diff --git a/Images/XRI2ToXRI3Guide/InputCompatibilityMode.png b/Images/XRI2ToXRI3Guide/InputCompatibilityMode.png new file mode 100644 index 000000000..d16a179f6 Binary files /dev/null and b/Images/XRI2ToXRI3Guide/InputCompatibilityMode.png differ diff --git a/Images/XRI2ToXRI3Guide/MRTK3XRI2RigStructure.png b/Images/XRI2ToXRI3Guide/MRTK3XRI2RigStructure.png new file mode 100644 index 000000000..35df594f3 Binary files /dev/null and b/Images/XRI2ToXRI3Guide/MRTK3XRI2RigStructure.png differ diff --git a/Images/XRI2ToXRI3Guide/MRTK3XRI3RigStructure.png b/Images/XRI2ToXRI3Guide/MRTK3XRI3RigStructure.png new file mode 100644 index 000000000..5e3e98633 Binary files /dev/null and b/Images/XRI2ToXRI3Guide/MRTK3XRI3RigStructure.png differ diff --git a/Images/XRI2ToXRI3Guide/MRTKInputReaders.png b/Images/XRI2ToXRI3Guide/MRTKInputReaders.png new file mode 100644 index 000000000..075419305 Binary files /dev/null and b/Images/XRI2ToXRI3Guide/MRTKInputReaders.png differ diff --git a/Images/XRI2ToXRI3Guide/ObsoleteMRTKRightHandXRController.png b/Images/XRI2ToXRI3Guide/ObsoleteMRTKRightHandXRController.png new file mode 100644 index 000000000..0ae775324 Binary files /dev/null and b/Images/XRI2ToXRI3Guide/ObsoleteMRTKRightHandXRController.png differ diff --git a/Images/XRI2ToXRI3Guide/ObsoleteMRTKXRRig.png b/Images/XRI2ToXRI3Guide/ObsoleteMRTKXRRig.png new file mode 100644 index 000000000..49c5a60ab Binary files /dev/null and b/Images/XRI2ToXRI3Guide/ObsoleteMRTKXRRig.png differ diff --git a/Images/XRI2ToXRI3Guide/TPDandMMR.png b/Images/XRI2ToXRI3Guide/TPDandMMR.png new file mode 100644 index 000000000..f4ddf4b44 Binary files /dev/null and b/Images/XRI2ToXRI3Guide/TPDandMMR.png differ diff --git a/Images/XRI2ToXRI3Guide/XRI2ToXRI3Step1.png b/Images/XRI2ToXRI3Guide/XRI2ToXRI3Step1.png new file mode 100644 index 000000000..82fa26aa2 Binary files /dev/null and b/Images/XRI2ToXRI3Guide/XRI2ToXRI3Step1.png differ diff --git a/Images/XRI2ToXRI3Guide/XRI2ToXRI3Step2.png b/Images/XRI2ToXRI3Guide/XRI2ToXRI3Step2.png new file mode 100644 index 000000000..3638377a2 Binary files /dev/null and b/Images/XRI2ToXRI3Guide/XRI2ToXRI3Step2.png differ diff --git a/Images/XRI2ToXRI3Guide/XRI2ToXRI3Step3.png b/Images/XRI2ToXRI3Guide/XRI2ToXRI3Step3.png new file mode 100644 index 000000000..18ca18936 Binary files /dev/null and b/Images/XRI2ToXRI3Guide/XRI2ToXRI3Step3.png differ diff --git a/Pipelines/Config/settings.yaml b/Pipelines/Config/settings.yaml index 44b8cbbc1..0cc1ddb91 100644 --- a/Pipelines/Config/settings.yaml +++ b/Pipelines/Config/settings.yaml @@ -4,4 +4,4 @@ variables: # match (see scripts/packaging/versionmetadata.ps1) # ProjectSettings/ProjectSettings.asset: bundleVersion: x.x.x # ProjectSettings/ProjectSettings.asset: metroPackageVersion: x.x.x.0 - ProjectVersion: 3.0.0 # used for overall build number of sample projects \ No newline at end of file + ProjectVersion: 4.0.0 # used for overall build number of sample projects \ No newline at end of file diff --git a/Pipelines/Scripts/update-versions.ps1 b/Pipelines/Scripts/update-versions.ps1 index cb947ed89..fad023441 100644 --- a/Pipelines/Scripts/update-versions.ps1 +++ b/Pipelines/Scripts/update-versions.ps1 @@ -160,7 +160,7 @@ Get-ChildItem -Path $PackagesRoot -Filter "package.json" -Recurse | ForEach-Obje Write-Output "Patching CHANGELOG.md version to [$version$tag] - $year-$month-$day" $escapedVersion = [regex]::Escape($version) Get-ChildItem -Path $packagePath/CHANGELOG.md -Recurse | ForEach-Object { - (Get-Content -Path $_ -Raw) -Replace "## (\[$escapedVersion(-[a-zA-Z0-9.]+)?\] - \b\d{4}\b-\b(0[1-9]|1[0-2])\b-\b(0[1-9]|[12][0-9]|3[01])\b|Unreleased)", "## [$version$tag] - $year-$month-$day" | Set-Content -Path $_ -NoNewline + (Get-Content -Path $_ -Raw) -Replace "## (\[$escapedVersion-development([a-zA-Z0-9.]+)?\] - \b\d{4}\b-\b(0[1-9]|1[0-2])\b-\b(0[1-9]|[12][0-9]|3[01])\b|\[?Unreleased\]?)", "## [$version$tag] - $year-$month-$day" | Set-Content -Path $_ -NoNewline } } diff --git a/Pipelines/Scripts/validatecode.ps1 b/Pipelines/Scripts/validatecode.ps1 index 2fdaba050..bf50c64e3 100644 --- a/Pipelines/Scripts/validatecode.ps1 +++ b/Pipelines/Scripts/validatecode.ps1 @@ -183,7 +183,12 @@ function CheckForMetaFile { [string]$FileName ) process { - if (-not $FileName.EndsWith("~") -and -not (Test-Path ($FileName + ".meta"))) { + $isIgnoredByUnity = $FileName -match "~([\\/]|$)" -or + $FileName -match "[\\/]\." -or + $FileName -match "[\\/]cvs([\\/]|$)" -or + $FileName.EndsWith(".tmp") + + if (-not $isIgnoredByUnity -and -not (Test-Path ($FileName + ".meta"))) { Write-Warning "Meta file missing for $FileName. Please be sure to check it in alongside this file." $true; } diff --git a/README.md b/README.md index 877e006ac..90b713165 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,7 @@ ### Long Term Support -* Minimum requirements: OpenXR, Unity 2022.3 LTS, Unity’s XR Interaction Toolkit 3.0. +* Minimum requirements: OpenXR, Unity 6.0 LTS, Unity’s XR Interaction Toolkit 3.0. ## Packages @@ -118,6 +118,26 @@ This project welcomes contributions, suggestions, and feedback. All contribution For more information on how to contribute Mixed Reality Toolkit for Unity Project, please read the [contributing guidelines](./CONTRIBUTING.md). +## MRTK3 XRI2 to XRI3 migration guide + +MRTK3 has been upgraded to use [Unity's XR Interaction Toolkit 3+](https://docs.unity3d.com/Packages/com.unity.xr.interaction.toolkit@3.0/manual/whats-new-3.0.html). As part of the upgrade several changes were made to properly consume XRI 3 package and adhere to the new patterns. In a nutshell, the main changes are summarized as follows: + +* New controller prefabs and a new rig have been created following the new XRI3 pattern. + * The old controllers and rig have been marked as osbolete and renamed as "Obsolete MRTK XR Rig", "Obsolete MRTK LeftHand Controller", "Obsolete MRTK RightHand Controller", "Obsolete MRTK Hand Controller", "Obsolete MRTK Interaction Manager", and "Obsolete MRTK Gaze Controller". + * The new controllers and rig retake the original names of the obsolete controllers. +* New controllers structure have been modified so that all of them have the same structure. +* The deprecated XRI2 XRController component has been removed from the controllers and its input actions have been moved to their interactors. + * The new controllers now have a Tracked Pose Driver components that holds references to the device's position, rotation, and tracking state input actions. +* Interactors now have a Tracked Pose Driver field that holds a reference to the Tracked Pose Driver component of the parent controller. +* Interactors now have a Mode Managed Root that holds a reference to the parent controller GameObject. +* Added new unity-tests for the new XRI3 functionality + components. +* Updated several unity-tests. +* Updated several scripts so that they work with both obsolete XRI2 and new XRI3 prefabs. +* Updated all scenes to use the new XRI3 rig + controllers. + * Made a copy of the old HandInteractionExamples scene and renamed as ObsoleteHandInteractionExample, this scene still consumes the old rig + controllers. + +A more detailed explanation of the changes can be found in [XRI2TOXRI3MIGRATIONGUIDE.md](./XRI2TOXRI3MIGRATIONGUIDE.md). The guide can also help others as a path for migrating their own solutions or MRTK3 forks from XRI2 to XRI3. + ## Governance For information on how the Mixed Reality Toolkit for Unity Project is governed, please read the [Governance document](./GOVERNANCE.md). diff --git a/UnityProjects/MRTKDevTemplate/Assets/BuildAssets/BuildApp.cs b/UnityProjects/MRTKDevTemplate/Assets/BuildAssets/BuildApp.cs index 976cde345..a5f04aa88 100644 --- a/UnityProjects/MRTKDevTemplate/Assets/BuildAssets/BuildApp.cs +++ b/UnityProjects/MRTKDevTemplate/Assets/BuildAssets/BuildApp.cs @@ -251,12 +251,10 @@ private static void PatchHands(bool addDebug) visualizer.JointMaterial = AssetDatabase.LoadAssetAtPath(AssetDatabase.GUIDToAssetPath(HandJointMaterialGuid)); visualizer.JointMesh = Resources.GetBuiltinResource("Cube.fbx"); } -#if UNITY_6000_0_OR_NEWER else { PrefabUtility.RemoveUnusedOverrides(new[] { leftHandVisualizer }, UnityEditor.InteractionMode.UserAction); } -#endif PrefabUtility.SaveAsPrefabAsset(leftHandVisualizer, leftHandPath); } PrefabUtility.UnloadPrefabContents(leftHandVisualizer); diff --git a/UnityProjects/MRTKDevTemplate/Assets/Data Binding Example/Prefabs/PhotoItem Quad.prefab b/UnityProjects/MRTKDevTemplate/Assets/Data Binding Example/Prefabs/PhotoItem Quad.prefab index 85b2a97b9..2a6236ee2 100644 --- a/UnityProjects/MRTKDevTemplate/Assets/Data Binding Example/Prefabs/PhotoItem Quad.prefab +++ b/UnityProjects/MRTKDevTemplate/Assets/Data Binding Example/Prefabs/PhotoItem Quad.prefab @@ -25,6 +25,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 484208870302911250} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -36,7 +37,6 @@ Transform: - {fileID: 330837963086729989} - {fileID: 133969779087695481} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &3782549843674289555 MonoBehaviour: @@ -97,13 +97,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4999043571444206104} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0.253, y: 0, z: 0.01} m_LocalScale: {x: 3.8187168, y: 1.2575, z: 0.001} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 484208870302911251} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &4467701978597395349 MeshFilter: @@ -130,6 +130,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -163,9 +166,17 @@ MeshCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4999043571444206104} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 4 + serializedVersion: 5 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} @@ -200,7 +211,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 484208870302911251} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -224,6 +234,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -307,20 +320,23 @@ MonoBehaviour: m_VerticalAlignment: 256 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 00000000 m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 0 m_isCullingEnabled: 0 @@ -368,13 +384,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7143347138592074966} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.999, y: 0, z: 0.0001} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 484208870302911251} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &1301481325207250709 MeshFilter: @@ -401,6 +417,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -434,9 +453,17 @@ MeshCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7143347138592074966} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 4 + serializedVersion: 5 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} @@ -493,7 +520,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 484208870302911251} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -517,6 +543,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -600,20 +629,23 @@ MonoBehaviour: m_VerticalAlignment: 256 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 1 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 00000000 m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 0 m_isCullingEnabled: 0 @@ -658,13 +690,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8921049681858529749} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 1.922, y: -0.382, z: -0.1} m_LocalScale: {x: 10, y: 10, z: 0.1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 484208870302911251} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &8181566081582823493 MonoBehaviour: diff --git a/UnityProjects/MRTKDevTemplate/Assets/Data Binding Example/Prefabs/PhotoItem Sprite.prefab b/UnityProjects/MRTKDevTemplate/Assets/Data Binding Example/Prefabs/PhotoItem Sprite.prefab index a96ed76c5..19909d0cb 100644 --- a/UnityProjects/MRTKDevTemplate/Assets/Data Binding Example/Prefabs/PhotoItem Sprite.prefab +++ b/UnityProjects/MRTKDevTemplate/Assets/Data Binding Example/Prefabs/PhotoItem Sprite.prefab @@ -31,7 +31,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 484208869767866870} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -104,20 +103,23 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 1 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 00000000 m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -170,7 +172,6 @@ RectTransform: - {fileID: 1664250162257263080} - {fileID: 484208869994139854} m_Father: {fileID: 484208870302911251} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -194,7 +195,9 @@ Canvas: m_OverrideSorting: 0 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 m_AdditionalShaderChannelsFlag: 25 + m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 @@ -269,7 +272,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 484208869767866870} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -293,6 +295,9 @@ SpriteRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -374,6 +379,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 484208870302911250} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -382,7 +388,6 @@ Transform: - {fileID: 5308369766463393447} - {fileID: 484208869767866870} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &2185989686393736106 MonoBehaviour: @@ -428,7 +433,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 484208869767866870} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -501,20 +505,23 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 1 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 00000000 m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -558,13 +565,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4999043571444206104} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0.01} m_LocalScale: {x: 3.498168, y: 1.0075, z: 0.13091514} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 484208870302911251} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &4467701978597395349 MeshFilter: @@ -591,6 +598,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -624,9 +634,17 @@ MeshCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4999043571444206104} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 4 + serializedVersion: 5 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} diff --git a/UnityProjects/MRTKDevTemplate/Assets/Prefabs/BoundsControl/CheeseBoundsControl.prefab b/UnityProjects/MRTKDevTemplate/Assets/Prefabs/BoundsControl/CheeseBoundsControl.prefab index 76bce26a0..d0766aca7 100644 --- a/UnityProjects/MRTKDevTemplate/Assets/Prefabs/BoundsControl/CheeseBoundsControl.prefab +++ b/UnityProjects/MRTKDevTemplate/Assets/Prefabs/BoundsControl/CheeseBoundsControl.prefab @@ -5,12 +5,9 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 1590675683978192152, guid: 94c09e98ca44a744b876d69345fd1074, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - target: {fileID: 1590675683978192152, guid: 94c09e98ca44a744b876d69345fd1074, type: 3} propertyPath: m_LocalScale.x value: 0.2 @@ -63,11 +60,25 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: -3.467 objectReference: {fileID: 0} + - target: {fileID: 1730601136305391045, guid: 94c09e98ca44a744b876d69345fd1074, type: 3} + propertyPath: handType + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 1730601136305391045, guid: 94c09e98ca44a744b876d69345fd1074, type: 3} + propertyPath: proximityType + value: -1 + objectReference: {fileID: 0} - target: {fileID: 3670630427193237415, guid: 94c09e98ca44a744b876d69345fd1074, type: 3} propertyPath: m_Name value: CheeseBoundsControl objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 3670630427193237415, guid: 94c09e98ca44a744b876d69345fd1074, type: 3} + insertIndex: -1 + addedObject: {fileID: 628273543} m_SourcePrefab: {fileID: 100100000, guid: 94c09e98ca44a744b876d69345fd1074, type: 3} --- !u!114 &3915192362586130041 stripped MonoBehaviour: @@ -119,6 +130,16 @@ MonoBehaviour: translateLerpTime: 0.0001 enableConstraints: 1 constraintsManager: {fileID: 3915192362586130041} + manipulationLogicTypes: + moveLogicType: + reference: MixedReality.Toolkit.SpatialManipulation.BoundsControlMoveLogic, + MixedReality.Toolkit.SpatialManipulation + rotateLogicType: + reference: MixedReality.Toolkit.SpatialManipulation.BoundsControlRotateLogic, + MixedReality.Toolkit.SpatialManipulation + scaleLogicType: + reference: MixedReality.Toolkit.SpatialManipulation.BoundsControlScaleLogic, + MixedReality.Toolkit.SpatialManipulation manipulationStarted: m_PersistentCalls: m_Calls: diff --git a/UnityProjects/MRTKDevTemplate/Assets/Prefabs/BoundsControl/CoffeeBoundsControl.prefab b/UnityProjects/MRTKDevTemplate/Assets/Prefabs/BoundsControl/CoffeeBoundsControl.prefab index 4a9d3da80..9cd38b324 100644 --- a/UnityProjects/MRTKDevTemplate/Assets/Prefabs/BoundsControl/CoffeeBoundsControl.prefab +++ b/UnityProjects/MRTKDevTemplate/Assets/Prefabs/BoundsControl/CoffeeBoundsControl.prefab @@ -25,13 +25,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 150104291} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0.014516856, y: 1.7744396, z: -0.011289552} m_LocalScale: {x: 1.8175923, y: 0.05679976, z: 1.8175923} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1214529608091387483} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &150104295 MeshFilter: @@ -58,6 +58,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -88,20 +91,13 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 100002, guid: 6ceef383a3dfd0a4e9c38b8d793170e4, type: 3} propertyPath: m_Name value: CoffeeBoundsControl objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 6ceef383a3dfd0a4e9c38b8d793170e4, type: 3} - propertyPath: m_LocalPosition.y - value: 0.644 - objectReference: {fileID: 0} - - target: {fileID: 400002, guid: 6ceef383a3dfd0a4e9c38b8d793170e4, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - target: {fileID: 400002, guid: 6ceef383a3dfd0a4e9c38b8d793170e4, type: 3} propertyPath: m_LocalScale.x value: 0.062000003 @@ -162,15 +158,41 @@ PrefabInstance: propertyPath: m_LocalPosition.y value: -0.9970206 objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 6ceef383a3dfd0a4e9c38b8d793170e4, type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: cfecafee97b1bac42be6698465e5bd45, type: 2} - target: {fileID: 2300002, guid: 6ceef383a3dfd0a4e9c38b8d793170e4, type: 3} - propertyPath: m_Materials.Array.data[0] + propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: edc81f8444b03444eae776bfc3a3dd00, type: 2} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 400004, guid: 6ceef383a3dfd0a4e9c38b8d793170e4, type: 3} + insertIndex: -1 + addedObject: {fileID: 150104292} + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 100002, guid: 6ceef383a3dfd0a4e9c38b8d793170e4, type: 3} + insertIndex: -1 + addedObject: {fileID: 251265377} + - targetCorrespondingSourceObject: {fileID: 100002, guid: 6ceef383a3dfd0a4e9c38b8d793170e4, type: 3} + insertIndex: -1 + addedObject: {fileID: 251265374} + - targetCorrespondingSourceObject: {fileID: 100002, guid: 6ceef383a3dfd0a4e9c38b8d793170e4, type: 3} + insertIndex: -1 + addedObject: {fileID: 251265375} + - targetCorrespondingSourceObject: {fileID: 100002, guid: 6ceef383a3dfd0a4e9c38b8d793170e4, type: 3} + insertIndex: -1 + addedObject: {fileID: 251265376} + - targetCorrespondingSourceObject: {fileID: 100002, guid: 6ceef383a3dfd0a4e9c38b8d793170e4, type: 3} + insertIndex: -1 + addedObject: {fileID: 251265379} + - targetCorrespondingSourceObject: {fileID: 100002, guid: 6ceef383a3dfd0a4e9c38b8d793170e4, type: 3} + insertIndex: -1 + addedObject: {fileID: 1768482734058504657} + - targetCorrespondingSourceObject: {fileID: 100004, guid: 6ceef383a3dfd0a4e9c38b8d793170e4, type: 3} + insertIndex: -1 + addedObject: {fileID: 255187375} + - targetCorrespondingSourceObject: {fileID: 100004, guid: 6ceef383a3dfd0a4e9c38b8d793170e4, type: 3} + insertIndex: -1 + addedObject: {fileID: 314195728} m_SourcePrefab: {fileID: 100100000, guid: 6ceef383a3dfd0a4e9c38b8d793170e4, type: 3} --- !u!4 &1214529608091387483 stripped Transform: @@ -195,9 +217,17 @@ MeshCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1214529608091490939} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 0 - serializedVersion: 4 + serializedVersion: 5 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: -1636560234873357706, guid: 3ceb984318b1e34419d826d447ca4eec, type: 3} @@ -209,9 +239,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1214529608091490939} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 2.487297, y: 2.159443, z: 1.9277921} m_Center: {x: 0.27394247, y: 1.1151569, z: -0.00000014901161} --- !u!1 &1214529608091490941 stripped @@ -230,6 +268,7 @@ AudioSource: serializedVersion: 4 OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 0} + m_Resource: {fileID: 0} m_PlayOnAwake: 1 m_Volume: 1 m_Pitch: 1 @@ -329,13 +368,11 @@ MonoBehaviour: m_EditorClassIdentifier: m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 1 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -392,42 +429,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_OnHoverEntered: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_OnHoverExited: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectEntered: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -670,6 +692,9 @@ MonoBehaviour: k__BackingField: 1 allowSelectByVoice: 1 speechRecognitionKeyword: select + k__BackingField: + m_PersistentCalls: + m_Calls: [] k__BackingField: 1 k__BackingField: 0 k__BackingField: @@ -692,6 +717,7 @@ MonoBehaviour: hostTransform: {fileID: 1214529608091387485} allowedManipulations: 7 allowedInteractionTypes: -2147483641 + rigidbodyMovementType: 0 applyTorque: 1 springForceSoftness: 0.1 springTorqueSoftness: 0.1 @@ -714,8 +740,7 @@ MonoBehaviour: moveLogicType: reference: MixedReality.Toolkit.SpatialManipulation.MoveLogic, MixedReality.Toolkit.SpatialManipulation rotateLogicType: - reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, - MixedReality.Toolkit.SpatialManipulation + reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, MixedReality.Toolkit.SpatialManipulation scaleLogicType: reference: MixedReality.Toolkit.SpatialManipulation.ScaleLogic, MixedReality.Toolkit.SpatialManipulation --- !u!114 &251265375 @@ -766,6 +791,16 @@ MonoBehaviour: translateLerpTime: 0.00001 enableConstraints: 1 constraintsManager: {fileID: 251265375} + manipulationLogicTypes: + moveLogicType: + reference: MixedReality.Toolkit.SpatialManipulation.BoundsControlMoveLogic, + MixedReality.Toolkit.SpatialManipulation + rotateLogicType: + reference: MixedReality.Toolkit.SpatialManipulation.BoundsControlRotateLogic, + MixedReality.Toolkit.SpatialManipulation + scaleLogicType: + reference: MixedReality.Toolkit.SpatialManipulation.BoundsControlScaleLogic, + MixedReality.Toolkit.SpatialManipulation manipulationStarted: m_PersistentCalls: m_Calls: @@ -808,8 +843,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 80f85af46f9bddd4ea78f11cee5e3b2e, type: 3} m_Name: m_EditorClassIdentifier: - handType: 3 - proximityType: 3 + handType: -1 + proximityType: -1 executionOrder: 0 minimumScale: {x: 0.5, y: 0.5, z: 0.5} maximumScale: {x: 1.5, y: 1.5, z: 1.5} diff --git a/UnityProjects/MRTKDevTemplate/Assets/Prefabs/BoundsControl/ScaledBoundingBoxWithTraditionalHandles.prefab b/UnityProjects/MRTKDevTemplate/Assets/Prefabs/BoundsControl/ScaledBoundingBoxWithTraditionalHandles.prefab index 9a1b7c0d8..b92918caf 100644 --- a/UnityProjects/MRTKDevTemplate/Assets/Prefabs/BoundsControl/ScaledBoundingBoxWithTraditionalHandles.prefab +++ b/UnityProjects/MRTKDevTemplate/Assets/Prefabs/BoundsControl/ScaledBoundingBoxWithTraditionalHandles.prefab @@ -5,6 +5,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 189245729653895548, guid: ecbf05ce2121a744cb893e82377ba3cd, type: 3} @@ -191,10 +192,6 @@ PrefabInstance: propertyPath: m_Name value: ScaledBoundingBoxWithTraditionalHandles objectReference: {fileID: 0} - - target: {fileID: 5671351296789090343, guid: ecbf05ce2121a744cb893e82377ba3cd, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - target: {fileID: 5671351296789090343, guid: ecbf05ce2121a744cb893e82377ba3cd, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -376,4 +373,7 @@ PrefabInstance: value: 3 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: ecbf05ce2121a744cb893e82377ba3cd, type: 3} diff --git a/UnityProjects/MRTKDevTemplate/Assets/Prefabs/CanvasExample/HeroButton.prefab b/UnityProjects/MRTKDevTemplate/Assets/Prefabs/CanvasExample/HeroButton.prefab index 4c29c99f0..3b932c345 100644 --- a/UnityProjects/MRTKDevTemplate/Assets/Prefabs/CanvasExample/HeroButton.prefab +++ b/UnityProjects/MRTKDevTemplate/Assets/Prefabs/CanvasExample/HeroButton.prefab @@ -33,7 +33,6 @@ RectTransform: - {fileID: 4487134853895481750} - {fileID: 546726529016720829} m_Father: {fileID: 7632410789924292269} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -99,7 +98,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 9062819528647497186} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -223,7 +221,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1268478249972355035} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -312,7 +309,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1268478249972355035} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -398,7 +394,6 @@ RectTransform: - {fileID: 3741865281567285213} - {fileID: 9099108670589840320} m_Father: {fileID: 9062819528647497186} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -454,7 +449,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 9062819528647497186} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -581,7 +575,6 @@ RectTransform: m_Children: - {fileID: 7632410789924292269} m_Father: {fileID: 9062819528647497186} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -743,7 +736,6 @@ RectTransform: m_Children: - {fileID: 2377984702296620284} m_Father: {fileID: 7632410789015663027} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -781,7 +773,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2377984702296620284} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -854,20 +845,23 @@ MonoBehaviour: m_VerticalAlignment: 256 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 00000000 m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -916,7 +910,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2377984702296620284} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -989,20 +982,23 @@ MonoBehaviour: m_VerticalAlignment: 256 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 00000000 m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -1051,7 +1047,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2377984702296620284} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -1124,20 +1119,23 @@ MonoBehaviour: m_VerticalAlignment: 256 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 00000000 m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -1197,7 +1195,6 @@ RectTransform: - {fileID: 8574554413131705941} - {fileID: 7632410789015663027} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -1218,13 +1215,11 @@ MonoBehaviour: m_EditorClassIdentifier: m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 1 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -1281,42 +1276,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnHoverExited: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectEntered: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectExited: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectCanceled: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -1409,6 +1389,9 @@ MonoBehaviour: k__BackingField: 1 allowSelectByVoice: 1 speechRecognitionKeyword: select + k__BackingField: + m_PersistentCalls: + m_Calls: [] k__BackingField: 1 k__BackingField: 0 k__BackingField: @@ -1438,6 +1421,14 @@ MonoBehaviour: rollOffXYDepth: 3 rejectZRollOff: 0 extendSpeed: 0.5 + k__BackingField: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] --- !u!114 &9062819528647497188 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1489,9 +1480,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 9062819528647497213} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 89.17, y: 89.17, z: 35.6} m_Center: {x: 0, y: 0, z: 0} --- !u!114 &9062819528647497190 @@ -1510,9 +1509,10 @@ MonoBehaviour: attachedRectTransform: {fileID: 9062819528647497186} padding: {x: 0, y: 0} forceUpdateEveryFrame: 0 + canToggleCollider: 1 --- !u!95 &9062819528647497185 Animator: - serializedVersion: 5 + serializedVersion: 7 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -1526,6 +1526,7 @@ Animator: m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 m_StabilizeFeet: 0 + m_AnimatePhysics: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 @@ -1542,6 +1543,7 @@ AudioSource: serializedVersion: 4 OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 0} + m_Resource: {fileID: 0} m_PlayOnAwake: 1 m_Volume: 1 m_Pitch: 1 diff --git a/UnityProjects/MRTKDevTemplate/Assets/Prefabs/CanvasExample/MenuExample.prefab b/UnityProjects/MRTKDevTemplate/Assets/Prefabs/CanvasExample/MenuExample.prefab index 7878757e1..3e1ba892a 100644 --- a/UnityProjects/MRTKDevTemplate/Assets/Prefabs/CanvasExample/MenuExample.prefab +++ b/UnityProjects/MRTKDevTemplate/Assets/Prefabs/CanvasExample/MenuExample.prefab @@ -38,7 +38,6 @@ RectTransform: - {fileID: 8772383183310666376} - {fileID: 8772383181666526701} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -73,6 +72,13 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] + m_Texture: {fileID: 0} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 radius: 12 thickness: 2 wedges: 8 @@ -152,7 +158,6 @@ RectTransform: - {fileID: 1372347124019474309} - {fileID: 390798463543326195} m_Father: {fileID: 8772383182092832675} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -235,7 +240,6 @@ RectTransform: - {fileID: 973366429613686264} - {fileID: 973366429533607481} m_Father: {fileID: 8053818244378328212} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -294,7 +298,6 @@ RectTransform: - {fileID: 9011640672616098289} - {fileID: 6062693551803024494} m_Father: {fileID: 8053818244378328212} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -361,7 +364,6 @@ RectTransform: - {fileID: 1190619788537433052} - {fileID: 4895693043742498319} m_Father: {fileID: 8053818244378328212} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -422,7 +424,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8053818244378328212} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -479,7 +480,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8053818244378328212} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -511,6 +511,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 8772383182754392671} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -529,118 +530,6 @@ PrefabInstance: propertyPath: m_Padding.m_Right value: 0 objectReference: {fileID: 0} - - target: {fileID: 3705378105823492738, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Name - value: CanvasButton (12) - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492760, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Size.x - value: 44 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492760, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Size.y - value: 44 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492760, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Center.x - value: 22 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492760, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Center.y - value: -22 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Pivot.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Pivot.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4598333082849809373, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_text - value: Test - objectReference: {fileID: 0} - - target: {fileID: 4598333082849809373, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_HorizontalAlignment - value: 2 - objectReference: {fileID: 0} - target: {fileID: 5319578128471115350, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -665,14 +554,6 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 6293367208459292257, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6293367208459292257, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - target: {fileID: 7216918420766221479, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.y value: 1 @@ -709,10 +590,6 @@ PrefabInstance: propertyPath: m_Size.y value: 44 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 3 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -746,6 +623,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &7366085648579622288 stripped RectTransform: @@ -757,6 +637,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 8772383182754392671} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -775,118 +656,6 @@ PrefabInstance: propertyPath: m_Padding.m_Right value: 0 objectReference: {fileID: 0} - - target: {fileID: 3705378105823492738, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Name - value: CanvasButton (12) - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492760, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Size.x - value: 44 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492760, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Size.y - value: 44 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492760, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Center.x - value: 22 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492760, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Center.y - value: -22 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Pivot.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Pivot.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4598333082849809373, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_text - value: Test - objectReference: {fileID: 0} - - target: {fileID: 4598333082849809373, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_HorizontalAlignment - value: 2 - objectReference: {fileID: 0} - target: {fileID: 5319578128471115350, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -911,14 +680,6 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 6293367208459292257, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6293367208459292257, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - target: {fileID: 7216918420766221479, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.y value: 1 @@ -955,10 +716,6 @@ PrefabInstance: propertyPath: m_Size.y value: 44 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -992,6 +749,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &7788963656103200937 stripped RectTransform: @@ -1003,6 +763,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 8772383182754392671} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -1021,118 +782,6 @@ PrefabInstance: propertyPath: m_Padding.m_Right value: 0 objectReference: {fileID: 0} - - target: {fileID: 3705378105823492738, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Name - value: CanvasButton (12) - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492760, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Size.x - value: 44 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492760, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Size.y - value: 44 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492760, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Center.x - value: 22 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492760, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Center.y - value: -22 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Pivot.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Pivot.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4598333082849809373, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_text - value: Test - objectReference: {fileID: 0} - - target: {fileID: 4598333082849809373, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_HorizontalAlignment - value: 2 - objectReference: {fileID: 0} - target: {fileID: 5319578128471115350, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -1157,14 +806,6 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 6293367208459292257, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6293367208459292257, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - target: {fileID: 7216918420766221479, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.y value: 1 @@ -1201,10 +842,6 @@ PrefabInstance: propertyPath: m_Size.y value: 44 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -1238,6 +875,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &7748071162045474738 stripped RectTransform: @@ -1249,191 +889,66 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 8772383182092832675} m_Modifications: - - target: {fileID: 3705378105823492738, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Name - value: Right + - target: {fileID: 7216918420766221479, guid: c6b351a67ceb69140b199996bbbea156, type: 3} + propertyPath: m_AnchorMax.y + value: 0 objectReference: {fileID: 0} - - target: {fileID: 3705378105823492760, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Size.x - value: 34 + - target: {fileID: 7216918420766221479, guid: c6b351a67ceb69140b199996bbbea156, type: 3} + propertyPath: m_AnchorMin.y + value: 0 objectReference: {fileID: 0} - - target: {fileID: 3705378105823492760, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Size.y - value: 34 + - target: {fileID: 7216918420766221479, guid: c6b351a67ceb69140b199996bbbea156, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7216918420766221479, guid: c6b351a67ceb69140b199996bbbea156, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7216918420766221479, guid: c6b351a67ceb69140b199996bbbea156, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7216918420766221479, guid: c6b351a67ceb69140b199996bbbea156, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8376646494505211224, guid: c6b351a67ceb69140b199996bbbea156, type: 3} + propertyPath: m_Size.x + value: 32 objectReference: {fileID: 0} - - target: {fileID: 3705378105823492760, guid: c6b351a67ceb69140b199996bbbea156, type: 3} + - target: {fileID: 8376646494505211224, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Center.x - value: -17 + value: -16 objectReference: {fileID: 0} - - target: {fileID: 3705378105823492760, guid: c6b351a67ceb69140b199996bbbea156, type: 3} + - target: {fileID: 8376646494505211224, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Center.y - value: -17 + value: -16 objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} + - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Pivot.x value: 1 objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} + - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Pivot.y value: 1 objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} + - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 1 objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} + - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.y value: 1 objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} + - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMin.x value: 1 objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_SizeDelta.x - value: 34 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4598333082849809373, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_text - value: 'Right - -' - objectReference: {fileID: 0} - - target: {fileID: 4598333082849809373, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_HorizontalAlignment - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 6293367208459292257, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6293367208459292257, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7216918420766221479, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7216918420766221479, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7216918420766221479, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7216918420766221479, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7216918420766221479, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7216918420766221479, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211224, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Size.x - value: 32 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211224, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Center.x - value: -16 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211224, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Center.y - value: -16 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Pivot.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Pivot.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMax.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMin.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} + - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMin.y value: 1 objectReference: {fileID: 0} @@ -1454,6 +969,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &6062693551803024494 stripped RectTransform: @@ -1465,6 +983,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 8772383182754392671} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -1483,118 +1002,6 @@ PrefabInstance: propertyPath: m_Padding.m_Right value: 0 objectReference: {fileID: 0} - - target: {fileID: 3705378105823492738, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Name - value: CanvasButton (12) - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492760, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Size.x - value: 44 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492760, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Size.y - value: 44 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492760, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Center.x - value: 22 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492760, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Center.y - value: -22 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Pivot.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Pivot.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4598333082849809373, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_text - value: Test - objectReference: {fileID: 0} - - target: {fileID: 4598333082849809373, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_HorizontalAlignment - value: 2 - objectReference: {fileID: 0} - target: {fileID: 5319578128471115350, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -1619,14 +1026,6 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 6293367208459292257, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6293367208459292257, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - target: {fileID: 7216918420766221479, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.y value: 1 @@ -1663,10 +1062,6 @@ PrefabInstance: propertyPath: m_Size.y value: 44 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 4 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -1700,6 +1095,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &6335042292419363128 stripped RectTransform: @@ -1711,6 +1109,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 9011640672616098289} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -1733,62 +1132,6 @@ PrefabInstance: propertyPath: m_Padding.m_Right value: 0 objectReference: {fileID: 0} - - target: {fileID: 3705378105823492738, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Name - value: CanvasButton (3) - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492760, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Size.y - value: 22.18 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492762, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: toggleMode - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492762, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: isToggled.active - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_SizeDelta.y - value: 22.18 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalPosition.z - value: 0.000012874603 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3954096648631943191, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchoredPosition.x - value: -0.000011444092 - objectReference: {fileID: 0} - target: {fileID: 4185972052008607584, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Enabled value: 0 @@ -1821,94 +1164,6 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 12 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMax.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMax.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMin.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMin.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_SizeDelta.x - value: 32 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_SizeDelta.y - value: 32 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchoredPosition.x - value: 15.480011 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchoredPosition.y - value: 128 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295668, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Name - value: CanvasSmallButton - objectReference: {fileID: 0} - target: {fileID: 8376646494505211224, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Size.x value: 38.6 @@ -1927,7 +1182,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMin.x @@ -1935,7 +1190,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_SizeDelta.x @@ -1943,17 +1198,16 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchoredPosition.x - value: 23.3 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchoredPosition.y - value: -16 - objectReference: {fileID: 0} - - target: {fileID: 9026472854072389795, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &4804666115626773169 stripped RectTransform: @@ -1965,6 +1219,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 8772383182754392671} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -1983,118 +1238,6 @@ PrefabInstance: propertyPath: m_Padding.m_Right value: 0 objectReference: {fileID: 0} - - target: {fileID: 3705378105823492738, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Name - value: CanvasButton (12) - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492760, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Size.x - value: 44 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492760, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Size.y - value: 44 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492760, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Center.x - value: 22 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492760, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Center.y - value: -22 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Pivot.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Pivot.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4598333082849809373, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_text - value: Test - objectReference: {fileID: 0} - - target: {fileID: 4598333082849809373, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_HorizontalAlignment - value: 2 - objectReference: {fileID: 0} - target: {fileID: 5319578128471115350, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -2119,14 +1262,6 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 6293367208459292257, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6293367208459292257, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - target: {fileID: 7216918420766221479, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.y value: 1 @@ -2163,10 +1298,6 @@ PrefabInstance: propertyPath: m_Size.y value: 44 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 9 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -2200,6 +1331,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &4895693043742498319 stripped RectTransform: @@ -2209,138 +1343,27 @@ RectTransform: --- !u!1001 &6694656084923305477 PrefabInstance: m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 8772383182754392671} - m_Modifications: - - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2142167140070017856, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3015392985318836008, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Padding.m_Left - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3015392985318836008, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Padding.m_Right - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492738, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Name - value: CanvasButton (12) - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492760, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Size.x - value: 44 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492760, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Size.y - value: 44 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492760, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Center.x - value: 22 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492760, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Center.y - value: -22 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Pivot.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Pivot.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchoredPosition.y + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 8772383182754392671} + m_Modifications: + - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} + propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 + - target: {fileID: 2142167140070017856, guid: c6b351a67ceb69140b199996bbbea156, type: 3} + propertyPath: m_IsActive + value: 1 objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalEulerAnglesHint.y + - target: {fileID: 3015392985318836008, guid: c6b351a67ceb69140b199996bbbea156, type: 3} + propertyPath: m_Padding.m_Left value: 0 objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalEulerAnglesHint.z + - target: {fileID: 3015392985318836008, guid: c6b351a67ceb69140b199996bbbea156, type: 3} + propertyPath: m_Padding.m_Right value: 0 objectReference: {fileID: 0} - - target: {fileID: 4598333082849809373, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_text - value: Test - objectReference: {fileID: 0} - - target: {fileID: 4598333082849809373, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_HorizontalAlignment - value: 2 - objectReference: {fileID: 0} - target: {fileID: 5319578128471115350, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -2365,14 +1388,6 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 6293367208459292257, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6293367208459292257, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - target: {fileID: 7216918420766221479, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.y value: 1 @@ -2409,10 +1424,6 @@ PrefabInstance: propertyPath: m_Size.y value: 44 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -2446,6 +1457,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &2943068991859710808 stripped RectTransform: @@ -2457,6 +1471,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 8772383182754392671} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -2475,118 +1490,6 @@ PrefabInstance: propertyPath: m_Padding.m_Right value: 0 objectReference: {fileID: 0} - - target: {fileID: 3705378105823492738, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Name - value: CanvasButton (12) - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492760, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Size.x - value: 44 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492760, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Size.y - value: 44 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492760, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Center.x - value: 22 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492760, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Center.y - value: -22 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Pivot.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Pivot.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4598333082849809373, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_text - value: Test - objectReference: {fileID: 0} - - target: {fileID: 4598333082849809373, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_HorizontalAlignment - value: 2 - objectReference: {fileID: 0} - target: {fileID: 5319578128471115350, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -2611,14 +1514,6 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 6293367208459292257, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6293367208459292257, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - target: {fileID: 7216918420766221479, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.y value: 1 @@ -2655,10 +1550,6 @@ PrefabInstance: propertyPath: m_Size.y value: 44 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 6 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -2692,6 +1583,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &3062738052405918301 stripped RectTransform: @@ -2703,6 +1597,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 9011640672616098289} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -2725,62 +1620,6 @@ PrefabInstance: propertyPath: m_Padding.m_Right value: 0 objectReference: {fileID: 0} - - target: {fileID: 3705378105823492738, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Name - value: CanvasButton (3) - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492760, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Size.y - value: 22.18 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492762, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: toggleMode - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492762, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: isToggled.active - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_SizeDelta.y - value: 22.18 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalPosition.z - value: 0.000012874603 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3954096648631943191, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchoredPosition.x - value: -0.000011444092 - objectReference: {fileID: 0} - target: {fileID: 4185972052008607584, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Enabled value: 0 @@ -2813,94 +1652,6 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 12 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMax.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMax.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMin.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMin.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_SizeDelta.x - value: 32 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_SizeDelta.y - value: 32 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchoredPosition.x - value: 15.480011 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchoredPosition.y - value: 128 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295668, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Name - value: CanvasSmallButton - objectReference: {fileID: 0} - target: {fileID: 8376646494505211202, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Name value: Action Button (1) @@ -2917,17 +1668,13 @@ PrefabInstance: propertyPath: k__BackingField value: 2 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMin.x @@ -2935,7 +1682,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_SizeDelta.x @@ -2943,17 +1690,16 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchoredPosition.x - value: 61.899998 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchoredPosition.y - value: -16 - objectReference: {fileID: 0} - - target: {fileID: 9026472854072389795, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &1546107985163316921 stripped RectTransform: @@ -2965,6 +1711,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 8772383182754392671} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -2983,118 +1730,6 @@ PrefabInstance: propertyPath: m_Padding.m_Right value: 0 objectReference: {fileID: 0} - - target: {fileID: 3705378105823492738, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Name - value: CanvasButton (12) - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492760, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Size.x - value: 44 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492760, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Size.y - value: 44 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492760, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Center.x - value: 22 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492760, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Center.y - value: -22 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Pivot.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Pivot.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4598333082849809373, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_text - value: Test - objectReference: {fileID: 0} - - target: {fileID: 4598333082849809373, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_HorizontalAlignment - value: 2 - objectReference: {fileID: 0} - target: {fileID: 5319578128471115350, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -3119,14 +1754,6 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 6293367208459292257, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6293367208459292257, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - target: {fileID: 7216918420766221479, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.y value: 1 @@ -3163,10 +1790,6 @@ PrefabInstance: propertyPath: m_Size.y value: 44 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 8 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -3200,6 +1823,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &1190619788537433052 stripped RectTransform: @@ -3211,6 +1837,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 8772383182754392671} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -3229,118 +1856,6 @@ PrefabInstance: propertyPath: m_Padding.m_Right value: 0 objectReference: {fileID: 0} - - target: {fileID: 3705378105823492738, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Name - value: CanvasButton (12) - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492760, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Size.x - value: 44 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492760, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Size.y - value: 44 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492760, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Center.x - value: 22 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492760, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Center.y - value: -22 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Pivot.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Pivot.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4598333082849809373, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_text - value: Test - objectReference: {fileID: 0} - - target: {fileID: 4598333082849809373, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_HorizontalAlignment - value: 2 - objectReference: {fileID: 0} - target: {fileID: 5319578128471115350, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -3365,14 +1880,6 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 6293367208459292257, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6293367208459292257, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - target: {fileID: 7216918420766221479, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.y value: 1 @@ -3409,10 +1916,6 @@ PrefabInstance: propertyPath: m_Size.y value: 44 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 7 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -3446,6 +1949,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &1368099457244141811 stripped RectTransform: @@ -3457,6 +1963,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 9011640672616098289} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -3479,62 +1986,6 @@ PrefabInstance: propertyPath: m_Padding.m_Right value: 0 objectReference: {fileID: 0} - - target: {fileID: 3705378105823492738, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Name - value: CanvasButton (3) - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492760, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Size.y - value: 22.18 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492762, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: toggleMode - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492762, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: isToggled.active - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_SizeDelta.y - value: 22.18 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalPosition.z - value: 0.000012874603 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3954096648631943191, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchoredPosition.x - value: -0.000011444092 - objectReference: {fileID: 0} - target: {fileID: 4185972052008607584, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Enabled value: 0 @@ -3567,94 +2018,6 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 12 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMax.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMax.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMin.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMin.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_SizeDelta.x - value: 32 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_SizeDelta.y - value: 32 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchoredPosition.x - value: 15.480011 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchoredPosition.y - value: 128 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295668, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Name - value: CanvasSmallButton - objectReference: {fileID: 0} - target: {fileID: 8376646494505211202, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Name value: Action Button (2) @@ -3671,17 +2034,13 @@ PrefabInstance: propertyPath: k__BackingField value: 2 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMin.x @@ -3689,7 +2048,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_SizeDelta.x @@ -3697,17 +2056,16 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchoredPosition.x - value: 100.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchoredPosition.y - value: -16 - objectReference: {fileID: 0} - - target: {fileID: 9026472854072389795, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &1372347124019474309 stripped RectTransform: @@ -3719,6 +2077,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 9011640672616098289} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -3726,196 +2085,52 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} - target: {fileID: 2044856827291504467, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2142167140070017856, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3015392985318836008, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Padding.m_Left - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3015392985318836008, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Padding.m_Right - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492738, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Name - value: CanvasButton (3) - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492760, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Size.y - value: 22.18 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492762, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: toggleMode - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492762, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: isToggled.active - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_SizeDelta.y - value: 22.18 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalPosition.z - value: 0.000012874603 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3954096648631943191, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchoredPosition.x - value: -0.000011444092 - objectReference: {fileID: 0} - - target: {fileID: 4185972052008607584, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Enabled - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4897024374970528438, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_SizeDelta.x - value: 23.98 - objectReference: {fileID: 0} - - target: {fileID: 5319578128471115350, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5319578128471115350, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5319578128471115350, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5319578128471115350, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5319578128471115350, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5319578128471115350, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 12 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMax.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMax.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMin.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMin.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_SizeDelta.x - value: 32 + propertyPath: m_IsActive + value: 1 objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_SizeDelta.y - value: 32 + - target: {fileID: 2142167140070017856, guid: c6b351a67ceb69140b199996bbbea156, type: 3} + propertyPath: m_IsActive + value: 1 objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalPosition.x + - target: {fileID: 3015392985318836008, guid: c6b351a67ceb69140b199996bbbea156, type: 3} + propertyPath: m_Padding.m_Left value: 0 objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalPosition.y + - target: {fileID: 3015392985318836008, guid: c6b351a67ceb69140b199996bbbea156, type: 3} + propertyPath: m_Padding.m_Right value: 0 objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalPosition.z + - target: {fileID: 4185972052008607584, guid: c6b351a67ceb69140b199996bbbea156, type: 3} + propertyPath: m_Enabled value: 0 objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalRotation.z - value: -0 + - target: {fileID: 4897024374970528438, guid: c6b351a67ceb69140b199996bbbea156, type: 3} + propertyPath: m_SizeDelta.x + value: 23.98 objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchoredPosition.x - value: 15.480011 + - target: {fileID: 5319578128471115350, guid: c6b351a67ceb69140b199996bbbea156, type: 3} + propertyPath: m_AnchorMax.y + value: 0 objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchoredPosition.y - value: 128 + - target: {fileID: 5319578128471115350, guid: c6b351a67ceb69140b199996bbbea156, type: 3} + propertyPath: m_AnchorMin.y + value: 0 objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalEulerAnglesHint.x + - target: {fileID: 5319578128471115350, guid: c6b351a67ceb69140b199996bbbea156, type: 3} + propertyPath: m_SizeDelta.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalEulerAnglesHint.y + - target: {fileID: 5319578128471115350, guid: c6b351a67ceb69140b199996bbbea156, type: 3} + propertyPath: m_SizeDelta.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalEulerAnglesHint.z + - target: {fileID: 5319578128471115350, guid: c6b351a67ceb69140b199996bbbea156, type: 3} + propertyPath: m_AnchoredPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 5973294913672295668, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Name - value: CanvasSmallButton + - target: {fileID: 5319578128471115350, guid: c6b351a67ceb69140b199996bbbea156, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 objectReference: {fileID: 0} - target: {fileID: 8376646494505211202, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Name @@ -3933,17 +2148,13 @@ PrefabInstance: propertyPath: k__BackingField value: 2 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 3 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMin.x @@ -3951,7 +2162,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_SizeDelta.x @@ -3959,17 +2170,16 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchoredPosition.x - value: 139.09999 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchoredPosition.y - value: -16 - objectReference: {fileID: 0} - - target: {fileID: 9026472854072389795, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &390798463543326195 stripped RectTransform: @@ -3981,6 +2191,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 8772383182754392671} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -3999,118 +2210,6 @@ PrefabInstance: propertyPath: m_Padding.m_Right value: 0 objectReference: {fileID: 0} - - target: {fileID: 3705378105823492738, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Name - value: CanvasButton (12) - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492760, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Size.x - value: 44 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492760, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Size.y - value: 44 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492760, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Center.x - value: 22 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492760, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Center.y - value: -22 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Pivot.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Pivot.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4598333082849809373, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_text - value: Test - objectReference: {fileID: 0} - - target: {fileID: 4598333082849809373, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_HorizontalAlignment - value: 2 - objectReference: {fileID: 0} - target: {fileID: 5319578128471115350, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -4135,14 +2234,6 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 6293367208459292257, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6293367208459292257, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - target: {fileID: 7216918420766221479, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.y value: 1 @@ -4175,10 +2266,6 @@ PrefabInstance: propertyPath: m_Size.y value: 44 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 5 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -4212,6 +2299,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &973366430373300949 stripped RectTransform: @@ -4223,130 +2313,9 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 8772383181666526701} m_Modifications: - - target: {fileID: 3705378105823492738, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Name - value: Right - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492760, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Size.x - value: 34 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492760, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Size.y - value: 34 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492760, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Center.x - value: -17 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492760, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Center.y - value: -17 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Pivot.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Pivot.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMax.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMin.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_SizeDelta.x - value: 34 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4598333082849809373, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_text - value: 'Right - -' - objectReference: {fileID: 0} - - target: {fileID: 4598333082849809373, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_HorizontalAlignment - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 6293367208459292257, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6293367208459292257, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - target: {fileID: 7216918420766221479, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -4404,6 +2373,9 @@ PrefabInstance: value: -16 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &973366429613686264 stripped RectTransform: @@ -4415,128 +2387,9 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 8772383181666526701} m_Modifications: - - target: {fileID: 3705378105823492738, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Name - value: Left - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492760, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Size.x - value: 34 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492760, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Size.y - value: 34 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492760, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Center.x - value: 17 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492760, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Center.y - value: -17 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Pivot.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Pivot.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_SizeDelta.x - value: 34 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4598333082849809373, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_text - value: Left - objectReference: {fileID: 0} - - target: {fileID: 4598333082849809373, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_HorizontalAlignment - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 6293367208459292257, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6293367208459292257, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - target: {fileID: 7216918420766221479, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -4573,10 +2426,6 @@ PrefabInstance: propertyPath: m_Pivot.x value: 1 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 1 @@ -4606,6 +2455,9 @@ PrefabInstance: value: -16 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &973366429533607481 stripped RectTransform: diff --git a/UnityProjects/MRTKDevTemplate/Assets/Prefabs/CanvasExample/TopNavigationExample.prefab b/UnityProjects/MRTKDevTemplate/Assets/Prefabs/CanvasExample/TopNavigationExample.prefab index 361c448e8..b66946e40 100644 --- a/UnityProjects/MRTKDevTemplate/Assets/Prefabs/CanvasExample/TopNavigationExample.prefab +++ b/UnityProjects/MRTKDevTemplate/Assets/Prefabs/CanvasExample/TopNavigationExample.prefab @@ -33,7 +33,6 @@ RectTransform: - {fileID: 6066126984062364055} - {fileID: 7745809423492399804} m_Father: {fileID: 3272530386015204673} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -97,7 +96,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3272530386015204673} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -174,20 +172,23 @@ MonoBehaviour: m_VerticalAlignment: 256 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 00000000 m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -236,11 +237,10 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3272530386015204673} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 3.5365982} + m_AnchoredPosition: {x: 0, y: 3.5365906} m_SizeDelta: {x: -74.32, y: -22.14} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &271915363107937258 @@ -317,7 +317,6 @@ RectTransform: - {fileID: 4095427113250735758} - {fileID: 3272530386015204673} m_Father: {fileID: 4095427112833100002} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -428,6 +427,7 @@ GameObject: - component: {fileID: 4095427112833100002} - component: {fileID: 4095427112833100000} - component: {fileID: 4095427112833100001} + - component: {fileID: 7538724603407037766} m_Layer: 5 m_Name: TopNavigationExample m_TagString: Untagged @@ -449,7 +449,6 @@ RectTransform: m_Children: - {fileID: 4095427112466402871} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -484,10 +483,58 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] + m_Texture: {fileID: 0} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 radius: 12 thickness: 2 wedges: 8 calculateSmoothEdges: 1 +--- !u!114 &7538724603407037766 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4095427112833100003} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 699100ca886480c4a94ced56b1ae0e94, type: 3} + m_Name: + m_EditorClassIdentifier: + themeDataSource: {fileID: 11400000, guid: 57993c46ea42acf4ca3067542443bc45, type: 2} + binders: + - rid: 7636826640568287471 + - rid: 7617100123102511115 + - rid: 7617100121658621991 + - rid: 7617100121658621992 + references: + version: 2 + RefIds: + - rid: 7617100121658621991 + type: {class: GraphicColorBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 6126417514449433620} + k__BackingField: On Surface Color + - rid: 7617100121658621992 + type: {class: TMP_TextFontAssetBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 6126417514449433620} + k__BackingField: Text Font + - rid: 7617100123102511115 + type: {class: ImageSpriteBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 7377956084833273159} + k__BackingField: MRTK Logo + - rid: 7636826640568287471 + type: {class: GraphicMaterialBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 4095427112833100001} + k__BackingField: Backplate Material --- !u!1 &4095427113250735759 GameObject: m_ObjectHideFlags: 0 @@ -524,7 +571,6 @@ RectTransform: - {fileID: 5542298194999167875} - {fileID: 5542298196129711383} m_Father: {fileID: 4095427112466402871} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -631,7 +677,6 @@ RectTransform: - {fileID: 3076762638259767239} - {fileID: 142364650382704810} m_Father: {fileID: 4095427112466402871} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -689,11 +734,10 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3272530386015204673} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 3.5365982} + m_AnchoredPosition: {x: 0, y: 3.5365906} m_SizeDelta: {x: -87.23, y: -31.55} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5143805549000109219 @@ -739,6 +783,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 142364650382704810} m_Modifications: - target: {fileID: 1922220768106560367, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -807,7 +852,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 100 + value: Lightbulb objectReference: {fileID: 0} - target: {fileID: 8376646494505211202, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Name @@ -825,10 +870,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -902,6 +943,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &7745809423492399804 stripped RectTransform: @@ -913,6 +957,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 142364650382704810} m_Modifications: - target: {fileID: 1922220768106560367, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -981,7 +1026,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 107 + value: Movie objectReference: {fileID: 0} - target: {fileID: 8376646494505211202, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Name @@ -999,10 +1044,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -1076,6 +1117,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &6066126984062364055 stripped RectTransform: @@ -1087,6 +1131,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4095427113250735758} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -1117,62 +1162,6 @@ PrefabInstance: propertyPath: m_Padding.m_Right value: 0 objectReference: {fileID: 0} - - target: {fileID: 3705378105823492738, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Name - value: CanvasButton (3) - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492760, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Size.y - value: 22.18 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492762, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: toggleMode - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492762, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: isToggled.active - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_SizeDelta.y - value: 22.18 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalPosition.z - value: 0.000012874603 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3954096648631943191, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchoredPosition.x - value: -0.000011444092 - objectReference: {fileID: 0} - target: {fileID: 4185972052008607584, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Enabled value: 0 @@ -1209,94 +1198,6 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 12 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMax.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMax.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMin.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMin.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_SizeDelta.x - value: 32 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_SizeDelta.y - value: 32 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchoredPosition.x - value: 15.480011 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchoredPosition.y - value: 128 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295668, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Name - value: CanvasSmallButton - objectReference: {fileID: 0} - target: {fileID: 7594107385585372191, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive value: 0 @@ -1317,10 +1218,6 @@ PrefabInstance: propertyPath: k__BackingField value: 2 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -1349,11 +1246,10 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 9026472854072389795, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &5542298196605009403 stripped RectTransform: @@ -1365,6 +1261,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4095427113250735758} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -1395,62 +1292,6 @@ PrefabInstance: propertyPath: m_Padding.m_Right value: 0 objectReference: {fileID: 0} - - target: {fileID: 3705378105823492738, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Name - value: CanvasButton (3) - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492760, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Size.y - value: 22.18 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492762, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: toggleMode - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492762, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: isToggled.active - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_SizeDelta.y - value: 22.18 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalPosition.z - value: 0.000012874603 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3954096648631943191, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchoredPosition.x - value: -0.000011444092 - objectReference: {fileID: 0} - target: {fileID: 4185972052008607584, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Enabled value: 0 @@ -1487,94 +1328,6 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 12 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMax.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMax.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMin.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMin.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_SizeDelta.x - value: 32 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_SizeDelta.y - value: 32 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchoredPosition.x - value: 15.480011 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchoredPosition.y - value: 128 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295668, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Name - value: CanvasSmallButton - objectReference: {fileID: 0} - target: {fileID: 7594107385585372191, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive value: 0 @@ -1595,10 +1348,6 @@ PrefabInstance: propertyPath: k__BackingField value: 2 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 3 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -1627,11 +1376,10 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 9026472854072389795, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &5542298196129711383 stripped RectTransform: @@ -1643,6 +1391,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4095427113250735758} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -1673,62 +1422,6 @@ PrefabInstance: propertyPath: m_Padding.m_Right value: 0 objectReference: {fileID: 0} - - target: {fileID: 3705378105823492738, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Name - value: CanvasButton (3) - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492760, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Size.y - value: 22.18 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492762, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: toggleMode - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492762, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: isToggled.active - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_SizeDelta.y - value: 22.18 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalPosition.z - value: 0.000012874603 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3954096648631943191, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchoredPosition.x - value: -0.000011444092 - objectReference: {fileID: 0} - target: {fileID: 4185972052008607584, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Enabled value: 0 @@ -1765,94 +1458,6 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 12 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMax.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMax.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMin.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMin.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_SizeDelta.x - value: 32 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_SizeDelta.y - value: 32 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchoredPosition.x - value: 15.480011 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchoredPosition.y - value: 128 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295668, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Name - value: CanvasSmallButton - objectReference: {fileID: 0} - target: {fileID: 7594107385585372191, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive value: 0 @@ -1873,10 +1478,6 @@ PrefabInstance: propertyPath: k__BackingField value: 2 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -1905,11 +1506,10 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 9026472854072389795, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &5542298196073234626 stripped RectTransform: @@ -1921,6 +1521,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4095427113250735758} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -1951,62 +1552,6 @@ PrefabInstance: propertyPath: m_Padding.m_Right value: 0 objectReference: {fileID: 0} - - target: {fileID: 3705378105823492738, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Name - value: CanvasButton (3) - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492760, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Size.y - value: 22.18 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492762, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: toggleMode - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492762, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: isToggled.active - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_SizeDelta.y - value: 22.18 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalPosition.z - value: 0.000012874603 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3954096648631943191, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchoredPosition.x - value: -0.000011444092 - objectReference: {fileID: 0} - target: {fileID: 4185972052008607584, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Enabled value: 0 @@ -2043,94 +1588,6 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 12 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMax.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMax.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMin.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMin.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_SizeDelta.x - value: 32 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_SizeDelta.y - value: 32 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchoredPosition.x - value: 15.480011 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchoredPosition.y - value: 128 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295668, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Name - value: CanvasSmallButton - objectReference: {fileID: 0} - target: {fileID: 7594107385585372191, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive value: 0 @@ -2151,10 +1608,6 @@ PrefabInstance: propertyPath: k__BackingField value: 2 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -2183,11 +1636,10 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 9026472854072389795, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &5542298194999167875 stripped RectTransform: @@ -2199,6 +1651,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 142364650382704810} m_Modifications: - target: {fileID: 1922220768106560367, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -2267,7 +1720,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 92 + value: Heart Outline objectReference: {fileID: 0} - target: {fileID: 8376646494505211202, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Name @@ -2285,10 +1738,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -2362,6 +1811,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &3462716897866756475 stripped RectTransform: diff --git a/UnityProjects/MRTKDevTemplate/Assets/Prefabs/CanvasExample/UIPanelExample.prefab b/UnityProjects/MRTKDevTemplate/Assets/Prefabs/CanvasExample/UIPanelExample.prefab index 3015b1700..001efae22 100644 --- a/UnityProjects/MRTKDevTemplate/Assets/Prefabs/CanvasExample/UIPanelExample.prefab +++ b/UnityProjects/MRTKDevTemplate/Assets/Prefabs/CanvasExample/UIPanelExample.prefab @@ -29,7 +29,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2356801616050657259} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -67,7 +66,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2578649064017060638} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -140,20 +138,23 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -205,7 +206,6 @@ RectTransform: - {fileID: 6338500038249281931} - {fileID: 6338500037595202671} m_Father: {fileID: 3868625797428816970} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -278,7 +278,6 @@ RectTransform: - {fileID: 6351079148266003887} - {fileID: 7879939008530370534} m_Father: {fileID: 3868625797428816970} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -414,7 +413,6 @@ RectTransform: - {fileID: 6776978392769446707} - {fileID: 6776978392589374209} m_Father: {fileID: 2578649063749817975} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -478,7 +476,6 @@ RectTransform: m_Children: - {fileID: 2578649063327347123} m_Father: {fileID: 2578649064017060638} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -546,7 +543,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2578649064399513024} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} @@ -569,9 +565,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2578649063991174810} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 13, y: 110, z: 10} m_Center: {x: 0, y: 0, z: 0} --- !u!114 &2578649063991174808 @@ -590,6 +594,7 @@ MonoBehaviour: attachedRectTransform: {fileID: 2578649063991174813} padding: {x: 5, y: 5} forceUpdateEveryFrame: 0 + canToggleCollider: 1 --- !u!114 &2578649063991174812 MonoBehaviour: m_ObjectHideFlags: 0 @@ -708,11 +713,10 @@ RectTransform: - {fileID: 2578649062778877953} - {fileID: 2578649063749817975} m_Father: {fileID: 2578649064448521969} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -0.00053877506, y: -0.00045043931} + m_AnchoredPosition: {x: 0.01523512, y: 0.023565155} m_SizeDelta: {x: 0, y: 218.4} m_Pivot: {x: 0, y: 1} --- !u!114 &2578649064017060637 @@ -776,7 +780,6 @@ RectTransform: - {fileID: 830797837766093032} - {fileID: 6550764639418190640} m_Father: {fileID: 2578649064460067242} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -862,7 +865,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2578649064399513024} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} @@ -885,9 +887,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2578649064187649785} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 13, y: 110, z: 10} m_Center: {x: 0, y: 0, z: 0} --- !u!114 &2578649064187649789 @@ -906,6 +916,7 @@ MonoBehaviour: attachedRectTransform: {fileID: 2578649064187649784} padding: {x: 5, y: 5} forceUpdateEveryFrame: 0 + canToggleCollider: 1 --- !u!114 &2578649064187649790 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1026,7 +1037,6 @@ RectTransform: - {fileID: 2578649064187649784} - {fileID: 2356801616050657259} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -1050,7 +1060,9 @@ Canvas: m_OverrideSorting: 0 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 m_AdditionalShaderChannelsFlag: 31 + m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 @@ -1076,7 +1088,7 @@ MonoBehaviour: m_FallbackScreenDPI: 96 m_DefaultSpriteDPI: 96 m_DynamicPixelsPerUnit: 1 - m_PresetInfoIsWorld: 1 + m_PresetInfoIsWorld: 0 --- !u!1 &2578649064448521970 GameObject: m_ObjectHideFlags: 0 @@ -1109,7 +1121,6 @@ RectTransform: m_Children: - {fileID: 2578649064017060638} m_Father: {fileID: 2578649064635381920} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -1175,7 +1186,6 @@ RectTransform: - {fileID: 2578649064106734587} - {fileID: 2578649064635381920} m_Father: {fileID: 3868625797428816970} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -1327,7 +1337,6 @@ RectTransform: m_Children: - {fileID: 2578649064448521969} m_Father: {fileID: 2578649064460067242} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -1423,7 +1432,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2578649063324106453} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -1496,20 +1504,23 @@ MonoBehaviour: m_VerticalAlignment: 256 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -1567,7 +1578,6 @@ RectTransform: - {fileID: 6480191133274044593} - {fileID: 8621070723831474135} m_Father: {fileID: 2578649064399513024} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 37.164, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} @@ -1602,6 +1612,13 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] + m_Texture: {fileID: 0} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 radius: 13 thickness: 2 wedges: 8 @@ -1651,6 +1668,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2356801616050657259} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -1729,10 +1747,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 6 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -1806,6 +1820,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &8621070723831474135 stripped RectTransform: @@ -1817,6 +1834,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2578649063324106453} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -1838,6 +1856,10 @@ PrefabInstance: propertyPath: m_HorizontalAlignment value: 1 objectReference: {fileID: 0} + - target: {fileID: 1922220768106560367, guid: c6b351a67ceb69140b199996bbbea156, type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} - target: {fileID: 2142167140070017856, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive value: 1 @@ -2007,6 +2029,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &7879939008530370534 stripped RectTransform: @@ -2018,6 +2043,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2578649063324106453} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -2038,6 +2064,10 @@ PrefabInstance: propertyPath: m_HorizontalAlignment value: 1 objectReference: {fileID: 0} + - target: {fileID: 1922220768106560367, guid: c6b351a67ceb69140b199996bbbea156, type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} - target: {fileID: 2142167140070017856, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive value: 1 @@ -2207,6 +2237,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &7724392866144474191 stripped RectTransform: @@ -2218,6 +2251,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2578649063324106453} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -2238,6 +2272,10 @@ PrefabInstance: propertyPath: m_HorizontalAlignment value: 1 objectReference: {fileID: 0} + - target: {fileID: 1922220768106560367, guid: c6b351a67ceb69140b199996bbbea156, type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} - target: {fileID: 2142167140070017856, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive value: 1 @@ -2407,6 +2445,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &6090670456024506908 stripped RectTransform: @@ -2418,6 +2459,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2578649063327347123} m_Modifications: - target: {fileID: 546726529016720829, guid: bd4b74f5c5104ae498cb7b5e4a5f2f04, type: 3} @@ -2448,10 +2490,18 @@ PrefabInstance: propertyPath: m_text value: Title objectReference: {fileID: 0} + - target: {fileID: 2745264576801878700, guid: bd4b74f5c5104ae498cb7b5e4a5f2f04, type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} - target: {fileID: 3147945552207970304, guid: bd4b74f5c5104ae498cb7b5e4a5f2f04, type: 3} propertyPath: m_text value: Lorem ipsum objectReference: {fileID: 0} + - target: {fileID: 3147945552207970304, guid: bd4b74f5c5104ae498cb7b5e4a5f2f04, type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} - target: {fileID: 3664738976956874277, guid: bd4b74f5c5104ae498cb7b5e4a5f2f04, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -2496,6 +2546,10 @@ PrefabInstance: propertyPath: m_text value: Lorem ipsum objectReference: {fileID: 0} + - target: {fileID: 4768141262871555261, guid: bd4b74f5c5104ae498cb7b5e4a5f2f04, type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} - target: {fileID: 7647534073772950212, guid: bd4b74f5c5104ae498cb7b5e4a5f2f04, type: 3} propertyPath: m_MinWidth value: -1 @@ -2614,11 +2668,11 @@ PrefabInstance: objectReference: {fileID: 6776978392589374209} - target: {fileID: 9062819528647497191, guid: bd4b74f5c5104ae498cb7b5e4a5f2f04, type: 3} propertyPath: m_Size.x - value: 80.64217 + value: 52.905224 objectReference: {fileID: 0} - target: {fileID: 9062819528647497191, guid: bd4b74f5c5104ae498cb7b5e4a5f2f04, type: 3} propertyPath: m_Size.y - value: 47.016113 + value: 8.91153 objectReference: {fileID: 0} - target: {fileID: 9062819528647497191, guid: bd4b74f5c5104ae498cb7b5e4a5f2f04, type: 3} propertyPath: m_Enabled @@ -2630,7 +2684,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 9062819528647497191, guid: bd4b74f5c5104ae498cb7b5e4a5f2f04, type: 3} propertyPath: m_Center.y - value: 4.2419434 + value: 23.294235 objectReference: {fileID: 0} - target: {fileID: 9062819528647497213, guid: bd4b74f5c5104ae498cb7b5e4a5f2f04, type: 3} propertyPath: m_Name @@ -2638,6 +2692,9 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: - {fileID: 7647534073772950212, guid: bd4b74f5c5104ae498cb7b5e4a5f2f04, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: bd4b74f5c5104ae498cb7b5e4a5f2f04, type: 3} --- !u!224 &6776978392589374209 stripped RectTransform: @@ -2649,6 +2706,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2578649064017060638} m_Modifications: - target: {fileID: 546726529016720829, guid: bd4b74f5c5104ae498cb7b5e4a5f2f04, type: 3} @@ -2679,10 +2737,18 @@ PrefabInstance: propertyPath: m_text value: Main header text objectReference: {fileID: 0} + - target: {fileID: 2745264576801878700, guid: bd4b74f5c5104ae498cb7b5e4a5f2f04, type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} - target: {fileID: 3147945552207970304, guid: bd4b74f5c5104ae498cb7b5e4a5f2f04, type: 3} propertyPath: m_text value: Secondary text two objectReference: {fileID: 0} + - target: {fileID: 3147945552207970304, guid: bd4b74f5c5104ae498cb7b5e4a5f2f04, type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} - target: {fileID: 3664738976956874277, guid: bd4b74f5c5104ae498cb7b5e4a5f2f04, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -2727,6 +2793,10 @@ PrefabInstance: propertyPath: m_text value: Secondary text one objectReference: {fileID: 0} + - target: {fileID: 4768141262871555261, guid: bd4b74f5c5104ae498cb7b5e4a5f2f04, type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} - target: {fileID: 7818897570117504404, guid: bd4b74f5c5104ae498cb7b5e4a5f2f04, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -2851,11 +2921,18 @@ PrefabInstance: propertyPath: m_Center.x value: 0 objectReference: {fileID: 0} + - target: {fileID: 9062819528647497191, guid: bd4b74f5c5104ae498cb7b5e4a5f2f04, type: 3} + propertyPath: m_Center.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 9062819528647497213, guid: bd4b74f5c5104ae498cb7b5e4a5f2f04, type: 3} propertyPath: m_Name value: HeroButton objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: bd4b74f5c5104ae498cb7b5e4a5f2f04, type: 3} --- !u!224 &6776978392855206655 stripped RectTransform: @@ -2867,6 +2944,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2578649063139551432} m_Modifications: - target: {fileID: 952967652988581951, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -3066,6 +3144,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &6338500039190568485 stripped RectTransform: @@ -3077,6 +3158,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2578649063327347123} m_Modifications: - target: {fileID: 546726529016720829, guid: bd4b74f5c5104ae498cb7b5e4a5f2f04, type: 3} @@ -3107,10 +3189,18 @@ PrefabInstance: propertyPath: m_text value: Title objectReference: {fileID: 0} + - target: {fileID: 2745264576801878700, guid: bd4b74f5c5104ae498cb7b5e4a5f2f04, type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} - target: {fileID: 3147945552207970304, guid: bd4b74f5c5104ae498cb7b5e4a5f2f04, type: 3} propertyPath: m_text value: Lorem ipsum objectReference: {fileID: 0} + - target: {fileID: 3147945552207970304, guid: bd4b74f5c5104ae498cb7b5e4a5f2f04, type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} - target: {fileID: 3664738976956874277, guid: bd4b74f5c5104ae498cb7b5e4a5f2f04, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -3155,6 +3245,10 @@ PrefabInstance: propertyPath: m_text value: Lorem ipsum objectReference: {fileID: 0} + - target: {fileID: 4768141262871555261, guid: bd4b74f5c5104ae498cb7b5e4a5f2f04, type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} - target: {fileID: 7647534073772950212, guid: bd4b74f5c5104ae498cb7b5e4a5f2f04, type: 3} propertyPath: m_MinWidth value: -1 @@ -3273,11 +3367,11 @@ PrefabInstance: objectReference: {fileID: 6776978392769446707} - target: {fileID: 9062819528647497191, guid: bd4b74f5c5104ae498cb7b5e4a5f2f04, type: 3} propertyPath: m_Size.x - value: 80.64217 + value: 52.905224 objectReference: {fileID: 0} - target: {fileID: 9062819528647497191, guid: bd4b74f5c5104ae498cb7b5e4a5f2f04, type: 3} propertyPath: m_Size.y - value: 47.016113 + value: 8.91153 objectReference: {fileID: 0} - target: {fileID: 9062819528647497191, guid: bd4b74f5c5104ae498cb7b5e4a5f2f04, type: 3} propertyPath: m_Enabled @@ -3285,7 +3379,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 9062819528647497191, guid: bd4b74f5c5104ae498cb7b5e4a5f2f04, type: 3} propertyPath: m_Center.y - value: 4.2419434 + value: 23.294235 objectReference: {fileID: 0} - target: {fileID: 9062819528647497213, guid: bd4b74f5c5104ae498cb7b5e4a5f2f04, type: 3} propertyPath: m_Name @@ -3293,6 +3387,9 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: - {fileID: 7647534073772950212, guid: bd4b74f5c5104ae498cb7b5e4a5f2f04, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: bd4b74f5c5104ae498cb7b5e4a5f2f04, type: 3} --- !u!224 &6776978392769446707 stripped RectTransform: @@ -3304,6 +3401,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2578649064106734587} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -3314,6 +3412,10 @@ PrefabInstance: propertyPath: m_text value: Tab objectReference: {fileID: 0} + - target: {fileID: 1922220768106560367, guid: c6b351a67ceb69140b199996bbbea156, type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} - target: {fileID: 2044856827291504467, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive value: 1 @@ -3567,6 +3669,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &6338500039098004376 stripped RectTransform: @@ -3578,6 +3683,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2578649063139551432} m_Modifications: - target: {fileID: 952967652988581951, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -3793,6 +3899,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &6338500039060582460 stripped RectTransform: @@ -3804,6 +3913,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2578649063139551432} m_Modifications: - target: {fileID: 952967652988581951, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -4019,6 +4129,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &6338500038249281931 stripped RectTransform: @@ -4030,6 +4143,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2578649064399513024} m_Modifications: - target: {fileID: 1619375032725711555, guid: 9d54fefbfd15f194cbaf3beeff5f6d10, type: 3} @@ -4040,10 +4154,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 1619375032725711555, guid: 9d54fefbfd15f194cbaf3beeff5f6d10, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - target: {fileID: 1619375032725711555, guid: 9d54fefbfd15f194cbaf3beeff5f6d10, type: 3} propertyPath: m_AnchorMax.x value: 1 @@ -4121,6 +4231,21 @@ PrefabInstance: value: DashboardPlate objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 1619375032725711555, guid: 9d54fefbfd15f194cbaf3beeff5f6d10, type: 3} + insertIndex: -1 + addedObject: {fileID: 2578649063139551432} + - targetCorrespondingSourceObject: {fileID: 1619375032725711555, guid: 9d54fefbfd15f194cbaf3beeff5f6d10, type: 3} + insertIndex: -1 + addedObject: {fileID: 2578649064460067242} + - targetCorrespondingSourceObject: {fileID: 1619375032725711555, guid: 9d54fefbfd15f194cbaf3beeff5f6d10, type: 3} + insertIndex: -1 + addedObject: {fileID: 2578649063324106453} + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 8510261678218358358, guid: 9d54fefbfd15f194cbaf3beeff5f6d10, type: 3} + insertIndex: -1 + addedObject: {fileID: 2578649064184072539} m_SourcePrefab: {fileID: 100100000, guid: 9d54fefbfd15f194cbaf3beeff5f6d10, type: 3} --- !u!224 &3868625797428816970 stripped RectTransform: @@ -4163,6 +4288,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2578649063327347123} m_Modifications: - target: {fileID: 546726529016720829, guid: bd4b74f5c5104ae498cb7b5e4a5f2f04, type: 3} @@ -4193,10 +4319,18 @@ PrefabInstance: propertyPath: m_text value: Title objectReference: {fileID: 0} + - target: {fileID: 2745264576801878700, guid: bd4b74f5c5104ae498cb7b5e4a5f2f04, type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} - target: {fileID: 3147945552207970304, guid: bd4b74f5c5104ae498cb7b5e4a5f2f04, type: 3} propertyPath: m_text value: Lorem ipsum objectReference: {fileID: 0} + - target: {fileID: 3147945552207970304, guid: bd4b74f5c5104ae498cb7b5e4a5f2f04, type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} - target: {fileID: 3664738976956874277, guid: bd4b74f5c5104ae498cb7b5e4a5f2f04, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -4241,6 +4375,10 @@ PrefabInstance: propertyPath: m_text value: Lorem ipsum objectReference: {fileID: 0} + - target: {fileID: 4768141262871555261, guid: bd4b74f5c5104ae498cb7b5e4a5f2f04, type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} - target: {fileID: 7647534073772950212, guid: bd4b74f5c5104ae498cb7b5e4a5f2f04, type: 3} propertyPath: m_MinWidth value: -1 @@ -4359,11 +4497,11 @@ PrefabInstance: objectReference: {fileID: 6776978393435224395} - target: {fileID: 9062819528647497191, guid: bd4b74f5c5104ae498cb7b5e4a5f2f04, type: 3} propertyPath: m_Size.x - value: 80.64167 + value: 52.905224 objectReference: {fileID: 0} - target: {fileID: 9062819528647497191, guid: bd4b74f5c5104ae498cb7b5e4a5f2f04, type: 3} propertyPath: m_Size.y - value: 47.016113 + value: 8.91153 objectReference: {fileID: 0} - target: {fileID: 9062819528647497191, guid: bd4b74f5c5104ae498cb7b5e4a5f2f04, type: 3} propertyPath: m_Enabled @@ -4371,11 +4509,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 9062819528647497191, guid: bd4b74f5c5104ae498cb7b5e4a5f2f04, type: 3} propertyPath: m_Center.x - value: 0.00025177002 + value: 0 objectReference: {fileID: 0} - target: {fileID: 9062819528647497191, guid: bd4b74f5c5104ae498cb7b5e4a5f2f04, type: 3} propertyPath: m_Center.y - value: 4.2419434 + value: 23.294235 objectReference: {fileID: 0} - target: {fileID: 9062819528647497213, guid: bd4b74f5c5104ae498cb7b5e4a5f2f04, type: 3} propertyPath: m_Name @@ -4383,6 +4521,9 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: - {fileID: 7647534073772950212, guid: bd4b74f5c5104ae498cb7b5e4a5f2f04, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: bd4b74f5c5104ae498cb7b5e4a5f2f04, type: 3} --- !u!224 &6776978393435224395 stripped RectTransform: @@ -4394,6 +4535,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2578649063139551432} m_Modifications: - target: {fileID: 952967652988581951, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -4609,6 +4751,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &6338500037595202671 stripped RectTransform: @@ -4620,6 +4765,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2578649063324106453} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -4641,6 +4787,10 @@ PrefabInstance: propertyPath: m_HorizontalAlignment value: 1 objectReference: {fileID: 0} + - target: {fileID: 1922220768106560367, guid: c6b351a67ceb69140b199996bbbea156, type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} - target: {fileID: 2142167140070017856, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive value: 1 @@ -4810,6 +4960,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &6351079148266003887 stripped RectTransform: @@ -4821,6 +4974,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2578649064106734587} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -4831,6 +4985,10 @@ PrefabInstance: propertyPath: m_text value: Tab objectReference: {fileID: 0} + - target: {fileID: 1922220768106560367, guid: c6b351a67ceb69140b199996bbbea156, type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} - target: {fileID: 2044856827291504467, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive value: 1 @@ -5092,6 +5250,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &6550764639418190640 stripped RectTransform: @@ -5103,6 +5264,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2578649063324106453} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -5124,6 +5286,10 @@ PrefabInstance: propertyPath: m_HorizontalAlignment value: 1 objectReference: {fileID: 0} + - target: {fileID: 1922220768106560367, guid: c6b351a67ceb69140b199996bbbea156, type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} - target: {fileID: 2142167140070017856, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive value: 1 @@ -5293,6 +5459,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &6576362801864956305 stripped RectTransform: @@ -5304,16 +5473,13 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2356801616050657259} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} - - target: {fileID: 952967652988581951, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_text - value: "\uF2F6" - objectReference: {fileID: 0} - target: {fileID: 2142167140070017856, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive value: 0 @@ -5394,10 +5560,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 3 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -5471,6 +5633,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &4127110153585389256 stripped RectTransform: @@ -5482,16 +5647,13 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2356801616050657259} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} - - target: {fileID: 952967652988581951, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_text - value: "\uF35A" - objectReference: {fileID: 0} - target: {fileID: 2142167140070017856, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive value: 0 @@ -5572,10 +5734,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -5649,6 +5807,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &3124354410494147608 stripped RectTransform: @@ -5660,6 +5821,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2578649064106734587} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -5670,6 +5832,10 @@ PrefabInstance: propertyPath: m_text value: Tab objectReference: {fileID: 0} + - target: {fileID: 1922220768106560367, guid: c6b351a67ceb69140b199996bbbea156, type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} - target: {fileID: 2044856827291504467, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive value: 1 @@ -5931,6 +6097,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &1266614207299526433 stripped RectTransform: @@ -5942,16 +6111,13 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2356801616050657259} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} - - target: {fileID: 952967652988581951, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_text - value: "\uF4A8" - objectReference: {fileID: 0} - target: {fileID: 2142167140070017856, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive value: 0 @@ -6032,10 +6198,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -6109,6 +6271,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &1389753798734922626 stripped RectTransform: @@ -6120,16 +6285,13 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2356801616050657259} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} - - target: {fileID: 952967652988581951, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_text - value: "\uF56C" - objectReference: {fileID: 0} - target: {fileID: 2142167140070017856, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive value: 0 @@ -6210,10 +6372,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -6287,6 +6445,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &1736624830057851760 stripped RectTransform: @@ -6298,16 +6459,13 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2356801616050657259} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} - - target: {fileID: 952967652988581951, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_text - value: "\uF169" - objectReference: {fileID: 0} - target: {fileID: 2142167140070017856, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive value: 0 @@ -6388,10 +6546,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 4 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -6465,6 +6619,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &980537988443892781 stripped RectTransform: @@ -6476,6 +6633,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2578649064106734587} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -6486,6 +6644,10 @@ PrefabInstance: propertyPath: m_text value: Tab objectReference: {fileID: 0} + - target: {fileID: 1922220768106560367, guid: c6b351a67ceb69140b199996bbbea156, type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} - target: {fileID: 2044856827291504467, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive value: 1 @@ -6747,6 +6909,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &830797837766093032 stripped RectTransform: diff --git a/UnityProjects/MRTKDevTemplate/Assets/Prefabs/EventSystem.prefab b/UnityProjects/MRTKDevTemplate/Assets/Prefabs/EventSystem.prefab index c7a7dcdaa..83b3d9921 100644 --- a/UnityProjects/MRTKDevTemplate/Assets/Prefabs/EventSystem.prefab +++ b/UnityProjects/MRTKDevTemplate/Assets/Prefabs/EventSystem.prefab @@ -25,13 +25,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5905304275062509471} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &5905304275062509469 MonoBehaviour: @@ -66,8 +66,9 @@ MonoBehaviour: m_RepeatDelay: 0.5 m_RepeatRate: 0.1 m_TrackedDeviceDragThresholdMultiplier: 1.4 + m_TrackedScrollDeltaMultiplier: 5 + m_BypassUIToolkitEvents: 0 m_ActiveInputMode: 0 - m_MaxTrackedDeviceRaycastDistance: 1000 m_EnableXRInput: 1 m_EnableMouseInput: 1 m_EnableTouchInput: 1 diff --git a/UnityProjects/MRTKDevTemplate/Assets/Prefabs/Experimental/CanvasExampleSimpleActionButton/MenuExampleSimpleActionButton.prefab b/UnityProjects/MRTKDevTemplate/Assets/Prefabs/Experimental/CanvasExampleSimpleActionButton/MenuExampleSimpleActionButton.prefab index 24f7e2a01..12c32fc8d 100644 --- a/UnityProjects/MRTKDevTemplate/Assets/Prefabs/Experimental/CanvasExampleSimpleActionButton/MenuExampleSimpleActionButton.prefab +++ b/UnityProjects/MRTKDevTemplate/Assets/Prefabs/Experimental/CanvasExampleSimpleActionButton/MenuExampleSimpleActionButton.prefab @@ -38,7 +38,6 @@ RectTransform: - {fileID: 8772383183310666376} - {fileID: 8772383181666526701} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -73,6 +72,13 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] + m_Texture: {fileID: 0} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 radius: 12 thickness: 2 wedges: 8 @@ -152,7 +158,6 @@ RectTransform: - {fileID: 4691149524986514612} - {fileID: 5288391855603297685} m_Father: {fileID: 8772383182092832675} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -235,7 +240,6 @@ RectTransform: - {fileID: 4726987540173500813} - {fileID: 2203565178339471068} m_Father: {fileID: 8053818244378328212} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -294,7 +298,6 @@ RectTransform: - {fileID: 9011640672616098289} - {fileID: 3053316400678557996} m_Father: {fileID: 8053818244378328212} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -361,7 +364,6 @@ RectTransform: - {fileID: 4394837425650018189} - {fileID: 5579691886790033606} m_Father: {fileID: 8053818244378328212} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -422,7 +424,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8053818244378328212} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -479,7 +480,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8053818244378328212} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -511,6 +511,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 8772383181666526701} m_Modifications: - target: {fileID: 2211332204183893664, guid: a2b07dcaa4b2f8e4fa68b319f1477f4c, type: 3} @@ -521,10 +522,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 2211332204183893664, guid: a2b07dcaa4b2f8e4fa68b319f1477f4c, type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - target: {fileID: 2211332204183893664, guid: a2b07dcaa4b2f8e4fa68b319f1477f4c, type: 3} propertyPath: m_AnchorMax.x value: 1 @@ -606,6 +603,9 @@ PrefabInstance: value: SimpleActionButton objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a2b07dcaa4b2f8e4fa68b319f1477f4c, type: 3} --- !u!224 &2203565178339471068 stripped RectTransform: @@ -617,6 +617,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 8772383182754392671} m_Modifications: - target: {fileID: 2211332204183893664, guid: a2b07dcaa4b2f8e4fa68b319f1477f4c, type: 3} @@ -627,10 +628,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 2211332204183893664, guid: a2b07dcaa4b2f8e4fa68b319f1477f4c, type: 3} - propertyPath: m_RootOrder - value: 6 - objectReference: {fileID: 0} - target: {fileID: 2211332204183893664, guid: a2b07dcaa4b2f8e4fa68b319f1477f4c, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -716,6 +713,9 @@ PrefabInstance: value: SimpleActionButton objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a2b07dcaa4b2f8e4fa68b319f1477f4c, type: 3} --- !u!224 &1374461679994594210 stripped RectTransform: @@ -727,6 +727,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 9011640672616098289} m_Modifications: - target: {fileID: 506625025428579473, guid: a2b07dcaa4b2f8e4fa68b319f1477f4c, type: 3} @@ -745,17 +746,13 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 2211332204183893664, guid: a2b07dcaa4b2f8e4fa68b319f1477f4c, type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - target: {fileID: 2211332204183893664, guid: a2b07dcaa4b2f8e4fa68b319f1477f4c, type: 3} propertyPath: m_AnchorMax.x value: 0 objectReference: {fileID: 0} - target: {fileID: 2211332204183893664, guid: a2b07dcaa4b2f8e4fa68b319f1477f4c, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2211332204183893664, guid: a2b07dcaa4b2f8e4fa68b319f1477f4c, type: 3} propertyPath: m_AnchorMin.x @@ -763,7 +760,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2211332204183893664, guid: a2b07dcaa4b2f8e4fa68b319f1477f4c, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2211332204183893664, guid: a2b07dcaa4b2f8e4fa68b319f1477f4c, type: 3} propertyPath: m_SizeDelta.x @@ -803,11 +800,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2211332204183893664, guid: a2b07dcaa4b2f8e4fa68b319f1477f4c, type: 3} propertyPath: m_AnchoredPosition.x - value: 52 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2211332204183893664, guid: a2b07dcaa4b2f8e4fa68b319f1477f4c, type: 3} propertyPath: m_AnchoredPosition.y - value: -16 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2211332204183893664, guid: a2b07dcaa4b2f8e4fa68b319f1477f4c, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -826,6 +823,9 @@ PrefabInstance: value: SimpleActionButton objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a2b07dcaa4b2f8e4fa68b319f1477f4c, type: 3} --- !u!224 &209245566481228407 stripped RectTransform: @@ -837,6 +837,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 8772383182754392671} m_Modifications: - target: {fileID: 2211332204183893664, guid: a2b07dcaa4b2f8e4fa68b319f1477f4c, type: 3} @@ -847,10 +848,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 2211332204183893664, guid: a2b07dcaa4b2f8e4fa68b319f1477f4c, type: 3} - propertyPath: m_RootOrder - value: 8 - objectReference: {fileID: 0} - target: {fileID: 2211332204183893664, guid: a2b07dcaa4b2f8e4fa68b319f1477f4c, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -936,6 +933,9 @@ PrefabInstance: value: SimpleActionButton objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a2b07dcaa4b2f8e4fa68b319f1477f4c, type: 3} --- !u!224 &4394837425650018189 stripped RectTransform: @@ -947,6 +947,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 8772383182754392671} m_Modifications: - target: {fileID: 2211332204183893664, guid: a2b07dcaa4b2f8e4fa68b319f1477f4c, type: 3} @@ -957,10 +958,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 2211332204183893664, guid: a2b07dcaa4b2f8e4fa68b319f1477f4c, type: 3} - propertyPath: m_RootOrder - value: 4 - objectReference: {fileID: 0} - target: {fileID: 2211332204183893664, guid: a2b07dcaa4b2f8e4fa68b319f1477f4c, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -1046,6 +1043,9 @@ PrefabInstance: value: SimpleActionButton objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a2b07dcaa4b2f8e4fa68b319f1477f4c, type: 3} --- !u!224 &3237369830788530448 stripped RectTransform: @@ -1057,6 +1057,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 8772383182092832675} m_Modifications: - target: {fileID: 2211332204183893664, guid: a2b07dcaa4b2f8e4fa68b319f1477f4c, type: 3} @@ -1067,10 +1068,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 1 objectReference: {fileID: 0} - - target: {fileID: 2211332204183893664, guid: a2b07dcaa4b2f8e4fa68b319f1477f4c, type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - target: {fileID: 2211332204183893664, guid: a2b07dcaa4b2f8e4fa68b319f1477f4c, type: 3} propertyPath: m_AnchorMax.x value: 1 @@ -1156,6 +1153,9 @@ PrefabInstance: value: SimpleActionButton objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a2b07dcaa4b2f8e4fa68b319f1477f4c, type: 3} --- !u!224 &3053316400678557996 stripped RectTransform: @@ -1167,6 +1167,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 8772383182754392671} m_Modifications: - target: {fileID: 2211332204183893664, guid: a2b07dcaa4b2f8e4fa68b319f1477f4c, type: 3} @@ -1177,10 +1178,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 2211332204183893664, guid: a2b07dcaa4b2f8e4fa68b319f1477f4c, type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - target: {fileID: 2211332204183893664, guid: a2b07dcaa4b2f8e4fa68b319f1477f4c, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -1266,6 +1263,9 @@ PrefabInstance: value: SimpleActionButton objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a2b07dcaa4b2f8e4fa68b319f1477f4c, type: 3} --- !u!224 &2866179203337519585 stripped RectTransform: @@ -1277,6 +1277,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 8772383182754392671} m_Modifications: - target: {fileID: 2211332204183893664, guid: a2b07dcaa4b2f8e4fa68b319f1477f4c, type: 3} @@ -1287,10 +1288,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 2211332204183893664, guid: a2b07dcaa4b2f8e4fa68b319f1477f4c, type: 3} - propertyPath: m_RootOrder - value: 5 - objectReference: {fileID: 0} - target: {fileID: 2211332204183893664, guid: a2b07dcaa4b2f8e4fa68b319f1477f4c, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -1376,6 +1373,9 @@ PrefabInstance: value: SimpleActionButton objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a2b07dcaa4b2f8e4fa68b319f1477f4c, type: 3} --- !u!224 &6215348342192696300 stripped RectTransform: @@ -1387,6 +1387,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 8772383182754392671} m_Modifications: - target: {fileID: 2211332204183893664, guid: a2b07dcaa4b2f8e4fa68b319f1477f4c, type: 3} @@ -1397,10 +1398,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 2211332204183893664, guid: a2b07dcaa4b2f8e4fa68b319f1477f4c, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - target: {fileID: 2211332204183893664, guid: a2b07dcaa4b2f8e4fa68b319f1477f4c, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -1486,6 +1483,9 @@ PrefabInstance: value: SimpleActionButton objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a2b07dcaa4b2f8e4fa68b319f1477f4c, type: 3} --- !u!224 &5811041175276373658 stripped RectTransform: @@ -1497,6 +1497,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 9011640672616098289} m_Modifications: - target: {fileID: 506625025428579473, guid: a2b07dcaa4b2f8e4fa68b319f1477f4c, type: 3} @@ -1515,17 +1516,13 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 2211332204183893664, guid: a2b07dcaa4b2f8e4fa68b319f1477f4c, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - target: {fileID: 2211332204183893664, guid: a2b07dcaa4b2f8e4fa68b319f1477f4c, type: 3} propertyPath: m_AnchorMax.x value: 0 objectReference: {fileID: 0} - target: {fileID: 2211332204183893664, guid: a2b07dcaa4b2f8e4fa68b319f1477f4c, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2211332204183893664, guid: a2b07dcaa4b2f8e4fa68b319f1477f4c, type: 3} propertyPath: m_AnchorMin.x @@ -1533,7 +1530,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2211332204183893664, guid: a2b07dcaa4b2f8e4fa68b319f1477f4c, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2211332204183893664, guid: a2b07dcaa4b2f8e4fa68b319f1477f4c, type: 3} propertyPath: m_SizeDelta.x @@ -1573,11 +1570,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2211332204183893664, guid: a2b07dcaa4b2f8e4fa68b319f1477f4c, type: 3} propertyPath: m_AnchoredPosition.x - value: 20 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2211332204183893664, guid: a2b07dcaa4b2f8e4fa68b319f1477f4c, type: 3} propertyPath: m_AnchoredPosition.y - value: -16 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2211332204183893664, guid: a2b07dcaa4b2f8e4fa68b319f1477f4c, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -1596,6 +1593,9 @@ PrefabInstance: value: SimpleActionButton objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a2b07dcaa4b2f8e4fa68b319f1477f4c, type: 3} --- !u!224 &5781719418039964675 stripped RectTransform: @@ -1607,6 +1607,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 8772383182754392671} m_Modifications: - target: {fileID: 2211332204183893664, guid: a2b07dcaa4b2f8e4fa68b319f1477f4c, type: 3} @@ -1617,10 +1618,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 2211332204183893664, guid: a2b07dcaa4b2f8e4fa68b319f1477f4c, type: 3} - propertyPath: m_RootOrder - value: 9 - objectReference: {fileID: 0} - target: {fileID: 2211332204183893664, guid: a2b07dcaa4b2f8e4fa68b319f1477f4c, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -1706,6 +1703,9 @@ PrefabInstance: value: SimpleActionButton objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a2b07dcaa4b2f8e4fa68b319f1477f4c, type: 3} --- !u!224 &5579691886790033606 stripped RectTransform: @@ -1717,6 +1717,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 8772383182754392671} m_Modifications: - target: {fileID: 2211332204183893664, guid: a2b07dcaa4b2f8e4fa68b319f1477f4c, type: 3} @@ -1727,10 +1728,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 2211332204183893664, guid: a2b07dcaa4b2f8e4fa68b319f1477f4c, type: 3} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - target: {fileID: 2211332204183893664, guid: a2b07dcaa4b2f8e4fa68b319f1477f4c, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -1816,6 +1813,9 @@ PrefabInstance: value: SimpleActionButton objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a2b07dcaa4b2f8e4fa68b319f1477f4c, type: 3} --- !u!224 &5349970067465533917 stripped RectTransform: @@ -1827,6 +1827,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 9011640672616098289} m_Modifications: - target: {fileID: 506625025428579473, guid: a2b07dcaa4b2f8e4fa68b319f1477f4c, type: 3} @@ -1845,17 +1846,13 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 2211332204183893664, guid: a2b07dcaa4b2f8e4fa68b319f1477f4c, type: 3} - propertyPath: m_RootOrder - value: 3 - objectReference: {fileID: 0} - target: {fileID: 2211332204183893664, guid: a2b07dcaa4b2f8e4fa68b319f1477f4c, type: 3} propertyPath: m_AnchorMax.x value: 0 objectReference: {fileID: 0} - target: {fileID: 2211332204183893664, guid: a2b07dcaa4b2f8e4fa68b319f1477f4c, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2211332204183893664, guid: a2b07dcaa4b2f8e4fa68b319f1477f4c, type: 3} propertyPath: m_AnchorMin.x @@ -1863,7 +1860,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2211332204183893664, guid: a2b07dcaa4b2f8e4fa68b319f1477f4c, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2211332204183893664, guid: a2b07dcaa4b2f8e4fa68b319f1477f4c, type: 3} propertyPath: m_SizeDelta.x @@ -1903,11 +1900,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2211332204183893664, guid: a2b07dcaa4b2f8e4fa68b319f1477f4c, type: 3} propertyPath: m_AnchoredPosition.x - value: 116 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2211332204183893664, guid: a2b07dcaa4b2f8e4fa68b319f1477f4c, type: 3} propertyPath: m_AnchoredPosition.y - value: -16 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2211332204183893664, guid: a2b07dcaa4b2f8e4fa68b319f1477f4c, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -1926,6 +1923,9 @@ PrefabInstance: value: SimpleActionButton objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a2b07dcaa4b2f8e4fa68b319f1477f4c, type: 3} --- !u!224 &5288391855603297685 stripped RectTransform: @@ -1937,6 +1937,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 8772383182754392671} m_Modifications: - target: {fileID: 2211332204183893664, guid: a2b07dcaa4b2f8e4fa68b319f1477f4c, type: 3} @@ -1947,10 +1948,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 2211332204183893664, guid: a2b07dcaa4b2f8e4fa68b319f1477f4c, type: 3} - propertyPath: m_RootOrder - value: 3 - objectReference: {fileID: 0} - target: {fileID: 2211332204183893664, guid: a2b07dcaa4b2f8e4fa68b319f1477f4c, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -2036,6 +2033,9 @@ PrefabInstance: value: SimpleActionButton objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a2b07dcaa4b2f8e4fa68b319f1477f4c, type: 3} --- !u!224 &4963777961876444922 stripped RectTransform: @@ -2047,6 +2047,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 8772383182754392671} m_Modifications: - target: {fileID: 2211332204183893664, guid: a2b07dcaa4b2f8e4fa68b319f1477f4c, type: 3} @@ -2057,10 +2058,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 2211332204183893664, guid: a2b07dcaa4b2f8e4fa68b319f1477f4c, type: 3} - propertyPath: m_RootOrder - value: 7 - objectReference: {fileID: 0} - target: {fileID: 2211332204183893664, guid: a2b07dcaa4b2f8e4fa68b319f1477f4c, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -2146,6 +2143,9 @@ PrefabInstance: value: SimpleActionButton objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a2b07dcaa4b2f8e4fa68b319f1477f4c, type: 3} --- !u!224 &4988331008166874853 stripped RectTransform: @@ -2157,6 +2157,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 8772383181666526701} m_Modifications: - target: {fileID: 2211332204183893664, guid: a2b07dcaa4b2f8e4fa68b319f1477f4c, type: 3} @@ -2167,10 +2168,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 2211332204183893664, guid: a2b07dcaa4b2f8e4fa68b319f1477f4c, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - target: {fileID: 2211332204183893664, guid: a2b07dcaa4b2f8e4fa68b319f1477f4c, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -2248,6 +2245,9 @@ PrefabInstance: value: SimpleActionButton objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a2b07dcaa4b2f8e4fa68b319f1477f4c, type: 3} --- !u!224 &4726987540173500813 stripped RectTransform: @@ -2259,6 +2259,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 9011640672616098289} m_Modifications: - target: {fileID: 506625025428579473, guid: a2b07dcaa4b2f8e4fa68b319f1477f4c, type: 3} @@ -2277,17 +2278,13 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 2211332204183893664, guid: a2b07dcaa4b2f8e4fa68b319f1477f4c, type: 3} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - target: {fileID: 2211332204183893664, guid: a2b07dcaa4b2f8e4fa68b319f1477f4c, type: 3} propertyPath: m_AnchorMax.x value: 0 objectReference: {fileID: 0} - target: {fileID: 2211332204183893664, guid: a2b07dcaa4b2f8e4fa68b319f1477f4c, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2211332204183893664, guid: a2b07dcaa4b2f8e4fa68b319f1477f4c, type: 3} propertyPath: m_AnchorMin.x @@ -2295,7 +2292,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2211332204183893664, guid: a2b07dcaa4b2f8e4fa68b319f1477f4c, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2211332204183893664, guid: a2b07dcaa4b2f8e4fa68b319f1477f4c, type: 3} propertyPath: m_SizeDelta.x @@ -2335,11 +2332,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2211332204183893664, guid: a2b07dcaa4b2f8e4fa68b319f1477f4c, type: 3} propertyPath: m_AnchoredPosition.x - value: 84 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2211332204183893664, guid: a2b07dcaa4b2f8e4fa68b319f1477f4c, type: 3} propertyPath: m_AnchoredPosition.y - value: -16 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2211332204183893664, guid: a2b07dcaa4b2f8e4fa68b319f1477f4c, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -2358,6 +2355,9 @@ PrefabInstance: value: SimpleActionButton objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a2b07dcaa4b2f8e4fa68b319f1477f4c, type: 3} --- !u!224 &4691149524986514612 stripped RectTransform: diff --git a/UnityProjects/MRTKDevTemplate/Assets/Prefabs/Experimental/CanvasExampleSimpleActionButton/TopNavigationExampleSimpleActionButton.prefab b/UnityProjects/MRTKDevTemplate/Assets/Prefabs/Experimental/CanvasExampleSimpleActionButton/TopNavigationExampleSimpleActionButton.prefab index 4c2e2a6cd..013855b89 100644 --- a/UnityProjects/MRTKDevTemplate/Assets/Prefabs/Experimental/CanvasExampleSimpleActionButton/TopNavigationExampleSimpleActionButton.prefab +++ b/UnityProjects/MRTKDevTemplate/Assets/Prefabs/Experimental/CanvasExampleSimpleActionButton/TopNavigationExampleSimpleActionButton.prefab @@ -33,7 +33,6 @@ RectTransform: - {fileID: 6066126984062364055} - {fileID: 7745809423492399804} m_Father: {fileID: 3272530386015204673} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -97,7 +96,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3272530386015204673} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -174,20 +172,23 @@ MonoBehaviour: m_VerticalAlignment: 256 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 00000000 m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -236,11 +237,10 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3272530386015204673} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 3.5365982} + m_AnchoredPosition: {x: 0, y: 3.5365906} m_SizeDelta: {x: -74.32, y: -22.14} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &271915363107937258 @@ -317,7 +317,6 @@ RectTransform: - {fileID: 4095427113250735758} - {fileID: 3272530386015204673} m_Father: {fileID: 4095427112833100002} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -449,7 +448,6 @@ RectTransform: m_Children: - {fileID: 4095427112466402871} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -484,6 +482,13 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] + m_Texture: {fileID: 0} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 radius: 12 thickness: 2 wedges: 8 @@ -524,7 +529,6 @@ RectTransform: - {fileID: 5542298194999167875} - {fileID: 5542298196129711383} m_Father: {fileID: 4095427112466402871} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -631,7 +635,6 @@ RectTransform: - {fileID: 3076762638259767239} - {fileID: 142364650382704810} m_Father: {fileID: 4095427112466402871} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -689,11 +692,10 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3272530386015204673} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 3.5365982} + m_AnchoredPosition: {x: 0, y: 3.5365906} m_SizeDelta: {x: -87.23, y: -31.55} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5143805549000109219 @@ -739,6 +741,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 142364650382704810} m_Modifications: - target: {fileID: 1922220768106560367, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -825,10 +828,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -902,6 +901,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &7745809423492399804 stripped RectTransform: @@ -913,6 +915,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 142364650382704810} m_Modifications: - target: {fileID: 1922220768106560367, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -999,10 +1002,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -1076,6 +1075,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &6066126984062364055 stripped RectTransform: @@ -1087,6 +1089,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4095427113250735758} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -1117,62 +1120,6 @@ PrefabInstance: propertyPath: m_Padding.m_Right value: 0 objectReference: {fileID: 0} - - target: {fileID: 3705378105823492738, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Name - value: CanvasButton (3) - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492760, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Size.y - value: 22.18 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492762, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: toggleMode - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492762, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: isToggled.active - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_SizeDelta.y - value: 22.18 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalPosition.z - value: 0.000012874603 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3954096648631943191, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchoredPosition.x - value: -0.000011444092 - objectReference: {fileID: 0} - target: {fileID: 4185972052008607584, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Enabled value: 0 @@ -1209,94 +1156,6 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 12 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMax.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMax.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMin.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMin.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_SizeDelta.x - value: 32 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_SizeDelta.y - value: 32 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchoredPosition.x - value: 15.480011 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchoredPosition.y - value: 128 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295668, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Name - value: CanvasSmallButton - objectReference: {fileID: 0} - target: {fileID: 7594107385585372191, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive value: 0 @@ -1317,10 +1176,6 @@ PrefabInstance: propertyPath: k__BackingField value: 2 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -1349,11 +1204,10 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 9026472854072389795, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &5542298196605009403 stripped RectTransform: @@ -1365,6 +1219,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4095427113250735758} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -1395,62 +1250,6 @@ PrefabInstance: propertyPath: m_Padding.m_Right value: 0 objectReference: {fileID: 0} - - target: {fileID: 3705378105823492738, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Name - value: CanvasButton (3) - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492760, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Size.y - value: 22.18 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492762, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: toggleMode - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492762, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: isToggled.active - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_SizeDelta.y - value: 22.18 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalPosition.z - value: 0.000012874603 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3954096648631943191, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchoredPosition.x - value: -0.000011444092 - objectReference: {fileID: 0} - target: {fileID: 4185972052008607584, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Enabled value: 0 @@ -1487,94 +1286,6 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 12 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMax.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMax.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMin.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMin.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_SizeDelta.x - value: 32 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_SizeDelta.y - value: 32 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchoredPosition.x - value: 15.480011 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchoredPosition.y - value: 128 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295668, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Name - value: CanvasSmallButton - objectReference: {fileID: 0} - target: {fileID: 7594107385585372191, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive value: 0 @@ -1595,10 +1306,6 @@ PrefabInstance: propertyPath: k__BackingField value: 2 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 3 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -1627,11 +1334,10 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 9026472854072389795, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &5542298196129711383 stripped RectTransform: @@ -1643,6 +1349,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4095427113250735758} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -1673,62 +1380,6 @@ PrefabInstance: propertyPath: m_Padding.m_Right value: 0 objectReference: {fileID: 0} - - target: {fileID: 3705378105823492738, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Name - value: CanvasButton (3) - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492760, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Size.y - value: 22.18 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492762, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: toggleMode - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492762, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: isToggled.active - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_SizeDelta.y - value: 22.18 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalPosition.z - value: 0.000012874603 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3954096648631943191, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchoredPosition.x - value: -0.000011444092 - objectReference: {fileID: 0} - target: {fileID: 4185972052008607584, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Enabled value: 0 @@ -1765,94 +1416,6 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 12 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMax.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMax.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMin.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMin.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_SizeDelta.x - value: 32 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_SizeDelta.y - value: 32 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchoredPosition.x - value: 15.480011 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchoredPosition.y - value: 128 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295668, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Name - value: CanvasSmallButton - objectReference: {fileID: 0} - target: {fileID: 7594107385585372191, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive value: 0 @@ -1873,10 +1436,6 @@ PrefabInstance: propertyPath: k__BackingField value: 2 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -1905,11 +1464,10 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 9026472854072389795, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &5542298196073234626 stripped RectTransform: @@ -1921,6 +1479,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4095427113250735758} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -1951,62 +1510,6 @@ PrefabInstance: propertyPath: m_Padding.m_Right value: 0 objectReference: {fileID: 0} - - target: {fileID: 3705378105823492738, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Name - value: CanvasButton (3) - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492760, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Size.y - value: 22.18 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492762, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: toggleMode - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492762, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: isToggled.active - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_SizeDelta.y - value: 22.18 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalPosition.z - value: 0.000012874603 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3954096648631943191, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchoredPosition.x - value: -0.000011444092 - objectReference: {fileID: 0} - target: {fileID: 4185972052008607584, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Enabled value: 0 @@ -2043,94 +1546,6 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 12 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMax.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMax.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMin.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchorMin.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_SizeDelta.x - value: 32 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_SizeDelta.y - value: 32 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchoredPosition.x - value: 15.480011 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_AnchoredPosition.y - value: 128 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295659, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5973294913672295668, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_Name - value: CanvasSmallButton - objectReference: {fileID: 0} - target: {fileID: 7594107385585372191, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive value: 0 @@ -2151,10 +1566,6 @@ PrefabInstance: propertyPath: k__BackingField value: 2 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -2183,11 +1594,10 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 9026472854072389795, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &5542298194999167875 stripped RectTransform: @@ -2199,6 +1609,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 142364650382704810} m_Modifications: - target: {fileID: 1922220768106560367, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -2285,10 +1696,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -2362,6 +1769,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &3462716897866756475 stripped RectTransform: diff --git a/UnityProjects/MRTKDevTemplate/Assets/Prefabs/Experimental/CanvasExampleSimpleActionButton/UIPanelExampleSimpleActionButton.prefab b/UnityProjects/MRTKDevTemplate/Assets/Prefabs/Experimental/CanvasExampleSimpleActionButton/UIPanelExampleSimpleActionButton.prefab index 2295692bb..cc3b8f416 100644 --- a/UnityProjects/MRTKDevTemplate/Assets/Prefabs/Experimental/CanvasExampleSimpleActionButton/UIPanelExampleSimpleActionButton.prefab +++ b/UnityProjects/MRTKDevTemplate/Assets/Prefabs/Experimental/CanvasExampleSimpleActionButton/UIPanelExampleSimpleActionButton.prefab @@ -29,7 +29,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2356801616050657259} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -67,7 +66,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2578649064017060638} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -140,20 +138,23 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -205,7 +206,6 @@ RectTransform: - {fileID: 6338500038249281931} - {fileID: 6338500037595202671} m_Father: {fileID: 3868625797428816970} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -278,7 +278,6 @@ RectTransform: - {fileID: 6351079148266003887} - {fileID: 7879939008530370534} m_Father: {fileID: 3868625797428816970} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -414,7 +413,6 @@ RectTransform: - {fileID: 6776978392769446707} - {fileID: 6776978392589374209} m_Father: {fileID: 2578649063749817975} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -478,7 +476,6 @@ RectTransform: m_Children: - {fileID: 2578649063327347123} m_Father: {fileID: 2578649064017060638} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -546,7 +543,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2578649064399513024} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} @@ -569,9 +565,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2578649063991174810} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 13, y: 110, z: 10} m_Center: {x: 0, y: 0, z: 0} --- !u!114 &2578649063991174808 @@ -590,6 +594,7 @@ MonoBehaviour: attachedRectTransform: {fileID: 2578649063991174813} padding: {x: 5, y: 5} forceUpdateEveryFrame: 0 + canToggleCollider: 1 --- !u!114 &2578649063991174812 MonoBehaviour: m_ObjectHideFlags: 0 @@ -708,11 +713,10 @@ RectTransform: - {fileID: 2578649062778877953} - {fileID: 2578649063749817975} m_Father: {fileID: 2578649064448521969} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -0.00053877506, y: -0.00045043931} + m_AnchoredPosition: {x: 0.014418174, y: 0.022417637} m_SizeDelta: {x: 0, y: 218.4} m_Pivot: {x: 0, y: 1} --- !u!114 &2578649064017060637 @@ -776,7 +780,6 @@ RectTransform: - {fileID: 830797837766093032} - {fileID: 6550764639418190640} m_Father: {fileID: 2578649064460067242} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -862,7 +865,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2578649064399513024} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} @@ -885,9 +887,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2578649064187649785} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 13, y: 110, z: 10} m_Center: {x: 0, y: 0, z: 0} --- !u!114 &2578649064187649789 @@ -906,6 +916,7 @@ MonoBehaviour: attachedRectTransform: {fileID: 2578649064187649784} padding: {x: 5, y: 5} forceUpdateEveryFrame: 0 + canToggleCollider: 1 --- !u!114 &2578649064187649790 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1026,7 +1037,6 @@ RectTransform: - {fileID: 2578649064187649784} - {fileID: 2356801616050657259} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -1050,7 +1060,9 @@ Canvas: m_OverrideSorting: 0 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 m_AdditionalShaderChannelsFlag: 31 + m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 @@ -1076,7 +1088,7 @@ MonoBehaviour: m_FallbackScreenDPI: 96 m_DefaultSpriteDPI: 96 m_DynamicPixelsPerUnit: 1 - m_PresetInfoIsWorld: 1 + m_PresetInfoIsWorld: 0 --- !u!1 &2578649064448521970 GameObject: m_ObjectHideFlags: 0 @@ -1109,7 +1121,6 @@ RectTransform: m_Children: - {fileID: 2578649064017060638} m_Father: {fileID: 2578649064635381920} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -1175,7 +1186,6 @@ RectTransform: - {fileID: 2578649064106734587} - {fileID: 2578649064635381920} m_Father: {fileID: 3868625797428816970} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -1327,7 +1337,6 @@ RectTransform: m_Children: - {fileID: 2578649064448521969} m_Father: {fileID: 2578649064460067242} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -1423,7 +1432,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2578649063324106453} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -1496,20 +1504,23 @@ MonoBehaviour: m_VerticalAlignment: 256 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -1567,7 +1578,6 @@ RectTransform: - {fileID: 6480191133274044593} - {fileID: 8621070723831474135} m_Father: {fileID: 2578649064399513024} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 37.164, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} @@ -1602,6 +1612,13 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] + m_Texture: {fileID: 0} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 radius: 13 thickness: 2 wedges: 8 @@ -1651,6 +1668,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2356801616050657259} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -1729,10 +1747,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 6 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -1806,6 +1820,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &8621070723831474135 stripped RectTransform: @@ -1817,6 +1834,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2578649063324106453} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -1838,6 +1856,10 @@ PrefabInstance: propertyPath: m_HorizontalAlignment value: 1 objectReference: {fileID: 0} + - target: {fileID: 1922220768106560367, guid: c6b351a67ceb69140b199996bbbea156, type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} - target: {fileID: 2142167140070017856, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive value: 1 @@ -2007,6 +2029,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &7879939008530370534 stripped RectTransform: @@ -2018,6 +2043,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2578649063324106453} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -2038,6 +2064,10 @@ PrefabInstance: propertyPath: m_HorizontalAlignment value: 1 objectReference: {fileID: 0} + - target: {fileID: 1922220768106560367, guid: c6b351a67ceb69140b199996bbbea156, type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} - target: {fileID: 2142167140070017856, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive value: 1 @@ -2207,6 +2237,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &7724392866144474191 stripped RectTransform: @@ -2218,6 +2251,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2578649063324106453} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -2238,6 +2272,10 @@ PrefabInstance: propertyPath: m_HorizontalAlignment value: 1 objectReference: {fileID: 0} + - target: {fileID: 1922220768106560367, guid: c6b351a67ceb69140b199996bbbea156, type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} - target: {fileID: 2142167140070017856, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive value: 1 @@ -2407,6 +2445,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &6090670456024506908 stripped RectTransform: @@ -2418,6 +2459,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2578649063327347123} m_Modifications: - target: {fileID: 546726529016720829, guid: bd4b74f5c5104ae498cb7b5e4a5f2f04, type: 3} @@ -2448,10 +2490,18 @@ PrefabInstance: propertyPath: m_text value: Title objectReference: {fileID: 0} + - target: {fileID: 2745264576801878700, guid: bd4b74f5c5104ae498cb7b5e4a5f2f04, type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} - target: {fileID: 3147945552207970304, guid: bd4b74f5c5104ae498cb7b5e4a5f2f04, type: 3} propertyPath: m_text value: Lorem ipsum objectReference: {fileID: 0} + - target: {fileID: 3147945552207970304, guid: bd4b74f5c5104ae498cb7b5e4a5f2f04, type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} - target: {fileID: 3664738976956874277, guid: bd4b74f5c5104ae498cb7b5e4a5f2f04, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -2496,6 +2546,10 @@ PrefabInstance: propertyPath: m_text value: Lorem ipsum objectReference: {fileID: 0} + - target: {fileID: 4768141262871555261, guid: bd4b74f5c5104ae498cb7b5e4a5f2f04, type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} - target: {fileID: 7647534073772950212, guid: bd4b74f5c5104ae498cb7b5e4a5f2f04, type: 3} propertyPath: m_MinWidth value: -1 @@ -2614,11 +2668,11 @@ PrefabInstance: objectReference: {fileID: 6776978392589374209} - target: {fileID: 9062819528647497191, guid: bd4b74f5c5104ae498cb7b5e4a5f2f04, type: 3} propertyPath: m_Size.x - value: 80.64217 + value: 52.905224 objectReference: {fileID: 0} - target: {fileID: 9062819528647497191, guid: bd4b74f5c5104ae498cb7b5e4a5f2f04, type: 3} propertyPath: m_Size.y - value: 47.016113 + value: 8.91153 objectReference: {fileID: 0} - target: {fileID: 9062819528647497191, guid: bd4b74f5c5104ae498cb7b5e4a5f2f04, type: 3} propertyPath: m_Enabled @@ -2630,7 +2684,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 9062819528647497191, guid: bd4b74f5c5104ae498cb7b5e4a5f2f04, type: 3} propertyPath: m_Center.y - value: 4.2419434 + value: 23.294235 objectReference: {fileID: 0} - target: {fileID: 9062819528647497213, guid: bd4b74f5c5104ae498cb7b5e4a5f2f04, type: 3} propertyPath: m_Name @@ -2638,6 +2692,9 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: - {fileID: 7647534073772950212, guid: bd4b74f5c5104ae498cb7b5e4a5f2f04, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: bd4b74f5c5104ae498cb7b5e4a5f2f04, type: 3} --- !u!224 &6776978392589374209 stripped RectTransform: @@ -2649,6 +2706,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2578649064017060638} m_Modifications: - target: {fileID: 546726529016720829, guid: bd4b74f5c5104ae498cb7b5e4a5f2f04, type: 3} @@ -2679,10 +2737,18 @@ PrefabInstance: propertyPath: m_text value: Main header text objectReference: {fileID: 0} + - target: {fileID: 2745264576801878700, guid: bd4b74f5c5104ae498cb7b5e4a5f2f04, type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} - target: {fileID: 3147945552207970304, guid: bd4b74f5c5104ae498cb7b5e4a5f2f04, type: 3} propertyPath: m_text value: Secondary text two objectReference: {fileID: 0} + - target: {fileID: 3147945552207970304, guid: bd4b74f5c5104ae498cb7b5e4a5f2f04, type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} - target: {fileID: 3664738976956874277, guid: bd4b74f5c5104ae498cb7b5e4a5f2f04, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -2727,6 +2793,10 @@ PrefabInstance: propertyPath: m_text value: Secondary text one objectReference: {fileID: 0} + - target: {fileID: 4768141262871555261, guid: bd4b74f5c5104ae498cb7b5e4a5f2f04, type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} - target: {fileID: 7818897570117504404, guid: bd4b74f5c5104ae498cb7b5e4a5f2f04, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -2851,11 +2921,18 @@ PrefabInstance: propertyPath: m_Center.x value: 0 objectReference: {fileID: 0} + - target: {fileID: 9062819528647497191, guid: bd4b74f5c5104ae498cb7b5e4a5f2f04, type: 3} + propertyPath: m_Center.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 9062819528647497213, guid: bd4b74f5c5104ae498cb7b5e4a5f2f04, type: 3} propertyPath: m_Name value: HeroButton objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: bd4b74f5c5104ae498cb7b5e4a5f2f04, type: 3} --- !u!224 &6776978392855206655 stripped RectTransform: @@ -2867,6 +2944,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2578649063139551432} m_Modifications: - target: {fileID: 952967652988581951, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -3066,6 +3144,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &6338500039190568485 stripped RectTransform: @@ -3077,6 +3158,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2578649063327347123} m_Modifications: - target: {fileID: 546726529016720829, guid: bd4b74f5c5104ae498cb7b5e4a5f2f04, type: 3} @@ -3107,10 +3189,18 @@ PrefabInstance: propertyPath: m_text value: Title objectReference: {fileID: 0} + - target: {fileID: 2745264576801878700, guid: bd4b74f5c5104ae498cb7b5e4a5f2f04, type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} - target: {fileID: 3147945552207970304, guid: bd4b74f5c5104ae498cb7b5e4a5f2f04, type: 3} propertyPath: m_text value: Lorem ipsum objectReference: {fileID: 0} + - target: {fileID: 3147945552207970304, guid: bd4b74f5c5104ae498cb7b5e4a5f2f04, type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} - target: {fileID: 3664738976956874277, guid: bd4b74f5c5104ae498cb7b5e4a5f2f04, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -3155,6 +3245,10 @@ PrefabInstance: propertyPath: m_text value: Lorem ipsum objectReference: {fileID: 0} + - target: {fileID: 4768141262871555261, guid: bd4b74f5c5104ae498cb7b5e4a5f2f04, type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} - target: {fileID: 7647534073772950212, guid: bd4b74f5c5104ae498cb7b5e4a5f2f04, type: 3} propertyPath: m_MinWidth value: -1 @@ -3273,11 +3367,11 @@ PrefabInstance: objectReference: {fileID: 6776978392769446707} - target: {fileID: 9062819528647497191, guid: bd4b74f5c5104ae498cb7b5e4a5f2f04, type: 3} propertyPath: m_Size.x - value: 80.64217 + value: 52.905224 objectReference: {fileID: 0} - target: {fileID: 9062819528647497191, guid: bd4b74f5c5104ae498cb7b5e4a5f2f04, type: 3} propertyPath: m_Size.y - value: 47.016113 + value: 8.91153 objectReference: {fileID: 0} - target: {fileID: 9062819528647497191, guid: bd4b74f5c5104ae498cb7b5e4a5f2f04, type: 3} propertyPath: m_Enabled @@ -3285,7 +3379,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 9062819528647497191, guid: bd4b74f5c5104ae498cb7b5e4a5f2f04, type: 3} propertyPath: m_Center.y - value: 4.2419434 + value: 23.294235 objectReference: {fileID: 0} - target: {fileID: 9062819528647497213, guid: bd4b74f5c5104ae498cb7b5e4a5f2f04, type: 3} propertyPath: m_Name @@ -3293,6 +3387,9 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: - {fileID: 7647534073772950212, guid: bd4b74f5c5104ae498cb7b5e4a5f2f04, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: bd4b74f5c5104ae498cb7b5e4a5f2f04, type: 3} --- !u!224 &6776978392769446707 stripped RectTransform: @@ -3304,6 +3401,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2578649064106734587} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -3314,6 +3412,10 @@ PrefabInstance: propertyPath: m_text value: Tab objectReference: {fileID: 0} + - target: {fileID: 1922220768106560367, guid: c6b351a67ceb69140b199996bbbea156, type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} - target: {fileID: 2044856827291504467, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive value: 1 @@ -3567,6 +3669,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &6338500039098004376 stripped RectTransform: @@ -3578,6 +3683,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2578649063139551432} m_Modifications: - target: {fileID: 952967652988581951, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -3793,6 +3899,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &6338500039060582460 stripped RectTransform: @@ -3804,6 +3913,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2578649063139551432} m_Modifications: - target: {fileID: 952967652988581951, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -4019,6 +4129,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &6338500038249281931 stripped RectTransform: @@ -4030,6 +4143,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2578649064399513024} m_Modifications: - target: {fileID: 1619375032725711555, guid: 9d54fefbfd15f194cbaf3beeff5f6d10, type: 3} @@ -4040,10 +4154,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 1619375032725711555, guid: 9d54fefbfd15f194cbaf3beeff5f6d10, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - target: {fileID: 1619375032725711555, guid: 9d54fefbfd15f194cbaf3beeff5f6d10, type: 3} propertyPath: m_AnchorMax.x value: 1 @@ -4121,6 +4231,21 @@ PrefabInstance: value: DashboardPlate objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 1619375032725711555, guid: 9d54fefbfd15f194cbaf3beeff5f6d10, type: 3} + insertIndex: -1 + addedObject: {fileID: 2578649063139551432} + - targetCorrespondingSourceObject: {fileID: 1619375032725711555, guid: 9d54fefbfd15f194cbaf3beeff5f6d10, type: 3} + insertIndex: -1 + addedObject: {fileID: 2578649064460067242} + - targetCorrespondingSourceObject: {fileID: 1619375032725711555, guid: 9d54fefbfd15f194cbaf3beeff5f6d10, type: 3} + insertIndex: -1 + addedObject: {fileID: 2578649063324106453} + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 8510261678218358358, guid: 9d54fefbfd15f194cbaf3beeff5f6d10, type: 3} + insertIndex: -1 + addedObject: {fileID: 2578649064184072539} m_SourcePrefab: {fileID: 100100000, guid: 9d54fefbfd15f194cbaf3beeff5f6d10, type: 3} --- !u!224 &3868625797428816970 stripped RectTransform: @@ -4163,6 +4288,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2578649063327347123} m_Modifications: - target: {fileID: 546726529016720829, guid: bd4b74f5c5104ae498cb7b5e4a5f2f04, type: 3} @@ -4193,10 +4319,18 @@ PrefabInstance: propertyPath: m_text value: Title objectReference: {fileID: 0} + - target: {fileID: 2745264576801878700, guid: bd4b74f5c5104ae498cb7b5e4a5f2f04, type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} - target: {fileID: 3147945552207970304, guid: bd4b74f5c5104ae498cb7b5e4a5f2f04, type: 3} propertyPath: m_text value: Lorem ipsum objectReference: {fileID: 0} + - target: {fileID: 3147945552207970304, guid: bd4b74f5c5104ae498cb7b5e4a5f2f04, type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} - target: {fileID: 3664738976956874277, guid: bd4b74f5c5104ae498cb7b5e4a5f2f04, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -4241,6 +4375,10 @@ PrefabInstance: propertyPath: m_text value: Lorem ipsum objectReference: {fileID: 0} + - target: {fileID: 4768141262871555261, guid: bd4b74f5c5104ae498cb7b5e4a5f2f04, type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} - target: {fileID: 7647534073772950212, guid: bd4b74f5c5104ae498cb7b5e4a5f2f04, type: 3} propertyPath: m_MinWidth value: -1 @@ -4359,11 +4497,11 @@ PrefabInstance: objectReference: {fileID: 6776978393435224395} - target: {fileID: 9062819528647497191, guid: bd4b74f5c5104ae498cb7b5e4a5f2f04, type: 3} propertyPath: m_Size.x - value: 80.64167 + value: 52.899147 objectReference: {fileID: 0} - target: {fileID: 9062819528647497191, guid: bd4b74f5c5104ae498cb7b5e4a5f2f04, type: 3} propertyPath: m_Size.y - value: 47.016113 + value: 8.91153 objectReference: {fileID: 0} - target: {fileID: 9062819528647497191, guid: bd4b74f5c5104ae498cb7b5e4a5f2f04, type: 3} propertyPath: m_Enabled @@ -4371,11 +4509,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 9062819528647497191, guid: bd4b74f5c5104ae498cb7b5e4a5f2f04, type: 3} propertyPath: m_Center.x - value: 0.00025177002 + value: 0.0030403137 objectReference: {fileID: 0} - target: {fileID: 9062819528647497191, guid: bd4b74f5c5104ae498cb7b5e4a5f2f04, type: 3} propertyPath: m_Center.y - value: 4.2419434 + value: 23.294235 objectReference: {fileID: 0} - target: {fileID: 9062819528647497213, guid: bd4b74f5c5104ae498cb7b5e4a5f2f04, type: 3} propertyPath: m_Name @@ -4383,6 +4521,9 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: - {fileID: 7647534073772950212, guid: bd4b74f5c5104ae498cb7b5e4a5f2f04, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: bd4b74f5c5104ae498cb7b5e4a5f2f04, type: 3} --- !u!224 &6776978393435224395 stripped RectTransform: @@ -4394,6 +4535,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2578649063139551432} m_Modifications: - target: {fileID: 952967652988581951, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -4609,6 +4751,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &6338500037595202671 stripped RectTransform: @@ -4620,6 +4765,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2578649063324106453} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -4641,6 +4787,10 @@ PrefabInstance: propertyPath: m_HorizontalAlignment value: 1 objectReference: {fileID: 0} + - target: {fileID: 1922220768106560367, guid: c6b351a67ceb69140b199996bbbea156, type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} - target: {fileID: 2142167140070017856, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive value: 1 @@ -4810,6 +4960,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &6351079148266003887 stripped RectTransform: @@ -4821,6 +4974,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2578649064106734587} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -4831,6 +4985,10 @@ PrefabInstance: propertyPath: m_text value: Tab objectReference: {fileID: 0} + - target: {fileID: 1922220768106560367, guid: c6b351a67ceb69140b199996bbbea156, type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} - target: {fileID: 2044856827291504467, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive value: 1 @@ -5092,6 +5250,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &6550764639418190640 stripped RectTransform: @@ -5103,6 +5264,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2578649063324106453} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -5124,6 +5286,10 @@ PrefabInstance: propertyPath: m_HorizontalAlignment value: 1 objectReference: {fileID: 0} + - target: {fileID: 1922220768106560367, guid: c6b351a67ceb69140b199996bbbea156, type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} - target: {fileID: 2142167140070017856, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive value: 1 @@ -5293,6 +5459,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &6576362801864956305 stripped RectTransform: @@ -5304,16 +5473,13 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2356801616050657259} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} - - target: {fileID: 952967652988581951, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_text - value: "\uF2F6" - objectReference: {fileID: 0} - target: {fileID: 2142167140070017856, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive value: 0 @@ -5394,10 +5560,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 3 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -5471,6 +5633,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &4127110153585389256 stripped RectTransform: @@ -5482,16 +5647,13 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2356801616050657259} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} - - target: {fileID: 952967652988581951, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_text - value: "\uF35A" - objectReference: {fileID: 0} - target: {fileID: 2142167140070017856, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive value: 0 @@ -5572,10 +5734,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -5649,6 +5807,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &3124354410494147608 stripped RectTransform: @@ -5660,6 +5821,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2578649064106734587} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -5670,6 +5832,10 @@ PrefabInstance: propertyPath: m_text value: Tab objectReference: {fileID: 0} + - target: {fileID: 1922220768106560367, guid: c6b351a67ceb69140b199996bbbea156, type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} - target: {fileID: 2044856827291504467, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive value: 1 @@ -5931,6 +6097,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &1266614207299526433 stripped RectTransform: @@ -5942,16 +6111,13 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2356801616050657259} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} - - target: {fileID: 952967652988581951, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_text - value: "\uF4A8" - objectReference: {fileID: 0} - target: {fileID: 2142167140070017856, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive value: 0 @@ -6032,10 +6198,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -6109,6 +6271,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &1389753798734922626 stripped RectTransform: @@ -6120,16 +6285,13 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2356801616050657259} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} - - target: {fileID: 952967652988581951, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_text - value: "\uF56C" - objectReference: {fileID: 0} - target: {fileID: 2142167140070017856, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive value: 0 @@ -6210,10 +6372,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -6287,6 +6445,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &1736624830057851760 stripped RectTransform: @@ -6298,16 +6459,13 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2356801616050657259} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} - - target: {fileID: 952967652988581951, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_text - value: "\uF169" - objectReference: {fileID: 0} - target: {fileID: 2142167140070017856, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive value: 0 @@ -6388,10 +6546,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 4 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -6465,6 +6619,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &980537988443892781 stripped RectTransform: @@ -6476,6 +6633,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2578649064106734587} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -6486,6 +6644,10 @@ PrefabInstance: propertyPath: m_text value: Tab objectReference: {fileID: 0} + - target: {fileID: 1922220768106560367, guid: c6b351a67ceb69140b199996bbbea156, type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} - target: {fileID: 2044856827291504467, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive value: 1 @@ -6747,6 +6909,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &830797837766093032 stripped RectTransform: diff --git a/UnityProjects/MRTKDevTemplate/Assets/Prefabs/EyeTrackingExamples/EyeCalibrationChecker.prefab b/UnityProjects/MRTKDevTemplate/Assets/Prefabs/EyeTrackingExamples/EyeCalibrationChecker.prefab index 214364506..86148739b 100644 --- a/UnityProjects/MRTKDevTemplate/Assets/Prefabs/EyeTrackingExamples/EyeCalibrationChecker.prefab +++ b/UnityProjects/MRTKDevTemplate/Assets/Prefabs/EyeTrackingExamples/EyeCalibrationChecker.prefab @@ -31,7 +31,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7942278510640247527} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1} @@ -106,7 +105,6 @@ RectTransform: m_Children: - {fileID: 7942278509857930420} m_Father: {fileID: 7942278511449526407} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -137,6 +135,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7942278510844116559} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -144,7 +143,6 @@ Transform: m_Children: - {fileID: 7942278511695666183} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &2018958471043176084 MonoBehaviour: @@ -158,7 +156,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 8b0ab44b6f20884458aa9e1d5ea5cf22, type: 3} m_Name: m_EditorClassIdentifier: - EditorTestIsCalibrated: 4 + k__BackingField: 4 calibrated: m_PersistentCalls: m_Calls: @@ -229,7 +227,6 @@ RectTransform: - {fileID: 7942278511777747278} - {fileID: 1875599312793828342} m_Father: {fileID: 7942278511695666183} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -264,6 +261,13 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] + m_Texture: {fileID: 0} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 radius: 13 thickness: 2 wedges: 8 @@ -340,7 +344,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7942278511449526407} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -413,20 +416,23 @@ MonoBehaviour: m_VerticalAlignment: 256 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 00000000 m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -497,7 +503,6 @@ RectTransform: m_Children: - {fileID: 7942278511449526407} m_Father: {fileID: 7942278510844116557} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -521,7 +526,9 @@ Canvas: m_OverrideSorting: 0 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 m_AdditionalShaderChannelsFlag: 31 + m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 @@ -593,7 +600,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7942278511449526407} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -673,20 +679,23 @@ MonoBehaviour: m_VerticalAlignment: 256 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 00000000 m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -709,16 +718,13 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 7942278511449526407} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} - - target: {fileID: 952967652988581951, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_text - value: "\uE840" - objectReference: {fileID: 0} - target: {fileID: 1922220768106560367, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_text value: Dismiss @@ -875,10 +881,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 3 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -952,6 +954,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &1875599312793828342 stripped RectTransform: diff --git a/UnityProjects/MRTKDevTemplate/Assets/Prefabs/EyeTrackingExamples/EyeTrackingCursor.prefab b/UnityProjects/MRTKDevTemplate/Assets/Prefabs/EyeTrackingExamples/EyeTrackingCursor.prefab index 1fe913aa5..c6596c770 100644 --- a/UnityProjects/MRTKDevTemplate/Assets/Prefabs/EyeTrackingExamples/EyeTrackingCursor.prefab +++ b/UnityProjects/MRTKDevTemplate/Assets/Prefabs/EyeTrackingExamples/EyeTrackingCursor.prefab @@ -26,13 +26,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4661674953859262253} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.05, y: 0.05, z: 0.05} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &7576754869308646869 MeshFilter: @@ -59,6 +59,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -98,25 +101,6 @@ MonoBehaviour: m_EditorClassIdentifier: defaultDistanceInMeters: 1 idleStateColor: {r: 0.94482756, g: 0, b: 1, a: 0.5019608} - hightlightStateColor: {r: 0.61972624, g: 0.8897059, b: 0, a: 0.5019608} - gazeController: {fileID: 0} - _gazeTranslationAction: - m_UseReference: 0 - m_Action: - m_Name: Gaze Translation - m_Type: 0 - m_ExpectedControlType: - m_Id: 760df33e-b34c-433a-8f53-9c42d6aab08f - m_Processors: - m_Interactions: - m_SingletonActionBindings: - - m_Name: - m_Id: 1a156263-df3f-4690-a968-7702cec4bcc1 - m_Path: /pose/position - m_Interactions: - m_Processors: - m_Groups: - m_Action: Gaze Translation - m_Flags: 0 - m_Flags: 0 - m_Reference: {fileID: 0} + highlightStateColor: {r: 0.61972624, g: 0.8897059, b: 0, a: 0.5019608} + gazePoseDriver: {fileID: 0} + gazeInteractor: {fileID: 0} diff --git a/UnityProjects/MRTKDevTemplate/Assets/Prefabs/EyeTrackingExamples/NavigationExample/AutoEyeScroll.prefab b/UnityProjects/MRTKDevTemplate/Assets/Prefabs/EyeTrackingExamples/NavigationExample/AutoEyeScroll.prefab index 7f2520435..c6d73a097 100644 --- a/UnityProjects/MRTKDevTemplate/Assets/Prefabs/EyeTrackingExamples/NavigationExample/AutoEyeScroll.prefab +++ b/UnityProjects/MRTKDevTemplate/Assets/Prefabs/EyeTrackingExamples/NavigationExample/AutoEyeScroll.prefab @@ -31,7 +31,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2362020299005470544} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -46,9 +45,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 913762019} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 145, y: 200, z: 2} m_Center: {x: 0, y: 0, z: 0} --- !u!114 &5273528282627450551 @@ -65,13 +72,11 @@ MonoBehaviour: m_EditorClassIdentifier: m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 0 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 1 m_AllowGazeSelect: 0 @@ -102,8 +107,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: - m_Target: {fileID: 5273528282627450551} - m_TargetAssemblyTypeName: MixedReality.Toolkit.Examples.PanZoomBase, - Assembly-CSharp + m_TargetAssemblyTypeName: MixedReality.Toolkit.Examples.PanZoomBase, Assembly-CSharp m_MethodName: OnSelectEntered m_Mode: 1 m_Arguments: @@ -118,8 +122,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: - m_Target: {fileID: 5273528282627450551} - m_TargetAssemblyTypeName: MixedReality.Toolkit.Examples.PanZoomBase, - Assembly-CSharp + m_TargetAssemblyTypeName: MixedReality.Toolkit.Examples.PanZoomBase, Assembly-CSharp m_MethodName: OnSelectExited m_Mode: 1 m_Arguments: @@ -130,42 +133,27 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - m_Activated: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_OnLastHoverExited: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnHoverEntered: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectEntered: - m_PersistentCalls: - m_Calls: [] - m_OnSelectExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -257,6 +245,9 @@ MonoBehaviour: k__BackingField: 1 allowSelectByVoice: 0 speechRecognitionKeyword: select + k__BackingField: + m_PersistentCalls: + m_Calls: [] k__BackingField: 1 k__BackingField: 0 k__BackingField: @@ -321,7 +312,6 @@ RectTransform: m_Children: - {fileID: 2362020300687397261} m_Father: {fileID: 2362020299236247663} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} @@ -410,7 +400,7 @@ MonoBehaviour: m_HandleRect: {fileID: 2362020299460492377} m_Direction: 2 m_Value: 1 - m_Size: 1 + m_Size: 0.999293 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: @@ -462,7 +452,6 @@ RectTransform: - {fileID: 913762020} - {fileID: 2362020300155552838} m_Father: {fileID: 2362020299236247663} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -563,7 +552,6 @@ RectTransform: m_Children: - {fileID: 2362020299939975223} m_Father: {fileID: 2362020300134035590} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -600,7 +588,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2362020299407945791} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -664,7 +651,6 @@ RectTransform: - {fileID: 2362020300134035590} - {fileID: 2362020298874072609} m_Father: {fileID: 2362020299407945791} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -796,7 +782,6 @@ RectTransform: - {fileID: 2362020299204246357} - {fileID: 2362020300032216897} m_Father: {fileID: 2362020300408418988} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -861,7 +846,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2362020300687397261} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -950,7 +934,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2362020299052919666} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -1037,7 +1020,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2362020300408418988} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -1095,7 +1077,6 @@ RectTransform: m_Children: - {fileID: 6405310739331107588} m_Father: {fileID: 2362020300408418988} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -1154,7 +1135,6 @@ RectTransform: - {fileID: 6122722206634550171} - {fileID: 6122722205925313786} m_Father: {fileID: 2362020299407945791} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -1215,7 +1195,6 @@ RectTransform: m_Children: - {fileID: 2362020299052919666} m_Father: {fileID: 2362020299236247663} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -1304,7 +1283,7 @@ MonoBehaviour: m_HandleRect: {fileID: 2362020299939975223} m_Direction: 0 m_Value: 0 - m_Size: 0.9999999 + m_Size: 1 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: @@ -1352,11 +1331,10 @@ RectTransform: m_Children: - {fileID: 2264487539955952384} m_Father: {fileID: 2362020299005470544} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0.00004196167, y: -0.000045776367} + m_AnchoredPosition: {x: 0.00004196167, y: -0.00015258789} m_SizeDelta: {x: 0, y: -5.2505875} m_Pivot: {x: 0, y: 0.5} --- !u!222 &2362020300155552841 @@ -1404,7 +1382,6 @@ RectTransform: - {fileID: 2362020299974371531} - {fileID: 2362020299407945791} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} @@ -1439,6 +1416,13 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] + m_Texture: {fileID: 0} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 radius: 12 thickness: 2 wedges: 8 @@ -1500,7 +1484,9 @@ Canvas: m_OverrideSorting: 0 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 m_AdditionalShaderChannelsFlag: 31 + m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 @@ -1534,7 +1520,6 @@ RectTransform: m_Children: - {fileID: 2362020299460492377} m_Father: {fileID: 2362020298874072609} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -1572,7 +1557,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2362020299985207259} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -1645,20 +1629,23 @@ MonoBehaviour: m_VerticalAlignment: 256 m_textAlignment: 65535 m_characterSpacing: -5.6 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -1681,12 +1668,9 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2362020300032216897} m_Modifications: - - target: {fileID: 952967652988581951, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_text - value: "\uF2B7" - objectReference: {fileID: 0} - target: {fileID: 2228947736508096533, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Sprite value: @@ -1807,10 +1791,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 1 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0.5 @@ -1884,6 +1864,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &6122722206634550171 stripped RectTransform: @@ -1895,6 +1878,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2362020300155552838} m_Modifications: - target: {fileID: 1079702612067531316, guid: f62537a90be5a084c916b1ba55b98a11, type: 3} @@ -1951,10 +1935,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 1 objectReference: {fileID: 0} - - target: {fileID: 4587628264892359693, guid: f62537a90be5a084c916b1ba55b98a11, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - target: {fileID: 4587628264892359693, guid: f62537a90be5a084c916b1ba55b98a11, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -2037,6 +2017,12 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: - {fileID: 1079702612067531316, guid: f62537a90be5a084c916b1ba55b98a11, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 4587628264892359694, guid: f62537a90be5a084c916b1ba55b98a11, type: 3} + insertIndex: -1 + addedObject: {fileID: 6104545332937109951} m_SourcePrefab: {fileID: 100100000, guid: f62537a90be5a084c916b1ba55b98a11, type: 3} --- !u!224 &2264487539955952384 stripped RectTransform: @@ -2067,12 +2053,9 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2362020300032216897} m_Modifications: - - target: {fileID: 952967652988581951, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_text - value: "\uF2A4" - objectReference: {fileID: 0} - target: {fileID: 2228947736508096533, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Sprite value: @@ -2193,10 +2176,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0.5 @@ -2270,6 +2249,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &6122722205925313786 stripped RectTransform: diff --git a/UnityProjects/MRTKDevTemplate/Assets/Prefabs/EyeTrackingExamples/NavigationExample/EyeGazeRotation.prefab b/UnityProjects/MRTKDevTemplate/Assets/Prefabs/EyeTrackingExamples/NavigationExample/EyeGazeRotation.prefab index 23d51d710..9f0e61043 100644 --- a/UnityProjects/MRTKDevTemplate/Assets/Prefabs/EyeTrackingExamples/NavigationExample/EyeGazeRotation.prefab +++ b/UnityProjects/MRTKDevTemplate/Assets/Prefabs/EyeTrackingExamples/NavigationExample/EyeGazeRotation.prefab @@ -25,6 +25,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7173684231665593440} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.112, y: -0.381, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -32,7 +33,6 @@ Transform: m_Children: - {fileID: 7173684231817596951} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!135 &7173684231665593445 SphereCollider: @@ -42,9 +42,17 @@ SphereCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7173684231665593440} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Radius: 0.2 m_Center: {x: 0, y: 0, z: 0} --- !u!114 &7173684231665593442 @@ -61,13 +69,11 @@ MonoBehaviour: m_EditorClassIdentifier: m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 0 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 1 m_AllowGazeSelect: 0 @@ -100,42 +106,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnHoverExited: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectEntered: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectExited: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectCanceled: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -227,6 +218,9 @@ MonoBehaviour: k__BackingField: 1 allowSelectByVoice: 1 speechRecognitionKeyword: select + k__BackingField: + m_PersistentCalls: + m_Calls: [] k__BackingField: 1 k__BackingField: 0 k__BackingField: @@ -260,16 +254,13 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 7173684231665593443} m_Modifications: - target: {fileID: 100000, guid: 0a30b3edc4f8ea24da9177aeae1b1e34, type: 3} propertyPath: m_Name value: EarthCore objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 0a30b3edc4f8ea24da9177aeae1b1e34, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - target: {fileID: 400000, guid: 0a30b3edc4f8ea24da9177aeae1b1e34, type: 3} propertyPath: m_LocalScale.x value: 60 @@ -323,6 +314,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 0a30b3edc4f8ea24da9177aeae1b1e34, type: 3} --- !u!4 &7173684231817596951 stripped Transform: diff --git a/UnityProjects/MRTKDevTemplate/Assets/Prefabs/EyeTrackingExamples/NavigationExample/EyeGazeRotationWithVoiceCommand.prefab b/UnityProjects/MRTKDevTemplate/Assets/Prefabs/EyeTrackingExamples/NavigationExample/EyeGazeRotationWithVoiceCommand.prefab index b3212c5c6..891896965 100644 --- a/UnityProjects/MRTKDevTemplate/Assets/Prefabs/EyeTrackingExamples/NavigationExample/EyeGazeRotationWithVoiceCommand.prefab +++ b/UnityProjects/MRTKDevTemplate/Assets/Prefabs/EyeTrackingExamples/NavigationExample/EyeGazeRotationWithVoiceCommand.prefab @@ -25,6 +25,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1808124033984213305} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0.354, y: -0.488, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -32,7 +33,6 @@ Transform: m_Children: - {fileID: 2566544794671369418} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!135 &1808124033984213309 SphereCollider: @@ -42,9 +42,17 @@ SphereCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1808124033984213305} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Radius: 0.16 m_Center: {x: 0, y: 0.11, z: 0} --- !u!114 &1808124033984213307 @@ -62,13 +70,11 @@ MonoBehaviour: m_InteractionManager: {fileID: 0} m_Colliders: - {fileID: 1808124033984213309} - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 0 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 1 m_AllowGazeSelect: 0 @@ -101,42 +107,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_Deactivated: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnHoverExited: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectEntered: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -240,6 +231,9 @@ MonoBehaviour: k__BackingField: 1 allowSelectByVoice: 1 speechRecognitionKeyword: come to me + k__BackingField: + m_PersistentCalls: + m_Calls: [] k__BackingField: 1 k__BackingField: 0 k__BackingField: @@ -308,6 +302,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6928618237584882502} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: -0.0388, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -315,23 +310,19 @@ Transform: m_Children: - {fileID: 1808124033441063062} m_Father: {fileID: 1808124033984213306} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1808124033441462822 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2566544794671369418} m_Modifications: - target: {fileID: 100048, guid: 60260aaff9ed8764d9aad59253d848f7, type: 3} propertyPath: m_Name value: LunarModule objectReference: {fileID: 0} - - target: {fileID: 400048, guid: 60260aaff9ed8764d9aad59253d848f7, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - target: {fileID: 400048, guid: 60260aaff9ed8764d9aad59253d848f7, type: 3} propertyPath: m_LocalScale.x value: 0.05 @@ -385,6 +376,27 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 100048, guid: 60260aaff9ed8764d9aad59253d848f7, type: 3} + insertIndex: -1 + addedObject: {fileID: 1808124033441462825} + - targetCorrespondingSourceObject: {fileID: 100048, guid: 60260aaff9ed8764d9aad59253d848f7, type: 3} + insertIndex: -1 + addedObject: {fileID: 1808124033441462824} + - targetCorrespondingSourceObject: {fileID: 100048, guid: 60260aaff9ed8764d9aad59253d848f7, type: 3} + insertIndex: -1 + addedObject: {fileID: 1808124033441462826} + - targetCorrespondingSourceObject: {fileID: 100048, guid: 60260aaff9ed8764d9aad59253d848f7, type: 3} + insertIndex: -1 + addedObject: {fileID: 1808124033441462827} + - targetCorrespondingSourceObject: {fileID: 100048, guid: 60260aaff9ed8764d9aad59253d848f7, type: 3} + insertIndex: -1 + addedObject: {fileID: 1808124033441462828} + - targetCorrespondingSourceObject: {fileID: 100048, guid: 60260aaff9ed8764d9aad59253d848f7, type: 3} + insertIndex: -1 + addedObject: {fileID: 1808124033441462829} m_SourcePrefab: {fileID: 100100000, guid: 60260aaff9ed8764d9aad59253d848f7, type: 3} --- !u!4 &1808124033441063062 stripped Transform: @@ -404,9 +416,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1808124033441365238} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 4, y: 5, z: 4.5} m_Center: {x: 0, y: 2.32, z: 0} --- !u!114 &1808124033441462824 @@ -461,6 +481,16 @@ MonoBehaviour: translateLerpTime: 0.00001 enableConstraints: 1 constraintsManager: {fileID: 0} + manipulationLogicTypes: + moveLogicType: + reference: MixedReality.Toolkit.SpatialManipulation.BoundsControlMoveLogic, + MixedReality.Toolkit.SpatialManipulation + rotateLogicType: + reference: MixedReality.Toolkit.SpatialManipulation.BoundsControlRotateLogic, + MixedReality.Toolkit.SpatialManipulation + scaleLogicType: + reference: MixedReality.Toolkit.SpatialManipulation.BoundsControlScaleLogic, + MixedReality.Toolkit.SpatialManipulation manipulationStarted: m_PersistentCalls: m_Calls: [] @@ -498,13 +528,11 @@ MonoBehaviour: m_EditorClassIdentifier: m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 0 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -537,42 +565,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnHoverExited: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectEntered: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectExited: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectCanceled: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -665,6 +678,9 @@ MonoBehaviour: k__BackingField: 1 allowSelectByVoice: 1 speechRecognitionKeyword: select + k__BackingField: + m_PersistentCalls: + m_Calls: [] k__BackingField: 1 k__BackingField: 0 k__BackingField: @@ -687,6 +703,7 @@ MonoBehaviour: hostTransform: {fileID: 1808124033984213306} allowedManipulations: 3 allowedInteractionTypes: 3 + rigidbodyMovementType: 0 applyTorque: 1 springForceSoftness: 0.1 springTorqueSoftness: 0.1 @@ -709,8 +726,7 @@ MonoBehaviour: moveLogicType: reference: MixedReality.Toolkit.SpatialManipulation.MoveLogic, MixedReality.Toolkit.SpatialManipulation rotateLogicType: - reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, - MixedReality.Toolkit.SpatialManipulation + reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, MixedReality.Toolkit.SpatialManipulation scaleLogicType: reference: MixedReality.Toolkit.SpatialManipulation.ScaleLogic, MixedReality.Toolkit.SpatialManipulation --- !u!114 &1808124033441462829 diff --git a/UnityProjects/MRTKDevTemplate/Assets/Prefabs/EyeTrackingExamples/NavigationExample/EyeScrollCanvas.prefab b/UnityProjects/MRTKDevTemplate/Assets/Prefabs/EyeTrackingExamples/NavigationExample/EyeScrollCanvas.prefab index fd4b2fde0..af4195dc0 100644 --- a/UnityProjects/MRTKDevTemplate/Assets/Prefabs/EyeTrackingExamples/NavigationExample/EyeScrollCanvas.prefab +++ b/UnityProjects/MRTKDevTemplate/Assets/Prefabs/EyeTrackingExamples/NavigationExample/EyeScrollCanvas.prefab @@ -33,11 +33,10 @@ RectTransform: m_Children: - {fileID: 5389885716139103178} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0.9243, y: 0.6084} + m_AnchoredPosition: {x: 0.9242859, y: 0.60839844} m_SizeDelta: {x: 540, y: 630} m_Pivot: {x: 0.5, y: 1} --- !u!223 &5389885717816914347 @@ -57,7 +56,9 @@ Canvas: m_OverrideSorting: 0 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 m_AdditionalShaderChannelsFlag: 31 + m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 @@ -83,7 +84,7 @@ MonoBehaviour: m_FallbackScreenDPI: 96 m_DefaultSpriteDPI: 96 m_DynamicPixelsPerUnit: 1 - m_PresetInfoIsWorld: 1 + m_PresetInfoIsWorld: 0 --- !u!114 &5389885717816914349 MonoBehaviour: m_ObjectHideFlags: 0 @@ -106,23 +107,16 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 5389885717816914348} m_Modifications: - - target: {fileID: 913762022, guid: 223005b231c33c5449426df912d4de39, type: 3} - propertyPath: m_InteractionManager - value: - objectReference: {fileID: 0} - - target: {fileID: 913762022, guid: 223005b231c33c5449426df912d4de39, type: 3} - propertyPath: k__BackingField - value: 1 - objectReference: {fileID: 0} - target: {fileID: 2362020298874072608, guid: 223005b231c33c5449426df912d4de39, type: 3} propertyPath: m_Size - value: 0.3587535 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2362020298874072608, guid: 223005b231c33c5449426df912d4de39, type: 3} propertyPath: m_Value - value: 1.0000001 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2362020298874072609, guid: 223005b231c33c5449426df912d4de39, type: 3} propertyPath: m_AnchorMax.y @@ -256,6 +250,10 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 2362020300134035589, guid: 223005b231c33c5449426df912d4de39, type: 3} + propertyPath: m_Value + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2362020300134035590, guid: 223005b231c33c5449426df912d4de39, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -266,7 +264,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2362020300155552838, guid: 223005b231c33c5449426df912d4de39, type: 3} propertyPath: m_AnchoredPosition.y - value: -512.9502 + value: -2.6326141 objectReference: {fileID: 0} - target: {fileID: 2362020300408418987, guid: 223005b231c33c5449426df912d4de39, type: 3} propertyPath: m_Name @@ -280,10 +278,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 1 objectReference: {fileID: 0} - - target: {fileID: 2362020300408418988, guid: 223005b231c33c5449426df912d4de39, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - target: {fileID: 2362020300408418988, guid: 223005b231c33c5449426df912d4de39, type: 3} propertyPath: m_AnchorMax.x value: 0.5 @@ -357,6 +351,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 223005b231c33c5449426df912d4de39, type: 3} --- !u!224 &5389885716139103178 stripped RectTransform: diff --git a/UnityProjects/MRTKDevTemplate/Assets/Prefabs/EyeTrackingExamples/NavigationExample/PanAndZoomExample.prefab b/UnityProjects/MRTKDevTemplate/Assets/Prefabs/EyeTrackingExamples/NavigationExample/PanAndZoomExample.prefab index d600ee60d..9cbabc03c 100644 --- a/UnityProjects/MRTKDevTemplate/Assets/Prefabs/EyeTrackingExamples/NavigationExample/PanAndZoomExample.prefab +++ b/UnityProjects/MRTKDevTemplate/Assets/Prefabs/EyeTrackingExamples/NavigationExample/PanAndZoomExample.prefab @@ -28,13 +28,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 348134654325234973} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.5, y: 0.5, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1614606089117502687} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &348134654325234969 MeshFilter: @@ -61,6 +61,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -94,9 +97,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 348134654325234973} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 1.1, y: 1.1, z: 0.1} m_Center: {x: 0, y: 0, z: 0} --- !u!114 &348134654325234971 @@ -113,13 +124,11 @@ MonoBehaviour: m_EditorClassIdentifier: m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 0 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 1 m_AllowGazeSelect: 1 @@ -152,50 +161,34 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnHoverExited: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectEntered: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectExited: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectCanceled: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: m_PersistentCalls: m_Calls: - m_Target: {fileID: 348134654325234971} - m_TargetAssemblyTypeName: MixedReality.Toolkit.Examples.PanZoomBase, - Assembly-CSharp + m_TargetAssemblyTypeName: MixedReality.Toolkit.Examples.PanZoomBase, Assembly-CSharp m_MethodName: EnableHandZoom m_Mode: 1 m_Arguments: @@ -207,8 +200,7 @@ MonoBehaviour: m_BoolArgument: 0 m_CallState: 2 - m_Target: {fileID: 348134654325234971} - m_TargetAssemblyTypeName: MixedReality.Toolkit.Examples.PanZoomBase, - Assembly-CSharp + m_TargetAssemblyTypeName: MixedReality.Toolkit.Examples.PanZoomBase, Assembly-CSharp m_MethodName: OnSelectEntered m_Mode: 1 m_Arguments: @@ -223,8 +215,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: - m_Target: {fileID: 348134654325234971} - m_TargetAssemblyTypeName: MixedReality.Toolkit.Examples.PanZoomBase, - Assembly-CSharp + m_TargetAssemblyTypeName: MixedReality.Toolkit.Examples.PanZoomBase, Assembly-CSharp m_MethodName: DisableHandZoom m_Mode: 1 m_Arguments: @@ -236,8 +227,7 @@ MonoBehaviour: m_BoolArgument: 0 m_CallState: 2 - m_Target: {fileID: 348134654325234971} - m_TargetAssemblyTypeName: MixedReality.Toolkit.Examples.PanZoomBase, - Assembly-CSharp + m_TargetAssemblyTypeName: MixedReality.Toolkit.Examples.PanZoomBase, Assembly-CSharp m_MethodName: OnSelectExited m_Mode: 1 m_Arguments: @@ -254,8 +244,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: - m_Target: {fileID: 348134654325234971} - m_TargetAssemblyTypeName: MixedReality.Toolkit.Examples.PanZoomBase, - Assembly-CSharp + m_TargetAssemblyTypeName: MixedReality.Toolkit.Examples.PanZoomBase, Assembly-CSharp m_MethodName: EnableHandZoom m_Mode: 1 m_Arguments: @@ -267,8 +256,7 @@ MonoBehaviour: m_BoolArgument: 0 m_CallState: 2 - m_Target: {fileID: 348134654325234971} - m_TargetAssemblyTypeName: MixedReality.Toolkit.Examples.PanZoomBase, - Assembly-CSharp + m_TargetAssemblyTypeName: MixedReality.Toolkit.Examples.PanZoomBase, Assembly-CSharp m_MethodName: OnSelectEntered m_Mode: 1 m_Arguments: @@ -283,8 +271,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: - m_Target: {fileID: 348134654325234971} - m_TargetAssemblyTypeName: MixedReality.Toolkit.Examples.PanZoomBase, - Assembly-CSharp + m_TargetAssemblyTypeName: MixedReality.Toolkit.Examples.PanZoomBase, Assembly-CSharp m_MethodName: DisableHandZoom m_Mode: 1 m_Arguments: @@ -296,8 +283,7 @@ MonoBehaviour: m_BoolArgument: 0 m_CallState: 2 - m_Target: {fileID: 348134654325234971} - m_TargetAssemblyTypeName: MixedReality.Toolkit.Examples.PanZoomBase, - Assembly-CSharp + m_TargetAssemblyTypeName: MixedReality.Toolkit.Examples.PanZoomBase, Assembly-CSharp m_MethodName: OnSelectExited m_Mode: 1 m_Arguments: @@ -322,8 +308,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: - m_Target: {fileID: 348134654325234971} - m_TargetAssemblyTypeName: MixedReality.Toolkit.Examples.PanZoomBase, - Assembly-CSharp + m_TargetAssemblyTypeName: MixedReality.Toolkit.Examples.PanZoomBase, Assembly-CSharp m_MethodName: EnableHandZoom m_Mode: 1 m_Arguments: @@ -335,8 +320,7 @@ MonoBehaviour: m_BoolArgument: 0 m_CallState: 2 - m_Target: {fileID: 348134654325234971} - m_TargetAssemblyTypeName: MixedReality.Toolkit.Examples.PanZoomBase, - Assembly-CSharp + m_TargetAssemblyTypeName: MixedReality.Toolkit.Examples.PanZoomBase, Assembly-CSharp m_MethodName: OnSelectEntered m_Mode: 1 m_Arguments: @@ -351,8 +335,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: - m_Target: {fileID: 348134654325234971} - m_TargetAssemblyTypeName: MixedReality.Toolkit.Examples.PanZoomBase, - Assembly-CSharp + m_TargetAssemblyTypeName: MixedReality.Toolkit.Examples.PanZoomBase, Assembly-CSharp m_MethodName: DisableHandZoom m_Mode: 1 m_Arguments: @@ -364,8 +347,7 @@ MonoBehaviour: m_BoolArgument: 0 m_CallState: 2 - m_Target: {fileID: 348134654325234971} - m_TargetAssemblyTypeName: MixedReality.Toolkit.Examples.PanZoomBase, - Assembly-CSharp + m_TargetAssemblyTypeName: MixedReality.Toolkit.Examples.PanZoomBase, Assembly-CSharp m_MethodName: OnSelectExited m_Mode: 1 m_Arguments: @@ -435,6 +417,9 @@ MonoBehaviour: k__BackingField: 1 allowSelectByVoice: 1 speechRecognitionKeyword: select + k__BackingField: + m_PersistentCalls: + m_Calls: [] k__BackingField: 1 k__BackingField: 0 k__BackingField: @@ -562,7 +547,6 @@ RectTransform: m_Children: - {fileID: 1068917453243083379} m_Father: {fileID: 8851224234324018853} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -586,7 +570,9 @@ Canvas: m_OverrideSorting: 0 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 m_AdditionalShaderChannelsFlag: 25 + m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 @@ -644,7 +630,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8081474135365968596} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -717,20 +702,23 @@ MonoBehaviour: m_VerticalAlignment: 256 m_textAlignment: 65535 m_characterSpacing: -5.6 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -778,7 +766,6 @@ RectTransform: m_Children: - {fileID: 348134654325234972} m_Father: {fileID: 8851224234324018853} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -817,7 +804,6 @@ RectTransform: - {fileID: 1614606089117502687} - {fileID: 7410355869489635092} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -829,6 +815,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 8851224234324018853} m_Modifications: - target: {fileID: 3148769097004162997, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} @@ -839,10 +826,6 @@ PrefabInstance: propertyPath: m_Name value: UIBackplate objectReference: {fileID: 0} - - target: {fileID: 4205010513405509735, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - target: {fileID: 4205010513405509735, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} propertyPath: m_LocalScale.x value: 1 @@ -908,6 +891,9 @@ PrefabInstance: value: 0.6 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} --- !u!4 &7410355869489635092 stripped Transform: diff --git a/UnityProjects/MRTKDevTemplate/Assets/Prefabs/EyeTrackingExamples/NavigationExample/Paragraph.prefab b/UnityProjects/MRTKDevTemplate/Assets/Prefabs/EyeTrackingExamples/NavigationExample/Paragraph.prefab index f32370c8c..3540778ad 100644 --- a/UnityProjects/MRTKDevTemplate/Assets/Prefabs/EyeTrackingExamples/NavigationExample/Paragraph.prefab +++ b/UnityProjects/MRTKDevTemplate/Assets/Prefabs/EyeTrackingExamples/NavigationExample/Paragraph.prefab @@ -32,7 +32,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -130,20 +129,23 @@ MonoBehaviour: m_VerticalAlignment: 256 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 4 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 00000000 m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -169,8 +171,16 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4587628264892359694} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 472, y: 1750, z: 1} m_Center: {x: 0, y: -590, z: 0} diff --git a/UnityProjects/MRTKDevTemplate/Assets/Prefabs/EyeTrackingExamples/TargetSelection/EyeTracking_BlueTarget.prefab b/UnityProjects/MRTKDevTemplate/Assets/Prefabs/EyeTrackingExamples/TargetSelection/EyeTracking_BlueTarget.prefab index 64b1059b4..5f9488c1e 100644 --- a/UnityProjects/MRTKDevTemplate/Assets/Prefabs/EyeTrackingExamples/TargetSelection/EyeTracking_BlueTarget.prefab +++ b/UnityProjects/MRTKDevTemplate/Assets/Prefabs/EyeTrackingExamples/TargetSelection/EyeTracking_BlueTarget.prefab @@ -25,13 +25,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 870610536867967727} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4091664850906067336} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!198 &267237374770158890 ParticleSystem: @@ -251,6 +251,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -280,6 +281,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 startSize: @@ -601,6 +603,7 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 randomizeRotationDirection: 0.26 + gravitySource: 0 maxNumParticles: 30 customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 @@ -1330,6 +1333,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -1359,6 +1363,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 UVModule: @@ -3579,6 +3584,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -3608,6 +3614,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 range: {x: 0, y: 1} @@ -3985,6 +3992,7 @@ ParticleSystem: m_RotationOrder: 4 minVertexDistance: 0.2 textureMode: 0 + textureScale: {x: 1, y: 1} ribbonCount: 1 shadowBias: 0.5 worldSpace: 0 @@ -4027,6 +4035,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -4056,6 +4065,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 widthOverTrail: @@ -4143,6 +4153,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -4172,6 +4183,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 CustomDataModule: @@ -4210,6 +4222,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -4239,6 +4252,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 colorLabel0: Color @@ -4492,6 +4506,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -4521,6 +4536,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 colorLabel1: Color @@ -4758,6 +4774,9 @@ ParticleSystemRenderer: m_ReflectionProbeUsage: 0 m_RayTracingMode: 0 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4796,13 +4815,15 @@ ParticleSystemRenderer: m_RenderAlignment: 0 m_Pivot: {x: 0, y: 0, z: 0} m_Flip: {x: 0, y: 0, z: 0} - m_UseCustomVertexStreams: 0 m_EnableGPUInstancing: 1 m_ApplyActiveColorSpace: 1 m_AllowRoll: 1 m_FreeformStretching: 0 m_RotateWithStretchDirection: 1 + m_UseCustomVertexStreams: 0 m_VertexStreams: 00010304 + m_UseCustomTrailVertexStreams: 0 + m_TrailVertexStreams: 00010304 m_Mesh: {fileID: 0} m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} @@ -4842,6 +4863,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4091664850906067339} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0.3, y: 0, z: 0} m_LocalScale: {x: 0.06, y: 0.06, z: 0.06} @@ -4849,7 +4871,6 @@ Transform: m_Children: - {fileID: 1554272296266963434} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &4091664850906067341 MeshFilter: @@ -4876,6 +4897,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4909,9 +4933,17 @@ SphereCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4091664850906067339} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Radius: 1.3 m_Center: {x: 0, y: 0, z: 0} --- !u!82 &6029233554234558129 @@ -4925,6 +4957,7 @@ AudioSource: serializedVersion: 4 OutputAudioMixerGroup: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} m_audioClip: {fileID: 0} + m_Resource: {fileID: 0} m_PlayOnAwake: 0 m_Volume: 1 m_Pitch: 1 @@ -5024,13 +5057,11 @@ MonoBehaviour: m_EditorClassIdentifier: m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 0 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 1 m_AllowGazeSelect: 1 @@ -5063,42 +5094,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnHoverExited: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectEntered: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectExited: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectCanceled: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -5242,6 +5258,9 @@ MonoBehaviour: k__BackingField: 1 allowSelectByVoice: 1 speechRecognitionKeyword: select + k__BackingField: + m_PersistentCalls: + m_Calls: [] k__BackingField: 1 k__BackingField: 1 k__BackingField: diff --git a/UnityProjects/MRTKDevTemplate/Assets/Prefabs/EyeTrackingExamples/TargetSelection/EyeTracking_GreenTarget.prefab b/UnityProjects/MRTKDevTemplate/Assets/Prefabs/EyeTrackingExamples/TargetSelection/EyeTracking_GreenTarget.prefab index e9154afea..64f80f63a 100644 --- a/UnityProjects/MRTKDevTemplate/Assets/Prefabs/EyeTrackingExamples/TargetSelection/EyeTracking_GreenTarget.prefab +++ b/UnityProjects/MRTKDevTemplate/Assets/Prefabs/EyeTrackingExamples/TargetSelection/EyeTracking_GreenTarget.prefab @@ -30,6 +30,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6674691429645067329} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0.3, y: 0, z: 0} m_LocalScale: {x: 0.06, y: 0.06, z: 0.06} @@ -37,7 +38,6 @@ Transform: m_Children: - {fileID: 3197037067258306566} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &6674691429645067333 MeshFilter: @@ -64,6 +64,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -97,9 +100,17 @@ SphereCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6674691429645067329} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Radius: 1.3 m_Center: {x: 0, y: 0, z: 0} --- !u!82 &2495840473053385437 @@ -113,6 +124,7 @@ AudioSource: serializedVersion: 4 OutputAudioMixerGroup: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} m_audioClip: {fileID: 0} + m_Resource: {fileID: 0} m_PlayOnAwake: 0 m_Volume: 1 m_Pitch: 1 @@ -212,13 +224,11 @@ MonoBehaviour: m_EditorClassIdentifier: m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 0 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 1 m_AllowGazeSelect: 1 @@ -251,42 +261,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnHoverExited: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectEntered: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectExited: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectCanceled: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -430,6 +425,9 @@ MonoBehaviour: k__BackingField: 1 allowSelectByVoice: 1 speechRecognitionKeyword: select + k__BackingField: + m_PersistentCalls: + m_Calls: [] k__BackingField: 1 k__BackingField: 1 k__BackingField: @@ -535,13 +533,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6796814780996062555} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6674691429645067328} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!198 &6934431388407613970 ParticleSystem: @@ -761,6 +759,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -790,6 +789,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 startSize: @@ -1111,6 +1111,7 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 randomizeRotationDirection: 0.26 + gravitySource: 0 maxNumParticles: 60 customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 @@ -1840,6 +1841,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -1869,6 +1871,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 UVModule: @@ -4089,6 +4092,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -4118,6 +4122,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 range: {x: 0, y: 1} @@ -4495,6 +4500,7 @@ ParticleSystem: m_RotationOrder: 4 minVertexDistance: 0.2 textureMode: 0 + textureScale: {x: 1, y: 1} ribbonCount: 1 shadowBias: 0.5 worldSpace: 0 @@ -4537,6 +4543,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -4566,6 +4573,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 widthOverTrail: @@ -4653,6 +4661,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -4682,6 +4691,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 CustomDataModule: @@ -4720,6 +4730,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -4749,6 +4760,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 colorLabel0: Color @@ -5002,6 +5014,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -5031,6 +5044,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 colorLabel1: Color @@ -5268,6 +5282,9 @@ ParticleSystemRenderer: m_ReflectionProbeUsage: 0 m_RayTracingMode: 0 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -5306,13 +5323,15 @@ ParticleSystemRenderer: m_RenderAlignment: 0 m_Pivot: {x: 0, y: 0, z: 0} m_Flip: {x: 0, y: 0, z: 0} - m_UseCustomVertexStreams: 0 m_EnableGPUInstancing: 1 m_ApplyActiveColorSpace: 1 m_AllowRoll: 1 m_FreeformStretching: 0 m_RotateWithStretchDirection: 1 + m_UseCustomVertexStreams: 0 m_VertexStreams: 00010304 + m_UseCustomTrailVertexStreams: 0 + m_TrailVertexStreams: 00010304 m_Mesh: {fileID: 0} m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} diff --git a/UnityProjects/MRTKDevTemplate/Assets/Prefabs/EyeTrackingExamples/TargetSelection/EyeTracking_PurpleTarget.prefab b/UnityProjects/MRTKDevTemplate/Assets/Prefabs/EyeTrackingExamples/TargetSelection/EyeTracking_PurpleTarget.prefab index eae44a6e3..46c891aff 100644 --- a/UnityProjects/MRTKDevTemplate/Assets/Prefabs/EyeTrackingExamples/TargetSelection/EyeTracking_PurpleTarget.prefab +++ b/UnityProjects/MRTKDevTemplate/Assets/Prefabs/EyeTrackingExamples/TargetSelection/EyeTracking_PurpleTarget.prefab @@ -25,13 +25,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1604616544742383950} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8787754652671033235} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!198 &5120723727797756260 ParticleSystem: @@ -251,6 +251,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -280,6 +281,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 startSize: @@ -601,6 +603,7 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 randomizeRotationDirection: 0.26 + gravitySource: 0 maxNumParticles: 30 customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 @@ -1330,6 +1333,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -1359,6 +1363,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 UVModule: @@ -3579,6 +3584,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -3608,6 +3614,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 range: {x: 0, y: 1} @@ -3985,6 +3992,7 @@ ParticleSystem: m_RotationOrder: 4 minVertexDistance: 0.2 textureMode: 0 + textureScale: {x: 1, y: 1} ribbonCount: 1 shadowBias: 0.5 worldSpace: 0 @@ -4027,6 +4035,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -4056,6 +4065,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 widthOverTrail: @@ -4143,6 +4153,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -4172,6 +4183,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 CustomDataModule: @@ -4210,6 +4222,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -4239,6 +4252,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 colorLabel0: Color @@ -4492,6 +4506,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -4521,6 +4536,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 colorLabel1: Color @@ -4758,6 +4774,9 @@ ParticleSystemRenderer: m_ReflectionProbeUsage: 0 m_RayTracingMode: 0 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4796,13 +4815,15 @@ ParticleSystemRenderer: m_RenderAlignment: 0 m_Pivot: {x: 0, y: 0, z: 0} m_Flip: {x: 0, y: 0, z: 0} - m_UseCustomVertexStreams: 0 m_EnableGPUInstancing: 1 m_ApplyActiveColorSpace: 1 m_AllowRoll: 1 m_FreeformStretching: 0 m_RotateWithStretchDirection: 1 + m_UseCustomVertexStreams: 0 m_VertexStreams: 00010304 + m_UseCustomTrailVertexStreams: 0 + m_TrailVertexStreams: 00010304 m_Mesh: {fileID: 0} m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} @@ -4842,6 +4863,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8787754652671033260} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0.1, y: 0, z: 0} m_LocalScale: {x: 0.06, y: 0.06, z: 0.06} @@ -4849,7 +4871,6 @@ Transform: m_Children: - {fileID: 9188011074838233835} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &8787754652671033232 MeshFilter: @@ -4876,6 +4897,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4909,9 +4933,17 @@ SphereCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8787754652671033260} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Radius: 1.3 m_Center: {x: 0, y: 0, z: 0} --- !u!82 &5611272847043470245 @@ -4925,6 +4957,7 @@ AudioSource: serializedVersion: 4 OutputAudioMixerGroup: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} m_audioClip: {fileID: 0} + m_Resource: {fileID: 0} m_PlayOnAwake: 0 m_Volume: 1 m_Pitch: 1 @@ -5024,13 +5057,11 @@ MonoBehaviour: m_EditorClassIdentifier: m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 0 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 1 m_AllowGazeSelect: 1 @@ -5063,42 +5094,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnHoverExited: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectEntered: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectExited: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectCanceled: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -5242,6 +5258,9 @@ MonoBehaviour: k__BackingField: 1 allowSelectByVoice: 1 speechRecognitionKeyword: select + k__BackingField: + m_PersistentCalls: + m_Calls: [] k__BackingField: 1 k__BackingField: 1 k__BackingField: diff --git a/UnityProjects/MRTKDevTemplate/Assets/Prefabs/EyeTrackingExamples/TargetSelection/EyeTracking_YellowTarget.prefab b/UnityProjects/MRTKDevTemplate/Assets/Prefabs/EyeTrackingExamples/TargetSelection/EyeTracking_YellowTarget.prefab index 942eb6966..0d067aba2 100644 --- a/UnityProjects/MRTKDevTemplate/Assets/Prefabs/EyeTrackingExamples/TargetSelection/EyeTracking_YellowTarget.prefab +++ b/UnityProjects/MRTKDevTemplate/Assets/Prefabs/EyeTrackingExamples/TargetSelection/EyeTracking_YellowTarget.prefab @@ -25,13 +25,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5296429810764919413} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7847039400930239022} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!198 &4509518621188683766 ParticleSystem: @@ -251,6 +251,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -280,6 +281,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 startSize: @@ -601,6 +603,7 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 randomizeRotationDirection: 0.26 + gravitySource: 0 maxNumParticles: 30 customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 @@ -1330,6 +1333,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -1359,6 +1363,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 UVModule: @@ -3579,6 +3584,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -3608,6 +3614,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 range: {x: 0, y: 1} @@ -3985,6 +3992,7 @@ ParticleSystem: m_RotationOrder: 4 minVertexDistance: 0.2 textureMode: 0 + textureScale: {x: 1, y: 1} ribbonCount: 1 shadowBias: 0.5 worldSpace: 0 @@ -4027,6 +4035,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -4056,6 +4065,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 widthOverTrail: @@ -4143,6 +4153,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -4172,6 +4183,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 CustomDataModule: @@ -4210,6 +4222,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -4239,6 +4252,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 colorLabel0: Color @@ -4492,6 +4506,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -4521,6 +4536,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 colorLabel1: Color @@ -4758,6 +4774,9 @@ ParticleSystemRenderer: m_ReflectionProbeUsage: 0 m_RayTracingMode: 0 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4796,13 +4815,15 @@ ParticleSystemRenderer: m_RenderAlignment: 0 m_Pivot: {x: 0, y: 0, z: 0} m_Flip: {x: 0, y: 0, z: 0} - m_UseCustomVertexStreams: 0 m_EnableGPUInstancing: 1 m_ApplyActiveColorSpace: 1 m_AllowRoll: 1 m_FreeformStretching: 0 m_RotateWithStretchDirection: 1 + m_UseCustomVertexStreams: 0 m_VertexStreams: 00010304 + m_UseCustomTrailVertexStreams: 0 + m_TrailVertexStreams: 00010304 m_Mesh: {fileID: 0} m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} @@ -4842,6 +4863,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7847039400930239025} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0.1, y: 0, z: 0} m_LocalScale: {x: 0.06, y: 0.06, z: 0.06} @@ -4849,7 +4871,6 @@ Transform: m_Children: - {fileID: 3203115201009251761} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &7847039400930239021 MeshFilter: @@ -4876,6 +4897,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4909,9 +4933,17 @@ SphereCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7847039400930239025} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Radius: 1.3 m_Center: {x: 0, y: 0, z: 0} --- !u!82 &483332623829893189 @@ -4925,6 +4957,7 @@ AudioSource: serializedVersion: 4 OutputAudioMixerGroup: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} m_audioClip: {fileID: 0} + m_Resource: {fileID: 0} m_PlayOnAwake: 0 m_Volume: 1 m_Pitch: 1 @@ -5024,13 +5057,11 @@ MonoBehaviour: m_EditorClassIdentifier: m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 0 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 1 m_AllowGazeSelect: 1 @@ -5063,42 +5094,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnHoverExited: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectEntered: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectExited: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectCanceled: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -5242,6 +5258,9 @@ MonoBehaviour: k__BackingField: 1 allowSelectByVoice: 1 speechRecognitionKeyword: select + k__BackingField: + m_PersistentCalls: + m_Calls: [] k__BackingField: 1 k__BackingField: 1 k__BackingField: diff --git a/UnityProjects/MRTKDevTemplate/Assets/Prefabs/EyeTrackingExamples/Visualizer/GazeVisualizerControls.prefab b/UnityProjects/MRTKDevTemplate/Assets/Prefabs/EyeTrackingExamples/Visualizer/GazeVisualizerControls.prefab index f56a7cc28..769dc7dee 100644 --- a/UnityProjects/MRTKDevTemplate/Assets/Prefabs/EyeTrackingExamples/Visualizer/GazeVisualizerControls.prefab +++ b/UnityProjects/MRTKDevTemplate/Assets/Prefabs/EyeTrackingExamples/Visualizer/GazeVisualizerControls.prefab @@ -23,6 +23,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 715919861} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -30,7 +31,6 @@ Transform: m_Children: - {fileID: 8237818351390515726} m_Father: {fileID: 7966308525794412797} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &191985091076322603 GameObject: @@ -55,6 +55,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 191985091076322603} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -62,7 +63,6 @@ Transform: m_Children: - {fileID: 847283648898560367} m_Father: {fileID: 7966308525794412797} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &760708550725870779 GameObject: @@ -89,13 +89,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 760708550725870779} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.11, y: 0.05, z: 0.02} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5853303421825090637} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &38410033959171080 MeshFilter: @@ -122,6 +122,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -170,6 +173,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1489465439754421922} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -0.0057} m_LocalScale: {x: 1, y: 1, z: 1} @@ -178,7 +182,6 @@ Transform: - {fileID: 6113648259023358418} - {fileID: 7966308525794412797} m_Father: {fileID: 5853303421825090637} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &5407173179125816706 GameObject: @@ -203,6 +206,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5407173179125816706} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0.025, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -212,7 +216,6 @@ Transform: - {fileID: 8189025005218568427} - {fileID: 715919862} m_Father: {fileID: 4198762078266477014} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &6745717655318747489 GameObject: @@ -245,7 +248,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5853303421825090637} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -269,6 +271,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -352,20 +357,23 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 00000000 m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 0 m_isCullingEnabled: 0 @@ -409,6 +417,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6802997350238223167} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -416,7 +425,6 @@ Transform: m_Children: - {fileID: 8237818351361965998} m_Father: {fileID: 6113648259023358418} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &6848819235249797219 GameObject: @@ -447,6 +455,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6848819235249797219} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0.5391, y: 0.0104, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -456,7 +465,6 @@ Transform: - {fileID: 8321243360356292476} - {fileID: 4198762078266477014} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &6681141328608613910 MonoBehaviour: @@ -505,6 +513,7 @@ MonoBehaviour: logStructure: {fileID: 9111033687875367441} userName: tester sessionDescription: Session00 + recordingUpdateStatusText: {fileID: 0} --- !u!114 &7861801676748397993 MonoBehaviour: m_ObjectHideFlags: 0 @@ -601,6 +610,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8061581585054467510} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0.025, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -609,7 +619,6 @@ Transform: - {fileID: 1193512509479148198} - {fileID: 5040661256948473030} m_Father: {fileID: 4198762078266477014} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &8310050747605233910 GameObject: @@ -634,6 +643,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8310050747605233910} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -641,7 +651,6 @@ Transform: m_Children: - {fileID: 8237818351523119923} m_Father: {fileID: 7966308525794412797} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &8650713101073464895 GameObject: @@ -666,6 +675,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8650713101073464895} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -673,13 +683,13 @@ Transform: m_Children: - {fileID: 5243915654612318504} m_Father: {fileID: 6113648259023358418} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1506125274296913025 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 8189025005218568427} m_Modifications: - target: {fileID: 1503546110793399400, guid: cd0f0697f0939504389ec612388f609a, type: 3} @@ -776,8 +786,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1503546110793399400, guid: cd0f0697f0939504389ec612388f609a, type: 3} propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: MixedReality.Toolkit.Examples.UserInputRecorderUIController, - Assembly-CSharp + value: MixedReality.Toolkit.Examples.UserInputRecorderUIController, Assembly-CSharp objectReference: {fileID: 0} - target: {fileID: 1503546110793399400, guid: cd0f0697f0939504389ec612388f609a, type: 3} propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[1].m_TargetAssemblyTypeName @@ -785,8 +794,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1503546110793399400, guid: cd0f0697f0939504389ec612388f609a, type: 3} propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[2].m_TargetAssemblyTypeName - value: MixedReality.Toolkit.Examples.UserInputRecorderUIController, - Assembly-CSharp + value: MixedReality.Toolkit.Examples.UserInputRecorderUIController, Assembly-CSharp objectReference: {fileID: 0} - target: {fileID: 1503546110793399400, guid: cd0f0697f0939504389ec612388f609a, type: 3} propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[3].m_TargetAssemblyTypeName @@ -836,10 +844,6 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} - - target: {fileID: 2244185731585867246, guid: cd0f0697f0939504389ec612388f609a, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - target: {fileID: 2244185731585867246, guid: cd0f0697f0939504389ec612388f609a, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 @@ -881,7 +885,7 @@ PrefabInstance: value: Icon 135 objectReference: {fileID: 0} - target: {fileID: 7855682163667943843, guid: cd0f0697f0939504389ec612388f609a, type: 3} - propertyPath: m_Materials.Array.data[0] + propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 5762245003366665926, guid: 9b0d0ee11ff70b04d901a29b519cbaa0, type: 2} - target: {fileID: 7867802180497734224, guid: cd0f0697f0939504389ec612388f609a, type: 3} @@ -893,6 +897,9 @@ PrefabInstance: value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: cd0f0697f0939504389ec612388f609a, type: 3} --- !u!4 &847283648898560367 stripped Transform: @@ -904,6 +911,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1193512509479148198} m_Modifications: - target: {fileID: 1503546110793399400, guid: cd0f0697f0939504389ec612388f609a, type: 3} @@ -1008,10 +1016,6 @@ PrefabInstance: propertyPath: m_Name value: RecordButton objectReference: {fileID: 0} - - target: {fileID: 2244185731585867246, guid: cd0f0697f0939504389ec612388f609a, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - target: {fileID: 2244185731585867246, guid: cd0f0697f0939504389ec612388f609a, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 @@ -1061,10 +1065,13 @@ PrefabInstance: value: Icon 128 objectReference: {fileID: 0} - target: {fileID: 7855682163667943843, guid: cd0f0697f0939504389ec612388f609a, type: 3} - propertyPath: m_Materials.Array.data[0] + propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 5762245003366665926, guid: 9b0d0ee11ff70b04d901a29b519cbaa0, type: 2} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: cd0f0697f0939504389ec612388f609a, type: 3} --- !u!4 &5243915654612318504 stripped Transform: @@ -1076,6 +1083,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4170012658089045370} m_Modifications: - target: {fileID: 1503546110793399400, guid: cd0f0697f0939504389ec612388f609a, type: 3} @@ -1172,8 +1180,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1503546110793399400, guid: cd0f0697f0939504389ec612388f609a, type: 3} propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: MixedReality.Toolkit.Examples.UserInputRecorderUIController, - Assembly-CSharp + value: MixedReality.Toolkit.Examples.UserInputRecorderUIController, Assembly-CSharp objectReference: {fileID: 0} - target: {fileID: 1503546110793399400, guid: cd0f0697f0939504389ec612388f609a, type: 3} propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[1].m_TargetAssemblyTypeName @@ -1181,8 +1188,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1503546110793399400, guid: cd0f0697f0939504389ec612388f609a, type: 3} propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[2].m_TargetAssemblyTypeName - value: MixedReality.Toolkit.Examples.UserInputRecorderUIController, - Assembly-CSharp + value: MixedReality.Toolkit.Examples.UserInputRecorderUIController, Assembly-CSharp objectReference: {fileID: 0} - target: {fileID: 1503546110793399400, guid: cd0f0697f0939504389ec612388f609a, type: 3} propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[3].m_TargetAssemblyTypeName @@ -1224,10 +1230,6 @@ PrefabInstance: propertyPath: m_Name value: ShowHeatmap objectReference: {fileID: 0} - - target: {fileID: 2244185731585867246, guid: cd0f0697f0939504389ec612388f609a, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - target: {fileID: 2244185731585867246, guid: cd0f0697f0939504389ec612388f609a, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 @@ -1257,10 +1259,13 @@ PrefabInstance: value: Icon 122 objectReference: {fileID: 0} - target: {fileID: 7855682163667943843, guid: cd0f0697f0939504389ec612388f609a, type: 3} - propertyPath: m_Materials.Array.data[0] + propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 5762245003366665926, guid: 9b0d0ee11ff70b04d901a29b519cbaa0, type: 2} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: cd0f0697f0939504389ec612388f609a, type: 3} --- !u!4 &8237818351523119923 stripped Transform: @@ -1272,6 +1277,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 5040661256948473030} m_Modifications: - target: {fileID: 1503546110793399400, guid: cd0f0697f0939504389ec612388f609a, type: 3} @@ -1376,10 +1382,6 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} - - target: {fileID: 2244185731585867246, guid: cd0f0697f0939504389ec612388f609a, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - target: {fileID: 2244185731585867246, guid: cd0f0697f0939504389ec612388f609a, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 @@ -1425,10 +1427,13 @@ PrefabInstance: value: Icon 128 objectReference: {fileID: 0} - target: {fileID: 7855682163667943843, guid: cd0f0697f0939504389ec612388f609a, type: 3} - propertyPath: m_Materials.Array.data[0] + propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 5762245003366665926, guid: 9b0d0ee11ff70b04d901a29b519cbaa0, type: 2} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: cd0f0697f0939504389ec612388f609a, type: 3} --- !u!4 &8237818351361965998 stripped Transform: @@ -1440,6 +1445,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 715919862} m_Modifications: - target: {fileID: 1503546110793399400, guid: cd0f0697f0939504389ec612388f609a, type: 3} @@ -1536,8 +1542,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1503546110793399400, guid: cd0f0697f0939504389ec612388f609a, type: 3} propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: MixedReality.Toolkit.Examples.UserInputRecorderUIController, - Assembly-CSharp + value: MixedReality.Toolkit.Examples.UserInputRecorderUIController, Assembly-CSharp objectReference: {fileID: 0} - target: {fileID: 1503546110793399400, guid: cd0f0697f0939504389ec612388f609a, type: 3} propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[1].m_TargetAssemblyTypeName @@ -1545,8 +1550,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1503546110793399400, guid: cd0f0697f0939504389ec612388f609a, type: 3} propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[2].m_TargetAssemblyTypeName - value: MixedReality.Toolkit.Examples.UserInputRecorderUIController, - Assembly-CSharp + value: MixedReality.Toolkit.Examples.UserInputRecorderUIController, Assembly-CSharp objectReference: {fileID: 0} - target: {fileID: 1503546110793399400, guid: cd0f0697f0939504389ec612388f609a, type: 3} propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[3].m_TargetAssemblyTypeName @@ -1596,10 +1600,6 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} - - target: {fileID: 2244185731585867246, guid: cd0f0697f0939504389ec612388f609a, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - target: {fileID: 2244185731585867246, guid: cd0f0697f0939504389ec612388f609a, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 @@ -1641,7 +1641,7 @@ PrefabInstance: value: Icon 123 objectReference: {fileID: 0} - target: {fileID: 7855682163667943843, guid: cd0f0697f0939504389ec612388f609a, type: 3} - propertyPath: m_Materials.Array.data[0] + propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 5762245003366665926, guid: 9b0d0ee11ff70b04d901a29b519cbaa0, type: 2} - target: {fileID: 7867802180497734224, guid: cd0f0697f0939504389ec612388f609a, type: 3} @@ -1653,6 +1653,9 @@ PrefabInstance: value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: cd0f0697f0939504389ec612388f609a, type: 3} --- !u!4 &8237818351390515726 stripped Transform: diff --git a/UnityProjects/MRTKDevTemplate/Assets/Prefabs/EyeTrackingExamples/Visualizer/LiveTrackingSample.prefab b/UnityProjects/MRTKDevTemplate/Assets/Prefabs/EyeTrackingExamples/Visualizer/LiveTrackingSample.prefab index 67ed72cdc..9dc108fd4 100644 --- a/UnityProjects/MRTKDevTemplate/Assets/Prefabs/EyeTrackingExamples/Visualizer/LiveTrackingSample.prefab +++ b/UnityProjects/MRTKDevTemplate/Assets/Prefabs/EyeTrackingExamples/Visualizer/LiveTrackingSample.prefab @@ -31,7 +31,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3418961756318920917} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -55,6 +54,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -138,20 +140,23 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 00000000 m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 0 m_isCullingEnabled: 0 @@ -200,13 +205,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1524931721158149769} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: -0.036, z: -0.01} m_LocalScale: {x: 0.65, y: 0.35, z: 0.8} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3418961756318920917} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &1524931721158149767 MeshFilter: @@ -233,6 +238,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -266,9 +274,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1524931721158149769} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 1, y: 1, z: 0.029271265} m_Center: {x: 0, y: 0, z: 0.010364364} --- !u!114 &1524931721158149770 @@ -328,13 +344,11 @@ MonoBehaviour: m_EditorClassIdentifier: m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 0 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 1 m_AllowGazeSelect: 0 @@ -367,42 +381,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnHoverEntered: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_OnHoverExited: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectEntered: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectExited: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -513,6 +512,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3200108193205774659} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0.339, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -523,7 +523,6 @@ Transform: - {fileID: 1524931721158149768} - {fileID: 3751761886644870978} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &7848041548806294287 MonoBehaviour: @@ -564,13 +563,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4301555257635212231} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: -0.036, z: -0.005} m_LocalScale: {x: 0.65, y: 0.35, z: 0.8} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3418961756318920917} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &5603803493961850458 MeshFilter: @@ -597,6 +596,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -690,13 +692,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4694296363121765674} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.75, y: 0.5, z: 0.04} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3418961756318920917} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &2906717128514655833 MeshFilter: @@ -723,6 +725,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: diff --git a/UnityProjects/MRTKDevTemplate/Assets/Prefabs/EyeTrackingExamples/Visualizer/RecordingSample.prefab b/UnityProjects/MRTKDevTemplate/Assets/Prefabs/EyeTrackingExamples/Visualizer/RecordingSample.prefab index 137620cea..39790cdb4 100644 --- a/UnityProjects/MRTKDevTemplate/Assets/Prefabs/EyeTrackingExamples/Visualizer/RecordingSample.prefab +++ b/UnityProjects/MRTKDevTemplate/Assets/Prefabs/EyeTrackingExamples/Visualizer/RecordingSample.prefab @@ -25,13 +25,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1689964858371251601} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.75, y: 0.5, z: 0.04} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8729132920210686062} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &9079310097581319906 MeshFilter: @@ -58,6 +58,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -114,7 +117,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8729132920210686062} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -138,6 +140,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -221,20 +226,23 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 00000000 m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 0 m_isCullingEnabled: 0 @@ -286,7 +294,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8729132920210686062} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -310,6 +317,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -393,20 +403,23 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 00000000 m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 0 m_isCullingEnabled: 0 @@ -455,13 +468,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4863657714435241522} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: -0.036, z: -0.01} m_LocalScale: {x: 0.65, y: 0.35, z: 0.8} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8729132920210686062} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &4863657714435241532 MeshFilter: @@ -488,6 +501,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -521,9 +537,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4863657714435241522} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 1, y: 1, z: 0.029271265} m_Center: {x: 0, y: 0, z: 0.010364364} --- !u!114 &4863657714435241521 @@ -583,13 +607,11 @@ MonoBehaviour: m_EditorClassIdentifier: m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 0 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 1 m_AllowGazeSelect: 0 @@ -622,42 +644,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnHoverExited: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectEntered: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectExited: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectCanceled: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -770,13 +777,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7918658594140388220} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: -0.036, z: -0.005} m_LocalScale: {x: 0.65, y: 0.35, z: 0.8} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8729132920210686062} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &1986718728903667425 MeshFilter: @@ -803,6 +810,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -895,6 +905,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8808929598776777208} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0.8042, y: 0.339, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -906,7 +917,6 @@ Transform: - {fileID: 4863657714435241523} - {fileID: 7081457625284112377} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &4233194032211196852 MonoBehaviour: diff --git a/UnityProjects/MRTKDevTemplate/Assets/Prefabs/EyeTrackingExamples/Visualizer/TitleBar.prefab b/UnityProjects/MRTKDevTemplate/Assets/Prefabs/EyeTrackingExamples/Visualizer/TitleBar.prefab index 97d9bec15..01f41bc28 100644 --- a/UnityProjects/MRTKDevTemplate/Assets/Prefabs/EyeTrackingExamples/Visualizer/TitleBar.prefab +++ b/UnityProjects/MRTKDevTemplate/Assets/Prefabs/EyeTrackingExamples/Visualizer/TitleBar.prefab @@ -31,7 +31,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4345256064901925368} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -55,6 +54,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -122,7 +124,7 @@ MonoBehaviour: m_spriteAsset: {fileID: 0} m_tintAllSprites: 0 m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: 2451216 + m_TextStyleHashCode: -1183493901 m_overrideHtmlColors: 0 m_faceColor: serializedVersion: 2 @@ -138,20 +140,23 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 0 m_isCullingEnabled: 0 @@ -196,6 +201,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3638217883559720406} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0.129, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -205,7 +211,6 @@ Transform: - {fileID: 2165265580557114057} - {fileID: 6283243792239002723} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &3588878034339634083 MonoBehaviour: @@ -245,13 +250,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7492014267416176910} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.352, y: 0.032, z: 0.02} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4345256064901925368} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &7925801624542624189 MeshFilter: @@ -278,6 +283,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -326,6 +334,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8781398875331709719} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -333,23 +342,19 @@ Transform: m_Children: - {fileID: 2715757078020306077} m_Father: {fileID: 4345256064901925368} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &4221207263471978867 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 6283243792239002723} m_Modifications: - target: {fileID: 2244185731031694095, guid: cd0f0697f0939504389ec612388f609a, type: 3} propertyPath: m_Name value: IconButton_32x32mm objectReference: {fileID: 0} - - target: {fileID: 2244185731585867246, guid: cd0f0697f0939504389ec612388f609a, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - target: {fileID: 2244185731585867246, guid: cd0f0697f0939504389ec612388f609a, type: 3} propertyPath: m_LocalPosition.x value: 0.1537 @@ -390,7 +395,22 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 6397459067767180594, guid: cd0f0697f0939504389ec612388f609a, type: 3} + propertyPath: m_sharedMaterial + value: + objectReference: {fileID: 5762245003366665926, guid: 9b0d0ee11ff70b04d901a29b519cbaa0, type: 2} + - target: {fileID: 6397459067767180594, guid: cd0f0697f0939504389ec612388f609a, type: 3} + propertyPath: m_hasFontAssetChanged + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7855682163667943843, guid: cd0f0697f0939504389ec612388f609a, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 5762245003366665926, guid: 9b0d0ee11ff70b04d901a29b519cbaa0, type: 2} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: cd0f0697f0939504389ec612388f609a, type: 3} --- !u!4 &2715757078020306077 stripped Transform: diff --git a/UnityProjects/MRTKDevTemplate/Assets/Prefabs/MagicWindow/MagicWindowExample.prefab b/UnityProjects/MRTKDevTemplate/Assets/Prefabs/MagicWindow/MagicWindowExample.prefab index 5e93e8b1d..cacc1bf86 100644 --- a/UnityProjects/MRTKDevTemplate/Assets/Prefabs/MagicWindow/MagicWindowExample.prefab +++ b/UnityProjects/MRTKDevTemplate/Assets/Prefabs/MagicWindow/MagicWindowExample.prefab @@ -26,13 +26,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1484624265136325994} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0.02075, y: -0.03762, z: 0.00014997} m_LocalScale: {x: 0.22297047, y: 0.15545277, z: 0.017} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8848900189972289685} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &9072984819814596121 MeshFilter: @@ -59,6 +59,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -92,9 +95,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1484624265136325994} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 1, y: 0.99999994, z: 0.1} m_Center: {x: 0, y: 0.000000074505806, z: 0.05} --- !u!1 &4654093213744493649 @@ -128,7 +139,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8848900189972289685} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -152,6 +162,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -237,20 +250,23 @@ MonoBehaviour: m_VerticalAlignment: 256 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 0 m_isCullingEnabled: 0 @@ -302,7 +318,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8848900189972289685} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -326,6 +341,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -409,20 +427,23 @@ MonoBehaviour: m_VerticalAlignment: 256 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 0 + m_TextWrappingMode: 0 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 0 m_isCullingEnabled: 0 @@ -468,13 +489,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4654093214782437221} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0.02063, y: -0.034449995, z: 0} m_LocalScale: {x: 1.0868015, y: 1.2879614, z: 0.004541254} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8848900189972289685} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &4654093214782437225 MeshFilter: @@ -501,6 +522,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -553,6 +577,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8779236679572472067} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -563,20 +588,19 @@ Transform: - {fileID: 4654093214401527389} - {fileID: 4654093213744493648} - {fileID: 662020072547169849} - - {fileID: 5312381282986474911} - - {fileID: 5312381281782279890} - - {fileID: 5312381281846480599} - - {fileID: 5312381282252256335} - - {fileID: 5312381281698606303} - - {fileID: 5312381281107156725} - - {fileID: 5312381282971670854} - - {fileID: 5312381281211732380} - - {fileID: 5312381282205253169} - - {fileID: 5312381282368505068} - - {fileID: 5312381282262772874} - - {fileID: 5312381281389662747} + - {fileID: 4615129974820844202} + - {fileID: 4615129975714128359} + - {fileID: 4615129975690314210} + - {fileID: 4615129975244716922} + - {fileID: 4615129975563477994} + - {fileID: 4615129976162750912} + - {fileID: 4615129974802110067} + - {fileID: 4615129976284176041} + - {fileID: 4615129975063097604} + - {fileID: 4615129975159376857} + - {fileID: 4615129975234192319} + - {fileID: 4615129976374156590} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &4131723327490007887 MonoBehaviour: @@ -602,6 +626,7 @@ AudioSource: serializedVersion: 4 OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 0} + m_Resource: {fileID: 0} m_PlayOnAwake: 1 m_Volume: 1 m_Pitch: 1 @@ -716,13 +741,11 @@ MonoBehaviour: m_InteractionManager: {fileID: 0} m_Colliders: - {fileID: 4654093214276311286} - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 1 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -755,42 +778,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_Deactivated: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnLastHoverExited: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectEntered: - m_PersistentCalls: - m_Calls: [] - m_OnSelectExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -1033,6 +1041,9 @@ MonoBehaviour: k__BackingField: 1 allowSelectByVoice: 1 speechRecognitionKeyword: select + k__BackingField: + m_PersistentCalls: + m_Calls: [] k__BackingField: 1 k__BackingField: 0 k__BackingField: @@ -1055,6 +1066,7 @@ MonoBehaviour: hostTransform: {fileID: 8848900189972289685} allowedManipulations: 7 allowedInteractionTypes: -2147483641 + rigidbodyMovementType: 0 applyTorque: 1 springForceSoftness: 0.1 springTorqueSoftness: 0.1 @@ -1077,8 +1089,7 @@ MonoBehaviour: moveLogicType: reference: MixedReality.Toolkit.SpatialManipulation.MoveLogic, MixedReality.Toolkit.SpatialManipulation rotateLogicType: - reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, - MixedReality.Toolkit.SpatialManipulation + reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, MixedReality.Toolkit.SpatialManipulation scaleLogicType: reference: MixedReality.Toolkit.SpatialManipulation.ScaleLogic, MixedReality.Toolkit.SpatialManipulation --- !u!1001 &244079199 @@ -1086,77 +1097,61 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 8848900189972289685} m_Modifications: - - target: {fileID: -4112578708967584890, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: e22eb6b0759a80d4e84be02ff377a943, type: 2} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} - propertyPath: m_RootOrder - value: 16 - objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} - propertyPath: m_LocalScale.x - value: 0.036755227 - objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} - propertyPath: m_LocalScale.y - value: 0.036755227 - objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} - propertyPath: m_LocalScale.z - value: 0.036755227 + - target: {fileID: -5028662342597560935, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + propertyPath: m_Name + value: MRTK_Logo_Number3 objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + - target: {fileID: -4608242060304742543, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} propertyPath: m_LocalPosition.x - value: -0.0163 + value: 0 objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + - target: {fileID: -4608242060304742543, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} propertyPath: m_LocalPosition.y - value: -0.024 + value: 0 objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + - target: {fileID: -4608242060304742543, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} propertyPath: m_LocalPosition.z - value: 0.2301 + value: 0 objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + - target: {fileID: -4608242060304742543, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} propertyPath: m_LocalRotation.w - value: 0.7071068 + value: 0.49999997 objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + - target: {fileID: -4608242060304742543, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: 0.5 objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + - target: {fileID: -4608242060304742543, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} propertyPath: m_LocalRotation.y - value: -0.7071068 + value: -0.5 objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + - target: {fileID: -4608242060304742543, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: 0.5 objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + - target: {fileID: -4608242060304742543, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + - target: {fileID: -4608242060304742543, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: -90 + value: 0 objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + - target: {fileID: -4608242060304742543, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 8771091787928289351, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} - propertyPath: m_Name - value: MRTK_Log_Number3 (11) - objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: -4161369568681901532, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} ---- !u!4 &5312381281389662747 stripped +--- !u!4 &4615129976374156590 stripped Transform: - m_CorrespondingSourceObject: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + m_CorrespondingSourceObject: {fileID: -4608242060304742543, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} m_PrefabInstance: {fileID: 244079199} m_PrefabAsset: {fileID: 0} --- !u!1001 &271145432 @@ -1164,77 +1159,61 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 8848900189972289685} m_Modifications: - - target: {fileID: -4112578708967584890, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: e22eb6b0759a80d4e84be02ff377a943, type: 2} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} - propertyPath: m_RootOrder - value: 12 - objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} - propertyPath: m_LocalScale.x - value: 0.07740959 - objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} - propertyPath: m_LocalScale.y - value: 0.07740959 - objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} - propertyPath: m_LocalScale.z - value: 0.07740959 + - target: {fileID: -5028662342597560935, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + propertyPath: m_Name + value: MRTK_Logo_Number3 objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + - target: {fileID: -4608242060304742543, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} propertyPath: m_LocalPosition.x - value: 0.075941 + value: 0 objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + - target: {fileID: -4608242060304742543, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} propertyPath: m_LocalPosition.y - value: -0.0203 + value: 0 objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + - target: {fileID: -4608242060304742543, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} propertyPath: m_LocalPosition.z - value: 0.1254 + value: 0 objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + - target: {fileID: -4608242060304742543, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} propertyPath: m_LocalRotation.w - value: 0.7071068 + value: 0.49999997 objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + - target: {fileID: -4608242060304742543, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: 0.5 objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + - target: {fileID: -4608242060304742543, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} propertyPath: m_LocalRotation.y - value: -0.7071068 + value: -0.5 objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + - target: {fileID: -4608242060304742543, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: 0.5 objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + - target: {fileID: -4608242060304742543, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + - target: {fileID: -4608242060304742543, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: -90 + value: 0 objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + - target: {fileID: -4608242060304742543, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 8771091787928289351, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} - propertyPath: m_Name - value: MRTK_Log_Number3 (7) - objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: -4161369568681901532, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} ---- !u!4 &5312381281211732380 stripped +--- !u!4 &4615129976284176041 stripped Transform: - m_CorrespondingSourceObject: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + m_CorrespondingSourceObject: {fileID: -4608242060304742543, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} m_PrefabInstance: {fileID: 271145432} m_PrefabAsset: {fileID: 0} --- !u!1001 &435525297 @@ -1242,77 +1221,61 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 8848900189972289685} m_Modifications: - - target: {fileID: -4112578708967584890, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: e22eb6b0759a80d4e84be02ff377a943, type: 2} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} - propertyPath: m_RootOrder - value: 10 - objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} - propertyPath: m_LocalScale.x - value: 0.025584873 - objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} - propertyPath: m_LocalScale.y - value: 0.025584873 - objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} - propertyPath: m_LocalScale.z - value: 0.025584873 + - target: {fileID: -5028662342597560935, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + propertyPath: m_Name + value: MRTK_Logo_Number3 objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + - target: {fileID: -4608242060304742543, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} propertyPath: m_LocalPosition.x - value: 0.0646 + value: 0 objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + - target: {fileID: -4608242060304742543, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} propertyPath: m_LocalPosition.y - value: -0.0713 + value: 0 objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + - target: {fileID: -4608242060304742543, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} propertyPath: m_LocalPosition.z - value: 0.0827 + value: 0 objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + - target: {fileID: -4608242060304742543, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} propertyPath: m_LocalRotation.w - value: 0.7071068 + value: 0.49999997 objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + - target: {fileID: -4608242060304742543, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: 0.5 objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + - target: {fileID: -4608242060304742543, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} propertyPath: m_LocalRotation.y - value: -0.7071068 + value: -0.5 objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + - target: {fileID: -4608242060304742543, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: 0.5 objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + - target: {fileID: -4608242060304742543, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + - target: {fileID: -4608242060304742543, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: -90 + value: 0 objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + - target: {fileID: -4608242060304742543, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 8771091787928289351, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} - propertyPath: m_Name - value: MRTK_Log_Number3 (5) - objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: -4161369568681901532, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} ---- !u!4 &5312381281107156725 stripped +--- !u!4 &4615129976162750912 stripped Transform: - m_CorrespondingSourceObject: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + m_CorrespondingSourceObject: {fileID: -4608242060304742543, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} m_PrefabInstance: {fileID: 435525297} m_PrefabAsset: {fileID: 0} --- !u!1001 &901957267 @@ -1320,77 +1283,61 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 8848900189972289685} m_Modifications: - - target: {fileID: -4112578708967584890, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: e22eb6b0759a80d4e84be02ff377a943, type: 2} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} - propertyPath: m_RootOrder - value: 7 - objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} - propertyPath: m_LocalScale.x - value: 0.025584873 - objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} - propertyPath: m_LocalScale.y - value: 0.025584873 - objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} - propertyPath: m_LocalScale.z - value: 0.025584873 + - target: {fileID: -5028662342597560935, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + propertyPath: m_Name + value: MRTK_Logo_Number3 objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + - target: {fileID: -4608242060304742543, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} propertyPath: m_LocalPosition.x - value: -0.0615 + value: 0 objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + - target: {fileID: -4608242060304742543, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} propertyPath: m_LocalPosition.y - value: -0.088041 + value: 0 objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + - target: {fileID: -4608242060304742543, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} propertyPath: m_LocalPosition.z - value: 0.2024 + value: 0 objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + - target: {fileID: -4608242060304742543, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} propertyPath: m_LocalRotation.w - value: 0.7071068 + value: 0.49999997 objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + - target: {fileID: -4608242060304742543, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: 0.5 objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + - target: {fileID: -4608242060304742543, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} propertyPath: m_LocalRotation.y - value: -0.7071068 + value: -0.5 objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + - target: {fileID: -4608242060304742543, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: 0.5 objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + - target: {fileID: -4608242060304742543, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + - target: {fileID: -4608242060304742543, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: -90 + value: 0 objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + - target: {fileID: -4608242060304742543, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 8771091787928289351, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} - propertyPath: m_Name - value: MRTK_Log_Number3 (2) - objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: -4161369568681901532, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} ---- !u!4 &5312381281846480599 stripped +--- !u!4 &4615129975690314210 stripped Transform: - m_CorrespondingSourceObject: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + m_CorrespondingSourceObject: {fileID: -4608242060304742543, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} m_PrefabInstance: {fileID: 901957267} m_PrefabAsset: {fileID: 0} --- !u!1001 &909584022 @@ -1398,77 +1345,61 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 8848900189972289685} m_Modifications: - - target: {fileID: -4112578708967584890, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: e22eb6b0759a80d4e84be02ff377a943, type: 2} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} - propertyPath: m_RootOrder - value: 6 - objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} - propertyPath: m_LocalScale.x - value: 0.04411185 - objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} - propertyPath: m_LocalScale.y - value: 0.04411185 - objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} - propertyPath: m_LocalScale.z - value: 0.04411185 + - target: {fileID: -5028662342597560935, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + propertyPath: m_Name + value: MRTK_Logo_Number3 objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + - target: {fileID: -4608242060304742543, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} propertyPath: m_LocalPosition.x - value: 0.18988 + value: 0 objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + - target: {fileID: -4608242060304742543, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} propertyPath: m_LocalPosition.y - value: -0.07828 + value: 0 objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + - target: {fileID: -4608242060304742543, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} propertyPath: m_LocalPosition.z - value: 0.2024 + value: 0 objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + - target: {fileID: -4608242060304742543, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} propertyPath: m_LocalRotation.w - value: 0.7071068 + value: 0.49999997 objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + - target: {fileID: -4608242060304742543, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: 0.5 objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + - target: {fileID: -4608242060304742543, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} propertyPath: m_LocalRotation.y - value: -0.7071068 + value: -0.5 objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + - target: {fileID: -4608242060304742543, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: 0.5 objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + - target: {fileID: -4608242060304742543, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + - target: {fileID: -4608242060304742543, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: -90 + value: 0 objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + - target: {fileID: -4608242060304742543, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 8771091787928289351, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} - propertyPath: m_Name - value: MRTK_Log_Number3 (1) - objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: -4161369568681901532, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} ---- !u!4 &5312381281782279890 stripped +--- !u!4 &4615129975714128359 stripped Transform: - m_CorrespondingSourceObject: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + m_CorrespondingSourceObject: {fileID: -4608242060304742543, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} m_PrefabInstance: {fileID: 909584022} m_PrefabAsset: {fileID: 0} --- !u!1001 &1026712731 @@ -1476,77 +1407,61 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 8848900189972289685} m_Modifications: - - target: {fileID: -4112578708967584890, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: e22eb6b0759a80d4e84be02ff377a943, type: 2} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} - propertyPath: m_RootOrder - value: 9 - objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} - propertyPath: m_LocalScale.x - value: 0.06750437 - objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} - propertyPath: m_LocalScale.y - value: 0.06750437 - objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} - propertyPath: m_LocalScale.z - value: 0.06750437 + - target: {fileID: -5028662342597560935, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + propertyPath: m_Name + value: MRTK_Logo_Number3 objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + - target: {fileID: -4608242060304742543, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} propertyPath: m_LocalPosition.x - value: -0.0219 + value: 0 objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + - target: {fileID: -4608242060304742543, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} propertyPath: m_LocalPosition.y - value: -0.19001 + value: 0 objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + - target: {fileID: -4608242060304742543, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} propertyPath: m_LocalPosition.z - value: 0.3023 + value: 0 objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + - target: {fileID: -4608242060304742543, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} propertyPath: m_LocalRotation.w - value: 0.7071068 + value: 0.49999997 objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + - target: {fileID: -4608242060304742543, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: 0.5 objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + - target: {fileID: -4608242060304742543, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} propertyPath: m_LocalRotation.y - value: -0.7071068 + value: -0.5 objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + - target: {fileID: -4608242060304742543, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: 0.5 objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + - target: {fileID: -4608242060304742543, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + - target: {fileID: -4608242060304742543, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: -90 + value: 0 objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + - target: {fileID: -4608242060304742543, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 8771091787928289351, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} - propertyPath: m_Name - value: MRTK_Log_Number3 (4) - objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: -4161369568681901532, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} ---- !u!4 &5312381281698606303 stripped +--- !u!4 &4615129975563477994 stripped Transform: - m_CorrespondingSourceObject: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + m_CorrespondingSourceObject: {fileID: -4608242060304742543, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} m_PrefabInstance: {fileID: 1026712731} m_PrefabAsset: {fileID: 0} --- !u!1001 &1379040267 @@ -1554,77 +1469,61 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 8848900189972289685} m_Modifications: - - target: {fileID: -4112578708967584890, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: e22eb6b0759a80d4e84be02ff377a943, type: 2} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} - propertyPath: m_RootOrder - value: 8 - objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} - propertyPath: m_LocalScale.x - value: 0.04411185 - objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} - propertyPath: m_LocalScale.y - value: 0.04411185 - objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} - propertyPath: m_LocalScale.z - value: 0.04411185 + - target: {fileID: -5028662342597560935, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + propertyPath: m_Name + value: MRTK_Logo_Number3 objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + - target: {fileID: -4608242060304742543, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} propertyPath: m_LocalPosition.x - value: 0.0114 + value: 0 objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + - target: {fileID: -4608242060304742543, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} propertyPath: m_LocalPosition.y - value: -0.1198 + value: 0 objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + - target: {fileID: -4608242060304742543, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} propertyPath: m_LocalPosition.z - value: 0.3023 + value: 0 objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + - target: {fileID: -4608242060304742543, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} propertyPath: m_LocalRotation.w - value: 0.7071068 + value: 0.49999997 objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + - target: {fileID: -4608242060304742543, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: 0.5 objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + - target: {fileID: -4608242060304742543, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} propertyPath: m_LocalRotation.y - value: -0.7071068 + value: -0.5 objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + - target: {fileID: -4608242060304742543, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: 0.5 objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + - target: {fileID: -4608242060304742543, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + - target: {fileID: -4608242060304742543, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: -90 + value: 0 objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + - target: {fileID: -4608242060304742543, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 8771091787928289351, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} - propertyPath: m_Name - value: MRTK_Log_Number3 (3) - objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: -4161369568681901532, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} ---- !u!4 &5312381282252256335 stripped +--- !u!4 &4615129975244716922 stripped Transform: - m_CorrespondingSourceObject: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + m_CorrespondingSourceObject: {fileID: -4608242060304742543, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} m_PrefabInstance: {fileID: 1379040267} m_PrefabAsset: {fileID: 0} --- !u!1001 &1385358542 @@ -1632,77 +1531,61 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 8848900189972289685} m_Modifications: - - target: {fileID: -4112578708967584890, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: e22eb6b0759a80d4e84be02ff377a943, type: 2} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} - propertyPath: m_RootOrder - value: 15 - objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} - propertyPath: m_LocalScale.x - value: 0.036755227 - objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} - propertyPath: m_LocalScale.y - value: 0.036755227 - objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} - propertyPath: m_LocalScale.z - value: 0.036755227 + - target: {fileID: -5028662342597560935, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + propertyPath: m_Name + value: MRTK_Logo_Number3 objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + - target: {fileID: -4608242060304742543, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} propertyPath: m_LocalPosition.x - value: -0.039239 + value: 0 objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + - target: {fileID: -4608242060304742543, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} propertyPath: m_LocalPosition.y - value: -0.063769 + value: 0 objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + - target: {fileID: -4608242060304742543, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} propertyPath: m_LocalPosition.z - value: 0.3114 + value: 0 objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + - target: {fileID: -4608242060304742543, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} propertyPath: m_LocalRotation.w - value: 0.7071068 + value: 0.49999997 objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + - target: {fileID: -4608242060304742543, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: 0.5 objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + - target: {fileID: -4608242060304742543, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} propertyPath: m_LocalRotation.y - value: -0.7071068 + value: -0.5 objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + - target: {fileID: -4608242060304742543, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: 0.5 objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + - target: {fileID: -4608242060304742543, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + - target: {fileID: -4608242060304742543, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: -90 + value: 0 objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + - target: {fileID: -4608242060304742543, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 8771091787928289351, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} - propertyPath: m_Name - value: MRTK_Log_Number3 (10) - objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: -4161369568681901532, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} ---- !u!4 &5312381282262772874 stripped +--- !u!4 &4615129975234192319 stripped Transform: - m_CorrespondingSourceObject: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + m_CorrespondingSourceObject: {fileID: -4608242060304742543, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} m_PrefabInstance: {fileID: 1385358542} m_PrefabAsset: {fileID: 0} --- !u!1001 &1428442280 @@ -1710,77 +1593,61 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 8848900189972289685} m_Modifications: - - target: {fileID: -4112578708967584890, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: e22eb6b0759a80d4e84be02ff377a943, type: 2} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} - propertyPath: m_RootOrder - value: 14 - objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} - propertyPath: m_LocalScale.x - value: 0.025143756 - objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} - propertyPath: m_LocalScale.y - value: 0.025143756 - objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} - propertyPath: m_LocalScale.z - value: 0.025143756 + - target: {fileID: -5028662342597560935, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + propertyPath: m_Name + value: MRTK_Logo_Number3 objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + - target: {fileID: -4608242060304742543, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} propertyPath: m_LocalPosition.x - value: 0.11046 + value: 0 objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + - target: {fileID: -4608242060304742543, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} propertyPath: m_LocalPosition.y - value: -0.061527 + value: 0 objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + - target: {fileID: -4608242060304742543, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} propertyPath: m_LocalPosition.z - value: 0.2024 + value: 0 objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + - target: {fileID: -4608242060304742543, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} propertyPath: m_LocalRotation.w - value: 0.7071068 + value: 0.49999997 objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + - target: {fileID: -4608242060304742543, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: 0.5 objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + - target: {fileID: -4608242060304742543, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} propertyPath: m_LocalRotation.y - value: -0.7071068 + value: -0.5 objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + - target: {fileID: -4608242060304742543, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: 0.5 objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + - target: {fileID: -4608242060304742543, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + - target: {fileID: -4608242060304742543, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: -90 + value: 0 objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + - target: {fileID: -4608242060304742543, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 8771091787928289351, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} - propertyPath: m_Name - value: MRTK_Log_Number3 (9) - objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: -4161369568681901532, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} ---- !u!4 &5312381282368505068 stripped +--- !u!4 &4615129975159376857 stripped Transform: - m_CorrespondingSourceObject: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + m_CorrespondingSourceObject: {fileID: -4608242060304742543, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} m_PrefabInstance: {fileID: 1428442280} m_PrefabAsset: {fileID: 0} --- !u!1001 &1600206453 @@ -1788,77 +1655,61 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 8848900189972289685} m_Modifications: - - target: {fileID: -4112578708967584890, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: e22eb6b0759a80d4e84be02ff377a943, type: 2} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} - propertyPath: m_RootOrder - value: 13 - objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} - propertyPath: m_LocalScale.x - value: 0.26617286 - objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} - propertyPath: m_LocalScale.y - value: 0.26617286 - objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} - propertyPath: m_LocalScale.z - value: 0.26617286 + - target: {fileID: -5028662342597560935, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + propertyPath: m_Name + value: MRTK_Logo_Number3 objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + - target: {fileID: -4608242060304742543, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} propertyPath: m_LocalPosition.x - value: -0.1647 + value: 0 objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + - target: {fileID: -4608242060304742543, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} propertyPath: m_LocalPosition.y - value: -0.0948 + value: 0 objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + - target: {fileID: -4608242060304742543, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} propertyPath: m_LocalPosition.z - value: 0.2478 + value: 0 objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + - target: {fileID: -4608242060304742543, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} propertyPath: m_LocalRotation.w - value: 0.7071068 + value: 0.49999997 objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + - target: {fileID: -4608242060304742543, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: 0.5 objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + - target: {fileID: -4608242060304742543, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} propertyPath: m_LocalRotation.y - value: -0.7071068 + value: -0.5 objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + - target: {fileID: -4608242060304742543, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: 0.5 objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + - target: {fileID: -4608242060304742543, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + - target: {fileID: -4608242060304742543, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: -90 + value: 0 objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + - target: {fileID: -4608242060304742543, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 8771091787928289351, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} - propertyPath: m_Name - value: MRTK_Log_Number3 (8) - objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: -4161369568681901532, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} ---- !u!4 &5312381282205253169 stripped +--- !u!4 &4615129975063097604 stripped Transform: - m_CorrespondingSourceObject: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + m_CorrespondingSourceObject: {fileID: -4608242060304742543, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} m_PrefabInstance: {fileID: 1600206453} m_PrefabAsset: {fileID: 0} --- !u!1001 &1758712066 @@ -1866,77 +1717,61 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 8848900189972289685} m_Modifications: - - target: {fileID: -4112578708967584890, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: e22eb6b0759a80d4e84be02ff377a943, type: 2} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} - propertyPath: m_RootOrder - value: 11 - objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} - propertyPath: m_LocalScale.x - value: 0.025584873 - objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} - propertyPath: m_LocalScale.y - value: 0.025584873 - objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} - propertyPath: m_LocalScale.z - value: 0.025584873 + - target: {fileID: -5028662342597560935, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + propertyPath: m_Name + value: MRTK_Logo_Number3 objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + - target: {fileID: -4608242060304742543, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} propertyPath: m_LocalPosition.x - value: -0.0372 + value: 0 objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + - target: {fileID: -4608242060304742543, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} propertyPath: m_LocalPosition.y - value: -0.089 + value: 0 objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + - target: {fileID: -4608242060304742543, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} propertyPath: m_LocalPosition.z - value: 0.0827 + value: 0 objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + - target: {fileID: -4608242060304742543, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} propertyPath: m_LocalRotation.w - value: 0.7071068 + value: 0.49999997 objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + - target: {fileID: -4608242060304742543, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: 0.5 objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + - target: {fileID: -4608242060304742543, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} propertyPath: m_LocalRotation.y - value: -0.7071068 + value: -0.5 objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + - target: {fileID: -4608242060304742543, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: 0.5 objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + - target: {fileID: -4608242060304742543, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + - target: {fileID: -4608242060304742543, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: -90 + value: 0 objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + - target: {fileID: -4608242060304742543, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 8771091787928289351, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} - propertyPath: m_Name - value: MRTK_Log_Number3 (6) - objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: -4161369568681901532, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} ---- !u!4 &5312381282971670854 stripped +--- !u!4 &4615129974802110067 stripped Transform: - m_CorrespondingSourceObject: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + m_CorrespondingSourceObject: {fileID: -4608242060304742543, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} m_PrefabInstance: {fileID: 1758712066} m_PrefabAsset: {fileID: 0} --- !u!1001 &1777448411 @@ -1944,77 +1779,61 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 8848900189972289685} m_Modifications: - - target: {fileID: -4112578708967584890, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: e22eb6b0759a80d4e84be02ff377a943, type: 2} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} - propertyPath: m_RootOrder - value: 5 - objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} - propertyPath: m_LocalScale.x - value: 0.09168195 - objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} - propertyPath: m_LocalScale.y - value: 0.09168195 - objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} - propertyPath: m_LocalScale.z - value: 0.09168195 + - target: {fileID: -5028662342597560935, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + propertyPath: m_Name + value: MRTK_Logo_Number3 objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + - target: {fileID: -4608242060304742543, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} propertyPath: m_LocalPosition.x - value: 0.0828 + value: 0 objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + - target: {fileID: -4608242060304742543, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} propertyPath: m_LocalPosition.y - value: -0.0905 + value: 0 objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + - target: {fileID: -4608242060304742543, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} propertyPath: m_LocalPosition.z - value: 0.0414 + value: 0 objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + - target: {fileID: -4608242060304742543, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} propertyPath: m_LocalRotation.w - value: 0.7071068 + value: 0.49999997 objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + - target: {fileID: -4608242060304742543, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: 0.5 objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + - target: {fileID: -4608242060304742543, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} propertyPath: m_LocalRotation.y - value: -0.7071068 + value: -0.5 objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + - target: {fileID: -4608242060304742543, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: 0.5 objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + - target: {fileID: -4608242060304742543, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + - target: {fileID: -4608242060304742543, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: -90 + value: 0 objectReference: {fileID: 0} - - target: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + - target: {fileID: -4608242060304742543, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 8771091787928289351, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} - propertyPath: m_Name - value: MRTK_Log_Number3 - objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: -4161369568681901532, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} ---- !u!4 &5312381282986474911 stripped +--- !u!4 &4615129974820844202 stripped Transform: - m_CorrespondingSourceObject: {fileID: -3910990755373119420, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} + m_CorrespondingSourceObject: {fileID: -4608242060304742543, guid: c15589e34720ea8468a056fdd06e4ef8, type: 3} m_PrefabInstance: {fileID: 1777448411} m_PrefabAsset: {fileID: 0} --- !u!1001 &4654093213403725437 @@ -2022,12 +1841,9 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 8848900189972289685} m_Modifications: - - target: {fileID: -3910990755373119420, guid: aa94f0fa662d8bd4e84361cc9f0d065a, type: 3} - propertyPath: m_RootOrder - value: 4 - objectReference: {fileID: 0} - target: {fileID: -3910990755373119420, guid: aa94f0fa662d8bd4e84361cc9f0d065a, type: 3} propertyPath: m_LocalScale.x value: 0.0033918219 @@ -2080,19 +1896,26 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4573406591499762589, guid: aa94f0fa662d8bd4e84361cc9f0d065a, type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: b94c87b5518a3374dafa78695104d851, type: 2} - - target: {fileID: 8661648763336267066, guid: aa94f0fa662d8bd4e84361cc9f0d065a, type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: e22eb6b0759a80d4e84be02ff377a943, type: 2} - target: {fileID: 8771091787928289351, guid: aa94f0fa662d8bd4e84361cc9f0d065a, type: 3} propertyPath: m_Name value: MRTK_Logo objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 8771091787928289351, guid: aa94f0fa662d8bd4e84361cc9f0d065a, type: 3} + insertIndex: -1 + addedObject: {fileID: 2061463798} + - targetCorrespondingSourceObject: {fileID: 8771091787928289351, guid: aa94f0fa662d8bd4e84361cc9f0d065a, type: 3} + insertIndex: -1 + addedObject: {fileID: 2061463795} + - targetCorrespondingSourceObject: {fileID: 8771091787928289351, guid: aa94f0fa662d8bd4e84361cc9f0d065a, type: 3} + insertIndex: -1 + addedObject: {fileID: 2061463796} + - targetCorrespondingSourceObject: {fileID: 8771091787928289351, guid: aa94f0fa662d8bd4e84361cc9f0d065a, type: 3} + insertIndex: -1 + addedObject: {fileID: 2061463797} m_SourcePrefab: {fileID: -4161369568681901532, guid: aa94f0fa662d8bd4e84361cc9f0d065a, type: 3} --- !u!4 &662020072547169849 stripped Transform: @@ -2112,8 +1935,17 @@ CapsuleCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4120657989746294330} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 + serializedVersion: 2 m_Radius: 10.918639 m_Height: 26.952131 m_Direction: 1 @@ -2129,6 +1961,7 @@ AudioSource: serializedVersion: 4 OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 0} + m_Resource: {fileID: 0} m_PlayOnAwake: 1 m_Volume: 1 m_Pitch: 1 @@ -2243,13 +2076,11 @@ MonoBehaviour: m_InteractionManager: {fileID: 0} m_Colliders: - {fileID: 2061463798} - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 0 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -2282,42 +2113,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnHoverExited: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectEntered: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectExited: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectCanceled: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -2447,6 +2263,9 @@ MonoBehaviour: k__BackingField: 1 allowSelectByVoice: 1 speechRecognitionKeyword: select + k__BackingField: + m_PersistentCalls: + m_Calls: [] k__BackingField: 1 k__BackingField: 0 k__BackingField: diff --git a/UnityProjects/MRTKDevTemplate/Assets/Prefabs/ObjectManipulator/CheeseObjectManipulator.prefab b/UnityProjects/MRTKDevTemplate/Assets/Prefabs/ObjectManipulator/CheeseObjectManipulator.prefab index a3d07efbb..371864dd7 100644 --- a/UnityProjects/MRTKDevTemplate/Assets/Prefabs/ObjectManipulator/CheeseObjectManipulator.prefab +++ b/UnityProjects/MRTKDevTemplate/Assets/Prefabs/ObjectManipulator/CheeseObjectManipulator.prefab @@ -28,6 +28,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3670630427193237415} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0.298, y: -0.052, z: 0.548} m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} @@ -35,7 +36,6 @@ Transform: m_Children: - {fileID: 2906908585794480988} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &7310580969362328787 MonoBehaviour: @@ -65,13 +65,11 @@ MonoBehaviour: m_EditorClassIdentifier: m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 1 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -128,42 +126,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnHoverEntered: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_OnHoverExited: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectEntered: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectExited: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -256,6 +239,9 @@ MonoBehaviour: k__BackingField: 1 allowSelectByVoice: 0 speechRecognitionKeyword: select + k__BackingField: + m_PersistentCalls: + m_Calls: [] k__BackingField: 1 k__BackingField: 0 k__BackingField: @@ -278,6 +264,7 @@ MonoBehaviour: hostTransform: {fileID: 1590675683978192152} allowedManipulations: -1 allowedInteractionTypes: -1 + rigidbodyMovementType: 0 applyTorque: 1 springForceSoftness: 0.1 springTorqueSoftness: 0.1 @@ -300,8 +287,7 @@ MonoBehaviour: moveLogicType: reference: MixedReality.Toolkit.SpatialManipulation.MoveLogic, MixedReality.Toolkit.SpatialManipulation rotateLogicType: - reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, - MixedReality.Toolkit.SpatialManipulation + reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, MixedReality.Toolkit.SpatialManipulation scaleLogicType: reference: MixedReality.Toolkit.SpatialManipulation.ScaleLogic, MixedReality.Toolkit.SpatialManipulation --- !u!82 &2574984449296839688 @@ -315,6 +301,7 @@ AudioSource: serializedVersion: 4 OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 0} + m_Resource: {fileID: 0} m_PlayOnAwake: 1 m_Volume: 1 m_Pitch: 1 @@ -412,8 +399,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 80f85af46f9bddd4ea78f11cee5e3b2e, type: 3} m_Name: m_EditorClassIdentifier: - handType: 3 - proximityType: 3 + handType: -1 + proximityType: -1 executionOrder: 0 minimumScale: {x: 0.2, y: 0.2, z: 0.2} maximumScale: {x: 2, y: 2, z: 2} @@ -466,12 +453,9 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1590675683978192152} m_Modifications: - - target: {fileID: -8679921383154817045, guid: 1571a4558bbb2674e96a603294238166, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 1571a4558bbb2674e96a603294238166, type: 3} propertyPath: m_LocalScale.x value: 0.22592774 @@ -529,6 +513,12 @@ PrefabInstance: value: Cheese objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 1571a4558bbb2674e96a603294238166, type: 3} + insertIndex: -1 + addedObject: {fileID: 854673377367239406} m_SourcePrefab: {fileID: 100100000, guid: 1571a4558bbb2674e96a603294238166, type: 3} --- !u!1 &2530100884866626022 stripped GameObject: @@ -543,9 +533,17 @@ MeshCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2530100884866626022} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 4 + serializedVersion: 5 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 5428250928199625666, guid: 1571a4558bbb2674e96a603294238166, type: 3} diff --git a/UnityProjects/MRTKDevTemplate/Assets/Prefabs/ObjectManipulator/CoffeeCupObjectManipulator.prefab b/UnityProjects/MRTKDevTemplate/Assets/Prefabs/ObjectManipulator/CoffeeCupObjectManipulator.prefab index dbb45071c..7d9d3461b 100644 --- a/UnityProjects/MRTKDevTemplate/Assets/Prefabs/ObjectManipulator/CoffeeCupObjectManipulator.prefab +++ b/UnityProjects/MRTKDevTemplate/Assets/Prefabs/ObjectManipulator/CoffeeCupObjectManipulator.prefab @@ -5,20 +5,13 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 100002, guid: 6ceef383a3dfd0a4e9c38b8d793170e4, type: 3} propertyPath: m_Name value: CoffeeCupObjectManipulator objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 6ceef383a3dfd0a4e9c38b8d793170e4, type: 3} - propertyPath: m_LocalPosition.y - value: 0.42102012 - objectReference: {fileID: 0} - - target: {fileID: 400002, guid: 6ceef383a3dfd0a4e9c38b8d793170e4, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - target: {fileID: 400002, guid: 6ceef383a3dfd0a4e9c38b8d793170e4, type: 3} propertyPath: m_LocalScale.x value: 0.062000006 @@ -75,15 +68,32 @@ PrefabInstance: propertyPath: m_LocalPosition.y value: -1.22 objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 6ceef383a3dfd0a4e9c38b8d793170e4, type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: cfecafee97b1bac42be6698465e5bd45, type: 2} - target: {fileID: 2300002, guid: 6ceef383a3dfd0a4e9c38b8d793170e4, type: 3} - propertyPath: m_Materials.Array.data[0] + propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: edc81f8444b03444eae776bfc3a3dd00, type: 2} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 100002, guid: 6ceef383a3dfd0a4e9c38b8d793170e4, type: 3} + insertIndex: -1 + addedObject: {fileID: 79416687} + - targetCorrespondingSourceObject: {fileID: 100002, guid: 6ceef383a3dfd0a4e9c38b8d793170e4, type: 3} + insertIndex: -1 + addedObject: {fileID: 79416690} + - targetCorrespondingSourceObject: {fileID: 100002, guid: 6ceef383a3dfd0a4e9c38b8d793170e4, type: 3} + insertIndex: -1 + addedObject: {fileID: 79416686} + - targetCorrespondingSourceObject: {fileID: 100002, guid: 6ceef383a3dfd0a4e9c38b8d793170e4, type: 3} + insertIndex: -1 + addedObject: {fileID: 79416689} + - targetCorrespondingSourceObject: {fileID: 100002, guid: 6ceef383a3dfd0a4e9c38b8d793170e4, type: 3} + insertIndex: -1 + addedObject: {fileID: 809220058266531701} + - targetCorrespondingSourceObject: {fileID: 100004, guid: 6ceef383a3dfd0a4e9c38b8d793170e4, type: 3} + insertIndex: -1 + addedObject: {fileID: 1146931006} m_SourcePrefab: {fileID: 100100000, guid: 6ceef383a3dfd0a4e9c38b8d793170e4, type: 3} --- !u!4 &1540348242515517645 stripped Transform: @@ -103,9 +113,17 @@ MeshCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1540348242515950827} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 4 + serializedVersion: 5 m_Convex: 1 m_CookingOptions: 30 m_Mesh: {fileID: 4300000, guid: 6ceef383a3dfd0a4e9c38b8d793170e4, type: 3} @@ -121,10 +139,21 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1540348242515950829} - serializedVersion: 2 + serializedVersion: 4 m_Mass: 1 m_Drag: 0 m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 m_UseGravity: 1 m_IsKinematic: 0 m_Interpolate: 0 @@ -141,6 +170,7 @@ AudioSource: serializedVersion: 4 OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 0} + m_Resource: {fileID: 0} m_PlayOnAwake: 1 m_Volume: 1 m_Pitch: 1 @@ -254,13 +284,11 @@ MonoBehaviour: m_EditorClassIdentifier: m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 1 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -317,42 +345,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnHoverEntered: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_OnHoverExited: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectEntered: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectExited: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -545,6 +558,9 @@ MonoBehaviour: k__BackingField: 1 allowSelectByVoice: 1 speechRecognitionKeyword: select + k__BackingField: + m_PersistentCalls: + m_Calls: [] k__BackingField: 1 k__BackingField: 0 k__BackingField: @@ -567,6 +583,7 @@ MonoBehaviour: hostTransform: {fileID: 1540348242515517645} allowedManipulations: 7 allowedInteractionTypes: -2147483641 + rigidbodyMovementType: 0 applyTorque: 1 springForceSoftness: 0.1 springTorqueSoftness: 0.1 @@ -589,8 +606,7 @@ MonoBehaviour: moveLogicType: reference: MixedReality.Toolkit.SpatialManipulation.MoveLogic, MixedReality.Toolkit.SpatialManipulation rotateLogicType: - reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, - MixedReality.Toolkit.SpatialManipulation + reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, MixedReality.Toolkit.SpatialManipulation scaleLogicType: reference: MixedReality.Toolkit.SpatialManipulation.ScaleLogic, MixedReality.Toolkit.SpatialManipulation --- !u!114 &809220058266531701 @@ -605,8 +621,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 80f85af46f9bddd4ea78f11cee5e3b2e, type: 3} m_Name: m_EditorClassIdentifier: - handType: 3 - proximityType: 3 + handType: -1 + proximityType: -1 executionOrder: 0 minimumScale: {x: 0.2, y: 0.2, z: 0.2} maximumScale: {x: 2, y: 2, z: 2} diff --git a/UnityProjects/MRTKDevTemplate/Assets/Prefabs/ObjectManipulator/EarthObjectManipulator.prefab b/UnityProjects/MRTKDevTemplate/Assets/Prefabs/ObjectManipulator/EarthObjectManipulator.prefab index 2e59170e3..4386bf88c 100644 --- a/UnityProjects/MRTKDevTemplate/Assets/Prefabs/ObjectManipulator/EarthObjectManipulator.prefab +++ b/UnityProjects/MRTKDevTemplate/Assets/Prefabs/ObjectManipulator/EarthObjectManipulator.prefab @@ -27,6 +27,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 9053179463288900218} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0.87, y: -0.176, z: 0.577} m_LocalScale: {x: 1, y: 1, z: 1} @@ -34,7 +35,6 @@ Transform: m_Children: - {fileID: 9053179463754190661} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &9053179463288900223 MonoBehaviour: @@ -64,13 +64,11 @@ MonoBehaviour: m_EditorClassIdentifier: m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 1 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -127,42 +125,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnHoverExited: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectEntered: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectExited: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectCanceled: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -303,6 +286,9 @@ MonoBehaviour: k__BackingField: 1 allowSelectByVoice: 1 speechRecognitionKeyword: select + k__BackingField: + m_PersistentCalls: + m_Calls: [] k__BackingField: 1 k__BackingField: 0 k__BackingField: @@ -325,6 +311,7 @@ MonoBehaviour: hostTransform: {fileID: 9053179463288900219} allowedManipulations: 7 allowedInteractionTypes: -2147483641 + rigidbodyMovementType: 0 applyTorque: 1 springForceSoftness: 0.1 springTorqueSoftness: 0.1 @@ -347,8 +334,7 @@ MonoBehaviour: moveLogicType: reference: MixedReality.Toolkit.SpatialManipulation.MoveLogic, MixedReality.Toolkit.SpatialManipulation rotateLogicType: - reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, - MixedReality.Toolkit.SpatialManipulation + reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, MixedReality.Toolkit.SpatialManipulation scaleLogicType: reference: MixedReality.Toolkit.SpatialManipulation.ScaleLogic, MixedReality.Toolkit.SpatialManipulation --- !u!82 &9053179463288900217 @@ -362,6 +348,7 @@ AudioSource: serializedVersion: 4 OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 0} + m_Resource: {fileID: 0} m_PlayOnAwake: 1 m_Volume: 1 m_Pitch: 1 @@ -459,8 +446,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 80f85af46f9bddd4ea78f11cee5e3b2e, type: 3} m_Name: m_EditorClassIdentifier: - handType: 3 - proximityType: 3 + handType: -1 + proximityType: -1 executionOrder: 0 minimumScale: {x: 0.2, y: 0.2, z: 0.2} maximumScale: {x: 2, y: 2, z: 2} @@ -491,13 +478,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 9053179463754190660} + serializedVersion: 2 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: 9053179463288900219} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: -0.107, y: 115.546, z: -0.068} --- !u!33 &9053179463754190667 MeshFilter: @@ -524,6 +511,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -557,8 +547,16 @@ SphereCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 9053179463754190660} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Radius: 0.09999921 m_Center: {x: -0.0000009238429, y: 0.09999877, z: -0.0000007301686} diff --git a/UnityProjects/MRTKDevTemplate/Assets/Prefabs/ObjectManipulator/PlatonicObjectManipulator.prefab b/UnityProjects/MRTKDevTemplate/Assets/Prefabs/ObjectManipulator/PlatonicObjectManipulator.prefab index 89dd74362..4f742634d 100644 --- a/UnityProjects/MRTKDevTemplate/Assets/Prefabs/ObjectManipulator/PlatonicObjectManipulator.prefab +++ b/UnityProjects/MRTKDevTemplate/Assets/Prefabs/ObjectManipulator/PlatonicObjectManipulator.prefab @@ -27,6 +27,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8995139278435433182} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0.439, y: 0, z: 0.386} m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} @@ -34,7 +35,6 @@ Transform: m_Children: - {fileID: 2245351383229865719} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &3121544055357172138 MonoBehaviour: @@ -64,13 +64,11 @@ MonoBehaviour: m_EditorClassIdentifier: m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 1 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -127,42 +125,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnHoverEntered: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_OnHoverExited: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectEntered: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectExited: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -255,6 +238,9 @@ MonoBehaviour: k__BackingField: 1 allowSelectByVoice: 0 speechRecognitionKeyword: select + k__BackingField: + m_PersistentCalls: + m_Calls: [] k__BackingField: 1 k__BackingField: 0 k__BackingField: @@ -277,6 +263,7 @@ MonoBehaviour: hostTransform: {fileID: 6356446544631578721} allowedManipulations: -1 allowedInteractionTypes: -1 + rigidbodyMovementType: 0 applyTorque: 1 springForceSoftness: 0.1 springTorqueSoftness: 0.1 @@ -299,8 +286,7 @@ MonoBehaviour: moveLogicType: reference: MixedReality.Toolkit.SpatialManipulation.MoveLogic, MixedReality.Toolkit.SpatialManipulation rotateLogicType: - reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, - MixedReality.Toolkit.SpatialManipulation + reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, MixedReality.Toolkit.SpatialManipulation scaleLogicType: reference: MixedReality.Toolkit.SpatialManipulation.ScaleLogic, MixedReality.Toolkit.SpatialManipulation --- !u!82 &4950694038239395254 @@ -314,6 +300,7 @@ AudioSource: serializedVersion: 4 OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 0} + m_Resource: {fileID: 0} m_PlayOnAwake: 1 m_Volume: 1 m_Pitch: 1 @@ -411,8 +398,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 80f85af46f9bddd4ea78f11cee5e3b2e, type: 3} m_Name: m_EditorClassIdentifier: - handType: 3 - proximityType: 3 + handType: -1 + proximityType: -1 executionOrder: 0 minimumScale: {x: 0.2, y: 0.2, z: 0.2} maximumScale: {x: 2, y: 2, z: 2} @@ -422,16 +409,13 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 6356446544631578721} m_Modifications: - target: {fileID: 8386151833442986111, guid: 5342e372ece3a9548ad0a77db00eee92, type: 3} propertyPath: m_Name value: Model_Bucky objectReference: {fileID: 0} - - target: {fileID: 9163215581144183493, guid: 5342e372ece3a9548ad0a77db00eee92, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - target: {fileID: 9163215581144183493, guid: 5342e372ece3a9548ad0a77db00eee92, type: 3} propertyPath: m_LocalScale.x value: 0.5 @@ -457,6 +441,12 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 4643611017994920230, guid: 5342e372ece3a9548ad0a77db00eee92, type: 3} + insertIndex: -1 + addedObject: {fileID: 6742016971129051057} m_SourcePrefab: {fileID: 100100000, guid: 5342e372ece3a9548ad0a77db00eee92, type: 3} --- !u!4 &2245351383229865719 stripped Transform: @@ -476,8 +466,16 @@ SphereCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2337989105492167956} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Radius: 1 m_Center: {x: -0.0000022649765, y: -0.0000014603137, z: 0.0000028312206} diff --git a/UnityProjects/MRTKDevTemplate/Assets/Prefabs/SampleSceneHelper/ColorChangingCube.prefab b/UnityProjects/MRTKDevTemplate/Assets/Prefabs/SampleSceneHelper/ColorChangingCube.prefab index fe18cccb9..6d3f130c7 100644 --- a/UnityProjects/MRTKDevTemplate/Assets/Prefabs/SampleSceneHelper/ColorChangingCube.prefab +++ b/UnityProjects/MRTKDevTemplate/Assets/Prefabs/SampleSceneHelper/ColorChangingCube.prefab @@ -27,13 +27,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 593722386012418505} + serializedVersion: 2 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: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &4793470368411601799 MeshFilter: @@ -60,6 +60,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -93,9 +96,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 593722386012418505} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0, y: 0, z: 0} --- !u!114 &2603518900594662515 diff --git a/UnityProjects/MRTKDevTemplate/Assets/Prefabs/SampleSceneHelper/ColorChangingCubeWithDescription.prefab b/UnityProjects/MRTKDevTemplate/Assets/Prefabs/SampleSceneHelper/ColorChangingCubeWithDescription.prefab index 7d6bb4eb3..767f88083 100644 --- a/UnityProjects/MRTKDevTemplate/Assets/Prefabs/SampleSceneHelper/ColorChangingCubeWithDescription.prefab +++ b/UnityProjects/MRTKDevTemplate/Assets/Prefabs/SampleSceneHelper/ColorChangingCubeWithDescription.prefab @@ -23,6 +23,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3750633563503633563} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -30,7 +31,6 @@ Transform: m_Children: - {fileID: 3750633563654491887} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &3750633563654491886 GameObject: @@ -64,7 +64,6 @@ RectTransform: m_Children: - {fileID: 4546248010104760701} m_Father: {fileID: 3750633563503633560} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -88,6 +87,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -171,20 +173,23 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 0 m_isCullingEnabled: 0 @@ -210,6 +215,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 3750633563654491887} m_Modifications: - target: {fileID: 593722386012418505, guid: 7d421b6091df2b5439be946871d23d28, type: 3} @@ -220,10 +226,6 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} - - target: {fileID: 800348947636869897, guid: 7d421b6091df2b5439be946871d23d28, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - target: {fileID: 800348947636869897, guid: 7d421b6091df2b5439be946871d23d28, type: 3} propertyPath: m_LocalScale.x value: 1 @@ -273,6 +275,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7d421b6091df2b5439be946871d23d28, type: 3} --- !u!4 &4546248010104760701 stripped Transform: diff --git a/UnityProjects/MRTKDevTemplate/Assets/Prefabs/SampleSceneHelper/DescriptionPanel.prefab b/UnityProjects/MRTKDevTemplate/Assets/Prefabs/SampleSceneHelper/DescriptionPanel.prefab index b22a112c3..86a3a12dd 100644 --- a/UnityProjects/MRTKDevTemplate/Assets/Prefabs/SampleSceneHelper/DescriptionPanel.prefab +++ b/UnityProjects/MRTKDevTemplate/Assets/Prefabs/SampleSceneHelper/DescriptionPanel.prefab @@ -31,7 +31,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3220012215463627515} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -104,20 +103,23 @@ MonoBehaviour: m_VerticalAlignment: 256 m_textAlignment: 65535 m_characterSpacing: -5.6 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -166,7 +168,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 772928284761863525} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -239,20 +240,23 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: -3.85 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -301,7 +305,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 772928284761863525} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -374,7 +377,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3220012215463627515} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -449,20 +451,23 @@ MonoBehaviour: m_VerticalAlignment: 256 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -511,7 +516,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3220012215463627515} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -588,20 +592,23 @@ MonoBehaviour: m_VerticalAlignment: 256 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -650,7 +657,6 @@ RectTransform: - {fileID: 8167802247755607139} - {fileID: 5965547906816129183} m_Father: {fileID: 5158546944129612579} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -668,6 +674,7 @@ GameObject: - component: {fileID: 3220012215463627515} - component: {fileID: 8084989196684289760} - component: {fileID: 5404797170367061738} + - component: {fileID: 863618738849702724} m_Layer: 5 m_Name: DescriptionPanel m_TagString: Untagged @@ -693,7 +700,6 @@ RectTransform: - {fileID: 3732017194820540582} - {fileID: 5158546944129612579} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -717,7 +723,9 @@ Canvas: m_OverrideSorting: 0 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 m_AdditionalShaderChannelsFlag: 25 + m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 @@ -744,6 +752,83 @@ MonoBehaviour: m_DefaultSpriteDPI: 96 m_DynamicPixelsPerUnit: 1 m_PresetInfoIsWorld: 1 +--- !u!114 &863618738849702724 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6540126486176102408} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 699100ca886480c4a94ced56b1ae0e94, type: 3} + m_Name: + m_EditorClassIdentifier: + themeDataSource: {fileID: 11400000, guid: 57993c46ea42acf4ca3067542443bc45, type: 2} + binders: + - rid: 7617100123102511104 + - rid: 7617100123102511105 + - rid: 7617100123102511106 + - rid: 7617100123102511107 + - rid: 7617100123102511108 + - rid: 7617100123102511109 + - rid: 7617100123102511110 + - rid: 7617100123102511111 + - rid: 7617100123102511113 + - rid: 7617100459693309976 + references: + version: 2 + RefIds: + - rid: 7617100123102511104 + type: {class: GraphicColorBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 6809291684801504143} + k__BackingField: On Surface Color + - rid: 7617100123102511105 + type: {class: TMP_TextFontAssetBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 6809291684801504143} + k__BackingField: Text Font + - rid: 7617100123102511106 + type: {class: GraphicColorBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 4568172237328552037} + k__BackingField: On Surface Color + - rid: 7617100123102511107 + type: {class: TMP_TextFontAssetBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 4568172237328552037} + k__BackingField: Text Font + - rid: 7617100123102511108 + type: {class: GraphicColorBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 2446705927233332293} + k__BackingField: On Surface Color + - rid: 7617100123102511109 + type: {class: TMP_TextFontAssetBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 2446705927233332293} + k__BackingField: Text Font + - rid: 7617100123102511110 + type: {class: GraphicColorBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 4376175471552893095} + k__BackingField: On Surface Color + - rid: 7617100123102511111 + type: {class: GraphicColorBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 5822078602719066722} + k__BackingField: On Surface Color + - rid: 7617100123102511113 + type: {class: SpriteRendererSpriteBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 1051251617942771901} + k__BackingField: MRTK Logo + - rid: 7617100459693309976 + type: {class: RendererMaterialBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 6676203961570324161} + k__BackingField: Non-Canvas Backplate (8mm) Material --- !u!1 &7368034384095272423 GameObject: m_ObjectHideFlags: 0 @@ -767,6 +852,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7368034384095272423} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -775,7 +861,6 @@ Transform: - {fileID: 772928284761863525} - {fileID: 5493534032387613222} m_Father: {fileID: 3220012215463627515} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &7872745334355361574 GameObject: @@ -788,7 +873,7 @@ GameObject: - component: {fileID: 3732017194820540582} - component: {fileID: 1051251617942771901} m_Layer: 0 - m_Name: MRTK_Logo_White + m_Name: MRTK_Logo m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -801,13 +886,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7872745334355361574} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -48.700005, y: 55.2, z: -3.700018} m_LocalScale: {x: 2.8187, y: 2.8187, z: 2.8187} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3220012215463627515} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &1051251617942771901 SpriteRenderer: @@ -826,6 +911,9 @@ SpriteRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -886,13 +974,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8323939510892415185} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 177.44179, y: 155.49632, z: 12.879309} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5158546944129612579} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &1262417381534939274 MeshFilter: @@ -919,6 +1007,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: diff --git a/UnityProjects/MRTKDevTemplate/Assets/Prefabs/SampleSceneHelper/Placard.prefab b/UnityProjects/MRTKDevTemplate/Assets/Prefabs/SampleSceneHelper/Placard.prefab index 106b44d84..4b1c77533 100644 --- a/UnityProjects/MRTKDevTemplate/Assets/Prefabs/SampleSceneHelper/Placard.prefab +++ b/UnityProjects/MRTKDevTemplate/Assets/Prefabs/SampleSceneHelper/Placard.prefab @@ -31,7 +31,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5264854134403395402} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -55,6 +54,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -138,20 +140,23 @@ MonoBehaviour: m_VerticalAlignment: 256 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 0 m_isCullingEnabled: 0 @@ -198,6 +203,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5264854134403395403} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2, y: 2, z: 1} @@ -206,7 +212,6 @@ Transform: - {fileID: 8307934293288657613} - {fileID: 5264854133094485413} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &5264854134403395406 MonoBehaviour: @@ -233,6 +238,7 @@ AudioSource: serializedVersion: 4 OutputAudioMixerGroup: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} m_audioClip: {fileID: 0} + m_Resource: {fileID: 0} m_PlayOnAwake: 1 m_Volume: 1 m_Pitch: 1 @@ -330,8 +336,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 80f85af46f9bddd4ea78f11cee5e3b2e, type: 3} m_Name: m_EditorClassIdentifier: - handType: 3 - proximityType: 3 + handType: -1 + proximityType: -1 executionOrder: 0 minimumScale: {x: 0.2, y: 0.2, z: 0.2} maximumScale: {x: 2, y: 2, z: 2} @@ -341,6 +347,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 5264854134403395402} m_Modifications: - target: {fileID: 4125495309553998321, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} @@ -351,10 +358,6 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} - - target: {fileID: 4205010513405509735, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - target: {fileID: 4205010513405509735, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} propertyPath: m_LocalScale.x value: 1 @@ -424,6 +427,9 @@ PrefabInstance: value: -0.0102 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} --- !u!4 &8307934293288657613 stripped Transform: diff --git a/UnityProjects/MRTKDevTemplate/Assets/Prefabs/SampleSceneHelper/SampleSceneHandMenu.prefab b/UnityProjects/MRTKDevTemplate/Assets/Prefabs/SampleSceneHelper/SampleSceneHandMenu.prefab index d233dc892..e9bda2568 100644 --- a/UnityProjects/MRTKDevTemplate/Assets/Prefabs/SampleSceneHelper/SampleSceneHandMenu.prefab +++ b/UnityProjects/MRTKDevTemplate/Assets/Prefabs/SampleSceneHelper/SampleSceneHandMenu.prefab @@ -32,7 +32,6 @@ RectTransform: - {fileID: 6134130586559970897} - {fileID: 2082148069247382452} m_Father: {fileID: 8695093631179458764} - m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -97,7 +96,6 @@ RectTransform: - {fileID: 8695093631179458764} - {fileID: 2359900579150043882} m_Father: {fileID: 7372669237086358568} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -121,7 +119,9 @@ Canvas: m_OverrideSorting: 0 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 m_AdditionalShaderChannelsFlag: 31 + m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 @@ -156,7 +156,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2359900579150043882} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -229,20 +228,23 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: -3.85 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 00000000 m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -291,7 +293,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8695093631179458764} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -364,20 +365,23 @@ MonoBehaviour: m_VerticalAlignment: 256 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 00000000 m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -426,7 +430,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2359900579150043882} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -509,7 +512,6 @@ RectTransform: - {fileID: 4841568318398405034} - {fileID: 5565386561008249008} m_Father: {fileID: 183353146933738960} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -544,6 +546,13 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] + m_Texture: {fileID: 0} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 radius: 13 thickness: 2 wedges: 8 @@ -633,6 +642,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7372669237086358564} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -640,7 +650,6 @@ Transform: m_Children: - {fileID: 183353146933738960} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &7372669237086358569 MonoBehaviour: @@ -779,7 +788,6 @@ RectTransform: - {fileID: 123480823478765233} - {fileID: 2752605514877435469} m_Father: {fileID: 183353146933738960} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -817,7 +825,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8695093631179458764} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -890,20 +897,23 @@ MonoBehaviour: m_VerticalAlignment: 1024 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 00000000 m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -952,7 +962,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8695093631179458764} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -1025,20 +1034,23 @@ MonoBehaviour: m_VerticalAlignment: 1024 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 00000000 m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -1061,6 +1073,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 8695093631179458764} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -1082,10 +1095,6 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} - - target: {fileID: 4897024374970528438, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - target: {fileID: 5319578128471115350, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.y value: 1 @@ -1162,10 +1171,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 3 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -1239,6 +1244,12 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 4185972052008607586, guid: c6b351a67ceb69140b199996bbbea156, type: 3} + insertIndex: -1 + addedObject: {fileID: 4975548348981941513} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &3136027443589254382 stripped RectTransform: @@ -1266,6 +1277,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 8695093631179458764} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -1287,10 +1299,6 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} - - target: {fileID: 4897024374970528438, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - target: {fileID: 5319578128471115350, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.y value: 1 @@ -1375,10 +1383,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -1452,6 +1456,12 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 4185972052008607586, guid: c6b351a67ceb69140b199996bbbea156, type: 3} + insertIndex: -1 + addedObject: {fileID: 1358815973674867033} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &2851895267872497046 stripped RectTransform: @@ -1479,12 +1489,9 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 5565386561008249008} m_Modifications: - - target: {fileID: 952967652988581951, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_text - value: "\uF2AB" - objectReference: {fileID: 0} - target: {fileID: 1520311476867378557, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_SizeDelta.x value: 43.44 @@ -1531,7 +1538,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 59 + value: Chevron Left objectReference: {fileID: 0} - target: {fileID: 7594107385585372191, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive @@ -1553,10 +1560,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -1634,6 +1637,9 @@ PrefabInstance: value: Previous Scene objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &6134130586559970897 stripped RectTransform: @@ -1656,6 +1662,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2851895267872497046} m_Modifications: - target: {fileID: 1345098608517470577, guid: 16750275763719646afa2c7c7592395d, type: 3} @@ -1751,12 +1758,21 @@ PrefabInstance: value: objectReference: {fileID: 7618871619398064046} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 16750275763719646afa2c7c7592395d, type: 3} +--- !u!224 &1358815973674867033 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3514389556853228399, guid: 16750275763719646afa2c7c7592395d, type: 3} + m_PrefabInstance: {fileID: 2458654523868060214} + m_PrefabAsset: {fileID: 0} --- !u!1001 &4429956662421172277 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 7236244361615264800} m_Modifications: - target: {fileID: 1345098608517470577, guid: 16750275763719646afa2c7c7592395d, type: 3} @@ -1852,12 +1868,21 @@ PrefabInstance: value: objectReference: {fileID: 3045578032311879192} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 16750275763719646afa2c7c7592395d, type: 3} +--- !u!224 &990722320281203546 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3514389556853228399, guid: 16750275763719646afa2c7c7592395d, type: 3} + m_PrefabInstance: {fileID: 4429956662421172277} + m_PrefabAsset: {fileID: 0} --- !u!1001 &6808249183111205698 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 8695093631179458764} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -1879,10 +1904,6 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} - - target: {fileID: 4897024374970528438, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - target: {fileID: 5319578128471115350, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.y value: 1 @@ -1971,10 +1992,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -2048,6 +2065,12 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 4185972052008607586, guid: c6b351a67ceb69140b199996bbbea156, type: 3} + insertIndex: -1 + addedObject: {fileID: 990722320281203546} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!114 &3045578032311879192 stripped MonoBehaviour: @@ -2075,12 +2098,9 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 5565386561008249008} m_Modifications: - - target: {fileID: 952967652988581951, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_text - value: "\uF2B1" - objectReference: {fileID: 0} - target: {fileID: 1520311476867378557, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_LocalPosition.z value: 0 @@ -2127,7 +2147,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 60 + value: Chevron Right objectReference: {fileID: 0} - target: {fileID: 7594107385585372191, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive @@ -2149,10 +2169,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -2230,6 +2246,9 @@ PrefabInstance: value: Next Scene objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!114 &2082148069247382451 stripped MonoBehaviour: @@ -2252,6 +2271,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 3136027443589254382} m_Modifications: - target: {fileID: 1345098608517470577, guid: 16750275763719646afa2c7c7592395d, type: 3} @@ -2347,4 +2367,12 @@ PrefabInstance: value: objectReference: {fileID: 7326570055845349078} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 16750275763719646afa2c7c7592395d, type: 3} +--- !u!224 &4975548348981941513 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3514389556853228399, guid: 16750275763719646afa2c7c7592395d, type: 3} + m_PrefabInstance: {fileID: 8487363841117509222} + m_PrefabAsset: {fileID: 0} diff --git a/UnityProjects/MRTKDevTemplate/Assets/Prefabs/SampleSceneHelper/TestDummyWalls.prefab b/UnityProjects/MRTKDevTemplate/Assets/Prefabs/SampleSceneHelper/TestDummyWalls.prefab index 016c63eca..2a8039c1e 100644 --- a/UnityProjects/MRTKDevTemplate/Assets/Prefabs/SampleSceneHelper/TestDummyWalls.prefab +++ b/UnityProjects/MRTKDevTemplate/Assets/Prefabs/SampleSceneHelper/TestDummyWalls.prefab @@ -23,6 +23,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 361177447810077853} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 2.3711753, y: -1.0604684, z: 0.26142955} m_LocalScale: {x: 0.95577997, y: 1.3330034, z: 0.72670954} @@ -33,7 +34,6 @@ Transform: - {fileID: 361177448263954364} - {fileID: 361177448647081919} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &361177448128710611 GameObject: @@ -61,13 +61,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 361177448128710611} + serializedVersion: 2 m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068} m_LocalPosition: {x: -0.91000074, y: 0, z: -0.20799983} m_LocalScale: {x: 0.10456, y: 0.10456, z: 0.07538044} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 361177447810077852} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} --- !u!33 &361177448128710615 MeshFilter: @@ -94,6 +94,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -127,9 +130,17 @@ MeshCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 361177448128710611} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 4 + serializedVersion: 5 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} @@ -159,13 +170,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 361177448263954365} + serializedVersion: 2 m_LocalRotation: {x: -0.64085644, y: -0.29883623, z: -0.29883623, w: 0.64085644} m_LocalPosition: {x: -1.747, y: 0, z: -0.627} m_LocalScale: {x: 0.10456, y: 0.10456, z: 0.07538044} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 361177447810077852} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: -90, y: 0, z: -50} --- !u!33 &361177448263954353 MeshFilter: @@ -192,6 +203,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -225,9 +239,17 @@ MeshCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 361177448263954365} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 4 + serializedVersion: 5 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} @@ -257,13 +279,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 361177448372109506} + serializedVersion: 2 m_LocalRotation: {x: -0.64085644, y: 0.29883623, z: 0.29883623, w: 0.64085644} m_LocalPosition: {x: -0.061, y: 0, z: -0.627} m_LocalScale: {x: 0.10456, y: 0.10456, z: 0.07538044} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 361177447810077852} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: -90, y: 0, z: 50} --- !u!33 &361177448372109510 MeshFilter: @@ -290,6 +312,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -323,9 +348,17 @@ MeshCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 361177448372109506} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 4 + serializedVersion: 5 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} @@ -355,13 +388,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 361177448647081912} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0.9053, y: -0.363, z: -1.109} m_LocalScale: {x: 0.23607455, y: 0.10456, z: 0.25875986} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 361177447810077852} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &361177448647081916 MeshFilter: @@ -388,6 +421,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -421,9 +457,17 @@ MeshCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 361177448647081912} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 4 + serializedVersion: 5 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} diff --git a/UnityProjects/MRTKDevTemplate/Assets/Prefabs/SpatialMesh/SpatialMesh.prefab b/UnityProjects/MRTKDevTemplate/Assets/Prefabs/SpatialMesh/SpatialMesh.prefab index 1ae56d949..22e53587d 100644 --- a/UnityProjects/MRTKDevTemplate/Assets/Prefabs/SpatialMesh/SpatialMesh.prefab +++ b/UnityProjects/MRTKDevTemplate/Assets/Prefabs/SpatialMesh/SpatialMesh.prefab @@ -26,13 +26,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6797172677923927144} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &5231468805595906662 MeshFilter: @@ -59,6 +59,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -92,9 +95,17 @@ MeshCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6797172677923927144} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 4 + serializedVersion: 5 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 0} diff --git a/UnityProjects/MRTKDevTemplate/Assets/Prefabs/TextPrefabExample/3DTextSelawik.prefab b/UnityProjects/MRTKDevTemplate/Assets/Prefabs/TextPrefabExample/3DTextSelawik.prefab index aade9ea49..cd8c7bd52 100644 --- a/UnityProjects/MRTKDevTemplate/Assets/Prefabs/TextPrefabExample/3DTextSelawik.prefab +++ b/UnityProjects/MRTKDevTemplate/Assets/Prefabs/TextPrefabExample/3DTextSelawik.prefab @@ -31,7 +31,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -55,6 +54,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -138,20 +140,23 @@ MonoBehaviour: m_VerticalAlignment: 256 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 00000000 m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 0 m_isCullingEnabled: 0 diff --git a/UnityProjects/MRTKDevTemplate/Assets/Prefabs/TextPrefabExample/3DTextSelawikBold.prefab b/UnityProjects/MRTKDevTemplate/Assets/Prefabs/TextPrefabExample/3DTextSelawikBold.prefab index 74406dbcd..317213bb4 100644 --- a/UnityProjects/MRTKDevTemplate/Assets/Prefabs/TextPrefabExample/3DTextSelawikBold.prefab +++ b/UnityProjects/MRTKDevTemplate/Assets/Prefabs/TextPrefabExample/3DTextSelawikBold.prefab @@ -31,7 +31,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -55,6 +54,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -138,20 +140,23 @@ MonoBehaviour: m_VerticalAlignment: 256 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 00000000 m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 0 m_isCullingEnabled: 0 diff --git a/UnityProjects/MRTKDevTemplate/Assets/Prefabs/TextPrefabExample/3DTextSelawikLight.prefab b/UnityProjects/MRTKDevTemplate/Assets/Prefabs/TextPrefabExample/3DTextSelawikLight.prefab index 5f13637c3..b2729a97f 100644 --- a/UnityProjects/MRTKDevTemplate/Assets/Prefabs/TextPrefabExample/3DTextSelawikLight.prefab +++ b/UnityProjects/MRTKDevTemplate/Assets/Prefabs/TextPrefabExample/3DTextSelawikLight.prefab @@ -31,7 +31,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -55,6 +54,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -138,20 +140,23 @@ MonoBehaviour: m_VerticalAlignment: 256 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 00000000 m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 0 m_isCullingEnabled: 0 diff --git a/UnityProjects/MRTKDevTemplate/Assets/Prefabs/TextPrefabExample/3DTextSelawikSemibold.prefab b/UnityProjects/MRTKDevTemplate/Assets/Prefabs/TextPrefabExample/3DTextSelawikSemibold.prefab index c8adb2253..3482d54ab 100644 --- a/UnityProjects/MRTKDevTemplate/Assets/Prefabs/TextPrefabExample/3DTextSelawikSemibold.prefab +++ b/UnityProjects/MRTKDevTemplate/Assets/Prefabs/TextPrefabExample/3DTextSelawikSemibold.prefab @@ -31,7 +31,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -55,6 +54,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -138,20 +140,23 @@ MonoBehaviour: m_VerticalAlignment: 256 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 00000000 m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 0 m_isCullingEnabled: 0 diff --git a/UnityProjects/MRTKDevTemplate/Assets/Prefabs/TextPrefabExample/3DTextSelawikSemilight.prefab b/UnityProjects/MRTKDevTemplate/Assets/Prefabs/TextPrefabExample/3DTextSelawikSemilight.prefab index 2ef1b6056..5b80721c6 100644 --- a/UnityProjects/MRTKDevTemplate/Assets/Prefabs/TextPrefabExample/3DTextSelawikSemilight.prefab +++ b/UnityProjects/MRTKDevTemplate/Assets/Prefabs/TextPrefabExample/3DTextSelawikSemilight.prefab @@ -31,7 +31,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -55,6 +54,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -138,20 +140,23 @@ MonoBehaviour: m_VerticalAlignment: 256 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 00000000 m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 0 m_isCullingEnabled: 0 diff --git a/UnityProjects/MRTKDevTemplate/Assets/Prefabs/TextPrefabExample/UITextSelawik.prefab b/UnityProjects/MRTKDevTemplate/Assets/Prefabs/TextPrefabExample/UITextSelawik.prefab index eb9600511..c988a4a7e 100644 --- a/UnityProjects/MRTKDevTemplate/Assets/Prefabs/TextPrefabExample/UITextSelawik.prefab +++ b/UnityProjects/MRTKDevTemplate/Assets/Prefabs/TextPrefabExample/UITextSelawik.prefab @@ -33,7 +33,6 @@ RectTransform: m_Children: - {fileID: 224000014204859762} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -57,7 +56,9 @@ Canvas: m_OverrideSorting: 0 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 m_AdditionalShaderChannelsFlag: 25 + m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 @@ -83,7 +84,7 @@ MonoBehaviour: m_FallbackScreenDPI: 96 m_DefaultSpriteDPI: 96 m_DynamicPixelsPerUnit: 2 - m_PresetInfoIsWorld: 1 + m_PresetInfoIsWorld: 0 --- !u!114 &114000011733207730 MonoBehaviour: m_ObjectHideFlags: 0 @@ -132,7 +133,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 224000011042862180} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} diff --git a/UnityProjects/MRTKDevTemplate/Assets/Prefabs/TextPrefabExample/UITextSelawikBold.prefab b/UnityProjects/MRTKDevTemplate/Assets/Prefabs/TextPrefabExample/UITextSelawikBold.prefab index 520dbb4bd..197dd8aeb 100644 --- a/UnityProjects/MRTKDevTemplate/Assets/Prefabs/TextPrefabExample/UITextSelawikBold.prefab +++ b/UnityProjects/MRTKDevTemplate/Assets/Prefabs/TextPrefabExample/UITextSelawikBold.prefab @@ -33,7 +33,6 @@ RectTransform: m_Children: - {fileID: 224000014204859762} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -57,7 +56,9 @@ Canvas: m_OverrideSorting: 0 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 m_AdditionalShaderChannelsFlag: 25 + m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 @@ -83,7 +84,7 @@ MonoBehaviour: m_FallbackScreenDPI: 96 m_DefaultSpriteDPI: 96 m_DynamicPixelsPerUnit: 2 - m_PresetInfoIsWorld: 1 + m_PresetInfoIsWorld: 0 --- !u!114 &114000011733207730 MonoBehaviour: m_ObjectHideFlags: 0 @@ -132,7 +133,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 224000011042862180} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} diff --git a/UnityProjects/MRTKDevTemplate/Assets/Prefabs/TextPrefabExample/UITextSelawikLight.prefab b/UnityProjects/MRTKDevTemplate/Assets/Prefabs/TextPrefabExample/UITextSelawikLight.prefab index 601344cd4..ac80b5f38 100644 --- a/UnityProjects/MRTKDevTemplate/Assets/Prefabs/TextPrefabExample/UITextSelawikLight.prefab +++ b/UnityProjects/MRTKDevTemplate/Assets/Prefabs/TextPrefabExample/UITextSelawikLight.prefab @@ -33,7 +33,6 @@ RectTransform: m_Children: - {fileID: 224000014204859762} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -57,7 +56,9 @@ Canvas: m_OverrideSorting: 0 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 m_AdditionalShaderChannelsFlag: 25 + m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 @@ -83,7 +84,7 @@ MonoBehaviour: m_FallbackScreenDPI: 96 m_DefaultSpriteDPI: 96 m_DynamicPixelsPerUnit: 2 - m_PresetInfoIsWorld: 1 + m_PresetInfoIsWorld: 0 --- !u!114 &114000011733207730 MonoBehaviour: m_ObjectHideFlags: 0 @@ -132,7 +133,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 224000011042862180} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} diff --git a/UnityProjects/MRTKDevTemplate/Assets/Prefabs/TextPrefabExample/UITextSelawikSemibold.prefab b/UnityProjects/MRTKDevTemplate/Assets/Prefabs/TextPrefabExample/UITextSelawikSemibold.prefab index 9685e9964..1341acd0a 100644 --- a/UnityProjects/MRTKDevTemplate/Assets/Prefabs/TextPrefabExample/UITextSelawikSemibold.prefab +++ b/UnityProjects/MRTKDevTemplate/Assets/Prefabs/TextPrefabExample/UITextSelawikSemibold.prefab @@ -33,7 +33,6 @@ RectTransform: m_Children: - {fileID: 224000014204859762} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -57,7 +56,9 @@ Canvas: m_OverrideSorting: 0 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 m_AdditionalShaderChannelsFlag: 25 + m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 @@ -83,7 +84,7 @@ MonoBehaviour: m_FallbackScreenDPI: 96 m_DefaultSpriteDPI: 96 m_DynamicPixelsPerUnit: 2 - m_PresetInfoIsWorld: 1 + m_PresetInfoIsWorld: 0 --- !u!114 &114000011733207730 MonoBehaviour: m_ObjectHideFlags: 0 @@ -132,7 +133,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 224000011042862180} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} diff --git a/UnityProjects/MRTKDevTemplate/Assets/Prefabs/TextPrefabExample/UITextSelawikSemilight.prefab b/UnityProjects/MRTKDevTemplate/Assets/Prefabs/TextPrefabExample/UITextSelawikSemilight.prefab index 94d890fde..682471921 100644 --- a/UnityProjects/MRTKDevTemplate/Assets/Prefabs/TextPrefabExample/UITextSelawikSemilight.prefab +++ b/UnityProjects/MRTKDevTemplate/Assets/Prefabs/TextPrefabExample/UITextSelawikSemilight.prefab @@ -33,7 +33,6 @@ RectTransform: m_Children: - {fileID: 224000014204859762} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -57,7 +56,9 @@ Canvas: m_OverrideSorting: 0 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 m_AdditionalShaderChannelsFlag: 25 + m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 @@ -83,7 +84,7 @@ MonoBehaviour: m_FallbackScreenDPI: 96 m_DefaultSpriteDPI: 96 m_DynamicPixelsPerUnit: 2 - m_PresetInfoIsWorld: 1 + m_PresetInfoIsWorld: 0 --- !u!114 &114000011733207730 MonoBehaviour: m_ObjectHideFlags: 0 @@ -132,7 +133,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 224000011042862180} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} diff --git a/UnityProjects/MRTKDevTemplate/Assets/Prefabs/VirtualizedScrollRectList/VirtualizedListButton.prefab b/UnityProjects/MRTKDevTemplate/Assets/Prefabs/VirtualizedScrollRectList/VirtualizedListButton.prefab index 25623192a..68801db4d 100644 --- a/UnityProjects/MRTKDevTemplate/Assets/Prefabs/VirtualizedScrollRectList/VirtualizedListButton.prefab +++ b/UnityProjects/MRTKDevTemplate/Assets/Prefabs/VirtualizedScrollRectList/VirtualizedListButton.prefab @@ -33,7 +33,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 922104272095131977} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -57,6 +56,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -140,20 +142,23 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -200,16 +205,13 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 201938300658660728, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 952967652988581951, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_text - value: "\uF710" - objectReference: {fileID: 0} - target: {fileID: 2142167140070017856, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive value: 1 @@ -302,10 +304,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 1 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -379,6 +377,12 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 7216918420766221479, guid: c6b351a67ceb69140b199996bbbea156, type: 3} + insertIndex: -1 + addedObject: {fileID: 155509664508198398} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &922104272095131977 stripped RectTransform: diff --git a/UnityProjects/MRTKDevTemplate/Assets/Prefabs/Whiteboard/WhiteboardExample.prefab b/UnityProjects/MRTKDevTemplate/Assets/Prefabs/Whiteboard/WhiteboardExample.prefab index 81de89f81..c913e58e0 100644 --- a/UnityProjects/MRTKDevTemplate/Assets/Prefabs/Whiteboard/WhiteboardExample.prefab +++ b/UnityProjects/MRTKDevTemplate/Assets/Prefabs/Whiteboard/WhiteboardExample.prefab @@ -35,7 +35,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4564568587149777177} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -67,6 +66,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -106,13 +108,11 @@ MonoBehaviour: m_EditorClassIdentifier: m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 4294967295 m_DistanceCalculationMode: 1 m_SelectMode: 1 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -145,42 +145,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnHoverExited: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectEntered: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectExited: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectCanceled: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -277,9 +262,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 443995631} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 1, y: 1, z: 0.05} m_Center: {x: 0, y: 0, z: 0} --- !u!114 &8850178465796647687 @@ -381,7 +374,6 @@ RectTransform: - {fileID: 724323403903675551} - {fileID: 9437446510852599} m_Father: {fileID: 4564568587149777177} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -466,7 +458,6 @@ RectTransform: m_Children: - {fileID: 4564568587149777177} m_Father: {fileID: 8468582706564339464} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -490,7 +481,9 @@ Canvas: m_OverrideSorting: 0 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 m_AdditionalShaderChannelsFlag: 31 + m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 @@ -547,7 +540,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5041229438117663422} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -579,6 +571,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2963852276419858579} m_Modifications: - target: {fileID: 1619375032725711555, guid: 9d54fefbfd15f194cbaf3beeff5f6d10, type: 3} @@ -589,10 +582,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 1619375032725711555, guid: 9d54fefbfd15f194cbaf3beeff5f6d10, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - target: {fileID: 1619375032725711555, guid: 9d54fefbfd15f194cbaf3beeff5f6d10, type: 3} propertyPath: m_AnchorMax.x value: 1 @@ -674,6 +663,18 @@ PrefabInstance: value: 11 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 1619375032725711555, guid: 9d54fefbfd15f194cbaf3beeff5f6d10, type: 3} + insertIndex: -1 + addedObject: {fileID: 5041229438117663422} + - targetCorrespondingSourceObject: {fileID: 1619375032725711555, guid: 9d54fefbfd15f194cbaf3beeff5f6d10, type: 3} + insertIndex: -1 + addedObject: {fileID: 1715477249078649596} + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 8510261678218358358, guid: 9d54fefbfd15f194cbaf3beeff5f6d10, type: 3} + insertIndex: -1 + addedObject: {fileID: 2963852275539639304} m_SourcePrefab: {fileID: 100100000, guid: 9d54fefbfd15f194cbaf3beeff5f6d10, type: 3} --- !u!224 &4564568587149777177 stripped RectTransform: @@ -716,6 +717,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 5041229438117663422} m_Modifications: - target: {fileID: 201938300658660728, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -915,6 +917,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &6709910909478096088 stripped RectTransform: @@ -926,6 +931,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 601986242425173794, guid: 2c4cecf25adbc2f4c88bc2752a9c3264, type: 3} @@ -985,11 +991,11 @@ PrefabInstance: value: WhiteboardExample objectReference: {fileID: 0} - target: {fileID: 2926093106609997995, guid: 2c4cecf25adbc2f4c88bc2752a9c3264, type: 3} - propertyPath: m_Materials.Array.data[0] + propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 5762245003366665926, guid: 9b0d0ee11ff70b04d901a29b519cbaa0, type: 2} - target: {fileID: 3005139051447799941, guid: 2c4cecf25adbc2f4c88bc2752a9c3264, type: 3} - propertyPath: m_Materials.Array.data[0] + propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 5762245003366665926, guid: 9b0d0ee11ff70b04d901a29b519cbaa0, type: 2} - target: {fileID: 3939605952418872802, guid: 2c4cecf25adbc2f4c88bc2752a9c3264, type: 3} @@ -1005,11 +1011,11 @@ PrefabInstance: value: 0.0095 objectReference: {fileID: 0} - target: {fileID: 4583912424509175209, guid: 2c4cecf25adbc2f4c88bc2752a9c3264, type: 3} - propertyPath: m_Materials.Array.data[0] + propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 5762245003366665926, guid: 9b0d0ee11ff70b04d901a29b519cbaa0, type: 2} - target: {fileID: 4939398736567125838, guid: 2c4cecf25adbc2f4c88bc2752a9c3264, type: 3} - propertyPath: m_Materials.Array.data[0] + propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 5762245003366665926, guid: 9b0d0ee11ff70b04d901a29b519cbaa0, type: 2} - target: {fileID: 5561744655428495453, guid: 2c4cecf25adbc2f4c88bc2752a9c3264, type: 3} @@ -1028,10 +1034,6 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 6612599088134562825, guid: 2c4cecf25adbc2f4c88bc2752a9c3264, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - target: {fileID: 6612599088134562825, guid: 2c4cecf25adbc2f4c88bc2752a9c3264, type: 3} propertyPath: m_LocalPosition.x value: 0.7181 @@ -1097,6 +1099,12 @@ PrefabInstance: value: 0.0001 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 6612599088134562825, guid: 2c4cecf25adbc2f4c88bc2752a9c3264, type: 3} + insertIndex: -1 + addedObject: {fileID: 2963852276419858579} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 2c4cecf25adbc2f4c88bc2752a9c3264, type: 3} --- !u!4 &8468582706564339464 stripped Transform: @@ -1108,6 +1116,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 5041229438117663422} m_Modifications: - target: {fileID: 201938300658660728, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -1307,6 +1316,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &5037185138549003642 stripped RectTransform: @@ -1318,6 +1330,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 5041229438117663422} m_Modifications: - target: {fileID: 201938300658660728, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -1517,6 +1530,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &4024654762168814420 stripped RectTransform: @@ -1528,6 +1544,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 5041229438117663422} m_Modifications: - target: {fileID: 201938300658660728, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -1759,6 +1776,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &9437446510852599 stripped RectTransform: diff --git a/UnityProjects/MRTKDevTemplate/Assets/Prefabs/Whiteboard/pen.prefab b/UnityProjects/MRTKDevTemplate/Assets/Prefabs/Whiteboard/pen.prefab index 781e52df5..7b685b6a4 100644 --- a/UnityProjects/MRTKDevTemplate/Assets/Prefabs/Whiteboard/pen.prefab +++ b/UnityProjects/MRTKDevTemplate/Assets/Prefabs/Whiteboard/pen.prefab @@ -10,7 +10,7 @@ GameObject: m_Component: - component: {fileID: 2002339756} - component: {fileID: 2002339758} - - component: {fileID: 2002339757} + - component: {fileID: 1066413309105225662} - component: {fileID: 2002339759} m_Layer: 0 m_Name: Pen Interactor @@ -26,13 +26,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2002339755} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -0.0123} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2415827607033482817} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &2002339758 MonoBehaviour: @@ -47,11 +47,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_InteractionManager: {fileID: 0} - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 4294967295 + m_Handedness: 0 m_AttachTransform: {fileID: 0} m_KeepSelectedTargetValid: 1 m_DisableVisualsWhenBlockedInGroup: 1 @@ -71,31 +69,29 @@ MonoBehaviour: m_Calls: [] m_StartingHoverFilters: [] m_StartingSelectFilters: [] - m_OnHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectEntered: - m_PersistentCalls: - m_Calls: [] - m_OnSelectExited: - m_PersistentCalls: - m_Calls: [] ---- !u!135 &2002339757 -SphereCollider: +--- !u!136 &1066413309105225662 +CapsuleCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2002339755} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 1 + m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 2 m_Radius: 0.0005 - m_Center: {x: 0, y: 0, z: 0.0004} + m_Height: 0.003 + m_Direction: 2 + m_Center: {x: 0, y: 0, z: 0.0008} --- !u!54 &2002339759 Rigidbody: m_ObjectHideFlags: 0 @@ -103,10 +99,21 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2002339755} - serializedVersion: 2 + serializedVersion: 4 m_Mass: 1 m_Drag: 0 m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 m_UseGravity: 1 m_IsKinematic: 1 m_Interpolate: 0 @@ -140,6 +147,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3084243108605482235} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0, y: 0, z: 0.333} m_LocalScale: {x: 8, y: 8, z: 8} @@ -147,7 +155,6 @@ Transform: m_Children: - {fileID: 2002339756} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &1596919684305715684 MeshFilter: @@ -174,6 +181,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -209,8 +219,17 @@ CapsuleCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3084243108605482235} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 + serializedVersion: 2 m_Radius: 0.0015 m_Height: 0.025 m_Direction: 2 @@ -229,13 +248,11 @@ MonoBehaviour: m_EditorClassIdentifier: m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 0 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -268,42 +285,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_OnHoverEntered: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_OnHoverExited: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectEntered: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -396,6 +398,9 @@ MonoBehaviour: k__BackingField: 1 allowSelectByVoice: 1 speechRecognitionKeyword: select + k__BackingField: + m_PersistentCalls: + m_Calls: [] k__BackingField: 1 k__BackingField: 0 k__BackingField: @@ -418,6 +423,7 @@ MonoBehaviour: hostTransform: {fileID: 2415827607033482817} allowedManipulations: 3 allowedInteractionTypes: 1 + rigidbodyMovementType: 0 applyTorque: 1 springForceSoftness: 0.1 springTorqueSoftness: 0.1 @@ -440,8 +446,7 @@ MonoBehaviour: moveLogicType: reference: MixedReality.Toolkit.SpatialManipulation.MoveLogic, MixedReality.Toolkit.SpatialManipulation rotateLogicType: - reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, - MixedReality.Toolkit.SpatialManipulation + reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, MixedReality.Toolkit.SpatialManipulation scaleLogicType: reference: MixedReality.Toolkit.SpatialManipulation.ScaleLogic, MixedReality.Toolkit.SpatialManipulation --- !u!114 &2741574062440155178 diff --git a/UnityProjects/MRTKDevTemplate/Assets/Profiles/MRTKSamplesProfile.asset b/UnityProjects/MRTKDevTemplate/Assets/Profiles/MRTKSamplesProfile.asset index 0ebad99a1..a9d3f794c 100644 --- a/UnityProjects/MRTKDevTemplate/Assets/Profiles/MRTKSamplesProfile.asset +++ b/UnityProjects/MRTKDevTemplate/Assets/Profiles/MRTKSamplesProfile.asset @@ -14,20 +14,16 @@ MonoBehaviour: m_EditorClassIdentifier: isCustomProfile: 0 loadedSubsystems: - - reference: MixedReality.Toolkit.Diagnostics.MRTKPerformanceStatsSubsystem, - MixedReality.Toolkit.Diagnostics - - reference: MixedReality.Toolkit.Speech.Windows.WindowsDictationSubsystem, - MixedReality.Toolkit.Speech.Windows + - reference: MixedReality.Toolkit.Input.UnityHandsSubsystem, MixedReality.Toolkit.Input + - reference: MixedReality.Toolkit.Diagnostics.MRTKPerformanceStatsSubsystem, MixedReality.Toolkit.Diagnostics + - reference: MixedReality.Toolkit.Speech.Windows.WindowsDictationSubsystem, MixedReality.Toolkit.Speech.Windows - reference: MixedReality.Toolkit.Speech.Windows.WindowsKeywordRecognitionSubsystem, MixedReality.Toolkit.Speech.Windows - reference: MixedReality.Toolkit.Speech.Windows.WindowsTextToSpeechSubsystem, MixedReality.Toolkit.Speech.Windows - - reference: MixedReality.Toolkit.Accessibility.MRTKAccessibilitySubsystem, - MixedReality.Toolkit.Accessibility - - reference: MixedReality.Toolkit.Input.OpenXRHandsSubsystem, MixedReality.Toolkit.Input + - reference: MixedReality.Toolkit.Accessibility.MRTKAccessibilitySubsystem, MixedReality.Toolkit.Accessibility - reference: MixedReality.Toolkit.Input.SyntheticHandsSubsystem, MixedReality.Toolkit.Input - - reference: MixedReality.Toolkit.Input.MRTKHandsAggregatorSubsystem, - MixedReality.Toolkit.Input + - reference: MixedReality.Toolkit.Input.MRTKHandsAggregatorSubsystem, MixedReality.Toolkit.Input subsystemConfigs: entries: - key: @@ -47,11 +43,8 @@ MonoBehaviour: MixedReality.Toolkit.Accessibility value: {fileID: 11400000, guid: 3aa94a99d7ce5e845a6a78409e004670, type: 2} - key: - reference: MixedReality.Toolkit.Input.SyntheticHandsSubsystem, - MixedReality.Toolkit.Input + reference: MixedReality.Toolkit.Input.SyntheticHandsSubsystem, MixedReality.Toolkit.Input value: {fileID: 11400000, guid: c45788af2ca823a4a904bf8762ff126d, type: 2} - key: - reference: MixedReality.Toolkit.Input.MRTKHandsAggregatorSubsystem, - MixedReality.Toolkit.Input + reference: MixedReality.Toolkit.Input.MRTKHandsAggregatorSubsystem, MixedReality.Toolkit.Input value: {fileID: 11400000, guid: b8da41358d218754494ea49599e7b0fb, type: 2} - k__BackingField: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} diff --git a/UnityProjects/MRTKDevTemplate/Assets/Scenes/Audio/AudioLoFiExample.unity b/UnityProjects/MRTKDevTemplate/Assets/Scenes/Audio/AudioLoFiExample.unity index 07d752a60..01249fc16 100644 --- a/UnityProjects/MRTKDevTemplate/Assets/Scenes/Audio/AudioLoFiExample.unity +++ b/UnityProjects/MRTKDevTemplate/Assets/Scenes/Audio/AudioLoFiExample.unity @@ -575,6 +575,67 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c32e8a7644144f8419bb881ad588ed0e, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1001 &107443798 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720334, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_Name + value: MRTK XR Rig + objectReference: {fileID: 0} + - target: {fileID: 8479077998186684813, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} --- !u!1001 &179866670 PrefabInstance: m_ObjectHideFlags: 0 @@ -926,71 +987,10 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &525252187 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720334, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_Name - value: MRTK XR Rig - objectReference: {fileID: 0} - - target: {fileID: 8479077998186684813, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} --- !u!114 &525252188 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 5569439093497552269, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - m_PrefabInstance: {fileID: 525252187} + m_CorrespondingSourceObject: {fileID: 800708247703322884, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + m_PrefabInstance: {fileID: 107443798} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 diff --git a/UnityProjects/MRTKDevTemplate/Assets/Scenes/Audio/AudioOcclusionExample.unity b/UnityProjects/MRTKDevTemplate/Assets/Scenes/Audio/AudioOcclusionExample.unity index 7409c6162..5349909fb 100644 --- a/UnityProjects/MRTKDevTemplate/Assets/Scenes/Audio/AudioOcclusionExample.unity +++ b/UnityProjects/MRTKDevTemplate/Assets/Scenes/Audio/AudioOcclusionExample.unity @@ -281,78 +281,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07c4bd04b45c014fad0e3cd30747f06, type: 3} ---- !u!1001 &525252187 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720334, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_Name - value: MRTK XR Rig - objectReference: {fileID: 0} - - target: {fileID: 8479077998186684813, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} ---- !u!114 &525252188 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 5569439093497552269, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - m_PrefabInstance: {fileID: 525252187} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 83e4e6cca11330d4088d729ab4fc9d9f, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &629829897 GameObject: m_ObjectHideFlags: 0 @@ -577,15 +505,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d9ad66e7cc9a2754d8ea989740c9f00d, type: 3} m_Name: m_EditorClassIdentifier: - m_InteractionManager: {fileID: 525252188} + m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 1 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -618,42 +544,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_OnLastHoverExited: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnHoverEntered: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectEntered: - m_PersistentCalls: - m_Calls: [] - m_OnSelectExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -768,6 +679,7 @@ MonoBehaviour: hostTransform: {fileID: 629829898} allowedManipulations: 3 allowedInteractionTypes: -2147483641 + rigidbodyMovementType: 0 applyTorque: 1 springForceSoftness: 0.1 springTorqueSoftness: 0.1 @@ -790,8 +702,7 @@ MonoBehaviour: moveLogicType: reference: MixedReality.Toolkit.SpatialManipulation.MoveLogic, MixedReality.Toolkit.SpatialManipulation rotateLogicType: - reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, - MixedReality.Toolkit.SpatialManipulation + reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, MixedReality.Toolkit.SpatialManipulation scaleLogicType: reference: MixedReality.Toolkit.SpatialManipulation.ScaleLogic, MixedReality.Toolkit.SpatialManipulation --- !u!114 &629829905 @@ -902,6 +813,67 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} +--- !u!1001 &833155999 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720334, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_Name + value: MRTK XR Rig + objectReference: {fileID: 0} + - target: {fileID: 8479077998186684813, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} --- !u!1 &937408412 GameObject: m_ObjectHideFlags: 0 @@ -1028,15 +1000,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d9ad66e7cc9a2754d8ea989740c9f00d, type: 3} m_Name: m_EditorClassIdentifier: - m_InteractionManager: {fileID: 525252188} + m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 1 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -1069,42 +1039,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_OnLastHoverExited: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnHoverEntered: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectEntered: - m_PersistentCalls: - m_Calls: [] - m_OnSelectExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -1219,6 +1174,7 @@ MonoBehaviour: hostTransform: {fileID: 937408413} allowedManipulations: 3 allowedInteractionTypes: -2147483641 + rigidbodyMovementType: 0 applyTorque: 1 springForceSoftness: 0.1 springTorqueSoftness: 0.1 @@ -1241,8 +1197,7 @@ MonoBehaviour: moveLogicType: reference: MixedReality.Toolkit.SpatialManipulation.MoveLogic, MixedReality.Toolkit.SpatialManipulation rotateLogicType: - reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, - MixedReality.Toolkit.SpatialManipulation + reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, MixedReality.Toolkit.SpatialManipulation scaleLogicType: reference: MixedReality.Toolkit.SpatialManipulation.ScaleLogic, MixedReality.Toolkit.SpatialManipulation --- !u!114 &937408419 @@ -1564,13 +1519,11 @@ MonoBehaviour: m_EditorClassIdentifier: m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 0 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -1603,42 +1556,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnHoverExited: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectEntered: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectExited: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectCanceled: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -1754,6 +1692,7 @@ MonoBehaviour: hostTransform: {fileID: 1918790412} allowedManipulations: 7 allowedInteractionTypes: -1 + rigidbodyMovementType: 0 applyTorque: 1 springForceSoftness: 0.1 springTorqueSoftness: 0.1 @@ -1776,8 +1715,7 @@ MonoBehaviour: moveLogicType: reference: MixedReality.Toolkit.SpatialManipulation.MoveLogic, MixedReality.Toolkit.SpatialManipulation rotateLogicType: - reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, - MixedReality.Toolkit.SpatialManipulation + reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, MixedReality.Toolkit.SpatialManipulation scaleLogicType: reference: MixedReality.Toolkit.SpatialManipulation.ScaleLogic, MixedReality.Toolkit.SpatialManipulation --- !u!114 &1966272106 diff --git a/UnityProjects/MRTKDevTemplate/Assets/Scenes/BoundsControlExamples.unity b/UnityProjects/MRTKDevTemplate/Assets/Scenes/BoundsControlExamples.unity index 1840bf7d5..4e73ff4c2 100644 --- a/UnityProjects/MRTKDevTemplate/Assets/Scenes/BoundsControlExamples.unity +++ b/UnityProjects/MRTKDevTemplate/Assets/Scenes/BoundsControlExamples.unity @@ -333,17 +333,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} ---- !u!114 &96287344 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 5569439093497552269, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - m_PrefabInstance: {fileID: 525252187} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 83e4e6cca11330d4088d729ab4fc9d9f, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1001 &141008310 PrefabInstance: m_ObjectHideFlags: 0 @@ -657,6 +646,16 @@ MonoBehaviour: translateLerpTime: 0.00001 enableConstraints: 1 constraintsManager: {fileID: 206300805} + manipulationLogicTypes: + moveLogicType: + reference: MixedReality.Toolkit.SpatialManipulation.BoundsControlMoveLogic, + MixedReality.Toolkit.SpatialManipulation + rotateLogicType: + reference: MixedReality.Toolkit.SpatialManipulation.BoundsControlRotateLogic, + MixedReality.Toolkit.SpatialManipulation + scaleLogicType: + reference: MixedReality.Toolkit.SpatialManipulation.BoundsControlScaleLogic, + MixedReality.Toolkit.SpatialManipulation manipulationStarted: m_PersistentCalls: m_Calls: [] @@ -689,15 +688,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d9ad66e7cc9a2754d8ea989740c9f00d, type: 3} m_Name: m_EditorClassIdentifier: - m_InteractionManager: {fileID: 96287344} + m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 1 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -730,42 +727,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_OnLastHoverExited: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_OnHoverEntered: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnHoverExited: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectEntered: - m_PersistentCalls: - m_Calls: [] - m_OnSelectExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -880,6 +862,7 @@ MonoBehaviour: hostTransform: {fileID: 206300803} allowedManipulations: 7 allowedInteractionTypes: -2147483641 + rigidbodyMovementType: 0 applyTorque: 1 springForceSoftness: 0.1 springTorqueSoftness: 0.1 @@ -902,8 +885,7 @@ MonoBehaviour: moveLogicType: reference: MixedReality.Toolkit.SpatialManipulation.MoveLogic, MixedReality.Toolkit.SpatialManipulation rotateLogicType: - reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, - MixedReality.Toolkit.SpatialManipulation + reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, MixedReality.Toolkit.SpatialManipulation scaleLogicType: reference: MixedReality.Toolkit.SpatialManipulation.ScaleLogic, MixedReality.Toolkit.SpatialManipulation --- !u!1001 &246643815 @@ -1616,67 +1598,6 @@ BoxCollider: serializedVersion: 2 m_Size: {x: 129.3, y: 41.1, z: 3.43} m_Center: {x: 0, y: 22, z: 0} ---- !u!1001 &525252187 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720334, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_Name - value: MRTK XR Rig - objectReference: {fileID: 0} - - target: {fileID: 8479077998186684813, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} --- !u!1 &705507993 GameObject: m_ObjectHideFlags: 0 @@ -2167,6 +2088,16 @@ MonoBehaviour: translateLerpTime: 0.00001 enableConstraints: 1 constraintsManager: {fileID: 1058535793} + manipulationLogicTypes: + moveLogicType: + reference: MixedReality.Toolkit.SpatialManipulation.BoundsControlMoveLogic, + MixedReality.Toolkit.SpatialManipulation + rotateLogicType: + reference: MixedReality.Toolkit.SpatialManipulation.BoundsControlRotateLogic, + MixedReality.Toolkit.SpatialManipulation + scaleLogicType: + reference: MixedReality.Toolkit.SpatialManipulation.BoundsControlScaleLogic, + MixedReality.Toolkit.SpatialManipulation manipulationStarted: m_PersistentCalls: m_Calls: [] @@ -2201,13 +2132,11 @@ MonoBehaviour: m_EditorClassIdentifier: m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 1 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -2240,42 +2169,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_Deactivated: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnLastHoverExited: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectEntered: - m_PersistentCalls: - m_Calls: [] - m_OnSelectExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -2540,6 +2454,7 @@ MonoBehaviour: hostTransform: {fileID: 1058535790} allowedManipulations: 7 allowedInteractionTypes: -2147483641 + rigidbodyMovementType: 0 applyTorque: 1 springForceSoftness: 0.1 springTorqueSoftness: 0.1 @@ -2562,8 +2477,7 @@ MonoBehaviour: moveLogicType: reference: MixedReality.Toolkit.SpatialManipulation.MoveLogic, MixedReality.Toolkit.SpatialManipulation rotateLogicType: - reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, - MixedReality.Toolkit.SpatialManipulation + reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, MixedReality.Toolkit.SpatialManipulation scaleLogicType: reference: MixedReality.Toolkit.SpatialManipulation.ScaleLogic, MixedReality.Toolkit.SpatialManipulation --- !u!82 &1058535795 @@ -3441,6 +3355,16 @@ MonoBehaviour: translateLerpTime: 0.001 enableConstraints: 1 constraintsManager: {fileID: 0} + manipulationLogicTypes: + moveLogicType: + reference: MixedReality.Toolkit.SpatialManipulation.BoundsControlMoveLogic, + MixedReality.Toolkit.SpatialManipulation + rotateLogicType: + reference: MixedReality.Toolkit.SpatialManipulation.BoundsControlRotateLogic, + MixedReality.Toolkit.SpatialManipulation + scaleLogicType: + reference: MixedReality.Toolkit.SpatialManipulation.BoundsControlScaleLogic, + MixedReality.Toolkit.SpatialManipulation manipulationStarted: m_PersistentCalls: m_Calls: [] @@ -3459,16 +3383,14 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d9ad66e7cc9a2754d8ea989740c9f00d, type: 3} m_Name: m_EditorClassIdentifier: - m_InteractionManager: {fileID: 96287344} + m_InteractionManager: {fileID: 0} m_Colliders: - {fileID: 524721200} - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 1 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -3501,42 +3423,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnHoverExited: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectEntered: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectExited: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectCanceled: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -3651,6 +3558,7 @@ MonoBehaviour: hostTransform: {fileID: 1513987307} allowedManipulations: 7 allowedInteractionTypes: -2147483641 + rigidbodyMovementType: 0 applyTorque: 1 springForceSoftness: 0.1 springTorqueSoftness: 0.1 @@ -3673,8 +3581,7 @@ MonoBehaviour: moveLogicType: reference: MixedReality.Toolkit.SpatialManipulation.MoveLogic, MixedReality.Toolkit.SpatialManipulation rotateLogicType: - reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, - MixedReality.Toolkit.SpatialManipulation + reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, MixedReality.Toolkit.SpatialManipulation scaleLogicType: reference: MixedReality.Toolkit.SpatialManipulation.ScaleLogic, MixedReality.Toolkit.SpatialManipulation --- !u!114 &1513987306 @@ -3857,6 +3764,67 @@ Transform: m_CorrespondingSourceObject: {fileID: 4986292954374696882, guid: 818e133c8f245de438f3edbd7d8d65bb, type: 3} m_PrefabInstance: {fileID: 5990324192755907374} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1589987418 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720334, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_Name + value: MRTK XR Rig + objectReference: {fileID: 0} + - target: {fileID: 8479077998186684813, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} --- !u!1001 &1594647897 PrefabInstance: m_ObjectHideFlags: 0 @@ -4506,13 +4474,11 @@ MonoBehaviour: m_EditorClassIdentifier: m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 1 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -4545,42 +4511,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectEntered: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectExited: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectCanceled: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -4845,6 +4796,7 @@ MonoBehaviour: hostTransform: {fileID: 2085586761} allowedManipulations: 7 allowedInteractionTypes: -2147483641 + rigidbodyMovementType: 0 applyTorque: 1 springForceSoftness: 0.1 springTorqueSoftness: 0.1 @@ -4867,8 +4819,7 @@ MonoBehaviour: moveLogicType: reference: MixedReality.Toolkit.SpatialManipulation.MoveLogic, MixedReality.Toolkit.SpatialManipulation rotateLogicType: - reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, - MixedReality.Toolkit.SpatialManipulation + reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, MixedReality.Toolkit.SpatialManipulation scaleLogicType: reference: MixedReality.Toolkit.SpatialManipulation.ScaleLogic, MixedReality.Toolkit.SpatialManipulation --- !u!114 &2085586763 @@ -4919,6 +4870,16 @@ MonoBehaviour: translateLerpTime: 0.00001 enableConstraints: 1 constraintsManager: {fileID: 2085586763} + manipulationLogicTypes: + moveLogicType: + reference: MixedReality.Toolkit.SpatialManipulation.BoundsControlMoveLogic, + MixedReality.Toolkit.SpatialManipulation + rotateLogicType: + reference: MixedReality.Toolkit.SpatialManipulation.BoundsControlRotateLogic, + MixedReality.Toolkit.SpatialManipulation + scaleLogicType: + reference: MixedReality.Toolkit.SpatialManipulation.BoundsControlScaleLogic, + MixedReality.Toolkit.SpatialManipulation manipulationStarted: m_PersistentCalls: m_Calls: [] diff --git a/UnityProjects/MRTKDevTemplate/Assets/Scenes/BoundsControlRuntimeExample.unity b/UnityProjects/MRTKDevTemplate/Assets/Scenes/BoundsControlRuntimeExample.unity index 533940755..e6ef7cf54 100644 --- a/UnityProjects/MRTKDevTemplate/Assets/Scenes/BoundsControlRuntimeExample.unity +++ b/UnityProjects/MRTKDevTemplate/Assets/Scenes/BoundsControlRuntimeExample.unity @@ -382,13 +382,11 @@ MonoBehaviour: m_EditorClassIdentifier: m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 1 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -421,42 +419,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnHoverExited: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectEntered: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectExited: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectCanceled: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -571,6 +554,7 @@ MonoBehaviour: hostTransform: {fileID: 1006616005} allowedManipulations: 7 allowedInteractionTypes: -2147483641 + rigidbodyMovementType: 0 applyTorque: 1 springForceSoftness: 0.1 springTorqueSoftness: 0.1 @@ -593,8 +577,7 @@ MonoBehaviour: moveLogicType: reference: MixedReality.Toolkit.SpatialManipulation.MoveLogic, MixedReality.Toolkit.SpatialManipulation rotateLogicType: - reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, - MixedReality.Toolkit.SpatialManipulation + reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, MixedReality.Toolkit.SpatialManipulation scaleLogicType: reference: MixedReality.Toolkit.SpatialManipulation.ScaleLogic, MixedReality.Toolkit.SpatialManipulation --- !u!114 &95915947 @@ -793,8 +776,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1952199377435673060, guid: 5e1e5c2fb89ded5469dd37ccbed1a896, type: 3} propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: MixedReality.Toolkit.Examples.Demos.BoundsControlRuntimeExample, - Assembly-CSharp + value: MixedReality.Toolkit.Examples.Demos.BoundsControlRuntimeExample, Assembly-CSharp objectReference: {fileID: 0} - target: {fileID: 1952199377435673060, guid: 5e1e5c2fb89ded5469dd37ccbed1a896, type: 3} propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName @@ -1015,67 +997,67 @@ RectTransform: m_AnchoredPosition: {x: 0.046, y: 1.664} m_SizeDelta: {x: 0.6279, y: 0.2077} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1001 &525252187 +--- !u!1001 &486399851 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} propertyPath: m_RootOrder value: 2 objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 2351505567455720334, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} + - target: {fileID: 2351505567455720334, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} propertyPath: m_Name value: MRTK XR Rig objectReference: {fileID: 0} - - target: {fileID: 8479077998186684813, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} + - target: {fileID: 8479077998186684813, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} + m_SourcePrefab: {fileID: 100100000, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} --- !u!1001 &640980041 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/UnityProjects/MRTKDevTemplate/Assets/Scenes/CanvasExample.unity b/UnityProjects/MRTKDevTemplate/Assets/Scenes/CanvasExample.unity index d1040eb41..442283d01 100644 --- a/UnityProjects/MRTKDevTemplate/Assets/Scenes/CanvasExample.unity +++ b/UnityProjects/MRTKDevTemplate/Assets/Scenes/CanvasExample.unity @@ -123,17 +123,6 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!114 &35339495 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 5569439093497552269, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - m_PrefabInstance: {fileID: 525252187} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 83e4e6cca11330d4088d729ab4fc9d9f, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &169386754 GameObject: m_ObjectHideFlags: 0 @@ -311,7 +300,7 @@ Canvas: m_Enabled: 1 serializedVersion: 3 m_RenderMode: 2 - m_Camera: {fileID: 619048528} + m_Camera: {fileID: 0} m_PlaneDistance: 100 m_PixelPerfect: 0 m_ReceivesEvents: 1 @@ -1002,11 +991,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5677198132670553562, guid: f64620d502cdf0f429efa27703913cb7, type: 3} propertyPath: m_AnchoredPosition.x - value: -0.000015258789 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5677198132670553562, guid: f64620d502cdf0f429efa27703913cb7, type: 3} propertyPath: m_AnchoredPosition.y - value: -0.000030517578 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5677198132984834578, guid: f64620d502cdf0f429efa27703913cb7, type: 3} propertyPath: m_Pivot.x @@ -1695,7 +1684,7 @@ Canvas: m_Enabled: 1 serializedVersion: 3 m_RenderMode: 2 - m_Camera: {fileID: 619048528} + m_Camera: {fileID: 0} m_PlaneDistance: 100 m_PixelPerfect: 0 m_ReceivesEvents: 1 @@ -1728,67 +1717,6 @@ RectTransform: m_AnchoredPosition: {x: -0.42389998, y: 1.4382999} m_SizeDelta: {x: 480.5, y: 427.3138} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1001 &525252187 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_RootOrder - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720334, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_Name - value: MRTK XR Rig - objectReference: {fileID: 0} - - target: {fileID: 8479077998186684813, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} --- !u!1001 &546180825 PrefabInstance: m_ObjectHideFlags: 0 @@ -1826,11 +1754,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5677198132670553562, guid: f64620d502cdf0f429efa27703913cb7, type: 3} propertyPath: m_AnchoredPosition.x - value: -0.000015258789 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5677198132670553562, guid: f64620d502cdf0f429efa27703913cb7, type: 3} propertyPath: m_AnchoredPosition.y - value: 0.000005722046 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5677198132984834578, guid: f64620d502cdf0f429efa27703913cb7, type: 3} propertyPath: m_Pivot.x @@ -1993,11 +1921,6 @@ MonoBehaviour: m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 m_ReverseArrangement: 0 ---- !u!20 &619048528 stripped -Camera: - m_CorrespondingSourceObject: {fileID: 2351505566771328527, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - m_PrefabInstance: {fileID: 525252187} - m_PrefabAsset: {fileID: 0} --- !u!1001 &664471307 PrefabInstance: m_ObjectHideFlags: 0 @@ -2035,11 +1958,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5677198132670553562, guid: f64620d502cdf0f429efa27703913cb7, type: 3} propertyPath: m_AnchoredPosition.x - value: -0.000015258789 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5677198132670553562, guid: f64620d502cdf0f429efa27703913cb7, type: 3} propertyPath: m_AnchoredPosition.y - value: -0.000011444092 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5677198132984834578, guid: f64620d502cdf0f429efa27703913cb7, type: 3} propertyPath: m_Pivot.x @@ -2187,7 +2110,7 @@ Canvas: m_Enabled: 1 serializedVersion: 3 m_RenderMode: 2 - m_Camera: {fileID: 619048528} + m_Camera: {fileID: 0} m_PlaneDistance: 100 m_PixelPerfect: 0 m_ReceivesEvents: 1 @@ -3438,11 +3361,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5677198132670553562, guid: f64620d502cdf0f429efa27703913cb7, type: 3} propertyPath: m_AnchoredPosition.x - value: 0.0000076293945 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5677198132670553562, guid: f64620d502cdf0f429efa27703913cb7, type: 3} propertyPath: m_AnchoredPosition.y - value: -0.000015258789 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5677198132984834578, guid: f64620d502cdf0f429efa27703913cb7, type: 3} propertyPath: m_Pivot.x @@ -3676,27 +3599,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1013724684} m_CullTransparentMesh: 1 ---- !u!1 &1014540484 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 2351505566771328562, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - m_PrefabInstance: {fileID: 525252187} - m_PrefabAsset: {fileID: 0} ---- !u!114 &1014540488 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1014540484} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c49b4cc203aa6414fae5c798d1d0e7d6, type: 3} - m_Name: - m_EditorClassIdentifier: - m_EventMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_MaxRayIntersections: 0 --- !u!1001 &1019412262 PrefabInstance: m_ObjectHideFlags: 0 @@ -5055,6 +4957,63 @@ MonoBehaviour: m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 m_ReverseArrangement: 0 +--- !u!1001 &1210175168 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720334, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_Name + value: MRTK XR Rig + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} --- !u!1001 &1221790206 PrefabInstance: m_ObjectHideFlags: 0 @@ -5987,11 +5946,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5677198132670553562, guid: f64620d502cdf0f429efa27703913cb7, type: 3} propertyPath: m_AnchoredPosition.x - value: 0.0000038146973 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5677198132670553562, guid: f64620d502cdf0f429efa27703913cb7, type: 3} propertyPath: m_AnchoredPosition.y - value: -0.000011444092 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5677198132965683087, guid: f64620d502cdf0f429efa27703913cb7, type: 3} propertyPath: m_AnchorMax.x @@ -6700,6 +6659,16 @@ MonoBehaviour: translateLerpTime: 0.00001 enableConstraints: 1 constraintsManager: {fileID: 0} + manipulationLogicTypes: + moveLogicType: + reference: MixedReality.Toolkit.SpatialManipulation.BoundsControlMoveLogic, + MixedReality.Toolkit.SpatialManipulation + rotateLogicType: + reference: MixedReality.Toolkit.SpatialManipulation.BoundsControlRotateLogic, + MixedReality.Toolkit.SpatialManipulation + scaleLogicType: + reference: MixedReality.Toolkit.SpatialManipulation.BoundsControlScaleLogic, + MixedReality.Toolkit.SpatialManipulation manipulationStarted: m_PersistentCalls: m_Calls: [] @@ -6718,17 +6687,15 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d9ad66e7cc9a2754d8ea989740c9f00d, type: 3} m_Name: m_EditorClassIdentifier: - m_InteractionManager: {fileID: 35339495} + m_InteractionManager: {fileID: 0} m_Colliders: - {fileID: 862305034} - {fileID: 1069515631} - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 1 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -6761,42 +6728,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnHoverEntered: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_OnHoverExited: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectEntered: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectExited: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -6911,6 +6863,7 @@ MonoBehaviour: hostTransform: {fileID: 1710053220} allowedManipulations: 7 allowedInteractionTypes: -2147483641 + rigidbodyMovementType: 0 applyTorque: 1 springForceSoftness: 0.1 springTorqueSoftness: 0.1 @@ -6933,8 +6886,7 @@ MonoBehaviour: moveLogicType: reference: MixedReality.Toolkit.SpatialManipulation.MoveLogic, MixedReality.Toolkit.SpatialManipulation rotateLogicType: - reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, - MixedReality.Toolkit.SpatialManipulation + reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, MixedReality.Toolkit.SpatialManipulation scaleLogicType: reference: MixedReality.Toolkit.SpatialManipulation.ScaleLogic, MixedReality.Toolkit.SpatialManipulation --- !u!114 &1710053219 @@ -7315,11 +7267,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5677198132670553562, guid: f64620d502cdf0f429efa27703913cb7, type: 3} propertyPath: m_AnchoredPosition.x - value: -0.0000076293945 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5677198132670553562, guid: f64620d502cdf0f429efa27703913cb7, type: 3} propertyPath: m_AnchoredPosition.y - value: -0.00005531311 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5677198132984834578, guid: f64620d502cdf0f429efa27703913cb7, type: 3} propertyPath: m_Pivot.x @@ -8067,11 +8019,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5677198132670553562, guid: f64620d502cdf0f429efa27703913cb7, type: 3} propertyPath: m_AnchoredPosition.x - value: 0.0000038146973 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5677198132670553562, guid: f64620d502cdf0f429efa27703913cb7, type: 3} propertyPath: m_AnchoredPosition.y - value: -0.000011444092 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5677198132965683087, guid: f64620d502cdf0f429efa27703913cb7, type: 3} propertyPath: m_AnchorMax.x @@ -8516,7 +8468,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5677198132670553562, guid: f64620d502cdf0f429efa27703913cb7, type: 3} propertyPath: m_AnchoredPosition.y - value: -0.000045776367 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5677198132984834578, guid: f64620d502cdf0f429efa27703913cb7, type: 3} propertyPath: m_Pivot.x @@ -8665,11 +8617,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5677198132670553562, guid: f64620d502cdf0f429efa27703913cb7, type: 3} propertyPath: m_AnchoredPosition.x - value: -0.0000076293945 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5677198132670553562, guid: f64620d502cdf0f429efa27703913cb7, type: 3} propertyPath: m_AnchoredPosition.y - value: -0.000015258789 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5677198132965683087, guid: f64620d502cdf0f429efa27703913cb7, type: 3} propertyPath: m_AnchorMax.x @@ -9250,7 +9202,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5677198132670553562, guid: f64620d502cdf0f429efa27703913cb7, type: 3} propertyPath: m_AnchoredPosition.y - value: 0.000015258789 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5677198132984834578, guid: f64620d502cdf0f429efa27703913cb7, type: 3} propertyPath: m_Pivot.x @@ -12340,19 +12292,19 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 390798463543326195, guid: 123a52cdc6c17724e94aa8e62e61b53a, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 390798463543326195, guid: 123a52cdc6c17724e94aa8e62e61b53a, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 390798463543326195, guid: 123a52cdc6c17724e94aa8e62e61b53a, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 139.09999 objectReference: {fileID: 0} - target: {fileID: 390798463543326195, guid: 123a52cdc6c17724e94aa8e62e61b53a, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -16 objectReference: {fileID: 0} - target: {fileID: 675955727448561912, guid: 123a52cdc6c17724e94aa8e62e61b53a, type: 3} propertyPath: m_AnchorMax.y @@ -12944,19 +12896,19 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1372347124019474309, guid: 123a52cdc6c17724e94aa8e62e61b53a, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1372347124019474309, guid: 123a52cdc6c17724e94aa8e62e61b53a, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1372347124019474309, guid: 123a52cdc6c17724e94aa8e62e61b53a, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 100.5 objectReference: {fileID: 0} - target: {fileID: 1372347124019474309, guid: 123a52cdc6c17724e94aa8e62e61b53a, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -16 objectReference: {fileID: 0} - target: {fileID: 1529748478307567699, guid: 123a52cdc6c17724e94aa8e62e61b53a, type: 3} propertyPath: m_AnchorMax.y @@ -12996,19 +12948,19 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1546107985163316921, guid: 123a52cdc6c17724e94aa8e62e61b53a, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1546107985163316921, guid: 123a52cdc6c17724e94aa8e62e61b53a, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1546107985163316921, guid: 123a52cdc6c17724e94aa8e62e61b53a, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 61.899998 objectReference: {fileID: 0} - target: {fileID: 1546107985163316921, guid: 123a52cdc6c17724e94aa8e62e61b53a, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -16 objectReference: {fileID: 0} - target: {fileID: 1604597561330407511, guid: 123a52cdc6c17724e94aa8e62e61b53a, type: 3} propertyPath: m_AnchorMax.y @@ -14788,19 +14740,19 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4804666115626773169, guid: 123a52cdc6c17724e94aa8e62e61b53a, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4804666115626773169, guid: 123a52cdc6c17724e94aa8e62e61b53a, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4804666115626773169, guid: 123a52cdc6c17724e94aa8e62e61b53a, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 23.3 objectReference: {fileID: 0} - target: {fileID: 4804666115626773169, guid: 123a52cdc6c17724e94aa8e62e61b53a, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -16 objectReference: {fileID: 0} - target: {fileID: 4895693043742498314, guid: 123a52cdc6c17724e94aa8e62e61b53a, type: 3} propertyPath: m_Size.x diff --git a/UnityProjects/MRTKDevTemplate/Assets/Scenes/CanvasUITearsheet.unity b/UnityProjects/MRTKDevTemplate/Assets/Scenes/CanvasUITearsheet.unity index feb69fcac..ec1b0441e 100644 --- a/UnityProjects/MRTKDevTemplate/Assets/Scenes/CanvasUITearsheet.unity +++ b/UnityProjects/MRTKDevTemplate/Assets/Scenes/CanvasUITearsheet.unity @@ -13,7 +13,7 @@ OcclusionCullingSettings: --- !u!104 &2 RenderSettings: m_ObjectHideFlags: 0 - serializedVersion: 9 + serializedVersion: 10 m_Fog: 0 m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} m_FogMode: 3 @@ -38,13 +38,12 @@ 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_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 12 - m_GIWorkflowMode: 1 + serializedVersion: 13 + m_BakeOnSceneLoad: 0 m_GISettings: serializedVersion: 2 m_BounceScale: 1 @@ -67,9 +66,6 @@ LightmapSettings: m_LightmapParameters: {fileID: 0} m_LightmapsBakeMode: 1 m_TextureCompression: 1 - m_FinalGather: 0 - m_FinalGatherFiltering: 1 - m_FinalGatherRayCount: 256 m_ReflectionCompression: 2 m_MixedBakeMode: 2 m_BakeBackend: 1 @@ -97,14 +93,14 @@ LightmapSettings: m_ExportTrainingData: 0 m_TrainingDataDestination: TrainingData m_LightProbeSampleCountMultiplier: 4 - m_LightingDataAsset: {fileID: 0} + m_LightingDataAsset: {fileID: 20201, guid: 0000000000000000f000000000000000, type: 0} m_LightingSettings: {fileID: 0} --- !u!196 &4 NavMeshSettings: serializedVersion: 2 m_ObjectHideFlags: 0 m_BuildSettings: - serializedVersion: 2 + serializedVersion: 3 agentTypeID: 0 agentRadius: 0.5 agentHeight: 2 @@ -117,7 +113,7 @@ NavMeshSettings: cellSize: 0.16666667 manualTileSize: 0 tileSize: 256 - accuratePlacement: 0 + buildHeightMesh: 0 maxJobWorkers: 0 preserveTilesOutsideBounds: 0 debug: @@ -155,7 +151,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 65389176} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -240,20 +235,23 @@ MonoBehaviour: m_VerticalAlignment: 256 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -284,6 +282,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 47797540} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -366,7 +365,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 133 + value: Favorite objectReference: {fileID: 0} - target: {fileID: 8376646494505211202, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Name @@ -485,6 +484,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &14426175 stripped RectTransform: @@ -528,7 +530,6 @@ RectTransform: - {fileID: 2086818868} - {fileID: 1599070117} m_Father: {fileID: 831863309} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -595,6 +596,13 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] + m_Texture: {fileID: 0} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 radius: 13 thickness: 2 wedges: 8 @@ -612,6 +620,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 682545839} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -694,7 +703,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 72 + value: Cut objectReference: {fileID: 0} - target: {fileID: 8376646494505211202, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Name @@ -821,6 +830,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &30053974 stripped RectTransform: @@ -832,6 +844,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1424732237} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -904,7 +917,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 115 + value: Group objectReference: {fileID: 0} - target: {fileID: 7594107385585372191, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive @@ -1015,6 +1028,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &30664519 stripped RectTransform: @@ -1060,7 +1076,6 @@ RectTransform: - {fileID: 14426175} - {fileID: 1472954656} m_Father: {fileID: 1714867591} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -1127,6 +1142,13 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] + m_Texture: {fileID: 0} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 radius: 12 thickness: 2 wedges: 8 @@ -1144,6 +1166,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 101034061} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -1212,7 +1235,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 51 + value: Horizontal List objectReference: {fileID: 0} - target: {fileID: 7594107385585372191, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive @@ -1327,6 +1350,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &47838182 stripped RectTransform: @@ -1338,12 +1364,9 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 5905304275062509466, guid: df4899a7e84d2794a9428337bba8a253, type: 3} - propertyPath: m_RootOrder - value: 4 - objectReference: {fileID: 0} - target: {fileID: 5905304275062509466, guid: df4899a7e84d2794a9428337bba8a253, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 @@ -1361,6 +1384,9 @@ PrefabInstance: value: EventSystem objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: df4899a7e84d2794a9428337bba8a253, type: 3} --- !u!1 &65389172 GameObject: @@ -1374,6 +1400,7 @@ GameObject: - component: {fileID: 65389175} - component: {fileID: 65389174} - component: {fileID: 65389173} + - component: {fileID: 65389177} m_Layer: 5 m_Name: Buttons Canvas m_TagString: Untagged @@ -1438,7 +1465,9 @@ Canvas: m_OverrideSorting: 0 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 m_AdditionalShaderChannelsFlag: 31 + m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 @@ -1460,18 +1489,77 @@ RectTransform: - {fileID: 3747106709254832807} - {fileID: 1944714597} m_Father: {fileID: 1369683957} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: -0.5737, y: -0.04201} m_SizeDelta: {x: 352.4888, y: 281.9509} m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &65389177 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 65389172} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 699100ca886480c4a94ced56b1ae0e94, type: 3} + m_Name: + m_EditorClassIdentifier: + themeDataSource: {fileID: 11400000, guid: 57993c46ea42acf4ca3067542443bc45, type: 2} + binders: + - rid: 1538473376477610090 + - rid: 1538473376477610091 + - rid: 1538473376477610092 + - rid: 1538473376477610087 + - rid: 1538473376477610088 + - rid: 1538473382797639792 + - rid: 1538473382797639793 + references: + version: 2 + RefIds: + - rid: 1538473376477610087 + type: {class: GraphicMaterialBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 6515328879105725118} + k__BackingField: Backplate Material + - rid: 1538473376477610088 + type: {class: GraphicMaterialBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 1944714600} + k__BackingField: Backplate Material + - rid: 1538473376477610090 + type: {class: TMP_TextFontAssetBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 2100425384} + k__BackingField: Text Font + - rid: 1538473376477610091 + type: {class: TMP_TextFontAssetBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 86645938} + k__BackingField: Text Font + - rid: 1538473376477610092 + type: {class: TMP_TextFontAssetBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 11163958} + k__BackingField: Text Font + - rid: 1538473382797639792 + type: {class: TMP_TextFontAssetBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 1622854746} + k__BackingField: Text Font + - rid: 1538473382797639793 + type: {class: GraphicColorBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 1622854746} + k__BackingField: On Surface Color --- !u!1001 &68209847 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 335940727} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -1540,7 +1628,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 104 + value: Mail objectReference: {fileID: 0} - target: {fileID: 7594107385585372191, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive @@ -1655,6 +1743,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &68209848 stripped RectTransform: @@ -1693,7 +1784,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1482164461} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -1778,20 +1868,23 @@ MonoBehaviour: m_VerticalAlignment: 256 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -1849,7 +1942,6 @@ RectTransform: m_Children: - {fileID: 906057049} m_Father: {fileID: 311062483} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -1876,6 +1968,13 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] + m_Texture: {fileID: 0} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 radius: 13 thickness: 2 wedges: 8 @@ -1920,7 +2019,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 65389176} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -2005,20 +2103,23 @@ MonoBehaviour: m_VerticalAlignment: 256 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -2049,6 +2150,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 14468906} m_Modifications: - target: {fileID: 201938300658660728, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -2236,6 +2338,12 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 7216918420766221479, guid: c6b351a67ceb69140b199996bbbea156, type: 3} + insertIndex: -1 + addedObject: {fileID: 1042814119} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &87540892 stripped RectTransform: @@ -2299,7 +2407,6 @@ RectTransform: - {fileID: 393337007} - {fileID: 628494713} m_Father: {fileID: 371654821} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -2364,6 +2471,13 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] + m_Texture: {fileID: 0} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 radius: 13 thickness: 2 wedges: 8 @@ -2381,6 +2495,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1983684637} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -2449,7 +2564,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 141 + value: Undo objectReference: {fileID: 0} - target: {fileID: 7594107385585372191, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive @@ -2564,6 +2679,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &101484292 stripped RectTransform: @@ -2575,6 +2693,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2087755156} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -2758,6 +2877,12 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 6922469056340231698, guid: c6b351a67ceb69140b199996bbbea156, type: 3} + insertIndex: -1 + addedObject: {fileID: 1349327197} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &109335092 stripped RectTransform: @@ -2785,6 +2910,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1983684637} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -2853,7 +2979,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 26 + value: Sound objectReference: {fileID: 0} - target: {fileID: 7594107385585372191, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive @@ -2968,6 +3094,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &117240531 stripped RectTransform: @@ -2979,6 +3108,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1073055405} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -3047,7 +3177,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 91 + value: Headphones objectReference: {fileID: 0} - target: {fileID: 7594107385585372191, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive @@ -3158,6 +3288,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &138829974 stripped RectTransform: @@ -3195,7 +3328,6 @@ RectTransform: - {fileID: 1488121688} - {fileID: 1854885402} m_Father: {fileID: 1092179575} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -3221,13 +3353,11 @@ MonoBehaviour: m_EditorClassIdentifier: m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 0 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -3260,42 +3390,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnHoverEntered: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_OnHoverExited: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectEntered: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectExited: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -3389,6 +3504,9 @@ MonoBehaviour: k__BackingField: 1 allowSelectByVoice: 1 speechRecognitionKeyword: select + k__BackingField: + m_PersistentCalls: + m_Calls: [] k__BackingField: 1 k__BackingField: 0 k__BackingField: @@ -3411,6 +3529,7 @@ MonoBehaviour: hostTransform: {fileID: 1369683957} allowedManipulations: 7 allowedInteractionTypes: -1 + rigidbodyMovementType: 0 applyTorque: 1 springForceSoftness: 0.1 springTorqueSoftness: 0.1 @@ -3433,8 +3552,7 @@ MonoBehaviour: moveLogicType: reference: MixedReality.Toolkit.SpatialManipulation.MoveLogic, MixedReality.Toolkit.SpatialManipulation rotateLogicType: - reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, - MixedReality.Toolkit.SpatialManipulation + reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, MixedReality.Toolkit.SpatialManipulation scaleLogicType: reference: MixedReality.Toolkit.SpatialManipulation.ScaleLogic, MixedReality.Toolkit.SpatialManipulation --- !u!114 &151308756 @@ -3456,6 +3574,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1304147004} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -3528,7 +3647,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 4 + value: Brightness objectReference: {fileID: 0} - target: {fileID: 8376646494505211202, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Name @@ -3635,6 +3754,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &151622003 stripped RectTransform: @@ -3675,7 +3797,6 @@ RectTransform: m_Children: - {fileID: 1936164015} m_Father: {fileID: 2118576653} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -3742,6 +3863,13 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] + m_Texture: {fileID: 0} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 radius: 13 thickness: 2 wedges: 8 @@ -3786,7 +3914,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 311062483} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -3871,20 +3998,23 @@ MonoBehaviour: m_VerticalAlignment: 256 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -3915,6 +4045,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 682545839} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -3997,7 +4128,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 53 + value: Camera objectReference: {fileID: 0} - target: {fileID: 8376646494505211202, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Name @@ -4124,6 +4255,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &168021814 stripped RectTransform: @@ -4135,6 +4269,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 47797540} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -4320,6 +4455,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &173788764 stripped RectTransform: @@ -4331,6 +4469,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1905834815} m_Modifications: - target: {fileID: 1345098608517470577, guid: 16750275763719646afa2c7c7592395d, type: 3} @@ -4426,12 +4565,21 @@ PrefabInstance: value: objectReference: {fileID: 1905834816} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 16750275763719646afa2c7c7592395d, type: 3} +--- !u!224 &188341443 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3514389556853228399, guid: 16750275763719646afa2c7c7592395d, type: 3} + m_PrefabInstance: {fileID: 188341442} + m_PrefabAsset: {fileID: 0} --- !u!1001 &197159555 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 386957940} m_Modifications: - target: {fileID: 1345098608517470577, guid: 16750275763719646afa2c7c7592395d, type: 3} @@ -4527,12 +4675,21 @@ PrefabInstance: value: objectReference: {fileID: 386957941} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 16750275763719646afa2c7c7592395d, type: 3} +--- !u!224 &197159556 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3514389556853228399, guid: 16750275763719646afa2c7c7592395d, type: 3} + m_PrefabInstance: {fileID: 197159555} + m_PrefabAsset: {fileID: 0} --- !u!1001 &198110455 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 335940727} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -4601,7 +4758,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 31 + value: Notifications objectReference: {fileID: 0} - target: {fileID: 7594107385585372191, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive @@ -4716,6 +4873,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &198110456 stripped RectTransform: @@ -4753,7 +4913,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 311062483} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -4821,20 +4980,23 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -4897,7 +5059,6 @@ RectTransform: - {fileID: 880417321} - {fileID: 1403959011} m_Father: {fileID: 831863309} - m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -4964,6 +5125,13 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] + m_Texture: {fileID: 0} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 radius: 13 thickness: 2 wedges: 8 @@ -5013,7 +5181,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1093577527} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -5099,20 +5266,23 @@ MonoBehaviour: m_VerticalAlignment: 256 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -5143,6 +5313,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1874031336} m_Modifications: - target: {fileID: 1345098608517470577, guid: f9ae8e304f5c6864980818dec2c95633, type: 3} @@ -5234,12 +5405,21 @@ PrefabInstance: value: objectReference: {fileID: 1874031337} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f9ae8e304f5c6864980818dec2c95633, type: 3} +--- !u!224 &276007649 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3514389556853228399, guid: f9ae8e304f5c6864980818dec2c95633, type: 3} + m_PrefabInstance: {fileID: 276007648} + m_PrefabAsset: {fileID: 0} --- !u!1001 &280014427 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1637717373} m_Modifications: - target: {fileID: 201938300658660728, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -5431,6 +5611,12 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 4185972052008607586, guid: c6b351a67ceb69140b199996bbbea156, type: 3} + insertIndex: -1 + addedObject: {fileID: 531191238} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &280014428 stripped RectTransform: @@ -5458,6 +5644,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1944714597} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -5635,6 +5822,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &284501559 stripped RectTransform: @@ -5646,6 +5836,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 479543587} m_Modifications: - target: {fileID: 1345098608517470577, guid: 16750275763719646afa2c7c7592395d, type: 3} @@ -5741,7 +5932,15 @@ PrefabInstance: value: objectReference: {fileID: 479543588} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 16750275763719646afa2c7c7592395d, type: 3} +--- !u!224 &290101502 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3514389556853228399, guid: 16750275763719646afa2c7c7592395d, type: 3} + m_PrefabInstance: {fileID: 290101501} + m_PrefabAsset: {fileID: 0} --- !u!1 &308180791 GameObject: m_ObjectHideFlags: 0 @@ -5774,7 +5973,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1653004003} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -5859,20 +6057,23 @@ MonoBehaviour: m_VerticalAlignment: 256 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -5939,7 +6140,6 @@ RectTransform: - {fileID: 1122818193} - {fileID: 1122456285} m_Father: {fileID: 1623931610} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -6003,7 +6203,9 @@ Canvas: m_OverrideSorting: 0 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 m_AdditionalShaderChannelsFlag: 31 + m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 @@ -6039,7 +6241,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1714867591} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -6124,20 +6325,23 @@ MonoBehaviour: m_VerticalAlignment: 256 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -6205,7 +6409,6 @@ RectTransform: - {fileID: 1111325864} - {fileID: 68209848} m_Father: {fileID: 371654821} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -6270,6 +6473,13 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] + m_Texture: {fileID: 0} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 radius: 13 thickness: 2 wedges: 8 @@ -6287,6 +6497,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 101034061} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -6355,7 +6566,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 93 + value: History objectReference: {fileID: 0} - target: {fileID: 7594107385585372191, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive @@ -6470,6 +6681,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &357876116 stripped RectTransform: @@ -6515,7 +6729,6 @@ RectTransform: - {fileID: 101034061} - {fileID: 335940727} m_Father: {fileID: 1158768845} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -6532,6 +6745,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1482164461} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -6618,7 +6832,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 84 + value: Globe objectReference: {fileID: 0} - target: {fileID: 8376646494505211202, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Name @@ -6733,6 +6947,12 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 4185972052008607586, guid: c6b351a67ceb69140b199996bbbea156, type: 3} + insertIndex: -1 + addedObject: {fileID: 197159556} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &386957939 stripped RectTransform: @@ -6760,6 +6980,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1983684637} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -6828,7 +7049,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 35 + value: List objectReference: {fileID: 0} - target: {fileID: 7594107385585372191, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive @@ -6943,6 +7164,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &389055256 stripped RectTransform: @@ -6954,6 +7178,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 101034061} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -7022,7 +7247,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 26 + value: Sound objectReference: {fileID: 0} - target: {fileID: 7594107385585372191, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive @@ -7137,6 +7362,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &393337007 stripped RectTransform: @@ -7148,6 +7376,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2087755156} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -7343,6 +7572,12 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 6922469056340231698, guid: c6b351a67ceb69140b199996bbbea156, type: 3} + insertIndex: -1 + addedObject: {fileID: 2044694321} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &402425587 stripped RectTransform: @@ -7398,7 +7633,6 @@ RectTransform: m_Children: - {fileID: 1704462485} m_Father: {fileID: 311062483} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -7457,6 +7691,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1854885402} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -7533,7 +7768,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 4 + value: Brightness objectReference: {fileID: 0} - target: {fileID: 8376646494505211202, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Name @@ -7696,33 +7931,16 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} ---- !u!1 &438013496 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 2351505566771328562, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - m_PrefabInstance: {fileID: 525252187} - m_PrefabAsset: {fileID: 0} ---- !u!114 &438013501 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 438013496} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c49b4cc203aa6414fae5c798d1d0e7d6, type: 3} - m_Name: - m_EditorClassIdentifier: - m_EventMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_MaxRayIntersections: 0 --- !u!1001 &443057977 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 891825324} m_Modifications: - target: {fileID: 1197545758422362387, guid: f64620d502cdf0f429efa27703913cb7, type: 3} @@ -7775,11 +7993,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5677198132670553562, guid: f64620d502cdf0f429efa27703913cb7, type: 3} propertyPath: m_AnchoredPosition.x - value: -0.000011444092 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5677198132670553562, guid: f64620d502cdf0f429efa27703913cb7, type: 3} propertyPath: m_AnchoredPosition.y - value: 0.00007534027 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5677198132965683087, guid: f64620d502cdf0f429efa27703913cb7, type: 3} propertyPath: m_AnchorMax.x @@ -7938,6 +8156,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f64620d502cdf0f429efa27703913cb7, type: 3} --- !u!224 &443057978 stripped RectTransform: @@ -7977,7 +8198,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1424732237} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -8056,6 +8276,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1944714597} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -8138,7 +8359,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 19 + value: Write Mail objectReference: {fileID: 0} - target: {fileID: 8376646494505211202, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Name @@ -8245,6 +8466,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &471693313 stripped RectTransform: @@ -8256,6 +8480,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 335940727} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -8324,7 +8549,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 94 + value: Home objectReference: {fileID: 0} - target: {fileID: 7594107385585372191, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive @@ -8439,6 +8664,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &475336116 stripped RectTransform: @@ -8450,6 +8678,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 773317072} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -8526,7 +8755,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 119 + value: Devices objectReference: {fileID: 0} - target: {fileID: 8376646494505211202, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Name @@ -8641,6 +8870,12 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 4185972052008607586, guid: c6b351a67ceb69140b199996bbbea156, type: 3} + insertIndex: -1 + addedObject: {fileID: 290101502} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &479543586 stripped RectTransform: @@ -8668,6 +8903,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 553395885} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -8865,6 +9101,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &505641634 stripped RectTransform: @@ -8876,6 +9115,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1482164461} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -8962,7 +9202,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 91 + value: Headphones objectReference: {fileID: 0} - target: {fileID: 8376646494505211202, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Name @@ -9089,6 +9329,12 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 4185972052008607586, guid: c6b351a67ceb69140b199996bbbea156, type: 3} + insertIndex: -1 + addedObject: {fileID: 826383660} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &514014398 stripped RectTransform: @@ -9116,6 +9362,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1944714597} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -9289,56 +9536,23 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &519434938 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} m_PrefabInstance: {fileID: 519434937} m_PrefabAsset: {fileID: 0} ---- !u!1001 &525252187 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720334, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_Name - value: MRTK XR Rig - objectReference: {fileID: 0} - - target: {fileID: 8479077998186684813, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} --- !u!1001 &530525190 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 3493013819197874656, guid: ad5b753b73e311143a85055b15cea562, type: 3} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - target: {fileID: 3493013819197874656, guid: ad5b753b73e311143a85055b15cea562, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 @@ -9360,12 +9574,16 @@ PrefabInstance: value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: ad5b753b73e311143a85055b15cea562, type: 3} --- !u!1001 &531191237 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 280014429} m_Modifications: - target: {fileID: 1345098608517470577, guid: 16750275763719646afa2c7c7592395d, type: 3} @@ -9461,12 +9679,21 @@ PrefabInstance: value: objectReference: {fileID: 280014430} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 16750275763719646afa2c7c7592395d, type: 3} +--- !u!224 &531191238 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3514389556853228399, guid: 16750275763719646afa2c7c7592395d, type: 3} + m_PrefabInstance: {fileID: 531191237} + m_PrefabAsset: {fileID: 0} --- !u!1001 &545482698 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1999519067} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -9539,7 +9766,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 91 + value: Headphones objectReference: {fileID: 0} - target: {fileID: 8376646494505211202, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Name @@ -9646,6 +9873,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &545482699 stripped RectTransform: @@ -9689,7 +9919,6 @@ RectTransform: - {fileID: 733249950} - {fileID: 505641634} m_Father: {fileID: 1653004003} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -9756,6 +9985,13 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] + m_Texture: {fileID: 0} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 radius: 13 thickness: 2 wedges: 8 @@ -9768,11 +10004,73 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 553395884} m_CullTransparentMesh: 1 +--- !u!1001 &553824788 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720334, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_Name + value: MRTK XR Rig + objectReference: {fileID: 0} + - target: {fileID: 8479077998186684813, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} --- !u!1001 &576536706 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1854885402} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -9851,7 +10149,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 4 + value: Brightness objectReference: {fileID: 0} - target: {fileID: 8376646494505211202, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Name @@ -10014,6 +10312,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &576536707 stripped RectTransform: @@ -10025,6 +10326,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 591035305} m_Modifications: - target: {fileID: 1345098608517470577, guid: 16750275763719646afa2c7c7592395d, type: 3} @@ -10116,12 +10418,21 @@ PrefabInstance: value: objectReference: {fileID: 591035306} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 16750275763719646afa2c7c7592395d, type: 3} +--- !u!224 &577083554 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3514389556853228399, guid: 16750275763719646afa2c7c7592395d, type: 3} + m_PrefabInstance: {fileID: 577083553} + m_PrefabAsset: {fileID: 0} --- !u!1001 &591035303 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 47797540} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -10367,6 +10678,12 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 4185972052008607586, guid: c6b351a67ceb69140b199996bbbea156, type: 3} + insertIndex: -1 + addedObject: {fileID: 577083554} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &591035304 stripped RectTransform: @@ -10394,6 +10711,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 101034061} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -10462,7 +10780,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 37 + value: Reset objectReference: {fileID: 0} - target: {fileID: 7594107385585372191, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive @@ -10577,6 +10895,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &628494713 stripped RectTransform: @@ -10588,6 +10909,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1796335078} m_Modifications: - target: {fileID: 1197545758422362387, guid: f64620d502cdf0f429efa27703913cb7, type: 3} @@ -10620,11 +10942,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5677198132670553562, guid: f64620d502cdf0f429efa27703913cb7, type: 3} propertyPath: m_AnchoredPosition.x - value: 0.000022888184 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5677198132670553562, guid: f64620d502cdf0f429efa27703913cb7, type: 3} propertyPath: m_AnchoredPosition.y - value: -0.00004386902 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5677198132984834578, guid: f64620d502cdf0f429efa27703913cb7, type: 3} propertyPath: m_Pivot.x @@ -10715,6 +11037,9 @@ PrefabInstance: value: CanvasSlider (1) objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f64620d502cdf0f429efa27703913cb7, type: 3} --- !u!224 &630532475 stripped RectTransform: @@ -10760,7 +11085,6 @@ RectTransform: - {fileID: 168021814} - {fileID: 30053974} m_Father: {fileID: 1653004003} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -10827,6 +11151,13 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] + m_Texture: {fileID: 0} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 radius: 13 thickness: 2 wedges: 8 @@ -10871,7 +11202,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2118576653} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -10959,20 +11289,23 @@ MonoBehaviour: m_VerticalAlignment: 256 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -11003,6 +11336,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1424732237} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -11103,7 +11437,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 85 + value: Edit objectReference: {fileID: 0} - target: {fileID: 7594107385585372191, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive @@ -11214,6 +11548,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &695898586 stripped RectTransform: @@ -11225,6 +11562,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1122818193} m_Modifications: - target: {fileID: 3705378105823492738, guid: b85e005d231192249b7077b40a4d4e45, type: 3} @@ -11392,6 +11730,9 @@ PrefabInstance: value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b85e005d231192249b7077b40a4d4e45, type: 3} --- !u!224 &703335399 stripped RectTransform: @@ -11423,9 +11764,8 @@ Light: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 705507993} m_Enabled: 1 - serializedVersion: 10 + serializedVersion: 11 m_Type: 1 - m_Shape: 0 m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1} m_Intensity: 1 m_Range: 10 @@ -11475,8 +11815,12 @@ Light: m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 m_UseViewFrustumForShadowCasterCull: 1 + m_ForceVisible: 0 m_ShadowRadius: 0 m_ShadowAngle: 0 + m_LightUnit: 1 + m_LuxAtDistance: 1 + m_EnableSpotReflector: 1 --- !u!4 &705507995 Transform: m_ObjectHideFlags: 0 @@ -11484,19 +11828,20 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 705507993} + serializedVersion: 2 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 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} --- !u!1001 &733249949 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 553395885} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -11694,6 +12039,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &733249950 stripped RectTransform: @@ -11737,7 +12085,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 682545839} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -11822,20 +12169,23 @@ MonoBehaviour: m_VerticalAlignment: 256 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -11866,12 +12216,9 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 7781529056550460865, guid: c07c4bd04b45c014fad0e3cd30747f06, type: 3} - propertyPath: m_RootOrder - value: 6 - objectReference: {fileID: 0} - target: {fileID: 7781529056550460865, guid: c07c4bd04b45c014fad0e3cd30747f06, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -11921,6 +12268,12 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 7781529056550460865, guid: c07c4bd04b45c014fad0e3cd30747f06, type: 3} + insertIndex: -1 + addedObject: {fileID: 1551252957} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07c4bd04b45c014fad0e3cd30747f06, type: 3} --- !u!1 &773317071 GameObject: @@ -11956,7 +12309,6 @@ RectTransform: - {fileID: 1874031335} - {fileID: 479543586} m_Father: {fileID: 1329564636} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -11994,6 +12346,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1073055405} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -12062,7 +12415,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 53 + value: Camera objectReference: {fileID: 0} - target: {fileID: 7594107385585372191, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive @@ -12173,6 +12526,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &819541700 stripped RectTransform: @@ -12184,6 +12540,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 101034061} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -12252,7 +12609,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 65 + value: Zoom objectReference: {fileID: 0} - target: {fileID: 7594107385585372191, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive @@ -12367,6 +12724,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &820958105 stripped RectTransform: @@ -12378,6 +12738,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 514014399} m_Modifications: - target: {fileID: 1345098608517470577, guid: 16750275763719646afa2c7c7592395d, type: 3} @@ -12473,7 +12834,15 @@ PrefabInstance: value: objectReference: {fileID: 514014400} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 16750275763719646afa2c7c7592395d, type: 3} +--- !u!224 &826383660 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3514389556853228399, guid: 16750275763719646afa2c7c7592395d, type: 3} + m_PrefabInstance: {fileID: 826383659} + m_PrefabAsset: {fileID: 0} --- !u!1 &831863308 GameObject: m_ObjectHideFlags: 0 @@ -12510,7 +12879,6 @@ RectTransform: - {fileID: 1424732237} - {fileID: 201720333} m_Father: {fileID: 2127076438} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -12522,6 +12890,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1599070118} m_Modifications: - target: {fileID: 1345098608517470577, guid: f9ae8e304f5c6864980818dec2c95633, type: 3} @@ -12601,12 +12970,21 @@ PrefabInstance: value: objectReference: {fileID: 1599070119} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f9ae8e304f5c6864980818dec2c95633, type: 3} +--- !u!224 &834000930 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3514389556853228399, guid: f9ae8e304f5c6864980818dec2c95633, type: 3} + m_PrefabInstance: {fileID: 834000929} + m_PrefabAsset: {fileID: 0} --- !u!1001 &850642144 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1424732237} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -12679,7 +13057,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 100 + value: Lightbulb objectReference: {fileID: 0} - target: {fileID: 7594107385585372191, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive @@ -12790,6 +13168,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &850642145 stripped RectTransform: @@ -12828,7 +13209,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 831863309} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -12913,20 +13293,23 @@ MonoBehaviour: m_VerticalAlignment: 256 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -12957,6 +13340,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 201720333} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -13025,7 +13409,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 40 + value: Move objectReference: {fileID: 0} - target: {fileID: 7594107385585372191, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive @@ -13136,6 +13520,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &880417321 stripped RectTransform: @@ -13178,7 +13565,6 @@ RectTransform: - {fileID: 443057978} - {fileID: 2137575391} m_Father: {fileID: 1290890163} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -13311,7 +13697,6 @@ RectTransform: m_Children: - {fileID: 1125450390} m_Father: {fileID: 85912328} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -13370,6 +13755,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2087755156} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -13565,6 +13951,12 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 6922469056340231698, guid: c6b351a67ceb69140b199996bbbea156, type: 3} + insertIndex: -1 + addedObject: {fileID: 1508693225} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &924342751 stripped RectTransform: @@ -13592,6 +13984,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1073055405} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -13660,7 +14053,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 113 + value: Settings Sliders objectReference: {fileID: 0} - target: {fileID: 7594107385585372191, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive @@ -13771,6 +14164,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &943981974 stripped RectTransform: @@ -13782,6 +14178,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1796335078} m_Modifications: - target: {fileID: 1197545758422362387, guid: f64620d502cdf0f429efa27703913cb7, type: 3} @@ -13814,11 +14211,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5677198132670553562, guid: f64620d502cdf0f429efa27703913cb7, type: 3} propertyPath: m_AnchoredPosition.x - value: 0.000022888184 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5677198132670553562, guid: f64620d502cdf0f429efa27703913cb7, type: 3} propertyPath: m_AnchoredPosition.y - value: 0.00005722046 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5677198132984834578, guid: f64620d502cdf0f429efa27703913cb7, type: 3} propertyPath: m_Pivot.x @@ -13909,6 +14306,9 @@ PrefabInstance: value: CanvasSlider (2) objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f64620d502cdf0f429efa27703913cb7, type: 3} --- !u!224 &954672193 stripped RectTransform: @@ -13920,6 +14320,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1637717373} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -13988,7 +14389,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 107 + value: Movie objectReference: {fileID: 0} - target: {fileID: 8376646494505211202, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Name @@ -14107,6 +14508,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &968557651 stripped RectTransform: @@ -14125,6 +14529,7 @@ GameObject: - component: {fileID: 1000460828} - component: {fileID: 1000460827} - component: {fileID: 1000460826} + - component: {fileID: 1000460830} m_Layer: 5 m_Name: Single Buttons Canvas m_TagString: Untagged @@ -14189,7 +14594,9 @@ Canvas: m_OverrideSorting: 0 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 m_AdditionalShaderChannelsFlag: 31 + m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 @@ -14207,13 +14614,59 @@ RectTransform: m_Children: - {fileID: 2118576653} m_Father: {fileID: 1369683957} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: -0.5773, y: -0.2353} m_SizeDelta: {x: 345.3021, y: 156.8906} m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1000460830 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1000460825} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 699100ca886480c4a94ced56b1ae0e94, type: 3} + m_Name: + m_EditorClassIdentifier: + themeDataSource: {fileID: 11400000, guid: 57993c46ea42acf4ca3067542443bc45, type: 2} + binders: + - rid: 1538473376477610093 + - rid: 1538473376477610094 + - rid: 1538473382797639789 + - rid: 1538473382797639790 + - rid: 1538473382797639791 + references: + version: 2 + RefIds: + - rid: 1538473376477610093 + type: {class: TMP_TextFontAssetBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 1023697618} + k__BackingField: Text Font + - rid: 1538473376477610094 + type: {class: TMP_TextFontAssetBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 692976829} + k__BackingField: Text Font + - rid: 1538473382797639789 + type: {class: GraphicMaterialBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 1031621825} + k__BackingField: Backplate Material + - rid: 1538473382797639790 + type: {class: GraphicMaterialBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 1304147007} + k__BackingField: Backplate Material + - rid: 1538473382797639791 + type: {class: GraphicMaterialBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 154440646} + k__BackingField: Backplate Material --- !u!1 &1005008029 GameObject: m_ObjectHideFlags: 0 @@ -14249,7 +14702,6 @@ RectTransform: m_Children: - {fileID: 1371947327} m_Father: {fileID: 1277251431} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -14354,6 +14806,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 2082148069247382453, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} @@ -14408,10 +14861,6 @@ PrefabInstance: propertyPath: m_Name value: SampleSceneHandMenu objectReference: {fileID: 0} - - target: {fileID: 7372669237086358568, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} - propertyPath: m_RootOrder - value: 3 - objectReference: {fileID: 0} - target: {fileID: 7372669237086358568, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -14465,6 +14914,9 @@ PrefabInstance: value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} --- !u!1 &1023697615 GameObject: @@ -14498,7 +14950,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2118576653} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -14583,20 +15034,23 @@ MonoBehaviour: m_VerticalAlignment: 256 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -14656,7 +15110,6 @@ RectTransform: m_Children: - {fileID: 2115835485} m_Father: {fileID: 2118576653} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -14723,6 +15176,13 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] + m_Texture: {fileID: 0} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 radius: 13 thickness: 2 wedges: 8 @@ -14740,6 +15200,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 87540893} m_Modifications: - target: {fileID: 1345098608517470577, guid: f9ae8e304f5c6864980818dec2c95633, type: 3} @@ -14819,7 +15280,15 @@ PrefabInstance: value: objectReference: {fileID: 87540894} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f9ae8e304f5c6864980818dec2c95633, type: 3} +--- !u!224 &1042814119 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3514389556853228399, guid: f9ae8e304f5c6864980818dec2c95633, type: 3} + m_PrefabInstance: {fileID: 1042814118} + m_PrefabAsset: {fileID: 0} --- !u!1 &1045922679 GameObject: m_ObjectHideFlags: 0 @@ -14852,7 +15321,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1093577527} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -14937,20 +15405,23 @@ MonoBehaviour: m_VerticalAlignment: 256 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -14981,6 +15452,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1482164461} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -15067,7 +15539,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 74 + value: Bar Chart objectReference: {fileID: 0} - target: {fileID: 8376646494505211202, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Name @@ -15194,6 +15666,12 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 4185972052008607586, guid: c6b351a67ceb69140b199996bbbea156, type: 3} + insertIndex: -1 + addedObject: {fileID: 1798621954} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &1048775325 stripped RectTransform: @@ -15221,6 +15699,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 773317072} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -15400,6 +15879,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &1051477455 stripped RectTransform: @@ -15411,6 +15893,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1983684637} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -15479,7 +15962,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 114 + value: Hierarchy objectReference: {fileID: 0} - target: {fileID: 7594107385585372191, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive @@ -15594,6 +16077,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &1064177822 stripped RectTransform: @@ -15637,7 +16123,6 @@ RectTransform: - {fileID: 1260305183} - {fileID: 819541700} m_Father: {fileID: 831863309} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -15704,6 +16189,13 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] + m_Texture: {fileID: 0} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 radius: 13 thickness: 2 wedges: 8 @@ -15728,6 +16220,7 @@ GameObject: - component: {fileID: 1092179574} - component: {fileID: 1092179573} - component: {fileID: 1092179572} + - component: {fileID: 1092179576} m_Layer: 5 m_Name: Dialogs Canvas m_TagString: Untagged @@ -15792,7 +16285,9 @@ Canvas: m_OverrideSorting: 0 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 m_AdditionalShaderChannelsFlag: 31 + m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 @@ -15810,13 +16305,41 @@ RectTransform: m_Children: - {fileID: 149389691} m_Father: {fileID: 1369683957} - m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0.6818, y: -0.1034} m_SizeDelta: {x: 240.0909, y: 404.8173} m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1092179576 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1092179571} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 699100ca886480c4a94ced56b1ae0e94, type: 3} + m_Name: + m_EditorClassIdentifier: + themeDataSource: {fileID: 11400000, guid: 57993c46ea42acf4ca3067542443bc45, type: 2} + binders: + - rid: 1538473382797639770 + - rid: 1538473382797639771 + references: + version: 2 + RefIds: + - rid: 1538473382797639770 + type: {class: TMP_TextFontAssetBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 1488121690} + k__BackingField: Text Font + - rid: 1538473382797639771 + type: {class: GraphicMaterialBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 1854885406} + k__BackingField: Backplate Material --- !u!1 &1093577523 GameObject: m_ObjectHideFlags: 0 @@ -15829,6 +16352,7 @@ GameObject: - component: {fileID: 1093577526} - component: {fileID: 1093577525} - component: {fileID: 1093577524} + - component: {fileID: 1093577528} m_Layer: 5 m_Name: Top Navigation Canvas m_TagString: Untagged @@ -15893,7 +16417,9 @@ Canvas: m_OverrideSorting: 0 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 m_AdditionalShaderChannelsFlag: 31 + m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 @@ -15913,18 +16439,47 @@ RectTransform: - {fileID: 272965572} - {fileID: 1506166577} m_Father: {fileID: 1369683957} - m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: -0.0175, y: -0.309} m_SizeDelta: {x: 227.4141, y: 146.1393} m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1093577528 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1093577523} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 699100ca886480c4a94ced56b1ae0e94, type: 3} + m_Name: + m_EditorClassIdentifier: + themeDataSource: {fileID: 11400000, guid: 57993c46ea42acf4ca3067542443bc45, type: 2} + binders: + - rid: 1538473376477610114 + - rid: 1538473376477610115 + references: + version: 2 + RefIds: + - rid: 1538473376477610114 + type: {class: TMP_TextFontAssetBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 1045922682} + k__BackingField: Text Font + - rid: 1538473376477610115 + type: {class: TMP_TextFontAssetBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 272965574} + k__BackingField: Text Font --- !u!1001 &1096736671 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 101034061} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -15993,7 +16548,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 72 + value: Cut objectReference: {fileID: 0} - target: {fileID: 7594107385585372191, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive @@ -16108,6 +16663,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &1096736672 stripped RectTransform: @@ -16119,6 +16677,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 335940727} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -16187,7 +16746,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 98 + value: Pen Tip objectReference: {fileID: 0} - target: {fileID: 7594107385585372191, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive @@ -16302,6 +16861,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &1111325864 stripped RectTransform: @@ -16339,7 +16901,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 311062483} - m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -16406,20 +16967,23 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -16480,7 +17044,6 @@ RectTransform: - {fileID: 703335399} - {fileID: 1277251431} m_Father: {fileID: 311062483} - m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -16547,6 +17110,13 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] + m_Texture: {fileID: 0} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 radius: 13 thickness: 2 wedges: 8 @@ -16564,6 +17134,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 906057049} m_Modifications: - target: {fileID: 4270209841583229004, guid: f64620d502cdf0f429efa27703913cb7, type: 3} @@ -16576,11 +17147,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5677198132670553562, guid: f64620d502cdf0f429efa27703913cb7, type: 3} propertyPath: m_AnchoredPosition.x - value: 0.000030517578 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5677198132670553562, guid: f64620d502cdf0f429efa27703913cb7, type: 3} propertyPath: m_AnchoredPosition.y - value: 0.000022888184 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5677198132984834578, guid: f64620d502cdf0f429efa27703913cb7, type: 3} propertyPath: m_Pivot.x @@ -16671,6 +17242,9 @@ PrefabInstance: value: CanvasSlider objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f64620d502cdf0f429efa27703913cb7, type: 3} --- !u!224 &1125450390 stripped RectTransform: @@ -16682,6 +17256,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2056942515} m_Modifications: - target: {fileID: 1197545758422362387, guid: f64620d502cdf0f429efa27703913cb7, type: 3} @@ -16714,11 +17289,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5677198132670553562, guid: f64620d502cdf0f429efa27703913cb7, type: 3} propertyPath: m_AnchoredPosition.x - value: -0.000015258789 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5677198132670553562, guid: f64620d502cdf0f429efa27703913cb7, type: 3} propertyPath: m_AnchoredPosition.y - value: 0.000015258789 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5677198132984834578, guid: f64620d502cdf0f429efa27703913cb7, type: 3} propertyPath: m_Pivot.x @@ -16809,6 +17384,9 @@ PrefabInstance: value: CanvasSlider (1) objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f64620d502cdf0f429efa27703913cb7, type: 3} --- !u!224 &1125611905 stripped RectTransform: @@ -16820,6 +17398,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1517398120} m_Modifications: - target: {fileID: 1345098608517470577, guid: 16750275763719646afa2c7c7592395d, type: 3} @@ -16915,12 +17494,21 @@ PrefabInstance: value: objectReference: {fileID: 1517398121} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 16750275763719646afa2c7c7592395d, type: 3} +--- !u!224 &1129401599 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3514389556853228399, guid: 16750275763719646afa2c7c7592395d, type: 3} + m_PrefabInstance: {fileID: 1129401598} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1137517785 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2056942515} m_Modifications: - target: {fileID: 1197545758422362387, guid: f64620d502cdf0f429efa27703913cb7, type: 3} @@ -16953,11 +17541,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5677198132670553562, guid: f64620d502cdf0f429efa27703913cb7, type: 3} propertyPath: m_AnchoredPosition.x - value: -0.000015258789 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5677198132670553562, guid: f64620d502cdf0f429efa27703913cb7, type: 3} propertyPath: m_AnchoredPosition.y - value: -0.000045776367 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5677198132984834578, guid: f64620d502cdf0f429efa27703913cb7, type: 3} propertyPath: m_Pivot.x @@ -17048,6 +17636,9 @@ PrefabInstance: value: CanvasSlider objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f64620d502cdf0f429efa27703913cb7, type: 3} --- !u!224 &1137517786 stripped RectTransform: @@ -17059,6 +17650,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1999519067} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -17226,6 +17818,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &1138145396 stripped RectTransform: @@ -17264,7 +17859,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1714867591} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -17351,20 +17945,23 @@ MonoBehaviour: m_VerticalAlignment: 256 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -17402,6 +17999,7 @@ GameObject: - component: {fileID: 1158768844} - component: {fileID: 1158768843} - component: {fileID: 1158768842} + - component: {fileID: 1158768846} m_Layer: 5 m_Name: Button Grid Canvas m_TagString: Untagged @@ -17466,7 +18064,9 @@ Canvas: m_OverrideSorting: 0 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 m_AdditionalShaderChannelsFlag: 31 + m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 @@ -17484,18 +18084,65 @@ RectTransform: m_Children: - {fileID: 371654821} m_Father: {fileID: 1369683957} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: -0.27, y: -0.304} m_SizeDelta: {x: 255.8181, y: 283.6979} m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1158768846 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1158768841} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 699100ca886480c4a94ced56b1ae0e94, type: 3} + m_Name: + m_EditorClassIdentifier: + themeDataSource: {fileID: 11400000, guid: 57993c46ea42acf4ca3067542443bc45, type: 2} + binders: + - rid: 1538473376477610102 + - rid: 1538473376477610103 + - rid: 1538473376477610107 + - rid: 1538473376477610105 + - rid: 1538473376477610106 + references: + version: 2 + RefIds: + - rid: 1538473376477610102 + type: {class: TMP_TextFontAssetBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 1503675472} + k__BackingField: Text Font + - rid: 1538473376477610103 + type: {class: TMP_TextFontAssetBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 1935111451} + k__BackingField: Text Font + - rid: 1538473376477610105 + type: {class: GraphicMaterialBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 101034064} + k__BackingField: Backplate Material + - rid: 1538473376477610106 + type: {class: GraphicMaterialBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 335940730} + k__BackingField: Backplate Material + - rid: 1538473376477610107 + type: {class: GraphicMaterialBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 1983684640} + k__BackingField: Backplate Material --- !u!1001 &1170466718 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1369683957} m_Modifications: - target: {fileID: 566361764857432160, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} @@ -17621,6 +18268,21 @@ PrefabInstance: value: objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 6540126486176102408, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} + insertIndex: -1 + addedObject: {fileID: 151308755} + - targetCorrespondingSourceObject: {fileID: 6540126486176102408, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} + insertIndex: -1 + addedObject: {fileID: 151308756} + - targetCorrespondingSourceObject: {fileID: 6540126486176102408, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} + insertIndex: -1 + addedObject: {fileID: 1170466720} + - targetCorrespondingSourceObject: {fileID: 8323939510892415185, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} + insertIndex: -1 + addedObject: {fileID: 1761219194} m_SourcePrefab: {fileID: 100100000, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} --- !u!224 &1170466719 stripped RectTransform: @@ -17639,8 +18301,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 80f85af46f9bddd4ea78f11cee5e3b2e, type: 3} m_Name: m_EditorClassIdentifier: - handType: 3 - proximityType: 3 + handType: -1 + proximityType: -1 executionOrder: 0 minimumScale: {x: 0.2, y: 0.2, z: 0.2} maximumScale: {x: 2, y: 2, z: 2} @@ -17650,6 +18312,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1472954657} m_Modifications: - target: {fileID: 1345098608517470577, guid: f9ae8e304f5c6864980818dec2c95633, type: 3} @@ -17741,7 +18404,15 @@ PrefabInstance: value: objectReference: {fileID: 1472954658} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f9ae8e304f5c6864980818dec2c95633, type: 3} +--- !u!224 &1181166648 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3514389556853228399, guid: f9ae8e304f5c6864980818dec2c95633, type: 3} + m_PrefabInstance: {fileID: 1181166647} + m_PrefabAsset: {fileID: 0} --- !u!1 &1187780960 GameObject: m_ObjectHideFlags: 0 @@ -17774,7 +18445,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1714867591} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -17859,20 +18529,23 @@ MonoBehaviour: m_VerticalAlignment: 256 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -17903,6 +18576,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 101034061} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -17971,7 +18645,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 74 + value: Bar Chart objectReference: {fileID: 0} - target: {fileID: 7594107385585372191, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive @@ -18086,6 +18760,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &1188352986 stripped RectTransform: @@ -18097,6 +18774,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 682545839} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -18179,7 +18857,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 45 + value: Attach objectReference: {fileID: 0} - target: {fileID: 8376646494505211202, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Name @@ -18294,6 +18972,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &1238271666 stripped RectTransform: @@ -18305,6 +18986,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1983684637} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -18373,7 +19055,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 139 + value: Videocam objectReference: {fileID: 0} - target: {fileID: 7594107385585372191, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive @@ -18488,6 +19170,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &1250963981 stripped RectTransform: @@ -18499,6 +19184,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1073055405} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -18567,7 +19253,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 67 + value: Color Palette objectReference: {fileID: 0} - target: {fileID: 7594107385585372191, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive @@ -18678,6 +19364,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &1260305183 stripped RectTransform: @@ -18689,6 +19378,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 335940727} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -18757,7 +19447,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 91 + value: Headphones objectReference: {fileID: 0} - target: {fileID: 7594107385585372191, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive @@ -18872,6 +19562,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &1265028401 stripped RectTransform: @@ -18883,6 +19576,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 773317072} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -19066,6 +19760,12 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 4185972052008607586, guid: c6b351a67ceb69140b199996bbbea156, type: 3} + insertIndex: -1 + addedObject: {fileID: 1469922710} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &1270681976 stripped RectTransform: @@ -19121,7 +19821,6 @@ RectTransform: - {fileID: 1729846266} - {fileID: 1005008030} m_Father: {fileID: 1122818193} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -19187,7 +19886,6 @@ RectTransform: - {fileID: 1665223376} - {fileID: 1915696964} m_Father: {fileID: 3747106709254832807} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -19252,7 +19950,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 831863309} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -19337,20 +20034,23 @@ MonoBehaviour: m_VerticalAlignment: 256 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -19410,7 +20110,6 @@ RectTransform: - {fileID: 1796335078} - {fileID: 891825324} m_Father: {fileID: 311062483} - m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -19463,6 +20162,13 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] + m_Texture: {fileID: 0} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 radius: 13 thickness: 2 wedges: 8 @@ -19480,6 +20186,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1944714597} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -19558,7 +20265,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 139 + value: Videocam objectReference: {fileID: 0} - target: {fileID: 8376646494505211202, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Name @@ -19665,6 +20372,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &1298861446 stripped RectTransform: @@ -19705,7 +20415,6 @@ RectTransform: m_Children: - {fileID: 151622003} m_Father: {fileID: 2118576653} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -19772,6 +20481,13 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] + m_Texture: {fileID: 0} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 radius: 13 thickness: 2 wedges: 8 @@ -19789,6 +20505,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1614318675} m_Modifications: - target: {fileID: 1345098608517470577, guid: f9ae8e304f5c6864980818dec2c95633, type: 3} @@ -19880,12 +20597,21 @@ PrefabInstance: value: objectReference: {fileID: 1614318676} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f9ae8e304f5c6864980818dec2c95633, type: 3} +--- !u!224 &1311646145 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3514389556853228399, guid: f9ae8e304f5c6864980818dec2c95633, type: 3} + m_PrefabInstance: {fileID: 1311646144} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1313191255 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1424732237} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -19958,7 +20684,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 101 + value: Link objectReference: {fileID: 0} - target: {fileID: 7594107385585372191, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive @@ -20069,6 +20795,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &1313191256 stripped RectTransform: @@ -20110,7 +20839,6 @@ RectTransform: - {fileID: 1637717373} - {fileID: 773317072} m_Father: {fileID: 1714867591} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -20177,6 +20905,13 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] + m_Texture: {fileID: 0} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 radius: 12 thickness: 2 wedges: 8 @@ -20194,6 +20929,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 109335093} m_Modifications: - target: {fileID: 1345098608517470577, guid: f9ae8e304f5c6864980818dec2c95633, type: 3} @@ -20285,7 +21021,15 @@ PrefabInstance: value: objectReference: {fileID: 109335094} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f9ae8e304f5c6864980818dec2c95633, type: 3} +--- !u!224 &1349327197 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3514389556853228399, guid: f9ae8e304f5c6864980818dec2c95633, type: 3} + m_PrefabInstance: {fileID: 1349327196} + m_PrefabAsset: {fileID: 0} --- !u!1 &1369683956 GameObject: m_ObjectHideFlags: 0 @@ -20309,6 +21053,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1369683956} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 1.6, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -20325,13 +21070,13 @@ Transform: - {fileID: 1092179575} - {fileID: 1623931610} m_Father: {fileID: 0} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1371947326 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1005008030} m_Modifications: - target: {fileID: 1197545758422362387, guid: f64620d502cdf0f429efa27703913cb7, type: 3} @@ -20384,11 +21129,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5677198132670553562, guid: f64620d502cdf0f429efa27703913cb7, type: 3} propertyPath: m_AnchoredPosition.x - value: -0.000022888184 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5677198132670553562, guid: f64620d502cdf0f429efa27703913cb7, type: 3} propertyPath: m_AnchoredPosition.y - value: -0.000076293945 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5677198132965683087, guid: f64620d502cdf0f429efa27703913cb7, type: 3} propertyPath: m_AnchorMax.x @@ -20547,6 +21292,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f64620d502cdf0f429efa27703913cb7, type: 3} --- !u!224 &1371947327 stripped RectTransform: @@ -20558,6 +21306,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 14468906} m_Modifications: - target: {fileID: 201938300658660728, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -20745,6 +21494,12 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 7216918420766221479, guid: c6b351a67ceb69140b199996bbbea156, type: 3} + insertIndex: -1 + addedObject: {fileID: 1427191248} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &1395554708 stripped RectTransform: @@ -20772,6 +21527,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 201720333} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -20840,7 +21596,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 14 + value: Add Location objectReference: {fileID: 0} - target: {fileID: 7594107385585372191, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive @@ -20951,6 +21707,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &1403959011 stripped RectTransform: @@ -20962,6 +21721,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 335940727} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -21030,7 +21790,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 77 + value: Icon 62298 objectReference: {fileID: 0} - target: {fileID: 7594107385585372191, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive @@ -21145,6 +21905,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &1419556815 stripped RectTransform: @@ -21189,7 +21952,6 @@ RectTransform: - {fileID: 850642145} - {fileID: 695898586} m_Father: {fileID: 831863309} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -21256,6 +22018,13 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] + m_Texture: {fileID: 0} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 radius: 13 thickness: 2 wedges: 8 @@ -21273,6 +22042,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1395554709} m_Modifications: - target: {fileID: 1345098608517470577, guid: f9ae8e304f5c6864980818dec2c95633, type: 3} @@ -21352,12 +22122,21 @@ PrefabInstance: value: objectReference: {fileID: 1395554710} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f9ae8e304f5c6864980818dec2c95633, type: 3} +--- !u!224 &1427191248 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3514389556853228399, guid: f9ae8e304f5c6864980818dec2c95633, type: 3} + m_PrefabInstance: {fileID: 1427191247} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1469922709 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1270681977} m_Modifications: - target: {fileID: 1345098608517470577, guid: 16750275763719646afa2c7c7592395d, type: 3} @@ -21453,12 +22232,21 @@ PrefabInstance: value: objectReference: {fileID: 1270681978} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 16750275763719646afa2c7c7592395d, type: 3} +--- !u!224 &1469922710 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3514389556853228399, guid: 16750275763719646afa2c7c7592395d, type: 3} + m_PrefabInstance: {fileID: 1469922709} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1472954655 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 47797540} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -21537,7 +22325,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 129 + value: Save objectReference: {fileID: 0} - target: {fileID: 8376646494505211202, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Name @@ -21656,6 +22444,12 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 6922469056340231698, guid: c6b351a67ceb69140b199996bbbea156, type: 3} + insertIndex: -1 + addedObject: {fileID: 1181166648} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &1472954656 stripped RectTransform: @@ -21717,7 +22511,6 @@ RectTransform: - {fileID: 1048775325} - {fileID: 1517398119} m_Father: {fileID: 1653004003} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -21784,6 +22577,13 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] + m_Texture: {fileID: 0} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 radius: 13 thickness: 2 wedges: 8 @@ -21828,7 +22628,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 149389691} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -21913,20 +22712,23 @@ MonoBehaviour: m_VerticalAlignment: 256 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -21984,7 +22786,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 371654821} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -22069,20 +22870,23 @@ MonoBehaviour: m_VerticalAlignment: 256 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -22113,6 +22917,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1093577527} m_Modifications: - target: {fileID: 3272530386015204673, guid: beb27f14f40963b45a9fb5d2523f4711, type: 3} @@ -22552,6 +23357,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: beb27f14f40963b45a9fb5d2523f4711, type: 3} --- !u!224 &1506166577 stripped RectTransform: @@ -22563,6 +23371,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 924342752} m_Modifications: - target: {fileID: 1345098608517470577, guid: f9ae8e304f5c6864980818dec2c95633, type: 3} @@ -22654,7 +23463,15 @@ PrefabInstance: value: objectReference: {fileID: 924342753} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f9ae8e304f5c6864980818dec2c95633, type: 3} +--- !u!224 &1508693225 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3514389556853228399, guid: f9ae8e304f5c6864980818dec2c95633, type: 3} + m_PrefabInstance: {fileID: 1508693224} + m_PrefabAsset: {fileID: 0} --- !u!1 &1512031906 GameObject: m_ObjectHideFlags: 0 @@ -22686,7 +23503,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 311062483} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -22753,20 +23569,23 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -22797,6 +23616,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1482164461} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -22883,7 +23703,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 31 + value: Notifications objectReference: {fileID: 0} - target: {fileID: 8376646494505211202, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Name @@ -23010,6 +23830,12 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 4185972052008607586, guid: c6b351a67ceb69140b199996bbbea156, type: 3} + insertIndex: -1 + addedObject: {fileID: 1129401599} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &1517398119 stripped RectTransform: @@ -23037,6 +23863,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2086818869} m_Modifications: - target: {fileID: 1345098608517470577, guid: f9ae8e304f5c6864980818dec2c95633, type: 3} @@ -23116,12 +23943,21 @@ PrefabInstance: value: objectReference: {fileID: 2086818870} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f9ae8e304f5c6864980818dec2c95633, type: 3} +--- !u!224 &1527218382 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3514389556853228399, guid: f9ae8e304f5c6864980818dec2c95633, type: 3} + m_PrefabInstance: {fileID: 1527218381} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1540026312 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1983684637} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -23190,7 +24026,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 25 + value: Save As objectReference: {fileID: 0} - target: {fileID: 7594107385585372191, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive @@ -23305,6 +24141,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &1540026313 stripped RectTransform: @@ -23337,13 +24176,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1551252956} + serializedVersion: 2 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 m_LocalEulerAnglesHint: {x: 33.644, y: 0, z: 0} --- !u!64 &1551252958 MeshCollider: @@ -23353,9 +24192,17 @@ MeshCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1551252956} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 4 + serializedVersion: 5 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} @@ -23376,6 +24223,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -23414,6 +24264,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1637717373} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -23486,7 +24337,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 110 + value: Newspaper objectReference: {fileID: 0} - target: {fileID: 7594107385585372191, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive @@ -23609,6 +24460,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &1577565684 stripped RectTransform: @@ -23620,6 +24474,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 14468906} m_Modifications: - target: {fileID: 201938300658660728, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -23807,6 +24662,12 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 7216918420766221479, guid: c6b351a67ceb69140b199996bbbea156, type: 3} + insertIndex: -1 + addedObject: {fileID: 834000930} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &1599070117 stripped RectTransform: @@ -23860,7 +24721,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 311062483} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -23927,20 +24787,23 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -23971,6 +24834,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1826937101} m_Modifications: - target: {fileID: 1345098608517470577, guid: 16750275763719646afa2c7c7592395d, type: 3} @@ -24066,12 +24930,21 @@ PrefabInstance: value: objectReference: {fileID: 1826937102} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 16750275763719646afa2c7c7592395d, type: 3} +--- !u!224 &1606706622 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3514389556853228399, guid: 16750275763719646afa2c7c7592395d, type: 3} + m_PrefabInstance: {fileID: 1606706621} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1614318673 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2087755156} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -24267,6 +25140,12 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 6922469056340231698, guid: c6b351a67ceb69140b199996bbbea156, type: 3} + insertIndex: -1 + addedObject: {fileID: 1311646145} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &1614318674 stripped RectTransform: @@ -24321,7 +25200,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1944714597} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -24406,20 +25284,23 @@ MonoBehaviour: m_VerticalAlignment: 256 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -24457,6 +25338,7 @@ GameObject: - component: {fileID: 1623931609} - component: {fileID: 1623931608} - component: {fileID: 1623931607} + - component: {fileID: 1623931611} m_Layer: 5 m_Name: Sliders Canvas m_TagString: Untagged @@ -24521,7 +25403,9 @@ Canvas: m_OverrideSorting: 0 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 m_AdditionalShaderChannelsFlag: 31 + m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 @@ -24539,18 +25423,83 @@ RectTransform: m_Children: - {fileID: 311062483} m_Father: {fileID: 1369683957} - m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0.94920003, y: -0.0954} m_SizeDelta: {x: 302.2189, y: 388.8804} m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1623931611 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1623931606} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 699100ca886480c4a94ced56b1ae0e94, type: 3} + m_Name: + m_EditorClassIdentifier: + themeDataSource: {fileID: 11400000, guid: 57993c46ea42acf4ca3067542443bc45, type: 2} + binders: + - rid: 1538473382797639772 + - rid: 1538473382797639773 + - rid: 1538473382797639774 + - rid: 1538473382797639775 + - rid: 1538473382797639776 + - rid: 1538473382797639777 + - rid: 1538473382797639778 + - rid: 1538473382797639779 + references: + version: 2 + RefIds: + - rid: 1538473382797639772 + type: {class: TMP_TextFontAssetBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 163304840} + k__BackingField: Text Font + - rid: 1538473382797639773 + type: {class: TMP_TextFontAssetBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 1600123139} + k__BackingField: Text Font + - rid: 1538473382797639774 + type: {class: TMP_TextFontAssetBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 1512031908} + k__BackingField: Text Font + - rid: 1538473382797639775 + type: {class: TMP_TextFontAssetBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 200481605} + k__BackingField: Text Font + - rid: 1538473382797639776 + type: {class: TMP_TextFontAssetBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 1122456286} + k__BackingField: Text Font + - rid: 1538473382797639777 + type: {class: GraphicMaterialBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 85912329} + k__BackingField: Backplate Material + - rid: 1538473382797639778 + type: {class: GraphicMaterialBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 1290890165} + k__BackingField: Backplate Material + - rid: 1538473382797639779 + type: {class: GraphicMaterialBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 1122818196} + k__BackingField: Backplate Material --- !u!1001 &1630388036 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1729846266} m_Modifications: - target: {fileID: 3705378105823492738, guid: b85e005d231192249b7077b40a4d4e45, type: 3} @@ -24690,6 +25639,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b85e005d231192249b7077b40a4d4e45, type: 3} --- !u!224 &1630388037 stripped RectTransform: @@ -24708,6 +25660,7 @@ GameObject: - component: {fileID: 1635487815} - component: {fileID: 1635487814} - component: {fileID: 1635487813} + - component: {fileID: 1635487817} m_Layer: 5 m_Name: ListMenus Canvas m_TagString: Untagged @@ -24772,7 +25725,9 @@ Canvas: m_OverrideSorting: 0 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 m_AdditionalShaderChannelsFlag: 31 + m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 @@ -24790,13 +25745,113 @@ RectTransform: m_Children: - {fileID: 1653004003} m_Father: {fileID: 1369683957} - m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0.388, y: -0.151} m_SizeDelta: {x: 414.4783, y: 500} m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1635487817 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1635487812} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 699100ca886480c4a94ced56b1ae0e94, type: 3} + m_Name: + m_EditorClassIdentifier: + themeDataSource: {fileID: 11400000, guid: 57993c46ea42acf4ca3067542443bc45, type: 2} + binders: + - rid: 1538473382797639769 + - rid: 1538473382797639768 + - rid: 1538473382797639767 + - rid: 1538473382797639766 + - rid: 1538473382797639765 + - rid: 1538473382797639764 + - rid: 1538473382797639780 + - rid: 1538473382797639781 + - rid: 1538473382797639782 + - rid: 1538473382797639783 + - rid: 1538473382797639784 + - rid: 1538473382797639785 + - rid: 1538473382797639788 + - rid: 1538473382797639787 + references: + version: 2 + RefIds: + - rid: 1538473382797639764 + type: {class: GraphicMaterialBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 2087755159} + k__BackingField: Backplate Material + - rid: 1538473382797639765 + type: {class: GraphicMaterialBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 553395888} + k__BackingField: Backplate Material + - rid: 1538473382797639766 + type: {class: GraphicMaterialBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 1482164464} + k__BackingField: Backplate Material + - rid: 1538473382797639767 + type: {class: GraphicMaterialBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 682545842} + k__BackingField: Backplate Material + - rid: 1538473382797639768 + type: {class: TMP_TextFontAssetBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 1635540425} + k__BackingField: Text Font + - rid: 1538473382797639769 + type: {class: TMP_TextFontAssetBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 308180794} + k__BackingField: Text Font + - rid: 1538473382797639780 + type: {class: TMP_TextFontAssetBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 759505762} + k__BackingField: Text Font + - rid: 1538473382797639781 + type: {class: GraphicColorBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 759505762} + k__BackingField: On Surface Color + - rid: 1538473382797639782 + type: {class: TMP_TextFontAssetBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 83153274} + k__BackingField: Text Font + - rid: 1538473382797639783 + type: {class: GraphicColorBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 83153274} + k__BackingField: On Surface Color + - rid: 1538473382797639784 + type: {class: TMP_TextFontAssetBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 1894806655} + k__BackingField: Text Font + - rid: 1538473382797639785 + type: {class: GraphicColorBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 1894806655} + k__BackingField: On Surface Color + - rid: 1538473382797639787 + type: {class: GraphicColorBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 1674269242} + k__BackingField: On Surface Color + - rid: 1538473382797639788 + type: {class: TMP_TextFontAssetBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 1674269242} + k__BackingField: Text Font --- !u!1 &1635540422 GameObject: m_ObjectHideFlags: 0 @@ -24829,7 +25884,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1653004003} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -24914,20 +25968,23 @@ MonoBehaviour: m_VerticalAlignment: 256 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -24986,7 +26043,6 @@ RectTransform: - {fileID: 280014428} - {fileID: 1577565684} m_Father: {fileID: 1329564636} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -25054,7 +26110,6 @@ RectTransform: - {fileID: 308180792} - {fileID: 1635540423} m_Father: {fileID: 1635487816} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -25066,6 +26121,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 201720333} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -25134,7 +26190,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 53 + value: Camera objectReference: {fileID: 0} - target: {fileID: 7594107385585372191, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive @@ -25245,6 +26301,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &1662388757 stripped RectTransform: @@ -25256,6 +26315,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1288869893} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -25324,7 +26384,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 107 + value: Movie objectReference: {fileID: 0} - target: {fileID: 7594107385585372191, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive @@ -25435,6 +26495,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &1665223376 stripped RectTransform: @@ -25473,7 +26536,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2087755156} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -25558,20 +26620,23 @@ MonoBehaviour: m_VerticalAlignment: 256 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -25602,6 +26667,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 404960832} m_Modifications: - target: {fileID: 4270209841583229004, guid: f64620d502cdf0f429efa27703913cb7, type: 3} @@ -25614,11 +26680,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5677198132670553562, guid: f64620d502cdf0f429efa27703913cb7, type: 3} propertyPath: m_AnchoredPosition.x - value: -0.0000076293945 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5677198132670553562, guid: f64620d502cdf0f429efa27703913cb7, type: 3} propertyPath: m_AnchoredPosition.y - value: 0.000045776367 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5677198132984834578, guid: f64620d502cdf0f429efa27703913cb7, type: 3} propertyPath: m_Pivot.x @@ -25709,6 +26775,9 @@ PrefabInstance: value: CanvasSlider objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f64620d502cdf0f429efa27703913cb7, type: 3} --- !u!224 &1704462485 stripped RectTransform: @@ -25720,6 +26789,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1796335078} m_Modifications: - target: {fileID: 1197545758422362387, guid: f64620d502cdf0f429efa27703913cb7, type: 3} @@ -25752,11 +26822,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5677198132670553562, guid: f64620d502cdf0f429efa27703913cb7, type: 3} propertyPath: m_AnchoredPosition.x - value: 0.000022888184 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5677198132670553562, guid: f64620d502cdf0f429efa27703913cb7, type: 3} propertyPath: m_AnchoredPosition.y - value: -0.00002670288 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5677198132984834578, guid: f64620d502cdf0f429efa27703913cb7, type: 3} propertyPath: m_Pivot.x @@ -25847,6 +26917,9 @@ PrefabInstance: value: CanvasSlider objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f64620d502cdf0f429efa27703913cb7, type: 3} --- !u!224 &1706338808 stripped RectTransform: @@ -25858,6 +26931,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 682545839} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -25940,7 +27014,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 62 + value: Paste objectReference: {fileID: 0} - target: {fileID: 8376646494505211202, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Name @@ -26067,6 +27141,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &1708049806 stripped RectTransform: @@ -26085,6 +27162,7 @@ GameObject: - component: {fileID: 1714867594} - component: {fileID: 1714867593} - component: {fileID: 1714867592} + - component: {fileID: 1714867595} m_Layer: 5 m_Name: Toggle Button Canvas m_TagString: Untagged @@ -26110,7 +27188,6 @@ RectTransform: - {fileID: 1329564636} - {fileID: 47797540} m_Father: {fileID: 1369683957} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -26174,10 +27251,59 @@ Canvas: m_OverrideSorting: 0 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 m_AdditionalShaderChannelsFlag: 31 + m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 +--- !u!114 &1714867595 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1714867590} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 699100ca886480c4a94ced56b1ae0e94, type: 3} + m_Name: + m_EditorClassIdentifier: + themeDataSource: {fileID: 11400000, guid: 57993c46ea42acf4ca3067542443bc45, type: 2} + binders: + - rid: 1538473376477610112 + - rid: 1538473376477610111 + - rid: 1538473376477610113 + - rid: 1538473376477610109 + - rid: 1538473376477610110 + references: + version: 2 + RefIds: + - rid: 1538473376477610109 + type: {class: GraphicMaterialBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 1329564639} + k__BackingField: Backplate Material + - rid: 1538473376477610110 + type: {class: GraphicMaterialBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 47797543} + k__BackingField: Backplate Material + - rid: 1538473376477610111 + type: {class: TMP_TextFontAssetBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 332225188} + k__BackingField: Text Font + - rid: 1538473376477610112 + type: {class: TMP_TextFontAssetBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 1148378778} + k__BackingField: Text Font + - rid: 1538473376477610113 + type: {class: TMP_TextFontAssetBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 1187780963} + k__BackingField: Text Font --- !u!1 &1729846265 GameObject: m_ObjectHideFlags: 0 @@ -26213,7 +27339,6 @@ RectTransform: - {fileID: 1630388037} - {fileID: 1995220997} m_Father: {fileID: 1277251431} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -26298,6 +27423,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1854885402} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -26374,7 +27500,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 4 + value: Brightness objectReference: {fileID: 0} - target: {fileID: 8376646494505211202, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Name @@ -26537,6 +27663,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!1 &1761219193 stripped GameObject: @@ -26551,9 +27680,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1761219193} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 0.99999994, y: 0.99999994, z: 0.1} m_Center: {x: 0, y: -0.000000014901161, z: 0.05} --- !u!1001 &1767162169 @@ -26561,6 +27698,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 101034061} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -26629,7 +27767,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 40 + value: Move objectReference: {fileID: 0} - target: {fileID: 7594107385585372191, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive @@ -26744,6 +27882,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &1767162170 stripped RectTransform: @@ -26755,6 +27896,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 553395885} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -26940,6 +28082,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &1773838171 stripped RectTransform: @@ -26951,6 +28096,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 335940727} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -27019,7 +28165,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 92 + value: Heart Outline objectReference: {fileID: 0} - target: {fileID: 7594107385585372191, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive @@ -27134,6 +28280,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &1794244716 stripped RectTransform: @@ -27177,7 +28326,6 @@ RectTransform: - {fileID: 630532475} - {fileID: 954672193} m_Father: {fileID: 1290890163} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -27282,6 +28430,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1048775326} m_Modifications: - target: {fileID: 1345098608517470577, guid: 16750275763719646afa2c7c7592395d, type: 3} @@ -27377,12 +28526,21 @@ PrefabInstance: value: objectReference: {fileID: 1048775327} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 16750275763719646afa2c7c7592395d, type: 3} +--- !u!224 &1798621954 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3514389556853228399, guid: 16750275763719646afa2c7c7592395d, type: 3} + m_PrefabInstance: {fileID: 1798621953} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1817612629 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1288869893} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -27451,7 +28609,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 82 + value: Doc objectReference: {fileID: 0} - target: {fileID: 8376646494505211202, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Name @@ -27558,6 +28716,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &1817612630 stripped RectTransform: @@ -27569,6 +28730,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 47797540} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -27651,7 +28813,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 132 + value: Settings objectReference: {fileID: 0} - target: {fileID: 8376646494505211202, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Name @@ -27770,6 +28932,12 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} + insertIndex: -1 + addedObject: {fileID: 1606706622} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &1826937101 stripped RectTransform: @@ -27792,6 +28960,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1854885402} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -27868,7 +29037,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 4 + value: Brightness objectReference: {fileID: 0} - target: {fileID: 8376646494505211202, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Name @@ -28031,6 +29200,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!1 &1854885401 GameObject: @@ -28072,7 +29244,6 @@ RectTransform: - {fileID: 368534647} - {fileID: 576536707} m_Father: {fileID: 149389691} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -28139,6 +29310,13 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] + m_Texture: {fileID: 0} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 radius: 13 thickness: 2 wedges: 8 @@ -28214,6 +29392,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1999519067} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -28290,7 +29469,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 92 + value: Heart Outline objectReference: {fileID: 0} - target: {fileID: 8376646494505211202, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Name @@ -28397,6 +29576,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &1856862789 stripped RectTransform: @@ -28408,6 +29590,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 773317072} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -28480,7 +29663,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 111 + value: Sticky Note objectReference: {fileID: 0} - target: {fileID: 8376646494505211202, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Name @@ -28595,6 +29778,12 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 6922469056340231698, guid: c6b351a67ceb69140b199996bbbea156, type: 3} + insertIndex: -1 + addedObject: {fileID: 276007649} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &1874031335 stripped RectTransform: @@ -28649,7 +29838,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 831863309} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -28734,20 +29922,23 @@ MonoBehaviour: m_VerticalAlignment: 256 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -28805,7 +29996,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 553395885} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -28890,20 +30080,23 @@ MonoBehaviour: m_VerticalAlignment: 256 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -28934,6 +30127,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 335940727} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -29002,7 +30196,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 85 + value: Edit objectReference: {fileID: 0} - target: {fileID: 7594107385585372191, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive @@ -29117,6 +30311,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &1900920948 stripped RectTransform: @@ -29128,6 +30325,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1482164461} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -29214,7 +30412,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 92 + value: Heart Outline objectReference: {fileID: 0} - target: {fileID: 8376646494505211202, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Name @@ -29341,6 +30539,12 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 4185972052008607586, guid: c6b351a67ceb69140b199996bbbea156, type: 3} + insertIndex: -1 + addedObject: {fileID: 188341443} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &1905834814 stripped RectTransform: @@ -29368,6 +30572,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 201720333} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -29436,7 +30641,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 63 + value: Time objectReference: {fileID: 0} - target: {fileID: 7594107385585372191, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive @@ -29547,6 +30752,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &1914810143 stripped RectTransform: @@ -29558,6 +30766,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1288869893} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -29630,7 +30839,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 95 + value: Photo objectReference: {fileID: 0} - target: {fileID: 7594107385585372191, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive @@ -29741,6 +30950,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &1915696964 stripped RectTransform: @@ -29752,6 +30964,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1983684637} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -29820,7 +31033,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 34 + value: Mobile objectReference: {fileID: 0} - target: {fileID: 7594107385585372191, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive @@ -29935,6 +31148,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &1925369313 stripped RectTransform: @@ -29973,7 +31189,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 371654821} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -30061,20 +31276,23 @@ MonoBehaviour: m_VerticalAlignment: 256 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -30105,6 +31323,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 154440643} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -30183,7 +31402,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 92 + value: Heart Outline objectReference: {fileID: 0} - target: {fileID: 8376646494505211202, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Name @@ -30290,6 +31509,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &1936164015 stripped RectTransform: @@ -30335,7 +31557,6 @@ RectTransform: - {fileID: 1990262478} - {fileID: 284501559} m_Father: {fileID: 65389176} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -30402,6 +31623,13 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] + m_Texture: {fileID: 0} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 radius: 12 thickness: 2 wedges: 8 @@ -30419,6 +31647,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 335940727} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -30487,7 +31716,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 76 + value: Delete objectReference: {fileID: 0} - target: {fileID: 7594107385585372191, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive @@ -30602,6 +31831,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &1945241971 stripped RectTransform: @@ -30613,6 +31845,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1983684637} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -30681,7 +31914,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 5 + value: Calendar objectReference: {fileID: 0} - target: {fileID: 7594107385585372191, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive @@ -30796,6 +32029,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &1951361111 stripped RectTransform: @@ -30807,6 +32043,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 47797540} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -30885,7 +32122,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 115 + value: Group objectReference: {fileID: 0} - target: {fileID: 8376646494505211202, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Name @@ -31004,6 +32241,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &1955009909 stripped RectTransform: @@ -31051,7 +32291,6 @@ RectTransform: - {fileID: 389055256} - {fileID: 1925369313} m_Father: {fileID: 371654821} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -31116,6 +32355,13 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] + m_Texture: {fileID: 0} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 radius: 13 thickness: 2 wedges: 8 @@ -31133,6 +32379,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1944714597} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -31211,7 +32458,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 20 + value: Mic objectReference: {fileID: 0} - target: {fileID: 8376646494505211202, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Name @@ -31318,6 +32565,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &1990262478 stripped RectTransform: @@ -31329,6 +32579,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 682545839} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -31411,7 +32662,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 54 + value: Shopping Cart objectReference: {fileID: 0} - target: {fileID: 8376646494505211202, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Name @@ -31538,6 +32789,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &1994347811 stripped RectTransform: @@ -31549,6 +32803,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1729846266} m_Modifications: - target: {fileID: 3705378105823492738, guid: b85e005d231192249b7077b40a4d4e45, type: 3} @@ -31688,6 +32943,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b85e005d231192249b7077b40a4d4e45, type: 3} --- !u!224 &1995220997 stripped RectTransform: @@ -31727,7 +32985,6 @@ RectTransform: - {fileID: 545482699} - {fileID: 1856862789} m_Father: {fileID: 3747106709254832807} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -31765,6 +33022,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 402425588} m_Modifications: - target: {fileID: 1345098608517470577, guid: f9ae8e304f5c6864980818dec2c95633, type: 3} @@ -31860,7 +33118,15 @@ PrefabInstance: value: objectReference: {fileID: 402425589} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f9ae8e304f5c6864980818dec2c95633, type: 3} +--- !u!224 &2044694321 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3514389556853228399, guid: f9ae8e304f5c6864980818dec2c95633, type: 3} + m_PrefabInstance: {fileID: 2044694320} + m_PrefabAsset: {fileID: 0} --- !u!1 &2056942514 GameObject: m_ObjectHideFlags: 0 @@ -31897,7 +33163,6 @@ RectTransform: - {fileID: 1137517786} - {fileID: 1125611905} m_Father: {fileID: 1277251431} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -32002,6 +33267,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 14468906} m_Modifications: - target: {fileID: 201938300658660728, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -32189,6 +33455,12 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 7216918420766221479, guid: c6b351a67ceb69140b199996bbbea156, type: 3} + insertIndex: -1 + addedObject: {fileID: 1527218382} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &2086818868 stripped RectTransform: @@ -32249,7 +33521,6 @@ RectTransform: - {fileID: 1614318674} - {fileID: 924342751} m_Father: {fileID: 1653004003} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -32316,6 +33587,13 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] + m_Texture: {fileID: 0} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 radius: 13 thickness: 2 wedges: 8 @@ -32360,7 +33638,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 65389176} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -32447,20 +33724,23 @@ MonoBehaviour: m_VerticalAlignment: 256 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -32491,6 +33771,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1031621822} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -32559,7 +33840,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7245587814888172855, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: currentIconName - value: Icon 22 + value: Music objectReference: {fileID: 0} - target: {fileID: 7594107385585372191, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive @@ -32670,6 +33951,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &2115835485 stripped RectTransform: @@ -32710,7 +33994,6 @@ RectTransform: - {fileID: 1304147004} - {fileID: 154440643} m_Father: {fileID: 1000460829} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -32729,6 +34012,7 @@ GameObject: - component: {fileID: 2127076437} - component: {fileID: 2127076436} - component: {fileID: 2127076435} + - component: {fileID: 2127076439} m_Layer: 5 m_Name: Button Bar Canvas m_TagString: Untagged @@ -32793,7 +34077,9 @@ Canvas: m_OverrideSorting: 0 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 m_AdditionalShaderChannelsFlag: 31 + m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 @@ -32811,18 +34097,77 @@ RectTransform: m_Children: - {fileID: 831863309} m_Father: {fileID: 1369683957} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: -0.28, y: -0.058} m_SizeDelta: {x: 261.305, y: 253.3427} m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2127076439 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2127076434} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 699100ca886480c4a94ced56b1ae0e94, type: 3} + m_Name: + m_EditorClassIdentifier: + themeDataSource: {fileID: 11400000, guid: 57993c46ea42acf4ca3067542443bc45, type: 2} + binders: + - rid: 1538473376477610101 + - rid: 1538473376477610100 + - rid: 1538473376477610099 + - rid: 1538473376477610098 + - rid: 1538473376477610097 + - rid: 1538473376477610096 + - rid: 1538473376477610095 + references: + version: 2 + RefIds: + - rid: 1538473376477610095 + type: {class: GraphicMaterialBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 201720336} + k__BackingField: Backplate Material + - rid: 1538473376477610096 + type: {class: GraphicMaterialBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 1424732240} + k__BackingField: Backplate Material + - rid: 1538473376477610097 + type: {class: GraphicMaterialBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 14468909} + k__BackingField: Backplate Material + - rid: 1538473376477610098 + type: {class: GraphicMaterialBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 1073055408} + k__BackingField: Backplate Material + - rid: 1538473376477610099 + type: {class: TMP_TextFontAssetBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 1876059102} + k__BackingField: Text Font + - rid: 1538473376477610100 + type: {class: TMP_TextFontAssetBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 861724341} + k__BackingField: Text Font + - rid: 1538473376477610101 + type: {class: TMP_TextFontAssetBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 1290511388} + k__BackingField: Text Font --- !u!1001 &2137575390 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 891825324} m_Modifications: - target: {fileID: 1197545758422362387, guid: f64620d502cdf0f429efa27703913cb7, type: 3} @@ -32875,11 +34220,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5677198132670553562, guid: f64620d502cdf0f429efa27703913cb7, type: 3} propertyPath: m_AnchoredPosition.x - value: -0.000015258789 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5677198132670553562, guid: f64620d502cdf0f429efa27703913cb7, type: 3} propertyPath: m_AnchoredPosition.y - value: 0.00007534027 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5677198132965683087, guid: f64620d502cdf0f429efa27703913cb7, type: 3} propertyPath: m_AnchorMax.x @@ -33038,6 +34383,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f64620d502cdf0f429efa27703913cb7, type: 3} --- !u!224 &2137575391 stripped RectTransform: @@ -33067,7 +34415,6 @@ RectTransform: - {fileID: 1288869893} - {fileID: 1999519067} m_Father: {fileID: 65389176} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -33154,7 +34501,25 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] + m_Texture: {fileID: 0} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 radius: 12 thickness: 2 wedges: 8 calculateSmoothEdges: 1 +--- !u!1660057539 &9223372036854775807 +SceneRoots: + m_ObjectHideFlags: 0 + m_Roots: + - {fileID: 705507995} + - {fileID: 553824788} + - {fileID: 530525190} + - {fileID: 1008854671} + - {fileID: 49756652} + - {fileID: 1369683957} + - {fileID: 771189643} diff --git a/UnityProjects/MRTKDevTemplate/Assets/Scenes/ClippingExamples.unity b/UnityProjects/MRTKDevTemplate/Assets/Scenes/ClippingExamples.unity index 4a6eb3813..b8d70a8ea 100644 --- a/UnityProjects/MRTKDevTemplate/Assets/Scenes/ClippingExamples.unity +++ b/UnityProjects/MRTKDevTemplate/Assets/Scenes/ClippingExamples.unity @@ -193,15 +193,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d9ad66e7cc9a2754d8ea989740c9f00d, type: 3} m_Name: m_EditorClassIdentifier: - m_InteractionManager: {fileID: 1530487695} + m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 1 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -294,42 +292,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnHoverEntered: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_OnHoverExited: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectEntered: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectExited: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -444,6 +427,7 @@ MonoBehaviour: hostTransform: {fileID: 135874843} allowedManipulations: 7 allowedInteractionTypes: -2147483641 + rigidbodyMovementType: 0 applyTorque: 1 springForceSoftness: 0.1 springTorqueSoftness: 0.1 @@ -466,8 +450,7 @@ MonoBehaviour: moveLogicType: reference: MixedReality.Toolkit.SpatialManipulation.MoveLogic, MixedReality.Toolkit.SpatialManipulation rotateLogicType: - reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, - MixedReality.Toolkit.SpatialManipulation + reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, MixedReality.Toolkit.SpatialManipulation scaleLogicType: reference: MixedReality.Toolkit.SpatialManipulation.ScaleLogic, MixedReality.Toolkit.SpatialManipulation --- !u!114 &135874846 @@ -661,6 +644,224 @@ MonoBehaviour: minimumScale: {x: 0.2, y: 0.2, z: 0.2} maximumScale: {x: 2, y: 2, z: 2} relativeToInitialState: 1 +--- !u!21 &186314050 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: HumanHeart (Instance) + m_Shader: {fileID: 4800000, guid: c331f6c43a2ef0945864cb668f2653c9, type: 3} + m_ValidKeywords: + - _CLIPPING_BORDER + - _CLIPPING_BOX + - _CLIPPING_PLANE + - _CLIPPING_SPHERE + - _DIRECTIONAL_LIGHT + - _HOVER_COLOR_OVERRIDE + - _HOVER_LIGHT + - _PROXIMITY_LIGHT_COLOR_OVERRIDE + - _REFLECTIONS + - _RIM_LIGHT + - _SPECULAR_HIGHLIGHTS + - _USE_WORLD_SCALE + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 2000 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ChannelMap: + m_Texture: {fileID: 2800000, guid: f020299d185d93e4d9c39aa03554c151, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissiveMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _IridescentSpectrumMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: 949533dcd9b0bba46a43427bb889d111, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _NormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AlbedoAlphaMode: 0 + - _AlbedoAssignedAtRuntime: 0 + - _BlendOp: 0 + - _BlendedClippingWidth: 1 + - _BlurBorderIntensity: 0 + - _BlurMode: 0 + - _BlurTextureIntensity: 1 + - _BorderColorMode: 0 + - _BorderLight: 0 + - _BorderLightOpaque: 0 + - _BorderLightOpaqueAlpha: 1 + - _BorderLightReplacesAlbedo: 0 + - _BorderLightUsesHoverColor: 0 + - _BorderMinValue: 0.1 + - _BorderWidth: 0.1 + - _BumpScale: 1 + - _ClippingBorder: 1 + - _ClippingBorderWidth: 0.01 + - _ColorWriteMask: 15 + - _CullMode: 0 + - _CustomMode: 0 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DirectionalLight: 1 + - _DstBlend: 0 + - _DstBlendAlpha: 1 + - _EdgeSmoothingMode: 0 + - _EdgeSmoothingValue: 0.002 + - _EnableChannelMap: 0 + - _EnableEmission: 0 + - _EnableHoverColorOverride: 1 + - _EnableLocalSpaceTriplanarMapping: 0 + - _EnableNormalMap: 0 + - _EnableProximityLightColorOverride: 1 + - _EnableSSAA: 0 + - _EnableStencil: 0 + - _EnableTriplanarMapping: 0 + - _EnvironmentColorIntensity: 0.5 + - _EnvironmentColorThreshold: 1.5 + - _EnvironmentColoring: 0 + - _Fade: 1 + - _FadeBeginDistance: 0.85 + - _FadeCompleteDistance: 0.5 + - _FadeMinValue: 0 + - _FluentLightIntensity: 1 + - _GlossMapScale: 1 + - _Glossiness: 0 + - _GlossyReflections: 1 + - _GradientAngle: 180 + - _GradientMode: 0 + - _HoverLight: 1 + - _IgnoreZScale: 0 + - _IndependentCorners: 0 + - _InnerGlow: 0 + - _InnerGlowPower: 4 + - _InstancedColor: 0 + - _Iridescence: 0 + - _IridescenceAngle: -0.78 + - _IridescenceIntensity: 0.5 + - _IridescenceThreshold: 0.05 + - _Metallic: 0 + - _MipmapBias: -2 + - _Mode: 0 + - _NPR: 0 + - _NearLightFade: 0 + - _NearPlaneFade: 0 + - _NormalMapScale: 1 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _ProximityLight: 0 + - _ProximityLightSubtractive: 0 + - _ProximityLightTwoSided: 0 + - _Reflections: 1 + - _Refraction: 0 + - _RefractiveIndex: 0 + - _RenderQueueOverride: -1 + - _RimLight: 1 + - _RimPower: 8 + - _RoundCornerMargin: 0.01 + - _RoundCornerRadius: 0.25 + - _RoundCorners: 0 + - _RoundCornersHideInterior: 0 + - _Smoothness: 1 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SphericalHarmonics: 0 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Stencil: 0 + - _StencilComparison: 0 + - _StencilOperation: 0 + - _StencilReadMask: 255 + - _StencilReference: 0 + - _StencilWriteMask: 255 + - _TriplanarMappingBlendSharpness: 4 + - _UVSec: 0 + - _UseWorldScale: 1 + - _VertexColors: 0 + - _VertexExtrusion: 0 + - _VertexExtrusionConstantWidth: 0 + - _VertexExtrusionSmoothNormals: 0 + - _VertexExtrusionValue: 0 + - _ZOffsetFactor: 0 + - _ZOffsetUnits: 0 + - _ZTest: 4 + - _ZWrite: 1 + m_Colors: + - _BlurBackgroundRect: {r: 0, g: 0, b: 1, a: 1} + - _BorderColor: {r: 1, g: 1, b: 1, a: 0} + - _ClippingBorderColor: {r: 0, g: 0.49019608, b: 1, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 0} + - _EmissiveColor: {r: 0, g: 0, b: 0, a: 0} + - _EnvironmentColorX: {r: 1, g: 0, b: 0, a: 1} + - _EnvironmentColorY: {r: 0, g: 1, b: 0, a: 1} + - _EnvironmentColorZ: {r: 0, g: 0, b: 1, a: 1} + - _GradientAlpha: {r: 1, g: 1, b: 1, a: 1} + - _GradientAlphaTime: {r: 0, g: 0, b: 0, a: 0} + - _GradientColor0: {r: 0.631373, g: 0.631373, b: 0.631373, a: 0} + - _GradientColor1: {r: 1, g: 0.690196, b: 0.976471, a: 0.25} + - _GradientColor2: {r: 0, g: 0.33, b: 0.88, a: 0.5} + - _GradientColor3: {r: 0, g: 0.33, b: 0.88, a: 1} + - _GradientColor4: {r: 1, g: 1, b: 1, a: 1} + - _HoverColorOverride: {r: 0, g: 0.49019608, b: 1, a: 1} + - _InnerGlowColor: {r: 1, g: 1, b: 1, a: 0.75} + - _ProximityLightCenterColorOverride: {r: 1, g: 1, b: 1, a: 0} + - _ProximityLightMiddleColorOverride: {r: 0, g: 0.4915483, b: 1, a: 0.5} + - _ProximityLightOuterColorOverride: {r: 0, g: 0, b: 1, a: 1} + - _RimColor: {r: 1, g: 0.66392815, b: 0, a: 1} + - _RoundCornersRadius: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} + m_BuildTextureStacks: [] --- !u!21 &247884401 Material: serializedVersion: 8 @@ -1005,15 +1206,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d9ad66e7cc9a2754d8ea989740c9f00d, type: 3} m_Name: m_EditorClassIdentifier: - m_InteractionManager: {fileID: 1530487695} + m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 1 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -1106,42 +1305,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_OnHoverEntered: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_OnHoverExited: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectEntered: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectExited: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: - m_PersistentCalls: - m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -1256,6 +1440,7 @@ MonoBehaviour: hostTransform: {fileID: 402531437} allowedManipulations: 7 allowedInteractionTypes: -2147483641 + rigidbodyMovementType: 0 applyTorque: 1 springForceSoftness: 0.1 springTorqueSoftness: 0.1 @@ -1278,8 +1463,7 @@ MonoBehaviour: moveLogicType: reference: MixedReality.Toolkit.SpatialManipulation.MoveLogic, MixedReality.Toolkit.SpatialManipulation rotateLogicType: - reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, - MixedReality.Toolkit.SpatialManipulation + reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, MixedReality.Toolkit.SpatialManipulation scaleLogicType: reference: MixedReality.Toolkit.SpatialManipulation.ScaleLogic, MixedReality.Toolkit.SpatialManipulation --- !u!114 &402531439 @@ -1393,314 +1577,96 @@ AudioSource: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - spreadCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - reverbZoneMixCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 ---- !u!114 &402531443 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 402531436} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 80f85af46f9bddd4ea78f11cee5e3b2e, type: 3} - m_Name: - m_EditorClassIdentifier: - handType: 3 - proximityType: 3 - executionOrder: 0 - minimumScale: {x: 0.2, y: 0.2, z: 0.2} - maximumScale: {x: 2, y: 2, z: 2} - relativeToInitialState: 1 ---- !u!1001 &530525190 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 3493013819197874656, guid: ad5b753b73e311143a85055b15cea562, type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3493013819197874656, guid: ad5b753b73e311143a85055b15cea562, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3493013819197874656, guid: ad5b753b73e311143a85055b15cea562, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3493013819197874656, guid: ad5b753b73e311143a85055b15cea562, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7585035320575375756, guid: ad5b753b73e311143a85055b15cea562, type: 3} - propertyPath: m_Name - value: MRTKInputSimulator - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: ad5b753b73e311143a85055b15cea562, type: 3} ---- !u!65 &624982110 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6056454165985891772} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Size: {x: 1, y: 0.99999994, z: 0.1} - m_Center: {x: 0, y: 0.000000074505806, z: 0.05} ---- !u!21 &712832625 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: HumanHeart (Instance) - m_Shader: {fileID: 4800000, guid: c331f6c43a2ef0945864cb668f2653c9, type: 3} - m_ValidKeywords: - - _CLIPPING_BORDER - - _CLIPPING_BOX - - _CLIPPING_PLANE - - _CLIPPING_SPHERE - - _DIRECTIONAL_LIGHT - - _HOVER_COLOR_OVERRIDE - - _HOVER_LIGHT - - _PROXIMITY_LIGHT_COLOR_OVERRIDE - - _REFLECTIONS - - _RIM_LIGHT - - _SPECULAR_HIGHLIGHTS - - _USE_WORLD_SCALE - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2000 - stringTagMap: - RenderType: Opaque - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ChannelMap: - m_Texture: {fileID: 2800000, guid: f020299d185d93e4d9c39aa03554c151, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissiveMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _IridescentSpectrumMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 2800000, guid: 949533dcd9b0bba46a43427bb889d111, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _NormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _AlbedoAlphaMode: 0 - - _AlbedoAssignedAtRuntime: 0 - - _BlendOp: 0 - - _BlendedClippingWidth: 1 - - _BlurBorderIntensity: 0 - - _BlurMode: 0 - - _BlurTextureIntensity: 1 - - _BorderColorMode: 0 - - _BorderLight: 0 - - _BorderLightOpaque: 0 - - _BorderLightOpaqueAlpha: 1 - - _BorderLightReplacesAlbedo: 0 - - _BorderLightUsesHoverColor: 0 - - _BorderMinValue: 0.1 - - _BorderWidth: 0.1 - - _BumpScale: 1 - - _ClippingBorder: 1 - - _ClippingBorderWidth: 0.01 - - _ColorWriteMask: 15 - - _CullMode: 0 - - _CustomMode: 0 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DirectionalLight: 1 - - _DstBlend: 0 - - _DstBlendAlpha: 1 - - _EdgeSmoothingMode: 0 - - _EdgeSmoothingValue: 0.002 - - _EnableChannelMap: 0 - - _EnableEmission: 0 - - _EnableHoverColorOverride: 1 - - _EnableLocalSpaceTriplanarMapping: 0 - - _EnableNormalMap: 0 - - _EnableProximityLightColorOverride: 1 - - _EnableSSAA: 0 - - _EnableStencil: 0 - - _EnableTriplanarMapping: 0 - - _EnvironmentColorIntensity: 0.5 - - _EnvironmentColorThreshold: 1.5 - - _EnvironmentColoring: 0 - - _Fade: 1 - - _FadeBeginDistance: 0.85 - - _FadeCompleteDistance: 0.5 - - _FadeMinValue: 0 - - _FluentLightIntensity: 1 - - _GlossMapScale: 1 - - _Glossiness: 0 - - _GlossyReflections: 1 - - _GradientAngle: 180 - - _GradientMode: 0 - - _HoverLight: 1 - - _IgnoreZScale: 0 - - _IndependentCorners: 0 - - _InnerGlow: 0 - - _InnerGlowPower: 4 - - _InstancedColor: 0 - - _Iridescence: 0 - - _IridescenceAngle: -0.78 - - _IridescenceIntensity: 0.5 - - _IridescenceThreshold: 0.05 - - _Metallic: 0 - - _MipmapBias: -2 - - _Mode: 0 - - _NPR: 0 - - _NearLightFade: 0 - - _NearPlaneFade: 0 - - _NormalMapScale: 1 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _ProximityLight: 0 - - _ProximityLightSubtractive: 0 - - _ProximityLightTwoSided: 0 - - _Reflections: 1 - - _Refraction: 0 - - _RefractiveIndex: 0 - - _RenderQueueOverride: -1 - - _RimLight: 1 - - _RimPower: 8 - - _RoundCornerMargin: 0.01 - - _RoundCornerRadius: 0.25 - - _RoundCorners: 0 - - _RoundCornersHideInterior: 0 - - _Smoothness: 1 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SphericalHarmonics: 0 - - _SrcBlend: 1 - - _SrcBlendAlpha: 1 - - _Stencil: 0 - - _StencilComparison: 0 - - _StencilOperation: 0 - - _StencilReadMask: 255 - - _StencilReference: 0 - - _StencilWriteMask: 255 - - _TriplanarMappingBlendSharpness: 4 - - _UVSec: 0 - - _UseWorldScale: 1 - - _VertexColors: 0 - - _VertexExtrusion: 0 - - _VertexExtrusionConstantWidth: 0 - - _VertexExtrusionSmoothNormals: 0 - - _VertexExtrusionValue: 0 - - _ZOffsetFactor: 0 - - _ZOffsetUnits: 0 - - _ZTest: 4 - - _ZWrite: 1 - m_Colors: - - _BlurBackgroundRect: {r: 0, g: 0, b: 1, a: 1} - - _BorderColor: {r: 1, g: 1, b: 1, a: 0} - - _ClippingBorderColor: {r: 0, g: 0.49019608, b: 1, a: 1} - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 0} - - _EmissiveColor: {r: 0, g: 0, b: 0, a: 0} - - _EnvironmentColorX: {r: 1, g: 0, b: 0, a: 1} - - _EnvironmentColorY: {r: 0, g: 1, b: 0, a: 1} - - _EnvironmentColorZ: {r: 0, g: 0, b: 1, a: 1} - - _GradientAlpha: {r: 1, g: 1, b: 1, a: 1} - - _GradientAlphaTime: {r: 0, g: 0, b: 0, a: 0} - - _GradientColor0: {r: 0.631373, g: 0.631373, b: 0.631373, a: 0} - - _GradientColor1: {r: 1, g: 0.690196, b: 0.976471, a: 0.25} - - _GradientColor2: {r: 0, g: 0.33, b: 0.88, a: 0.5} - - _GradientColor3: {r: 0, g: 0.33, b: 0.88, a: 1} - - _GradientColor4: {r: 1, g: 1, b: 1, a: 1} - - _HoverColorOverride: {r: 0, g: 0.49019608, b: 1, a: 1} - - _InnerGlowColor: {r: 1, g: 1, b: 1, a: 0.75} - - _ProximityLightCenterColorOverride: {r: 1, g: 1, b: 1, a: 0} - - _ProximityLightMiddleColorOverride: {r: 0, g: 0.4915483, b: 1, a: 0.5} - - _ProximityLightOuterColorOverride: {r: 0, g: 0, b: 1, a: 1} - - _RimColor: {r: 1, g: 0.66392815, b: 0, a: 1} - - _RoundCornersRadius: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} - m_BuildTextureStacks: [] + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 +--- !u!114 &402531443 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 402531436} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 80f85af46f9bddd4ea78f11cee5e3b2e, type: 3} + m_Name: + m_EditorClassIdentifier: + handType: 3 + proximityType: 3 + executionOrder: 0 + minimumScale: {x: 0.2, y: 0.2, z: 0.2} + maximumScale: {x: 2, y: 2, z: 2} + relativeToInitialState: 1 +--- !u!1001 &530525190 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 3493013819197874656, guid: ad5b753b73e311143a85055b15cea562, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3493013819197874656, guid: ad5b753b73e311143a85055b15cea562, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3493013819197874656, guid: ad5b753b73e311143a85055b15cea562, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3493013819197874656, guid: ad5b753b73e311143a85055b15cea562, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7585035320575375756, guid: ad5b753b73e311143a85055b15cea562, type: 3} + propertyPath: m_Name + value: MRTKInputSimulator + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: ad5b753b73e311143a85055b15cea562, type: 3} +--- !u!65 &624982110 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6056454165985891772} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 0.99999994, z: 0.1} + m_Center: {x: 0, y: 0.000000074505806, z: 0.05} --- !u!82 &840468523 AudioSource: m_ObjectHideFlags: 0 @@ -2340,15 +2306,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d9ad66e7cc9a2754d8ea989740c9f00d, type: 3} m_Name: m_EditorClassIdentifier: - m_InteractionManager: {fileID: 1530487695} + m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 1 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -2381,42 +2345,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_OnHoverEntered: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_OnHoverExited: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectEntered: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -2531,6 +2480,7 @@ MonoBehaviour: hostTransform: {fileID: 1229001242} allowedManipulations: -1 allowedInteractionTypes: -2147483641 + rigidbodyMovementType: 0 applyTorque: 1 springForceSoftness: 0.1 springTorqueSoftness: 0.1 @@ -2553,8 +2503,7 @@ MonoBehaviour: moveLogicType: reference: MixedReality.Toolkit.SpatialManipulation.MoveLogic, MixedReality.Toolkit.SpatialManipulation rotateLogicType: - reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, - MixedReality.Toolkit.SpatialManipulation + reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, MixedReality.Toolkit.SpatialManipulation scaleLogicType: reference: MixedReality.Toolkit.SpatialManipulation.ScaleLogic, MixedReality.Toolkit.SpatialManipulation --- !u!114 &1170466722 @@ -2797,6 +2746,67 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} +--- !u!1001 &1288658493 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720334, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_Name + value: MRTK XR Rig + objectReference: {fileID: 0} + - target: {fileID: 8479077998186684813, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} --- !u!1 &1428268607 GameObject: m_ObjectHideFlags: 0 @@ -2928,78 +2938,6 @@ MonoBehaviour: m_EditorClassIdentifier: defaultMaterials: - {fileID: 2100000, guid: 1874c930b0ce81b4ca09b4b549f79886, type: 2} ---- !u!1001 &1530487694 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720334, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_Name - value: MRTK XR Rig - objectReference: {fileID: 0} - - target: {fileID: 8479077998186684813, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} ---- !u!114 &1530487695 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 5569439093497552269, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - m_PrefabInstance: {fileID: 1530487694} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 83e4e6cca11330d4088d729ab4fc9d9f, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1001 &1575273447 PrefabInstance: m_ObjectHideFlags: 0 @@ -3113,15 +3051,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d9ad66e7cc9a2754d8ea989740c9f00d, type: 3} m_Name: m_EditorClassIdentifier: - m_InteractionManager: {fileID: 1530487695} + m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 1 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -3214,42 +3150,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnHoverExited: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectEntered: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectExited: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectCanceled: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -3364,6 +3285,7 @@ MonoBehaviour: hostTransform: {fileID: 1723500072} allowedManipulations: 7 allowedInteractionTypes: -2147483641 + rigidbodyMovementType: 0 applyTorque: 1 springForceSoftness: 0.1 springTorqueSoftness: 0.1 @@ -3386,8 +3308,7 @@ MonoBehaviour: moveLogicType: reference: MixedReality.Toolkit.SpatialManipulation.MoveLogic, MixedReality.Toolkit.SpatialManipulation rotateLogicType: - reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, - MixedReality.Toolkit.SpatialManipulation + reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, MixedReality.Toolkit.SpatialManipulation scaleLogicType: reference: MixedReality.Toolkit.SpatialManipulation.ScaleLogic, MixedReality.Toolkit.SpatialManipulation --- !u!65 &1723500074 @@ -3618,13 +3539,11 @@ MonoBehaviour: m_EditorClassIdentifier: m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 1 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -3681,42 +3600,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnHoverExited: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectEntered: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectExited: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectCanceled: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -3879,6 +3783,7 @@ MonoBehaviour: hostTransform: {fileID: 1923515645} allowedManipulations: -1 allowedInteractionTypes: -2147483641 + rigidbodyMovementType: 0 applyTorque: 1 springForceSoftness: 0.1 springTorqueSoftness: 0.1 @@ -3901,8 +3806,7 @@ MonoBehaviour: moveLogicType: reference: MixedReality.Toolkit.SpatialManipulation.MoveLogic, MixedReality.Toolkit.SpatialManipulation rotateLogicType: - reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, - MixedReality.Toolkit.SpatialManipulation + reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, MixedReality.Toolkit.SpatialManipulation scaleLogicType: reference: MixedReality.Toolkit.SpatialManipulation.ScaleLogic, MixedReality.Toolkit.SpatialManipulation --- !u!114 &1724991367 diff --git a/UnityProjects/MRTKDevTemplate/Assets/Scenes/ClippingInstancedExamples.unity b/UnityProjects/MRTKDevTemplate/Assets/Scenes/ClippingInstancedExamples.unity index 9dad1fd42..ef0951539 100644 --- a/UnityProjects/MRTKDevTemplate/Assets/Scenes/ClippingInstancedExamples.unity +++ b/UnityProjects/MRTKDevTemplate/Assets/Scenes/ClippingInstancedExamples.unity @@ -123,244 +123,7 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!21 &22144449 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: ShaderBallClippingPlane (Instance) - m_Shader: {fileID: 4800000, guid: c331f6c43a2ef0945864cb668f2653c9, type: 3} - m_ValidKeywords: - - _CLIPPING_BORDER - - _CLIPPING_PLANE - - _DIRECTIONAL_LIGHT - - _DISABLE_ALBEDO_MAP - - _HOVER_LIGHT - - _REFLECTIONS - - _SPECULAR_HIGHLIGHTS - - _USE_WORLD_SCALE - m_InvalidKeywords: - - _CLIPPING_PLANE_BORDER - m_LightmapFlags: 4 - m_EnableInstancingVariants: 1 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2000 - stringTagMap: - RenderType: Opaque - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ChannelMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissiveMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _IridescentSpectrumMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _LightMapTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _NormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _AlbedoAlphaMode: 0 - - _AlbedoAlphaSmoothness: 0 - - _AlbedoAssignedAtRuntime: 0 - - _BlendOp: 0 - - _BlendedClippingWidth: 1 - - _BlurBorderIntensity: 0 - - _BlurMode: 0 - - _BlurTextureIntensity: 1 - - _BorderColorMode: 0 - - _BorderLight: 0 - - _BorderLightOpaque: 0 - - _BorderLightOpaqueAlpha: 1 - - _BorderLightReplacesAlbedo: 0 - - _BorderLightUsesHoverColor: 0 - - _BorderMinValue: 0.02 - - _BorderWidth: 0.1 - - _BorderWidthHorizontal: 0.1 - - _BorderWidthVertical: 0.1 - - _BumpScale: 1 - - _ClippingBorder: 1 - - _ClippingBorderWidth: 0.025 - - _ClippingBox: 0 - - _ClippingPlane: 1 - - _ClippingPlaneBorder: 1 - - _ClippingPlaneBorderWidth: 0.02 - - _ClippingSphere: 0 - - _ColorWriteMask: 15 - - _Cull: 2 - - _CullMode: 2 - - _CustomMode: 0 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DirectionalLight: 1 - - _DstBlend: 0 - - _DstBlendAlpha: 1 - - _EdgeSmoothingMode: 0 - - _EdgeSmoothingValue: 0.002 - - _EnableChannelMap: 0 - - _EnableEmission: 0 - - _EnableHoverColorOpaqueOverride: 0 - - _EnableHoverColorOverride: 0 - - _EnableLightMap: 0 - - _EnableLocalSpaceTriplanarMapping: 0 - - _EnableNormalMap: 0 - - _EnableProximityLightColorOverride: 0 - - _EnableSSAA: 0 - - _EnableStencil: 0 - - _EnableTriplanarMapping: 0 - - _EnvironmentColorIntensity: 0.5 - - _EnvironmentColorThreshold: 1.5 - - _EnvironmentColoring: 0 - - _Fade: 1 - - _FadeBeginDistance: 0.85 - - _FadeCompleteDistance: 0.5 - - _FadeMinValue: 0 - - _FluentLightIntensity: 1 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _GradientAngle: 180 - - _GradientMode: 0 - - _HoverLight: 1 - - _HoverLightOpaque: 0 - - _IgnoreZScale: 0 - - _IndependentCorners: 0 - - _InnerGlow: 0 - - _InnerGlowPower: 4 - - _InstancedColor: 0 - - _Iridescence: 0 - - _IridescenceAngle: -0.78 - - _IridescenceIntensity: 0.5 - - _IridescenceThreshold: 0.05 - - _Metallic: 0 - - _MipmapBias: -2 - - _Mode: 0 - - _MyCullVariable: 1 - - _NPR: 0 - - _NearLightFade: 0 - - _NearPlaneFade: 0 - - _NormalMapScale: 1 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _ProximityLight: 0 - - _ProximityLightSubtractive: 0 - - _ProximityLightTwoSided: 0 - - _Reflections: 1 - - _Refraction: 0 - - _RefractiveIndex: 1.1 - - _RenderQueueOverride: -1 - - _RimLight: 0 - - _RimPower: 3 - - _RoundCornerMargin: 0 - - _RoundCornerPower: 0.4 - - _RoundCornerRadius: 0.25 - - _RoundCorners: 0 - - _RoundCornersHideInterior: 0 - - _Smoothness: 0.5 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SphericalHarmonics: 0 - - _SrcBlend: 1 - - _SrcBlendAlpha: 1 - - _Stencil: 0 - - _StencilComparison: 0 - - _StencilOperation: 0 - - _StencilReadMask: 255 - - _StencilReference: 0 - - _StencilWriteMask: 255 - - _TriplanarMappingBlendSharpness: 4 - - _UVSec: 0 - - _UseWorldScale: 1 - - _VertexColors: 0 - - _VertexExtrusion: 0 - - _VertexExtrusionConstantWidth: 0 - - _VertexExtrusionSmoothNormals: 0 - - _VertexExtrusionValue: 0 - - _ZOffsetFactor: 0 - - _ZOffsetUnits: 0 - - _ZTest: 4 - - _ZWrite: 1 - m_Colors: - - _BlurBackgroundRect: {r: 0, g: 0, b: 1, a: 1} - - _BorderColor: {r: 1, g: 1, b: 1, a: 0} - - _ClipPlane: {r: 0, g: 1, b: 0, a: 0} - - _ClippingBorderColor: {r: 1, g: 0.2, b: 0, a: 1} - - _ClippingPlaneBorderColor: {r: 1, g: 0.2, b: 0, a: 1} - - _Color: {r: 0.5754717, g: 0.4325086, b: 0.4325086, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1} - - _EnvironmentColorX: {r: 1, g: 0, b: 0, a: 1} - - _EnvironmentColorY: {r: 0, g: 1, b: 0, a: 1} - - _EnvironmentColorZ: {r: 0, g: 0, b: 1, a: 1} - - _GradientAlpha: {r: 1, g: 1, b: 1, a: 1} - - _GradientAlphaTime: {r: 0, g: 0, b: 0, a: 0} - - _GradientColor0: {r: 0.631373, g: 0.631373, b: 0.631373, a: 0} - - _GradientColor1: {r: 1, g: 0.690196, b: 0.976471, a: 0.25} - - _GradientColor2: {r: 0, g: 0.32999998, b: 0.88, a: 0.5} - - _GradientColor3: {r: 0, g: 0.32999998, b: 0.88, a: 1} - - _GradientColor4: {r: 1, g: 1, b: 1, a: 1} - - _HoverColor: {r: 1, g: 0, b: 0, a: 1} - - _HoverColorOpaqueOverride: {r: 1, g: 1, b: 1, a: 1} - - _HoverColorOverride: {r: 1, g: 1, b: 1, a: 1} - - _InnerGlowColor: {r: 1, g: 1, b: 1, a: 0.75} - - _ProximityLightCenterColorOverride: {r: 1, g: 0, b: 0, a: 0} - - _ProximityLightMiddleColorOverride: {r: 0, g: 1, b: 0, a: 0.5} - - _ProximityLightOuterColorOverride: {r: 0, g: 0, b: 1, a: 1} - - _RimColor: {r: 1, g: 1, b: 1, a: 1} - - _RoundCornersRadius: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} - m_BuildTextureStacks: [] ---- !u!21 &33224374 +--- !u!21 &30329026 Material: serializedVersion: 8 m_ObjectHideFlags: 0 @@ -1405,245 +1168,8 @@ Transform: m_Father: {fileID: 723260586} m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 47.876003} ---- !u!21 &131109905 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: ShaderBallClippingSphere (Instance) - m_Shader: {fileID: 4800000, guid: c331f6c43a2ef0945864cb668f2653c9, type: 3} - m_ValidKeywords: - - _BORDER_LIGHT_USES_HOVER_COLOR - - _CLIPPING_SPHERE - - _DIRECTIONAL_LIGHT - - _DISABLE_ALBEDO_MAP - - _HOVER_LIGHT - - _REFLECTIONS - - _SPECULAR_HIGHLIGHTS - - _USE_WORLD_SCALE - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 1 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2000 - stringTagMap: - RenderType: Opaque - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ChannelMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissiveMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _IridescentSpectrumMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _LightMapTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 2800000, guid: 32c57306df745a147a2e02f8827a8cdc, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _NormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _AlbedoAlphaMode: 0 - - _AlbedoAlphaSmoothness: 0 - - _AlbedoAssignedAtRuntime: 0 - - _BlendOp: 0 - - _BlendedClippingWidth: 1 - - _BlurBorderIntensity: 0 - - _BlurMode: 0 - - _BlurTextureIntensity: 1 - - _BorderColorMode: 0 - - _BorderLight: 0 - - _BorderLightOpaque: 0 - - _BorderLightOpaqueAlpha: 1 - - _BorderLightReplacesAlbedo: 0 - - _BorderLightUsesHoverColor: 1 - - _BorderMinValue: 0.02 - - _BorderWidth: 0.1 - - _BorderWidthHorizontal: 0.1 - - _BorderWidthVertical: 0.1 - - _BumpScale: 1 - - _ClipBoxSide: 1 - - _ClipPlaneSide: 1 - - _ClipSphereSide: 1 - - _ClippingBorder: 0 - - _ClippingBorderWidth: 0.025 - - _ClippingBox: 0 - - _ClippingPlane: 0 - - _ClippingPlaneBorder: 0 - - _ClippingPlaneBorderWidth: 0.025 - - _ClippingSphere: 1 - - _ColorWriteMask: 15 - - _CullMode: 2 - - _CustomMode: 0 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DirectionalLight: 1 - - _DstBlend: 0 - - _DstBlendAlpha: 1 - - _EdgeSmoothingMode: 0 - - _EdgeSmoothingValue: 0.002 - - _EnableChannelMap: 0 - - _EnableEmission: 0 - - _EnableHoverColorOpaqueOverride: 0 - - _EnableHoverColorOverride: 0 - - _EnableLightMap: 0 - - _EnableLocalSpaceTriplanarMapping: 0 - - _EnableNormalMap: 0 - - _EnableProximityLightColorOverride: 0 - - _EnableSSAA: 0 - - _EnableStencil: 0 - - _EnableTriplanarMapping: 0 - - _EnvironmentColorIntensity: 0.5 - - _EnvironmentColorThreshold: 1.5 - - _EnvironmentColoring: 0 - - _Fade: 1 - - _FadeBeginDistance: 0.85 - - _FadeCompleteDistance: 0.5 - - _FadeMinValue: 0 - - _FluentLightIntensity: 1 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _GradientAngle: 180 - - _GradientMode: 0 - - _HoverLight: 1 - - _HoverLightOpaque: 0 - - _IgnoreZScale: 0 - - _IndependentCorners: 0 - - _InnerGlow: 0 - - _InnerGlowPower: 4 - - _InstancedColor: 0 - - _Iridescence: 0 - - _IridescenceAngle: -0.78 - - _IridescenceIntensity: 0.5 - - _IridescenceThreshold: 0.05 - - _Metallic: 0 - - _MipmapBias: -2 - - _Mode: 0 - - _NPR: 0 - - _NearLightFade: 0 - - _NearPlaneFade: 0 - - _NormalMapScale: 1 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _ProximityLight: 0 - - _ProximityLightSubtractive: 0 - - _ProximityLightTwoSided: 0 - - _Reflections: 1 - - _Refraction: 0 - - _RefractiveIndex: 1.1 - - _RenderQueueOverride: -1 - - _RimLight: 0 - - _RimPower: 3 - - _RoundCornerMargin: 0 - - _RoundCornerRadius: 0.25 - - _RoundCorners: 0 - - _RoundCornersHideInterior: 0 - - _Smoothness: 1 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SphericalHarmonics: 0 - - _SrcBlend: 1 - - _SrcBlendAlpha: 1 - - _Stencil: 0 - - _StencilComparison: 0 - - _StencilOperation: 0 - - _StencilReadMask: 255 - - _StencilReference: 0 - - _StencilWriteMask: 255 - - _TriplanarMappingBlendSharpness: 4 - - _UVSec: 0 - - _UseWorldScale: 1 - - _VertexColors: 0 - - _VertexExtrusion: 0 - - _VertexExtrusionConstantWidth: 0 - - _VertexExtrusionSmoothNormals: 0 - - _VertexExtrusionValue: 0 - - _ZOffsetFactor: 0 - - _ZOffsetUnits: 0 - - _ZTest: 4 - - _ZWrite: 1 - m_Colors: - - _BlurBackgroundRect: {r: 0, g: 0, b: 1, a: 1} - - _BorderColor: {r: 1, g: 1, b: 1, a: 0} - - _ClipBoxSize: {r: 1, g: 1, b: 1, a: 0} - - _ClipPlane: {r: 0, g: 1, b: 0, a: 0} - - _ClipSphere: {r: 0, g: 0, b: 0, a: 0.5} - - _ClippingBorderColor: {r: 1, g: 0.2, b: 0, a: 1} - - _ClippingPlaneBorderColor: {r: 1, g: 0.2, b: 0, a: 1} - - _Color: {r: 0, g: 0.5862069, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1} - - _EnvironmentColorX: {r: 1, g: 0, b: 0, a: 1} - - _EnvironmentColorY: {r: 0, g: 1, b: 0, a: 1} - - _EnvironmentColorZ: {r: 0, g: 0, b: 1, a: 1} - - _GradientAlpha: {r: 1, g: 1, b: 1, a: 1} - - _GradientAlphaTime: {r: 0, g: 0, b: 0, a: 0} - - _GradientColor0: {r: 0.631373, g: 0.631373, b: 0.631373, a: 0} - - _GradientColor1: {r: 1, g: 0.690196, b: 0.976471, a: 0.25} - - _GradientColor2: {r: 0, g: 0.32999998, b: 0.88, a: 0.5} - - _GradientColor3: {r: 0, g: 0.32999998, b: 0.88, a: 1} - - _GradientColor4: {r: 1, g: 1, b: 1, a: 1} - - _HoverColorOpaqueOverride: {r: 1, g: 1, b: 1, a: 1} - - _HoverColorOverride: {r: 1, g: 1, b: 1, a: 1} - - _InnerGlowColor: {r: 1, g: 1, b: 1, a: 0.75} - - _ProximityLightCenterColorOverride: {r: 1, g: 0, b: 0, a: 0} - - _ProximityLightMiddleColorOverride: {r: 0, g: 1, b: 0, a: 0.5} - - _ProximityLightOuterColorOverride: {r: 0, g: 0, b: 1, a: 1} - - _RimColor: {r: 1, g: 1, b: 1, a: 1} - - _RoundCornersRadius: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} - m_BuildTextureStacks: [] ---- !u!1 &162241853 -GameObject: +--- !u!1 &162241853 +GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -2048,245 +1574,8 @@ Material: - _RimColor: {r: 1, g: 1, b: 1, a: 1} - _RoundCornersRadius: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} m_BuildTextureStacks: [] ---- !u!21 &173316004 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: ShaderBallClippingPlane (Instance) - m_Shader: {fileID: 4800000, guid: c331f6c43a2ef0945864cb668f2653c9, type: 3} - m_ValidKeywords: - - _CLIPPING_BORDER - - _CLIPPING_PLANE - - _DIRECTIONAL_LIGHT - - _DISABLE_ALBEDO_MAP - - _HOVER_LIGHT - - _REFLECTIONS - - _SPECULAR_HIGHLIGHTS - - _USE_WORLD_SCALE - m_InvalidKeywords: - - _CLIPPING_PLANE_BORDER - m_LightmapFlags: 4 - m_EnableInstancingVariants: 1 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2000 - stringTagMap: - RenderType: Opaque - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ChannelMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissiveMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _IridescentSpectrumMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _LightMapTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _NormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _AlbedoAlphaMode: 0 - - _AlbedoAlphaSmoothness: 0 - - _AlbedoAssignedAtRuntime: 0 - - _BlendOp: 0 - - _BlendedClippingWidth: 1 - - _BlurBorderIntensity: 0 - - _BlurMode: 0 - - _BlurTextureIntensity: 1 - - _BorderColorMode: 0 - - _BorderLight: 0 - - _BorderLightOpaque: 0 - - _BorderLightOpaqueAlpha: 1 - - _BorderLightReplacesAlbedo: 0 - - _BorderLightUsesHoverColor: 0 - - _BorderMinValue: 0.02 - - _BorderWidth: 0.1 - - _BorderWidthHorizontal: 0.1 - - _BorderWidthVertical: 0.1 - - _BumpScale: 1 - - _ClippingBorder: 1 - - _ClippingBorderWidth: 0.025 - - _ClippingBox: 0 - - _ClippingPlane: 1 - - _ClippingPlaneBorder: 1 - - _ClippingPlaneBorderWidth: 0.02 - - _ClippingSphere: 0 - - _ColorWriteMask: 15 - - _Cull: 2 - - _CullMode: 2 - - _CustomMode: 0 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DirectionalLight: 1 - - _DstBlend: 0 - - _DstBlendAlpha: 1 - - _EdgeSmoothingMode: 0 - - _EdgeSmoothingValue: 0.002 - - _EnableChannelMap: 0 - - _EnableEmission: 0 - - _EnableHoverColorOpaqueOverride: 0 - - _EnableHoverColorOverride: 0 - - _EnableLightMap: 0 - - _EnableLocalSpaceTriplanarMapping: 0 - - _EnableNormalMap: 0 - - _EnableProximityLightColorOverride: 0 - - _EnableSSAA: 0 - - _EnableStencil: 0 - - _EnableTriplanarMapping: 0 - - _EnvironmentColorIntensity: 0.5 - - _EnvironmentColorThreshold: 1.5 - - _EnvironmentColoring: 0 - - _Fade: 1 - - _FadeBeginDistance: 0.85 - - _FadeCompleteDistance: 0.5 - - _FadeMinValue: 0 - - _FluentLightIntensity: 1 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _GradientAngle: 180 - - _GradientMode: 0 - - _HoverLight: 1 - - _HoverLightOpaque: 0 - - _IgnoreZScale: 0 - - _IndependentCorners: 0 - - _InnerGlow: 0 - - _InnerGlowPower: 4 - - _InstancedColor: 0 - - _Iridescence: 0 - - _IridescenceAngle: -0.78 - - _IridescenceIntensity: 0.5 - - _IridescenceThreshold: 0.05 - - _Metallic: 0 - - _MipmapBias: -2 - - _Mode: 0 - - _MyCullVariable: 1 - - _NPR: 0 - - _NearLightFade: 0 - - _NearPlaneFade: 0 - - _NormalMapScale: 1 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _ProximityLight: 0 - - _ProximityLightSubtractive: 0 - - _ProximityLightTwoSided: 0 - - _Reflections: 1 - - _Refraction: 0 - - _RefractiveIndex: 1.1 - - _RenderQueueOverride: -1 - - _RimLight: 0 - - _RimPower: 3 - - _RoundCornerMargin: 0 - - _RoundCornerPower: 0.4 - - _RoundCornerRadius: 0.25 - - _RoundCorners: 0 - - _RoundCornersHideInterior: 0 - - _Smoothness: 0.5 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SphericalHarmonics: 0 - - _SrcBlend: 1 - - _SrcBlendAlpha: 1 - - _Stencil: 0 - - _StencilComparison: 0 - - _StencilOperation: 0 - - _StencilReadMask: 255 - - _StencilReference: 0 - - _StencilWriteMask: 255 - - _TriplanarMappingBlendSharpness: 4 - - _UVSec: 0 - - _UseWorldScale: 1 - - _VertexColors: 0 - - _VertexExtrusion: 0 - - _VertexExtrusionConstantWidth: 0 - - _VertexExtrusionSmoothNormals: 0 - - _VertexExtrusionValue: 0 - - _ZOffsetFactor: 0 - - _ZOffsetUnits: 0 - - _ZTest: 4 - - _ZWrite: 1 - m_Colors: - - _BlurBackgroundRect: {r: 0, g: 0, b: 1, a: 1} - - _BorderColor: {r: 1, g: 1, b: 1, a: 0} - - _ClipPlane: {r: 0, g: 1, b: 0, a: 0} - - _ClippingBorderColor: {r: 1, g: 0.2, b: 0, a: 1} - - _ClippingPlaneBorderColor: {r: 1, g: 0.2, b: 0, a: 1} - - _Color: {r: 0.5754717, g: 0.4325086, b: 0.4325086, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1} - - _EnvironmentColorX: {r: 1, g: 0, b: 0, a: 1} - - _EnvironmentColorY: {r: 0, g: 1, b: 0, a: 1} - - _EnvironmentColorZ: {r: 0, g: 0, b: 1, a: 1} - - _GradientAlpha: {r: 1, g: 1, b: 1, a: 1} - - _GradientAlphaTime: {r: 0, g: 0, b: 0, a: 0} - - _GradientColor0: {r: 0.631373, g: 0.631373, b: 0.631373, a: 0} - - _GradientColor1: {r: 1, g: 0.690196, b: 0.976471, a: 0.25} - - _GradientColor2: {r: 0, g: 0.32999998, b: 0.88, a: 0.5} - - _GradientColor3: {r: 0, g: 0.32999998, b: 0.88, a: 1} - - _GradientColor4: {r: 1, g: 1, b: 1, a: 1} - - _HoverColor: {r: 1, g: 0, b: 0, a: 1} - - _HoverColorOpaqueOverride: {r: 1, g: 1, b: 1, a: 1} - - _HoverColorOverride: {r: 1, g: 1, b: 1, a: 1} - - _InnerGlowColor: {r: 1, g: 1, b: 1, a: 0.75} - - _ProximityLightCenterColorOverride: {r: 1, g: 0, b: 0, a: 0} - - _ProximityLightMiddleColorOverride: {r: 0, g: 1, b: 0, a: 0.5} - - _ProximityLightOuterColorOverride: {r: 0, g: 0, b: 1, a: 1} - - _RimColor: {r: 1, g: 1, b: 1, a: 1} - - _RoundCornersRadius: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} - m_BuildTextureStacks: [] ---- !u!1001 &227929822 -PrefabInstance: +--- !u!1001 &227929822 +PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: @@ -2557,7 +1846,7 @@ MonoBehaviour: m_EditorClassIdentifier: defaultMaterials: - {fileID: 2100000, guid: 9f21cf60c2137a64dbe161430f7c0b75, type: 2} ---- !u!21 &354872648 +--- !u!21 &305566201 Material: serializedVersion: 8 m_ObjectHideFlags: 0 @@ -2612,6 +1901,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _EmissiveMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _IridescentSpectrumMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -2678,6 +1971,7 @@ Material: - _DetailNormalMapScale: 1 - _DirectionalLight: 1 - _DstBlend: 0 + - _DstBlendAlpha: 1 - _EdgeSmoothingMode: 0 - _EdgeSmoothingValue: 0.002 - _EnableChannelMap: 0 @@ -2718,6 +2012,7 @@ Material: - _Metallic: 0 - _MipmapBias: -2 - _Mode: 0 + - _NPR: 0 - _NearLightFade: 0 - _NearPlaneFade: 0 - _NormalMapScale: 1 @@ -2741,6 +2036,7 @@ Material: - _SpecularHighlights: 1 - _SphericalHarmonics: 0 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Stencil: 0 - _StencilComparison: 0 - _StencilOperation: 0 @@ -2752,6 +2048,7 @@ Material: - _UseWorldScale: 1 - _VertexColors: 0 - _VertexExtrusion: 0 + - _VertexExtrusionConstantWidth: 0 - _VertexExtrusionSmoothNormals: 0 - _VertexExtrusionValue: 0 - _ZOffsetFactor: 0 @@ -2788,339 +2085,9 @@ Material: - _RimColor: {r: 0, g: 0.006896496, b: 1, a: 1} - _RoundCornersRadius: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} m_BuildTextureStacks: [] ---- !u!1001 &360322616 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 162241854} - m_Modifications: - - target: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_Name - value: ShaderBall (8) - objectReference: {fileID: 0} - - target: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_StaticEditorFlags - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_RootOrder - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalScale.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalScale.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalScale.z - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalPosition.x - value: -6.4 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_CastShadows - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_MotionVectors - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_ReceiveShadows - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LightProbeUsage - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_ReflectionProbeUsage - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 1769567142} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} ---- !u!4 &360322617 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - m_PrefabInstance: {fileID: 360322616} - m_PrefabAsset: {fileID: 0} ---- !u!1 &360322618 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - m_PrefabInstance: {fileID: 360322616} - m_PrefabAsset: {fileID: 0} ---- !u!64 &360322619 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 360322618} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 4 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: 4300002, guid: 1104611d051d4e42a68391888b61b32e, type: 3} ---- !u!23 &360322620 stripped -MeshRenderer: - m_CorrespondingSourceObject: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - m_PrefabInstance: {fileID: 360322616} - m_PrefabAsset: {fileID: 0} ---- !u!114 &360322622 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 360322618} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c53e2b0613597e849870c4a691d25e0f, type: 3} - m_Name: - m_EditorClassIdentifier: - defaultMaterials: - - {fileID: 2100000, guid: 93312c326d8c3c54bb251f588b42cda7, type: 2} ---- !u!1 &365058295 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 365058296} - - component: {fileID: 365058297} - m_Layer: 0 - m_Name: Animator - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &365058296 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 365058295} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0.28} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1008789741} - m_Father: {fileID: 1595900778} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!95 &365058297 -Animator: - serializedVersion: 5 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 365058295} - m_Enabled: 1 - m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: 1613883fc4354f43b4909721507cfdeb, type: 2} - m_CullingMode: 0 - 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 ---- !u!1001 &370647260 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 120963526} - m_Modifications: - - target: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_Name - value: ShaderBall - objectReference: {fileID: 0} - - target: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_StaticEditorFlags - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalScale.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalScale.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalScale.z - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_CastShadows - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_MotionVectors - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_ReceiveShadows - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LightProbeUsage - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_ReflectionProbeUsage - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 855647985} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} ---- !u!4 &370647261 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - m_PrefabInstance: {fileID: 370647260} - m_PrefabAsset: {fileID: 0} ---- !u!1 &370647262 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - m_PrefabInstance: {fileID: 370647260} - m_PrefabAsset: {fileID: 0} ---- !u!64 &370647263 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 370647262} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 4 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: 4300002, guid: 1104611d051d4e42a68391888b61b32e, type: 3} ---- !u!23 &370647264 stripped -MeshRenderer: - m_CorrespondingSourceObject: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - m_PrefabInstance: {fileID: 370647260} - m_PrefabAsset: {fileID: 0} ---- !u!114 &370647266 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 370647262} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c53e2b0613597e849870c4a691d25e0f, type: 3} - m_Name: - m_EditorClassIdentifier: - defaultMaterials: - - {fileID: 2100000, guid: 9f21cf60c2137a64dbe161430f7c0b75, type: 2} ---- !u!21 &398192737 -Material: - serializedVersion: 8 +--- !u!21 &339803606 +Material: + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -3357,223 +2324,27 @@ Material: - _RimColor: {r: 0, g: 0.006896496, b: 1, a: 1} - _RoundCornersRadius: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} m_BuildTextureStacks: [] ---- !u!1001 &441466246 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 1444854130} - m_Modifications: - - target: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_Name - value: ShaderBall - objectReference: {fileID: 0} - - target: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_StaticEditorFlags - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalScale.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalScale.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalScale.z - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_CastShadows - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_MotionVectors - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_ReceiveShadows - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LightProbeUsage - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_ReflectionProbeUsage - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 1393154610} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} ---- !u!4 &441466247 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - m_PrefabInstance: {fileID: 441466246} - m_PrefabAsset: {fileID: 0} ---- !u!1 &441466248 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - m_PrefabInstance: {fileID: 441466246} - m_PrefabAsset: {fileID: 0} ---- !u!64 &441466249 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 441466248} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 4 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: 4300002, guid: 1104611d051d4e42a68391888b61b32e, type: 3} ---- !u!23 &441466250 stripped -MeshRenderer: - m_CorrespondingSourceObject: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - m_PrefabInstance: {fileID: 441466246} - m_PrefabAsset: {fileID: 0} ---- !u!114 &441466252 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 441466248} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c53e2b0613597e849870c4a691d25e0f, type: 3} - m_Name: - m_EditorClassIdentifier: - defaultMaterials: - - {fileID: 2100000, guid: 72beba80472642299b6651a33cc160df, type: 2} ---- !u!1001 &468754747 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 7781529056550460865, guid: c07c4bd04b45c014fad0e3cd30747f06, type: 3} - propertyPath: m_RootOrder - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 7781529056550460865, guid: c07c4bd04b45c014fad0e3cd30747f06, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7781529056550460865, guid: c07c4bd04b45c014fad0e3cd30747f06, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7781529056550460865, guid: c07c4bd04b45c014fad0e3cd30747f06, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7781529056550460865, guid: c07c4bd04b45c014fad0e3cd30747f06, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7781529056550460865, guid: c07c4bd04b45c014fad0e3cd30747f06, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7781529056550460865, guid: c07c4bd04b45c014fad0e3cd30747f06, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7781529056550460865, guid: c07c4bd04b45c014fad0e3cd30747f06, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7781529056550460865, guid: c07c4bd04b45c014fad0e3cd30747f06, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7781529056550460865, guid: c07c4bd04b45c014fad0e3cd30747f06, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7781529056550460865, guid: c07c4bd04b45c014fad0e3cd30747f06, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7781529056550460866, guid: c07c4bd04b45c014fad0e3cd30747f06, type: 3} - propertyPath: m_Name - value: SimpleProfiler - objectReference: {fileID: 0} - - target: {fileID: 7781529056550460866, guid: c07c4bd04b45c014fad0e3cd30747f06, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: c07c4bd04b45c014fad0e3cd30747f06, type: 3} ---- !u!21 &512803740 +--- !u!21 &354872648 Material: serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: ShaderBallClippingPlane (Instance) + m_Name: ShaderBallClippingBox (Instance) m_Shader: {fileID: 4800000, guid: c331f6c43a2ef0945864cb668f2653c9, type: 3} m_ValidKeywords: - - _CLIPPING_BORDER - - _CLIPPING_PLANE + - _BORDER_LIGHT_USES_HOVER_COLOR + - _CLIPPING_BOX - _DIRECTIONAL_LIGHT - _DISABLE_ALBEDO_MAP + - _HOVER_COLOR_OVERRIDE - _HOVER_LIGHT - _REFLECTIONS + - _RIM_LIGHT - _SPECULAR_HIGHLIGHTS - _USE_WORLD_SCALE - m_InvalidKeywords: - - _CLIPPING_PLANE_BORDER + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 @@ -3617,7 +2388,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 32c57306df745a147a2e02f8827a8cdc, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: @@ -3651,22 +2422,24 @@ Material: - _BorderLightOpaque: 0 - _BorderLightOpaqueAlpha: 1 - _BorderLightReplacesAlbedo: 0 - - _BorderLightUsesHoverColor: 0 + - _BorderLightUsesHoverColor: 1 - _BorderMinValue: 0.02 - _BorderWidth: 0.1 - _BorderWidthHorizontal: 0.1 - _BorderWidthVertical: 0.1 - _BumpScale: 1 - - _ClippingBorder: 1 + - _ClipBoxSide: 1 + - _ClipPlaneSide: 1 + - _ClipSphereSide: 1 + - _ClippingBorder: 0 - _ClippingBorderWidth: 0.025 - - _ClippingBox: 0 - - _ClippingPlane: 1 - - _ClippingPlaneBorder: 1 - - _ClippingPlaneBorderWidth: 0.02 + - _ClippingBox: 1 + - _ClippingPlane: 0 + - _ClippingPlaneBorder: 0 + - _ClippingPlaneBorderWidth: 0.025 - _ClippingSphere: 0 - _ColorWriteMask: 15 - - _Cull: 2 - - _CullMode: 2 + - _CullMode: 0 - _CustomMode: 0 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 @@ -3677,7 +2450,7 @@ Material: - _EnableChannelMap: 0 - _EnableEmission: 0 - _EnableHoverColorOpaqueOverride: 0 - - _EnableHoverColorOverride: 0 + - _EnableHoverColorOverride: 1 - _EnableLightMap: 0 - _EnableLocalSpaceTriplanarMapping: 0 - _EnableNormalMap: 0 @@ -3712,7 +2485,6 @@ Material: - _Metallic: 0 - _MipmapBias: -2 - _Mode: 0 - - _MyCullVariable: 1 - _NearLightFade: 0 - _NearPlaneFade: 0 - _NormalMapScale: 1 @@ -3725,14 +2497,13 @@ Material: - _Refraction: 0 - _RefractiveIndex: 1.1 - _RenderQueueOverride: -1 - - _RimLight: 0 + - _RimLight: 1 - _RimPower: 3 - _RoundCornerMargin: 0 - - _RoundCornerPower: 0.4 - _RoundCornerRadius: 0.25 - _RoundCorners: 0 - _RoundCornersHideInterior: 0 - - _Smoothness: 0.5 + - _Smoothness: 1 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SphericalHarmonics: 0 @@ -3757,10 +2528,12 @@ Material: m_Colors: - _BlurBackgroundRect: {r: 0, g: 0, b: 1, a: 1} - _BorderColor: {r: 1, g: 1, b: 1, a: 0} + - _ClipBoxSize: {r: 1, g: 1, b: 1, a: 0} - _ClipPlane: {r: 0, g: 1, b: 0, a: 0} + - _ClipSphere: {r: 0, g: 0, b: 0, a: 0.5} - _ClippingBorderColor: {r: 1, g: 0.2, b: 0, a: 1} - _ClippingPlaneBorderColor: {r: 1, g: 0.2, b: 0, a: 1} - - _Color: {r: 0.5754717, g: 0.4325086, b: 0.4325086, a: 1} + - _Color: {r: 0.72794116, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1} - _EnvironmentColorX: {r: 1, g: 0, b: 0, a: 1} @@ -3773,523 +2546,219 @@ Material: - _GradientColor2: {r: 0, g: 0.32999998, b: 0.88, a: 0.5} - _GradientColor3: {r: 0, g: 0.32999998, b: 0.88, a: 1} - _GradientColor4: {r: 1, g: 1, b: 1, a: 1} - - _HoverColor: {r: 1, g: 0, b: 0, a: 1} - _HoverColorOpaqueOverride: {r: 1, g: 1, b: 1, a: 1} - - _HoverColorOverride: {r: 1, g: 1, b: 1, a: 1} + - _HoverColorOverride: {r: 0, g: 0.007843138, b: 1, a: 1} - _InnerGlowColor: {r: 1, g: 1, b: 1, a: 0.75} - _ProximityLightCenterColorOverride: {r: 1, g: 0, b: 0, a: 0} - _ProximityLightMiddleColorOverride: {r: 0, g: 1, b: 0, a: 0.5} - _ProximityLightOuterColorOverride: {r: 0, g: 0, b: 1, a: 1} - - _RimColor: {r: 1, g: 1, b: 1, a: 1} + - _RimColor: {r: 0, g: 0.006896496, b: 1, a: 1} - _RoundCornersRadius: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} m_BuildTextureStacks: [] ---- !u!1001 &530525190 +--- !u!1001 &360322616 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 162241854} m_Modifications: - - target: {fileID: 3493013819197874656, guid: ad5b753b73e311143a85055b15cea562, type: 3} + - target: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_Name + value: ShaderBall (8) + objectReference: {fileID: 0} + - target: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} propertyPath: m_RootOrder + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalScale.x value: 1 objectReference: {fileID: 0} - - target: {fileID: 3493013819197874656, guid: ad5b753b73e311143a85055b15cea562, type: 3} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalPosition.x + value: -6.4 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 3493013819197874656, guid: ad5b753b73e311143a85055b15cea562, type: 3} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 3493013819197874656, guid: ad5b753b73e311143a85055b15cea562, type: 3} - propertyPath: m_LocalEulerAnglesHint.z + - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_CastShadows value: 0 objectReference: {fileID: 0} - - target: {fileID: 7585035320575375756, guid: ad5b753b73e311143a85055b15cea562, type: 3} - propertyPath: m_Name - value: MRTKInputSimulator + - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_MotionVectors + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_ReceiveShadows + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LightProbeUsage + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_ReflectionProbeUsage + value: 0 objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 1769567142} m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: ad5b753b73e311143a85055b15cea562, type: 3} ---- !u!21 &542103952 -Material: - serializedVersion: 8 + m_SourcePrefab: {fileID: 100100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} +--- !u!4 &360322617 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + m_PrefabInstance: {fileID: 360322616} + m_PrefabAsset: {fileID: 0} +--- !u!1 &360322618 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + m_PrefabInstance: {fileID: 360322616} + m_PrefabAsset: {fileID: 0} +--- !u!64 &360322619 +MeshCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: ShaderBallClippingSphere (Instance) - m_Shader: {fileID: 4800000, guid: c331f6c43a2ef0945864cb668f2653c9, type: 3} - m_ValidKeywords: - - _BORDER_LIGHT_USES_HOVER_COLOR - - _CLIPPING_SPHERE - - _DIRECTIONAL_LIGHT - - _DISABLE_ALBEDO_MAP - - _HOVER_LIGHT - - _REFLECTIONS - - _SPECULAR_HIGHLIGHTS - - _USE_WORLD_SCALE - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 1 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2000 - stringTagMap: - RenderType: Opaque - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ChannelMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _IridescentSpectrumMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _LightMapTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 2800000, guid: 32c57306df745a147a2e02f8827a8cdc, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _NormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _AlbedoAlphaMode: 0 - - _AlbedoAlphaSmoothness: 0 - - _AlbedoAssignedAtRuntime: 0 - - _BlendOp: 0 - - _BlendedClippingWidth: 1 - - _BlurBorderIntensity: 0 - - _BlurMode: 0 - - _BlurTextureIntensity: 1 - - _BorderColorMode: 0 - - _BorderLight: 0 - - _BorderLightOpaque: 0 - - _BorderLightOpaqueAlpha: 1 - - _BorderLightReplacesAlbedo: 0 - - _BorderLightUsesHoverColor: 1 - - _BorderMinValue: 0.02 - - _BorderWidth: 0.1 - - _BorderWidthHorizontal: 0.1 - - _BorderWidthVertical: 0.1 - - _BumpScale: 1 - - _ClipBoxSide: 1 - - _ClipPlaneSide: 1 - - _ClipSphereSide: 1 - - _ClippingBorder: 0 - - _ClippingBorderWidth: 0.025 - - _ClippingBox: 0 - - _ClippingPlane: 0 - - _ClippingPlaneBorder: 0 - - _ClippingPlaneBorderWidth: 0.025 - - _ClippingSphere: 1 - - _ColorWriteMask: 15 - - _CullMode: 2 - - _CustomMode: 0 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DirectionalLight: 1 - - _DstBlend: 0 - - _EdgeSmoothingMode: 0 - - _EdgeSmoothingValue: 0.002 - - _EnableChannelMap: 0 - - _EnableEmission: 0 - - _EnableHoverColorOpaqueOverride: 0 - - _EnableHoverColorOverride: 0 - - _EnableLightMap: 0 - - _EnableLocalSpaceTriplanarMapping: 0 - - _EnableNormalMap: 0 - - _EnableProximityLightColorOverride: 0 - - _EnableSSAA: 0 - - _EnableStencil: 0 - - _EnableTriplanarMapping: 0 - - _EnvironmentColorIntensity: 0.5 - - _EnvironmentColorThreshold: 1.5 - - _EnvironmentColoring: 0 - - _Fade: 1 - - _FadeBeginDistance: 0.85 - - _FadeCompleteDistance: 0.5 - - _FadeMinValue: 0 - - _FluentLightIntensity: 1 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _GradientAngle: 180 - - _GradientMode: 0 - - _HoverLight: 1 - - _HoverLightOpaque: 0 - - _IgnoreZScale: 0 - - _IndependentCorners: 0 - - _InnerGlow: 0 - - _InnerGlowPower: 4 - - _InstancedColor: 0 - - _Iridescence: 0 - - _IridescenceAngle: -0.78 - - _IridescenceIntensity: 0.5 - - _IridescenceThreshold: 0.05 - - _Metallic: 0 - - _MipmapBias: -2 - - _Mode: 0 - - _NearLightFade: 0 - - _NearPlaneFade: 0 - - _NormalMapScale: 1 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _ProximityLight: 0 - - _ProximityLightSubtractive: 0 - - _ProximityLightTwoSided: 0 - - _Reflections: 1 - - _Refraction: 0 - - _RefractiveIndex: 1.1 - - _RenderQueueOverride: -1 - - _RimLight: 0 - - _RimPower: 3 - - _RoundCornerMargin: 0 - - _RoundCornerRadius: 0.25 - - _RoundCorners: 0 - - _RoundCornersHideInterior: 0 - - _Smoothness: 1 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SphericalHarmonics: 0 - - _SrcBlend: 1 - - _Stencil: 0 - - _StencilComparison: 0 - - _StencilOperation: 0 - - _StencilReadMask: 255 - - _StencilReference: 0 - - _StencilWriteMask: 255 - - _TriplanarMappingBlendSharpness: 4 - - _UVSec: 0 - - _UseWorldScale: 1 - - _VertexColors: 0 - - _VertexExtrusion: 0 - - _VertexExtrusionSmoothNormals: 0 - - _VertexExtrusionValue: 0 - - _ZOffsetFactor: 0 - - _ZOffsetUnits: 0 - - _ZTest: 4 - - _ZWrite: 1 - m_Colors: - - _BlurBackgroundRect: {r: 0, g: 0, b: 1, a: 1} - - _BorderColor: {r: 1, g: 1, b: 1, a: 0} - - _ClipBoxSize: {r: 1, g: 1, b: 1, a: 0} - - _ClipPlane: {r: 0, g: 1, b: 0, a: 0} - - _ClipSphere: {r: 0, g: 0, b: 0, a: 0.5} - - _ClippingBorderColor: {r: 1, g: 0.2, b: 0, a: 1} - - _ClippingPlaneBorderColor: {r: 1, g: 0.2, b: 0, a: 1} - - _Color: {r: 0, g: 0.5862069, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1} - - _EnvironmentColorX: {r: 1, g: 0, b: 0, a: 1} - - _EnvironmentColorY: {r: 0, g: 1, b: 0, a: 1} - - _EnvironmentColorZ: {r: 0, g: 0, b: 1, a: 1} - - _GradientAlpha: {r: 1, g: 1, b: 1, a: 1} - - _GradientAlphaTime: {r: 0, g: 0, b: 0, a: 0} - - _GradientColor0: {r: 0.631373, g: 0.631373, b: 0.631373, a: 0} - - _GradientColor1: {r: 1, g: 0.690196, b: 0.976471, a: 0.25} - - _GradientColor2: {r: 0, g: 0.32999998, b: 0.88, a: 0.5} - - _GradientColor3: {r: 0, g: 0.32999998, b: 0.88, a: 1} - - _GradientColor4: {r: 1, g: 1, b: 1, a: 1} - - _HoverColorOpaqueOverride: {r: 1, g: 1, b: 1, a: 1} - - _HoverColorOverride: {r: 1, g: 1, b: 1, a: 1} - - _InnerGlowColor: {r: 1, g: 1, b: 1, a: 0.75} - - _ProximityLightCenterColorOverride: {r: 1, g: 0, b: 0, a: 0} - - _ProximityLightMiddleColorOverride: {r: 0, g: 1, b: 0, a: 0.5} - - _ProximityLightOuterColorOverride: {r: 0, g: 0, b: 1, a: 1} - - _RimColor: {r: 1, g: 1, b: 1, a: 1} - - _RoundCornersRadius: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} - m_BuildTextureStacks: [] ---- !u!21 &587361058 -Material: - serializedVersion: 8 + m_GameObject: {fileID: 360322618} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 4300002, guid: 1104611d051d4e42a68391888b61b32e, type: 3} +--- !u!23 &360322620 stripped +MeshRenderer: + m_CorrespondingSourceObject: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + m_PrefabInstance: {fileID: 360322616} + m_PrefabAsset: {fileID: 0} +--- !u!114 &360322622 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: ShaderBallClippingBox (Instance) - m_Shader: {fileID: 4800000, guid: c331f6c43a2ef0945864cb668f2653c9, type: 3} - m_ValidKeywords: - - _BORDER_LIGHT_USES_HOVER_COLOR - - _CLIPPING_BOX - - _DIRECTIONAL_LIGHT - - _DISABLE_ALBEDO_MAP - - _HOVER_COLOR_OVERRIDE - - _HOVER_LIGHT - - _REFLECTIONS - - _RIM_LIGHT - - _SPECULAR_HIGHLIGHTS - - _USE_WORLD_SCALE - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 1 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2000 - stringTagMap: - RenderType: Opaque - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ChannelMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissiveMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _IridescentSpectrumMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _LightMapTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 2800000, guid: 32c57306df745a147a2e02f8827a8cdc, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _NormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _AlbedoAlphaMode: 0 - - _AlbedoAlphaSmoothness: 0 - - _AlbedoAssignedAtRuntime: 0 - - _BlendOp: 0 - - _BlendedClippingWidth: 1 - - _BlurBorderIntensity: 0 - - _BlurMode: 0 - - _BlurTextureIntensity: 1 - - _BorderColorMode: 0 - - _BorderLight: 0 - - _BorderLightOpaque: 0 - - _BorderLightOpaqueAlpha: 1 - - _BorderLightReplacesAlbedo: 0 - - _BorderLightUsesHoverColor: 1 - - _BorderMinValue: 0.02 - - _BorderWidth: 0.1 - - _BorderWidthHorizontal: 0.1 - - _BorderWidthVertical: 0.1 - - _BumpScale: 1 - - _ClipBoxSide: 1 - - _ClipPlaneSide: 1 - - _ClipSphereSide: 1 - - _ClippingBorder: 0 - - _ClippingBorderWidth: 0.025 - - _ClippingBox: 1 - - _ClippingPlane: 0 - - _ClippingPlaneBorder: 0 - - _ClippingPlaneBorderWidth: 0.025 - - _ClippingSphere: 0 - - _ColorWriteMask: 15 - - _CullMode: 0 - - _CustomMode: 0 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DirectionalLight: 1 - - _DstBlend: 0 - - _DstBlendAlpha: 1 - - _EdgeSmoothingMode: 0 - - _EdgeSmoothingValue: 0.002 - - _EnableChannelMap: 0 - - _EnableEmission: 0 - - _EnableHoverColorOpaqueOverride: 0 - - _EnableHoverColorOverride: 1 - - _EnableLightMap: 0 - - _EnableLocalSpaceTriplanarMapping: 0 - - _EnableNormalMap: 0 - - _EnableProximityLightColorOverride: 0 - - _EnableSSAA: 0 - - _EnableStencil: 0 - - _EnableTriplanarMapping: 0 - - _EnvironmentColorIntensity: 0.5 - - _EnvironmentColorThreshold: 1.5 - - _EnvironmentColoring: 0 - - _Fade: 1 - - _FadeBeginDistance: 0.85 - - _FadeCompleteDistance: 0.5 - - _FadeMinValue: 0 - - _FluentLightIntensity: 1 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _GradientAngle: 180 - - _GradientMode: 0 - - _HoverLight: 1 - - _HoverLightOpaque: 0 - - _IgnoreZScale: 0 - - _IndependentCorners: 0 - - _InnerGlow: 0 - - _InnerGlowPower: 4 - - _InstancedColor: 0 - - _Iridescence: 0 - - _IridescenceAngle: -0.78 - - _IridescenceIntensity: 0.5 - - _IridescenceThreshold: 0.05 - - _Metallic: 0 - - _MipmapBias: -2 - - _Mode: 0 - - _NPR: 0 - - _NearLightFade: 0 - - _NearPlaneFade: 0 - - _NormalMapScale: 1 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _ProximityLight: 0 - - _ProximityLightSubtractive: 0 - - _ProximityLightTwoSided: 0 - - _Reflections: 1 - - _Refraction: 0 - - _RefractiveIndex: 1.1 - - _RenderQueueOverride: -1 - - _RimLight: 1 - - _RimPower: 3 - - _RoundCornerMargin: 0 - - _RoundCornerRadius: 0.25 - - _RoundCorners: 0 - - _RoundCornersHideInterior: 0 - - _Smoothness: 1 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SphericalHarmonics: 0 - - _SrcBlend: 1 - - _SrcBlendAlpha: 1 - - _Stencil: 0 - - _StencilComparison: 0 - - _StencilOperation: 0 - - _StencilReadMask: 255 - - _StencilReference: 0 - - _StencilWriteMask: 255 - - _TriplanarMappingBlendSharpness: 4 - - _UVSec: 0 - - _UseWorldScale: 1 - - _VertexColors: 0 - - _VertexExtrusion: 0 - - _VertexExtrusionConstantWidth: 0 - - _VertexExtrusionSmoothNormals: 0 - - _VertexExtrusionValue: 0 - - _ZOffsetFactor: 0 - - _ZOffsetUnits: 0 - - _ZTest: 4 - - _ZWrite: 1 - m_Colors: - - _BlurBackgroundRect: {r: 0, g: 0, b: 1, a: 1} - - _BorderColor: {r: 1, g: 1, b: 1, a: 0} - - _ClipBoxSize: {r: 1, g: 1, b: 1, a: 0} - - _ClipPlane: {r: 0, g: 1, b: 0, a: 0} - - _ClipSphere: {r: 0, g: 0, b: 0, a: 0.5} - - _ClippingBorderColor: {r: 1, g: 0.2, b: 0, a: 1} - - _ClippingPlaneBorderColor: {r: 1, g: 0.2, b: 0, a: 1} - - _Color: {r: 0.72794116, g: 0, b: 0, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1} - - _EnvironmentColorX: {r: 1, g: 0, b: 0, a: 1} - - _EnvironmentColorY: {r: 0, g: 1, b: 0, a: 1} - - _EnvironmentColorZ: {r: 0, g: 0, b: 1, a: 1} - - _GradientAlpha: {r: 1, g: 1, b: 1, a: 1} - - _GradientAlphaTime: {r: 0, g: 0, b: 0, a: 0} - - _GradientColor0: {r: 0.631373, g: 0.631373, b: 0.631373, a: 0} - - _GradientColor1: {r: 1, g: 0.690196, b: 0.976471, a: 0.25} - - _GradientColor2: {r: 0, g: 0.32999998, b: 0.88, a: 0.5} - - _GradientColor3: {r: 0, g: 0.32999998, b: 0.88, a: 1} - - _GradientColor4: {r: 1, g: 1, b: 1, a: 1} - - _HoverColorOpaqueOverride: {r: 1, g: 1, b: 1, a: 1} - - _HoverColorOverride: {r: 0, g: 0.007843138, b: 1, a: 1} - - _InnerGlowColor: {r: 1, g: 1, b: 1, a: 0.75} - - _ProximityLightCenterColorOverride: {r: 1, g: 0, b: 0, a: 0} - - _ProximityLightMiddleColorOverride: {r: 0, g: 1, b: 0, a: 0.5} - - _ProximityLightOuterColorOverride: {r: 0, g: 0, b: 1, a: 1} - - _RimColor: {r: 0, g: 0.006896496, b: 1, a: 1} - - _RoundCornersRadius: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} - m_BuildTextureStacks: [] ---- !u!1001 &588131902 + m_GameObject: {fileID: 360322618} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c53e2b0613597e849870c4a691d25e0f, type: 3} + m_Name: + m_EditorClassIdentifier: + defaultMaterials: + - {fileID: 2100000, guid: 93312c326d8c3c54bb251f588b42cda7, type: 2} +--- !u!1 &365058295 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 365058296} + - component: {fileID: 365058297} + m_Layer: 0 + m_Name: Animator + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &365058296 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 365058295} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0.28} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1008789741} + m_Father: {fileID: 1595900778} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!95 &365058297 +Animator: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 365058295} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 1613883fc4354f43b4909721507cfdeb, type: 2} + m_CullingMode: 0 + 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 +--- !u!1001 &370647260 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 162241854} + m_TransformParent: {fileID: 120963526} m_Modifications: - target: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} propertyPath: m_Name - value: ShaderBall (5) + value: ShaderBall objectReference: {fileID: 0} - target: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} propertyPath: m_StaticEditorFlags @@ -4297,7 +2766,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} propertyPath: m_RootOrder - value: 6 + value: 0 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} propertyPath: m_LocalScale.x @@ -4313,11 +2782,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} propertyPath: m_LocalPosition.x - value: -4 + value: 0 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} propertyPath: m_LocalPosition.y - value: 0.3 + value: 0 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} propertyPath: m_LocalPosition.z @@ -4370,26 +2839,26 @@ PrefabInstance: - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} propertyPath: m_Materials.Array.data[0] value: - objectReference: {fileID: 929061953} + objectReference: {fileID: 855647985} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} ---- !u!4 &588131903 stripped +--- !u!4 &370647261 stripped Transform: m_CorrespondingSourceObject: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - m_PrefabInstance: {fileID: 588131902} + m_PrefabInstance: {fileID: 370647260} m_PrefabAsset: {fileID: 0} ---- !u!1 &588131904 stripped +--- !u!1 &370647262 stripped GameObject: m_CorrespondingSourceObject: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - m_PrefabInstance: {fileID: 588131902} + m_PrefabInstance: {fileID: 370647260} m_PrefabAsset: {fileID: 0} ---- !u!64 &588131905 +--- !u!64 &370647263 MeshCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 588131904} + m_GameObject: {fileID: 370647262} m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 @@ -4397,273 +2866,31 @@ MeshCollider: m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 4300002, guid: 1104611d051d4e42a68391888b61b32e, type: 3} ---- !u!23 &588131906 stripped +--- !u!23 &370647264 stripped MeshRenderer: m_CorrespondingSourceObject: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - m_PrefabInstance: {fileID: 588131902} + m_PrefabInstance: {fileID: 370647260} m_PrefabAsset: {fileID: 0} ---- !u!114 &588131908 +--- !u!114 &370647266 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 588131904} + m_GameObject: {fileID: 370647262} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: c53e2b0613597e849870c4a691d25e0f, type: 3} m_Name: m_EditorClassIdentifier: defaultMaterials: - - {fileID: 2100000, guid: 93312c326d8c3c54bb251f588b42cda7, type: 2} ---- !u!4 &592789515 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 5264854134403395402, guid: 53b4fadc7abe80d4f9549b89f80300d0, type: 3} - m_PrefabInstance: {fileID: 1558856740} - m_PrefabAsset: {fileID: 0} ---- !u!21 &602923317 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: ShaderBallClippingPlaneInner (Instance) - m_Shader: {fileID: 4800000, guid: c331f6c43a2ef0945864cb668f2653c9, type: 3} - m_ValidKeywords: - - _CLIPPING_PLANE - - _DIRECTIONAL_LIGHT - - _DISABLE_ALBEDO_MAP - - _EMISSION - - _HOVER_LIGHT - - _REFLECTIONS - - _SPECULAR_HIGHLIGHTS - - _USE_WORLD_SCALE - m_InvalidKeywords: - - _CLIPPING_PLANE_BORDER - m_LightmapFlags: 4 - m_EnableInstancingVariants: 1 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2000 - stringTagMap: - RenderType: Opaque - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ChannelMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissiveMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _IridescentSpectrumMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _LightMapTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 2800000, guid: 32c57306df745a147a2e02f8827a8cdc, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _NormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _AlbedoAlphaMode: 0 - - _AlbedoAlphaSmoothness: 0 - - _AlbedoAssignedAtRuntime: 0 - - _BlendOp: 0 - - _BlendedClippingWidth: 1 - - _BlurBorderIntensity: 0 - - _BlurMode: 0 - - _BlurTextureIntensity: 1 - - _BorderColorMode: 0 - - _BorderLight: 0 - - _BorderLightOpaque: 0 - - _BorderLightOpaqueAlpha: 1 - - _BorderLightReplacesAlbedo: 0 - - _BorderLightUsesHoverColor: 0 - - _BorderMinValue: 0.02 - - _BorderWidth: 0.1 - - _BorderWidthHorizontal: 0.1 - - _BorderWidthVertical: 0.1 - - _BumpScale: 1 - - _ClippingBorder: 0 - - _ClippingBorderWidth: 0.025 - - _ClippingBox: 0 - - _ClippingPlane: 1 - - _ClippingPlaneBorder: 1 - - _ClippingPlaneBorderWidth: 0.02 - - _ClippingSphere: 0 - - _ColorWriteMask: 15 - - _Cull: 2 - - _CullMode: 1 - - _CustomMode: 0 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DirectionalLight: 1 - - _DstBlend: 0 - - _DstBlendAlpha: 1 - - _EdgeSmoothingMode: 0 - - _EdgeSmoothingValue: 0.002 - - _EnableChannelMap: 0 - - _EnableEmission: 1 - - _EnableHoverColorOpaqueOverride: 0 - - _EnableHoverColorOverride: 0 - - _EnableLightMap: 0 - - _EnableLocalSpaceTriplanarMapping: 0 - - _EnableNormalMap: 0 - - _EnableProximityLightColorOverride: 0 - - _EnableSSAA: 0 - - _EnableStencil: 0 - - _EnableTriplanarMapping: 0 - - _EnvironmentColorIntensity: 0.5 - - _EnvironmentColorThreshold: 1.5 - - _EnvironmentColoring: 0 - - _Fade: 1 - - _FadeBeginDistance: 0.85 - - _FadeCompleteDistance: 0.5 - - _FadeMinValue: 0 - - _FluentLightIntensity: 1 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _GradientAngle: 180 - - _GradientMode: 0 - - _HoverLight: 1 - - _HoverLightOpaque: 0 - - _IgnoreZScale: 0 - - _IndependentCorners: 0 - - _InnerGlow: 0 - - _InnerGlowPower: 4 - - _InstancedColor: 0 - - _Iridescence: 0 - - _IridescenceAngle: -0.78 - - _IridescenceIntensity: 0.5 - - _IridescenceThreshold: 0.05 - - _Metallic: 0.036 - - _MipmapBias: -2 - - _Mode: 0 - - _MyCullVariable: 1 - - _NPR: 0 - - _NearLightFade: 0 - - _NearPlaneFade: 0 - - _NormalMapScale: 1 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _ProximityLight: 0 - - _ProximityLightSubtractive: 0 - - _ProximityLightTwoSided: 0 - - _Reflections: 1 - - _Refraction: 0 - - _RefractiveIndex: 1.1 - - _RenderQueueOverride: -1 - - _RimLight: 0 - - _RimPower: 3 - - _RoundCornerMargin: 0 - - _RoundCornerPower: 0.4 - - _RoundCornerRadius: 0.25 - - _RoundCorners: 0 - - _RoundCornersHideInterior: 0 - - _Smoothness: 0.5 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SphericalHarmonics: 0 - - _SrcBlend: 1 - - _SrcBlendAlpha: 1 - - _Stencil: 0 - - _StencilComparison: 0 - - _StencilOperation: 0 - - _StencilReadMask: 255 - - _StencilReference: 0 - - _StencilWriteMask: 255 - - _TriplanarMappingBlendSharpness: 4 - - _UVSec: 0 - - _UseWorldScale: 1 - - _VertexColors: 0 - - _VertexExtrusion: 0 - - _VertexExtrusionConstantWidth: 0 - - _VertexExtrusionSmoothNormals: 0 - - _VertexExtrusionValue: 0 - - _ZOffsetFactor: 0 - - _ZOffsetUnits: 0 - - _ZTest: 4 - - _ZWrite: 1 - m_Colors: - - _BlurBackgroundRect: {r: 0, g: 0, b: 1, a: 1} - - _BorderColor: {r: 1, g: 1, b: 1, a: 0} - - _ClipPlane: {r: 0, g: 1, b: 0, a: 0} - - _ClippingBorderColor: {r: 1, g: 0.2, b: 0, a: 1} - - _ClippingPlaneBorderColor: {r: 1, g: 0.2, b: 0, a: 1} - - _Color: {r: 1, g: 0.6827586, b: 0, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _EmissiveColor: {r: 0.9411765, g: 0, b: 0, a: 1} - - _EnvironmentColorX: {r: 1, g: 0, b: 0, a: 1} - - _EnvironmentColorY: {r: 0, g: 1, b: 0, a: 1} - - _EnvironmentColorZ: {r: 0, g: 0, b: 1, a: 1} - - _GradientAlpha: {r: 1, g: 1, b: 1, a: 1} - - _GradientAlphaTime: {r: 0, g: 0, b: 0, a: 0} - - _GradientColor0: {r: 0.631373, g: 0.631373, b: 0.631373, a: 0} - - _GradientColor1: {r: 1, g: 0.690196, b: 0.976471, a: 0.25} - - _GradientColor2: {r: 0, g: 0.32999998, b: 0.88, a: 0.5} - - _GradientColor3: {r: 0, g: 0.32999998, b: 0.88, a: 1} - - _GradientColor4: {r: 1, g: 1, b: 1, a: 1} - - _HoverColor: {r: 1, g: 0, b: 0, a: 1} - - _HoverColorOpaqueOverride: {r: 1, g: 1, b: 1, a: 1} - - _HoverColorOverride: {r: 1, g: 1, b: 1, a: 1} - - _InnerGlowColor: {r: 1, g: 1, b: 1, a: 0.75} - - _ProximityLightCenterColorOverride: {r: 1, g: 0, b: 0, a: 0} - - _ProximityLightMiddleColorOverride: {r: 0, g: 1, b: 0, a: 0.5} - - _ProximityLightOuterColorOverride: {r: 0, g: 0, b: 1, a: 1} - - _RimColor: {r: 1, g: 1, b: 1, a: 1} - - _RoundCornersRadius: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} - m_BuildTextureStacks: [] ---- !u!1001 &616142844 -PrefabInstance: + - {fileID: 2100000, guid: 9f21cf60c2137a64dbe161430f7c0b75, type: 2} +--- !u!1001 &441466246 +PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 973147021} + m_TransformParent: {fileID: 1444854130} m_Modifications: - target: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} propertyPath: m_Name @@ -4748,26 +2975,26 @@ PrefabInstance: - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} propertyPath: m_Materials.Array.data[0] value: - objectReference: {fileID: 2097836553} + objectReference: {fileID: 1393154610} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} ---- !u!4 &616142845 stripped +--- !u!4 &441466247 stripped Transform: m_CorrespondingSourceObject: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - m_PrefabInstance: {fileID: 616142844} + m_PrefabInstance: {fileID: 441466246} m_PrefabAsset: {fileID: 0} ---- !u!1 &616142846 stripped +--- !u!1 &441466248 stripped GameObject: m_CorrespondingSourceObject: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - m_PrefabInstance: {fileID: 616142844} + m_PrefabInstance: {fileID: 441466246} m_PrefabAsset: {fileID: 0} ---- !u!64 &616142847 +--- !u!64 &441466249 MeshCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 616142846} + m_GameObject: {fileID: 441466248} m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 @@ -4775,18 +3002,18 @@ MeshCollider: m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 4300002, guid: 1104611d051d4e42a68391888b61b32e, type: 3} ---- !u!23 &616142848 stripped +--- !u!23 &441466250 stripped MeshRenderer: m_CorrespondingSourceObject: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - m_PrefabInstance: {fileID: 616142844} + m_PrefabInstance: {fileID: 441466246} m_PrefabAsset: {fileID: 0} ---- !u!114 &616142850 +--- !u!114 &441466252 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 616142846} + m_GameObject: {fileID: 441466248} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: c53e2b0613597e849870c4a691d25e0f, type: 3} @@ -4794,312 +3021,86 @@ MonoBehaviour: m_EditorClassIdentifier: defaultMaterials: - {fileID: 2100000, guid: 72beba80472642299b6651a33cc160df, type: 2} ---- !u!1001 &623737352 +--- !u!1001 &468754747 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 1793330793} + m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_Name - value: ShaderBall - objectReference: {fileID: 0} - - target: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_StaticEditorFlags - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + - target: {fileID: 7781529056550460865, guid: c07c4bd04b45c014fad0e3cd30747f06, type: 3} propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalScale.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalScale.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalScale.z - value: 1 + value: 5 objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + - target: {fileID: 7781529056550460865, guid: c07c4bd04b45c014fad0e3cd30747f06, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + - target: {fileID: 7781529056550460865, guid: c07c4bd04b45c014fad0e3cd30747f06, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + - target: {fileID: 7781529056550460865, guid: c07c4bd04b45c014fad0e3cd30747f06, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + - target: {fileID: 7781529056550460865, guid: c07c4bd04b45c014fad0e3cd30747f06, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + - target: {fileID: 7781529056550460865, guid: c07c4bd04b45c014fad0e3cd30747f06, type: 3} propertyPath: m_LocalRotation.x - value: -0 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + - target: {fileID: 7781529056550460865, guid: c07c4bd04b45c014fad0e3cd30747f06, type: 3} propertyPath: m_LocalRotation.y - value: -0 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + - target: {fileID: 7781529056550460865, guid: c07c4bd04b45c014fad0e3cd30747f06, type: 3} propertyPath: m_LocalRotation.z - value: -0 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + - target: {fileID: 7781529056550460865, guid: c07c4bd04b45c014fad0e3cd30747f06, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + - target: {fileID: 7781529056550460865, guid: c07c4bd04b45c014fad0e3cd30747f06, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_CastShadows - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_MotionVectors - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_ReceiveShadows - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LightProbeUsage - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_ReflectionProbeUsage + - target: {fileID: 7781529056550460865, guid: c07c4bd04b45c014fad0e3cd30747f06, type: 3} + propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 759015636} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} ---- !u!4 &623737353 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - m_PrefabInstance: {fileID: 623737352} - m_PrefabAsset: {fileID: 0} ---- !u!1 &623737354 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - m_PrefabInstance: {fileID: 623737352} - m_PrefabAsset: {fileID: 0} ---- !u!64 &623737355 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 623737354} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 4 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: 4300002, guid: 1104611d051d4e42a68391888b61b32e, type: 3} ---- !u!114 &623737356 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 623737354} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c53e2b0613597e849870c4a691d25e0f, type: 3} - m_Name: - m_EditorClassIdentifier: - defaultMaterials: - - {fileID: 2100000, guid: 72beba80472642299b6651a33cc160df, type: 2} ---- !u!23 &623737357 stripped -MeshRenderer: - m_CorrespondingSourceObject: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - m_PrefabInstance: {fileID: 623737352} - m_PrefabAsset: {fileID: 0} ---- !u!1001 &640662407 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 1162469815} - m_Modifications: - - target: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + - target: {fileID: 7781529056550460866, guid: c07c4bd04b45c014fad0e3cd30747f06, type: 3} propertyPath: m_Name - value: ShaderBallInner - objectReference: {fileID: 0} - - target: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_StaticEditorFlags - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalScale.x - value: 0.99000084 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalScale.y - value: 0.9900005 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalScale.z - value: 0.9900005 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_CastShadows - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_MotionVectors - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_ReceiveShadows - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LightProbeUsage - value: 0 + value: SimpleProfiler objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_ReflectionProbeUsage + - target: {fileID: 7781529056550460866, guid: c07c4bd04b45c014fad0e3cd30747f06, type: 3} + propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: ced12abb765d5e247bd3311bd2fb5d98, type: 2} m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} ---- !u!4 &640662408 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - m_PrefabInstance: {fileID: 640662407} - m_PrefabAsset: {fileID: 0} ---- !u!1 &640662409 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - m_PrefabInstance: {fileID: 640662407} - m_PrefabAsset: {fileID: 0} ---- !u!64 &640662410 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 640662409} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 4 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: 4300002, guid: 1104611d051d4e42a68391888b61b32e, type: 3} ---- !u!1 &641881979 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 641881980} - m_Layer: 0 - m_Name: ShaderBall (3) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &641881980 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 641881979} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -2.4, y: 0.3, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1434900813} - - {fileID: 1038663547} - m_Father: {fileID: 1595900778} - m_RootOrder: 4 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!21 &681442045 + m_SourcePrefab: {fileID: 100100000, guid: c07c4bd04b45c014fad0e3cd30747f06, type: 3} +--- !u!21 &505670119 Material: serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: ShaderBallClippingPlaneInner (Instance) + m_Name: ShaderBallClippingSphere (Instance) m_Shader: {fileID: 4800000, guid: c331f6c43a2ef0945864cb668f2653c9, type: 3} m_ValidKeywords: - - _CLIPPING_PLANE + - _BORDER_LIGHT_USES_HOVER_COLOR + - _CLIPPING_SPHERE - _DIRECTIONAL_LIGHT - _DISABLE_ALBEDO_MAP - - _EMISSION - _HOVER_LIGHT - _REFLECTIONS - _SPECULAR_HIGHLIGHTS - _USE_WORLD_SCALE - m_InvalidKeywords: - - _CLIPPING_PLANE_BORDER + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 @@ -5181,22 +3182,24 @@ Material: - _BorderLightOpaque: 0 - _BorderLightOpaqueAlpha: 1 - _BorderLightReplacesAlbedo: 0 - - _BorderLightUsesHoverColor: 0 + - _BorderLightUsesHoverColor: 1 - _BorderMinValue: 0.02 - _BorderWidth: 0.1 - _BorderWidthHorizontal: 0.1 - _BorderWidthVertical: 0.1 - _BumpScale: 1 + - _ClipBoxSide: 1 + - _ClipPlaneSide: 1 + - _ClipSphereSide: 1 - _ClippingBorder: 0 - _ClippingBorderWidth: 0.025 - _ClippingBox: 0 - - _ClippingPlane: 1 - - _ClippingPlaneBorder: 1 - - _ClippingPlaneBorderWidth: 0.02 - - _ClippingSphere: 0 + - _ClippingPlane: 0 + - _ClippingPlaneBorder: 0 + - _ClippingPlaneBorderWidth: 0.025 + - _ClippingSphere: 1 - _ColorWriteMask: 15 - - _Cull: 2 - - _CullMode: 1 + - _CullMode: 2 - _CustomMode: 0 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 @@ -5206,7 +3209,7 @@ Material: - _EdgeSmoothingMode: 0 - _EdgeSmoothingValue: 0.002 - _EnableChannelMap: 0 - - _EnableEmission: 1 + - _EnableEmission: 0 - _EnableHoverColorOpaqueOverride: 0 - _EnableHoverColorOverride: 0 - _EnableLightMap: 0 @@ -5240,10 +3243,9 @@ Material: - _IridescenceAngle: -0.78 - _IridescenceIntensity: 0.5 - _IridescenceThreshold: 0.05 - - _Metallic: 0.036 + - _Metallic: 0 - _MipmapBias: -2 - _Mode: 0 - - _MyCullVariable: 1 - _NPR: 0 - _NearLightFade: 0 - _NearPlaneFade: 0 @@ -5260,11 +3262,10 @@ Material: - _RimLight: 0 - _RimPower: 3 - _RoundCornerMargin: 0 - - _RoundCornerPower: 0.4 - _RoundCornerRadius: 0.25 - _RoundCorners: 0 - _RoundCornersHideInterior: 0 - - _Smoothness: 0.5 + - _Smoothness: 1 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SphericalHarmonics: 0 @@ -5291,12 +3292,14 @@ Material: m_Colors: - _BlurBackgroundRect: {r: 0, g: 0, b: 1, a: 1} - _BorderColor: {r: 1, g: 1, b: 1, a: 0} + - _ClipBoxSize: {r: 1, g: 1, b: 1, a: 0} - _ClipPlane: {r: 0, g: 1, b: 0, a: 0} + - _ClipSphere: {r: 0, g: 0, b: 0, a: 0.5} - _ClippingBorderColor: {r: 1, g: 0.2, b: 0, a: 1} - _ClippingPlaneBorderColor: {r: 1, g: 0.2, b: 0, a: 1} - - _Color: {r: 1, g: 0.6827586, b: 0, a: 1} + - _Color: {r: 0, g: 0.5862069, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _EmissiveColor: {r: 0.9411765, g: 0, b: 0, a: 1} + - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1} - _EnvironmentColorX: {r: 1, g: 0, b: 0, a: 1} - _EnvironmentColorY: {r: 0, g: 1, b: 0, a: 1} - _EnvironmentColorZ: {r: 0, g: 0, b: 1, a: 1} @@ -5307,7 +3310,6 @@ Material: - _GradientColor2: {r: 0, g: 0.32999998, b: 0.88, a: 0.5} - _GradientColor3: {r: 0, g: 0.32999998, b: 0.88, a: 1} - _GradientColor4: {r: 1, g: 1, b: 1, a: 1} - - _HoverColor: {r: 1, g: 0, b: 0, a: 1} - _HoverColorOpaqueOverride: {r: 1, g: 1, b: 1, a: 1} - _HoverColorOverride: {r: 1, g: 1, b: 1, a: 1} - _InnerGlowColor: {r: 1, g: 1, b: 1, a: 0.75} @@ -5317,143 +3319,7 @@ Material: - _RimColor: {r: 1, g: 1, b: 1, a: 1} - _RoundCornersRadius: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} m_BuildTextureStacks: [] ---- !u!1001 &687910007 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 866223477} - m_Modifications: - - target: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_Name - value: ShaderBall - objectReference: {fileID: 0} - - target: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_StaticEditorFlags - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalScale.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalScale.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalScale.z - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_CastShadows - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_MotionVectors - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_ReceiveShadows - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LightProbeUsage - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_ReflectionProbeUsage - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 512803740} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} ---- !u!4 &687910008 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - m_PrefabInstance: {fileID: 687910007} - m_PrefabAsset: {fileID: 0} ---- !u!1 &687910009 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - m_PrefabInstance: {fileID: 687910007} - m_PrefabAsset: {fileID: 0} ---- !u!64 &687910010 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 687910009} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 4 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: 4300002, guid: 1104611d051d4e42a68391888b61b32e, type: 3} ---- !u!23 &687910011 stripped -MeshRenderer: - m_CorrespondingSourceObject: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - m_PrefabInstance: {fileID: 687910007} - m_PrefabAsset: {fileID: 0} ---- !u!114 &687910013 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 687910009} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c53e2b0613597e849870c4a691d25e0f, type: 3} - m_Name: - m_EditorClassIdentifier: - defaultMaterials: - - {fileID: 2100000, guid: 72beba80472642299b6651a33cc160df, type: 2} ---- !u!21 &688359758 +--- !u!21 &506370196 Material: serializedVersion: 8 m_ObjectHideFlags: 0 @@ -5690,352 +3556,32 @@ Material: - _RimColor: {r: 1, g: 1, b: 1, a: 1} - _RoundCornersRadius: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} m_BuildTextureStacks: [] ---- !u!1001 &696814941 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 162241854} - m_Modifications: - - target: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_Name - value: ShaderBall (1) - objectReference: {fileID: 0} - - target: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_StaticEditorFlags - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalScale.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalScale.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalScale.z - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalPosition.x - value: -0.8 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalPosition.y - value: 0.1 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_CastShadows - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_MotionVectors - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_ReceiveShadows - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LightProbeUsage - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_ReflectionProbeUsage - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 1157956411} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} ---- !u!4 &696814942 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - m_PrefabInstance: {fileID: 696814941} - m_PrefabAsset: {fileID: 0} ---- !u!1 &696814943 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - m_PrefabInstance: {fileID: 696814941} - m_PrefabAsset: {fileID: 0} ---- !u!64 &696814944 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 696814943} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 4 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: 4300002, guid: 1104611d051d4e42a68391888b61b32e, type: 3} ---- !u!23 &696814945 stripped -MeshRenderer: - m_CorrespondingSourceObject: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - m_PrefabInstance: {fileID: 696814941} - m_PrefabAsset: {fileID: 0} ---- !u!114 &696814947 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 696814943} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c53e2b0613597e849870c4a691d25e0f, type: 3} - m_Name: - m_EditorClassIdentifier: - defaultMaterials: - - {fileID: 2100000, guid: 93312c326d8c3c54bb251f588b42cda7, type: 2} ---- !u!1 &723260585 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 723260586} - m_Layer: 0 - m_Name: ClippingSphere - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &723260586 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 723260585} - m_LocalRotation: {x: 0, y: 0.7071068, z: 0.7071068, w: 0} - m_LocalPosition: {x: 0.401, y: 0, z: -1.528} - m_LocalScale: {x: 0.21048994, y: 0.21048994, z: 0.21048994} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 2106529387} - - {fileID: 119951084} - - {fileID: 37496078} - - {fileID: 955809413} - - {fileID: 842427686} - - {fileID: 1274666198} - - {fileID: 1659572901} - - {fileID: 1162469815} - - {fileID: 1233524242} - - {fileID: 120963526} - m_Father: {fileID: 1250785856} - m_RootOrder: 6 - m_LocalEulerAnglesHint: {x: -90, y: 180, z: 0} ---- !u!1001 &745713249 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 2021874965} - m_Modifications: - - target: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_Name - value: ShaderBallInner - objectReference: {fileID: 0} - - target: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_StaticEditorFlags - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalScale.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalScale.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalScale.z - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_CastShadows - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_MotionVectors - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_ReceiveShadows - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LightProbeUsage - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_Materials.Array.size - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_ReflectionProbeUsage - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: 11043ba092e44ae496f1361e7c0d8b0b, type: 2} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} ---- !u!4 &745713250 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - m_PrefabInstance: {fileID: 745713249} - m_PrefabAsset: {fileID: 0} ---- !u!1 &745713251 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - m_PrefabInstance: {fileID: 745713249} - m_PrefabAsset: {fileID: 0} ---- !u!64 &745713252 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 745713251} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 4 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: 4300002, guid: 1104611d051d4e42a68391888b61b32e, type: 3} ---- !u!23 &745713254 stripped -MeshRenderer: - m_CorrespondingSourceObject: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - m_PrefabInstance: {fileID: 745713249} - m_PrefabAsset: {fileID: 0} ---- !u!114 &745713256 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 745713251} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c53e2b0613597e849870c4a691d25e0f, type: 3} - m_Name: - m_EditorClassIdentifier: - defaultMaterials: - - {fileID: 2100000, guid: 11043ba092e44ae496f1361e7c0d8b0b, type: 2} ---- !u!21 &759015636 -Material: - serializedVersion: 8 +--- !u!21 &512803740 +Material: + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: ShaderBallClippingPlane (Instance) - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_ValidKeywords: [] - m_InvalidKeywords: + m_Shader: {fileID: 4800000, guid: c331f6c43a2ef0945864cb668f2653c9, type: 3} + m_ValidKeywords: - _CLIPPING_BORDER - _CLIPPING_PLANE - - _CLIPPING_PLANE_BORDER - _DIRECTIONAL_LIGHT - _DISABLE_ALBEDO_MAP - _HOVER_LIGHT - _REFLECTIONS - _SPECULAR_HIGHLIGHTS - _USE_WORLD_SCALE + m_InvalidKeywords: + - _CLIPPING_PLANE_BORDER m_LightmapFlags: 4 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} + m_CustomRenderQueue: 2000 + stringTagMap: + RenderType: Opaque disabledShaderPasses: [] m_SavedProperties: serializedVersion: 3 @@ -6239,162 +3785,25 @@ Material: - _RimColor: {r: 1, g: 1, b: 1, a: 1} - _RoundCornersRadius: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} m_BuildTextureStacks: [] ---- !u!1001 &781216071 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 1872109879} - m_Modifications: - - target: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_Name - value: ShaderBallInner - objectReference: {fileID: 0} - - target: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_StaticEditorFlags - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalScale.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalScale.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalScale.z - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_CastShadows - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_MotionVectors - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_ReceiveShadows - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LightProbeUsage - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_ReflectionProbeUsage - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2010519469} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} ---- !u!4 &781216072 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - m_PrefabInstance: {fileID: 781216071} - m_PrefabAsset: {fileID: 0} ---- !u!1 &781216073 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - m_PrefabInstance: {fileID: 781216071} - m_PrefabAsset: {fileID: 0} ---- !u!64 &781216074 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 781216073} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 4 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: 4300002, guid: 1104611d051d4e42a68391888b61b32e, type: 3} ---- !u!23 &781216075 stripped -MeshRenderer: - m_CorrespondingSourceObject: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - m_PrefabInstance: {fileID: 781216071} - m_PrefabAsset: {fileID: 0} ---- !u!114 &781216077 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 781216073} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c53e2b0613597e849870c4a691d25e0f, type: 3} - m_Name: - m_EditorClassIdentifier: - defaultMaterials: - - {fileID: 2100000, guid: 11043ba092e44ae496f1361e7c0d8b0b, type: 2} ---- !u!21 &794962756 -Material: - serializedVersion: 8 +--- !u!21 &523011714 +Material: + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: ShaderBallClippingPlane (Instance) + m_Name: ShaderBallClippingSphere (Instance) m_Shader: {fileID: 4800000, guid: c331f6c43a2ef0945864cb668f2653c9, type: 3} m_ValidKeywords: - - _CLIPPING_BORDER - - _CLIPPING_PLANE + - _BORDER_LIGHT_USES_HOVER_COLOR + - _CLIPPING_SPHERE - _DIRECTIONAL_LIGHT - _DISABLE_ALBEDO_MAP - _HOVER_LIGHT - _REFLECTIONS - _SPECULAR_HIGHLIGHTS - _USE_WORLD_SCALE - m_InvalidKeywords: - - _CLIPPING_PLANE_BORDER + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 @@ -6442,7 +3851,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 32c57306df745a147a2e02f8827a8cdc, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: @@ -6476,21 +3885,23 @@ Material: - _BorderLightOpaque: 0 - _BorderLightOpaqueAlpha: 1 - _BorderLightReplacesAlbedo: 0 - - _BorderLightUsesHoverColor: 0 + - _BorderLightUsesHoverColor: 1 - _BorderMinValue: 0.02 - _BorderWidth: 0.1 - _BorderWidthHorizontal: 0.1 - _BorderWidthVertical: 0.1 - _BumpScale: 1 - - _ClippingBorder: 1 + - _ClipBoxSide: 1 + - _ClipPlaneSide: 1 + - _ClipSphereSide: 1 + - _ClippingBorder: 0 - _ClippingBorderWidth: 0.025 - _ClippingBox: 0 - - _ClippingPlane: 1 - - _ClippingPlaneBorder: 1 - - _ClippingPlaneBorderWidth: 0.02 - - _ClippingSphere: 0 + - _ClippingPlane: 0 + - _ClippingPlaneBorder: 0 + - _ClippingPlaneBorderWidth: 0.025 + - _ClippingSphere: 1 - _ColorWriteMask: 15 - - _Cull: 2 - _CullMode: 2 - _CustomMode: 0 - _Cutoff: 0.5 @@ -6538,7 +3949,6 @@ Material: - _Metallic: 0 - _MipmapBias: -2 - _Mode: 0 - - _MyCullVariable: 1 - _NPR: 0 - _NearLightFade: 0 - _NearPlaneFade: 0 @@ -6555,11 +3965,10 @@ Material: - _RimLight: 0 - _RimPower: 3 - _RoundCornerMargin: 0 - - _RoundCornerPower: 0.4 - _RoundCornerRadius: 0.25 - _RoundCorners: 0 - _RoundCornersHideInterior: 0 - - _Smoothness: 0.5 + - _Smoothness: 1 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SphericalHarmonics: 0 @@ -6586,10 +3995,12 @@ Material: m_Colors: - _BlurBackgroundRect: {r: 0, g: 0, b: 1, a: 1} - _BorderColor: {r: 1, g: 1, b: 1, a: 0} + - _ClipBoxSize: {r: 1, g: 1, b: 1, a: 0} - _ClipPlane: {r: 0, g: 1, b: 0, a: 0} + - _ClipSphere: {r: 0, g: 0, b: 0, a: 0.5} - _ClippingBorderColor: {r: 1, g: 0.2, b: 0, a: 1} - _ClippingPlaneBorderColor: {r: 1, g: 0.2, b: 0, a: 1} - - _Color: {r: 0.5754717, g: 0.4325086, b: 0.4325086, a: 1} + - _Color: {r: 0, g: 0.5862069, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1} - _EnvironmentColorX: {r: 1, g: 0, b: 0, a: 1} @@ -6602,7 +4013,6 @@ Material: - _GradientColor2: {r: 0, g: 0.32999998, b: 0.88, a: 0.5} - _GradientColor3: {r: 0, g: 0.32999998, b: 0.88, a: 1} - _GradientColor4: {r: 1, g: 1, b: 1, a: 1} - - _HoverColor: {r: 1, g: 0, b: 0, a: 1} - _HoverColorOpaqueOverride: {r: 1, g: 1, b: 1, a: 1} - _HoverColorOverride: {r: 1, g: 1, b: 1, a: 1} - _InnerGlowColor: {r: 1, g: 1, b: 1, a: 0.75} @@ -6612,26 +4022,54 @@ Material: - _RimColor: {r: 1, g: 1, b: 1, a: 1} - _RoundCornersRadius: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} m_BuildTextureStacks: [] ---- !u!21 &807459210 +--- !u!1001 &530525190 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 3493013819197874656, guid: ad5b753b73e311143a85055b15cea562, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3493013819197874656, guid: ad5b753b73e311143a85055b15cea562, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3493013819197874656, guid: ad5b753b73e311143a85055b15cea562, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3493013819197874656, guid: ad5b753b73e311143a85055b15cea562, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7585035320575375756, guid: ad5b753b73e311143a85055b15cea562, type: 3} + propertyPath: m_Name + value: MRTKInputSimulator + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: ad5b753b73e311143a85055b15cea562, type: 3} +--- !u!21 &532887143 Material: serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: ShaderBallClippingPlaneInner (Instance) + m_Name: ShaderBallClippingSphere (Instance) m_Shader: {fileID: 4800000, guid: c331f6c43a2ef0945864cb668f2653c9, type: 3} m_ValidKeywords: - - _CLIPPING_PLANE + - _BORDER_LIGHT_USES_HOVER_COLOR + - _CLIPPING_SPHERE - _DIRECTIONAL_LIGHT - _DISABLE_ALBEDO_MAP - - _EMISSION - _HOVER_LIGHT - _REFLECTIONS - _SPECULAR_HIGHLIGHTS - _USE_WORLD_SCALE - m_InvalidKeywords: - - _CLIPPING_PLANE_BORDER + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 @@ -6713,22 +4151,24 @@ Material: - _BorderLightOpaque: 0 - _BorderLightOpaqueAlpha: 1 - _BorderLightReplacesAlbedo: 0 - - _BorderLightUsesHoverColor: 0 + - _BorderLightUsesHoverColor: 1 - _BorderMinValue: 0.02 - _BorderWidth: 0.1 - _BorderWidthHorizontal: 0.1 - _BorderWidthVertical: 0.1 - _BumpScale: 1 + - _ClipBoxSide: 1 + - _ClipPlaneSide: 1 + - _ClipSphereSide: 1 - _ClippingBorder: 0 - _ClippingBorderWidth: 0.025 - _ClippingBox: 0 - - _ClippingPlane: 1 - - _ClippingPlaneBorder: 1 - - _ClippingPlaneBorderWidth: 0.02 - - _ClippingSphere: 0 + - _ClippingPlane: 0 + - _ClippingPlaneBorder: 0 + - _ClippingPlaneBorderWidth: 0.025 + - _ClippingSphere: 1 - _ColorWriteMask: 15 - - _Cull: 2 - - _CullMode: 1 + - _CullMode: 2 - _CustomMode: 0 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 @@ -6738,7 +4178,7 @@ Material: - _EdgeSmoothingMode: 0 - _EdgeSmoothingValue: 0.002 - _EnableChannelMap: 0 - - _EnableEmission: 1 + - _EnableEmission: 0 - _EnableHoverColorOpaqueOverride: 0 - _EnableHoverColorOverride: 0 - _EnableLightMap: 0 @@ -6772,10 +4212,9 @@ Material: - _IridescenceAngle: -0.78 - _IridescenceIntensity: 0.5 - _IridescenceThreshold: 0.05 - - _Metallic: 0.036 + - _Metallic: 0 - _MipmapBias: -2 - _Mode: 0 - - _MyCullVariable: 1 - _NPR: 0 - _NearLightFade: 0 - _NearPlaneFade: 0 @@ -6792,11 +4231,10 @@ Material: - _RimLight: 0 - _RimPower: 3 - _RoundCornerMargin: 0 - - _RoundCornerPower: 0.4 - _RoundCornerRadius: 0.25 - _RoundCorners: 0 - _RoundCornersHideInterior: 0 - - _Smoothness: 0.5 + - _Smoothness: 1 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SphericalHarmonics: 0 @@ -6823,12 +4261,14 @@ Material: m_Colors: - _BlurBackgroundRect: {r: 0, g: 0, b: 1, a: 1} - _BorderColor: {r: 1, g: 1, b: 1, a: 0} + - _ClipBoxSize: {r: 1, g: 1, b: 1, a: 0} - _ClipPlane: {r: 0, g: 1, b: 0, a: 0} + - _ClipSphere: {r: 0, g: 0, b: 0, a: 0.5} - _ClippingBorderColor: {r: 1, g: 0.2, b: 0, a: 1} - _ClippingPlaneBorderColor: {r: 1, g: 0.2, b: 0, a: 1} - - _Color: {r: 1, g: 0.6827586, b: 0, a: 1} + - _Color: {r: 0, g: 0.5862069, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _EmissiveColor: {r: 0.9411765, g: 0, b: 0, a: 1} + - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1} - _EnvironmentColorX: {r: 1, g: 0, b: 0, a: 1} - _EnvironmentColorY: {r: 0, g: 1, b: 0, a: 1} - _EnvironmentColorZ: {r: 0, g: 0, b: 1, a: 1} @@ -6839,7 +4279,6 @@ Material: - _GradientColor2: {r: 0, g: 0.32999998, b: 0.88, a: 0.5} - _GradientColor3: {r: 0, g: 0.32999998, b: 0.88, a: 1} - _GradientColor4: {r: 1, g: 1, b: 1, a: 1} - - _HoverColor: {r: 1, g: 0, b: 0, a: 1} - _HoverColorOpaqueOverride: {r: 1, g: 1, b: 1, a: 1} - _HoverColorOverride: {r: 1, g: 1, b: 1, a: 1} - _InnerGlowColor: {r: 1, g: 1, b: 1, a: 0.75} @@ -6849,55 +4288,24 @@ Material: - _RimColor: {r: 1, g: 1, b: 1, a: 1} - _RoundCornersRadius: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} m_BuildTextureStacks: [] ---- !u!1 &842427685 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 842427686} - m_Layer: 0 - m_Name: ShaderBall (3) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &842427686 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 842427685} - m_LocalRotation: {x: -0, y: 0.00000008940696, z: -0.816581, w: 0.57723093} - m_LocalPosition: {x: -0.99000114, y: 0.05000007, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1112684251} - - {fileID: 1687595650} - m_Father: {fileID: 723260586} - m_RootOrder: 4 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: -50.912003} ---- !u!21 &855647985 +--- !u!21 &534459030 Material: serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: ShaderBallClippingSphere (Instance) + m_Name: ShaderBallClippingBox (Instance) m_Shader: {fileID: 4800000, guid: c331f6c43a2ef0945864cb668f2653c9, type: 3} m_ValidKeywords: - _BORDER_LIGHT_USES_HOVER_COLOR - - _CLIPPING_SPHERE + - _CLIPPING_BOX - _DIRECTIONAL_LIGHT - _DISABLE_ALBEDO_MAP + - _HOVER_COLOR_OVERRIDE - _HOVER_LIGHT - _REFLECTIONS + - _RIM_LIGHT - _SPECULAR_HIGHLIGHTS - _USE_WORLD_SCALE m_InvalidKeywords: [] @@ -6935,6 +4343,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _EmissiveMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _IridescentSpectrumMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -6989,24 +4401,25 @@ Material: - _ClipSphereSide: 1 - _ClippingBorder: 0 - _ClippingBorderWidth: 0.025 - - _ClippingBox: 0 + - _ClippingBox: 1 - _ClippingPlane: 0 - _ClippingPlaneBorder: 0 - _ClippingPlaneBorderWidth: 0.025 - - _ClippingSphere: 1 + - _ClippingSphere: 0 - _ColorWriteMask: 15 - - _CullMode: 2 + - _CullMode: 0 - _CustomMode: 0 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DirectionalLight: 1 - _DstBlend: 0 + - _DstBlendAlpha: 1 - _EdgeSmoothingMode: 0 - _EdgeSmoothingValue: 0.002 - _EnableChannelMap: 0 - _EnableEmission: 0 - _EnableHoverColorOpaqueOverride: 0 - - _EnableHoverColorOverride: 0 + - _EnableHoverColorOverride: 1 - _EnableLightMap: 0 - _EnableLocalSpaceTriplanarMapping: 0 - _EnableNormalMap: 0 @@ -7041,6 +4454,7 @@ Material: - _Metallic: 0 - _MipmapBias: -2 - _Mode: 0 + - _NPR: 0 - _NearLightFade: 0 - _NearPlaneFade: 0 - _NormalMapScale: 1 @@ -7053,7 +4467,7 @@ Material: - _Refraction: 0 - _RefractiveIndex: 1.1 - _RenderQueueOverride: -1 - - _RimLight: 0 + - _RimLight: 1 - _RimPower: 3 - _RoundCornerMargin: 0 - _RoundCornerRadius: 0.25 @@ -7064,6 +4478,7 @@ Material: - _SpecularHighlights: 1 - _SphericalHarmonics: 0 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Stencil: 0 - _StencilComparison: 0 - _StencilOperation: 0 @@ -7075,6 +4490,7 @@ Material: - _UseWorldScale: 1 - _VertexColors: 0 - _VertexExtrusion: 0 + - _VertexExtrusionConstantWidth: 0 - _VertexExtrusionSmoothNormals: 0 - _VertexExtrusionValue: 0 - _ZOffsetFactor: 0 @@ -7089,7 +4505,7 @@ Material: - _ClipSphere: {r: 0, g: 0, b: 0, a: 0.5} - _ClippingBorderColor: {r: 1, g: 0.2, b: 0, a: 1} - _ClippingPlaneBorderColor: {r: 1, g: 0.2, b: 0, a: 1} - - _Color: {r: 0, g: 0.5862069, b: 1, a: 1} + - _Color: {r: 0.72794116, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1} - _EnvironmentColorX: {r: 1, g: 0, b: 0, a: 1} @@ -7103,242 +4519,15 @@ Material: - _GradientColor3: {r: 0, g: 0.32999998, b: 0.88, a: 1} - _GradientColor4: {r: 1, g: 1, b: 1, a: 1} - _HoverColorOpaqueOverride: {r: 1, g: 1, b: 1, a: 1} - - _HoverColorOverride: {r: 1, g: 1, b: 1, a: 1} + - _HoverColorOverride: {r: 0, g: 0.007843138, b: 1, a: 1} - _InnerGlowColor: {r: 1, g: 1, b: 1, a: 0.75} - _ProximityLightCenterColorOverride: {r: 1, g: 0, b: 0, a: 0} - _ProximityLightMiddleColorOverride: {r: 0, g: 1, b: 0, a: 0.5} - _ProximityLightOuterColorOverride: {r: 0, g: 0, b: 1, a: 1} - - _RimColor: {r: 1, g: 1, b: 1, a: 1} + - _RimColor: {r: 0, g: 0.006896496, b: 1, a: 1} - _RoundCornersRadius: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} m_BuildTextureStacks: [] ---- !u!1 &866223476 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 866223477} - m_Layer: 0 - m_Name: ShaderBall (8) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!4 &866223477 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 866223476} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -6.4, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 687910008} - - {fileID: 2078929849} - m_Father: {fileID: 1595900778} - m_RootOrder: 9 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &878230435 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 5264854134403395402, guid: 53b4fadc7abe80d4f9549b89f80300d0, type: 3} - m_PrefabInstance: {fileID: 5264854134733198569} - m_PrefabAsset: {fileID: 0} ---- !u!1 &916092929 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 916092930} - m_Layer: 0 - m_Name: GameObject - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &916092930 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 916092929} - m_LocalRotation: {x: 0, y: -0.7071068, z: 0, w: 0.7071068} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1790579014} - m_Father: {fileID: 162241854} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0} ---- !u!1001 &919228574 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 1667384560894720772, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} - propertyPath: isToggled.onExited.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 1667384560894720772, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} - propertyPath: isToggled.onExited.m_PersistentCalls.m_Calls.Array.data[1].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 1667384560894720772, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} - propertyPath: isToggled.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 1667384560894720772, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} - propertyPath: isToggled.onEntered.m_PersistentCalls.m_Calls.Array.data[1].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 1667384561245672091, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} - propertyPath: isToggled.onExited.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 1667384561245672091, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} - propertyPath: isToggled.onExited.m_PersistentCalls.m_Calls.Array.data[1].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 1667384561245672091, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} - propertyPath: isToggled.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 1667384561245672091, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} - propertyPath: isToggled.onEntered.m_PersistentCalls.m_Calls.Array.data[1].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 1667384562270007169, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} - propertyPath: isToggled.onExited.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 1667384562270007169, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} - propertyPath: isToggled.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 2082148069247382453, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} - propertyPath: Spatialize - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2082148069247382453, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} - propertyPath: OutputAudioMixerGroup - value: - objectReference: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} - - target: {fileID: 2082148069247382453, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} - propertyPath: panLevelCustomCurve.m_Curve.Array.data[0].value - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3045578032311879198, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} - propertyPath: Spatialize - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3045578032311879198, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} - propertyPath: OutputAudioMixerGroup - value: - objectReference: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} - - target: {fileID: 3045578032311879198, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} - propertyPath: panLevelCustomCurve.m_Curve.Array.data[0].value - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6134130586559970896, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} - propertyPath: Spatialize - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6134130586559970896, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} - propertyPath: OutputAudioMixerGroup - value: - objectReference: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} - - target: {fileID: 6134130586559970896, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} - propertyPath: panLevelCustomCurve.m_Curve.Array.data[0].value - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7326570055845349072, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} - propertyPath: Spatialize - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7326570055845349072, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} - propertyPath: OutputAudioMixerGroup - value: - objectReference: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} - - target: {fileID: 7326570055845349072, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} - propertyPath: panLevelCustomCurve.m_Curve.Array.data[0].value - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7372669237086358564, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} - propertyPath: m_Name - value: HandMenu - objectReference: {fileID: 0} - - target: {fileID: 7372669237086358568, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} - propertyPath: m_RootOrder - value: 4 - objectReference: {fileID: 0} - - target: {fileID: 7372669237086358568, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7372669237086358568, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7372669237086358568, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7372669237086358568, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7372669237086358568, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7372669237086358568, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7372669237086358568, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7372669237086358568, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7372669237086358568, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7372669237086358568, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7618871619398064040, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} - propertyPath: Spatialize - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7618871619398064040, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} - propertyPath: OutputAudioMixerGroup - value: - objectReference: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} - - target: {fileID: 7618871619398064040, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} - propertyPath: panLevelCustomCurve.m_Curve.Array.data[0].value - value: 1 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} ---- !u!21 &929042400 +--- !u!21 &542103952 Material: serializedVersion: 8 m_ObjectHideFlags: 0 @@ -7391,10 +4580,6 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - - _EmissiveMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - _IridescentSpectrumMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -7461,7 +4646,6 @@ Material: - _DetailNormalMapScale: 1 - _DirectionalLight: 1 - _DstBlend: 0 - - _DstBlendAlpha: 1 - _EdgeSmoothingMode: 0 - _EdgeSmoothingValue: 0.002 - _EnableChannelMap: 0 @@ -7502,7 +4686,6 @@ Material: - _Metallic: 0 - _MipmapBias: -2 - _Mode: 0 - - _NPR: 0 - _NearLightFade: 0 - _NearPlaneFade: 0 - _NormalMapScale: 1 @@ -7526,7 +4709,6 @@ Material: - _SpecularHighlights: 1 - _SphericalHarmonics: 0 - _SrcBlend: 1 - - _SrcBlendAlpha: 1 - _Stencil: 0 - _StencilComparison: 0 - _StencilOperation: 0 @@ -7538,7 +4720,6 @@ Material: - _UseWorldScale: 1 - _VertexColors: 0 - _VertexExtrusion: 0 - - _VertexExtrusionConstantWidth: 0 - _VertexExtrusionSmoothNormals: 0 - _VertexExtrusionValue: 0 - _ZOffsetFactor: 0 @@ -7575,245 +4756,14 @@ Material: - _RimColor: {r: 1, g: 1, b: 1, a: 1} - _RoundCornersRadius: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} m_BuildTextureStacks: [] ---- !u!21 &929061953 +--- !u!21 &586314725 Material: serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: ShaderBallClippingBox (Instance) - m_Shader: {fileID: 4800000, guid: c331f6c43a2ef0945864cb668f2653c9, type: 3} - m_ValidKeywords: - - _BORDER_LIGHT_USES_HOVER_COLOR - - _CLIPPING_BOX - - _DIRECTIONAL_LIGHT - - _DISABLE_ALBEDO_MAP - - _HOVER_COLOR_OVERRIDE - - _HOVER_LIGHT - - _REFLECTIONS - - _RIM_LIGHT - - _SPECULAR_HIGHLIGHTS - - _USE_WORLD_SCALE - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 1 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2000 - stringTagMap: - RenderType: Opaque - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ChannelMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _IridescentSpectrumMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _LightMapTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 2800000, guid: 32c57306df745a147a2e02f8827a8cdc, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _NormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _AlbedoAlphaMode: 0 - - _AlbedoAlphaSmoothness: 0 - - _AlbedoAssignedAtRuntime: 0 - - _BlendOp: 0 - - _BlendedClippingWidth: 1 - - _BlurBorderIntensity: 0 - - _BlurMode: 0 - - _BlurTextureIntensity: 1 - - _BorderColorMode: 0 - - _BorderLight: 0 - - _BorderLightOpaque: 0 - - _BorderLightOpaqueAlpha: 1 - - _BorderLightReplacesAlbedo: 0 - - _BorderLightUsesHoverColor: 1 - - _BorderMinValue: 0.02 - - _BorderWidth: 0.1 - - _BorderWidthHorizontal: 0.1 - - _BorderWidthVertical: 0.1 - - _BumpScale: 1 - - _ClipBoxSide: 1 - - _ClipPlaneSide: 1 - - _ClipSphereSide: 1 - - _ClippingBorder: 0 - - _ClippingBorderWidth: 0.025 - - _ClippingBox: 1 - - _ClippingPlane: 0 - - _ClippingPlaneBorder: 0 - - _ClippingPlaneBorderWidth: 0.025 - - _ClippingSphere: 0 - - _ColorWriteMask: 15 - - _CullMode: 0 - - _CustomMode: 0 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DirectionalLight: 1 - - _DstBlend: 0 - - _EdgeSmoothingMode: 0 - - _EdgeSmoothingValue: 0.002 - - _EnableChannelMap: 0 - - _EnableEmission: 0 - - _EnableHoverColorOpaqueOverride: 0 - - _EnableHoverColorOverride: 1 - - _EnableLightMap: 0 - - _EnableLocalSpaceTriplanarMapping: 0 - - _EnableNormalMap: 0 - - _EnableProximityLightColorOverride: 0 - - _EnableSSAA: 0 - - _EnableStencil: 0 - - _EnableTriplanarMapping: 0 - - _EnvironmentColorIntensity: 0.5 - - _EnvironmentColorThreshold: 1.5 - - _EnvironmentColoring: 0 - - _Fade: 1 - - _FadeBeginDistance: 0.85 - - _FadeCompleteDistance: 0.5 - - _FadeMinValue: 0 - - _FluentLightIntensity: 1 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _GradientAngle: 180 - - _GradientMode: 0 - - _HoverLight: 1 - - _HoverLightOpaque: 0 - - _IgnoreZScale: 0 - - _IndependentCorners: 0 - - _InnerGlow: 0 - - _InnerGlowPower: 4 - - _InstancedColor: 0 - - _Iridescence: 0 - - _IridescenceAngle: -0.78 - - _IridescenceIntensity: 0.5 - - _IridescenceThreshold: 0.05 - - _Metallic: 0 - - _MipmapBias: -2 - - _Mode: 0 - - _NearLightFade: 0 - - _NearPlaneFade: 0 - - _NormalMapScale: 1 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _ProximityLight: 0 - - _ProximityLightSubtractive: 0 - - _ProximityLightTwoSided: 0 - - _Reflections: 1 - - _Refraction: 0 - - _RefractiveIndex: 1.1 - - _RenderQueueOverride: -1 - - _RimLight: 1 - - _RimPower: 3 - - _RoundCornerMargin: 0 - - _RoundCornerRadius: 0.25 - - _RoundCorners: 0 - - _RoundCornersHideInterior: 0 - - _Smoothness: 1 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SphericalHarmonics: 0 - - _SrcBlend: 1 - - _Stencil: 0 - - _StencilComparison: 0 - - _StencilOperation: 0 - - _StencilReadMask: 255 - - _StencilReference: 0 - - _StencilWriteMask: 255 - - _TriplanarMappingBlendSharpness: 4 - - _UVSec: 0 - - _UseWorldScale: 1 - - _VertexColors: 0 - - _VertexExtrusion: 0 - - _VertexExtrusionSmoothNormals: 0 - - _VertexExtrusionValue: 0 - - _ZOffsetFactor: 0 - - _ZOffsetUnits: 0 - - _ZTest: 4 - - _ZWrite: 1 - m_Colors: - - _BlurBackgroundRect: {r: 0, g: 0, b: 1, a: 1} - - _BorderColor: {r: 1, g: 1, b: 1, a: 0} - - _ClipBoxSize: {r: 1, g: 1, b: 1, a: 0} - - _ClipPlane: {r: 0, g: 1, b: 0, a: 0} - - _ClipSphere: {r: 0, g: 0, b: 0, a: 0.5} - - _ClippingBorderColor: {r: 1, g: 0.2, b: 0, a: 1} - - _ClippingPlaneBorderColor: {r: 1, g: 0.2, b: 0, a: 1} - - _Color: {r: 0.72794116, g: 0, b: 0, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1} - - _EnvironmentColorX: {r: 1, g: 0, b: 0, a: 1} - - _EnvironmentColorY: {r: 0, g: 1, b: 0, a: 1} - - _EnvironmentColorZ: {r: 0, g: 0, b: 1, a: 1} - - _GradientAlpha: {r: 1, g: 1, b: 1, a: 1} - - _GradientAlphaTime: {r: 0, g: 0, b: 0, a: 0} - - _GradientColor0: {r: 0.631373, g: 0.631373, b: 0.631373, a: 0} - - _GradientColor1: {r: 1, g: 0.690196, b: 0.976471, a: 0.25} - - _GradientColor2: {r: 0, g: 0.32999998, b: 0.88, a: 0.5} - - _GradientColor3: {r: 0, g: 0.32999998, b: 0.88, a: 1} - - _GradientColor4: {r: 1, g: 1, b: 1, a: 1} - - _HoverColorOpaqueOverride: {r: 1, g: 1, b: 1, a: 1} - - _HoverColorOverride: {r: 0, g: 0.007843138, b: 1, a: 1} - - _InnerGlowColor: {r: 1, g: 1, b: 1, a: 0.75} - - _ProximityLightCenterColorOverride: {r: 1, g: 0, b: 0, a: 0} - - _ProximityLightMiddleColorOverride: {r: 0, g: 1, b: 0, a: 0.5} - - _ProximityLightOuterColorOverride: {r: 0, g: 0, b: 1, a: 1} - - _RimColor: {r: 0, g: 0.006896496, b: 1, a: 1} - - _RoundCornersRadius: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} - m_BuildTextureStacks: [] ---- !u!21 &943765560 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: ShaderBallClippingPlaneInner (Instance) + m_Name: ShaderBallClippingPlaneInner (Instance) m_Shader: {fileID: 4800000, guid: c331f6c43a2ef0945864cb668f2653c9, type: 3} m_ValidKeywords: - _CLIPPING_PLANE @@ -7860,6 +4810,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _EmissiveMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _IridescentSpectrumMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -7924,6 +4878,7 @@ Material: - _DetailNormalMapScale: 1 - _DirectionalLight: 1 - _DstBlend: 0 + - _DstBlendAlpha: 1 - _EdgeSmoothingMode: 0 - _EdgeSmoothingValue: 0.002 - _EnableChannelMap: 0 @@ -7965,6 +4920,7 @@ Material: - _MipmapBias: -2 - _Mode: 0 - _MyCullVariable: 1 + - _NPR: 0 - _NearLightFade: 0 - _NearPlaneFade: 0 - _NormalMapScale: 1 @@ -7989,6 +4945,7 @@ Material: - _SpecularHighlights: 1 - _SphericalHarmonics: 0 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Stencil: 0 - _StencilComparison: 0 - _StencilOperation: 0 @@ -8000,6 +4957,7 @@ Material: - _UseWorldScale: 1 - _VertexColors: 0 - _VertexExtrusion: 0 + - _VertexExtrusionConstantWidth: 0 - _VertexExtrusionSmoothNormals: 0 - _VertexExtrusionValue: 0 - _ZOffsetFactor: 0 @@ -8035,581 +4993,570 @@ Material: - _RimColor: {r: 1, g: 1, b: 1, a: 1} - _RoundCornersRadius: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} m_BuildTextureStacks: [] ---- !u!1 &955809412 -GameObject: +--- !u!1001 &588131902 +PrefabInstance: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 955809413} - m_Layer: 0 - m_Name: ShaderBall (2) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &955809413 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 162241854} + m_Modifications: + - target: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_Name + value: ShaderBall (5) + objectReference: {fileID: 0} + - target: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_RootOrder + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalPosition.x + value: -4 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalPosition.y + value: 0.3 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_CastShadows + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_MotionVectors + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_ReceiveShadows + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LightProbeUsage + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_ReflectionProbeUsage + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 929061953} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} +--- !u!4 &588131903 stripped Transform: + m_CorrespondingSourceObject: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + m_PrefabInstance: {fileID: 588131902} + m_PrefabAsset: {fileID: 0} +--- !u!1 &588131904 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + m_PrefabInstance: {fileID: 588131902} + m_PrefabAsset: {fileID: 0} +--- !u!64 &588131905 +MeshCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 955809412} - m_LocalRotation: {x: -0, y: 0.000000074505806, z: -0.48919588, w: 0.87217396} - m_LocalPosition: {x: -0.98, y: -0.64, z: -0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1865679674} - - {fileID: 2090454749} - m_Father: {fileID: 723260586} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: -58.575005} ---- !u!1 &958324214 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 8323939510892415185, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} - m_PrefabInstance: {fileID: 1170466718} + m_GameObject: {fileID: 588131904} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 4300002, guid: 1104611d051d4e42a68391888b61b32e, type: 3} +--- !u!23 &588131906 stripped +MeshRenderer: + m_CorrespondingSourceObject: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + m_PrefabInstance: {fileID: 588131902} m_PrefabAsset: {fileID: 0} ---- !u!114 &958324215 +--- !u!114 &588131908 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 958324214} + m_GameObject: {fileID: 588131904} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d9ad66e7cc9a2754d8ea989740c9f00d, type: 3} + m_Script: {fileID: 11500000, guid: c53e2b0613597e849870c4a691d25e0f, type: 3} m_Name: m_EditorClassIdentifier: - m_InteractionManager: {fileID: 0} - m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_InteractionLayers: - m_Bits: 1 - 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: [] - m_LastHoverExited: - m_PersistentCalls: - m_Calls: [] - m_HoverEntered: - m_PersistentCalls: - m_Calls: [] - m_HoverExited: - m_PersistentCalls: - m_Calls: [] - m_FirstSelectEntered: - m_PersistentCalls: - m_Calls: [] - m_LastSelectExited: - m_PersistentCalls: - m_Calls: [] - m_SelectEntered: - m_PersistentCalls: - m_Calls: [] - m_SelectExited: - m_PersistentCalls: - m_Calls: [] - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectEntered: - m_PersistentCalls: - m_Calls: [] - m_OnSelectExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: - m_PersistentCalls: - m_Calls: [] - m_OnDeactivate: - m_PersistentCalls: - m_Calls: [] - isGazePinchSelected: - active: 0 - onEntered: - m_PersistentCalls: - m_Calls: [] - onExited: - m_PersistentCalls: - m_Calls: [] - isRaySelected: - active: 0 - onEntered: - m_PersistentCalls: - m_Calls: [] - onExited: - m_PersistentCalls: - m_Calls: [] - isPokeSelected: - active: 0 - onEntered: - m_PersistentCalls: - m_Calls: [] - onExited: - m_PersistentCalls: - m_Calls: [] - isGrabSelected: - active: 0 - onEntered: - m_PersistentCalls: - m_Calls: [] - onExited: - m_PersistentCalls: - m_Calls: [] - isGazeHovered: - active: 0 - onEntered: - m_PersistentCalls: - m_Calls: [] - onExited: - m_PersistentCalls: - m_Calls: [] - isGazePinchHovered: - active: 0 - onEntered: - m_PersistentCalls: - m_Calls: [] - onExited: - m_PersistentCalls: - m_Calls: [] - isRayHovered: - active: 0 - onEntered: - m_PersistentCalls: - m_Calls: [] - onExited: - m_PersistentCalls: - m_Calls: [] - isGrabHovered: - active: 0 - onEntered: - m_PersistentCalls: - m_Calls: [] - onExited: - m_PersistentCalls: - m_Calls: [] - isPokeHovered: - active: 0 - onEntered: - m_PersistentCalls: - m_Calls: [] - onExited: - m_PersistentCalls: - m_Calls: [] - isActiveHovered: - active: 0 - onEntered: - m_PersistentCalls: - m_Calls: [] - onExited: - m_PersistentCalls: - m_Calls: [] - disabledInteractorTypes: - - reference: MixedReality.Toolkit.IPokeInteractor, MixedReality.Toolkit.Core - k__BackingField: 0 - k__BackingField: 0.9 - k__BackingField: 0.1 - k__BackingField: 1 - k__BackingField: 0 - k__BackingField: 1 - k__BackingField: 0 - k__BackingField: 1 - allowSelectByVoice: 1 - speechRecognitionKeyword: select - k__BackingField: 1 - k__BackingField: 0 - k__BackingField: - active: 0 - onEntered: - m_PersistentCalls: - m_Calls: [] - onExited: - m_PersistentCalls: - m_Calls: [] - k__BackingField: - m_PersistentCalls: - m_Calls: [] - k__BackingField: - m_PersistentCalls: - m_Calls: [] - k__BackingField: - m_PersistentCalls: - m_Calls: [] - hostTransform: {fileID: 1250785856} - allowedManipulations: 7 - allowedInteractionTypes: -2147483641 - applyTorque: 1 - springForceSoftness: 0.1 - springTorqueSoftness: 0.1 - springDamping: 1 - springForceLimit: 100 - rotationAnchorNear: 1 - rotationAnchorFar: 1 - releaseBehavior: 3 - transformSmoothingLogicType: - reference: MixedReality.Toolkit.SpatialManipulation.DefaultTransformSmoothingLogic, - MixedReality.Toolkit.SpatialManipulation - smoothingFar: 1 - smoothingNear: 1 - moveLerpTime: 0.001 - rotateLerpTime: 0.001 - scaleLerpTime: 0.001 - enableConstraints: 1 - constraintsManager: {fileID: 958324216} - manipulationLogicTypes: - moveLogicType: - reference: MixedReality.Toolkit.SpatialManipulation.MoveLogic, MixedReality.Toolkit.SpatialManipulation - rotateLogicType: - reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, - MixedReality.Toolkit.SpatialManipulation - scaleLogicType: - reference: MixedReality.Toolkit.SpatialManipulation.ScaleLogic, MixedReality.Toolkit.SpatialManipulation ---- !u!114 &958324216 -MonoBehaviour: + defaultMaterials: + - {fileID: 2100000, guid: 93312c326d8c3c54bb251f588b42cda7, type: 2} +--- !u!4 &592789515 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5264854134403395402, guid: 53b4fadc7abe80d4f9549b89f80300d0, type: 3} + m_PrefabInstance: {fileID: 1558856740} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &616142844 +PrefabInstance: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 973147021} + m_Modifications: + - target: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_Name + value: ShaderBall + objectReference: {fileID: 0} + - target: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_CastShadows + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_MotionVectors + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_ReceiveShadows + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LightProbeUsage + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_ReflectionProbeUsage + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2097836553} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} +--- !u!4 &616142845 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + m_PrefabInstance: {fileID: 616142844} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 958324214} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 50cdab0cd5a0916419324bb54314773d, type: 3} - m_Name: - m_EditorClassIdentifier: - autoConstraintSelection: 1 - selectedConstraints: [] ---- !u!65 &958324217 -BoxCollider: +--- !u!1 &616142846 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + m_PrefabInstance: {fileID: 616142844} + m_PrefabAsset: {fileID: 0} +--- !u!64 &616142847 +MeshCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 958324214} + m_GameObject: {fileID: 616142846} m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 2 - m_Size: {x: 0.99999994, y: 1.0000001, z: 0.099999994} - m_Center: {x: 0, y: 0, z: 0.049999997} ---- !u!114 &958324219 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 4300002, guid: 1104611d051d4e42a68391888b61b32e, type: 3} +--- !u!23 &616142848 stripped +MeshRenderer: + m_CorrespondingSourceObject: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + m_PrefabInstance: {fileID: 616142844} + m_PrefabAsset: {fileID: 0} +--- !u!114 &616142850 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 958324214} + m_GameObject: {fileID: 616142846} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 80f85af46f9bddd4ea78f11cee5e3b2e, type: 3} + m_Script: {fileID: 11500000, guid: c53e2b0613597e849870c4a691d25e0f, type: 3} m_Name: m_EditorClassIdentifier: - handType: 3 - proximityType: 3 - executionOrder: 0 - minimumScale: {x: 0.2, y: 0.2, z: 0.2} - maximumScale: {x: 2, y: 2, z: 2} - relativeToInitialState: 1 ---- !u!1 &973147020 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 973147021} - m_Layer: 0 - m_Name: ShaderBall (5) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &973147021 -Transform: + defaultMaterials: + - {fileID: 2100000, guid: 72beba80472642299b6651a33cc160df, type: 2} +--- !u!1001 &623737352 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1793330793} + m_Modifications: + - target: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_Name + value: ShaderBall + objectReference: {fileID: 0} + - target: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_CastShadows + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_MotionVectors + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_ReceiveShadows + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LightProbeUsage + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_ReflectionProbeUsage + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 759015636} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} +--- !u!4 &623737353 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + m_PrefabInstance: {fileID: 623737352} + m_PrefabAsset: {fileID: 0} +--- !u!1 &623737354 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + m_PrefabInstance: {fileID: 623737352} + m_PrefabAsset: {fileID: 0} +--- !u!64 &623737355 +MeshCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 973147020} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -4, y: 0.3, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 616142845} - - {fileID: 1058943381} - m_Father: {fileID: 1595900778} - m_RootOrder: 6 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!21 &975595898 -Material: - serializedVersion: 8 + m_GameObject: {fileID: 623737354} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 4300002, guid: 1104611d051d4e42a68391888b61b32e, type: 3} +--- !u!114 &623737356 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: ShaderBallClippingPlaneInner (Instance) - m_Shader: {fileID: 4800000, guid: c331f6c43a2ef0945864cb668f2653c9, type: 3} - m_ValidKeywords: - - _CLIPPING_PLANE - - _DIRECTIONAL_LIGHT - - _DISABLE_ALBEDO_MAP - - _EMISSION - - _HOVER_LIGHT - - _REFLECTIONS - - _SPECULAR_HIGHLIGHTS - - _USE_WORLD_SCALE - m_InvalidKeywords: - - _CLIPPING_PLANE_BORDER - m_LightmapFlags: 4 - m_EnableInstancingVariants: 1 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2000 - stringTagMap: - RenderType: Opaque - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ChannelMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _IridescentSpectrumMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _LightMapTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 2800000, guid: 32c57306df745a147a2e02f8827a8cdc, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _NormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _AlbedoAlphaMode: 0 - - _AlbedoAlphaSmoothness: 0 - - _AlbedoAssignedAtRuntime: 0 - - _BlendOp: 0 - - _BlendedClippingWidth: 1 - - _BlurBorderIntensity: 0 - - _BlurMode: 0 - - _BlurTextureIntensity: 1 - - _BorderColorMode: 0 - - _BorderLight: 0 - - _BorderLightOpaque: 0 - - _BorderLightOpaqueAlpha: 1 - - _BorderLightReplacesAlbedo: 0 - - _BorderLightUsesHoverColor: 0 - - _BorderMinValue: 0.02 - - _BorderWidth: 0.1 - - _BorderWidthHorizontal: 0.1 - - _BorderWidthVertical: 0.1 - - _BumpScale: 1 - - _ClippingBorder: 0 - - _ClippingBorderWidth: 0.025 - - _ClippingBox: 0 - - _ClippingPlane: 1 - - _ClippingPlaneBorder: 1 - - _ClippingPlaneBorderWidth: 0.02 - - _ClippingSphere: 0 - - _ColorWriteMask: 15 - - _Cull: 2 - - _CullMode: 1 - - _CustomMode: 0 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DirectionalLight: 1 - - _DstBlend: 0 - - _EdgeSmoothingMode: 0 - - _EdgeSmoothingValue: 0.002 - - _EnableChannelMap: 0 - - _EnableEmission: 1 - - _EnableHoverColorOpaqueOverride: 0 - - _EnableHoverColorOverride: 0 - - _EnableLightMap: 0 - - _EnableLocalSpaceTriplanarMapping: 0 - - _EnableNormalMap: 0 - - _EnableProximityLightColorOverride: 0 - - _EnableSSAA: 0 - - _EnableStencil: 0 - - _EnableTriplanarMapping: 0 - - _EnvironmentColorIntensity: 0.5 - - _EnvironmentColorThreshold: 1.5 - - _EnvironmentColoring: 0 - - _Fade: 1 - - _FadeBeginDistance: 0.85 - - _FadeCompleteDistance: 0.5 - - _FadeMinValue: 0 - - _FluentLightIntensity: 1 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _GradientAngle: 180 - - _GradientMode: 0 - - _HoverLight: 1 - - _HoverLightOpaque: 0 - - _IgnoreZScale: 0 - - _IndependentCorners: 0 - - _InnerGlow: 0 - - _InnerGlowPower: 4 - - _InstancedColor: 0 - - _Iridescence: 0 - - _IridescenceAngle: -0.78 - - _IridescenceIntensity: 0.5 - - _IridescenceThreshold: 0.05 - - _Metallic: 0.036 - - _MipmapBias: -2 - - _Mode: 0 - - _MyCullVariable: 1 - - _NearLightFade: 0 - - _NearPlaneFade: 0 - - _NormalMapScale: 1 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _ProximityLight: 0 - - _ProximityLightSubtractive: 0 - - _ProximityLightTwoSided: 0 - - _Reflections: 1 - - _Refraction: 0 - - _RefractiveIndex: 1.1 - - _RenderQueueOverride: -1 - - _RimLight: 0 - - _RimPower: 3 - - _RoundCornerMargin: 0 - - _RoundCornerPower: 0.4 - - _RoundCornerRadius: 0.25 - - _RoundCorners: 0 - - _RoundCornersHideInterior: 0 - - _Smoothness: 0.5 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SphericalHarmonics: 0 - - _SrcBlend: 1 - - _Stencil: 0 - - _StencilComparison: 0 - - _StencilOperation: 0 - - _StencilReadMask: 255 - - _StencilReference: 0 - - _StencilWriteMask: 255 - - _TriplanarMappingBlendSharpness: 4 - - _UVSec: 0 - - _UseWorldScale: 1 - - _VertexColors: 0 - - _VertexExtrusion: 0 - - _VertexExtrusionSmoothNormals: 0 - - _VertexExtrusionValue: 0 - - _ZOffsetFactor: 0 - - _ZOffsetUnits: 0 - - _ZTest: 4 - - _ZWrite: 1 - m_Colors: - - _BlurBackgroundRect: {r: 0, g: 0, b: 1, a: 1} - - _BorderColor: {r: 1, g: 1, b: 1, a: 0} - - _ClipPlane: {r: 0, g: 1, b: 0, a: 0} - - _ClippingBorderColor: {r: 1, g: 0.2, b: 0, a: 1} - - _ClippingPlaneBorderColor: {r: 1, g: 0.2, b: 0, a: 1} - - _Color: {r: 1, g: 0.6827586, b: 0, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _EmissiveColor: {r: 0.9411765, g: 0, b: 0, a: 1} - - _EnvironmentColorX: {r: 1, g: 0, b: 0, a: 1} - - _EnvironmentColorY: {r: 0, g: 1, b: 0, a: 1} - - _EnvironmentColorZ: {r: 0, g: 0, b: 1, a: 1} - - _GradientAlpha: {r: 1, g: 1, b: 1, a: 1} - - _GradientAlphaTime: {r: 0, g: 0, b: 0, a: 0} - - _GradientColor0: {r: 0.631373, g: 0.631373, b: 0.631373, a: 0} - - _GradientColor1: {r: 1, g: 0.690196, b: 0.976471, a: 0.25} - - _GradientColor2: {r: 0, g: 0.32999998, b: 0.88, a: 0.5} - - _GradientColor3: {r: 0, g: 0.32999998, b: 0.88, a: 1} - - _GradientColor4: {r: 1, g: 1, b: 1, a: 1} - - _HoverColor: {r: 1, g: 0, b: 0, a: 1} - - _HoverColorOpaqueOverride: {r: 1, g: 1, b: 1, a: 1} - - _HoverColorOverride: {r: 1, g: 1, b: 1, a: 1} - - _InnerGlowColor: {r: 1, g: 1, b: 1, a: 0.75} - - _ProximityLightCenterColorOverride: {r: 1, g: 0, b: 0, a: 0} - - _ProximityLightMiddleColorOverride: {r: 0, g: 1, b: 0, a: 0.5} - - _ProximityLightOuterColorOverride: {r: 0, g: 0, b: 1, a: 1} - - _RimColor: {r: 1, g: 1, b: 1, a: 1} - - _RoundCornersRadius: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} - m_BuildTextureStacks: [] ---- !u!21 &996446357 + m_GameObject: {fileID: 623737354} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c53e2b0613597e849870c4a691d25e0f, type: 3} + m_Name: + m_EditorClassIdentifier: + defaultMaterials: + - {fileID: 2100000, guid: 72beba80472642299b6651a33cc160df, type: 2} +--- !u!23 &623737357 stripped +MeshRenderer: + m_CorrespondingSourceObject: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + m_PrefabInstance: {fileID: 623737352} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &640662407 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1162469815} + m_Modifications: + - target: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_Name + value: ShaderBallInner + objectReference: {fileID: 0} + - target: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalScale.x + value: 0.99000084 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalScale.y + value: 0.9900005 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalScale.z + value: 0.9900005 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_CastShadows + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_MotionVectors + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_ReceiveShadows + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LightProbeUsage + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_ReflectionProbeUsage + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: ced12abb765d5e247bd3311bd2fb5d98, type: 2} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} +--- !u!4 &640662408 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + m_PrefabInstance: {fileID: 640662407} + m_PrefabAsset: {fileID: 0} +--- !u!1 &640662409 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + m_PrefabInstance: {fileID: 640662407} + m_PrefabAsset: {fileID: 0} +--- !u!64 &640662410 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 640662409} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 4300002, guid: 1104611d051d4e42a68391888b61b32e, type: 3} +--- !u!1 &641881979 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 641881980} + m_Layer: 0 + m_Name: ShaderBall (3) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &641881980 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 641881979} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -2.4, y: 0.3, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1434900813} + - {fileID: 1038663547} + m_Father: {fileID: 1595900778} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!21 &653162250 Material: serializedVersion: 8 m_ObjectHideFlags: 0 @@ -8848,83 +5795,156 @@ Material: - _RimColor: {r: 0, g: 0.006896496, b: 1, a: 1} - _RoundCornersRadius: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} m_BuildTextureStacks: [] ---- !u!1 &1008789740 -GameObject: +--- !u!1001 &687910007 +PrefabInstance: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1008789741} - - component: {fileID: 1008789743} - m_Layer: 0 - m_Name: ClippingPlane - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1008789741 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 866223477} + m_Modifications: + - target: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_Name + value: ShaderBall + objectReference: {fileID: 0} + - target: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_CastShadows + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_MotionVectors + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_ReceiveShadows + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LightProbeUsage + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_ReflectionProbeUsage + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 512803740} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} +--- !u!4 &687910008 stripped Transform: + m_CorrespondingSourceObject: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + m_PrefabInstance: {fileID: 687910007} + m_PrefabAsset: {fileID: 0} +--- !u!1 &687910009 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + m_PrefabInstance: {fileID: 687910007} + m_PrefabAsset: {fileID: 0} +--- !u!64 &687910010 +MeshCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1008789740} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 365058296} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1008789743 + m_GameObject: {fileID: 687910009} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 4300002, guid: 1104611d051d4e42a68391888b61b32e, type: 3} +--- !u!23 &687910011 stripped +MeshRenderer: + m_CorrespondingSourceObject: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + m_PrefabInstance: {fileID: 687910007} + m_PrefabAsset: {fileID: 0} +--- !u!114 &687910013 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1008789740} + m_GameObject: {fileID: 687910009} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c69c48e6206a97e4c95f6f21a5b521c9, type: 3} + m_Script: {fileID: 11500000, guid: c53e2b0613597e849870c4a691d25e0f, type: 3} m_Name: m_EditorClassIdentifier: - applyToSharedMaterial: 0 - renderers: - - {fileID: 623737357} - - {fileID: 1484576915} - - {fileID: 1631871846} - - {fileID: 48993998} - - {fileID: 2046883233} - - {fileID: 745713254} - - {fileID: 1434900816} - - {fileID: 1038663550} - - {fileID: 1932829213} - - {fileID: 164497537} - - {fileID: 616142848} - - {fileID: 1058943384} - - {fileID: 48176122} - - {fileID: 781216075} - - {fileID: 441466250} - - {fileID: 1141845619} - - {fileID: 687910011} - - {fileID: 2078929852} - materials: [] - clippingSide: 1 - useOnPreRender: 0 ---- !u!1001 &1038663546 + defaultMaterials: + - {fileID: 2100000, guid: 72beba80472642299b6651a33cc160df, type: 2} +--- !u!1001 &696814941 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 641881980} + m_TransformParent: {fileID: 162241854} m_Modifications: - target: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} propertyPath: m_Name - value: ShaderBallInner + value: ShaderBall (1) + objectReference: {fileID: 0} + - target: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_IsActive + value: 0 objectReference: {fileID: 0} - target: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} propertyPath: m_StaticEditorFlags @@ -8932,7 +5952,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} propertyPath: m_RootOrder - value: 1 + value: 2 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} propertyPath: m_LocalScale.x @@ -8948,11 +5968,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: -0.8 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: 0.1 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} propertyPath: m_LocalPosition.z @@ -8964,15 +5984,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} propertyPath: m_LocalRotation.x - value: -0 + value: 0 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} propertyPath: m_LocalRotation.y - value: -0 + value: 0 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} propertyPath: m_LocalRotation.z - value: -0 + value: 0 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -8998,10 +6018,6 @@ PrefabInstance: propertyPath: m_LightProbeUsage value: 0 objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_Materials.Array.size - value: 1 - objectReference: {fileID: 0} - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} propertyPath: m_ReflectionProbeUsage value: 0 @@ -9009,26 +6025,26 @@ PrefabInstance: - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} propertyPath: m_Materials.Array.data[0] value: - objectReference: {fileID: 1595569633} + objectReference: {fileID: 1157956411} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} ---- !u!4 &1038663547 stripped +--- !u!4 &696814942 stripped Transform: m_CorrespondingSourceObject: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - m_PrefabInstance: {fileID: 1038663546} + m_PrefabInstance: {fileID: 696814941} m_PrefabAsset: {fileID: 0} ---- !u!1 &1038663548 stripped +--- !u!1 &696814943 stripped GameObject: m_CorrespondingSourceObject: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - m_PrefabInstance: {fileID: 1038663546} + m_PrefabInstance: {fileID: 696814941} m_PrefabAsset: {fileID: 0} ---- !u!64 &1038663549 +--- !u!64 &696814944 MeshCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1038663548} + m_GameObject: {fileID: 696814943} m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 @@ -9036,61 +6052,101 @@ MeshCollider: m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 4300002, guid: 1104611d051d4e42a68391888b61b32e, type: 3} ---- !u!23 &1038663550 stripped +--- !u!23 &696814945 stripped MeshRenderer: m_CorrespondingSourceObject: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - m_PrefabInstance: {fileID: 1038663546} + m_PrefabInstance: {fileID: 696814941} m_PrefabAsset: {fileID: 0} ---- !u!114 &1038663552 +--- !u!114 &696814947 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1038663548} + m_GameObject: {fileID: 696814943} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: c53e2b0613597e849870c4a691d25e0f, type: 3} m_Name: m_EditorClassIdentifier: defaultMaterials: - - {fileID: 2100000, guid: 11043ba092e44ae496f1361e7c0d8b0b, type: 2} ---- !u!21 &1039698707 -Material: - serializedVersion: 8 + - {fileID: 2100000, guid: 93312c326d8c3c54bb251f588b42cda7, type: 2} +--- !u!1 &723260585 +GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: ShaderBallClippingBox (Instance) - m_Shader: {fileID: 4800000, guid: c331f6c43a2ef0945864cb668f2653c9, type: 3} - m_ValidKeywords: - - _BORDER_LIGHT_USES_HOVER_COLOR - - _CLIPPING_BOX - - _DIRECTIONAL_LIGHT - - _DISABLE_ALBEDO_MAP - - _HOVER_COLOR_OVERRIDE - - _HOVER_LIGHT - - _REFLECTIONS - - _RIM_LIGHT - - _SPECULAR_HIGHLIGHTS - - _USE_WORLD_SCALE - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 1 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2000 - stringTagMap: - RenderType: Opaque - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ChannelMap: + serializedVersion: 6 + m_Component: + - component: {fileID: 723260586} + m_Layer: 0 + m_Name: ClippingSphere + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &723260586 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 723260585} + m_LocalRotation: {x: 0, y: 0.7071068, z: 0.7071068, w: 0} + m_LocalPosition: {x: 0.401, y: 0, z: -1.528} + m_LocalScale: {x: 0.21048994, y: 0.21048994, z: 0.21048994} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 2106529387} + - {fileID: 119951084} + - {fileID: 37496078} + - {fileID: 955809413} + - {fileID: 842427686} + - {fileID: 1274666198} + - {fileID: 1659572901} + - {fileID: 1162469815} + - {fileID: 1233524242} + - {fileID: 120963526} + m_Father: {fileID: 1250785856} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: -90, y: 180, z: 0} +--- !u!21 &727422391 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: ShaderBallClippingPlaneInner (Instance) + m_Shader: {fileID: 4800000, guid: c331f6c43a2ef0945864cb668f2653c9, type: 3} + m_ValidKeywords: + - _CLIPPING_PLANE + - _DIRECTIONAL_LIGHT + - _DISABLE_ALBEDO_MAP + - _EMISSION + - _HOVER_LIGHT + - _REFLECTIONS + - _SPECULAR_HIGHLIGHTS + - _USE_WORLD_SCALE + m_InvalidKeywords: + - _CLIPPING_PLANE_BORDER + m_LightmapFlags: 4 + m_EnableInstancingVariants: 1 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 2000 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ChannelMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} @@ -9157,24 +6213,22 @@ Material: - _BorderLightOpaque: 0 - _BorderLightOpaqueAlpha: 1 - _BorderLightReplacesAlbedo: 0 - - _BorderLightUsesHoverColor: 1 + - _BorderLightUsesHoverColor: 0 - _BorderMinValue: 0.02 - _BorderWidth: 0.1 - _BorderWidthHorizontal: 0.1 - _BorderWidthVertical: 0.1 - _BumpScale: 1 - - _ClipBoxSide: 1 - - _ClipPlaneSide: 1 - - _ClipSphereSide: 1 - _ClippingBorder: 0 - _ClippingBorderWidth: 0.025 - - _ClippingBox: 1 - - _ClippingPlane: 0 - - _ClippingPlaneBorder: 0 - - _ClippingPlaneBorderWidth: 0.025 + - _ClippingBox: 0 + - _ClippingPlane: 1 + - _ClippingPlaneBorder: 1 + - _ClippingPlaneBorderWidth: 0.02 - _ClippingSphere: 0 - _ColorWriteMask: 15 - - _CullMode: 0 + - _Cull: 2 + - _CullMode: 1 - _CustomMode: 0 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 @@ -9184,9 +6238,9 @@ Material: - _EdgeSmoothingMode: 0 - _EdgeSmoothingValue: 0.002 - _EnableChannelMap: 0 - - _EnableEmission: 0 + - _EnableEmission: 1 - _EnableHoverColorOpaqueOverride: 0 - - _EnableHoverColorOverride: 1 + - _EnableHoverColorOverride: 0 - _EnableLightMap: 0 - _EnableLocalSpaceTriplanarMapping: 0 - _EnableNormalMap: 0 @@ -9218,9 +6272,10 @@ Material: - _IridescenceAngle: -0.78 - _IridescenceIntensity: 0.5 - _IridescenceThreshold: 0.05 - - _Metallic: 0 + - _Metallic: 0.036 - _MipmapBias: -2 - _Mode: 0 + - _MyCullVariable: 1 - _NPR: 0 - _NearLightFade: 0 - _NearPlaneFade: 0 @@ -9234,13 +6289,14 @@ Material: - _Refraction: 0 - _RefractiveIndex: 1.1 - _RenderQueueOverride: -1 - - _RimLight: 1 + - _RimLight: 0 - _RimPower: 3 - _RoundCornerMargin: 0 + - _RoundCornerPower: 0.4 - _RoundCornerRadius: 0.25 - _RoundCorners: 0 - _RoundCornersHideInterior: 0 - - _Smoothness: 1 + - _Smoothness: 0.5 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SphericalHarmonics: 0 @@ -9267,14 +6323,12 @@ Material: m_Colors: - _BlurBackgroundRect: {r: 0, g: 0, b: 1, a: 1} - _BorderColor: {r: 1, g: 1, b: 1, a: 0} - - _ClipBoxSize: {r: 1, g: 1, b: 1, a: 0} - _ClipPlane: {r: 0, g: 1, b: 0, a: 0} - - _ClipSphere: {r: 0, g: 0, b: 0, a: 0.5} - _ClippingBorderColor: {r: 1, g: 0.2, b: 0, a: 1} - _ClippingPlaneBorderColor: {r: 1, g: 0.2, b: 0, a: 1} - - _Color: {r: 0.72794116, g: 0, b: 0, a: 1} + - _Color: {r: 1, g: 0.6827586, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1} + - _EmissiveColor: {r: 0.9411765, g: 0, b: 0, a: 1} - _EnvironmentColorX: {r: 1, g: 0, b: 0, a: 1} - _EnvironmentColorY: {r: 0, g: 1, b: 0, a: 1} - _EnvironmentColorZ: {r: 0, g: 0, b: 1, a: 1} @@ -9285,138 +6339,22 @@ Material: - _GradientColor2: {r: 0, g: 0.32999998, b: 0.88, a: 0.5} - _GradientColor3: {r: 0, g: 0.32999998, b: 0.88, a: 1} - _GradientColor4: {r: 1, g: 1, b: 1, a: 1} + - _HoverColor: {r: 1, g: 0, b: 0, a: 1} - _HoverColorOpaqueOverride: {r: 1, g: 1, b: 1, a: 1} - - _HoverColorOverride: {r: 0, g: 0.007843138, b: 1, a: 1} + - _HoverColorOverride: {r: 1, g: 1, b: 1, a: 1} - _InnerGlowColor: {r: 1, g: 1, b: 1, a: 0.75} - _ProximityLightCenterColorOverride: {r: 1, g: 0, b: 0, a: 0} - _ProximityLightMiddleColorOverride: {r: 0, g: 1, b: 0, a: 0.5} - _ProximityLightOuterColorOverride: {r: 0, g: 0, b: 1, a: 1} - - _RimColor: {r: 0, g: 0.006896496, b: 1, a: 1} + - _RimColor: {r: 1, g: 1, b: 1, a: 1} - _RoundCornersRadius: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} m_BuildTextureStacks: [] ---- !u!1001 &1042775804 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 37496078} - m_Modifications: - - target: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_Name - value: ShaderBallInner - objectReference: {fileID: 0} - - target: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_StaticEditorFlags - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalScale.x - value: 0.99000084 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalScale.y - value: 0.9900005 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalScale.z - value: 0.9900005 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_CastShadows - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_MotionVectors - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_ReceiveShadows - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LightProbeUsage - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_ReflectionProbeUsage - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: ced12abb765d5e247bd3311bd2fb5d98, type: 2} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} ---- !u!4 &1042775805 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - m_PrefabInstance: {fileID: 1042775804} - m_PrefabAsset: {fileID: 0} ---- !u!1 &1042775806 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - m_PrefabInstance: {fileID: 1042775804} - m_PrefabAsset: {fileID: 0} ---- !u!64 &1042775807 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1042775806} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 4 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: 4300002, guid: 1104611d051d4e42a68391888b61b32e, type: 3} ---- !u!1001 &1058943380 +--- !u!1001 &745713249 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 973147021} + m_TransformParent: {fileID: 2021874965} m_Modifications: - target: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} propertyPath: m_Name @@ -9494,6 +6432,10 @@ PrefabInstance: propertyPath: m_LightProbeUsage value: 0 objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_Materials.Array.size + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} propertyPath: m_ReflectionProbeUsage value: 0 @@ -9501,26 +6443,26 @@ PrefabInstance: - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} propertyPath: m_Materials.Array.data[0] value: - objectReference: {fileID: 1624239208} + objectReference: {fileID: 2100000, guid: 11043ba092e44ae496f1361e7c0d8b0b, type: 2} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} ---- !u!4 &1058943381 stripped +--- !u!4 &745713250 stripped Transform: m_CorrespondingSourceObject: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - m_PrefabInstance: {fileID: 1058943380} + m_PrefabInstance: {fileID: 745713249} m_PrefabAsset: {fileID: 0} ---- !u!1 &1058943382 stripped +--- !u!1 &745713251 stripped GameObject: m_CorrespondingSourceObject: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - m_PrefabInstance: {fileID: 1058943380} + m_PrefabInstance: {fileID: 745713249} m_PrefabAsset: {fileID: 0} ---- !u!64 &1058943383 +--- !u!64 &745713252 MeshCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1058943382} + m_GameObject: {fileID: 745713251} m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 @@ -9528,18 +6470,18 @@ MeshCollider: m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 4300002, guid: 1104611d051d4e42a68391888b61b32e, type: 3} ---- !u!23 &1058943384 stripped +--- !u!23 &745713254 stripped MeshRenderer: m_CorrespondingSourceObject: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - m_PrefabInstance: {fileID: 1058943380} + m_PrefabInstance: {fileID: 745713249} m_PrefabAsset: {fileID: 0} ---- !u!114 &1058943386 +--- !u!114 &745713256 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1058943382} + m_GameObject: {fileID: 745713251} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: c53e2b0613597e849870c4a691d25e0f, type: 3} @@ -9547,143 +6489,7 @@ MonoBehaviour: m_EditorClassIdentifier: defaultMaterials: - {fileID: 2100000, guid: 11043ba092e44ae496f1361e7c0d8b0b, type: 2} ---- !u!1001 &1060317755 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 1659572901} - m_Modifications: - - target: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_Name - value: ShaderBall - objectReference: {fileID: 0} - - target: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_StaticEditorFlags - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalScale.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalScale.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalScale.z - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_CastShadows - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_MotionVectors - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_ReceiveShadows - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LightProbeUsage - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_ReflectionProbeUsage - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 1796905766} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} ---- !u!4 &1060317756 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - m_PrefabInstance: {fileID: 1060317755} - m_PrefabAsset: {fileID: 0} ---- !u!1 &1060317757 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - m_PrefabInstance: {fileID: 1060317755} - m_PrefabAsset: {fileID: 0} ---- !u!64 &1060317758 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1060317757} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 4 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: 4300002, guid: 1104611d051d4e42a68391888b61b32e, type: 3} ---- !u!23 &1060317759 stripped -MeshRenderer: - m_CorrespondingSourceObject: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - m_PrefabInstance: {fileID: 1060317755} - m_PrefabAsset: {fileID: 0} ---- !u!114 &1060317761 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1060317757} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c53e2b0613597e849870c4a691d25e0f, type: 3} - m_Name: - m_EditorClassIdentifier: - defaultMaterials: - - {fileID: 2100000, guid: 9f21cf60c2137a64dbe161430f7c0b75, type: 2} ---- !u!21 &1084849456 +--- !u!21 &759015636 Material: serializedVersion: 8 m_ObjectHideFlags: 0 @@ -9691,24 +6497,23 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: ShaderBallClippingPlane (Instance) - m_Shader: {fileID: 4800000, guid: c331f6c43a2ef0945864cb668f2653c9, type: 3} - m_ValidKeywords: + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_ValidKeywords: [] + m_InvalidKeywords: - _CLIPPING_BORDER - _CLIPPING_PLANE + - _CLIPPING_PLANE_BORDER - _DIRECTIONAL_LIGHT - _DISABLE_ALBEDO_MAP - _HOVER_LIGHT - _REFLECTIONS - _SPECULAR_HIGHLIGHTS - _USE_WORLD_SCALE - m_InvalidKeywords: - - _CLIPPING_PLANE_BORDER m_LightmapFlags: 4 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2000 - stringTagMap: - RenderType: Opaque + m_CustomRenderQueue: -1 + stringTagMap: {} disabledShaderPasses: [] m_SavedProperties: serializedVersion: 3 @@ -9912,16 +6717,16 @@ Material: - _RimColor: {r: 1, g: 1, b: 1, a: 1} - _RoundCornersRadius: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} m_BuildTextureStacks: [] ---- !u!1001 &1112684250 +--- !u!1001 &781216071 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 842427686} + m_TransformParent: {fileID: 1872109879} m_Modifications: - target: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} propertyPath: m_Name - value: ShaderBall + value: ShaderBallInner objectReference: {fileID: 0} - target: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} propertyPath: m_StaticEditorFlags @@ -9929,7 +6734,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} propertyPath: m_RootOrder - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} propertyPath: m_LocalScale.x @@ -9961,15 +6766,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -10002,26 +6807,26 @@ PrefabInstance: - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} propertyPath: m_Materials.Array.data[0] value: - objectReference: {fileID: 542103952} + objectReference: {fileID: 2010519469} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} ---- !u!4 &1112684251 stripped +--- !u!4 &781216072 stripped Transform: m_CorrespondingSourceObject: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - m_PrefabInstance: {fileID: 1112684250} + m_PrefabInstance: {fileID: 781216071} m_PrefabAsset: {fileID: 0} ---- !u!1 &1112684252 stripped +--- !u!1 &781216073 stripped GameObject: m_CorrespondingSourceObject: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - m_PrefabInstance: {fileID: 1112684250} + m_PrefabInstance: {fileID: 781216071} m_PrefabAsset: {fileID: 0} ---- !u!64 &1112684253 +--- !u!64 &781216074 MeshCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1112684252} + m_GameObject: {fileID: 781216073} m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 @@ -10029,44 +6834,45 @@ MeshCollider: m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 4300002, guid: 1104611d051d4e42a68391888b61b32e, type: 3} ---- !u!23 &1112684254 stripped +--- !u!23 &781216075 stripped MeshRenderer: m_CorrespondingSourceObject: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - m_PrefabInstance: {fileID: 1112684250} + m_PrefabInstance: {fileID: 781216071} m_PrefabAsset: {fileID: 0} ---- !u!114 &1112684256 +--- !u!114 &781216077 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1112684252} + m_GameObject: {fileID: 781216073} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: c53e2b0613597e849870c4a691d25e0f, type: 3} m_Name: m_EditorClassIdentifier: defaultMaterials: - - {fileID: 2100000, guid: 9f21cf60c2137a64dbe161430f7c0b75, type: 2} ---- !u!21 &1115790161 + - {fileID: 2100000, guid: 11043ba092e44ae496f1361e7c0d8b0b, type: 2} +--- !u!21 &838623786 Material: serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: ShaderBallClippingSphere (Instance) + m_Name: ShaderBallClippingPlaneInner (Instance) m_Shader: {fileID: 4800000, guid: c331f6c43a2ef0945864cb668f2653c9, type: 3} m_ValidKeywords: - - _BORDER_LIGHT_USES_HOVER_COLOR - - _CLIPPING_SPHERE + - _CLIPPING_PLANE - _DIRECTIONAL_LIGHT - _DISABLE_ALBEDO_MAP + - _EMISSION - _HOVER_LIGHT - _REFLECTIONS - _SPECULAR_HIGHLIGHTS - _USE_WORLD_SCALE - m_InvalidKeywords: [] + m_InvalidKeywords: + - _CLIPPING_PLANE_BORDER m_LightmapFlags: 4 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 @@ -10101,6 +6907,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _EmissiveMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _IridescentSpectrumMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -10144,33 +6954,32 @@ Material: - _BorderLightOpaque: 0 - _BorderLightOpaqueAlpha: 1 - _BorderLightReplacesAlbedo: 0 - - _BorderLightUsesHoverColor: 1 + - _BorderLightUsesHoverColor: 0 - _BorderMinValue: 0.02 - _BorderWidth: 0.1 - _BorderWidthHorizontal: 0.1 - _BorderWidthVertical: 0.1 - _BumpScale: 1 - - _ClipBoxSide: 1 - - _ClipPlaneSide: 1 - - _ClipSphereSide: 1 - _ClippingBorder: 0 - _ClippingBorderWidth: 0.025 - _ClippingBox: 0 - - _ClippingPlane: 0 - - _ClippingPlaneBorder: 0 - - _ClippingPlaneBorderWidth: 0.025 - - _ClippingSphere: 1 + - _ClippingPlane: 1 + - _ClippingPlaneBorder: 1 + - _ClippingPlaneBorderWidth: 0.02 + - _ClippingSphere: 0 - _ColorWriteMask: 15 - - _CullMode: 2 + - _Cull: 2 + - _CullMode: 1 - _CustomMode: 0 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DirectionalLight: 1 - _DstBlend: 0 + - _DstBlendAlpha: 1 - _EdgeSmoothingMode: 0 - _EdgeSmoothingValue: 0.002 - _EnableChannelMap: 0 - - _EnableEmission: 0 + - _EnableEmission: 1 - _EnableHoverColorOpaqueOverride: 0 - _EnableHoverColorOverride: 0 - _EnableLightMap: 0 @@ -10204,9 +7013,11 @@ Material: - _IridescenceAngle: -0.78 - _IridescenceIntensity: 0.5 - _IridescenceThreshold: 0.05 - - _Metallic: 0 + - _Metallic: 0.036 - _MipmapBias: -2 - _Mode: 0 + - _MyCullVariable: 1 + - _NPR: 0 - _NearLightFade: 0 - _NearPlaneFade: 0 - _NormalMapScale: 1 @@ -10222,14 +7033,16 @@ Material: - _RimLight: 0 - _RimPower: 3 - _RoundCornerMargin: 0 + - _RoundCornerPower: 0.4 - _RoundCornerRadius: 0.25 - _RoundCorners: 0 - _RoundCornersHideInterior: 0 - - _Smoothness: 1 + - _Smoothness: 0.5 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SphericalHarmonics: 0 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Stencil: 0 - _StencilComparison: 0 - _StencilOperation: 0 @@ -10241,6 +7054,7 @@ Material: - _UseWorldScale: 1 - _VertexColors: 0 - _VertexExtrusion: 0 + - _VertexExtrusionConstantWidth: 0 - _VertexExtrusionSmoothNormals: 0 - _VertexExtrusionValue: 0 - _ZOffsetFactor: 0 @@ -10250,14 +7064,12 @@ Material: m_Colors: - _BlurBackgroundRect: {r: 0, g: 0, b: 1, a: 1} - _BorderColor: {r: 1, g: 1, b: 1, a: 0} - - _ClipBoxSize: {r: 1, g: 1, b: 1, a: 0} - _ClipPlane: {r: 0, g: 1, b: 0, a: 0} - - _ClipSphere: {r: 0, g: 0, b: 0, a: 0.5} - _ClippingBorderColor: {r: 1, g: 0.2, b: 0, a: 1} - _ClippingPlaneBorderColor: {r: 1, g: 0.2, b: 0, a: 1} - - _Color: {r: 0, g: 0.5862069, b: 1, a: 1} + - _Color: {r: 1, g: 0.6827586, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1} + - _EmissiveColor: {r: 0.9411765, g: 0, b: 0, a: 1} - _EnvironmentColorX: {r: 1, g: 0, b: 0, a: 1} - _EnvironmentColorY: {r: 0, g: 1, b: 0, a: 1} - _EnvironmentColorZ: {r: 0, g: 0, b: 1, a: 1} @@ -10268,6 +7080,7 @@ Material: - _GradientColor2: {r: 0, g: 0.32999998, b: 0.88, a: 0.5} - _GradientColor3: {r: 0, g: 0.32999998, b: 0.88, a: 1} - _GradientColor4: {r: 1, g: 1, b: 1, a: 1} + - _HoverColor: {r: 1, g: 0, b: 0, a: 1} - _HoverColorOpaqueOverride: {r: 1, g: 1, b: 1, a: 1} - _HoverColorOverride: {r: 1, g: 1, b: 1, a: 1} - _InnerGlowColor: {r: 1, g: 1, b: 1, a: 0.75} @@ -10277,27 +7090,60 @@ Material: - _RimColor: {r: 1, g: 1, b: 1, a: 1} - _RoundCornersRadius: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} m_BuildTextureStacks: [] ---- !u!21 &1134585582 -Material: - serializedVersion: 8 +--- !u!1 &842427685 +GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: ShaderBallClippingPlaneInner (Instance) - m_Shader: {fileID: 4800000, guid: c331f6c43a2ef0945864cb668f2653c9, type: 3} - m_ValidKeywords: - - _CLIPPING_PLANE - - _DIRECTIONAL_LIGHT - - _DISABLE_ALBEDO_MAP - - _EMISSION - - _HOVER_LIGHT - - _REFLECTIONS - - _SPECULAR_HIGHLIGHTS - - _USE_WORLD_SCALE - m_InvalidKeywords: - - _CLIPPING_PLANE_BORDER - m_LightmapFlags: 4 + serializedVersion: 6 + m_Component: + - component: {fileID: 842427686} + m_Layer: 0 + m_Name: ShaderBall (3) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &842427686 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 842427685} + m_LocalRotation: {x: -0, y: 0.00000008940696, z: -0.816581, w: 0.57723093} + m_LocalPosition: {x: -0.99000114, y: 0.05000007, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1112684251} + - {fileID: 1687595650} + m_Father: {fileID: 723260586} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: -50.912003} +--- !u!21 &842982906 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: ShaderBallClippingPlane (Instance) + m_Shader: {fileID: 4800000, guid: c331f6c43a2ef0945864cb668f2653c9, type: 3} + m_ValidKeywords: + - _CLIPPING_BORDER + - _CLIPPING_PLANE + - _DIRECTIONAL_LIGHT + - _DISABLE_ALBEDO_MAP + - _HOVER_LIGHT + - _REFLECTIONS + - _SPECULAR_HIGHLIGHTS + - _USE_WORLD_SCALE + m_InvalidKeywords: + - _CLIPPING_PLANE_BORDER + m_LightmapFlags: 4 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 m_CustomRenderQueue: 2000 @@ -10331,6 +7177,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _EmissiveMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _IridescentSpectrumMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -10340,7 +7190,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: 32c57306df745a147a2e02f8827a8cdc, type: 3} + m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: @@ -10380,7 +7230,7 @@ Material: - _BorderWidthHorizontal: 0.1 - _BorderWidthVertical: 0.1 - _BumpScale: 1 - - _ClippingBorder: 0 + - _ClippingBorder: 1 - _ClippingBorderWidth: 0.025 - _ClippingBox: 0 - _ClippingPlane: 1 @@ -10389,16 +7239,17 @@ Material: - _ClippingSphere: 0 - _ColorWriteMask: 15 - _Cull: 2 - - _CullMode: 1 + - _CullMode: 2 - _CustomMode: 0 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DirectionalLight: 1 - _DstBlend: 0 + - _DstBlendAlpha: 1 - _EdgeSmoothingMode: 0 - _EdgeSmoothingValue: 0.002 - _EnableChannelMap: 0 - - _EnableEmission: 1 + - _EnableEmission: 0 - _EnableHoverColorOpaqueOverride: 0 - _EnableHoverColorOverride: 0 - _EnableLightMap: 0 @@ -10432,10 +7283,11 @@ Material: - _IridescenceAngle: -0.78 - _IridescenceIntensity: 0.5 - _IridescenceThreshold: 0.05 - - _Metallic: 0.036 + - _Metallic: 0 - _MipmapBias: -2 - _Mode: 0 - _MyCullVariable: 1 + - _NPR: 0 - _NearLightFade: 0 - _NearPlaneFade: 0 - _NormalMapScale: 1 @@ -10460,6 +7312,7 @@ Material: - _SpecularHighlights: 1 - _SphericalHarmonics: 0 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Stencil: 0 - _StencilComparison: 0 - _StencilOperation: 0 @@ -10471,6 +7324,7 @@ Material: - _UseWorldScale: 1 - _VertexColors: 0 - _VertexExtrusion: 0 + - _VertexExtrusionConstantWidth: 0 - _VertexExtrusionSmoothNormals: 0 - _VertexExtrusionValue: 0 - _ZOffsetFactor: 0 @@ -10483,9 +7337,9 @@ Material: - _ClipPlane: {r: 0, g: 1, b: 0, a: 0} - _ClippingBorderColor: {r: 1, g: 0.2, b: 0, a: 1} - _ClippingPlaneBorderColor: {r: 1, g: 0.2, b: 0, a: 1} - - _Color: {r: 1, g: 0.6827586, b: 0, a: 1} + - _Color: {r: 0.5754717, g: 0.4325086, b: 0.4325086, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _EmissiveColor: {r: 0.9411765, g: 0, b: 0, a: 1} + - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1} - _EnvironmentColorX: {r: 1, g: 0, b: 0, a: 1} - _EnvironmentColorY: {r: 0, g: 1, b: 0, a: 1} - _EnvironmentColorZ: {r: 0, g: 0, b: 1, a: 1} @@ -10506,143 +7360,7 @@ Material: - _RimColor: {r: 1, g: 1, b: 1, a: 1} - _RoundCornersRadius: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} m_BuildTextureStacks: [] ---- !u!1001 &1141845615 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 1444854130} - m_Modifications: - - target: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_Name - value: ShaderBallInner - objectReference: {fileID: 0} - - target: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_StaticEditorFlags - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalScale.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalScale.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalScale.z - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_CastShadows - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_MotionVectors - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_ReceiveShadows - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LightProbeUsage - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_ReflectionProbeUsage - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 1382788413} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} ---- !u!4 &1141845616 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - m_PrefabInstance: {fileID: 1141845615} - m_PrefabAsset: {fileID: 0} ---- !u!1 &1141845617 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - m_PrefabInstance: {fileID: 1141845615} - m_PrefabAsset: {fileID: 0} ---- !u!64 &1141845618 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1141845617} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 4 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: 4300002, guid: 1104611d051d4e42a68391888b61b32e, type: 3} ---- !u!23 &1141845619 stripped -MeshRenderer: - m_CorrespondingSourceObject: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - m_PrefabInstance: {fileID: 1141845615} - m_PrefabAsset: {fileID: 0} ---- !u!114 &1141845621 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1141845617} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c53e2b0613597e849870c4a691d25e0f, type: 3} - m_Name: - m_EditorClassIdentifier: - defaultMaterials: - - {fileID: 2100000, guid: 11043ba092e44ae496f1361e7c0d8b0b, type: 2} ---- !u!21 &1150368749 +--- !u!21 &855647985 Material: serializedVersion: 8 m_ObjectHideFlags: 0 @@ -10695,10 +7413,6 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - - _EmissiveMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - _IridescentSpectrumMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -10765,7 +7479,6 @@ Material: - _DetailNormalMapScale: 1 - _DirectionalLight: 1 - _DstBlend: 0 - - _DstBlendAlpha: 1 - _EdgeSmoothingMode: 0 - _EdgeSmoothingValue: 0.002 - _EnableChannelMap: 0 @@ -10806,7 +7519,6 @@ Material: - _Metallic: 0 - _MipmapBias: -2 - _Mode: 0 - - _NPR: 0 - _NearLightFade: 0 - _NearPlaneFade: 0 - _NormalMapScale: 1 @@ -10830,7 +7542,6 @@ Material: - _SpecularHighlights: 1 - _SphericalHarmonics: 0 - _SrcBlend: 1 - - _SrcBlendAlpha: 1 - _Stencil: 0 - _StencilComparison: 0 - _StencilOperation: 0 @@ -10842,7 +7553,6 @@ Material: - _UseWorldScale: 1 - _VertexColors: 0 - _VertexExtrusion: 0 - - _VertexExtrusionConstantWidth: 0 - _VertexExtrusionSmoothNormals: 0 - _VertexExtrusionValue: 0 - _ZOffsetFactor: 0 @@ -10879,238 +7589,45 @@ Material: - _RimColor: {r: 1, g: 1, b: 1, a: 1} - _RoundCornersRadius: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} m_BuildTextureStacks: [] ---- !u!21 &1157956411 -Material: - serializedVersion: 8 +--- !u!1 &866223476 +GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: ShaderBallClippingBox (Instance) - m_Shader: {fileID: 4800000, guid: c331f6c43a2ef0945864cb668f2653c9, type: 3} - m_ValidKeywords: - - _BORDER_LIGHT_USES_HOVER_COLOR - - _CLIPPING_BOX - - _DIRECTIONAL_LIGHT - - _DISABLE_ALBEDO_MAP - - _HOVER_COLOR_OVERRIDE - - _HOVER_LIGHT - - _REFLECTIONS - - _RIM_LIGHT - - _SPECULAR_HIGHLIGHTS - - _USE_WORLD_SCALE - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 1 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2000 - stringTagMap: - RenderType: Opaque - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ChannelMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _IridescentSpectrumMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _LightMapTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 2800000, guid: 32c57306df745a147a2e02f8827a8cdc, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _NormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _AlbedoAlphaMode: 0 - - _AlbedoAlphaSmoothness: 0 - - _AlbedoAssignedAtRuntime: 0 - - _BlendOp: 0 - - _BlendedClippingWidth: 1 - - _BlurBorderIntensity: 0 - - _BlurMode: 0 - - _BlurTextureIntensity: 1 - - _BorderColorMode: 0 - - _BorderLight: 0 - - _BorderLightOpaque: 0 - - _BorderLightOpaqueAlpha: 1 - - _BorderLightReplacesAlbedo: 0 - - _BorderLightUsesHoverColor: 1 - - _BorderMinValue: 0.02 - - _BorderWidth: 0.1 - - _BorderWidthHorizontal: 0.1 - - _BorderWidthVertical: 0.1 - - _BumpScale: 1 - - _ClipBoxSide: 1 - - _ClipPlaneSide: 1 - - _ClipSphereSide: 1 - - _ClippingBorder: 0 - - _ClippingBorderWidth: 0.025 - - _ClippingBox: 1 - - _ClippingPlane: 0 - - _ClippingPlaneBorder: 0 - - _ClippingPlaneBorderWidth: 0.025 - - _ClippingSphere: 0 - - _ColorWriteMask: 15 - - _CullMode: 0 - - _CustomMode: 0 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DirectionalLight: 1 - - _DstBlend: 0 - - _EdgeSmoothingMode: 0 - - _EdgeSmoothingValue: 0.002 - - _EnableChannelMap: 0 - - _EnableEmission: 0 - - _EnableHoverColorOpaqueOverride: 0 - - _EnableHoverColorOverride: 1 - - _EnableLightMap: 0 - - _EnableLocalSpaceTriplanarMapping: 0 - - _EnableNormalMap: 0 - - _EnableProximityLightColorOverride: 0 - - _EnableSSAA: 0 - - _EnableStencil: 0 - - _EnableTriplanarMapping: 0 - - _EnvironmentColorIntensity: 0.5 - - _EnvironmentColorThreshold: 1.5 - - _EnvironmentColoring: 0 - - _Fade: 1 - - _FadeBeginDistance: 0.85 - - _FadeCompleteDistance: 0.5 - - _FadeMinValue: 0 - - _FluentLightIntensity: 1 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _GradientAngle: 180 - - _GradientMode: 0 - - _HoverLight: 1 - - _HoverLightOpaque: 0 - - _IgnoreZScale: 0 - - _IndependentCorners: 0 - - _InnerGlow: 0 - - _InnerGlowPower: 4 - - _InstancedColor: 0 - - _Iridescence: 0 - - _IridescenceAngle: -0.78 - - _IridescenceIntensity: 0.5 - - _IridescenceThreshold: 0.05 - - _Metallic: 0 - - _MipmapBias: -2 - - _Mode: 0 - - _NearLightFade: 0 - - _NearPlaneFade: 0 - - _NormalMapScale: 1 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _ProximityLight: 0 - - _ProximityLightSubtractive: 0 - - _ProximityLightTwoSided: 0 - - _Reflections: 1 - - _Refraction: 0 - - _RefractiveIndex: 1.1 - - _RenderQueueOverride: -1 - - _RimLight: 1 - - _RimPower: 3 - - _RoundCornerMargin: 0 - - _RoundCornerRadius: 0.25 - - _RoundCorners: 0 - - _RoundCornersHideInterior: 0 - - _Smoothness: 1 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SphericalHarmonics: 0 - - _SrcBlend: 1 - - _Stencil: 0 - - _StencilComparison: 0 - - _StencilOperation: 0 - - _StencilReadMask: 255 - - _StencilReference: 0 - - _StencilWriteMask: 255 - - _TriplanarMappingBlendSharpness: 4 - - _UVSec: 0 - - _UseWorldScale: 1 - - _VertexColors: 0 - - _VertexExtrusion: 0 - - _VertexExtrusionSmoothNormals: 0 - - _VertexExtrusionValue: 0 - - _ZOffsetFactor: 0 - - _ZOffsetUnits: 0 - - _ZTest: 4 - - _ZWrite: 1 - m_Colors: - - _BlurBackgroundRect: {r: 0, g: 0, b: 1, a: 1} - - _BorderColor: {r: 1, g: 1, b: 1, a: 0} - - _ClipBoxSize: {r: 1, g: 1, b: 1, a: 0} - - _ClipPlane: {r: 0, g: 1, b: 0, a: 0} - - _ClipSphere: {r: 0, g: 0, b: 0, a: 0.5} - - _ClippingBorderColor: {r: 1, g: 0.2, b: 0, a: 1} - - _ClippingPlaneBorderColor: {r: 1, g: 0.2, b: 0, a: 1} - - _Color: {r: 0.72794116, g: 0, b: 0, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1} - - _EnvironmentColorX: {r: 1, g: 0, b: 0, a: 1} - - _EnvironmentColorY: {r: 0, g: 1, b: 0, a: 1} - - _EnvironmentColorZ: {r: 0, g: 0, b: 1, a: 1} - - _GradientAlpha: {r: 1, g: 1, b: 1, a: 1} - - _GradientAlphaTime: {r: 0, g: 0, b: 0, a: 0} - - _GradientColor0: {r: 0.631373, g: 0.631373, b: 0.631373, a: 0} - - _GradientColor1: {r: 1, g: 0.690196, b: 0.976471, a: 0.25} - - _GradientColor2: {r: 0, g: 0.32999998, b: 0.88, a: 0.5} - - _GradientColor3: {r: 0, g: 0.32999998, b: 0.88, a: 1} - - _GradientColor4: {r: 1, g: 1, b: 1, a: 1} - - _HoverColorOpaqueOverride: {r: 1, g: 1, b: 1, a: 1} - - _HoverColorOverride: {r: 0, g: 0.007843138, b: 1, a: 1} - - _InnerGlowColor: {r: 1, g: 1, b: 1, a: 0.75} - - _ProximityLightCenterColorOverride: {r: 1, g: 0, b: 0, a: 0} - - _ProximityLightMiddleColorOverride: {r: 0, g: 1, b: 0, a: 0.5} - - _ProximityLightOuterColorOverride: {r: 0, g: 0, b: 1, a: 1} - - _RimColor: {r: 0, g: 0.006896496, b: 1, a: 1} - - _RoundCornersRadius: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} - m_BuildTextureStacks: [] ---- !u!1 &1162469814 + serializedVersion: 6 + m_Component: + - component: {fileID: 866223477} + m_Layer: 0 + m_Name: ShaderBall (8) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &866223477 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 866223476} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -6.4, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 687910008} + - {fileID: 2078929849} + m_Father: {fileID: 1595900778} + m_RootOrder: 9 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!4 &878230435 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5264854134403395402, guid: 53b4fadc7abe80d4f9549b89f80300d0, type: 3} + m_PrefabInstance: {fileID: 5264854134733198569} + m_PrefabAsset: {fileID: 0} +--- !u!1 &916092929 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -11118,341 +7635,1528 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1162469815} + - component: {fileID: 916092930} m_Layer: 0 - m_Name: ShaderBall (6) + m_Name: GameObject m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &1162469815 +--- !u!4 &916092930 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1162469814} - m_LocalRotation: {x: -0, y: -0.00000008940696, z: 0.9214616, w: 0.3884696} - m_LocalPosition: {x: 0.71, y: 0.74, z: -0} + m_GameObject: {fileID: 916092929} + m_LocalRotation: {x: 0, y: -0.7071068, z: 0, w: 0.7071068} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 227929823} - - {fileID: 640662408} - m_Father: {fileID: 723260586} - m_RootOrder: 7 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 134.281} ---- !u!1001 &1170466718 + - {fileID: 1790579014} + m_Father: {fileID: 162241854} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0} +--- !u!1001 &919228574 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 1250785856} + m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 566361764857432160, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} - propertyPath: m_AnchoredPosition.y - value: -34.5 - objectReference: {fileID: 0} - - target: {fileID: 1438325884843275054, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} - propertyPath: m_IsActive - value: 0 + - target: {fileID: 1667384560894720772, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} + propertyPath: isToggled.onExited.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: objectReference: {fileID: 0} - - target: {fileID: 2446705927233332293, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} - propertyPath: m_text - value: 'Instanced Clipping Example - - - This scene - shows how the Graphics Tools/Standard shader in conjunction with clipping - primitives (ClippingPlane, ClippingSphere, & ClippingBox) can be used to - dynamically clip pixels on meshes instanced on the GPU. This method allows - for significantly more clipped meshes by enabling automatic batching across - all renderers that share the same material even if they interact with different - clipping primitives.' - objectReference: {fileID: 0} - - target: {fileID: 2446705927233332293, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} - propertyPath: m_fontStyle - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3220012215463627515, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 3220012215463627515, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 3220012215463627515, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3220012215463627515, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3220012215463627515, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3220012215463627515, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3220012215463627515, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3220012215463627515, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} - propertyPath: m_SizeDelta.x - value: 213.2298 - objectReference: {fileID: 0} - - target: {fileID: 3220012215463627515, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} - propertyPath: m_SizeDelta.y - value: 93.4684 - objectReference: {fileID: 0} - - target: {fileID: 3220012215463627515, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3220012215463627515, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3220012215463627515, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} - propertyPath: m_LocalPosition.z - value: -1.108 + - target: {fileID: 1667384560894720772, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} + propertyPath: isToggled.onExited.m_PersistentCalls.m_Calls.Array.data[1].m_Target + value: objectReference: {fileID: 0} - - target: {fileID: 3220012215463627515, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} - propertyPath: m_LocalRotation.w - value: 0.953717 + - target: {fileID: 1667384560894720772, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} + propertyPath: isToggled.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: objectReference: {fileID: 0} - - target: {fileID: 3220012215463627515, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} - propertyPath: m_LocalRotation.x - value: 0 + - target: {fileID: 1667384560894720772, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} + propertyPath: isToggled.onEntered.m_PersistentCalls.m_Calls.Array.data[1].m_Target + value: objectReference: {fileID: 0} - - target: {fileID: 3220012215463627515, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} - propertyPath: m_LocalRotation.y - value: -0.30070576 + - target: {fileID: 1667384561245672091, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} + propertyPath: isToggled.onExited.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: objectReference: {fileID: 0} - - target: {fileID: 3220012215463627515, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} - propertyPath: m_LocalRotation.z - value: 0 + - target: {fileID: 1667384561245672091, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} + propertyPath: isToggled.onExited.m_PersistentCalls.m_Calls.Array.data[1].m_Target + value: objectReference: {fileID: 0} - - target: {fileID: 3220012215463627515, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 + - target: {fileID: 1667384561245672091, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} + propertyPath: isToggled.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: objectReference: {fileID: 0} - - target: {fileID: 3220012215463627515, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0.47450006 + - target: {fileID: 1667384561245672091, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} + propertyPath: isToggled.onEntered.m_PersistentCalls.m_Calls.Array.data[1].m_Target + value: objectReference: {fileID: 0} - - target: {fileID: 3220012215463627515, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 + - target: {fileID: 1667384562270007169, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} + propertyPath: isToggled.onExited.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: objectReference: {fileID: 0} - - target: {fileID: 3220012215463627515, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: -35 + - target: {fileID: 1667384562270007169, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} + propertyPath: isToggled.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: objectReference: {fileID: 0} - - target: {fileID: 3220012215463627515, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 + - target: {fileID: 2082148069247382453, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} + propertyPath: Spatialize + value: 1 objectReference: {fileID: 0} - - target: {fileID: 4568172237328552037, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} - propertyPath: m_text - value: Button with Basic Visuals + - target: {fileID: 2082148069247382453, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} + propertyPath: OutputAudioMixerGroup + value: + objectReference: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} + - target: {fileID: 2082148069247382453, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} + propertyPath: panLevelCustomCurve.m_Curve.Array.data[0].value + value: 1 objectReference: {fileID: 0} - - target: {fileID: 5158546944129612579, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} - propertyPath: m_LocalPosition.y - value: -12.1 + - target: {fileID: 3045578032311879198, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} + propertyPath: Spatialize + value: 1 objectReference: {fileID: 0} - - target: {fileID: 5493534032387613222, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} - propertyPath: m_LocalScale.y - value: 162.67668 + - target: {fileID: 3045578032311879198, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} + propertyPath: OutputAudioMixerGroup + value: + objectReference: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} + - target: {fileID: 3045578032311879198, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} + propertyPath: panLevelCustomCurve.m_Curve.Array.data[0].value + value: 1 objectReference: {fileID: 0} - - target: {fileID: 5493534032387613222, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} - propertyPath: m_LocalPosition.y - value: 9.22 + - target: {fileID: 6134130586559970896, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} + propertyPath: Spatialize + value: 1 objectReference: {fileID: 0} - - target: {fileID: 5929991690626966069, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} - propertyPath: m_IsActive - value: 0 + - target: {fileID: 6134130586559970896, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} + propertyPath: OutputAudioMixerGroup + value: + objectReference: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} + - target: {fileID: 6134130586559970896, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} + propertyPath: panLevelCustomCurve.m_Curve.Array.data[0].value + value: 1 objectReference: {fileID: 0} - - target: {fileID: 6540126486176102408, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} - propertyPath: m_Name - value: DescriptionPanel + - target: {fileID: 7326570055845349072, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} + propertyPath: Spatialize + value: 1 objectReference: {fileID: 0} - - target: {fileID: 6809291684801504143, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} - propertyPath: m_text - value: 'PressableButtonStateful.cs - - BasicPressableButtonVisuals.cs' + - target: {fileID: 7326570055845349072, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} + propertyPath: OutputAudioMixerGroup + value: + objectReference: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} + - target: {fileID: 7326570055845349072, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} + propertyPath: panLevelCustomCurve.m_Curve.Array.data[0].value + value: 1 objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} ---- !u!224 &1170466719 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 3220012215463627515, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} - m_PrefabInstance: {fileID: 1170466718} - m_PrefabAsset: {fileID: 0} ---- !u!1001 &1180347530 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 1274666198} - m_Modifications: - - target: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + - target: {fileID: 7372669237086358564, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} propertyPath: m_Name - value: ShaderBall - objectReference: {fileID: 0} - - target: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_StaticEditorFlags - value: 0 + value: HandMenu objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + - target: {fileID: 7372669237086358568, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalScale.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalScale.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalScale.z - value: 1 + value: 4 objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + - target: {fileID: 7372669237086358568, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + - target: {fileID: 7372669237086358568, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + - target: {fileID: 7372669237086358568, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + - target: {fileID: 7372669237086358568, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + - target: {fileID: 7372669237086358568, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + - target: {fileID: 7372669237086358568, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + - target: {fileID: 7372669237086358568, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + - target: {fileID: 7372669237086358568, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + - target: {fileID: 7372669237086358568, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_CastShadows - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_MotionVectors - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_ReceiveShadows + - target: {fileID: 7372669237086358568, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} + propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LightProbeUsage - value: 0 + - target: {fileID: 7618871619398064040, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} + propertyPath: Spatialize + value: 1 objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_ReflectionProbeUsage - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_Materials.Array.data[0] + - target: {fileID: 7618871619398064040, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} + propertyPath: OutputAudioMixerGroup value: - objectReference: {fileID: 1503596314} + objectReference: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} + - target: {fileID: 7618871619398064040, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} + propertyPath: panLevelCustomCurve.m_Curve.Array.data[0].value + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} ---- !u!4 &1180347531 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - m_PrefabInstance: {fileID: 1180347530} + m_SourcePrefab: {fileID: 100100000, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} +--- !u!21 &929061953 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} ---- !u!1 &1180347532 stripped + m_Name: ShaderBallClippingBox (Instance) + m_Shader: {fileID: 4800000, guid: c331f6c43a2ef0945864cb668f2653c9, type: 3} + m_ValidKeywords: + - _BORDER_LIGHT_USES_HOVER_COLOR + - _CLIPPING_BOX + - _DIRECTIONAL_LIGHT + - _DISABLE_ALBEDO_MAP + - _HOVER_COLOR_OVERRIDE + - _HOVER_LIGHT + - _REFLECTIONS + - _RIM_LIGHT + - _SPECULAR_HIGHLIGHTS + - _USE_WORLD_SCALE + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 1 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 2000 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ChannelMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _IridescentSpectrumMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _LightMapTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: 32c57306df745a147a2e02f8827a8cdc, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _NormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AlbedoAlphaMode: 0 + - _AlbedoAlphaSmoothness: 0 + - _AlbedoAssignedAtRuntime: 0 + - _BlendOp: 0 + - _BlendedClippingWidth: 1 + - _BlurBorderIntensity: 0 + - _BlurMode: 0 + - _BlurTextureIntensity: 1 + - _BorderColorMode: 0 + - _BorderLight: 0 + - _BorderLightOpaque: 0 + - _BorderLightOpaqueAlpha: 1 + - _BorderLightReplacesAlbedo: 0 + - _BorderLightUsesHoverColor: 1 + - _BorderMinValue: 0.02 + - _BorderWidth: 0.1 + - _BorderWidthHorizontal: 0.1 + - _BorderWidthVertical: 0.1 + - _BumpScale: 1 + - _ClipBoxSide: 1 + - _ClipPlaneSide: 1 + - _ClipSphereSide: 1 + - _ClippingBorder: 0 + - _ClippingBorderWidth: 0.025 + - _ClippingBox: 1 + - _ClippingPlane: 0 + - _ClippingPlaneBorder: 0 + - _ClippingPlaneBorderWidth: 0.025 + - _ClippingSphere: 0 + - _ColorWriteMask: 15 + - _CullMode: 0 + - _CustomMode: 0 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DirectionalLight: 1 + - _DstBlend: 0 + - _EdgeSmoothingMode: 0 + - _EdgeSmoothingValue: 0.002 + - _EnableChannelMap: 0 + - _EnableEmission: 0 + - _EnableHoverColorOpaqueOverride: 0 + - _EnableHoverColorOverride: 1 + - _EnableLightMap: 0 + - _EnableLocalSpaceTriplanarMapping: 0 + - _EnableNormalMap: 0 + - _EnableProximityLightColorOverride: 0 + - _EnableSSAA: 0 + - _EnableStencil: 0 + - _EnableTriplanarMapping: 0 + - _EnvironmentColorIntensity: 0.5 + - _EnvironmentColorThreshold: 1.5 + - _EnvironmentColoring: 0 + - _Fade: 1 + - _FadeBeginDistance: 0.85 + - _FadeCompleteDistance: 0.5 + - _FadeMinValue: 0 + - _FluentLightIntensity: 1 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _GradientAngle: 180 + - _GradientMode: 0 + - _HoverLight: 1 + - _HoverLightOpaque: 0 + - _IgnoreZScale: 0 + - _IndependentCorners: 0 + - _InnerGlow: 0 + - _InnerGlowPower: 4 + - _InstancedColor: 0 + - _Iridescence: 0 + - _IridescenceAngle: -0.78 + - _IridescenceIntensity: 0.5 + - _IridescenceThreshold: 0.05 + - _Metallic: 0 + - _MipmapBias: -2 + - _Mode: 0 + - _NearLightFade: 0 + - _NearPlaneFade: 0 + - _NormalMapScale: 1 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _ProximityLight: 0 + - _ProximityLightSubtractive: 0 + - _ProximityLightTwoSided: 0 + - _Reflections: 1 + - _Refraction: 0 + - _RefractiveIndex: 1.1 + - _RenderQueueOverride: -1 + - _RimLight: 1 + - _RimPower: 3 + - _RoundCornerMargin: 0 + - _RoundCornerRadius: 0.25 + - _RoundCorners: 0 + - _RoundCornersHideInterior: 0 + - _Smoothness: 1 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SphericalHarmonics: 0 + - _SrcBlend: 1 + - _Stencil: 0 + - _StencilComparison: 0 + - _StencilOperation: 0 + - _StencilReadMask: 255 + - _StencilReference: 0 + - _StencilWriteMask: 255 + - _TriplanarMappingBlendSharpness: 4 + - _UVSec: 0 + - _UseWorldScale: 1 + - _VertexColors: 0 + - _VertexExtrusion: 0 + - _VertexExtrusionSmoothNormals: 0 + - _VertexExtrusionValue: 0 + - _ZOffsetFactor: 0 + - _ZOffsetUnits: 0 + - _ZTest: 4 + - _ZWrite: 1 + m_Colors: + - _BlurBackgroundRect: {r: 0, g: 0, b: 1, a: 1} + - _BorderColor: {r: 1, g: 1, b: 1, a: 0} + - _ClipBoxSize: {r: 1, g: 1, b: 1, a: 0} + - _ClipPlane: {r: 0, g: 1, b: 0, a: 0} + - _ClipSphere: {r: 0, g: 0, b: 0, a: 0.5} + - _ClippingBorderColor: {r: 1, g: 0.2, b: 0, a: 1} + - _ClippingPlaneBorderColor: {r: 1, g: 0.2, b: 0, a: 1} + - _Color: {r: 0.72794116, g: 0, b: 0, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1} + - _EnvironmentColorX: {r: 1, g: 0, b: 0, a: 1} + - _EnvironmentColorY: {r: 0, g: 1, b: 0, a: 1} + - _EnvironmentColorZ: {r: 0, g: 0, b: 1, a: 1} + - _GradientAlpha: {r: 1, g: 1, b: 1, a: 1} + - _GradientAlphaTime: {r: 0, g: 0, b: 0, a: 0} + - _GradientColor0: {r: 0.631373, g: 0.631373, b: 0.631373, a: 0} + - _GradientColor1: {r: 1, g: 0.690196, b: 0.976471, a: 0.25} + - _GradientColor2: {r: 0, g: 0.32999998, b: 0.88, a: 0.5} + - _GradientColor3: {r: 0, g: 0.32999998, b: 0.88, a: 1} + - _GradientColor4: {r: 1, g: 1, b: 1, a: 1} + - _HoverColorOpaqueOverride: {r: 1, g: 1, b: 1, a: 1} + - _HoverColorOverride: {r: 0, g: 0.007843138, b: 1, a: 1} + - _InnerGlowColor: {r: 1, g: 1, b: 1, a: 0.75} + - _ProximityLightCenterColorOverride: {r: 1, g: 0, b: 0, a: 0} + - _ProximityLightMiddleColorOverride: {r: 0, g: 1, b: 0, a: 0.5} + - _ProximityLightOuterColorOverride: {r: 0, g: 0, b: 1, a: 1} + - _RimColor: {r: 0, g: 0.006896496, b: 1, a: 1} + - _RoundCornersRadius: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} + m_BuildTextureStacks: [] +--- !u!21 &943765560 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: ShaderBallClippingPlaneInner (Instance) + m_Shader: {fileID: 4800000, guid: c331f6c43a2ef0945864cb668f2653c9, type: 3} + m_ValidKeywords: + - _CLIPPING_PLANE + - _DIRECTIONAL_LIGHT + - _DISABLE_ALBEDO_MAP + - _EMISSION + - _HOVER_LIGHT + - _REFLECTIONS + - _SPECULAR_HIGHLIGHTS + - _USE_WORLD_SCALE + m_InvalidKeywords: + - _CLIPPING_PLANE_BORDER + m_LightmapFlags: 4 + m_EnableInstancingVariants: 1 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 2000 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ChannelMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _IridescentSpectrumMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _LightMapTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: 32c57306df745a147a2e02f8827a8cdc, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _NormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AlbedoAlphaMode: 0 + - _AlbedoAlphaSmoothness: 0 + - _AlbedoAssignedAtRuntime: 0 + - _BlendOp: 0 + - _BlendedClippingWidth: 1 + - _BlurBorderIntensity: 0 + - _BlurMode: 0 + - _BlurTextureIntensity: 1 + - _BorderColorMode: 0 + - _BorderLight: 0 + - _BorderLightOpaque: 0 + - _BorderLightOpaqueAlpha: 1 + - _BorderLightReplacesAlbedo: 0 + - _BorderLightUsesHoverColor: 0 + - _BorderMinValue: 0.02 + - _BorderWidth: 0.1 + - _BorderWidthHorizontal: 0.1 + - _BorderWidthVertical: 0.1 + - _BumpScale: 1 + - _ClippingBorder: 0 + - _ClippingBorderWidth: 0.025 + - _ClippingBox: 0 + - _ClippingPlane: 1 + - _ClippingPlaneBorder: 1 + - _ClippingPlaneBorderWidth: 0.02 + - _ClippingSphere: 0 + - _ColorWriteMask: 15 + - _Cull: 2 + - _CullMode: 1 + - _CustomMode: 0 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DirectionalLight: 1 + - _DstBlend: 0 + - _EdgeSmoothingMode: 0 + - _EdgeSmoothingValue: 0.002 + - _EnableChannelMap: 0 + - _EnableEmission: 1 + - _EnableHoverColorOpaqueOverride: 0 + - _EnableHoverColorOverride: 0 + - _EnableLightMap: 0 + - _EnableLocalSpaceTriplanarMapping: 0 + - _EnableNormalMap: 0 + - _EnableProximityLightColorOverride: 0 + - _EnableSSAA: 0 + - _EnableStencil: 0 + - _EnableTriplanarMapping: 0 + - _EnvironmentColorIntensity: 0.5 + - _EnvironmentColorThreshold: 1.5 + - _EnvironmentColoring: 0 + - _Fade: 1 + - _FadeBeginDistance: 0.85 + - _FadeCompleteDistance: 0.5 + - _FadeMinValue: 0 + - _FluentLightIntensity: 1 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _GradientAngle: 180 + - _GradientMode: 0 + - _HoverLight: 1 + - _HoverLightOpaque: 0 + - _IgnoreZScale: 0 + - _IndependentCorners: 0 + - _InnerGlow: 0 + - _InnerGlowPower: 4 + - _InstancedColor: 0 + - _Iridescence: 0 + - _IridescenceAngle: -0.78 + - _IridescenceIntensity: 0.5 + - _IridescenceThreshold: 0.05 + - _Metallic: 0.036 + - _MipmapBias: -2 + - _Mode: 0 + - _MyCullVariable: 1 + - _NearLightFade: 0 + - _NearPlaneFade: 0 + - _NormalMapScale: 1 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _ProximityLight: 0 + - _ProximityLightSubtractive: 0 + - _ProximityLightTwoSided: 0 + - _Reflections: 1 + - _Refraction: 0 + - _RefractiveIndex: 1.1 + - _RenderQueueOverride: -1 + - _RimLight: 0 + - _RimPower: 3 + - _RoundCornerMargin: 0 + - _RoundCornerPower: 0.4 + - _RoundCornerRadius: 0.25 + - _RoundCorners: 0 + - _RoundCornersHideInterior: 0 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SphericalHarmonics: 0 + - _SrcBlend: 1 + - _Stencil: 0 + - _StencilComparison: 0 + - _StencilOperation: 0 + - _StencilReadMask: 255 + - _StencilReference: 0 + - _StencilWriteMask: 255 + - _TriplanarMappingBlendSharpness: 4 + - _UVSec: 0 + - _UseWorldScale: 1 + - _VertexColors: 0 + - _VertexExtrusion: 0 + - _VertexExtrusionSmoothNormals: 0 + - _VertexExtrusionValue: 0 + - _ZOffsetFactor: 0 + - _ZOffsetUnits: 0 + - _ZTest: 4 + - _ZWrite: 1 + m_Colors: + - _BlurBackgroundRect: {r: 0, g: 0, b: 1, a: 1} + - _BorderColor: {r: 1, g: 1, b: 1, a: 0} + - _ClipPlane: {r: 0, g: 1, b: 0, a: 0} + - _ClippingBorderColor: {r: 1, g: 0.2, b: 0, a: 1} + - _ClippingPlaneBorderColor: {r: 1, g: 0.2, b: 0, a: 1} + - _Color: {r: 1, g: 0.6827586, b: 0, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _EmissiveColor: {r: 0.9411765, g: 0, b: 0, a: 1} + - _EnvironmentColorX: {r: 1, g: 0, b: 0, a: 1} + - _EnvironmentColorY: {r: 0, g: 1, b: 0, a: 1} + - _EnvironmentColorZ: {r: 0, g: 0, b: 1, a: 1} + - _GradientAlpha: {r: 1, g: 1, b: 1, a: 1} + - _GradientAlphaTime: {r: 0, g: 0, b: 0, a: 0} + - _GradientColor0: {r: 0.631373, g: 0.631373, b: 0.631373, a: 0} + - _GradientColor1: {r: 1, g: 0.690196, b: 0.976471, a: 0.25} + - _GradientColor2: {r: 0, g: 0.32999998, b: 0.88, a: 0.5} + - _GradientColor3: {r: 0, g: 0.32999998, b: 0.88, a: 1} + - _GradientColor4: {r: 1, g: 1, b: 1, a: 1} + - _HoverColor: {r: 1, g: 0, b: 0, a: 1} + - _HoverColorOpaqueOverride: {r: 1, g: 1, b: 1, a: 1} + - _HoverColorOverride: {r: 1, g: 1, b: 1, a: 1} + - _InnerGlowColor: {r: 1, g: 1, b: 1, a: 0.75} + - _ProximityLightCenterColorOverride: {r: 1, g: 0, b: 0, a: 0} + - _ProximityLightMiddleColorOverride: {r: 0, g: 1, b: 0, a: 0.5} + - _ProximityLightOuterColorOverride: {r: 0, g: 0, b: 1, a: 1} + - _RimColor: {r: 1, g: 1, b: 1, a: 1} + - _RoundCornersRadius: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} + m_BuildTextureStacks: [] +--- !u!1 &955809412 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 955809413} + m_Layer: 0 + m_Name: ShaderBall (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &955809413 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 955809412} + m_LocalRotation: {x: -0, y: 0.000000074505806, z: -0.48919588, w: 0.87217396} + m_LocalPosition: {x: -0.98, y: -0.64, z: -0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1865679674} + - {fileID: 2090454749} + m_Father: {fileID: 723260586} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: -58.575005} +--- !u!1 &958324214 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 8323939510892415185, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} + m_PrefabInstance: {fileID: 1170466718} + m_PrefabAsset: {fileID: 0} +--- !u!114 &958324215 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 958324214} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d9ad66e7cc9a2754d8ea989740c9f00d, type: 3} + m_Name: + m_EditorClassIdentifier: + m_InteractionManager: {fileID: 0} + m_Colliders: [] + m_InteractionLayers: + m_Bits: 1 + m_DistanceCalculationMode: 1 + m_SelectMode: 1 + m_FocusMode: 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: [] + m_LastHoverExited: + m_PersistentCalls: + m_Calls: [] + m_HoverEntered: + m_PersistentCalls: + m_Calls: [] + m_HoverExited: + m_PersistentCalls: + m_Calls: [] + m_FirstSelectEntered: + m_PersistentCalls: + m_Calls: [] + m_LastSelectExited: + m_PersistentCalls: + m_Calls: [] + m_SelectEntered: + m_PersistentCalls: + m_Calls: [] + m_SelectExited: + m_PersistentCalls: + m_Calls: [] + m_FirstFocusEntered: + m_PersistentCalls: + m_Calls: [] + m_LastFocusExited: + m_PersistentCalls: + m_Calls: [] + m_FocusEntered: + m_PersistentCalls: + m_Calls: [] + m_FocusExited: + m_PersistentCalls: + m_Calls: [] + m_Activated: + m_PersistentCalls: + m_Calls: [] + m_Deactivated: + m_PersistentCalls: + m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] + isGazePinchSelected: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isRaySelected: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isPokeSelected: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isGrabSelected: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isGazeHovered: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isGazePinchHovered: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isRayHovered: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isGrabHovered: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isPokeHovered: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isActiveHovered: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + disabledInteractorTypes: + - reference: MixedReality.Toolkit.IPokeInteractor, MixedReality.Toolkit.Core + k__BackingField: 0 + k__BackingField: 0.9 + k__BackingField: 0.1 + k__BackingField: 1 + k__BackingField: 0 + k__BackingField: 1 + k__BackingField: 0 + k__BackingField: 1 + allowSelectByVoice: 1 + speechRecognitionKeyword: select + k__BackingField: 1 + k__BackingField: 0 + k__BackingField: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + k__BackingField: + m_PersistentCalls: + m_Calls: [] + k__BackingField: + m_PersistentCalls: + m_Calls: [] + k__BackingField: + m_PersistentCalls: + m_Calls: [] + hostTransform: {fileID: 1250785856} + allowedManipulations: 7 + allowedInteractionTypes: -2147483641 + rigidbodyMovementType: 0 + applyTorque: 1 + springForceSoftness: 0.1 + springTorqueSoftness: 0.1 + springDamping: 1 + springForceLimit: 100 + rotationAnchorNear: 1 + rotationAnchorFar: 1 + releaseBehavior: 3 + transformSmoothingLogicType: + reference: MixedReality.Toolkit.SpatialManipulation.DefaultTransformSmoothingLogic, + MixedReality.Toolkit.SpatialManipulation + smoothingFar: 1 + smoothingNear: 1 + moveLerpTime: 0.001 + rotateLerpTime: 0.001 + scaleLerpTime: 0.001 + enableConstraints: 1 + constraintsManager: {fileID: 958324216} + manipulationLogicTypes: + moveLogicType: + reference: MixedReality.Toolkit.SpatialManipulation.MoveLogic, MixedReality.Toolkit.SpatialManipulation + rotateLogicType: + reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, MixedReality.Toolkit.SpatialManipulation + scaleLogicType: + reference: MixedReality.Toolkit.SpatialManipulation.ScaleLogic, MixedReality.Toolkit.SpatialManipulation +--- !u!114 &958324216 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 958324214} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 50cdab0cd5a0916419324bb54314773d, type: 3} + m_Name: + m_EditorClassIdentifier: + autoConstraintSelection: 1 + selectedConstraints: [] +--- !u!65 &958324217 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 958324214} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 0.99999994, y: 1.0000001, z: 0.099999994} + m_Center: {x: 0, y: 0, z: 0.049999997} +--- !u!114 &958324219 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 958324214} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 80f85af46f9bddd4ea78f11cee5e3b2e, type: 3} + m_Name: + m_EditorClassIdentifier: + handType: 3 + proximityType: 3 + executionOrder: 0 + minimumScale: {x: 0.2, y: 0.2, z: 0.2} + maximumScale: {x: 2, y: 2, z: 2} + relativeToInitialState: 1 +--- !u!1 &973147020 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 973147021} + m_Layer: 0 + m_Name: ShaderBall (5) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &973147021 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 973147020} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -4, y: 0.3, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 616142845} + - {fileID: 1058943381} + m_Father: {fileID: 1595900778} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!21 &975595898 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: ShaderBallClippingPlaneInner (Instance) + m_Shader: {fileID: 4800000, guid: c331f6c43a2ef0945864cb668f2653c9, type: 3} + m_ValidKeywords: + - _CLIPPING_PLANE + - _DIRECTIONAL_LIGHT + - _DISABLE_ALBEDO_MAP + - _EMISSION + - _HOVER_LIGHT + - _REFLECTIONS + - _SPECULAR_HIGHLIGHTS + - _USE_WORLD_SCALE + m_InvalidKeywords: + - _CLIPPING_PLANE_BORDER + m_LightmapFlags: 4 + m_EnableInstancingVariants: 1 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 2000 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ChannelMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _IridescentSpectrumMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _LightMapTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: 32c57306df745a147a2e02f8827a8cdc, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _NormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AlbedoAlphaMode: 0 + - _AlbedoAlphaSmoothness: 0 + - _AlbedoAssignedAtRuntime: 0 + - _BlendOp: 0 + - _BlendedClippingWidth: 1 + - _BlurBorderIntensity: 0 + - _BlurMode: 0 + - _BlurTextureIntensity: 1 + - _BorderColorMode: 0 + - _BorderLight: 0 + - _BorderLightOpaque: 0 + - _BorderLightOpaqueAlpha: 1 + - _BorderLightReplacesAlbedo: 0 + - _BorderLightUsesHoverColor: 0 + - _BorderMinValue: 0.02 + - _BorderWidth: 0.1 + - _BorderWidthHorizontal: 0.1 + - _BorderWidthVertical: 0.1 + - _BumpScale: 1 + - _ClippingBorder: 0 + - _ClippingBorderWidth: 0.025 + - _ClippingBox: 0 + - _ClippingPlane: 1 + - _ClippingPlaneBorder: 1 + - _ClippingPlaneBorderWidth: 0.02 + - _ClippingSphere: 0 + - _ColorWriteMask: 15 + - _Cull: 2 + - _CullMode: 1 + - _CustomMode: 0 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DirectionalLight: 1 + - _DstBlend: 0 + - _EdgeSmoothingMode: 0 + - _EdgeSmoothingValue: 0.002 + - _EnableChannelMap: 0 + - _EnableEmission: 1 + - _EnableHoverColorOpaqueOverride: 0 + - _EnableHoverColorOverride: 0 + - _EnableLightMap: 0 + - _EnableLocalSpaceTriplanarMapping: 0 + - _EnableNormalMap: 0 + - _EnableProximityLightColorOverride: 0 + - _EnableSSAA: 0 + - _EnableStencil: 0 + - _EnableTriplanarMapping: 0 + - _EnvironmentColorIntensity: 0.5 + - _EnvironmentColorThreshold: 1.5 + - _EnvironmentColoring: 0 + - _Fade: 1 + - _FadeBeginDistance: 0.85 + - _FadeCompleteDistance: 0.5 + - _FadeMinValue: 0 + - _FluentLightIntensity: 1 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _GradientAngle: 180 + - _GradientMode: 0 + - _HoverLight: 1 + - _HoverLightOpaque: 0 + - _IgnoreZScale: 0 + - _IndependentCorners: 0 + - _InnerGlow: 0 + - _InnerGlowPower: 4 + - _InstancedColor: 0 + - _Iridescence: 0 + - _IridescenceAngle: -0.78 + - _IridescenceIntensity: 0.5 + - _IridescenceThreshold: 0.05 + - _Metallic: 0.036 + - _MipmapBias: -2 + - _Mode: 0 + - _MyCullVariable: 1 + - _NearLightFade: 0 + - _NearPlaneFade: 0 + - _NormalMapScale: 1 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _ProximityLight: 0 + - _ProximityLightSubtractive: 0 + - _ProximityLightTwoSided: 0 + - _Reflections: 1 + - _Refraction: 0 + - _RefractiveIndex: 1.1 + - _RenderQueueOverride: -1 + - _RimLight: 0 + - _RimPower: 3 + - _RoundCornerMargin: 0 + - _RoundCornerPower: 0.4 + - _RoundCornerRadius: 0.25 + - _RoundCorners: 0 + - _RoundCornersHideInterior: 0 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SphericalHarmonics: 0 + - _SrcBlend: 1 + - _Stencil: 0 + - _StencilComparison: 0 + - _StencilOperation: 0 + - _StencilReadMask: 255 + - _StencilReference: 0 + - _StencilWriteMask: 255 + - _TriplanarMappingBlendSharpness: 4 + - _UVSec: 0 + - _UseWorldScale: 1 + - _VertexColors: 0 + - _VertexExtrusion: 0 + - _VertexExtrusionSmoothNormals: 0 + - _VertexExtrusionValue: 0 + - _ZOffsetFactor: 0 + - _ZOffsetUnits: 0 + - _ZTest: 4 + - _ZWrite: 1 + m_Colors: + - _BlurBackgroundRect: {r: 0, g: 0, b: 1, a: 1} + - _BorderColor: {r: 1, g: 1, b: 1, a: 0} + - _ClipPlane: {r: 0, g: 1, b: 0, a: 0} + - _ClippingBorderColor: {r: 1, g: 0.2, b: 0, a: 1} + - _ClippingPlaneBorderColor: {r: 1, g: 0.2, b: 0, a: 1} + - _Color: {r: 1, g: 0.6827586, b: 0, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _EmissiveColor: {r: 0.9411765, g: 0, b: 0, a: 1} + - _EnvironmentColorX: {r: 1, g: 0, b: 0, a: 1} + - _EnvironmentColorY: {r: 0, g: 1, b: 0, a: 1} + - _EnvironmentColorZ: {r: 0, g: 0, b: 1, a: 1} + - _GradientAlpha: {r: 1, g: 1, b: 1, a: 1} + - _GradientAlphaTime: {r: 0, g: 0, b: 0, a: 0} + - _GradientColor0: {r: 0.631373, g: 0.631373, b: 0.631373, a: 0} + - _GradientColor1: {r: 1, g: 0.690196, b: 0.976471, a: 0.25} + - _GradientColor2: {r: 0, g: 0.32999998, b: 0.88, a: 0.5} + - _GradientColor3: {r: 0, g: 0.32999998, b: 0.88, a: 1} + - _GradientColor4: {r: 1, g: 1, b: 1, a: 1} + - _HoverColor: {r: 1, g: 0, b: 0, a: 1} + - _HoverColorOpaqueOverride: {r: 1, g: 1, b: 1, a: 1} + - _HoverColorOverride: {r: 1, g: 1, b: 1, a: 1} + - _InnerGlowColor: {r: 1, g: 1, b: 1, a: 0.75} + - _ProximityLightCenterColorOverride: {r: 1, g: 0, b: 0, a: 0} + - _ProximityLightMiddleColorOverride: {r: 0, g: 1, b: 0, a: 0.5} + - _ProximityLightOuterColorOverride: {r: 0, g: 0, b: 1, a: 1} + - _RimColor: {r: 1, g: 1, b: 1, a: 1} + - _RoundCornersRadius: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} + m_BuildTextureStacks: [] +--- !u!21 &1007155415 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: ShaderBallClippingPlaneInner (Instance) + m_Shader: {fileID: 4800000, guid: c331f6c43a2ef0945864cb668f2653c9, type: 3} + m_ValidKeywords: + - _CLIPPING_PLANE + - _DIRECTIONAL_LIGHT + - _DISABLE_ALBEDO_MAP + - _EMISSION + - _HOVER_LIGHT + - _REFLECTIONS + - _SPECULAR_HIGHLIGHTS + - _USE_WORLD_SCALE + m_InvalidKeywords: + - _CLIPPING_PLANE_BORDER + m_LightmapFlags: 4 + m_EnableInstancingVariants: 1 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 2000 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ChannelMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissiveMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _IridescentSpectrumMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _LightMapTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: 32c57306df745a147a2e02f8827a8cdc, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _NormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AlbedoAlphaMode: 0 + - _AlbedoAlphaSmoothness: 0 + - _AlbedoAssignedAtRuntime: 0 + - _BlendOp: 0 + - _BlendedClippingWidth: 1 + - _BlurBorderIntensity: 0 + - _BlurMode: 0 + - _BlurTextureIntensity: 1 + - _BorderColorMode: 0 + - _BorderLight: 0 + - _BorderLightOpaque: 0 + - _BorderLightOpaqueAlpha: 1 + - _BorderLightReplacesAlbedo: 0 + - _BorderLightUsesHoverColor: 0 + - _BorderMinValue: 0.02 + - _BorderWidth: 0.1 + - _BorderWidthHorizontal: 0.1 + - _BorderWidthVertical: 0.1 + - _BumpScale: 1 + - _ClippingBorder: 0 + - _ClippingBorderWidth: 0.025 + - _ClippingBox: 0 + - _ClippingPlane: 1 + - _ClippingPlaneBorder: 1 + - _ClippingPlaneBorderWidth: 0.02 + - _ClippingSphere: 0 + - _ColorWriteMask: 15 + - _Cull: 2 + - _CullMode: 1 + - _CustomMode: 0 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DirectionalLight: 1 + - _DstBlend: 0 + - _DstBlendAlpha: 1 + - _EdgeSmoothingMode: 0 + - _EdgeSmoothingValue: 0.002 + - _EnableChannelMap: 0 + - _EnableEmission: 1 + - _EnableHoverColorOpaqueOverride: 0 + - _EnableHoverColorOverride: 0 + - _EnableLightMap: 0 + - _EnableLocalSpaceTriplanarMapping: 0 + - _EnableNormalMap: 0 + - _EnableProximityLightColorOverride: 0 + - _EnableSSAA: 0 + - _EnableStencil: 0 + - _EnableTriplanarMapping: 0 + - _EnvironmentColorIntensity: 0.5 + - _EnvironmentColorThreshold: 1.5 + - _EnvironmentColoring: 0 + - _Fade: 1 + - _FadeBeginDistance: 0.85 + - _FadeCompleteDistance: 0.5 + - _FadeMinValue: 0 + - _FluentLightIntensity: 1 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _GradientAngle: 180 + - _GradientMode: 0 + - _HoverLight: 1 + - _HoverLightOpaque: 0 + - _IgnoreZScale: 0 + - _IndependentCorners: 0 + - _InnerGlow: 0 + - _InnerGlowPower: 4 + - _InstancedColor: 0 + - _Iridescence: 0 + - _IridescenceAngle: -0.78 + - _IridescenceIntensity: 0.5 + - _IridescenceThreshold: 0.05 + - _Metallic: 0.036 + - _MipmapBias: -2 + - _Mode: 0 + - _MyCullVariable: 1 + - _NPR: 0 + - _NearLightFade: 0 + - _NearPlaneFade: 0 + - _NormalMapScale: 1 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _ProximityLight: 0 + - _ProximityLightSubtractive: 0 + - _ProximityLightTwoSided: 0 + - _Reflections: 1 + - _Refraction: 0 + - _RefractiveIndex: 1.1 + - _RenderQueueOverride: -1 + - _RimLight: 0 + - _RimPower: 3 + - _RoundCornerMargin: 0 + - _RoundCornerPower: 0.4 + - _RoundCornerRadius: 0.25 + - _RoundCorners: 0 + - _RoundCornersHideInterior: 0 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SphericalHarmonics: 0 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Stencil: 0 + - _StencilComparison: 0 + - _StencilOperation: 0 + - _StencilReadMask: 255 + - _StencilReference: 0 + - _StencilWriteMask: 255 + - _TriplanarMappingBlendSharpness: 4 + - _UVSec: 0 + - _UseWorldScale: 1 + - _VertexColors: 0 + - _VertexExtrusion: 0 + - _VertexExtrusionConstantWidth: 0 + - _VertexExtrusionSmoothNormals: 0 + - _VertexExtrusionValue: 0 + - _ZOffsetFactor: 0 + - _ZOffsetUnits: 0 + - _ZTest: 4 + - _ZWrite: 1 + m_Colors: + - _BlurBackgroundRect: {r: 0, g: 0, b: 1, a: 1} + - _BorderColor: {r: 1, g: 1, b: 1, a: 0} + - _ClipPlane: {r: 0, g: 1, b: 0, a: 0} + - _ClippingBorderColor: {r: 1, g: 0.2, b: 0, a: 1} + - _ClippingPlaneBorderColor: {r: 1, g: 0.2, b: 0, a: 1} + - _Color: {r: 1, g: 0.6827586, b: 0, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _EmissiveColor: {r: 0.9411765, g: 0, b: 0, a: 1} + - _EnvironmentColorX: {r: 1, g: 0, b: 0, a: 1} + - _EnvironmentColorY: {r: 0, g: 1, b: 0, a: 1} + - _EnvironmentColorZ: {r: 0, g: 0, b: 1, a: 1} + - _GradientAlpha: {r: 1, g: 1, b: 1, a: 1} + - _GradientAlphaTime: {r: 0, g: 0, b: 0, a: 0} + - _GradientColor0: {r: 0.631373, g: 0.631373, b: 0.631373, a: 0} + - _GradientColor1: {r: 1, g: 0.690196, b: 0.976471, a: 0.25} + - _GradientColor2: {r: 0, g: 0.32999998, b: 0.88, a: 0.5} + - _GradientColor3: {r: 0, g: 0.32999998, b: 0.88, a: 1} + - _GradientColor4: {r: 1, g: 1, b: 1, a: 1} + - _HoverColor: {r: 1, g: 0, b: 0, a: 1} + - _HoverColorOpaqueOverride: {r: 1, g: 1, b: 1, a: 1} + - _HoverColorOverride: {r: 1, g: 1, b: 1, a: 1} + - _InnerGlowColor: {r: 1, g: 1, b: 1, a: 0.75} + - _ProximityLightCenterColorOverride: {r: 1, g: 0, b: 0, a: 0} + - _ProximityLightMiddleColorOverride: {r: 0, g: 1, b: 0, a: 0.5} + - _ProximityLightOuterColorOverride: {r: 0, g: 0, b: 1, a: 1} + - _RimColor: {r: 1, g: 1, b: 1, a: 1} + - _RoundCornersRadius: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} + m_BuildTextureStacks: [] +--- !u!1 &1008789740 GameObject: - m_CorrespondingSourceObject: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - m_PrefabInstance: {fileID: 1180347530} - m_PrefabAsset: {fileID: 0} ---- !u!64 &1180347533 -MeshCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1180347532} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 4 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: 4300002, guid: 1104611d051d4e42a68391888b61b32e, type: 3} ---- !u!23 &1180347534 stripped -MeshRenderer: - m_CorrespondingSourceObject: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - m_PrefabInstance: {fileID: 1180347530} + serializedVersion: 6 + m_Component: + - component: {fileID: 1008789741} + - component: {fileID: 1008789743} + m_Layer: 0 + m_Name: ClippingPlane + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1008789741 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} ---- !u!114 &1180347536 + m_GameObject: {fileID: 1008789740} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 365058296} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1008789743 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1180347532} + m_GameObject: {fileID: 1008789740} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c53e2b0613597e849870c4a691d25e0f, type: 3} + m_Script: {fileID: 11500000, guid: c69c48e6206a97e4c95f6f21a5b521c9, type: 3} m_Name: m_EditorClassIdentifier: - defaultMaterials: - - {fileID: 2100000, guid: 9f21cf60c2137a64dbe161430f7c0b75, type: 2} ---- !u!21 &1205347890 + applyToSharedMaterial: 0 + renderers: + - {fileID: 623737357} + - {fileID: 1484576915} + - {fileID: 1631871846} + - {fileID: 48993998} + - {fileID: 2046883233} + - {fileID: 745713254} + - {fileID: 1434900816} + - {fileID: 1038663550} + - {fileID: 1932829213} + - {fileID: 164497537} + - {fileID: 616142848} + - {fileID: 1058943384} + - {fileID: 48176122} + - {fileID: 781216075} + - {fileID: 441466250} + - {fileID: 1141845619} + - {fileID: 687910011} + - {fileID: 2078929852} + materials: [] + clippingSide: 1 + useOnPreRender: 0 +--- !u!21 &1018197722 Material: serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: ShaderBallClippingBox (Instance) + m_Name: ShaderBallClippingPlaneInner (Instance) m_Shader: {fileID: 4800000, guid: c331f6c43a2ef0945864cb668f2653c9, type: 3} m_ValidKeywords: - - _BORDER_LIGHT_USES_HOVER_COLOR - - _CLIPPING_BOX + - _CLIPPING_PLANE - _DIRECTIONAL_LIGHT - _DISABLE_ALBEDO_MAP - - _HOVER_COLOR_OVERRIDE + - _EMISSION - _HOVER_LIGHT - _REFLECTIONS - - _RIM_LIGHT - _SPECULAR_HIGHLIGHTS - _USE_WORLD_SCALE - m_InvalidKeywords: [] + m_InvalidKeywords: + - _CLIPPING_PLANE_BORDER m_LightmapFlags: 4 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 @@ -11487,6 +9191,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _EmissiveMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _IridescentSpectrumMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -11530,35 +9238,34 @@ Material: - _BorderLightOpaque: 0 - _BorderLightOpaqueAlpha: 1 - _BorderLightReplacesAlbedo: 0 - - _BorderLightUsesHoverColor: 1 + - _BorderLightUsesHoverColor: 0 - _BorderMinValue: 0.02 - _BorderWidth: 0.1 - _BorderWidthHorizontal: 0.1 - _BorderWidthVertical: 0.1 - _BumpScale: 1 - - _ClipBoxSide: 1 - - _ClipPlaneSide: 1 - - _ClipSphereSide: 1 - _ClippingBorder: 0 - _ClippingBorderWidth: 0.025 - - _ClippingBox: 1 - - _ClippingPlane: 0 - - _ClippingPlaneBorder: 0 - - _ClippingPlaneBorderWidth: 0.025 + - _ClippingBox: 0 + - _ClippingPlane: 1 + - _ClippingPlaneBorder: 1 + - _ClippingPlaneBorderWidth: 0.02 - _ClippingSphere: 0 - _ColorWriteMask: 15 - - _CullMode: 0 + - _Cull: 2 + - _CullMode: 1 - _CustomMode: 0 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DirectionalLight: 1 - _DstBlend: 0 + - _DstBlendAlpha: 1 - _EdgeSmoothingMode: 0 - _EdgeSmoothingValue: 0.002 - _EnableChannelMap: 0 - - _EnableEmission: 0 + - _EnableEmission: 1 - _EnableHoverColorOpaqueOverride: 0 - - _EnableHoverColorOverride: 1 + - _EnableHoverColorOverride: 0 - _EnableLightMap: 0 - _EnableLocalSpaceTriplanarMapping: 0 - _EnableNormalMap: 0 @@ -11590,9 +9297,11 @@ Material: - _IridescenceAngle: -0.78 - _IridescenceIntensity: 0.5 - _IridescenceThreshold: 0.05 - - _Metallic: 0 + - _Metallic: 0.036 - _MipmapBias: -2 - _Mode: 0 + - _MyCullVariable: 1 + - _NPR: 0 - _NearLightFade: 0 - _NearPlaneFade: 0 - _NormalMapScale: 1 @@ -11605,17 +9314,19 @@ Material: - _Refraction: 0 - _RefractiveIndex: 1.1 - _RenderQueueOverride: -1 - - _RimLight: 1 + - _RimLight: 0 - _RimPower: 3 - _RoundCornerMargin: 0 + - _RoundCornerPower: 0.4 - _RoundCornerRadius: 0.25 - _RoundCorners: 0 - _RoundCornersHideInterior: 0 - - _Smoothness: 1 + - _Smoothness: 0.5 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SphericalHarmonics: 0 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Stencil: 0 - _StencilComparison: 0 - _StencilOperation: 0 @@ -11627,6 +9338,7 @@ Material: - _UseWorldScale: 1 - _VertexColors: 0 - _VertexExtrusion: 0 + - _VertexExtrusionConstantWidth: 0 - _VertexExtrusionSmoothNormals: 0 - _VertexExtrusionValue: 0 - _ZOffsetFactor: 0 @@ -11636,14 +9348,12 @@ Material: m_Colors: - _BlurBackgroundRect: {r: 0, g: 0, b: 1, a: 1} - _BorderColor: {r: 1, g: 1, b: 1, a: 0} - - _ClipBoxSize: {r: 1, g: 1, b: 1, a: 0} - _ClipPlane: {r: 0, g: 1, b: 0, a: 0} - - _ClipSphere: {r: 0, g: 0, b: 0, a: 0.5} - _ClippingBorderColor: {r: 1, g: 0.2, b: 0, a: 1} - _ClippingPlaneBorderColor: {r: 1, g: 0.2, b: 0, a: 1} - - _Color: {r: 0.72794116, g: 0, b: 0, a: 1} + - _Color: {r: 1, g: 0.6827586, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1} + - _EmissiveColor: {r: 0.9411765, g: 0, b: 0, a: 1} - _EnvironmentColorX: {r: 1, g: 0, b: 0, a: 1} - _EnvironmentColorY: {r: 0, g: 1, b: 0, a: 1} - _EnvironmentColorZ: {r: 0, g: 0, b: 1, a: 1} @@ -11654,25 +9364,166 @@ Material: - _GradientColor2: {r: 0, g: 0.32999998, b: 0.88, a: 0.5} - _GradientColor3: {r: 0, g: 0.32999998, b: 0.88, a: 1} - _GradientColor4: {r: 1, g: 1, b: 1, a: 1} + - _HoverColor: {r: 1, g: 0, b: 0, a: 1} - _HoverColorOpaqueOverride: {r: 1, g: 1, b: 1, a: 1} - - _HoverColorOverride: {r: 0, g: 0.007843138, b: 1, a: 1} + - _HoverColorOverride: {r: 1, g: 1, b: 1, a: 1} - _InnerGlowColor: {r: 1, g: 1, b: 1, a: 0.75} - _ProximityLightCenterColorOverride: {r: 1, g: 0, b: 0, a: 0} - _ProximityLightMiddleColorOverride: {r: 0, g: 1, b: 0, a: 0.5} - _ProximityLightOuterColorOverride: {r: 0, g: 0, b: 1, a: 1} - - _RimColor: {r: 0, g: 0.006896496, b: 1, a: 1} + - _RimColor: {r: 1, g: 1, b: 1, a: 1} - _RoundCornersRadius: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} m_BuildTextureStacks: [] ---- !u!1001 &1226438752 +--- !u!1001 &1038663546 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 641881980} + m_Modifications: + - target: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_Name + value: ShaderBallInner + objectReference: {fileID: 0} + - target: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_CastShadows + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_MotionVectors + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_ReceiveShadows + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LightProbeUsage + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_Materials.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_ReflectionProbeUsage + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 1595569633} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} +--- !u!4 &1038663547 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + m_PrefabInstance: {fileID: 1038663546} + m_PrefabAsset: {fileID: 0} +--- !u!1 &1038663548 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + m_PrefabInstance: {fileID: 1038663546} + m_PrefabAsset: {fileID: 0} +--- !u!64 &1038663549 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1038663548} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 4300002, guid: 1104611d051d4e42a68391888b61b32e, type: 3} +--- !u!23 &1038663550 stripped +MeshRenderer: + m_CorrespondingSourceObject: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + m_PrefabInstance: {fileID: 1038663546} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1038663552 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1038663548} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c53e2b0613597e849870c4a691d25e0f, type: 3} + m_Name: + m_EditorClassIdentifier: + defaultMaterials: + - {fileID: 2100000, guid: 11043ba092e44ae496f1361e7c0d8b0b, type: 2} +--- !u!1001 &1042775804 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 162241854} + m_TransformParent: {fileID: 37496078} m_Modifications: - target: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} propertyPath: m_Name - value: ShaderBall (6) + value: ShaderBallInner objectReference: {fileID: 0} - target: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} propertyPath: m_StaticEditorFlags @@ -11680,27 +9531,27 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} propertyPath: m_RootOrder - value: 7 + value: 1 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} propertyPath: m_LocalScale.x - value: 1 + value: 0.99000084 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} propertyPath: m_LocalScale.y - value: 1 + value: 0.9900005 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} propertyPath: m_LocalScale.z - value: 1 + value: 0.9900005 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} propertyPath: m_LocalPosition.x - value: -4.8 + value: 0 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} propertyPath: m_LocalPosition.y - value: 0.2 + value: 0 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} propertyPath: m_LocalPosition.z @@ -11753,203 +9604,47 @@ PrefabInstance: - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} propertyPath: m_Materials.Array.data[0] value: - objectReference: {fileID: 1205347890} + objectReference: {fileID: 2100000, guid: ced12abb765d5e247bd3311bd2fb5d98, type: 2} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} ---- !u!4 &1226438753 stripped +--- !u!4 &1042775805 stripped Transform: m_CorrespondingSourceObject: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - m_PrefabInstance: {fileID: 1226438752} + m_PrefabInstance: {fileID: 1042775804} m_PrefabAsset: {fileID: 0} ---- !u!1 &1226438754 stripped +--- !u!1 &1042775806 stripped GameObject: m_CorrespondingSourceObject: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - m_PrefabInstance: {fileID: 1226438752} + m_PrefabInstance: {fileID: 1042775804} m_PrefabAsset: {fileID: 0} ---- !u!64 &1226438755 +--- !u!64 &1042775807 MeshCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1226438754} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 4 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: 4300002, guid: 1104611d051d4e42a68391888b61b32e, type: 3} ---- !u!23 &1226438756 stripped -MeshRenderer: - m_CorrespondingSourceObject: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - m_PrefabInstance: {fileID: 1226438752} - m_PrefabAsset: {fileID: 0} ---- !u!114 &1226438758 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1226438754} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c53e2b0613597e849870c4a691d25e0f, type: 3} - m_Name: - m_EditorClassIdentifier: - defaultMaterials: - - {fileID: 2100000, guid: 93312c326d8c3c54bb251f588b42cda7, type: 2} ---- !u!1 &1233524241 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1233524242} - m_Layer: 0 - m_Name: ShaderBall (7) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1233524242 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1233524241} - m_LocalRotation: {x: -0, y: -0.00000008940696, z: 0.7699822, w: 0.6380654} - m_LocalPosition: {x: 1, y: 0.07, z: -0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1728100314} - - {fileID: 2068151802} - m_Father: {fileID: 723260586} - m_RootOrder: 8 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 100.705} ---- !u!1 &1250785855 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1250785856} - m_Layer: 0 - m_Name: SceneContent - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1250785856 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1250785855} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.655, y: 1.25, z: 2} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1170466719} - - {fileID: 878230435} - - {fileID: 1595900778} - - {fileID: 1544641785} - - {fileID: 162241854} - - {fileID: 592789515} - - {fileID: 723260586} - m_Father: {fileID: 0} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1257006307 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1257006308} - m_Layer: 0 - m_Name: ShaderBall (1) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!4 &1257006308 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1257006307} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.8, y: 0.1, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1631871842} - - {fileID: 48993994} - m_Father: {fileID: 1595900778} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1274666197 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1274666198} - m_Layer: 0 - m_Name: ShaderBall (4) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1274666198 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1274666197} - m_LocalRotation: {x: -0, y: 0.00000008940696, z: -0.9113847, w: 0.41155547} - m_LocalPosition: {x: -0.67, y: 0.69, z: -0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1180347531} - - {fileID: 1687903706} - m_Father: {fileID: 723260586} - m_RootOrder: 5 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: -131.395} ---- !u!21 &1307432230 + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1042775806} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 4300002, guid: 1104611d051d4e42a68391888b61b32e, type: 3} +--- !u!21 &1049582622 Material: serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: ShaderBallClippingPlaneInner (Instance) + m_Name: ShaderBallClippingPlane (Instance) m_Shader: {fileID: 4800000, guid: c331f6c43a2ef0945864cb668f2653c9, type: 3} m_ValidKeywords: + - _CLIPPING_BORDER - _CLIPPING_PLANE - _DIRECTIONAL_LIGHT - _DISABLE_ALBEDO_MAP - - _EMISSION - _HOVER_LIGHT - _REFLECTIONS - _SPECULAR_HIGHLIGHTS @@ -12003,7 +9698,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: 32c57306df745a147a2e02f8827a8cdc, type: 3} + m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: @@ -12043,7 +9738,7 @@ Material: - _BorderWidthHorizontal: 0.1 - _BorderWidthVertical: 0.1 - _BumpScale: 1 - - _ClippingBorder: 0 + - _ClippingBorder: 1 - _ClippingBorderWidth: 0.025 - _ClippingBox: 0 - _ClippingPlane: 1 @@ -12052,7 +9747,7 @@ Material: - _ClippingSphere: 0 - _ColorWriteMask: 15 - _Cull: 2 - - _CullMode: 1 + - _CullMode: 2 - _CustomMode: 0 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 @@ -12062,7 +9757,7 @@ Material: - _EdgeSmoothingMode: 0 - _EdgeSmoothingValue: 0.002 - _EnableChannelMap: 0 - - _EnableEmission: 1 + - _EnableEmission: 0 - _EnableHoverColorOpaqueOverride: 0 - _EnableHoverColorOverride: 0 - _EnableLightMap: 0 @@ -12096,7 +9791,7 @@ Material: - _IridescenceAngle: -0.78 - _IridescenceIntensity: 0.5 - _IridescenceThreshold: 0.05 - - _Metallic: 0.036 + - _Metallic: 0 - _MipmapBias: -2 - _Mode: 0 - _MyCullVariable: 1 @@ -12150,9 +9845,9 @@ Material: - _ClipPlane: {r: 0, g: 1, b: 0, a: 0} - _ClippingBorderColor: {r: 1, g: 0.2, b: 0, a: 1} - _ClippingPlaneBorderColor: {r: 1, g: 0.2, b: 0, a: 1} - - _Color: {r: 1, g: 0.6827586, b: 0, a: 1} + - _Color: {r: 0.5754717, g: 0.4325086, b: 0.4325086, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _EmissiveColor: {r: 0.9411765, g: 0, b: 0, a: 1} + - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1} - _EnvironmentColorX: {r: 1, g: 0, b: 0, a: 1} - _EnvironmentColorY: {r: 0, g: 1, b: 0, a: 1} - _EnvironmentColorZ: {r: 0, g: 0, b: 1, a: 1} @@ -12173,160 +9868,81 @@ Material: - _RimColor: {r: 1, g: 1, b: 1, a: 1} - _RoundCornersRadius: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} m_BuildTextureStacks: [] ---- !u!1001 &1322392162 +--- !u!1001 &1049608235 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 162241854} + m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_Name - value: ShaderBall - objectReference: {fileID: 0} - - target: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_StaticEditorFlags - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalScale.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalScale.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalScale.z - value: 1 + value: 2 objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_CastShadows - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_MotionVectors - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_ReceiveShadows + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LightProbeUsage - value: 0 + - target: {fileID: 2351505567455720334, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_Name + value: MRTK XR Rig objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_ReflectionProbeUsage - value: 0 + - target: {fileID: 8479077998186684813, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_IsActive + value: 1 objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 1735125630} m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} ---- !u!4 &1322392163 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - m_PrefabInstance: {fileID: 1322392162} - m_PrefabAsset: {fileID: 0} ---- !u!1 &1322392164 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - m_PrefabInstance: {fileID: 1322392162} - m_PrefabAsset: {fileID: 0} ---- !u!64 &1322392165 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1322392164} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 4 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: 4300002, guid: 1104611d051d4e42a68391888b61b32e, type: 3} ---- !u!23 &1322392166 stripped -MeshRenderer: - m_CorrespondingSourceObject: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - m_PrefabInstance: {fileID: 1322392162} - m_PrefabAsset: {fileID: 0} ---- !u!114 &1322392168 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1322392164} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c53e2b0613597e849870c4a691d25e0f, type: 3} - m_Name: - m_EditorClassIdentifier: - defaultMaterials: - - {fileID: 2100000, guid: 93312c326d8c3c54bb251f588b42cda7, type: 2} ---- !u!21 &1360890786 + m_SourcePrefab: {fileID: 100100000, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} +--- !u!21 &1050646656 Material: serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: ShaderBallClippingPlaneInner (Instance) + m_Name: ShaderBallClippingPlane (Instance) m_Shader: {fileID: 4800000, guid: c331f6c43a2ef0945864cb668f2653c9, type: 3} m_ValidKeywords: + - _CLIPPING_BORDER - _CLIPPING_PLANE - _DIRECTIONAL_LIGHT - _DISABLE_ALBEDO_MAP - - _EMISSION - _HOVER_LIGHT - _REFLECTIONS - _SPECULAR_HIGHLIGHTS @@ -12380,7 +9996,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: 32c57306df745a147a2e02f8827a8cdc, type: 3} + m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: @@ -12420,7 +10036,7 @@ Material: - _BorderWidthHorizontal: 0.1 - _BorderWidthVertical: 0.1 - _BumpScale: 1 - - _ClippingBorder: 0 + - _ClippingBorder: 1 - _ClippingBorderWidth: 0.025 - _ClippingBox: 0 - _ClippingPlane: 1 @@ -12429,7 +10045,7 @@ Material: - _ClippingSphere: 0 - _ColorWriteMask: 15 - _Cull: 2 - - _CullMode: 1 + - _CullMode: 2 - _CustomMode: 0 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 @@ -12439,7 +10055,7 @@ Material: - _EdgeSmoothingMode: 0 - _EdgeSmoothingValue: 0.002 - _EnableChannelMap: 0 - - _EnableEmission: 1 + - _EnableEmission: 0 - _EnableHoverColorOpaqueOverride: 0 - _EnableHoverColorOverride: 0 - _EnableLightMap: 0 @@ -12473,7 +10089,7 @@ Material: - _IridescenceAngle: -0.78 - _IridescenceIntensity: 0.5 - _IridescenceThreshold: 0.05 - - _Metallic: 0.036 + - _Metallic: 0 - _MipmapBias: -2 - _Mode: 0 - _MyCullVariable: 1 @@ -12527,9 +10143,9 @@ Material: - _ClipPlane: {r: 0, g: 1, b: 0, a: 0} - _ClippingBorderColor: {r: 1, g: 0.2, b: 0, a: 1} - _ClippingPlaneBorderColor: {r: 1, g: 0.2, b: 0, a: 1} - - _Color: {r: 1, g: 0.6827586, b: 0, a: 1} + - _Color: {r: 0.5754717, g: 0.4325086, b: 0.4325086, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _EmissiveColor: {r: 0.9411765, g: 0, b: 0, a: 1} + - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1} - _EnvironmentColorX: {r: 1, g: 0, b: 0, a: 1} - _EnvironmentColorY: {r: 0, g: 1, b: 0, a: 1} - _EnvironmentColorZ: {r: 0, g: 0, b: 1, a: 1} @@ -12550,25 +10166,298 @@ Material: - _RimColor: {r: 1, g: 1, b: 1, a: 1} - _RoundCornersRadius: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} m_BuildTextureStacks: [] ---- !u!21 &1363773384 +--- !u!1001 &1058943380 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 973147021} + m_Modifications: + - target: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_Name + value: ShaderBallInner + objectReference: {fileID: 0} + - target: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_CastShadows + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_MotionVectors + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_ReceiveShadows + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LightProbeUsage + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_ReflectionProbeUsage + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 1624239208} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} +--- !u!4 &1058943381 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + m_PrefabInstance: {fileID: 1058943380} + m_PrefabAsset: {fileID: 0} +--- !u!1 &1058943382 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + m_PrefabInstance: {fileID: 1058943380} + m_PrefabAsset: {fileID: 0} +--- !u!64 &1058943383 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1058943382} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 4300002, guid: 1104611d051d4e42a68391888b61b32e, type: 3} +--- !u!23 &1058943384 stripped +MeshRenderer: + m_CorrespondingSourceObject: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + m_PrefabInstance: {fileID: 1058943380} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1058943386 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1058943382} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c53e2b0613597e849870c4a691d25e0f, type: 3} + m_Name: + m_EditorClassIdentifier: + defaultMaterials: + - {fileID: 2100000, guid: 11043ba092e44ae496f1361e7c0d8b0b, type: 2} +--- !u!1001 &1060317755 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1659572901} + m_Modifications: + - target: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_Name + value: ShaderBall + objectReference: {fileID: 0} + - target: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_CastShadows + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_MotionVectors + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_ReceiveShadows + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LightProbeUsage + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_ReflectionProbeUsage + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 1796905766} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} +--- !u!4 &1060317756 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + m_PrefabInstance: {fileID: 1060317755} + m_PrefabAsset: {fileID: 0} +--- !u!1 &1060317757 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + m_PrefabInstance: {fileID: 1060317755} + m_PrefabAsset: {fileID: 0} +--- !u!64 &1060317758 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1060317757} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 4300002, guid: 1104611d051d4e42a68391888b61b32e, type: 3} +--- !u!23 &1060317759 stripped +MeshRenderer: + m_CorrespondingSourceObject: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + m_PrefabInstance: {fileID: 1060317755} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1060317761 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1060317757} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c53e2b0613597e849870c4a691d25e0f, type: 3} + m_Name: + m_EditorClassIdentifier: + defaultMaterials: + - {fileID: 2100000, guid: 9f21cf60c2137a64dbe161430f7c0b75, type: 2} +--- !u!21 &1084849456 Material: serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: ShaderBallClippingSphere (Instance) + m_Name: ShaderBallClippingPlane (Instance) m_Shader: {fileID: 4800000, guid: c331f6c43a2ef0945864cb668f2653c9, type: 3} m_ValidKeywords: - - _BORDER_LIGHT_USES_HOVER_COLOR - - _CLIPPING_SPHERE + - _CLIPPING_BORDER + - _CLIPPING_PLANE - _DIRECTIONAL_LIGHT - _DISABLE_ALBEDO_MAP - _HOVER_LIGHT - _REFLECTIONS - _SPECULAR_HIGHLIGHTS - _USE_WORLD_SCALE - m_InvalidKeywords: [] + m_InvalidKeywords: + - _CLIPPING_PLANE_BORDER m_LightmapFlags: 4 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 @@ -12603,10 +10492,6 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - - _EmissiveMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - _IridescentSpectrumMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -12616,7 +10501,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: 32c57306df745a147a2e02f8827a8cdc, type: 3} + m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: @@ -12650,30 +10535,27 @@ Material: - _BorderLightOpaque: 0 - _BorderLightOpaqueAlpha: 1 - _BorderLightReplacesAlbedo: 0 - - _BorderLightUsesHoverColor: 1 + - _BorderLightUsesHoverColor: 0 - _BorderMinValue: 0.02 - _BorderWidth: 0.1 - _BorderWidthHorizontal: 0.1 - _BorderWidthVertical: 0.1 - _BumpScale: 1 - - _ClipBoxSide: 1 - - _ClipPlaneSide: 1 - - _ClipSphereSide: 1 - - _ClippingBorder: 0 + - _ClippingBorder: 1 - _ClippingBorderWidth: 0.025 - _ClippingBox: 0 - - _ClippingPlane: 0 - - _ClippingPlaneBorder: 0 - - _ClippingPlaneBorderWidth: 0.025 - - _ClippingSphere: 1 + - _ClippingPlane: 1 + - _ClippingPlaneBorder: 1 + - _ClippingPlaneBorderWidth: 0.02 + - _ClippingSphere: 0 - _ColorWriteMask: 15 + - _Cull: 2 - _CullMode: 2 - _CustomMode: 0 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DirectionalLight: 1 - _DstBlend: 0 - - _DstBlendAlpha: 1 - _EdgeSmoothingMode: 0 - _EdgeSmoothingValue: 0.002 - _EnableChannelMap: 0 @@ -12714,7 +10596,7 @@ Material: - _Metallic: 0 - _MipmapBias: -2 - _Mode: 0 - - _NPR: 0 + - _MyCullVariable: 1 - _NearLightFade: 0 - _NearPlaneFade: 0 - _NormalMapScale: 1 @@ -12730,15 +10612,15 @@ Material: - _RimLight: 0 - _RimPower: 3 - _RoundCornerMargin: 0 + - _RoundCornerPower: 0.4 - _RoundCornerRadius: 0.25 - _RoundCorners: 0 - _RoundCornersHideInterior: 0 - - _Smoothness: 1 + - _Smoothness: 0.5 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SphericalHarmonics: 0 - _SrcBlend: 1 - - _SrcBlendAlpha: 1 - _Stencil: 0 - _StencilComparison: 0 - _StencilOperation: 0 @@ -12750,7 +10632,6 @@ Material: - _UseWorldScale: 1 - _VertexColors: 0 - _VertexExtrusion: 0 - - _VertexExtrusionConstantWidth: 0 - _VertexExtrusionSmoothNormals: 0 - _VertexExtrusionValue: 0 - _ZOffsetFactor: 0 @@ -12760,12 +10641,10 @@ Material: m_Colors: - _BlurBackgroundRect: {r: 0, g: 0, b: 1, a: 1} - _BorderColor: {r: 1, g: 1, b: 1, a: 0} - - _ClipBoxSize: {r: 1, g: 1, b: 1, a: 0} - _ClipPlane: {r: 0, g: 1, b: 0, a: 0} - - _ClipSphere: {r: 0, g: 0, b: 0, a: 0.5} - _ClippingBorderColor: {r: 1, g: 0.2, b: 0, a: 1} - _ClippingPlaneBorderColor: {r: 1, g: 0.2, b: 0, a: 1} - - _Color: {r: 0, g: 0.5862069, b: 1, a: 1} + - _Color: {r: 0.5754717, g: 0.4325086, b: 0.4325086, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1} - _EnvironmentColorX: {r: 1, g: 0, b: 0, a: 1} @@ -12778,6 +10657,7 @@ Material: - _GradientColor2: {r: 0, g: 0.32999998, b: 0.88, a: 0.5} - _GradientColor3: {r: 0, g: 0.32999998, b: 0.88, a: 1} - _GradientColor4: {r: 1, g: 1, b: 1, a: 1} + - _HoverColor: {r: 1, g: 0, b: 0, a: 1} - _HoverColorOpaqueOverride: {r: 1, g: 1, b: 1, a: 1} - _HoverColorOverride: {r: 1, g: 1, b: 1, a: 1} - _InnerGlowColor: {r: 1, g: 1, b: 1, a: 0.75} @@ -12787,7 +10667,7 @@ Material: - _RimColor: {r: 1, g: 1, b: 1, a: 1} - _RoundCornersRadius: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} m_BuildTextureStacks: [] ---- !u!21 &1368414922 +--- !u!21 &1101390724 Material: serializedVersion: 8 m_ObjectHideFlags: 0 @@ -13024,26 +10904,161 @@ Material: - _RimColor: {r: 1, g: 1, b: 1, a: 1} - _RoundCornersRadius: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} m_BuildTextureStacks: [] ---- !u!21 &1382788413 +--- !u!1001 &1112684250 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 842427686} + m_Modifications: + - target: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_Name + value: ShaderBall + objectReference: {fileID: 0} + - target: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_CastShadows + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_MotionVectors + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_ReceiveShadows + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LightProbeUsage + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_ReflectionProbeUsage + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 542103952} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} +--- !u!4 &1112684251 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + m_PrefabInstance: {fileID: 1112684250} + m_PrefabAsset: {fileID: 0} +--- !u!1 &1112684252 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + m_PrefabInstance: {fileID: 1112684250} + m_PrefabAsset: {fileID: 0} +--- !u!64 &1112684253 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1112684252} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 4300002, guid: 1104611d051d4e42a68391888b61b32e, type: 3} +--- !u!23 &1112684254 stripped +MeshRenderer: + m_CorrespondingSourceObject: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + m_PrefabInstance: {fileID: 1112684250} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1112684256 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1112684252} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c53e2b0613597e849870c4a691d25e0f, type: 3} + m_Name: + m_EditorClassIdentifier: + defaultMaterials: + - {fileID: 2100000, guid: 9f21cf60c2137a64dbe161430f7c0b75, type: 2} +--- !u!21 &1115790161 Material: serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: ShaderBallClippingPlaneInner (Instance) + m_Name: ShaderBallClippingSphere (Instance) m_Shader: {fileID: 4800000, guid: c331f6c43a2ef0945864cb668f2653c9, type: 3} m_ValidKeywords: - - _CLIPPING_PLANE + - _BORDER_LIGHT_USES_HOVER_COLOR + - _CLIPPING_SPHERE - _DIRECTIONAL_LIGHT - _DISABLE_ALBEDO_MAP - - _EMISSION - _HOVER_LIGHT - _REFLECTIONS - _SPECULAR_HIGHLIGHTS - _USE_WORLD_SCALE - m_InvalidKeywords: - - _CLIPPING_PLANE_BORDER + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 @@ -13121,22 +11136,24 @@ Material: - _BorderLightOpaque: 0 - _BorderLightOpaqueAlpha: 1 - _BorderLightReplacesAlbedo: 0 - - _BorderLightUsesHoverColor: 0 + - _BorderLightUsesHoverColor: 1 - _BorderMinValue: 0.02 - _BorderWidth: 0.1 - _BorderWidthHorizontal: 0.1 - _BorderWidthVertical: 0.1 - _BumpScale: 1 + - _ClipBoxSide: 1 + - _ClipPlaneSide: 1 + - _ClipSphereSide: 1 - _ClippingBorder: 0 - _ClippingBorderWidth: 0.025 - _ClippingBox: 0 - - _ClippingPlane: 1 - - _ClippingPlaneBorder: 1 - - _ClippingPlaneBorderWidth: 0.02 - - _ClippingSphere: 0 + - _ClippingPlane: 0 + - _ClippingPlaneBorder: 0 + - _ClippingPlaneBorderWidth: 0.025 + - _ClippingSphere: 1 - _ColorWriteMask: 15 - - _Cull: 2 - - _CullMode: 1 + - _CullMode: 2 - _CustomMode: 0 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 @@ -13145,7 +11162,7 @@ Material: - _EdgeSmoothingMode: 0 - _EdgeSmoothingValue: 0.002 - _EnableChannelMap: 0 - - _EnableEmission: 1 + - _EnableEmission: 0 - _EnableHoverColorOpaqueOverride: 0 - _EnableHoverColorOverride: 0 - _EnableLightMap: 0 @@ -13179,10 +11196,9 @@ Material: - _IridescenceAngle: -0.78 - _IridescenceIntensity: 0.5 - _IridescenceThreshold: 0.05 - - _Metallic: 0.036 + - _Metallic: 0 - _MipmapBias: -2 - _Mode: 0 - - _MyCullVariable: 1 - _NearLightFade: 0 - _NearPlaneFade: 0 - _NormalMapScale: 1 @@ -13198,11 +11214,10 @@ Material: - _RimLight: 0 - _RimPower: 3 - _RoundCornerMargin: 0 - - _RoundCornerPower: 0.4 - _RoundCornerRadius: 0.25 - _RoundCorners: 0 - _RoundCornersHideInterior: 0 - - _Smoothness: 0.5 + - _Smoothness: 1 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SphericalHarmonics: 0 @@ -13227,12 +11242,14 @@ Material: m_Colors: - _BlurBackgroundRect: {r: 0, g: 0, b: 1, a: 1} - _BorderColor: {r: 1, g: 1, b: 1, a: 0} + - _ClipBoxSize: {r: 1, g: 1, b: 1, a: 0} - _ClipPlane: {r: 0, g: 1, b: 0, a: 0} + - _ClipSphere: {r: 0, g: 0, b: 0, a: 0.5} - _ClippingBorderColor: {r: 1, g: 0.2, b: 0, a: 1} - _ClippingPlaneBorderColor: {r: 1, g: 0.2, b: 0, a: 1} - - _Color: {r: 1, g: 0.6827586, b: 0, a: 1} + - _Color: {r: 0, g: 0.5862069, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _EmissiveColor: {r: 0.9411765, g: 0, b: 0, a: 1} + - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1} - _EnvironmentColorX: {r: 1, g: 0, b: 0, a: 1} - _EnvironmentColorY: {r: 0, g: 1, b: 0, a: 1} - _EnvironmentColorZ: {r: 0, g: 0, b: 1, a: 1} @@ -13243,7 +11260,6 @@ Material: - _GradientColor2: {r: 0, g: 0.32999998, b: 0.88, a: 0.5} - _GradientColor3: {r: 0, g: 0.32999998, b: 0.88, a: 1} - _GradientColor4: {r: 1, g: 1, b: 1, a: 1} - - _HoverColor: {r: 1, g: 0, b: 0, a: 1} - _HoverColorOpaqueOverride: {r: 1, g: 1, b: 1, a: 1} - _HoverColorOverride: {r: 1, g: 1, b: 1, a: 1} - _InnerGlowColor: {r: 1, g: 1, b: 1, a: 0.75} @@ -13253,20 +11269,20 @@ Material: - _RimColor: {r: 1, g: 1, b: 1, a: 1} - _RoundCornersRadius: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} m_BuildTextureStacks: [] ---- !u!21 &1393154610 +--- !u!21 &1134585582 Material: serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: ShaderBallClippingPlane (Instance) + m_Name: ShaderBallClippingPlaneInner (Instance) m_Shader: {fileID: 4800000, guid: c331f6c43a2ef0945864cb668f2653c9, type: 3} m_ValidKeywords: - - _CLIPPING_BORDER - _CLIPPING_PLANE - _DIRECTIONAL_LIGHT - _DISABLE_ALBEDO_MAP + - _EMISSION - _HOVER_LIGHT - _REFLECTIONS - _SPECULAR_HIGHLIGHTS @@ -13316,7 +11332,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 32c57306df745a147a2e02f8827a8cdc, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: @@ -13356,7 +11372,7 @@ Material: - _BorderWidthHorizontal: 0.1 - _BorderWidthVertical: 0.1 - _BumpScale: 1 - - _ClippingBorder: 1 + - _ClippingBorder: 0 - _ClippingBorderWidth: 0.025 - _ClippingBox: 0 - _ClippingPlane: 1 @@ -13365,7 +11381,7 @@ Material: - _ClippingSphere: 0 - _ColorWriteMask: 15 - _Cull: 2 - - _CullMode: 2 + - _CullMode: 1 - _CustomMode: 0 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 @@ -13374,7 +11390,7 @@ Material: - _EdgeSmoothingMode: 0 - _EdgeSmoothingValue: 0.002 - _EnableChannelMap: 0 - - _EnableEmission: 0 + - _EnableEmission: 1 - _EnableHoverColorOpaqueOverride: 0 - _EnableHoverColorOverride: 0 - _EnableLightMap: 0 @@ -13408,7 +11424,7 @@ Material: - _IridescenceAngle: -0.78 - _IridescenceIntensity: 0.5 - _IridescenceThreshold: 0.05 - - _Metallic: 0 + - _Metallic: 0.036 - _MipmapBias: -2 - _Mode: 0 - _MyCullVariable: 1 @@ -13459,9 +11475,9 @@ Material: - _ClipPlane: {r: 0, g: 1, b: 0, a: 0} - _ClippingBorderColor: {r: 1, g: 0.2, b: 0, a: 1} - _ClippingPlaneBorderColor: {r: 1, g: 0.2, b: 0, a: 1} - - _Color: {r: 0.5754717, g: 0.4325086, b: 0.4325086, a: 1} + - _Color: {r: 1, g: 0.6827586, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1} + - _EmissiveColor: {r: 0.9411765, g: 0, b: 0, a: 1} - _EnvironmentColorX: {r: 1, g: 0, b: 0, a: 1} - _EnvironmentColorY: {r: 0, g: 1, b: 0, a: 1} - _EnvironmentColorZ: {r: 0, g: 0, b: 1, a: 1} @@ -13482,26 +11498,163 @@ Material: - _RimColor: {r: 1, g: 1, b: 1, a: 1} - _RoundCornersRadius: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} m_BuildTextureStacks: [] ---- !u!21 &1401888045 +--- !u!1001 &1141845615 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1444854130} + m_Modifications: + - target: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_Name + value: ShaderBallInner + objectReference: {fileID: 0} + - target: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_CastShadows + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_MotionVectors + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_ReceiveShadows + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LightProbeUsage + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_ReflectionProbeUsage + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 1382788413} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} +--- !u!4 &1141845616 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + m_PrefabInstance: {fileID: 1141845615} + m_PrefabAsset: {fileID: 0} +--- !u!1 &1141845617 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + m_PrefabInstance: {fileID: 1141845615} + m_PrefabAsset: {fileID: 0} +--- !u!64 &1141845618 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1141845617} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 4300002, guid: 1104611d051d4e42a68391888b61b32e, type: 3} +--- !u!23 &1141845619 stripped +MeshRenderer: + m_CorrespondingSourceObject: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + m_PrefabInstance: {fileID: 1141845615} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1141845621 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1141845617} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c53e2b0613597e849870c4a691d25e0f, type: 3} + m_Name: + m_EditorClassIdentifier: + defaultMaterials: + - {fileID: 2100000, guid: 11043ba092e44ae496f1361e7c0d8b0b, type: 2} +--- !u!21 &1157956411 Material: serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: ShaderBallClippingPlane (Instance) + m_Name: ShaderBallClippingBox (Instance) m_Shader: {fileID: 4800000, guid: c331f6c43a2ef0945864cb668f2653c9, type: 3} m_ValidKeywords: - - _CLIPPING_BORDER - - _CLIPPING_PLANE + - _BORDER_LIGHT_USES_HOVER_COLOR + - _CLIPPING_BOX - _DIRECTIONAL_LIGHT - _DISABLE_ALBEDO_MAP + - _HOVER_COLOR_OVERRIDE - _HOVER_LIGHT - _REFLECTIONS + - _RIM_LIGHT - _SPECULAR_HIGHLIGHTS - _USE_WORLD_SCALE - m_InvalidKeywords: - - _CLIPPING_PLANE_BORDER + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 @@ -13536,10 +11689,6 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - - _EmissiveMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - _IridescentSpectrumMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -13549,7 +11698,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 32c57306df745a147a2e02f8827a8cdc, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: @@ -13583,34 +11732,35 @@ Material: - _BorderLightOpaque: 0 - _BorderLightOpaqueAlpha: 1 - _BorderLightReplacesAlbedo: 0 - - _BorderLightUsesHoverColor: 0 + - _BorderLightUsesHoverColor: 1 - _BorderMinValue: 0.02 - _BorderWidth: 0.1 - _BorderWidthHorizontal: 0.1 - _BorderWidthVertical: 0.1 - _BumpScale: 1 - - _ClippingBorder: 1 + - _ClipBoxSide: 1 + - _ClipPlaneSide: 1 + - _ClipSphereSide: 1 + - _ClippingBorder: 0 - _ClippingBorderWidth: 0.025 - - _ClippingBox: 0 - - _ClippingPlane: 1 - - _ClippingPlaneBorder: 1 - - _ClippingPlaneBorderWidth: 0.02 + - _ClippingBox: 1 + - _ClippingPlane: 0 + - _ClippingPlaneBorder: 0 + - _ClippingPlaneBorderWidth: 0.025 - _ClippingSphere: 0 - _ColorWriteMask: 15 - - _Cull: 2 - - _CullMode: 2 + - _CullMode: 0 - _CustomMode: 0 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DirectionalLight: 1 - _DstBlend: 0 - - _DstBlendAlpha: 1 - _EdgeSmoothingMode: 0 - _EdgeSmoothingValue: 0.002 - _EnableChannelMap: 0 - _EnableEmission: 0 - _EnableHoverColorOpaqueOverride: 0 - - _EnableHoverColorOverride: 0 + - _EnableHoverColorOverride: 1 - _EnableLightMap: 0 - _EnableLocalSpaceTriplanarMapping: 0 - _EnableNormalMap: 0 @@ -13645,8 +11795,6 @@ Material: - _Metallic: 0 - _MipmapBias: -2 - _Mode: 0 - - _MyCullVariable: 1 - - _NPR: 0 - _NearLightFade: 0 - _NearPlaneFade: 0 - _NormalMapScale: 1 @@ -13659,19 +11807,17 @@ Material: - _Refraction: 0 - _RefractiveIndex: 1.1 - _RenderQueueOverride: -1 - - _RimLight: 0 + - _RimLight: 1 - _RimPower: 3 - _RoundCornerMargin: 0 - - _RoundCornerPower: 0.4 - _RoundCornerRadius: 0.25 - _RoundCorners: 0 - _RoundCornersHideInterior: 0 - - _Smoothness: 0.5 + - _Smoothness: 1 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SphericalHarmonics: 0 - _SrcBlend: 1 - - _SrcBlendAlpha: 1 - _Stencil: 0 - _StencilComparison: 0 - _StencilOperation: 0 @@ -13683,7 +11829,6 @@ Material: - _UseWorldScale: 1 - _VertexColors: 0 - _VertexExtrusion: 0 - - _VertexExtrusionConstantWidth: 0 - _VertexExtrusionSmoothNormals: 0 - _VertexExtrusionValue: 0 - _ZOffsetFactor: 0 @@ -13693,10 +11838,12 @@ Material: m_Colors: - _BlurBackgroundRect: {r: 0, g: 0, b: 1, a: 1} - _BorderColor: {r: 1, g: 1, b: 1, a: 0} + - _ClipBoxSize: {r: 1, g: 1, b: 1, a: 0} - _ClipPlane: {r: 0, g: 1, b: 0, a: 0} + - _ClipSphere: {r: 0, g: 0, b: 0, a: 0.5} - _ClippingBorderColor: {r: 1, g: 0.2, b: 0, a: 1} - _ClippingPlaneBorderColor: {r: 1, g: 0.2, b: 0, a: 1} - - _Color: {r: 0.5754717, g: 0.4325086, b: 0.4325086, a: 1} + - _Color: {r: 0.72794116, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1} - _EnvironmentColorX: {r: 1, g: 0, b: 0, a: 1} @@ -13709,17 +11856,16 @@ Material: - _GradientColor2: {r: 0, g: 0.32999998, b: 0.88, a: 0.5} - _GradientColor3: {r: 0, g: 0.32999998, b: 0.88, a: 1} - _GradientColor4: {r: 1, g: 1, b: 1, a: 1} - - _HoverColor: {r: 1, g: 0, b: 0, a: 1} - _HoverColorOpaqueOverride: {r: 1, g: 1, b: 1, a: 1} - - _HoverColorOverride: {r: 1, g: 1, b: 1, a: 1} + - _HoverColorOverride: {r: 0, g: 0.007843138, b: 1, a: 1} - _InnerGlowColor: {r: 1, g: 1, b: 1, a: 0.75} - _ProximityLightCenterColorOverride: {r: 1, g: 0, b: 0, a: 0} - _ProximityLightMiddleColorOverride: {r: 0, g: 1, b: 0, a: 0.5} - _ProximityLightOuterColorOverride: {r: 0, g: 0, b: 1, a: 1} - - _RimColor: {r: 1, g: 1, b: 1, a: 1} + - _RimColor: {r: 0, g: 0.006896496, b: 1, a: 1} - _RoundCornersRadius: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} m_BuildTextureStacks: [] ---- !u!1 &1428268607 +--- !u!1 &1162469814 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -13727,275 +11873,194 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1428268609} - - component: {fileID: 1428268608} + - component: {fileID: 1162469815} m_Layer: 0 - m_Name: Directional Light + m_Name: ShaderBall (6) m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!108 &1428268608 -Light: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1428268607} - m_Enabled: 1 - serializedVersion: 10 - m_Type: 1 - m_Shape: 0 - m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1} - m_Intensity: 1 - m_Range: 10 - m_SpotAngle: 30 - m_InnerSpotAngle: 21.80208 - m_CookieSize: 10 - m_Shadows: - m_Type: 0 - m_Resolution: -1 - m_CustomResolution: -1 - m_Strength: 1 - m_Bias: 0.05 - m_NormalBias: 0.4 - m_NearPlane: 0.2 - m_CullingMatrixOverride: - e00: 1 - e01: 0 - e02: 0 - e03: 0 - e10: 0 - e11: 1 - e12: 0 - e13: 0 - e20: 0 - e21: 0 - e22: 1 - e23: 0 - e30: 0 - e31: 0 - e32: 0 - e33: 1 - m_UseCullingMatrixOverride: 0 - m_Cookie: {fileID: 0} - m_DrawHalo: 0 - m_Flare: {fileID: 0} - m_RenderMode: 0 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_RenderingLayerMask: 1 - m_Lightmapping: 4 - m_LightShadowCasterMode: 0 - m_AreaSize: {x: 1, y: 1} - m_BounceIntensity: 1 - m_ColorTemperature: 6570 - m_UseColorTemperature: 0 - m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} - m_UseBoundingSphereOverride: 0 - m_UseViewFrustumForShadowCasterCull: 1 - m_ShadowRadius: 0 - m_ShadowAngle: 0 ---- !u!4 &1428268609 +--- !u!4 &1162469815 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1428268607} - m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} - m_LocalPosition: {x: 0, y: 3, z: 0} + m_GameObject: {fileID: 1162469814} + m_LocalRotation: {x: -0, y: -0.00000008940696, z: 0.9214616, w: 0.3884696} + m_LocalPosition: {x: 0.71, y: 0.74, z: -0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} ---- !u!1001 &1434900812 + m_Children: + - {fileID: 227929823} + - {fileID: 640662408} + m_Father: {fileID: 723260586} + m_RootOrder: 7 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 134.281} +--- !u!1001 &1170466718 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 641881980} + m_TransformParent: {fileID: 1250785856} m_Modifications: - - target: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_Name - value: ShaderBall + - target: {fileID: 566361764857432160, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} + propertyPath: m_AnchoredPosition.y + value: -34.5 objectReference: {fileID: 0} - - target: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_StaticEditorFlags + - target: {fileID: 1438325884843275054, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} + propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + - target: {fileID: 2446705927233332293, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} + propertyPath: m_text + value: 'Instanced Clipping Example + + + This scene + shows how the Graphics Tools/Standard shader in conjunction with clipping + primitives (ClippingPlane, ClippingSphere, & ClippingBox) can be used to + dynamically clip pixels on meshes instanced on the GPU. This method allows + for significantly more clipped meshes by enabling automatic batching across + all renderers that share the same material even if they interact with different + clipping primitives.' + objectReference: {fileID: 0} + - target: {fileID: 2446705927233332293, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} + propertyPath: m_fontStyle + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3220012215463627515, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3220012215463627515, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3220012215463627515, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} propertyPath: m_RootOrder value: 0 objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalScale.x - value: 1 + - target: {fileID: 3220012215463627515, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} + propertyPath: m_AnchorMax.x + value: 0 objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalScale.y - value: 1 + - target: {fileID: 3220012215463627515, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} + propertyPath: m_AnchorMax.y + value: 0 objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalScale.z - value: 1 + - target: {fileID: 3220012215463627515, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} + propertyPath: m_AnchorMin.x + value: 0 objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + - target: {fileID: 3220012215463627515, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3220012215463627515, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} + propertyPath: m_SizeDelta.x + value: 213.2298 + objectReference: {fileID: 0} + - target: {fileID: 3220012215463627515, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} + propertyPath: m_SizeDelta.y + value: 93.4684 + objectReference: {fileID: 0} + - target: {fileID: 3220012215463627515, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + - target: {fileID: 3220012215463627515, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + - target: {fileID: 3220012215463627515, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} propertyPath: m_LocalPosition.z - value: 0 + value: -1.108 objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + - target: {fileID: 3220012215463627515, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} propertyPath: m_LocalRotation.w - value: 1 + value: 0.953717 objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + - target: {fileID: 3220012215463627515, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} propertyPath: m_LocalRotation.x - value: -0 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + - target: {fileID: 3220012215463627515, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} propertyPath: m_LocalRotation.y - value: -0 + value: -0.30070576 objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + - target: {fileID: 3220012215463627515, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} propertyPath: m_LocalRotation.z - value: -0 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + - target: {fileID: 3220012215463627515, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3220012215463627515, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0.47450006 + objectReference: {fileID: 0} + - target: {fileID: 3220012215463627515, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + - target: {fileID: 3220012215463627515, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 0 + value: -35 objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_CastShadows + - target: {fileID: 3220012215463627515, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} + propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_MotionVectors - value: 2 + - target: {fileID: 4568172237328552037, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} + propertyPath: m_text + value: Button with Basic Visuals objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_ReceiveShadows - value: 0 + - target: {fileID: 5158546944129612579, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} + propertyPath: m_LocalPosition.y + value: -12.1 objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LightProbeUsage - value: 0 + - target: {fileID: 5493534032387613222, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} + propertyPath: m_LocalScale.y + value: 162.67668 objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_Materials.Array.size - value: 1 + - target: {fileID: 5493534032387613222, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} + propertyPath: m_LocalPosition.y + value: 9.22 objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_ReflectionProbeUsage + - target: {fileID: 5929991690626966069, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} + propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 1907285553} + - target: {fileID: 6540126486176102408, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} + propertyPath: m_Name + value: DescriptionPanel + objectReference: {fileID: 0} + - target: {fileID: 6809291684801504143, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} + propertyPath: m_text + value: 'PressableButtonStateful.cs + + BasicPressableButtonVisuals.cs' + objectReference: {fileID: 0} m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} ---- !u!4 &1434900813 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - m_PrefabInstance: {fileID: 1434900812} - m_PrefabAsset: {fileID: 0} ---- !u!1 &1434900814 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - m_PrefabInstance: {fileID: 1434900812} - m_PrefabAsset: {fileID: 0} ---- !u!64 &1434900815 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1434900814} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 4 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: 4300002, guid: 1104611d051d4e42a68391888b61b32e, type: 3} ---- !u!23 &1434900816 stripped -MeshRenderer: - m_CorrespondingSourceObject: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - m_PrefabInstance: {fileID: 1434900812} - m_PrefabAsset: {fileID: 0} ---- !u!114 &1434900818 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1434900814} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c53e2b0613597e849870c4a691d25e0f, type: 3} - m_Name: - m_EditorClassIdentifier: - defaultMaterials: - - {fileID: 2100000, guid: 72beba80472642299b6651a33cc160df, type: 2} ---- !u!1 &1444854129 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1444854130} - m_Layer: 0 - m_Name: ShaderBall (7) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!4 &1444854130 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} + m_SourcePrefab: {fileID: 100100000, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} +--- !u!224 &1170466719 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3220012215463627515, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} + m_PrefabInstance: {fileID: 1170466718} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1444854129} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -5.6, y: 0.1, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 441466247} - - {fileID: 1141845616} - m_Father: {fileID: 1595900778} - m_RootOrder: 8 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &1484576910 +--- !u!1001 &1180347530 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 1793330793} + m_TransformParent: {fileID: 1274666198} m_Modifications: - target: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} propertyPath: m_Name - value: ShaderBallInner + value: ShaderBall objectReference: {fileID: 0} - target: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} propertyPath: m_StaticEditorFlags @@ -14003,7 +12068,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} propertyPath: m_RootOrder - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} propertyPath: m_LocalScale.x @@ -14035,15 +12100,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} propertyPath: m_LocalRotation.x - value: -0 + value: 0 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} propertyPath: m_LocalRotation.y - value: -0 + value: 0 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} propertyPath: m_LocalRotation.z - value: -0 + value: 0 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -14076,26 +12141,26 @@ PrefabInstance: - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} propertyPath: m_Materials.Array.data[0] value: - objectReference: {fileID: 943765560} + objectReference: {fileID: 1503596314} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} ---- !u!4 &1484576911 stripped +--- !u!4 &1180347531 stripped Transform: m_CorrespondingSourceObject: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - m_PrefabInstance: {fileID: 1484576910} + m_PrefabInstance: {fileID: 1180347530} m_PrefabAsset: {fileID: 0} ---- !u!1 &1484576912 stripped +--- !u!1 &1180347532 stripped GameObject: m_CorrespondingSourceObject: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - m_PrefabInstance: {fileID: 1484576910} + m_PrefabInstance: {fileID: 1180347530} m_PrefabAsset: {fileID: 0} ---- !u!64 &1484576913 +--- !u!64 &1180347533 MeshCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1484576912} + m_GameObject: {fileID: 1180347532} m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 @@ -14103,45 +12168,46 @@ MeshCollider: m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 4300002, guid: 1104611d051d4e42a68391888b61b32e, type: 3} ---- !u!114 &1484576914 +--- !u!23 &1180347534 stripped +MeshRenderer: + m_CorrespondingSourceObject: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + m_PrefabInstance: {fileID: 1180347530} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1180347536 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1484576912} + m_GameObject: {fileID: 1180347532} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: c53e2b0613597e849870c4a691d25e0f, type: 3} m_Name: m_EditorClassIdentifier: defaultMaterials: - - {fileID: 2100000, guid: 11043ba092e44ae496f1361e7c0d8b0b, type: 2} ---- !u!23 &1484576915 stripped -MeshRenderer: - m_CorrespondingSourceObject: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - m_PrefabInstance: {fileID: 1484576910} - m_PrefabAsset: {fileID: 0} ---- !u!21 &1497487918 + - {fileID: 2100000, guid: 9f21cf60c2137a64dbe161430f7c0b75, type: 2} +--- !u!21 &1205347890 Material: serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: ShaderBallClippingPlaneInner (Instance) + m_Name: ShaderBallClippingBox (Instance) m_Shader: {fileID: 4800000, guid: c331f6c43a2ef0945864cb668f2653c9, type: 3} m_ValidKeywords: - - _CLIPPING_PLANE + - _BORDER_LIGHT_USES_HOVER_COLOR + - _CLIPPING_BOX - _DIRECTIONAL_LIGHT - _DISABLE_ALBEDO_MAP - - _EMISSION + - _HOVER_COLOR_OVERRIDE - _HOVER_LIGHT - _REFLECTIONS + - _RIM_LIGHT - _SPECULAR_HIGHLIGHTS - _USE_WORLD_SCALE - m_InvalidKeywords: - - _CLIPPING_PLANE_BORDER + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 @@ -14176,10 +12242,6 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - - _EmissiveMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - _IridescentSpectrumMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -14223,34 +12285,35 @@ Material: - _BorderLightOpaque: 0 - _BorderLightOpaqueAlpha: 1 - _BorderLightReplacesAlbedo: 0 - - _BorderLightUsesHoverColor: 0 + - _BorderLightUsesHoverColor: 1 - _BorderMinValue: 0.02 - _BorderWidth: 0.1 - _BorderWidthHorizontal: 0.1 - _BorderWidthVertical: 0.1 - _BumpScale: 1 + - _ClipBoxSide: 1 + - _ClipPlaneSide: 1 + - _ClipSphereSide: 1 - _ClippingBorder: 0 - _ClippingBorderWidth: 0.025 - - _ClippingBox: 0 - - _ClippingPlane: 1 - - _ClippingPlaneBorder: 1 - - _ClippingPlaneBorderWidth: 0.02 + - _ClippingBox: 1 + - _ClippingPlane: 0 + - _ClippingPlaneBorder: 0 + - _ClippingPlaneBorderWidth: 0.025 - _ClippingSphere: 0 - _ColorWriteMask: 15 - - _Cull: 2 - - _CullMode: 1 + - _CullMode: 0 - _CustomMode: 0 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DirectionalLight: 1 - _DstBlend: 0 - - _DstBlendAlpha: 1 - _EdgeSmoothingMode: 0 - _EdgeSmoothingValue: 0.002 - _EnableChannelMap: 0 - - _EnableEmission: 1 + - _EnableEmission: 0 - _EnableHoverColorOpaqueOverride: 0 - - _EnableHoverColorOverride: 0 + - _EnableHoverColorOverride: 1 - _EnableLightMap: 0 - _EnableLocalSpaceTriplanarMapping: 0 - _EnableNormalMap: 0 @@ -14282,11 +12345,9 @@ Material: - _IridescenceAngle: -0.78 - _IridescenceIntensity: 0.5 - _IridescenceThreshold: 0.05 - - _Metallic: 0.036 + - _Metallic: 0 - _MipmapBias: -2 - _Mode: 0 - - _MyCullVariable: 1 - - _NPR: 0 - _NearLightFade: 0 - _NearPlaneFade: 0 - _NormalMapScale: 1 @@ -14299,19 +12360,17 @@ Material: - _Refraction: 0 - _RefractiveIndex: 1.1 - _RenderQueueOverride: -1 - - _RimLight: 0 + - _RimLight: 1 - _RimPower: 3 - _RoundCornerMargin: 0 - - _RoundCornerPower: 0.4 - _RoundCornerRadius: 0.25 - _RoundCorners: 0 - _RoundCornersHideInterior: 0 - - _Smoothness: 0.5 + - _Smoothness: 1 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SphericalHarmonics: 0 - _SrcBlend: 1 - - _SrcBlendAlpha: 1 - _Stencil: 0 - _StencilComparison: 0 - _StencilOperation: 0 @@ -14323,7 +12382,6 @@ Material: - _UseWorldScale: 1 - _VertexColors: 0 - _VertexExtrusion: 0 - - _VertexExtrusionConstantWidth: 0 - _VertexExtrusionSmoothNormals: 0 - _VertexExtrusionValue: 0 - _ZOffsetFactor: 0 @@ -14333,12 +12391,14 @@ Material: m_Colors: - _BlurBackgroundRect: {r: 0, g: 0, b: 1, a: 1} - _BorderColor: {r: 1, g: 1, b: 1, a: 0} + - _ClipBoxSize: {r: 1, g: 1, b: 1, a: 0} - _ClipPlane: {r: 0, g: 1, b: 0, a: 0} + - _ClipSphere: {r: 0, g: 0, b: 0, a: 0.5} - _ClippingBorderColor: {r: 1, g: 0.2, b: 0, a: 1} - _ClippingPlaneBorderColor: {r: 1, g: 0.2, b: 0, a: 1} - - _Color: {r: 1, g: 0.6827586, b: 0, a: 1} + - _Color: {r: 0.72794116, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _EmissiveColor: {r: 0.9411765, g: 0, b: 0, a: 1} + - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1} - _EnvironmentColorX: {r: 1, g: 0, b: 0, a: 1} - _EnvironmentColorY: {r: 0, g: 1, b: 0, a: 1} - _EnvironmentColorZ: {r: 0, g: 0, b: 1, a: 1} @@ -14349,266 +12409,448 @@ Material: - _GradientColor2: {r: 0, g: 0.32999998, b: 0.88, a: 0.5} - _GradientColor3: {r: 0, g: 0.32999998, b: 0.88, a: 1} - _GradientColor4: {r: 1, g: 1, b: 1, a: 1} - - _HoverColor: {r: 1, g: 0, b: 0, a: 1} - _HoverColorOpaqueOverride: {r: 1, g: 1, b: 1, a: 1} - - _HoverColorOverride: {r: 1, g: 1, b: 1, a: 1} + - _HoverColorOverride: {r: 0, g: 0.007843138, b: 1, a: 1} - _InnerGlowColor: {r: 1, g: 1, b: 1, a: 0.75} - _ProximityLightCenterColorOverride: {r: 1, g: 0, b: 0, a: 0} - _ProximityLightMiddleColorOverride: {r: 0, g: 1, b: 0, a: 0.5} - _ProximityLightOuterColorOverride: {r: 0, g: 0, b: 1, a: 1} - - _RimColor: {r: 1, g: 1, b: 1, a: 1} + - _RimColor: {r: 0, g: 0.006896496, b: 1, a: 1} - _RoundCornersRadius: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} m_BuildTextureStacks: [] ---- !u!21 &1500990950 -Material: - serializedVersion: 8 +--- !u!1001 &1226438752 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 162241854} + m_Modifications: + - target: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_Name + value: ShaderBall (6) + objectReference: {fileID: 0} + - target: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_RootOrder + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalPosition.x + value: -4.8 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalPosition.y + value: 0.2 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_CastShadows + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_MotionVectors + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_ReceiveShadows + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LightProbeUsage + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_ReflectionProbeUsage + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 1205347890} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} +--- !u!4 &1226438753 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + m_PrefabInstance: {fileID: 1226438752} + m_PrefabAsset: {fileID: 0} +--- !u!1 &1226438754 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + m_PrefabInstance: {fileID: 1226438752} + m_PrefabAsset: {fileID: 0} +--- !u!64 &1226438755 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1226438754} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 4300002, guid: 1104611d051d4e42a68391888b61b32e, type: 3} +--- !u!23 &1226438756 stripped +MeshRenderer: + m_CorrespondingSourceObject: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + m_PrefabInstance: {fileID: 1226438752} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1226438758 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1226438754} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c53e2b0613597e849870c4a691d25e0f, type: 3} + m_Name: + m_EditorClassIdentifier: + defaultMaterials: + - {fileID: 2100000, guid: 93312c326d8c3c54bb251f588b42cda7, type: 2} +--- !u!1 &1233524241 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1233524242} + m_Layer: 0 + m_Name: ShaderBall (7) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1233524242 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1233524241} + m_LocalRotation: {x: -0, y: -0.00000008940696, z: 0.7699822, w: 0.6380654} + m_LocalPosition: {x: 1, y: 0.07, z: -0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1728100314} + - {fileID: 2068151802} + m_Father: {fileID: 723260586} + m_RootOrder: 8 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 100.705} +--- !u!1 &1250785855 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1250785856} + m_Layer: 0 + m_Name: SceneContent + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1250785856 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1250785855} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.655, y: 1.25, z: 2} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1170466719} + - {fileID: 878230435} + - {fileID: 1595900778} + - {fileID: 1544641785} + - {fileID: 162241854} + - {fileID: 592789515} + - {fileID: 723260586} + m_Father: {fileID: 0} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1257006307 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1257006308} + m_Layer: 0 + m_Name: ShaderBall (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &1257006308 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1257006307} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0.8, y: 0.1, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1631871842} + - {fileID: 48993994} + m_Father: {fileID: 1595900778} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1274666197 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1274666198} + m_Layer: 0 + m_Name: ShaderBall (4) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1274666198 +Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: ShaderBallClippingBox (Instance) - m_Shader: {fileID: 4800000, guid: c331f6c43a2ef0945864cb668f2653c9, type: 3} - m_ValidKeywords: - - _BORDER_LIGHT_USES_HOVER_COLOR - - _CLIPPING_BOX - - _DIRECTIONAL_LIGHT - - _DISABLE_ALBEDO_MAP - - _HOVER_COLOR_OVERRIDE - - _HOVER_LIGHT - - _REFLECTIONS - - _RIM_LIGHT - - _SPECULAR_HIGHLIGHTS - - _USE_WORLD_SCALE - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 1 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: 2000 - stringTagMap: - RenderType: Opaque - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ChannelMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _IridescentSpectrumMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _LightMapTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 2800000, guid: 32c57306df745a147a2e02f8827a8cdc, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _NormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _AlbedoAlphaMode: 0 - - _AlbedoAlphaSmoothness: 0 - - _AlbedoAssignedAtRuntime: 0 - - _BlendOp: 0 - - _BlendedClippingWidth: 1 - - _BlurBorderIntensity: 0 - - _BlurMode: 0 - - _BlurTextureIntensity: 1 - - _BorderColorMode: 0 - - _BorderLight: 0 - - _BorderLightOpaque: 0 - - _BorderLightOpaqueAlpha: 1 - - _BorderLightReplacesAlbedo: 0 - - _BorderLightUsesHoverColor: 1 - - _BorderMinValue: 0.02 - - _BorderWidth: 0.1 - - _BorderWidthHorizontal: 0.1 - - _BorderWidthVertical: 0.1 - - _BumpScale: 1 - - _ClipBoxSide: 1 - - _ClipPlaneSide: 1 - - _ClipSphereSide: 1 - - _ClippingBorder: 0 - - _ClippingBorderWidth: 0.025 - - _ClippingBox: 1 - - _ClippingPlane: 0 - - _ClippingPlaneBorder: 0 - - _ClippingPlaneBorderWidth: 0.025 - - _ClippingSphere: 0 - - _ColorWriteMask: 15 - - _CullMode: 0 - - _CustomMode: 0 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DirectionalLight: 1 - - _DstBlend: 0 - - _EdgeSmoothingMode: 0 - - _EdgeSmoothingValue: 0.002 - - _EnableChannelMap: 0 - - _EnableEmission: 0 - - _EnableHoverColorOpaqueOverride: 0 - - _EnableHoverColorOverride: 1 - - _EnableLightMap: 0 - - _EnableLocalSpaceTriplanarMapping: 0 - - _EnableNormalMap: 0 - - _EnableProximityLightColorOverride: 0 - - _EnableSSAA: 0 - - _EnableStencil: 0 - - _EnableTriplanarMapping: 0 - - _EnvironmentColorIntensity: 0.5 - - _EnvironmentColorThreshold: 1.5 - - _EnvironmentColoring: 0 - - _Fade: 1 - - _FadeBeginDistance: 0.85 - - _FadeCompleteDistance: 0.5 - - _FadeMinValue: 0 - - _FluentLightIntensity: 1 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _GradientAngle: 180 - - _GradientMode: 0 - - _HoverLight: 1 - - _HoverLightOpaque: 0 - - _IgnoreZScale: 0 - - _IndependentCorners: 0 - - _InnerGlow: 0 - - _InnerGlowPower: 4 - - _InstancedColor: 0 - - _Iridescence: 0 - - _IridescenceAngle: -0.78 - - _IridescenceIntensity: 0.5 - - _IridescenceThreshold: 0.05 - - _Metallic: 0 - - _MipmapBias: -2 - - _Mode: 0 - - _NearLightFade: 0 - - _NearPlaneFade: 0 - - _NormalMapScale: 1 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _ProximityLight: 0 - - _ProximityLightSubtractive: 0 - - _ProximityLightTwoSided: 0 - - _Reflections: 1 - - _Refraction: 0 - - _RefractiveIndex: 1.1 - - _RenderQueueOverride: -1 - - _RimLight: 1 - - _RimPower: 3 - - _RoundCornerMargin: 0 - - _RoundCornerRadius: 0.25 - - _RoundCorners: 0 - - _RoundCornersHideInterior: 0 - - _Smoothness: 1 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SphericalHarmonics: 0 - - _SrcBlend: 1 - - _Stencil: 0 - - _StencilComparison: 0 - - _StencilOperation: 0 - - _StencilReadMask: 255 - - _StencilReference: 0 - - _StencilWriteMask: 255 - - _TriplanarMappingBlendSharpness: 4 - - _UVSec: 0 - - _UseWorldScale: 1 - - _VertexColors: 0 - - _VertexExtrusion: 0 - - _VertexExtrusionSmoothNormals: 0 - - _VertexExtrusionValue: 0 - - _ZOffsetFactor: 0 - - _ZOffsetUnits: 0 - - _ZTest: 4 - - _ZWrite: 1 - m_Colors: - - _BlurBackgroundRect: {r: 0, g: 0, b: 1, a: 1} - - _BorderColor: {r: 1, g: 1, b: 1, a: 0} - - _ClipBoxSize: {r: 1, g: 1, b: 1, a: 0} - - _ClipPlane: {r: 0, g: 1, b: 0, a: 0} - - _ClipSphere: {r: 0, g: 0, b: 0, a: 0.5} - - _ClippingBorderColor: {r: 1, g: 0.2, b: 0, a: 1} - - _ClippingPlaneBorderColor: {r: 1, g: 0.2, b: 0, a: 1} - - _Color: {r: 0.72794116, g: 0, b: 0, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1} - - _EnvironmentColorX: {r: 1, g: 0, b: 0, a: 1} - - _EnvironmentColorY: {r: 0, g: 1, b: 0, a: 1} - - _EnvironmentColorZ: {r: 0, g: 0, b: 1, a: 1} - - _GradientAlpha: {r: 1, g: 1, b: 1, a: 1} - - _GradientAlphaTime: {r: 0, g: 0, b: 0, a: 0} - - _GradientColor0: {r: 0.631373, g: 0.631373, b: 0.631373, a: 0} - - _GradientColor1: {r: 1, g: 0.690196, b: 0.976471, a: 0.25} - - _GradientColor2: {r: 0, g: 0.32999998, b: 0.88, a: 0.5} - - _GradientColor3: {r: 0, g: 0.32999998, b: 0.88, a: 1} - - _GradientColor4: {r: 1, g: 1, b: 1, a: 1} - - _HoverColorOpaqueOverride: {r: 1, g: 1, b: 1, a: 1} - - _HoverColorOverride: {r: 0, g: 0.007843138, b: 1, a: 1} - - _InnerGlowColor: {r: 1, g: 1, b: 1, a: 0.75} - - _ProximityLightCenterColorOverride: {r: 1, g: 0, b: 0, a: 0} - - _ProximityLightMiddleColorOverride: {r: 0, g: 1, b: 0, a: 0.5} - - _ProximityLightOuterColorOverride: {r: 0, g: 0, b: 1, a: 1} - - _RimColor: {r: 0, g: 0.006896496, b: 1, a: 1} - - _RoundCornersRadius: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} - m_BuildTextureStacks: [] ---- !u!21 &1503596314 + m_GameObject: {fileID: 1274666197} + m_LocalRotation: {x: -0, y: 0.00000008940696, z: -0.9113847, w: 0.41155547} + m_LocalPosition: {x: -0.67, y: 0.69, z: -0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1180347531} + - {fileID: 1687903706} + m_Father: {fileID: 723260586} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: -131.395} +--- !u!1001 &1322392162 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 162241854} + m_Modifications: + - target: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_Name + value: ShaderBall + objectReference: {fileID: 0} + - target: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_CastShadows + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_MotionVectors + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_ReceiveShadows + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LightProbeUsage + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_ReflectionProbeUsage + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 1735125630} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} +--- !u!4 &1322392163 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + m_PrefabInstance: {fileID: 1322392162} + m_PrefabAsset: {fileID: 0} +--- !u!1 &1322392164 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + m_PrefabInstance: {fileID: 1322392162} + m_PrefabAsset: {fileID: 0} +--- !u!64 &1322392165 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1322392164} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 4300002, guid: 1104611d051d4e42a68391888b61b32e, type: 3} +--- !u!23 &1322392166 stripped +MeshRenderer: + m_CorrespondingSourceObject: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + m_PrefabInstance: {fileID: 1322392162} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1322392168 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1322392164} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c53e2b0613597e849870c4a691d25e0f, type: 3} + m_Name: + m_EditorClassIdentifier: + defaultMaterials: + - {fileID: 2100000, guid: 93312c326d8c3c54bb251f588b42cda7, type: 2} +--- !u!21 &1330887180 Material: serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: ShaderBallClippingSphere (Instance) + m_Name: ShaderBallClippingPlaneInner (Instance) m_Shader: {fileID: 4800000, guid: c331f6c43a2ef0945864cb668f2653c9, type: 3} m_ValidKeywords: - - _BORDER_LIGHT_USES_HOVER_COLOR - - _CLIPPING_SPHERE + - _CLIPPING_PLANE - _DIRECTIONAL_LIGHT - _DISABLE_ALBEDO_MAP + - _EMISSION - _HOVER_LIGHT - _REFLECTIONS - _SPECULAR_HIGHLIGHTS - _USE_WORLD_SCALE - m_InvalidKeywords: [] + m_InvalidKeywords: + - _CLIPPING_PLANE_BORDER m_LightmapFlags: 4 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 @@ -14643,6 +12885,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _EmissiveMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _IridescentSpectrumMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -14686,33 +12932,32 @@ Material: - _BorderLightOpaque: 0 - _BorderLightOpaqueAlpha: 1 - _BorderLightReplacesAlbedo: 0 - - _BorderLightUsesHoverColor: 1 + - _BorderLightUsesHoverColor: 0 - _BorderMinValue: 0.02 - _BorderWidth: 0.1 - _BorderWidthHorizontal: 0.1 - _BorderWidthVertical: 0.1 - _BumpScale: 1 - - _ClipBoxSide: 1 - - _ClipPlaneSide: 1 - - _ClipSphereSide: 1 - _ClippingBorder: 0 - _ClippingBorderWidth: 0.025 - _ClippingBox: 0 - - _ClippingPlane: 0 - - _ClippingPlaneBorder: 0 - - _ClippingPlaneBorderWidth: 0.025 - - _ClippingSphere: 1 + - _ClippingPlane: 1 + - _ClippingPlaneBorder: 1 + - _ClippingPlaneBorderWidth: 0.02 + - _ClippingSphere: 0 - _ColorWriteMask: 15 - - _CullMode: 2 + - _Cull: 2 + - _CullMode: 1 - _CustomMode: 0 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DirectionalLight: 1 - _DstBlend: 0 + - _DstBlendAlpha: 1 - _EdgeSmoothingMode: 0 - _EdgeSmoothingValue: 0.002 - _EnableChannelMap: 0 - - _EnableEmission: 0 + - _EnableEmission: 1 - _EnableHoverColorOpaqueOverride: 0 - _EnableHoverColorOverride: 0 - _EnableLightMap: 0 @@ -14746,9 +12991,11 @@ Material: - _IridescenceAngle: -0.78 - _IridescenceIntensity: 0.5 - _IridescenceThreshold: 0.05 - - _Metallic: 0 + - _Metallic: 0.036 - _MipmapBias: -2 - _Mode: 0 + - _MyCullVariable: 1 + - _NPR: 0 - _NearLightFade: 0 - _NearPlaneFade: 0 - _NormalMapScale: 1 @@ -14764,14 +13011,16 @@ Material: - _RimLight: 0 - _RimPower: 3 - _RoundCornerMargin: 0 + - _RoundCornerPower: 0.4 - _RoundCornerRadius: 0.25 - _RoundCorners: 0 - _RoundCornersHideInterior: 0 - - _Smoothness: 1 + - _Smoothness: 0.5 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SphericalHarmonics: 0 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Stencil: 0 - _StencilComparison: 0 - _StencilOperation: 0 @@ -14783,6 +13032,7 @@ Material: - _UseWorldScale: 1 - _VertexColors: 0 - _VertexExtrusion: 0 + - _VertexExtrusionConstantWidth: 0 - _VertexExtrusionSmoothNormals: 0 - _VertexExtrusionValue: 0 - _ZOffsetFactor: 0 @@ -14792,14 +13042,12 @@ Material: m_Colors: - _BlurBackgroundRect: {r: 0, g: 0, b: 1, a: 1} - _BorderColor: {r: 1, g: 1, b: 1, a: 0} - - _ClipBoxSize: {r: 1, g: 1, b: 1, a: 0} - _ClipPlane: {r: 0, g: 1, b: 0, a: 0} - - _ClipSphere: {r: 0, g: 0, b: 0, a: 0.5} - _ClippingBorderColor: {r: 1, g: 0.2, b: 0, a: 1} - _ClippingPlaneBorderColor: {r: 1, g: 0.2, b: 0, a: 1} - - _Color: {r: 0, g: 0.5862069, b: 1, a: 1} + - _Color: {r: 1, g: 0.6827586, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1} + - _EmissiveColor: {r: 0.9411765, g: 0, b: 0, a: 1} - _EnvironmentColorX: {r: 1, g: 0, b: 0, a: 1} - _EnvironmentColorY: {r: 0, g: 1, b: 0, a: 1} - _EnvironmentColorZ: {r: 0, g: 0, b: 1, a: 1} @@ -14810,6 +13058,7 @@ Material: - _GradientColor2: {r: 0, g: 0.32999998, b: 0.88, a: 0.5} - _GradientColor3: {r: 0, g: 0.32999998, b: 0.88, a: 1} - _GradientColor4: {r: 1, g: 1, b: 1, a: 1} + - _HoverColor: {r: 1, g: 0, b: 0, a: 1} - _HoverColorOpaqueOverride: {r: 1, g: 1, b: 1, a: 1} - _HoverColorOverride: {r: 1, g: 1, b: 1, a: 1} - _InnerGlowColor: {r: 1, g: 1, b: 1, a: 0.75} @@ -14819,87 +13068,26 @@ Material: - _RimColor: {r: 1, g: 1, b: 1, a: 1} - _RoundCornersRadius: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} m_BuildTextureStacks: [] ---- !u!1001 &1530487694 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720334, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_Name - value: MRTK XR Rig - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} ---- !u!4 &1544641785 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 5264854134403395402, guid: 53b4fadc7abe80d4f9549b89f80300d0, type: 3} - m_PrefabInstance: {fileID: 2083807616} - m_PrefabAsset: {fileID: 0} ---- !u!21 &1547427062 +--- !u!21 &1381013722 Material: serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: ShaderBallClippingSphere (Instance) + m_Name: ShaderBallClippingPlane (Instance) m_Shader: {fileID: 4800000, guid: c331f6c43a2ef0945864cb668f2653c9, type: 3} m_ValidKeywords: - - _BORDER_LIGHT_USES_HOVER_COLOR - - _CLIPPING_SPHERE + - _CLIPPING_BORDER + - _CLIPPING_PLANE - _DIRECTIONAL_LIGHT - _DISABLE_ALBEDO_MAP - _HOVER_LIGHT - _REFLECTIONS - _SPECULAR_HIGHLIGHTS - _USE_WORLD_SCALE - m_InvalidKeywords: [] + m_InvalidKeywords: + - _CLIPPING_PLANE_BORDER m_LightmapFlags: 4 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 @@ -14934,6 +13122,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _EmissiveMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _IridescentSpectrumMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -14943,7 +13135,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: 32c57306df745a147a2e02f8827a8cdc, type: 3} + m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: @@ -14977,29 +13169,28 @@ Material: - _BorderLightOpaque: 0 - _BorderLightOpaqueAlpha: 1 - _BorderLightReplacesAlbedo: 0 - - _BorderLightUsesHoverColor: 1 + - _BorderLightUsesHoverColor: 0 - _BorderMinValue: 0.02 - _BorderWidth: 0.1 - _BorderWidthHorizontal: 0.1 - _BorderWidthVertical: 0.1 - _BumpScale: 1 - - _ClipBoxSide: 1 - - _ClipPlaneSide: 1 - - _ClipSphereSide: 1 - - _ClippingBorder: 0 + - _ClippingBorder: 1 - _ClippingBorderWidth: 0.025 - _ClippingBox: 0 - - _ClippingPlane: 0 - - _ClippingPlaneBorder: 0 - - _ClippingPlaneBorderWidth: 0.025 - - _ClippingSphere: 1 + - _ClippingPlane: 1 + - _ClippingPlaneBorder: 1 + - _ClippingPlaneBorderWidth: 0.02 + - _ClippingSphere: 0 - _ColorWriteMask: 15 + - _Cull: 2 - _CullMode: 2 - _CustomMode: 0 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DirectionalLight: 1 - _DstBlend: 0 + - _DstBlendAlpha: 1 - _EdgeSmoothingMode: 0 - _EdgeSmoothingValue: 0.002 - _EnableChannelMap: 0 @@ -15040,6 +13231,8 @@ Material: - _Metallic: 0 - _MipmapBias: -2 - _Mode: 0 + - _MyCullVariable: 1 + - _NPR: 0 - _NearLightFade: 0 - _NearPlaneFade: 0 - _NormalMapScale: 1 @@ -15055,14 +13248,16 @@ Material: - _RimLight: 0 - _RimPower: 3 - _RoundCornerMargin: 0 + - _RoundCornerPower: 0.4 - _RoundCornerRadius: 0.25 - _RoundCorners: 0 - _RoundCornersHideInterior: 0 - - _Smoothness: 1 + - _Smoothness: 0.5 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SphericalHarmonics: 0 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Stencil: 0 - _StencilComparison: 0 - _StencilOperation: 0 @@ -15074,6 +13269,7 @@ Material: - _UseWorldScale: 1 - _VertexColors: 0 - _VertexExtrusion: 0 + - _VertexExtrusionConstantWidth: 0 - _VertexExtrusionSmoothNormals: 0 - _VertexExtrusionValue: 0 - _ZOffsetFactor: 0 @@ -15083,12 +13279,10 @@ Material: m_Colors: - _BlurBackgroundRect: {r: 0, g: 0, b: 1, a: 1} - _BorderColor: {r: 1, g: 1, b: 1, a: 0} - - _ClipBoxSize: {r: 1, g: 1, b: 1, a: 0} - _ClipPlane: {r: 0, g: 1, b: 0, a: 0} - - _ClipSphere: {r: 0, g: 0, b: 0, a: 0.5} - _ClippingBorderColor: {r: 1, g: 0.2, b: 0, a: 1} - _ClippingPlaneBorderColor: {r: 1, g: 0.2, b: 0, a: 1} - - _Color: {r: 0, g: 0.5862069, b: 1, a: 1} + - _Color: {r: 0.5754717, g: 0.4325086, b: 0.4325086, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1} - _EnvironmentColorX: {r: 1, g: 0, b: 0, a: 1} @@ -15101,6 +13295,7 @@ Material: - _GradientColor2: {r: 0, g: 0.32999998, b: 0.88, a: 0.5} - _GradientColor3: {r: 0, g: 0.32999998, b: 0.88, a: 1} - _GradientColor4: {r: 1, g: 1, b: 1, a: 1} + - _HoverColor: {r: 1, g: 0, b: 0, a: 1} - _HoverColorOpaqueOverride: {r: 1, g: 1, b: 1, a: 1} - _HoverColorOverride: {r: 1, g: 1, b: 1, a: 1} - _InnerGlowColor: {r: 1, g: 1, b: 1, a: 0.75} @@ -15110,199 +13305,7 @@ Material: - _RimColor: {r: 1, g: 1, b: 1, a: 1} - _RoundCornersRadius: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} m_BuildTextureStacks: [] ---- !u!1001 &1558856740 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 1250785856} - m_Modifications: - - target: {fileID: 5264854133094485412, guid: 53b4fadc7abe80d4f9549b89f80300d0, type: 3} - propertyPath: m_text - value: 'Clipping Sphere - -' - objectReference: {fileID: 0} - - target: {fileID: 5264854134403395402, guid: 53b4fadc7abe80d4f9549b89f80300d0, type: 3} - propertyPath: m_RootOrder - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 5264854134403395402, guid: 53b4fadc7abe80d4f9549b89f80300d0, type: 3} - propertyPath: m_LocalScale.x - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 5264854134403395402, guid: 53b4fadc7abe80d4f9549b89f80300d0, type: 3} - propertyPath: m_LocalScale.y - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 5264854134403395402, guid: 53b4fadc7abe80d4f9549b89f80300d0, type: 3} - propertyPath: m_LocalScale.z - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5264854134403395402, guid: 53b4fadc7abe80d4f9549b89f80300d0, type: 3} - propertyPath: m_LocalPosition.x - value: 1.0736674 - objectReference: {fileID: 0} - - target: {fileID: 5264854134403395402, guid: 53b4fadc7abe80d4f9549b89f80300d0, type: 3} - propertyPath: m_LocalPosition.y - value: -0.0013 - objectReference: {fileID: 0} - - target: {fileID: 5264854134403395402, guid: 53b4fadc7abe80d4f9549b89f80300d0, type: 3} - propertyPath: m_LocalPosition.z - value: -1.5011 - objectReference: {fileID: 0} - - target: {fileID: 5264854134403395402, guid: 53b4fadc7abe80d4f9549b89f80300d0, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5264854134403395402, guid: 53b4fadc7abe80d4f9549b89f80300d0, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5264854134403395402, guid: 53b4fadc7abe80d4f9549b89f80300d0, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5264854134403395402, guid: 53b4fadc7abe80d4f9549b89f80300d0, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5264854134403395402, guid: 53b4fadc7abe80d4f9549b89f80300d0, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5264854134403395402, guid: 53b4fadc7abe80d4f9549b89f80300d0, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5264854134403395402, guid: 53b4fadc7abe80d4f9549b89f80300d0, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5264854134403395403, guid: 53b4fadc7abe80d4f9549b89f80300d0, type: 3} - propertyPath: m_Name - value: ClippingSpherePlacard - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 53b4fadc7abe80d4f9549b89f80300d0, type: 3} ---- !u!1001 &1576001568 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 1659572901} - m_Modifications: - - target: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_Name - value: ShaderBallInner - objectReference: {fileID: 0} - - target: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_StaticEditorFlags - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalScale.x - value: 0.99000084 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalScale.y - value: 0.9900005 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalScale.z - value: 0.9900005 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_CastShadows - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_MotionVectors - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_ReceiveShadows - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LightProbeUsage - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_ReflectionProbeUsage - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: ced12abb765d5e247bd3311bd2fb5d98, type: 2} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} ---- !u!4 &1576001569 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - m_PrefabInstance: {fileID: 1576001568} - m_PrefabAsset: {fileID: 0} ---- !u!1 &1576001570 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - m_PrefabInstance: {fileID: 1576001568} - m_PrefabAsset: {fileID: 0} ---- !u!64 &1576001571 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1576001570} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 4 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: 4300002, guid: 1104611d051d4e42a68391888b61b32e, type: 3} ---- !u!21 &1595569633 +--- !u!21 &1382788413 Material: serializedVersion: 8 m_ObjectHideFlags: 0 @@ -15527,72 +13530,30 @@ Material: - _InnerGlowColor: {r: 1, g: 1, b: 1, a: 0.75} - _ProximityLightCenterColorOverride: {r: 1, g: 0, b: 0, a: 0} - _ProximityLightMiddleColorOverride: {r: 0, g: 1, b: 0, a: 0.5} - - _ProximityLightOuterColorOverride: {r: 0, g: 0, b: 1, a: 1} - - _RimColor: {r: 1, g: 1, b: 1, a: 1} - - _RoundCornersRadius: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} - m_BuildTextureStacks: [] ---- !u!1 &1595900777 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1595900778} - m_Layer: 0 - m_Name: ClippingPlane - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1595900778 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1595900777} - m_LocalRotation: {x: 0, y: 0.7071068, z: 0.7071068, w: 0} - m_LocalPosition: {x: -0.24399999, y: 0, z: -0.6} - m_LocalScale: {x: 0.21048994, y: 0.21048994, z: 0.21048994} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 365058296} - - {fileID: 1793330793} - - {fileID: 1257006308} - - {fileID: 2021874965} - - {fileID: 641881980} - - {fileID: 87335838} - - {fileID: 973147021} - - {fileID: 1872109879} - - {fileID: 1444854130} - - {fileID: 866223477} - m_Father: {fileID: 1250785856} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: -90, y: 180, z: 0} ---- !u!21 &1600733508 + - _ProximityLightOuterColorOverride: {r: 0, g: 0, b: 1, a: 1} + - _RimColor: {r: 1, g: 1, b: 1, a: 1} + - _RoundCornersRadius: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} + m_BuildTextureStacks: [] +--- !u!21 &1393154610 Material: serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: ShaderBallClippingBox (Instance) + m_Name: ShaderBallClippingPlane (Instance) m_Shader: {fileID: 4800000, guid: c331f6c43a2ef0945864cb668f2653c9, type: 3} m_ValidKeywords: - - _BORDER_LIGHT_USES_HOVER_COLOR - - _CLIPPING_BOX + - _CLIPPING_BORDER + - _CLIPPING_PLANE - _DIRECTIONAL_LIGHT - _DISABLE_ALBEDO_MAP - - _HOVER_COLOR_OVERRIDE - _HOVER_LIGHT - _REFLECTIONS - - _RIM_LIGHT - _SPECULAR_HIGHLIGHTS - _USE_WORLD_SCALE - m_InvalidKeywords: [] + m_InvalidKeywords: + - _CLIPPING_PLANE_BORDER m_LightmapFlags: 4 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 @@ -15627,10 +13588,6 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - - _EmissiveMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - _IridescentSpectrumMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -15640,7 +13597,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: 32c57306df745a147a2e02f8827a8cdc, type: 3} + m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: @@ -15674,36 +13631,33 @@ Material: - _BorderLightOpaque: 0 - _BorderLightOpaqueAlpha: 1 - _BorderLightReplacesAlbedo: 0 - - _BorderLightUsesHoverColor: 1 + - _BorderLightUsesHoverColor: 0 - _BorderMinValue: 0.02 - _BorderWidth: 0.1 - _BorderWidthHorizontal: 0.1 - _BorderWidthVertical: 0.1 - _BumpScale: 1 - - _ClipBoxSide: 1 - - _ClipPlaneSide: 1 - - _ClipSphereSide: 1 - - _ClippingBorder: 0 + - _ClippingBorder: 1 - _ClippingBorderWidth: 0.025 - - _ClippingBox: 1 - - _ClippingPlane: 0 - - _ClippingPlaneBorder: 0 - - _ClippingPlaneBorderWidth: 0.025 + - _ClippingBox: 0 + - _ClippingPlane: 1 + - _ClippingPlaneBorder: 1 + - _ClippingPlaneBorderWidth: 0.02 - _ClippingSphere: 0 - _ColorWriteMask: 15 - - _CullMode: 0 + - _Cull: 2 + - _CullMode: 2 - _CustomMode: 0 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DirectionalLight: 1 - _DstBlend: 0 - - _DstBlendAlpha: 1 - _EdgeSmoothingMode: 0 - _EdgeSmoothingValue: 0.002 - _EnableChannelMap: 0 - _EnableEmission: 0 - _EnableHoverColorOpaqueOverride: 0 - - _EnableHoverColorOverride: 1 + - _EnableHoverColorOverride: 0 - _EnableLightMap: 0 - _EnableLocalSpaceTriplanarMapping: 0 - _EnableNormalMap: 0 @@ -15738,7 +13692,7 @@ Material: - _Metallic: 0 - _MipmapBias: -2 - _Mode: 0 - - _NPR: 0 + - _MyCullVariable: 1 - _NearLightFade: 0 - _NearPlaneFade: 0 - _NormalMapScale: 1 @@ -15751,18 +13705,18 @@ Material: - _Refraction: 0 - _RefractiveIndex: 1.1 - _RenderQueueOverride: -1 - - _RimLight: 1 + - _RimLight: 0 - _RimPower: 3 - _RoundCornerMargin: 0 + - _RoundCornerPower: 0.4 - _RoundCornerRadius: 0.25 - _RoundCorners: 0 - _RoundCornersHideInterior: 0 - - _Smoothness: 1 + - _Smoothness: 0.5 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SphericalHarmonics: 0 - _SrcBlend: 1 - - _SrcBlendAlpha: 1 - _Stencil: 0 - _StencilComparison: 0 - _StencilOperation: 0 @@ -15774,7 +13728,6 @@ Material: - _UseWorldScale: 1 - _VertexColors: 0 - _VertexExtrusion: 0 - - _VertexExtrusionConstantWidth: 0 - _VertexExtrusionSmoothNormals: 0 - _VertexExtrusionValue: 0 - _ZOffsetFactor: 0 @@ -15784,12 +13737,10 @@ Material: m_Colors: - _BlurBackgroundRect: {r: 0, g: 0, b: 1, a: 1} - _BorderColor: {r: 1, g: 1, b: 1, a: 0} - - _ClipBoxSize: {r: 1, g: 1, b: 1, a: 0} - _ClipPlane: {r: 0, g: 1, b: 0, a: 0} - - _ClipSphere: {r: 0, g: 0, b: 0, a: 0.5} - _ClippingBorderColor: {r: 1, g: 0.2, b: 0, a: 1} - _ClippingPlaneBorderColor: {r: 1, g: 0.2, b: 0, a: 1} - - _Color: {r: 0.72794116, g: 0, b: 0, a: 1} + - _Color: {r: 0.5754717, g: 0.4325086, b: 0.4325086, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1} - _EnvironmentColorX: {r: 1, g: 0, b: 0, a: 1} @@ -15802,152 +13753,131 @@ Material: - _GradientColor2: {r: 0, g: 0.32999998, b: 0.88, a: 0.5} - _GradientColor3: {r: 0, g: 0.32999998, b: 0.88, a: 1} - _GradientColor4: {r: 1, g: 1, b: 1, a: 1} + - _HoverColor: {r: 1, g: 0, b: 0, a: 1} - _HoverColorOpaqueOverride: {r: 1, g: 1, b: 1, a: 1} - - _HoverColorOverride: {r: 0, g: 0.007843138, b: 1, a: 1} + - _HoverColorOverride: {r: 1, g: 1, b: 1, a: 1} - _InnerGlowColor: {r: 1, g: 1, b: 1, a: 0.75} - _ProximityLightCenterColorOverride: {r: 1, g: 0, b: 0, a: 0} - _ProximityLightMiddleColorOverride: {r: 0, g: 1, b: 0, a: 0.5} - _ProximityLightOuterColorOverride: {r: 0, g: 0, b: 1, a: 1} - - _RimColor: {r: 0, g: 0.006896496, b: 1, a: 1} + - _RimColor: {r: 1, g: 1, b: 1, a: 1} - _RoundCornersRadius: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} m_BuildTextureStacks: [] ---- !u!1001 &1607317316 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 119951084} - m_Modifications: - - target: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_Name - value: ShaderBallInner - objectReference: {fileID: 0} - - target: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_StaticEditorFlags - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalScale.x - value: 0.99000084 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalScale.y - value: 0.9900005 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalScale.z - value: 0.9900005 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_CastShadows - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_MotionVectors - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_ReceiveShadows - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LightProbeUsage - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_ReflectionProbeUsage - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: ced12abb765d5e247bd3311bd2fb5d98, type: 2} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} ---- !u!4 &1607317317 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - m_PrefabInstance: {fileID: 1607317316} - m_PrefabAsset: {fileID: 0} ---- !u!1 &1607317318 stripped +--- !u!1 &1428268607 GameObject: - m_CorrespondingSourceObject: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - m_PrefabInstance: {fileID: 1607317316} + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} ---- !u!64 &1607317319 -MeshCollider: + serializedVersion: 6 + m_Component: + - component: {fileID: 1428268609} + - component: {fileID: 1428268608} + m_Layer: 0 + m_Name: Directional Light + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!108 &1428268608 +Light: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1607317318} - m_Material: {fileID: 0} - m_IsTrigger: 0 + m_GameObject: {fileID: 1428268607} m_Enabled: 1 - serializedVersion: 4 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: 4300002, guid: 1104611d051d4e42a68391888b61b32e, type: 3} ---- !u!21 &1624239208 + serializedVersion: 10 + m_Type: 1 + m_Shape: 0 + m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1} + m_Intensity: 1 + m_Range: 10 + m_SpotAngle: 30 + m_InnerSpotAngle: 21.80208 + m_CookieSize: 10 + m_Shadows: + m_Type: 0 + m_Resolution: -1 + m_CustomResolution: -1 + m_Strength: 1 + m_Bias: 0.05 + m_NormalBias: 0.4 + m_NearPlane: 0.2 + m_CullingMatrixOverride: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_UseCullingMatrixOverride: 0 + m_Cookie: {fileID: 0} + m_DrawHalo: 0 + m_Flare: {fileID: 0} + m_RenderMode: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingLayerMask: 1 + m_Lightmapping: 4 + m_LightShadowCasterMode: 0 + m_AreaSize: {x: 1, y: 1} + m_BounceIntensity: 1 + m_ColorTemperature: 6570 + m_UseColorTemperature: 0 + m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} + m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 + m_ShadowRadius: 0 + m_ShadowAngle: 0 +--- !u!4 &1428268609 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1428268607} + 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 + m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} +--- !u!21 &1430626794 Material: serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: ShaderBallClippingPlaneInner (Instance) + m_Name: ShaderBallClippingBox (Instance) m_Shader: {fileID: 4800000, guid: c331f6c43a2ef0945864cb668f2653c9, type: 3} m_ValidKeywords: - - _CLIPPING_PLANE + - _BORDER_LIGHT_USES_HOVER_COLOR + - _CLIPPING_BOX - _DIRECTIONAL_LIGHT - _DISABLE_ALBEDO_MAP - - _EMISSION + - _HOVER_COLOR_OVERRIDE - _HOVER_LIGHT - _REFLECTIONS + - _RIM_LIGHT - _SPECULAR_HIGHLIGHTS - _USE_WORLD_SCALE - m_InvalidKeywords: - - _CLIPPING_PLANE_BORDER + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 @@ -15982,6 +13912,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _EmissiveMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _IridescentSpectrumMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -16025,33 +13959,36 @@ Material: - _BorderLightOpaque: 0 - _BorderLightOpaqueAlpha: 1 - _BorderLightReplacesAlbedo: 0 - - _BorderLightUsesHoverColor: 0 + - _BorderLightUsesHoverColor: 1 - _BorderMinValue: 0.02 - _BorderWidth: 0.1 - _BorderWidthHorizontal: 0.1 - _BorderWidthVertical: 0.1 - _BumpScale: 1 + - _ClipBoxSide: 1 + - _ClipPlaneSide: 1 + - _ClipSphereSide: 1 - _ClippingBorder: 0 - _ClippingBorderWidth: 0.025 - - _ClippingBox: 0 - - _ClippingPlane: 1 - - _ClippingPlaneBorder: 1 - - _ClippingPlaneBorderWidth: 0.02 + - _ClippingBox: 1 + - _ClippingPlane: 0 + - _ClippingPlaneBorder: 0 + - _ClippingPlaneBorderWidth: 0.025 - _ClippingSphere: 0 - _ColorWriteMask: 15 - - _Cull: 2 - - _CullMode: 1 + - _CullMode: 0 - _CustomMode: 0 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DirectionalLight: 1 - _DstBlend: 0 + - _DstBlendAlpha: 1 - _EdgeSmoothingMode: 0 - _EdgeSmoothingValue: 0.002 - _EnableChannelMap: 0 - - _EnableEmission: 1 + - _EnableEmission: 0 - _EnableHoverColorOpaqueOverride: 0 - - _EnableHoverColorOverride: 0 + - _EnableHoverColorOverride: 1 - _EnableLightMap: 0 - _EnableLocalSpaceTriplanarMapping: 0 - _EnableNormalMap: 0 @@ -16083,10 +14020,10 @@ Material: - _IridescenceAngle: -0.78 - _IridescenceIntensity: 0.5 - _IridescenceThreshold: 0.05 - - _Metallic: 0.036 + - _Metallic: 0 - _MipmapBias: -2 - _Mode: 0 - - _MyCullVariable: 1 + - _NPR: 0 - _NearLightFade: 0 - _NearPlaneFade: 0 - _NormalMapScale: 1 @@ -16099,18 +14036,18 @@ Material: - _Refraction: 0 - _RefractiveIndex: 1.1 - _RenderQueueOverride: -1 - - _RimLight: 0 + - _RimLight: 1 - _RimPower: 3 - _RoundCornerMargin: 0 - - _RoundCornerPower: 0.4 - _RoundCornerRadius: 0.25 - _RoundCorners: 0 - _RoundCornersHideInterior: 0 - - _Smoothness: 0.5 + - _Smoothness: 1 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SphericalHarmonics: 0 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Stencil: 0 - _StencilComparison: 0 - _StencilOperation: 0 @@ -16122,6 +14059,7 @@ Material: - _UseWorldScale: 1 - _VertexColors: 0 - _VertexExtrusion: 0 + - _VertexExtrusionConstantWidth: 0 - _VertexExtrusionSmoothNormals: 0 - _VertexExtrusionValue: 0 - _ZOffsetFactor: 0 @@ -16131,12 +14069,14 @@ Material: m_Colors: - _BlurBackgroundRect: {r: 0, g: 0, b: 1, a: 1} - _BorderColor: {r: 1, g: 1, b: 1, a: 0} + - _ClipBoxSize: {r: 1, g: 1, b: 1, a: 0} - _ClipPlane: {r: 0, g: 1, b: 0, a: 0} + - _ClipSphere: {r: 0, g: 0, b: 0, a: 0.5} - _ClippingBorderColor: {r: 1, g: 0.2, b: 0, a: 1} - _ClippingPlaneBorderColor: {r: 1, g: 0.2, b: 0, a: 1} - - _Color: {r: 1, g: 0.6827586, b: 0, a: 1} + - _Color: {r: 0.72794116, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _EmissiveColor: {r: 0.9411765, g: 0, b: 0, a: 1} + - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1} - _EnvironmentColorX: {r: 1, g: 0, b: 0, a: 1} - _EnvironmentColorY: {r: 0, g: 1, b: 0, a: 1} - _EnvironmentColorZ: {r: 0, g: 0, b: 1, a: 1} @@ -16147,22 +14087,21 @@ Material: - _GradientColor2: {r: 0, g: 0.32999998, b: 0.88, a: 0.5} - _GradientColor3: {r: 0, g: 0.32999998, b: 0.88, a: 1} - _GradientColor4: {r: 1, g: 1, b: 1, a: 1} - - _HoverColor: {r: 1, g: 0, b: 0, a: 1} - _HoverColorOpaqueOverride: {r: 1, g: 1, b: 1, a: 1} - - _HoverColorOverride: {r: 1, g: 1, b: 1, a: 1} + - _HoverColorOverride: {r: 0, g: 0.007843138, b: 1, a: 1} - _InnerGlowColor: {r: 1, g: 1, b: 1, a: 0.75} - _ProximityLightCenterColorOverride: {r: 1, g: 0, b: 0, a: 0} - _ProximityLightMiddleColorOverride: {r: 0, g: 1, b: 0, a: 0.5} - _ProximityLightOuterColorOverride: {r: 0, g: 0, b: 1, a: 1} - - _RimColor: {r: 1, g: 1, b: 1, a: 1} + - _RimColor: {r: 0, g: 0.006896496, b: 1, a: 1} - _RoundCornersRadius: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} m_BuildTextureStacks: [] ---- !u!1001 &1631871841 +--- !u!1001 &1434900812 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 1257006308} + m_TransformParent: {fileID: 641881980} m_Modifications: - target: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} propertyPath: m_Name @@ -16240,6 +14179,10 @@ PrefabInstance: propertyPath: m_LightProbeUsage value: 0 objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_Materials.Array.size + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} propertyPath: m_ReflectionProbeUsage value: 0 @@ -16247,26 +14190,26 @@ PrefabInstance: - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} propertyPath: m_Materials.Array.data[0] value: - objectReference: {fileID: 2076656188} + objectReference: {fileID: 1907285553} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} ---- !u!4 &1631871842 stripped +--- !u!4 &1434900813 stripped Transform: m_CorrespondingSourceObject: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - m_PrefabInstance: {fileID: 1631871841} + m_PrefabInstance: {fileID: 1434900812} m_PrefabAsset: {fileID: 0} ---- !u!1 &1631871843 stripped +--- !u!1 &1434900814 stripped GameObject: m_CorrespondingSourceObject: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - m_PrefabInstance: {fileID: 1631871841} + m_PrefabInstance: {fileID: 1434900812} m_PrefabAsset: {fileID: 0} ---- !u!64 &1631871844 +--- !u!64 &1434900815 MeshCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1631871843} + m_GameObject: {fileID: 1434900814} m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 @@ -16274,13 +14217,18 @@ MeshCollider: m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 4300002, guid: 1104611d051d4e42a68391888b61b32e, type: 3} ---- !u!114 &1631871845 +--- !u!23 &1434900816 stripped +MeshRenderer: + m_CorrespondingSourceObject: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + m_PrefabInstance: {fileID: 1434900812} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1434900818 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1631871843} + m_GameObject: {fileID: 1434900814} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: c53e2b0613597e849870c4a691d25e0f, type: 3} @@ -16288,31 +14236,196 @@ MonoBehaviour: m_EditorClassIdentifier: defaultMaterials: - {fileID: 2100000, guid: 72beba80472642299b6651a33cc160df, type: 2} ---- !u!23 &1631871846 stripped +--- !u!1 &1444854129 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1444854130} + m_Layer: 0 + m_Name: ShaderBall (7) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &1444854130 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1444854129} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -5.6, y: 0.1, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 441466247} + - {fileID: 1141845616} + m_Father: {fileID: 1595900778} + m_RootOrder: 8 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &1484576910 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1793330793} + m_Modifications: + - target: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_Name + value: ShaderBallInner + objectReference: {fileID: 0} + - target: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_CastShadows + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_MotionVectors + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_ReceiveShadows + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LightProbeUsage + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_ReflectionProbeUsage + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 943765560} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} +--- !u!4 &1484576911 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + m_PrefabInstance: {fileID: 1484576910} + m_PrefabAsset: {fileID: 0} +--- !u!1 &1484576912 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + m_PrefabInstance: {fileID: 1484576910} + m_PrefabAsset: {fileID: 0} +--- !u!64 &1484576913 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1484576912} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 4300002, guid: 1104611d051d4e42a68391888b61b32e, type: 3} +--- !u!114 &1484576914 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1484576912} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c53e2b0613597e849870c4a691d25e0f, type: 3} + m_Name: + m_EditorClassIdentifier: + defaultMaterials: + - {fileID: 2100000, guid: 11043ba092e44ae496f1361e7c0d8b0b, type: 2} +--- !u!23 &1484576915 stripped MeshRenderer: m_CorrespondingSourceObject: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - m_PrefabInstance: {fileID: 1631871841} + m_PrefabInstance: {fileID: 1484576910} m_PrefabAsset: {fileID: 0} ---- !u!21 &1635481276 +--- !u!21 &1500990950 Material: serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: ShaderBallClippingPlane (Instance) + m_Name: ShaderBallClippingBox (Instance) m_Shader: {fileID: 4800000, guid: c331f6c43a2ef0945864cb668f2653c9, type: 3} m_ValidKeywords: - - _CLIPPING_BORDER - - _CLIPPING_PLANE + - _BORDER_LIGHT_USES_HOVER_COLOR + - _CLIPPING_BOX - _DIRECTIONAL_LIGHT - _DISABLE_ALBEDO_MAP + - _HOVER_COLOR_OVERRIDE - _HOVER_LIGHT - _REFLECTIONS + - _RIM_LIGHT - _SPECULAR_HIGHLIGHTS - _USE_WORLD_SCALE - m_InvalidKeywords: - - _CLIPPING_PLANE_BORDER + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 @@ -16347,10 +14460,6 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - - _EmissiveMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - _IridescentSpectrumMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -16360,7 +14469,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 32c57306df745a147a2e02f8827a8cdc, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: @@ -16394,34 +14503,35 @@ Material: - _BorderLightOpaque: 0 - _BorderLightOpaqueAlpha: 1 - _BorderLightReplacesAlbedo: 0 - - _BorderLightUsesHoverColor: 0 + - _BorderLightUsesHoverColor: 1 - _BorderMinValue: 0.02 - _BorderWidth: 0.1 - _BorderWidthHorizontal: 0.1 - _BorderWidthVertical: 0.1 - _BumpScale: 1 - - _ClippingBorder: 1 + - _ClipBoxSide: 1 + - _ClipPlaneSide: 1 + - _ClipSphereSide: 1 + - _ClippingBorder: 0 - _ClippingBorderWidth: 0.025 - - _ClippingBox: 0 - - _ClippingPlane: 1 - - _ClippingPlaneBorder: 1 - - _ClippingPlaneBorderWidth: 0.02 + - _ClippingBox: 1 + - _ClippingPlane: 0 + - _ClippingPlaneBorder: 0 + - _ClippingPlaneBorderWidth: 0.025 - _ClippingSphere: 0 - _ColorWriteMask: 15 - - _Cull: 2 - - _CullMode: 2 + - _CullMode: 0 - _CustomMode: 0 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DirectionalLight: 1 - _DstBlend: 0 - - _DstBlendAlpha: 1 - _EdgeSmoothingMode: 0 - _EdgeSmoothingValue: 0.002 - _EnableChannelMap: 0 - _EnableEmission: 0 - _EnableHoverColorOpaqueOverride: 0 - - _EnableHoverColorOverride: 0 + - _EnableHoverColorOverride: 1 - _EnableLightMap: 0 - _EnableLocalSpaceTriplanarMapping: 0 - _EnableNormalMap: 0 @@ -16456,8 +14566,6 @@ Material: - _Metallic: 0 - _MipmapBias: -2 - _Mode: 0 - - _MyCullVariable: 1 - - _NPR: 0 - _NearLightFade: 0 - _NearPlaneFade: 0 - _NormalMapScale: 1 @@ -16470,19 +14578,17 @@ Material: - _Refraction: 0 - _RefractiveIndex: 1.1 - _RenderQueueOverride: -1 - - _RimLight: 0 + - _RimLight: 1 - _RimPower: 3 - _RoundCornerMargin: 0 - - _RoundCornerPower: 0.4 - _RoundCornerRadius: 0.25 - _RoundCorners: 0 - _RoundCornersHideInterior: 0 - - _Smoothness: 0.5 + - _Smoothness: 1 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SphericalHarmonics: 0 - _SrcBlend: 1 - - _SrcBlendAlpha: 1 - _Stencil: 0 - _StencilComparison: 0 - _StencilOperation: 0 @@ -16494,7 +14600,6 @@ Material: - _UseWorldScale: 1 - _VertexColors: 0 - _VertexExtrusion: 0 - - _VertexExtrusionConstantWidth: 0 - _VertexExtrusionSmoothNormals: 0 - _VertexExtrusionValue: 0 - _ZOffsetFactor: 0 @@ -16504,10 +14609,12 @@ Material: m_Colors: - _BlurBackgroundRect: {r: 0, g: 0, b: 1, a: 1} - _BorderColor: {r: 1, g: 1, b: 1, a: 0} + - _ClipBoxSize: {r: 1, g: 1, b: 1, a: 0} - _ClipPlane: {r: 0, g: 1, b: 0, a: 0} + - _ClipSphere: {r: 0, g: 0, b: 0, a: 0.5} - _ClippingBorderColor: {r: 1, g: 0.2, b: 0, a: 1} - _ClippingPlaneBorderColor: {r: 1, g: 0.2, b: 0, a: 1} - - _Color: {r: 0.5754717, g: 0.4325086, b: 0.4325086, a: 1} + - _Color: {r: 0.72794116, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1} - _EnvironmentColorX: {r: 1, g: 0, b: 0, a: 1} @@ -16520,69 +14627,34 @@ Material: - _GradientColor2: {r: 0, g: 0.32999998, b: 0.88, a: 0.5} - _GradientColor3: {r: 0, g: 0.32999998, b: 0.88, a: 1} - _GradientColor4: {r: 1, g: 1, b: 1, a: 1} - - _HoverColor: {r: 1, g: 0, b: 0, a: 1} - _HoverColorOpaqueOverride: {r: 1, g: 1, b: 1, a: 1} - - _HoverColorOverride: {r: 1, g: 1, b: 1, a: 1} + - _HoverColorOverride: {r: 0, g: 0.007843138, b: 1, a: 1} - _InnerGlowColor: {r: 1, g: 1, b: 1, a: 0.75} - _ProximityLightCenterColorOverride: {r: 1, g: 0, b: 0, a: 0} - _ProximityLightMiddleColorOverride: {r: 0, g: 1, b: 0, a: 0.5} - _ProximityLightOuterColorOverride: {r: 0, g: 0, b: 1, a: 1} - - _RimColor: {r: 1, g: 1, b: 1, a: 1} + - _RimColor: {r: 0, g: 0.006896496, b: 1, a: 1} - _RoundCornersRadius: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} m_BuildTextureStacks: [] ---- !u!1 &1659572900 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1659572901} - m_Layer: 0 - m_Name: ShaderBall (5) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1659572901 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1659572900} - m_LocalRotation: {x: 0.0000000037252899, y: -0.00000008940696, z: 0.99636066, w: 0.08523821} - m_LocalPosition: {x: 0.02, y: 0.94, z: -0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1060317756} - - {fileID: 1576001569} - m_Father: {fileID: 723260586} - m_RootOrder: 6 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 170.22101} ---- !u!21 &1684186454 +--- !u!21 &1503596314 Material: serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: ShaderBallClippingPlane (Instance) + m_Name: ShaderBallClippingSphere (Instance) m_Shader: {fileID: 4800000, guid: c331f6c43a2ef0945864cb668f2653c9, type: 3} m_ValidKeywords: - - _CLIPPING_BORDER - - _CLIPPING_PLANE + - _BORDER_LIGHT_USES_HOVER_COLOR + - _CLIPPING_SPHERE - _DIRECTIONAL_LIGHT - _DISABLE_ALBEDO_MAP - _HOVER_LIGHT - _REFLECTIONS - _SPECULAR_HIGHLIGHTS - _USE_WORLD_SCALE - m_InvalidKeywords: - - _CLIPPING_PLANE_BORDER + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 @@ -16617,10 +14689,6 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - - _EmissiveMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - _IridescentSpectrumMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -16630,7 +14698,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 32c57306df745a147a2e02f8827a8cdc, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: @@ -16664,28 +14732,29 @@ Material: - _BorderLightOpaque: 0 - _BorderLightOpaqueAlpha: 1 - _BorderLightReplacesAlbedo: 0 - - _BorderLightUsesHoverColor: 0 + - _BorderLightUsesHoverColor: 1 - _BorderMinValue: 0.02 - _BorderWidth: 0.1 - _BorderWidthHorizontal: 0.1 - _BorderWidthVertical: 0.1 - _BumpScale: 1 - - _ClippingBorder: 1 + - _ClipBoxSide: 1 + - _ClipPlaneSide: 1 + - _ClipSphereSide: 1 + - _ClippingBorder: 0 - _ClippingBorderWidth: 0.025 - _ClippingBox: 0 - - _ClippingPlane: 1 - - _ClippingPlaneBorder: 1 - - _ClippingPlaneBorderWidth: 0.02 - - _ClippingSphere: 0 + - _ClippingPlane: 0 + - _ClippingPlaneBorder: 0 + - _ClippingPlaneBorderWidth: 0.025 + - _ClippingSphere: 1 - _ColorWriteMask: 15 - - _Cull: 2 - _CullMode: 2 - _CustomMode: 0 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DirectionalLight: 1 - _DstBlend: 0 - - _DstBlendAlpha: 1 - _EdgeSmoothingMode: 0 - _EdgeSmoothingValue: 0.002 - _EnableChannelMap: 0 @@ -16726,8 +14795,6 @@ Material: - _Metallic: 0 - _MipmapBias: -2 - _Mode: 0 - - _MyCullVariable: 1 - - _NPR: 0 - _NearLightFade: 0 - _NearPlaneFade: 0 - _NormalMapScale: 1 @@ -16743,16 +14810,14 @@ Material: - _RimLight: 0 - _RimPower: 3 - _RoundCornerMargin: 0 - - _RoundCornerPower: 0.4 - _RoundCornerRadius: 0.25 - _RoundCorners: 0 - _RoundCornersHideInterior: 0 - - _Smoothness: 0.5 + - _Smoothness: 1 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SphericalHarmonics: 0 - _SrcBlend: 1 - - _SrcBlendAlpha: 1 - _Stencil: 0 - _StencilComparison: 0 - _StencilOperation: 0 @@ -16764,7 +14829,6 @@ Material: - _UseWorldScale: 1 - _VertexColors: 0 - _VertexExtrusion: 0 - - _VertexExtrusionConstantWidth: 0 - _VertexExtrusionSmoothNormals: 0 - _VertexExtrusionValue: 0 - _ZOffsetFactor: 0 @@ -16774,10 +14838,12 @@ Material: m_Colors: - _BlurBackgroundRect: {r: 0, g: 0, b: 1, a: 1} - _BorderColor: {r: 1, g: 1, b: 1, a: 0} + - _ClipBoxSize: {r: 1, g: 1, b: 1, a: 0} - _ClipPlane: {r: 0, g: 1, b: 0, a: 0} + - _ClipSphere: {r: 0, g: 0, b: 0, a: 0.5} - _ClippingBorderColor: {r: 1, g: 0.2, b: 0, a: 1} - _ClippingPlaneBorderColor: {r: 1, g: 0.2, b: 0, a: 1} - - _Color: {r: 0.5754717, g: 0.4325086, b: 0.4325086, a: 1} + - _Color: {r: 0, g: 0.5862069, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1} - _EnvironmentColorX: {r: 1, g: 0, b: 0, a: 1} @@ -16787,399 +14853,574 @@ Material: - _GradientAlphaTime: {r: 0, g: 0, b: 0, a: 0} - _GradientColor0: {r: 0.631373, g: 0.631373, b: 0.631373, a: 0} - _GradientColor1: {r: 1, g: 0.690196, b: 0.976471, a: 0.25} - - _GradientColor2: {r: 0, g: 0.32999998, b: 0.88, a: 0.5} - - _GradientColor3: {r: 0, g: 0.32999998, b: 0.88, a: 1} - - _GradientColor4: {r: 1, g: 1, b: 1, a: 1} - - _HoverColor: {r: 1, g: 0, b: 0, a: 1} - - _HoverColorOpaqueOverride: {r: 1, g: 1, b: 1, a: 1} - - _HoverColorOverride: {r: 1, g: 1, b: 1, a: 1} - - _InnerGlowColor: {r: 1, g: 1, b: 1, a: 0.75} - - _ProximityLightCenterColorOverride: {r: 1, g: 0, b: 0, a: 0} - - _ProximityLightMiddleColorOverride: {r: 0, g: 1, b: 0, a: 0.5} - - _ProximityLightOuterColorOverride: {r: 0, g: 0, b: 1, a: 1} - - _RimColor: {r: 1, g: 1, b: 1, a: 1} - - _RoundCornersRadius: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} - m_BuildTextureStacks: [] ---- !u!1001 &1687595649 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 842427686} - m_Modifications: - - target: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_Name - value: ShaderBallInner - objectReference: {fileID: 0} - - target: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_StaticEditorFlags - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalScale.x - value: 0.99000084 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalScale.y - value: 0.9900005 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalScale.z - value: 0.9900005 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_CastShadows - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_MotionVectors - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_ReceiveShadows - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LightProbeUsage - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_ReflectionProbeUsage - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: ced12abb765d5e247bd3311bd2fb5d98, type: 2} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} ---- !u!4 &1687595650 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - m_PrefabInstance: {fileID: 1687595649} - m_PrefabAsset: {fileID: 0} ---- !u!1 &1687595651 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - m_PrefabInstance: {fileID: 1687595649} - m_PrefabAsset: {fileID: 0} ---- !u!64 &1687595652 -MeshCollider: + - _GradientColor2: {r: 0, g: 0.32999998, b: 0.88, a: 0.5} + - _GradientColor3: {r: 0, g: 0.32999998, b: 0.88, a: 1} + - _GradientColor4: {r: 1, g: 1, b: 1, a: 1} + - _HoverColorOpaqueOverride: {r: 1, g: 1, b: 1, a: 1} + - _HoverColorOverride: {r: 1, g: 1, b: 1, a: 1} + - _InnerGlowColor: {r: 1, g: 1, b: 1, a: 0.75} + - _ProximityLightCenterColorOverride: {r: 1, g: 0, b: 0, a: 0} + - _ProximityLightMiddleColorOverride: {r: 0, g: 1, b: 0, a: 0.5} + - _ProximityLightOuterColorOverride: {r: 0, g: 0, b: 1, a: 1} + - _RimColor: {r: 1, g: 1, b: 1, a: 1} + - _RoundCornersRadius: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} + m_BuildTextureStacks: [] +--- !u!21 &1532491288 +Material: + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1687595651} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 4 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: 4300002, guid: 1104611d051d4e42a68391888b61b32e, type: 3} ---- !u!1001 &1687903705 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 1274666198} - m_Modifications: - - target: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_Name - value: ShaderBallInner - objectReference: {fileID: 0} - - target: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_StaticEditorFlags - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalScale.x - value: 0.99000084 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalScale.y - value: 0.9900005 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalScale.z - value: 0.9900005 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_CastShadows - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_MotionVectors - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_ReceiveShadows - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LightProbeUsage - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_ReflectionProbeUsage - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: ced12abb765d5e247bd3311bd2fb5d98, type: 2} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} ---- !u!4 &1687903706 stripped + m_Name: ShaderBallClippingSphere (Instance) + m_Shader: {fileID: 4800000, guid: c331f6c43a2ef0945864cb668f2653c9, type: 3} + m_ValidKeywords: + - _BORDER_LIGHT_USES_HOVER_COLOR + - _CLIPPING_SPHERE + - _DIRECTIONAL_LIGHT + - _DISABLE_ALBEDO_MAP + - _HOVER_LIGHT + - _REFLECTIONS + - _SPECULAR_HIGHLIGHTS + - _USE_WORLD_SCALE + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 1 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 2000 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ChannelMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissiveMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _IridescentSpectrumMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _LightMapTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: 32c57306df745a147a2e02f8827a8cdc, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _NormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AlbedoAlphaMode: 0 + - _AlbedoAlphaSmoothness: 0 + - _AlbedoAssignedAtRuntime: 0 + - _BlendOp: 0 + - _BlendedClippingWidth: 1 + - _BlurBorderIntensity: 0 + - _BlurMode: 0 + - _BlurTextureIntensity: 1 + - _BorderColorMode: 0 + - _BorderLight: 0 + - _BorderLightOpaque: 0 + - _BorderLightOpaqueAlpha: 1 + - _BorderLightReplacesAlbedo: 0 + - _BorderLightUsesHoverColor: 1 + - _BorderMinValue: 0.02 + - _BorderWidth: 0.1 + - _BorderWidthHorizontal: 0.1 + - _BorderWidthVertical: 0.1 + - _BumpScale: 1 + - _ClipBoxSide: 1 + - _ClipPlaneSide: 1 + - _ClipSphereSide: 1 + - _ClippingBorder: 0 + - _ClippingBorderWidth: 0.025 + - _ClippingBox: 0 + - _ClippingPlane: 0 + - _ClippingPlaneBorder: 0 + - _ClippingPlaneBorderWidth: 0.025 + - _ClippingSphere: 1 + - _ColorWriteMask: 15 + - _CullMode: 2 + - _CustomMode: 0 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DirectionalLight: 1 + - _DstBlend: 0 + - _DstBlendAlpha: 1 + - _EdgeSmoothingMode: 0 + - _EdgeSmoothingValue: 0.002 + - _EnableChannelMap: 0 + - _EnableEmission: 0 + - _EnableHoverColorOpaqueOverride: 0 + - _EnableHoverColorOverride: 0 + - _EnableLightMap: 0 + - _EnableLocalSpaceTriplanarMapping: 0 + - _EnableNormalMap: 0 + - _EnableProximityLightColorOverride: 0 + - _EnableSSAA: 0 + - _EnableStencil: 0 + - _EnableTriplanarMapping: 0 + - _EnvironmentColorIntensity: 0.5 + - _EnvironmentColorThreshold: 1.5 + - _EnvironmentColoring: 0 + - _Fade: 1 + - _FadeBeginDistance: 0.85 + - _FadeCompleteDistance: 0.5 + - _FadeMinValue: 0 + - _FluentLightIntensity: 1 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _GradientAngle: 180 + - _GradientMode: 0 + - _HoverLight: 1 + - _HoverLightOpaque: 0 + - _IgnoreZScale: 0 + - _IndependentCorners: 0 + - _InnerGlow: 0 + - _InnerGlowPower: 4 + - _InstancedColor: 0 + - _Iridescence: 0 + - _IridescenceAngle: -0.78 + - _IridescenceIntensity: 0.5 + - _IridescenceThreshold: 0.05 + - _Metallic: 0 + - _MipmapBias: -2 + - _Mode: 0 + - _NPR: 0 + - _NearLightFade: 0 + - _NearPlaneFade: 0 + - _NormalMapScale: 1 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _ProximityLight: 0 + - _ProximityLightSubtractive: 0 + - _ProximityLightTwoSided: 0 + - _Reflections: 1 + - _Refraction: 0 + - _RefractiveIndex: 1.1 + - _RenderQueueOverride: -1 + - _RimLight: 0 + - _RimPower: 3 + - _RoundCornerMargin: 0 + - _RoundCornerRadius: 0.25 + - _RoundCorners: 0 + - _RoundCornersHideInterior: 0 + - _Smoothness: 1 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SphericalHarmonics: 0 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Stencil: 0 + - _StencilComparison: 0 + - _StencilOperation: 0 + - _StencilReadMask: 255 + - _StencilReference: 0 + - _StencilWriteMask: 255 + - _TriplanarMappingBlendSharpness: 4 + - _UVSec: 0 + - _UseWorldScale: 1 + - _VertexColors: 0 + - _VertexExtrusion: 0 + - _VertexExtrusionConstantWidth: 0 + - _VertexExtrusionSmoothNormals: 0 + - _VertexExtrusionValue: 0 + - _ZOffsetFactor: 0 + - _ZOffsetUnits: 0 + - _ZTest: 4 + - _ZWrite: 1 + m_Colors: + - _BlurBackgroundRect: {r: 0, g: 0, b: 1, a: 1} + - _BorderColor: {r: 1, g: 1, b: 1, a: 0} + - _ClipBoxSize: {r: 1, g: 1, b: 1, a: 0} + - _ClipPlane: {r: 0, g: 1, b: 0, a: 0} + - _ClipSphere: {r: 0, g: 0, b: 0, a: 0.5} + - _ClippingBorderColor: {r: 1, g: 0.2, b: 0, a: 1} + - _ClippingPlaneBorderColor: {r: 1, g: 0.2, b: 0, a: 1} + - _Color: {r: 0, g: 0.5862069, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1} + - _EnvironmentColorX: {r: 1, g: 0, b: 0, a: 1} + - _EnvironmentColorY: {r: 0, g: 1, b: 0, a: 1} + - _EnvironmentColorZ: {r: 0, g: 0, b: 1, a: 1} + - _GradientAlpha: {r: 1, g: 1, b: 1, a: 1} + - _GradientAlphaTime: {r: 0, g: 0, b: 0, a: 0} + - _GradientColor0: {r: 0.631373, g: 0.631373, b: 0.631373, a: 0} + - _GradientColor1: {r: 1, g: 0.690196, b: 0.976471, a: 0.25} + - _GradientColor2: {r: 0, g: 0.32999998, b: 0.88, a: 0.5} + - _GradientColor3: {r: 0, g: 0.32999998, b: 0.88, a: 1} + - _GradientColor4: {r: 1, g: 1, b: 1, a: 1} + - _HoverColorOpaqueOverride: {r: 1, g: 1, b: 1, a: 1} + - _HoverColorOverride: {r: 1, g: 1, b: 1, a: 1} + - _InnerGlowColor: {r: 1, g: 1, b: 1, a: 0.75} + - _ProximityLightCenterColorOverride: {r: 1, g: 0, b: 0, a: 0} + - _ProximityLightMiddleColorOverride: {r: 0, g: 1, b: 0, a: 0.5} + - _ProximityLightOuterColorOverride: {r: 0, g: 0, b: 1, a: 1} + - _RimColor: {r: 1, g: 1, b: 1, a: 1} + - _RoundCornersRadius: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} + m_BuildTextureStacks: [] +--- !u!4 &1544641785 stripped Transform: - m_CorrespondingSourceObject: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - m_PrefabInstance: {fileID: 1687903705} - m_PrefabAsset: {fileID: 0} ---- !u!1 &1687903707 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - m_PrefabInstance: {fileID: 1687903705} + m_CorrespondingSourceObject: {fileID: 5264854134403395402, guid: 53b4fadc7abe80d4f9549b89f80300d0, type: 3} + m_PrefabInstance: {fileID: 2083807616} m_PrefabAsset: {fileID: 0} ---- !u!64 &1687903708 -MeshCollider: +--- !u!21 &1547427062 +Material: + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1687903707} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 4 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: 4300002, guid: 1104611d051d4e42a68391888b61b32e, type: 3} ---- !u!1001 &1719678897 + m_Name: ShaderBallClippingSphere (Instance) + m_Shader: {fileID: 4800000, guid: c331f6c43a2ef0945864cb668f2653c9, type: 3} + m_ValidKeywords: + - _BORDER_LIGHT_USES_HOVER_COLOR + - _CLIPPING_SPHERE + - _DIRECTIONAL_LIGHT + - _DISABLE_ALBEDO_MAP + - _HOVER_LIGHT + - _REFLECTIONS + - _SPECULAR_HIGHLIGHTS + - _USE_WORLD_SCALE + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 1 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 2000 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ChannelMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _IridescentSpectrumMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _LightMapTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: 32c57306df745a147a2e02f8827a8cdc, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _NormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AlbedoAlphaMode: 0 + - _AlbedoAlphaSmoothness: 0 + - _AlbedoAssignedAtRuntime: 0 + - _BlendOp: 0 + - _BlendedClippingWidth: 1 + - _BlurBorderIntensity: 0 + - _BlurMode: 0 + - _BlurTextureIntensity: 1 + - _BorderColorMode: 0 + - _BorderLight: 0 + - _BorderLightOpaque: 0 + - _BorderLightOpaqueAlpha: 1 + - _BorderLightReplacesAlbedo: 0 + - _BorderLightUsesHoverColor: 1 + - _BorderMinValue: 0.02 + - _BorderWidth: 0.1 + - _BorderWidthHorizontal: 0.1 + - _BorderWidthVertical: 0.1 + - _BumpScale: 1 + - _ClipBoxSide: 1 + - _ClipPlaneSide: 1 + - _ClipSphereSide: 1 + - _ClippingBorder: 0 + - _ClippingBorderWidth: 0.025 + - _ClippingBox: 0 + - _ClippingPlane: 0 + - _ClippingPlaneBorder: 0 + - _ClippingPlaneBorderWidth: 0.025 + - _ClippingSphere: 1 + - _ColorWriteMask: 15 + - _CullMode: 2 + - _CustomMode: 0 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DirectionalLight: 1 + - _DstBlend: 0 + - _EdgeSmoothingMode: 0 + - _EdgeSmoothingValue: 0.002 + - _EnableChannelMap: 0 + - _EnableEmission: 0 + - _EnableHoverColorOpaqueOverride: 0 + - _EnableHoverColorOverride: 0 + - _EnableLightMap: 0 + - _EnableLocalSpaceTriplanarMapping: 0 + - _EnableNormalMap: 0 + - _EnableProximityLightColorOverride: 0 + - _EnableSSAA: 0 + - _EnableStencil: 0 + - _EnableTriplanarMapping: 0 + - _EnvironmentColorIntensity: 0.5 + - _EnvironmentColorThreshold: 1.5 + - _EnvironmentColoring: 0 + - _Fade: 1 + - _FadeBeginDistance: 0.85 + - _FadeCompleteDistance: 0.5 + - _FadeMinValue: 0 + - _FluentLightIntensity: 1 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _GradientAngle: 180 + - _GradientMode: 0 + - _HoverLight: 1 + - _HoverLightOpaque: 0 + - _IgnoreZScale: 0 + - _IndependentCorners: 0 + - _InnerGlow: 0 + - _InnerGlowPower: 4 + - _InstancedColor: 0 + - _Iridescence: 0 + - _IridescenceAngle: -0.78 + - _IridescenceIntensity: 0.5 + - _IridescenceThreshold: 0.05 + - _Metallic: 0 + - _MipmapBias: -2 + - _Mode: 0 + - _NearLightFade: 0 + - _NearPlaneFade: 0 + - _NormalMapScale: 1 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _ProximityLight: 0 + - _ProximityLightSubtractive: 0 + - _ProximityLightTwoSided: 0 + - _Reflections: 1 + - _Refraction: 0 + - _RefractiveIndex: 1.1 + - _RenderQueueOverride: -1 + - _RimLight: 0 + - _RimPower: 3 + - _RoundCornerMargin: 0 + - _RoundCornerRadius: 0.25 + - _RoundCorners: 0 + - _RoundCornersHideInterior: 0 + - _Smoothness: 1 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SphericalHarmonics: 0 + - _SrcBlend: 1 + - _Stencil: 0 + - _StencilComparison: 0 + - _StencilOperation: 0 + - _StencilReadMask: 255 + - _StencilReference: 0 + - _StencilWriteMask: 255 + - _TriplanarMappingBlendSharpness: 4 + - _UVSec: 0 + - _UseWorldScale: 1 + - _VertexColors: 0 + - _VertexExtrusion: 0 + - _VertexExtrusionSmoothNormals: 0 + - _VertexExtrusionValue: 0 + - _ZOffsetFactor: 0 + - _ZOffsetUnits: 0 + - _ZTest: 4 + - _ZWrite: 1 + m_Colors: + - _BlurBackgroundRect: {r: 0, g: 0, b: 1, a: 1} + - _BorderColor: {r: 1, g: 1, b: 1, a: 0} + - _ClipBoxSize: {r: 1, g: 1, b: 1, a: 0} + - _ClipPlane: {r: 0, g: 1, b: 0, a: 0} + - _ClipSphere: {r: 0, g: 0, b: 0, a: 0.5} + - _ClippingBorderColor: {r: 1, g: 0.2, b: 0, a: 1} + - _ClippingPlaneBorderColor: {r: 1, g: 0.2, b: 0, a: 1} + - _Color: {r: 0, g: 0.5862069, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1} + - _EnvironmentColorX: {r: 1, g: 0, b: 0, a: 1} + - _EnvironmentColorY: {r: 0, g: 1, b: 0, a: 1} + - _EnvironmentColorZ: {r: 0, g: 0, b: 1, a: 1} + - _GradientAlpha: {r: 1, g: 1, b: 1, a: 1} + - _GradientAlphaTime: {r: 0, g: 0, b: 0, a: 0} + - _GradientColor0: {r: 0.631373, g: 0.631373, b: 0.631373, a: 0} + - _GradientColor1: {r: 1, g: 0.690196, b: 0.976471, a: 0.25} + - _GradientColor2: {r: 0, g: 0.32999998, b: 0.88, a: 0.5} + - _GradientColor3: {r: 0, g: 0.32999998, b: 0.88, a: 1} + - _GradientColor4: {r: 1, g: 1, b: 1, a: 1} + - _HoverColorOpaqueOverride: {r: 1, g: 1, b: 1, a: 1} + - _HoverColorOverride: {r: 1, g: 1, b: 1, a: 1} + - _InnerGlowColor: {r: 1, g: 1, b: 1, a: 0.75} + - _ProximityLightCenterColorOverride: {r: 1, g: 0, b: 0, a: 0} + - _ProximityLightMiddleColorOverride: {r: 0, g: 1, b: 0, a: 0.5} + - _ProximityLightOuterColorOverride: {r: 0, g: 0, b: 1, a: 1} + - _RimColor: {r: 1, g: 1, b: 1, a: 1} + - _RoundCornersRadius: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} + m_BuildTextureStacks: [] +--- !u!1001 &1558856740 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 162241854} + m_TransformParent: {fileID: 1250785856} m_Modifications: - - target: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_Name - value: ShaderBall (4) - objectReference: {fileID: 0} - - target: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_StaticEditorFlags - value: 0 + - target: {fileID: 5264854133094485412, guid: 53b4fadc7abe80d4f9549b89f80300d0, type: 3} + propertyPath: m_text + value: 'Clipping Sphere + +' objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + - target: {fileID: 5264854134403395402, guid: 53b4fadc7abe80d4f9549b89f80300d0, type: 3} propertyPath: m_RootOrder value: 5 objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + - target: {fileID: 5264854134403395402, guid: 53b4fadc7abe80d4f9549b89f80300d0, type: 3} propertyPath: m_LocalScale.x - value: 1 + value: 2 objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + - target: {fileID: 5264854134403395402, guid: 53b4fadc7abe80d4f9549b89f80300d0, type: 3} propertyPath: m_LocalScale.y - value: 1 + value: 2 objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + - target: {fileID: 5264854134403395402, guid: 53b4fadc7abe80d4f9549b89f80300d0, type: 3} propertyPath: m_LocalScale.z value: 1 objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + - target: {fileID: 5264854134403395402, guid: 53b4fadc7abe80d4f9549b89f80300d0, type: 3} propertyPath: m_LocalPosition.x - value: -3.2 + value: 1.0736674 objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + - target: {fileID: 5264854134403395402, guid: 53b4fadc7abe80d4f9549b89f80300d0, type: 3} propertyPath: m_LocalPosition.y - value: 0.4 + value: -0.0013 objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + - target: {fileID: 5264854134403395402, guid: 53b4fadc7abe80d4f9549b89f80300d0, type: 3} propertyPath: m_LocalPosition.z - value: 0 + value: -1.5011 objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + - target: {fileID: 5264854134403395402, guid: 53b4fadc7abe80d4f9549b89f80300d0, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + - target: {fileID: 5264854134403395402, guid: 53b4fadc7abe80d4f9549b89f80300d0, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + - target: {fileID: 5264854134403395402, guid: 53b4fadc7abe80d4f9549b89f80300d0, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + - target: {fileID: 5264854134403395402, guid: 53b4fadc7abe80d4f9549b89f80300d0, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + - target: {fileID: 5264854134403395402, guid: 53b4fadc7abe80d4f9549b89f80300d0, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + - target: {fileID: 5264854134403395402, guid: 53b4fadc7abe80d4f9549b89f80300d0, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_CastShadows - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_MotionVectors - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_ReceiveShadows - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LightProbeUsage + - target: {fileID: 5264854134403395402, guid: 53b4fadc7abe80d4f9549b89f80300d0, type: 3} + propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_ReflectionProbeUsage - value: 0 + - target: {fileID: 5264854134403395403, guid: 53b4fadc7abe80d4f9549b89f80300d0, type: 3} + propertyPath: m_Name + value: ClippingSpherePlacard objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 354872648} m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} ---- !u!4 &1719678898 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - m_PrefabInstance: {fileID: 1719678897} - m_PrefabAsset: {fileID: 0} ---- !u!1 &1719678899 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - m_PrefabInstance: {fileID: 1719678897} - m_PrefabAsset: {fileID: 0} ---- !u!64 &1719678900 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1719678899} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 4 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: 4300002, guid: 1104611d051d4e42a68391888b61b32e, type: 3} ---- !u!23 &1719678901 stripped -MeshRenderer: - m_CorrespondingSourceObject: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - m_PrefabInstance: {fileID: 1719678897} - m_PrefabAsset: {fileID: 0} ---- !u!114 &1719678903 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1719678899} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c53e2b0613597e849870c4a691d25e0f, type: 3} - m_Name: - m_EditorClassIdentifier: - defaultMaterials: - - {fileID: 2100000, guid: 93312c326d8c3c54bb251f588b42cda7, type: 2} ---- !u!1001 &1728100313 + m_SourcePrefab: {fileID: 100100000, guid: 53b4fadc7abe80d4f9549b89f80300d0, type: 3} +--- !u!1001 &1576001568 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 1233524242} + m_TransformParent: {fileID: 1659572901} m_Modifications: - target: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} propertyPath: m_Name - value: ShaderBall + value: ShaderBallInner objectReference: {fileID: 0} - target: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} propertyPath: m_StaticEditorFlags @@ -17187,19 +15428,19 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} propertyPath: m_RootOrder - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} propertyPath: m_LocalScale.x - value: 1 + value: 0.99000084 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} propertyPath: m_LocalScale.y - value: 1 + value: 0.9900005 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} propertyPath: m_LocalScale.z - value: 1 + value: 0.9900005 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} propertyPath: m_LocalPosition.x @@ -17260,26 +15501,26 @@ PrefabInstance: - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} propertyPath: m_Materials.Array.data[0] value: - objectReference: {fileID: 97488093} + objectReference: {fileID: 2100000, guid: ced12abb765d5e247bd3311bd2fb5d98, type: 2} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} ---- !u!4 &1728100314 stripped +--- !u!4 &1576001569 stripped Transform: m_CorrespondingSourceObject: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - m_PrefabInstance: {fileID: 1728100313} + m_PrefabInstance: {fileID: 1576001568} m_PrefabAsset: {fileID: 0} ---- !u!1 &1728100315 stripped +--- !u!1 &1576001570 stripped GameObject: m_CorrespondingSourceObject: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - m_PrefabInstance: {fileID: 1728100313} + m_PrefabInstance: {fileID: 1576001568} m_PrefabAsset: {fileID: 0} ---- !u!64 &1728100316 +--- !u!64 &1576001571 MeshCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1728100315} + m_GameObject: {fileID: 1576001570} m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 @@ -17287,39 +15528,259 @@ MeshCollider: m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 4300002, guid: 1104611d051d4e42a68391888b61b32e, type: 3} ---- !u!23 &1728100317 stripped -MeshRenderer: - m_CorrespondingSourceObject: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - m_PrefabInstance: {fileID: 1728100313} - m_PrefabAsset: {fileID: 0} ---- !u!114 &1728100319 -MonoBehaviour: +--- !u!21 &1591531724 +Material: + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1728100315} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c53e2b0613597e849870c4a691d25e0f, type: 3} - m_Name: - m_EditorClassIdentifier: - defaultMaterials: - - {fileID: 2100000, guid: 9f21cf60c2137a64dbe161430f7c0b75, type: 2} ---- !u!21 &1732764233 + m_Name: ShaderBallClippingBox (Instance) + m_Shader: {fileID: 4800000, guid: c331f6c43a2ef0945864cb668f2653c9, type: 3} + m_ValidKeywords: + - _BORDER_LIGHT_USES_HOVER_COLOR + - _CLIPPING_BOX + - _DIRECTIONAL_LIGHT + - _DISABLE_ALBEDO_MAP + - _HOVER_COLOR_OVERRIDE + - _HOVER_LIGHT + - _REFLECTIONS + - _RIM_LIGHT + - _SPECULAR_HIGHLIGHTS + - _USE_WORLD_SCALE + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 1 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 2000 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ChannelMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissiveMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _IridescentSpectrumMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _LightMapTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: 32c57306df745a147a2e02f8827a8cdc, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _NormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AlbedoAlphaMode: 0 + - _AlbedoAlphaSmoothness: 0 + - _AlbedoAssignedAtRuntime: 0 + - _BlendOp: 0 + - _BlendedClippingWidth: 1 + - _BlurBorderIntensity: 0 + - _BlurMode: 0 + - _BlurTextureIntensity: 1 + - _BorderColorMode: 0 + - _BorderLight: 0 + - _BorderLightOpaque: 0 + - _BorderLightOpaqueAlpha: 1 + - _BorderLightReplacesAlbedo: 0 + - _BorderLightUsesHoverColor: 1 + - _BorderMinValue: 0.02 + - _BorderWidth: 0.1 + - _BorderWidthHorizontal: 0.1 + - _BorderWidthVertical: 0.1 + - _BumpScale: 1 + - _ClipBoxSide: 1 + - _ClipPlaneSide: 1 + - _ClipSphereSide: 1 + - _ClippingBorder: 0 + - _ClippingBorderWidth: 0.025 + - _ClippingBox: 1 + - _ClippingPlane: 0 + - _ClippingPlaneBorder: 0 + - _ClippingPlaneBorderWidth: 0.025 + - _ClippingSphere: 0 + - _ColorWriteMask: 15 + - _CullMode: 0 + - _CustomMode: 0 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DirectionalLight: 1 + - _DstBlend: 0 + - _DstBlendAlpha: 1 + - _EdgeSmoothingMode: 0 + - _EdgeSmoothingValue: 0.002 + - _EnableChannelMap: 0 + - _EnableEmission: 0 + - _EnableHoverColorOpaqueOverride: 0 + - _EnableHoverColorOverride: 1 + - _EnableLightMap: 0 + - _EnableLocalSpaceTriplanarMapping: 0 + - _EnableNormalMap: 0 + - _EnableProximityLightColorOverride: 0 + - _EnableSSAA: 0 + - _EnableStencil: 0 + - _EnableTriplanarMapping: 0 + - _EnvironmentColorIntensity: 0.5 + - _EnvironmentColorThreshold: 1.5 + - _EnvironmentColoring: 0 + - _Fade: 1 + - _FadeBeginDistance: 0.85 + - _FadeCompleteDistance: 0.5 + - _FadeMinValue: 0 + - _FluentLightIntensity: 1 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _GradientAngle: 180 + - _GradientMode: 0 + - _HoverLight: 1 + - _HoverLightOpaque: 0 + - _IgnoreZScale: 0 + - _IndependentCorners: 0 + - _InnerGlow: 0 + - _InnerGlowPower: 4 + - _InstancedColor: 0 + - _Iridescence: 0 + - _IridescenceAngle: -0.78 + - _IridescenceIntensity: 0.5 + - _IridescenceThreshold: 0.05 + - _Metallic: 0 + - _MipmapBias: -2 + - _Mode: 0 + - _NPR: 0 + - _NearLightFade: 0 + - _NearPlaneFade: 0 + - _NormalMapScale: 1 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _ProximityLight: 0 + - _ProximityLightSubtractive: 0 + - _ProximityLightTwoSided: 0 + - _Reflections: 1 + - _Refraction: 0 + - _RefractiveIndex: 1.1 + - _RenderQueueOverride: -1 + - _RimLight: 1 + - _RimPower: 3 + - _RoundCornerMargin: 0 + - _RoundCornerRadius: 0.25 + - _RoundCorners: 0 + - _RoundCornersHideInterior: 0 + - _Smoothness: 1 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SphericalHarmonics: 0 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Stencil: 0 + - _StencilComparison: 0 + - _StencilOperation: 0 + - _StencilReadMask: 255 + - _StencilReference: 0 + - _StencilWriteMask: 255 + - _TriplanarMappingBlendSharpness: 4 + - _UVSec: 0 + - _UseWorldScale: 1 + - _VertexColors: 0 + - _VertexExtrusion: 0 + - _VertexExtrusionConstantWidth: 0 + - _VertexExtrusionSmoothNormals: 0 + - _VertexExtrusionValue: 0 + - _ZOffsetFactor: 0 + - _ZOffsetUnits: 0 + - _ZTest: 4 + - _ZWrite: 1 + m_Colors: + - _BlurBackgroundRect: {r: 0, g: 0, b: 1, a: 1} + - _BorderColor: {r: 1, g: 1, b: 1, a: 0} + - _ClipBoxSize: {r: 1, g: 1, b: 1, a: 0} + - _ClipPlane: {r: 0, g: 1, b: 0, a: 0} + - _ClipSphere: {r: 0, g: 0, b: 0, a: 0.5} + - _ClippingBorderColor: {r: 1, g: 0.2, b: 0, a: 1} + - _ClippingPlaneBorderColor: {r: 1, g: 0.2, b: 0, a: 1} + - _Color: {r: 0.72794116, g: 0, b: 0, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1} + - _EnvironmentColorX: {r: 1, g: 0, b: 0, a: 1} + - _EnvironmentColorY: {r: 0, g: 1, b: 0, a: 1} + - _EnvironmentColorZ: {r: 0, g: 0, b: 1, a: 1} + - _GradientAlpha: {r: 1, g: 1, b: 1, a: 1} + - _GradientAlphaTime: {r: 0, g: 0, b: 0, a: 0} + - _GradientColor0: {r: 0.631373, g: 0.631373, b: 0.631373, a: 0} + - _GradientColor1: {r: 1, g: 0.690196, b: 0.976471, a: 0.25} + - _GradientColor2: {r: 0, g: 0.32999998, b: 0.88, a: 0.5} + - _GradientColor3: {r: 0, g: 0.32999998, b: 0.88, a: 1} + - _GradientColor4: {r: 1, g: 1, b: 1, a: 1} + - _HoverColorOpaqueOverride: {r: 1, g: 1, b: 1, a: 1} + - _HoverColorOverride: {r: 0, g: 0.007843138, b: 1, a: 1} + - _InnerGlowColor: {r: 1, g: 1, b: 1, a: 0.75} + - _ProximityLightCenterColorOverride: {r: 1, g: 0, b: 0, a: 0} + - _ProximityLightMiddleColorOverride: {r: 0, g: 1, b: 0, a: 0.5} + - _ProximityLightOuterColorOverride: {r: 0, g: 0, b: 1, a: 1} + - _RimColor: {r: 0, g: 0.006896496, b: 1, a: 1} + - _RoundCornersRadius: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} + m_BuildTextureStacks: [] +--- !u!21 &1595569633 Material: serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: ShaderBallClippingPlane (Instance) + m_Name: ShaderBallClippingPlaneInner (Instance) m_Shader: {fileID: 4800000, guid: c331f6c43a2ef0945864cb668f2653c9, type: 3} m_ValidKeywords: - - _CLIPPING_BORDER - _CLIPPING_PLANE - _DIRECTIONAL_LIGHT - _DISABLE_ALBEDO_MAP + - _EMISSION - _HOVER_LIGHT - _REFLECTIONS - _SPECULAR_HIGHLIGHTS @@ -17360,10 +15821,6 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - - _EmissiveMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - _IridescentSpectrumMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -17373,7 +15830,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 32c57306df745a147a2e02f8827a8cdc, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: @@ -17413,7 +15870,7 @@ Material: - _BorderWidthHorizontal: 0.1 - _BorderWidthVertical: 0.1 - _BumpScale: 1 - - _ClippingBorder: 1 + - _ClippingBorder: 0 - _ClippingBorderWidth: 0.025 - _ClippingBox: 0 - _ClippingPlane: 1 @@ -17422,17 +15879,16 @@ Material: - _ClippingSphere: 0 - _ColorWriteMask: 15 - _Cull: 2 - - _CullMode: 2 + - _CullMode: 1 - _CustomMode: 0 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DirectionalLight: 1 - _DstBlend: 0 - - _DstBlendAlpha: 1 - _EdgeSmoothingMode: 0 - _EdgeSmoothingValue: 0.002 - _EnableChannelMap: 0 - - _EnableEmission: 0 + - _EnableEmission: 1 - _EnableHoverColorOpaqueOverride: 0 - _EnableHoverColorOverride: 0 - _EnableLightMap: 0 @@ -17466,11 +15922,10 @@ Material: - _IridescenceAngle: -0.78 - _IridescenceIntensity: 0.5 - _IridescenceThreshold: 0.05 - - _Metallic: 0 + - _Metallic: 0.036 - _MipmapBias: -2 - _Mode: 0 - _MyCullVariable: 1 - - _NPR: 0 - _NearLightFade: 0 - _NearPlaneFade: 0 - _NormalMapScale: 1 @@ -17495,7 +15950,6 @@ Material: - _SpecularHighlights: 1 - _SphericalHarmonics: 0 - _SrcBlend: 1 - - _SrcBlendAlpha: 1 - _Stencil: 0 - _StencilComparison: 0 - _StencilOperation: 0 @@ -17507,7 +15961,6 @@ Material: - _UseWorldScale: 1 - _VertexColors: 0 - _VertexExtrusion: 0 - - _VertexExtrusionConstantWidth: 0 - _VertexExtrusionSmoothNormals: 0 - _VertexExtrusionValue: 0 - _ZOffsetFactor: 0 @@ -17520,9 +15973,9 @@ Material: - _ClipPlane: {r: 0, g: 1, b: 0, a: 0} - _ClippingBorderColor: {r: 1, g: 0.2, b: 0, a: 1} - _ClippingPlaneBorderColor: {r: 1, g: 0.2, b: 0, a: 1} - - _Color: {r: 0.5754717, g: 0.4325086, b: 0.4325086, a: 1} + - _Color: {r: 1, g: 0.6827586, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1} + - _EmissiveColor: {r: 0.9411765, g: 0, b: 0, a: 1} - _EnvironmentColorX: {r: 1, g: 0, b: 0, a: 1} - _EnvironmentColorY: {r: 0, g: 1, b: 0, a: 1} - _EnvironmentColorZ: {r: 0, g: 0, b: 1, a: 1} @@ -17543,27 +15996,184 @@ Material: - _RimColor: {r: 1, g: 1, b: 1, a: 1} - _RoundCornersRadius: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} m_BuildTextureStacks: [] ---- !u!21 &1735125630 +--- !u!1 &1595900777 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1595900778} + m_Layer: 0 + m_Name: ClippingPlane + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1595900778 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1595900777} + m_LocalRotation: {x: 0, y: 0.7071068, z: 0.7071068, w: 0} + m_LocalPosition: {x: -0.24399999, y: 0, z: -0.6} + m_LocalScale: {x: 0.21048994, y: 0.21048994, z: 0.21048994} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 365058296} + - {fileID: 1793330793} + - {fileID: 1257006308} + - {fileID: 2021874965} + - {fileID: 641881980} + - {fileID: 87335838} + - {fileID: 973147021} + - {fileID: 1872109879} + - {fileID: 1444854130} + - {fileID: 866223477} + m_Father: {fileID: 1250785856} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: -90, y: 180, z: 0} +--- !u!1001 &1607317316 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 119951084} + m_Modifications: + - target: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_Name + value: ShaderBallInner + objectReference: {fileID: 0} + - target: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalScale.x + value: 0.99000084 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalScale.y + value: 0.9900005 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalScale.z + value: 0.9900005 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_CastShadows + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_MotionVectors + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_ReceiveShadows + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LightProbeUsage + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_ReflectionProbeUsage + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: ced12abb765d5e247bd3311bd2fb5d98, type: 2} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} +--- !u!4 &1607317317 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + m_PrefabInstance: {fileID: 1607317316} + m_PrefabAsset: {fileID: 0} +--- !u!1 &1607317318 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + m_PrefabInstance: {fileID: 1607317316} + m_PrefabAsset: {fileID: 0} +--- !u!64 &1607317319 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1607317318} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 4300002, guid: 1104611d051d4e42a68391888b61b32e, type: 3} +--- !u!21 &1624239208 Material: serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: ShaderBallClippingBox (Instance) + m_Name: ShaderBallClippingPlaneInner (Instance) m_Shader: {fileID: 4800000, guid: c331f6c43a2ef0945864cb668f2653c9, type: 3} m_ValidKeywords: - - _BORDER_LIGHT_USES_HOVER_COLOR - - _CLIPPING_BOX + - _CLIPPING_PLANE - _DIRECTIONAL_LIGHT - _DISABLE_ALBEDO_MAP - - _HOVER_COLOR_OVERRIDE + - _EMISSION - _HOVER_LIGHT - _REFLECTIONS - - _RIM_LIGHT - _SPECULAR_HIGHLIGHTS - _USE_WORLD_SCALE - m_InvalidKeywords: [] + m_InvalidKeywords: + - _CLIPPING_PLANE_BORDER m_LightmapFlags: 4 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 @@ -17641,24 +16251,22 @@ Material: - _BorderLightOpaque: 0 - _BorderLightOpaqueAlpha: 1 - _BorderLightReplacesAlbedo: 0 - - _BorderLightUsesHoverColor: 1 + - _BorderLightUsesHoverColor: 0 - _BorderMinValue: 0.02 - _BorderWidth: 0.1 - _BorderWidthHorizontal: 0.1 - _BorderWidthVertical: 0.1 - _BumpScale: 1 - - _ClipBoxSide: 1 - - _ClipPlaneSide: 1 - - _ClipSphereSide: 1 - _ClippingBorder: 0 - _ClippingBorderWidth: 0.025 - - _ClippingBox: 1 - - _ClippingPlane: 0 - - _ClippingPlaneBorder: 0 - - _ClippingPlaneBorderWidth: 0.025 + - _ClippingBox: 0 + - _ClippingPlane: 1 + - _ClippingPlaneBorder: 1 + - _ClippingPlaneBorderWidth: 0.02 - _ClippingSphere: 0 - _ColorWriteMask: 15 - - _CullMode: 0 + - _Cull: 2 + - _CullMode: 1 - _CustomMode: 0 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 @@ -17667,9 +16275,9 @@ Material: - _EdgeSmoothingMode: 0 - _EdgeSmoothingValue: 0.002 - _EnableChannelMap: 0 - - _EnableEmission: 0 + - _EnableEmission: 1 - _EnableHoverColorOpaqueOverride: 0 - - _EnableHoverColorOverride: 1 + - _EnableHoverColorOverride: 0 - _EnableLightMap: 0 - _EnableLocalSpaceTriplanarMapping: 0 - _EnableNormalMap: 0 @@ -17701,9 +16309,10 @@ Material: - _IridescenceAngle: -0.78 - _IridescenceIntensity: 0.5 - _IridescenceThreshold: 0.05 - - _Metallic: 0 + - _Metallic: 0.036 - _MipmapBias: -2 - _Mode: 0 + - _MyCullVariable: 1 - _NearLightFade: 0 - _NearPlaneFade: 0 - _NormalMapScale: 1 @@ -17716,13 +16325,14 @@ Material: - _Refraction: 0 - _RefractiveIndex: 1.1 - _RenderQueueOverride: -1 - - _RimLight: 1 + - _RimLight: 0 - _RimPower: 3 - _RoundCornerMargin: 0 + - _RoundCornerPower: 0.4 - _RoundCornerRadius: 0.25 - _RoundCorners: 0 - _RoundCornersHideInterior: 0 - - _Smoothness: 1 + - _Smoothness: 0.5 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SphericalHarmonics: 0 @@ -17747,14 +16357,12 @@ Material: m_Colors: - _BlurBackgroundRect: {r: 0, g: 0, b: 1, a: 1} - _BorderColor: {r: 1, g: 1, b: 1, a: 0} - - _ClipBoxSize: {r: 1, g: 1, b: 1, a: 0} - _ClipPlane: {r: 0, g: 1, b: 0, a: 0} - - _ClipSphere: {r: 0, g: 0, b: 0, a: 0.5} - _ClippingBorderColor: {r: 1, g: 0.2, b: 0, a: 1} - _ClippingPlaneBorderColor: {r: 1, g: 0.2, b: 0, a: 1} - - _Color: {r: 0.72794116, g: 0, b: 0, a: 1} + - _Color: {r: 1, g: 0.6827586, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1} + - _EmissiveColor: {r: 0.9411765, g: 0, b: 0, a: 1} - _EnvironmentColorX: {r: 1, g: 0, b: 0, a: 1} - _EnvironmentColorY: {r: 0, g: 1, b: 0, a: 1} - _EnvironmentColorZ: {r: 0, g: 0, b: 1, a: 1} @@ -17765,35 +16373,37 @@ Material: - _GradientColor2: {r: 0, g: 0.32999998, b: 0.88, a: 0.5} - _GradientColor3: {r: 0, g: 0.32999998, b: 0.88, a: 1} - _GradientColor4: {r: 1, g: 1, b: 1, a: 1} + - _HoverColor: {r: 1, g: 0, b: 0, a: 1} - _HoverColorOpaqueOverride: {r: 1, g: 1, b: 1, a: 1} - - _HoverColorOverride: {r: 0, g: 0.007843138, b: 1, a: 1} + - _HoverColorOverride: {r: 1, g: 1, b: 1, a: 1} - _InnerGlowColor: {r: 1, g: 1, b: 1, a: 0.75} - _ProximityLightCenterColorOverride: {r: 1, g: 0, b: 0, a: 0} - _ProximityLightMiddleColorOverride: {r: 0, g: 1, b: 0, a: 0.5} - _ProximityLightOuterColorOverride: {r: 0, g: 0, b: 1, a: 1} - - _RimColor: {r: 0, g: 0.006896496, b: 1, a: 1} + - _RimColor: {r: 1, g: 1, b: 1, a: 1} - _RoundCornersRadius: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} m_BuildTextureStacks: [] ---- !u!21 &1763290178 +--- !u!21 &1625794050 Material: serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: ShaderBallClippingPlaneInner (Instance) + m_Name: ShaderBallClippingBox (Instance) m_Shader: {fileID: 4800000, guid: c331f6c43a2ef0945864cb668f2653c9, type: 3} m_ValidKeywords: - - _CLIPPING_PLANE + - _BORDER_LIGHT_USES_HOVER_COLOR + - _CLIPPING_BOX - _DIRECTIONAL_LIGHT - _DISABLE_ALBEDO_MAP - - _EMISSION + - _HOVER_COLOR_OVERRIDE - _HOVER_LIGHT - _REFLECTIONS + - _RIM_LIGHT - _SPECULAR_HIGHLIGHTS - _USE_WORLD_SCALE - m_InvalidKeywords: - - _CLIPPING_PLANE_BORDER + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 @@ -17828,6 +16438,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _EmissiveMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _IridescentSpectrumMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -17871,33 +16485,36 @@ Material: - _BorderLightOpaque: 0 - _BorderLightOpaqueAlpha: 1 - _BorderLightReplacesAlbedo: 0 - - _BorderLightUsesHoverColor: 0 + - _BorderLightUsesHoverColor: 1 - _BorderMinValue: 0.02 - _BorderWidth: 0.1 - _BorderWidthHorizontal: 0.1 - _BorderWidthVertical: 0.1 - _BumpScale: 1 + - _ClipBoxSide: 1 + - _ClipPlaneSide: 1 + - _ClipSphereSide: 1 - _ClippingBorder: 0 - _ClippingBorderWidth: 0.025 - - _ClippingBox: 0 - - _ClippingPlane: 1 - - _ClippingPlaneBorder: 1 - - _ClippingPlaneBorderWidth: 0.02 + - _ClippingBox: 1 + - _ClippingPlane: 0 + - _ClippingPlaneBorder: 0 + - _ClippingPlaneBorderWidth: 0.025 - _ClippingSphere: 0 - _ColorWriteMask: 15 - - _Cull: 2 - - _CullMode: 1 + - _CullMode: 0 - _CustomMode: 0 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DirectionalLight: 1 - _DstBlend: 0 + - _DstBlendAlpha: 1 - _EdgeSmoothingMode: 0 - _EdgeSmoothingValue: 0.002 - _EnableChannelMap: 0 - - _EnableEmission: 1 + - _EnableEmission: 0 - _EnableHoverColorOpaqueOverride: 0 - - _EnableHoverColorOverride: 0 + - _EnableHoverColorOverride: 1 - _EnableLightMap: 0 - _EnableLocalSpaceTriplanarMapping: 0 - _EnableNormalMap: 0 @@ -17929,10 +16546,10 @@ Material: - _IridescenceAngle: -0.78 - _IridescenceIntensity: 0.5 - _IridescenceThreshold: 0.05 - - _Metallic: 0.036 + - _Metallic: 0 - _MipmapBias: -2 - _Mode: 0 - - _MyCullVariable: 1 + - _NPR: 0 - _NearLightFade: 0 - _NearPlaneFade: 0 - _NormalMapScale: 1 @@ -17945,18 +16562,18 @@ Material: - _Refraction: 0 - _RefractiveIndex: 1.1 - _RenderQueueOverride: -1 - - _RimLight: 0 + - _RimLight: 1 - _RimPower: 3 - _RoundCornerMargin: 0 - - _RoundCornerPower: 0.4 - _RoundCornerRadius: 0.25 - _RoundCorners: 0 - _RoundCornersHideInterior: 0 - - _Smoothness: 0.5 + - _Smoothness: 1 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SphericalHarmonics: 0 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Stencil: 0 - _StencilComparison: 0 - _StencilOperation: 0 @@ -17968,6 +16585,7 @@ Material: - _UseWorldScale: 1 - _VertexColors: 0 - _VertexExtrusion: 0 + - _VertexExtrusionConstantWidth: 0 - _VertexExtrusionSmoothNormals: 0 - _VertexExtrusionValue: 0 - _ZOffsetFactor: 0 @@ -17977,12 +16595,14 @@ Material: m_Colors: - _BlurBackgroundRect: {r: 0, g: 0, b: 1, a: 1} - _BorderColor: {r: 1, g: 1, b: 1, a: 0} + - _ClipBoxSize: {r: 1, g: 1, b: 1, a: 0} - _ClipPlane: {r: 0, g: 1, b: 0, a: 0} + - _ClipSphere: {r: 0, g: 0, b: 0, a: 0.5} - _ClippingBorderColor: {r: 1, g: 0.2, b: 0, a: 1} - _ClippingPlaneBorderColor: {r: 1, g: 0.2, b: 0, a: 1} - - _Color: {r: 1, g: 0.6827586, b: 0, a: 1} + - _Color: {r: 0.72794116, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _EmissiveColor: {r: 0.9411765, g: 0, b: 0, a: 1} + - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1} - _EnvironmentColorX: {r: 1, g: 0, b: 0, a: 1} - _EnvironmentColorY: {r: 0, g: 1, b: 0, a: 1} - _EnvironmentColorZ: {r: 0, g: 0, b: 1, a: 1} @@ -17993,37 +16613,438 @@ Material: - _GradientColor2: {r: 0, g: 0.32999998, b: 0.88, a: 0.5} - _GradientColor3: {r: 0, g: 0.32999998, b: 0.88, a: 1} - _GradientColor4: {r: 1, g: 1, b: 1, a: 1} - - _HoverColor: {r: 1, g: 0, b: 0, a: 1} - _HoverColorOpaqueOverride: {r: 1, g: 1, b: 1, a: 1} - - _HoverColorOverride: {r: 1, g: 1, b: 1, a: 1} + - _HoverColorOverride: {r: 0, g: 0.007843138, b: 1, a: 1} - _InnerGlowColor: {r: 1, g: 1, b: 1, a: 0.75} - _ProximityLightCenterColorOverride: {r: 1, g: 0, b: 0, a: 0} - _ProximityLightMiddleColorOverride: {r: 0, g: 1, b: 0, a: 0.5} - _ProximityLightOuterColorOverride: {r: 0, g: 0, b: 1, a: 1} - - _RimColor: {r: 1, g: 1, b: 1, a: 1} + - _RimColor: {r: 0, g: 0.006896496, b: 1, a: 1} - _RoundCornersRadius: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} m_BuildTextureStacks: [] ---- !u!21 &1769567142 +--- !u!1001 &1631871841 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1257006308} + m_Modifications: + - target: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_Name + value: ShaderBall + objectReference: {fileID: 0} + - target: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_CastShadows + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_MotionVectors + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_ReceiveShadows + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LightProbeUsage + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_ReflectionProbeUsage + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2076656188} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} +--- !u!4 &1631871842 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + m_PrefabInstance: {fileID: 1631871841} + m_PrefabAsset: {fileID: 0} +--- !u!1 &1631871843 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + m_PrefabInstance: {fileID: 1631871841} + m_PrefabAsset: {fileID: 0} +--- !u!64 &1631871844 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1631871843} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 4300002, guid: 1104611d051d4e42a68391888b61b32e, type: 3} +--- !u!114 &1631871845 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1631871843} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c53e2b0613597e849870c4a691d25e0f, type: 3} + m_Name: + m_EditorClassIdentifier: + defaultMaterials: + - {fileID: 2100000, guid: 72beba80472642299b6651a33cc160df, type: 2} +--- !u!23 &1631871846 stripped +MeshRenderer: + m_CorrespondingSourceObject: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + m_PrefabInstance: {fileID: 1631871841} + m_PrefabAsset: {fileID: 0} +--- !u!1 &1659572900 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1659572901} + m_Layer: 0 + m_Name: ShaderBall (5) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1659572901 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1659572900} + m_LocalRotation: {x: 0.0000000037252899, y: -0.00000008940696, z: 0.99636066, w: 0.08523821} + m_LocalPosition: {x: 0.02, y: 0.94, z: -0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1060317756} + - {fileID: 1576001569} + m_Father: {fileID: 723260586} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 170.22101} +--- !u!1001 &1687595649 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 842427686} + m_Modifications: + - target: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_Name + value: ShaderBallInner + objectReference: {fileID: 0} + - target: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalScale.x + value: 0.99000084 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalScale.y + value: 0.9900005 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalScale.z + value: 0.9900005 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_CastShadows + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_MotionVectors + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_ReceiveShadows + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LightProbeUsage + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_ReflectionProbeUsage + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: ced12abb765d5e247bd3311bd2fb5d98, type: 2} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} +--- !u!4 &1687595650 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + m_PrefabInstance: {fileID: 1687595649} + m_PrefabAsset: {fileID: 0} +--- !u!1 &1687595651 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + m_PrefabInstance: {fileID: 1687595649} + m_PrefabAsset: {fileID: 0} +--- !u!64 &1687595652 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1687595651} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 4300002, guid: 1104611d051d4e42a68391888b61b32e, type: 3} +--- !u!1001 &1687903705 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1274666198} + m_Modifications: + - target: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_Name + value: ShaderBallInner + objectReference: {fileID: 0} + - target: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalScale.x + value: 0.99000084 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalScale.y + value: 0.9900005 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalScale.z + value: 0.9900005 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_CastShadows + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_MotionVectors + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_ReceiveShadows + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LightProbeUsage + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_ReflectionProbeUsage + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: ced12abb765d5e247bd3311bd2fb5d98, type: 2} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} +--- !u!4 &1687903706 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + m_PrefabInstance: {fileID: 1687903705} + m_PrefabAsset: {fileID: 0} +--- !u!1 &1687903707 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + m_PrefabInstance: {fileID: 1687903705} + m_PrefabAsset: {fileID: 0} +--- !u!64 &1687903708 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1687903707} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 4300002, guid: 1104611d051d4e42a68391888b61b32e, type: 3} +--- !u!21 &1694382071 Material: serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: ShaderBallClippingBox (Instance) + m_Name: ShaderBallClippingPlaneInner (Instance) m_Shader: {fileID: 4800000, guid: c331f6c43a2ef0945864cb668f2653c9, type: 3} m_ValidKeywords: - - _BORDER_LIGHT_USES_HOVER_COLOR - - _CLIPPING_BOX + - _CLIPPING_PLANE - _DIRECTIONAL_LIGHT - _DISABLE_ALBEDO_MAP - - _HOVER_COLOR_OVERRIDE + - _EMISSION - _HOVER_LIGHT - _REFLECTIONS - - _RIM_LIGHT - _SPECULAR_HIGHLIGHTS - _USE_WORLD_SCALE - m_InvalidKeywords: [] + m_InvalidKeywords: + - _CLIPPING_PLANE_BORDER m_LightmapFlags: 4 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 @@ -18058,6 +17079,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _EmissiveMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _IridescentSpectrumMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -18101,35 +17126,34 @@ Material: - _BorderLightOpaque: 0 - _BorderLightOpaqueAlpha: 1 - _BorderLightReplacesAlbedo: 0 - - _BorderLightUsesHoverColor: 1 + - _BorderLightUsesHoverColor: 0 - _BorderMinValue: 0.02 - _BorderWidth: 0.1 - _BorderWidthHorizontal: 0.1 - _BorderWidthVertical: 0.1 - _BumpScale: 1 - - _ClipBoxSide: 1 - - _ClipPlaneSide: 1 - - _ClipSphereSide: 1 - _ClippingBorder: 0 - _ClippingBorderWidth: 0.025 - - _ClippingBox: 1 - - _ClippingPlane: 0 - - _ClippingPlaneBorder: 0 - - _ClippingPlaneBorderWidth: 0.025 + - _ClippingBox: 0 + - _ClippingPlane: 1 + - _ClippingPlaneBorder: 1 + - _ClippingPlaneBorderWidth: 0.02 - _ClippingSphere: 0 - _ColorWriteMask: 15 - - _CullMode: 0 + - _Cull: 2 + - _CullMode: 1 - _CustomMode: 0 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DirectionalLight: 1 - _DstBlend: 0 + - _DstBlendAlpha: 1 - _EdgeSmoothingMode: 0 - _EdgeSmoothingValue: 0.002 - _EnableChannelMap: 0 - - _EnableEmission: 0 + - _EnableEmission: 1 - _EnableHoverColorOpaqueOverride: 0 - - _EnableHoverColorOverride: 1 + - _EnableHoverColorOverride: 0 - _EnableLightMap: 0 - _EnableLocalSpaceTriplanarMapping: 0 - _EnableNormalMap: 0 @@ -18161,9 +17185,11 @@ Material: - _IridescenceAngle: -0.78 - _IridescenceIntensity: 0.5 - _IridescenceThreshold: 0.05 - - _Metallic: 0 + - _Metallic: 0.036 - _MipmapBias: -2 - _Mode: 0 + - _MyCullVariable: 1 + - _NPR: 0 - _NearLightFade: 0 - _NearPlaneFade: 0 - _NormalMapScale: 1 @@ -18176,17 +17202,19 @@ Material: - _Refraction: 0 - _RefractiveIndex: 1.1 - _RenderQueueOverride: -1 - - _RimLight: 1 + - _RimLight: 0 - _RimPower: 3 - _RoundCornerMargin: 0 + - _RoundCornerPower: 0.4 - _RoundCornerRadius: 0.25 - _RoundCorners: 0 - _RoundCornersHideInterior: 0 - - _Smoothness: 1 + - _Smoothness: 0.5 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SphericalHarmonics: 0 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Stencil: 0 - _StencilComparison: 0 - _StencilOperation: 0 @@ -18198,6 +17226,7 @@ Material: - _UseWorldScale: 1 - _VertexColors: 0 - _VertexExtrusion: 0 + - _VertexExtrusionConstantWidth: 0 - _VertexExtrusionSmoothNormals: 0 - _VertexExtrusionValue: 0 - _ZOffsetFactor: 0 @@ -18207,14 +17236,12 @@ Material: m_Colors: - _BlurBackgroundRect: {r: 0, g: 0, b: 1, a: 1} - _BorderColor: {r: 1, g: 1, b: 1, a: 0} - - _ClipBoxSize: {r: 1, g: 1, b: 1, a: 0} - _ClipPlane: {r: 0, g: 1, b: 0, a: 0} - - _ClipSphere: {r: 0, g: 0, b: 0, a: 0.5} - _ClippingBorderColor: {r: 1, g: 0.2, b: 0, a: 1} - _ClippingPlaneBorderColor: {r: 1, g: 0.2, b: 0, a: 1} - - _Color: {r: 0.72794116, g: 0, b: 0, a: 1} + - _Color: {r: 1, g: 0.6827586, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1} + - _EmissiveColor: {r: 0.9411765, g: 0, b: 0, a: 1} - _EnvironmentColorX: {r: 1, g: 0, b: 0, a: 1} - _EnvironmentColorY: {r: 0, g: 1, b: 0, a: 1} - _EnvironmentColorZ: {r: 0, g: 0, b: 1, a: 1} @@ -18225,118 +17252,306 @@ Material: - _GradientColor2: {r: 0, g: 0.32999998, b: 0.88, a: 0.5} - _GradientColor3: {r: 0, g: 0.32999998, b: 0.88, a: 1} - _GradientColor4: {r: 1, g: 1, b: 1, a: 1} + - _HoverColor: {r: 1, g: 0, b: 0, a: 1} - _HoverColorOpaqueOverride: {r: 1, g: 1, b: 1, a: 1} - - _HoverColorOverride: {r: 0, g: 0.007843138, b: 1, a: 1} + - _HoverColorOverride: {r: 1, g: 1, b: 1, a: 1} - _InnerGlowColor: {r: 1, g: 1, b: 1, a: 0.75} - _ProximityLightCenterColorOverride: {r: 1, g: 0, b: 0, a: 0} - _ProximityLightMiddleColorOverride: {r: 0, g: 1, b: 0, a: 0.5} - _ProximityLightOuterColorOverride: {r: 0, g: 0, b: 1, a: 1} - - _RimColor: {r: 0, g: 0.006896496, b: 1, a: 1} + - _RimColor: {r: 1, g: 1, b: 1, a: 1} - _RoundCornersRadius: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} m_BuildTextureStacks: [] ---- !u!1 &1790579013 +--- !u!1001 &1719678897 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 162241854} + m_Modifications: + - target: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_Name + value: ShaderBall (4) + objectReference: {fileID: 0} + - target: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_RootOrder + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalPosition.x + value: -3.2 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalPosition.y + value: 0.4 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_CastShadows + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_MotionVectors + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_ReceiveShadows + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LightProbeUsage + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_ReflectionProbeUsage + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 354872648} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} +--- !u!4 &1719678898 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + m_PrefabInstance: {fileID: 1719678897} + m_PrefabAsset: {fileID: 0} +--- !u!1 &1719678899 stripped GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + m_PrefabInstance: {fileID: 1719678897} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1790579014} - - component: {fileID: 1790579015} - m_Layer: 0 - m_Name: Animator - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1790579014 -Transform: +--- !u!64 &1719678900 +MeshCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1790579013} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.31, y: -0, z: -0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1862493834} - m_Father: {fileID: 916092930} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!95 &1790579015 -Animator: - serializedVersion: 5 + m_GameObject: {fileID: 1719678899} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 4300002, guid: 1104611d051d4e42a68391888b61b32e, type: 3} +--- !u!23 &1719678901 stripped +MeshRenderer: + m_CorrespondingSourceObject: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + m_PrefabInstance: {fileID: 1719678897} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1719678903 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1790579013} + m_GameObject: {fileID: 1719678899} m_Enabled: 1 - m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: e12f15fc56be8b341bc479ac58e071e7, type: 2} - m_CullingMode: 0 - 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 ---- !u!1 &1793330792 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c53e2b0613597e849870c4a691d25e0f, type: 3} + m_Name: + m_EditorClassIdentifier: + defaultMaterials: + - {fileID: 2100000, guid: 93312c326d8c3c54bb251f588b42cda7, type: 2} +--- !u!1001 &1728100313 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1233524242} + m_Modifications: + - target: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_Name + value: ShaderBall + objectReference: {fileID: 0} + - target: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_CastShadows + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_MotionVectors + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_ReceiveShadows + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LightProbeUsage + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_ReflectionProbeUsage + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 97488093} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} +--- !u!4 &1728100314 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + m_PrefabInstance: {fileID: 1728100313} + m_PrefabAsset: {fileID: 0} +--- !u!1 &1728100315 stripped GameObject: + m_CorrespondingSourceObject: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + m_PrefabInstance: {fileID: 1728100313} + m_PrefabAsset: {fileID: 0} +--- !u!64 &1728100316 +MeshCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1793330793} - m_Layer: 0 - m_Name: ShaderBall - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!4 &1793330793 -Transform: + m_GameObject: {fileID: 1728100315} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 4300002, guid: 1104611d051d4e42a68391888b61b32e, type: 3} +--- !u!23 &1728100317 stripped +MeshRenderer: + m_CorrespondingSourceObject: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + m_PrefabInstance: {fileID: 1728100313} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1728100319 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1793330792} - 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: 623737353} - - {fileID: 1484576911} - m_Father: {fileID: 1595900778} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!21 &1796905766 + m_GameObject: {fileID: 1728100315} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c53e2b0613597e849870c4a691d25e0f, type: 3} + m_Name: + m_EditorClassIdentifier: + defaultMaterials: + - {fileID: 2100000, guid: 9f21cf60c2137a64dbe161430f7c0b75, type: 2} +--- !u!21 &1735125630 Material: serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: ShaderBallClippingSphere (Instance) + m_Name: ShaderBallClippingBox (Instance) m_Shader: {fileID: 4800000, guid: c331f6c43a2ef0945864cb668f2653c9, type: 3} m_ValidKeywords: - _BORDER_LIGHT_USES_HOVER_COLOR - - _CLIPPING_SPHERE + - _CLIPPING_BOX - _DIRECTIONAL_LIGHT - _DISABLE_ALBEDO_MAP + - _HOVER_COLOR_OVERRIDE - _HOVER_LIGHT - _REFLECTIONS + - _RIM_LIGHT - _SPECULAR_HIGHLIGHTS - _USE_WORLD_SCALE m_InvalidKeywords: [] @@ -18428,13 +17643,13 @@ Material: - _ClipSphereSide: 1 - _ClippingBorder: 0 - _ClippingBorderWidth: 0.025 - - _ClippingBox: 0 + - _ClippingBox: 1 - _ClippingPlane: 0 - _ClippingPlaneBorder: 0 - _ClippingPlaneBorderWidth: 0.025 - - _ClippingSphere: 1 + - _ClippingSphere: 0 - _ColorWriteMask: 15 - - _CullMode: 2 + - _CullMode: 0 - _CustomMode: 0 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 @@ -18445,7 +17660,7 @@ Material: - _EnableChannelMap: 0 - _EnableEmission: 0 - _EnableHoverColorOpaqueOverride: 0 - - _EnableHoverColorOverride: 0 + - _EnableHoverColorOverride: 1 - _EnableLightMap: 0 - _EnableLocalSpaceTriplanarMapping: 0 - _EnableNormalMap: 0 @@ -18492,7 +17707,7 @@ Material: - _Refraction: 0 - _RefractiveIndex: 1.1 - _RenderQueueOverride: -1 - - _RimLight: 0 + - _RimLight: 1 - _RimPower: 3 - _RoundCornerMargin: 0 - _RoundCornerRadius: 0.25 @@ -18528,7 +17743,7 @@ Material: - _ClipSphere: {r: 0, g: 0, b: 0, a: 0.5} - _ClippingBorderColor: {r: 1, g: 0.2, b: 0, a: 1} - _ClippingPlaneBorderColor: {r: 1, g: 0.2, b: 0, a: 1} - - _Color: {r: 0, g: 0.5862069, b: 1, a: 1} + - _Color: {r: 0.72794116, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1} - _EnvironmentColorX: {r: 1, g: 0, b: 0, a: 1} @@ -18542,32 +17757,30 @@ Material: - _GradientColor3: {r: 0, g: 0.32999998, b: 0.88, a: 1} - _GradientColor4: {r: 1, g: 1, b: 1, a: 1} - _HoverColorOpaqueOverride: {r: 1, g: 1, b: 1, a: 1} - - _HoverColorOverride: {r: 1, g: 1, b: 1, a: 1} + - _HoverColorOverride: {r: 0, g: 0.007843138, b: 1, a: 1} - _InnerGlowColor: {r: 1, g: 1, b: 1, a: 0.75} - _ProximityLightCenterColorOverride: {r: 1, g: 0, b: 0, a: 0} - _ProximityLightMiddleColorOverride: {r: 0, g: 1, b: 0, a: 0.5} - _ProximityLightOuterColorOverride: {r: 0, g: 0, b: 1, a: 1} - - _RimColor: {r: 1, g: 1, b: 1, a: 1} + - _RimColor: {r: 0, g: 0.006896496, b: 1, a: 1} - _RoundCornersRadius: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} m_BuildTextureStacks: [] ---- !u!21 &1811070939 +--- !u!21 &1757177221 Material: serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: ShaderBallClippingBox (Instance) + m_Name: ShaderBallClippingSphere (Instance) m_Shader: {fileID: 4800000, guid: c331f6c43a2ef0945864cb668f2653c9, type: 3} m_ValidKeywords: - _BORDER_LIGHT_USES_HOVER_COLOR - - _CLIPPING_BOX + - _CLIPPING_SPHERE - _DIRECTIONAL_LIGHT - _DISABLE_ALBEDO_MAP - - _HOVER_COLOR_OVERRIDE - _HOVER_LIGHT - _REFLECTIONS - - _RIM_LIGHT - _SPECULAR_HIGHLIGHTS - _USE_WORLD_SCALE m_InvalidKeywords: [] @@ -18663,13 +17876,13 @@ Material: - _ClipSphereSide: 1 - _ClippingBorder: 0 - _ClippingBorderWidth: 0.025 - - _ClippingBox: 1 + - _ClippingBox: 0 - _ClippingPlane: 0 - _ClippingPlaneBorder: 0 - _ClippingPlaneBorderWidth: 0.025 - - _ClippingSphere: 0 + - _ClippingSphere: 1 - _ColorWriteMask: 15 - - _CullMode: 0 + - _CullMode: 2 - _CustomMode: 0 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 @@ -18681,7 +17894,7 @@ Material: - _EnableChannelMap: 0 - _EnableEmission: 0 - _EnableHoverColorOpaqueOverride: 0 - - _EnableHoverColorOverride: 1 + - _EnableHoverColorOverride: 0 - _EnableLightMap: 0 - _EnableLocalSpaceTriplanarMapping: 0 - _EnableNormalMap: 0 @@ -18729,7 +17942,7 @@ Material: - _Refraction: 0 - _RefractiveIndex: 1.1 - _RenderQueueOverride: -1 - - _RimLight: 1 + - _RimLight: 0 - _RimPower: 3 - _RoundCornerMargin: 0 - _RoundCornerRadius: 0.25 @@ -18767,7 +17980,7 @@ Material: - _ClipSphere: {r: 0, g: 0, b: 0, a: 0.5} - _ClippingBorderColor: {r: 1, g: 0.2, b: 0, a: 1} - _ClippingPlaneBorderColor: {r: 1, g: 0.2, b: 0, a: 1} - - _Color: {r: 0.72794116, g: 0, b: 0, a: 1} + - _Color: {r: 0, g: 0.5862069, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1} - _EnvironmentColorX: {r: 1, g: 0, b: 0, a: 1} @@ -18781,171 +17994,34 @@ Material: - _GradientColor3: {r: 0, g: 0.32999998, b: 0.88, a: 1} - _GradientColor4: {r: 1, g: 1, b: 1, a: 1} - _HoverColorOpaqueOverride: {r: 1, g: 1, b: 1, a: 1} - - _HoverColorOverride: {r: 0, g: 0.007843138, b: 1, a: 1} + - _HoverColorOverride: {r: 1, g: 1, b: 1, a: 1} - _InnerGlowColor: {r: 1, g: 1, b: 1, a: 0.75} - _ProximityLightCenterColorOverride: {r: 1, g: 0, b: 0, a: 0} - _ProximityLightMiddleColorOverride: {r: 0, g: 1, b: 0, a: 0.5} - _ProximityLightOuterColorOverride: {r: 0, g: 0, b: 1, a: 1} - - _RimColor: {r: 0, g: 0.006896496, b: 1, a: 1} + - _RimColor: {r: 1, g: 1, b: 1, a: 1} - _RoundCornersRadius: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} m_BuildTextureStacks: [] ---- !u!1001 &1838185220 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 37496078} - m_Modifications: - - target: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_Name - value: ShaderBall - objectReference: {fileID: 0} - - target: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_StaticEditorFlags - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalScale.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalScale.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalScale.z - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_CastShadows - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_MotionVectors - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_ReceiveShadows - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LightProbeUsage - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_ReflectionProbeUsage - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2113792908} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} ---- !u!4 &1838185221 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - m_PrefabInstance: {fileID: 1838185220} - m_PrefabAsset: {fileID: 0} ---- !u!1 &1838185222 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - m_PrefabInstance: {fileID: 1838185220} - m_PrefabAsset: {fileID: 0} ---- !u!64 &1838185223 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1838185222} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 4 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: 4300002, guid: 1104611d051d4e42a68391888b61b32e, type: 3} ---- !u!23 &1838185224 stripped -MeshRenderer: - m_CorrespondingSourceObject: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - m_PrefabInstance: {fileID: 1838185220} - m_PrefabAsset: {fileID: 0} ---- !u!114 &1838185226 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1838185222} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c53e2b0613597e849870c4a691d25e0f, type: 3} - m_Name: - m_EditorClassIdentifier: - defaultMaterials: - - {fileID: 2100000, guid: 9f21cf60c2137a64dbe161430f7c0b75, type: 2} ---- !u!21 &1838235410 +--- !u!21 &1763290178 Material: serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: ShaderBallClippingBox (Instance) + m_Name: ShaderBallClippingPlaneInner (Instance) m_Shader: {fileID: 4800000, guid: c331f6c43a2ef0945864cb668f2653c9, type: 3} m_ValidKeywords: - - _BORDER_LIGHT_USES_HOVER_COLOR - - _CLIPPING_BOX + - _CLIPPING_PLANE - _DIRECTIONAL_LIGHT - _DISABLE_ALBEDO_MAP - - _HOVER_COLOR_OVERRIDE + - _EMISSION - _HOVER_LIGHT - _REFLECTIONS - - _RIM_LIGHT - _SPECULAR_HIGHLIGHTS - _USE_WORLD_SCALE - m_InvalidKeywords: [] + m_InvalidKeywords: + - _CLIPPING_PLANE_BORDER m_LightmapFlags: 4 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 @@ -18980,10 +18056,6 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - - _EmissiveMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - _IridescentSpectrumMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -19027,36 +18099,33 @@ Material: - _BorderLightOpaque: 0 - _BorderLightOpaqueAlpha: 1 - _BorderLightReplacesAlbedo: 0 - - _BorderLightUsesHoverColor: 1 + - _BorderLightUsesHoverColor: 0 - _BorderMinValue: 0.02 - _BorderWidth: 0.1 - _BorderWidthHorizontal: 0.1 - _BorderWidthVertical: 0.1 - _BumpScale: 1 - - _ClipBoxSide: 1 - - _ClipPlaneSide: 1 - - _ClipSphereSide: 1 - _ClippingBorder: 0 - _ClippingBorderWidth: 0.025 - - _ClippingBox: 1 - - _ClippingPlane: 0 - - _ClippingPlaneBorder: 0 - - _ClippingPlaneBorderWidth: 0.025 + - _ClippingBox: 0 + - _ClippingPlane: 1 + - _ClippingPlaneBorder: 1 + - _ClippingPlaneBorderWidth: 0.02 - _ClippingSphere: 0 - _ColorWriteMask: 15 - - _CullMode: 0 + - _Cull: 2 + - _CullMode: 1 - _CustomMode: 0 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DirectionalLight: 1 - _DstBlend: 0 - - _DstBlendAlpha: 1 - _EdgeSmoothingMode: 0 - _EdgeSmoothingValue: 0.002 - _EnableChannelMap: 0 - - _EnableEmission: 0 + - _EnableEmission: 1 - _EnableHoverColorOpaqueOverride: 0 - - _EnableHoverColorOverride: 1 + - _EnableHoverColorOverride: 0 - _EnableLightMap: 0 - _EnableLocalSpaceTriplanarMapping: 0 - _EnableNormalMap: 0 @@ -19088,10 +18157,10 @@ Material: - _IridescenceAngle: -0.78 - _IridescenceIntensity: 0.5 - _IridescenceThreshold: 0.05 - - _Metallic: 0 + - _Metallic: 0.036 - _MipmapBias: -2 - _Mode: 0 - - _NPR: 0 + - _MyCullVariable: 1 - _NearLightFade: 0 - _NearPlaneFade: 0 - _NormalMapScale: 1 @@ -19104,18 +18173,18 @@ Material: - _Refraction: 0 - _RefractiveIndex: 1.1 - _RenderQueueOverride: -1 - - _RimLight: 1 + - _RimLight: 0 - _RimPower: 3 - _RoundCornerMargin: 0 + - _RoundCornerPower: 0.4 - _RoundCornerRadius: 0.25 - _RoundCorners: 0 - _RoundCornersHideInterior: 0 - - _Smoothness: 1 + - _Smoothness: 0.5 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SphericalHarmonics: 0 - _SrcBlend: 1 - - _SrcBlendAlpha: 1 - _Stencil: 0 - _StencilComparison: 0 - _StencilOperation: 0 @@ -19127,7 +18196,6 @@ Material: - _UseWorldScale: 1 - _VertexColors: 0 - _VertexExtrusion: 0 - - _VertexExtrusionConstantWidth: 0 - _VertexExtrusionSmoothNormals: 0 - _VertexExtrusionValue: 0 - _ZOffsetFactor: 0 @@ -19137,14 +18205,12 @@ Material: m_Colors: - _BlurBackgroundRect: {r: 0, g: 0, b: 1, a: 1} - _BorderColor: {r: 1, g: 1, b: 1, a: 0} - - _ClipBoxSize: {r: 1, g: 1, b: 1, a: 0} - _ClipPlane: {r: 0, g: 1, b: 0, a: 0} - - _ClipSphere: {r: 0, g: 0, b: 0, a: 0.5} - _ClippingBorderColor: {r: 1, g: 0.2, b: 0, a: 1} - _ClippingPlaneBorderColor: {r: 1, g: 0.2, b: 0, a: 1} - - _Color: {r: 0.72794116, g: 0, b: 0, a: 1} + - _Color: {r: 1, g: 0.6827586, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1} + - _EmissiveColor: {r: 0.9411765, g: 0, b: 0, a: 1} - _EnvironmentColorX: {r: 1, g: 0, b: 0, a: 1} - _EnvironmentColorY: {r: 0, g: 1, b: 0, a: 1} - _EnvironmentColorZ: {r: 0, g: 0, b: 1, a: 1} @@ -19155,16 +18221,17 @@ Material: - _GradientColor2: {r: 0, g: 0.32999998, b: 0.88, a: 0.5} - _GradientColor3: {r: 0, g: 0.32999998, b: 0.88, a: 1} - _GradientColor4: {r: 1, g: 1, b: 1, a: 1} + - _HoverColor: {r: 1, g: 0, b: 0, a: 1} - _HoverColorOpaqueOverride: {r: 1, g: 1, b: 1, a: 1} - - _HoverColorOverride: {r: 0, g: 0.007843138, b: 1, a: 1} + - _HoverColorOverride: {r: 1, g: 1, b: 1, a: 1} - _InnerGlowColor: {r: 1, g: 1, b: 1, a: 0.75} - _ProximityLightCenterColorOverride: {r: 1, g: 0, b: 0, a: 0} - _ProximityLightMiddleColorOverride: {r: 0, g: 1, b: 0, a: 0.5} - _ProximityLightOuterColorOverride: {r: 0, g: 0, b: 1, a: 1} - - _RimColor: {r: 0, g: 0.006896496, b: 1, a: 1} + - _RimColor: {r: 1, g: 1, b: 1, a: 1} - _RoundCornersRadius: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} m_BuildTextureStacks: [] ---- !u!21 &1851936429 +--- !u!21 &1769567142 Material: serializedVersion: 8 m_ObjectHideFlags: 0 @@ -19219,10 +18286,6 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - - _EmissiveMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - _IridescentSpectrumMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -19289,7 +18352,6 @@ Material: - _DetailNormalMapScale: 1 - _DirectionalLight: 1 - _DstBlend: 0 - - _DstBlendAlpha: 1 - _EdgeSmoothingMode: 0 - _EdgeSmoothingValue: 0.002 - _EnableChannelMap: 0 @@ -19330,7 +18392,6 @@ Material: - _Metallic: 0 - _MipmapBias: -2 - _Mode: 0 - - _NPR: 0 - _NearLightFade: 0 - _NearPlaneFade: 0 - _NormalMapScale: 1 @@ -19354,7 +18415,6 @@ Material: - _SpecularHighlights: 1 - _SphericalHarmonics: 0 - _SrcBlend: 1 - - _SrcBlendAlpha: 1 - _Stencil: 0 - _StencilComparison: 0 - _StencilOperation: 0 @@ -19366,7 +18426,6 @@ Material: - _UseWorldScale: 1 - _VertexColors: 0 - _VertexExtrusion: 0 - - _VertexExtrusionConstantWidth: 0 - _VertexExtrusionSmoothNormals: 0 - _VertexExtrusionValue: 0 - _ZOffsetFactor: 0 @@ -19403,7 +18462,7 @@ Material: - _RimColor: {r: 0, g: 0.006896496, b: 1, a: 1} - _RoundCornersRadius: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} m_BuildTextureStacks: [] ---- !u!1 &1862493833 +--- !u!1 &1790579013 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -19411,193 +18470,53 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1862493834} - - component: {fileID: 1862493835} + - component: {fileID: 1790579014} + - component: {fileID: 1790579015} m_Layer: 0 - m_Name: ClippingBox + m_Name: Animator m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &1862493834 +--- !u!4 &1790579014 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1862493833} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: -0, z: 3.21} - m_LocalScale: {x: 0.25, y: 1, z: 8.14} + m_GameObject: {fileID: 1790579013} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.31, y: -0, z: -0} + m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1790579014} + m_Children: + - {fileID: 1862493834} + m_Father: {fileID: 916092930} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1862493835 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1862493833} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a976746b0d99e6f4b89504219cc67824, type: 3} - m_Name: - m_EditorClassIdentifier: - applyToSharedMaterial: 0 - renderers: - - {fileID: 1322392166} - - {fileID: 696814945} - - {fileID: 2074424269} - - {fileID: 2105085698} - - {fileID: 1719678901} - - {fileID: 588131906} - - {fileID: 1226438756} - - {fileID: 2078021580} - - {fileID: 360322620} - materials: [] - clippingSide: -1 - useOnPreRender: 0 ---- !u!1001 &1865679673 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 955809413} - m_Modifications: - - target: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_Name - value: ShaderBall - objectReference: {fileID: 0} - - target: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_StaticEditorFlags - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalScale.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalScale.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalScale.z - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_CastShadows - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_MotionVectors - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_ReceiveShadows - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_LightProbeUsage - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_ReflectionProbeUsage - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 1115790161} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} ---- !u!4 &1865679674 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - m_PrefabInstance: {fileID: 1865679673} - m_PrefabAsset: {fileID: 0} ---- !u!1 &1865679675 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - m_PrefabInstance: {fileID: 1865679673} - m_PrefabAsset: {fileID: 0} ---- !u!64 &1865679676 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1865679675} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 4 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: 4300002, guid: 1104611d051d4e42a68391888b61b32e, type: 3} ---- !u!23 &1865679677 stripped -MeshRenderer: - m_CorrespondingSourceObject: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} - m_PrefabInstance: {fileID: 1865679673} - m_PrefabAsset: {fileID: 0} ---- !u!114 &1865679679 -MonoBehaviour: +--- !u!95 &1790579015 +Animator: + serializedVersion: 5 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1865679675} + m_GameObject: {fileID: 1790579013} m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c53e2b0613597e849870c4a691d25e0f, type: 3} - m_Name: - m_EditorClassIdentifier: - defaultMaterials: - - {fileID: 2100000, guid: 9f21cf60c2137a64dbe161430f7c0b75, type: 2} ---- !u!1 &1872109878 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: e12f15fc56be8b341bc479ac58e071e7, type: 2} + m_CullingMode: 0 + 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 +--- !u!1 &1793330792 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -19605,45 +18524,274 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1872109879} + - component: {fileID: 1793330793} m_Layer: 0 - m_Name: ShaderBall (6) + m_Name: ShaderBall m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1872109879 + m_IsActive: 0 +--- !u!4 &1793330793 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1872109878} + m_GameObject: {fileID: 1793330792} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -4.8, y: 0.2, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 48176119} - - {fileID: 781216072} + - {fileID: 623737353} + - {fileID: 1484576911} m_Father: {fileID: 1595900778} - m_RootOrder: 7 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!21 &1875027688 +--- !u!21 &1796905766 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: ShaderBallClippingSphere (Instance) + m_Shader: {fileID: 4800000, guid: c331f6c43a2ef0945864cb668f2653c9, type: 3} + m_ValidKeywords: + - _BORDER_LIGHT_USES_HOVER_COLOR + - _CLIPPING_SPHERE + - _DIRECTIONAL_LIGHT + - _DISABLE_ALBEDO_MAP + - _HOVER_LIGHT + - _REFLECTIONS + - _SPECULAR_HIGHLIGHTS + - _USE_WORLD_SCALE + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 1 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 2000 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ChannelMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _IridescentSpectrumMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _LightMapTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: 32c57306df745a147a2e02f8827a8cdc, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _NormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AlbedoAlphaMode: 0 + - _AlbedoAlphaSmoothness: 0 + - _AlbedoAssignedAtRuntime: 0 + - _BlendOp: 0 + - _BlendedClippingWidth: 1 + - _BlurBorderIntensity: 0 + - _BlurMode: 0 + - _BlurTextureIntensity: 1 + - _BorderColorMode: 0 + - _BorderLight: 0 + - _BorderLightOpaque: 0 + - _BorderLightOpaqueAlpha: 1 + - _BorderLightReplacesAlbedo: 0 + - _BorderLightUsesHoverColor: 1 + - _BorderMinValue: 0.02 + - _BorderWidth: 0.1 + - _BorderWidthHorizontal: 0.1 + - _BorderWidthVertical: 0.1 + - _BumpScale: 1 + - _ClipBoxSide: 1 + - _ClipPlaneSide: 1 + - _ClipSphereSide: 1 + - _ClippingBorder: 0 + - _ClippingBorderWidth: 0.025 + - _ClippingBox: 0 + - _ClippingPlane: 0 + - _ClippingPlaneBorder: 0 + - _ClippingPlaneBorderWidth: 0.025 + - _ClippingSphere: 1 + - _ColorWriteMask: 15 + - _CullMode: 2 + - _CustomMode: 0 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DirectionalLight: 1 + - _DstBlend: 0 + - _EdgeSmoothingMode: 0 + - _EdgeSmoothingValue: 0.002 + - _EnableChannelMap: 0 + - _EnableEmission: 0 + - _EnableHoverColorOpaqueOverride: 0 + - _EnableHoverColorOverride: 0 + - _EnableLightMap: 0 + - _EnableLocalSpaceTriplanarMapping: 0 + - _EnableNormalMap: 0 + - _EnableProximityLightColorOverride: 0 + - _EnableSSAA: 0 + - _EnableStencil: 0 + - _EnableTriplanarMapping: 0 + - _EnvironmentColorIntensity: 0.5 + - _EnvironmentColorThreshold: 1.5 + - _EnvironmentColoring: 0 + - _Fade: 1 + - _FadeBeginDistance: 0.85 + - _FadeCompleteDistance: 0.5 + - _FadeMinValue: 0 + - _FluentLightIntensity: 1 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _GradientAngle: 180 + - _GradientMode: 0 + - _HoverLight: 1 + - _HoverLightOpaque: 0 + - _IgnoreZScale: 0 + - _IndependentCorners: 0 + - _InnerGlow: 0 + - _InnerGlowPower: 4 + - _InstancedColor: 0 + - _Iridescence: 0 + - _IridescenceAngle: -0.78 + - _IridescenceIntensity: 0.5 + - _IridescenceThreshold: 0.05 + - _Metallic: 0 + - _MipmapBias: -2 + - _Mode: 0 + - _NearLightFade: 0 + - _NearPlaneFade: 0 + - _NormalMapScale: 1 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _ProximityLight: 0 + - _ProximityLightSubtractive: 0 + - _ProximityLightTwoSided: 0 + - _Reflections: 1 + - _Refraction: 0 + - _RefractiveIndex: 1.1 + - _RenderQueueOverride: -1 + - _RimLight: 0 + - _RimPower: 3 + - _RoundCornerMargin: 0 + - _RoundCornerRadius: 0.25 + - _RoundCorners: 0 + - _RoundCornersHideInterior: 0 + - _Smoothness: 1 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SphericalHarmonics: 0 + - _SrcBlend: 1 + - _Stencil: 0 + - _StencilComparison: 0 + - _StencilOperation: 0 + - _StencilReadMask: 255 + - _StencilReference: 0 + - _StencilWriteMask: 255 + - _TriplanarMappingBlendSharpness: 4 + - _UVSec: 0 + - _UseWorldScale: 1 + - _VertexColors: 0 + - _VertexExtrusion: 0 + - _VertexExtrusionSmoothNormals: 0 + - _VertexExtrusionValue: 0 + - _ZOffsetFactor: 0 + - _ZOffsetUnits: 0 + - _ZTest: 4 + - _ZWrite: 1 + m_Colors: + - _BlurBackgroundRect: {r: 0, g: 0, b: 1, a: 1} + - _BorderColor: {r: 1, g: 1, b: 1, a: 0} + - _ClipBoxSize: {r: 1, g: 1, b: 1, a: 0} + - _ClipPlane: {r: 0, g: 1, b: 0, a: 0} + - _ClipSphere: {r: 0, g: 0, b: 0, a: 0.5} + - _ClippingBorderColor: {r: 1, g: 0.2, b: 0, a: 1} + - _ClippingPlaneBorderColor: {r: 1, g: 0.2, b: 0, a: 1} + - _Color: {r: 0, g: 0.5862069, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1} + - _EnvironmentColorX: {r: 1, g: 0, b: 0, a: 1} + - _EnvironmentColorY: {r: 0, g: 1, b: 0, a: 1} + - _EnvironmentColorZ: {r: 0, g: 0, b: 1, a: 1} + - _GradientAlpha: {r: 1, g: 1, b: 1, a: 1} + - _GradientAlphaTime: {r: 0, g: 0, b: 0, a: 0} + - _GradientColor0: {r: 0.631373, g: 0.631373, b: 0.631373, a: 0} + - _GradientColor1: {r: 1, g: 0.690196, b: 0.976471, a: 0.25} + - _GradientColor2: {r: 0, g: 0.32999998, b: 0.88, a: 0.5} + - _GradientColor3: {r: 0, g: 0.32999998, b: 0.88, a: 1} + - _GradientColor4: {r: 1, g: 1, b: 1, a: 1} + - _HoverColorOpaqueOverride: {r: 1, g: 1, b: 1, a: 1} + - _HoverColorOverride: {r: 1, g: 1, b: 1, a: 1} + - _InnerGlowColor: {r: 1, g: 1, b: 1, a: 0.75} + - _ProximityLightCenterColorOverride: {r: 1, g: 0, b: 0, a: 0} + - _ProximityLightMiddleColorOverride: {r: 0, g: 1, b: 0, a: 0.5} + - _ProximityLightOuterColorOverride: {r: 0, g: 0, b: 1, a: 1} + - _RimColor: {r: 1, g: 1, b: 1, a: 1} + - _RoundCornersRadius: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} + m_BuildTextureStacks: [] +--- !u!21 &1825490565 Material: serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: ShaderBallClippingPlane (Instance) + m_Name: ShaderBallClippingPlaneInner (Instance) m_Shader: {fileID: 4800000, guid: c331f6c43a2ef0945864cb668f2653c9, type: 3} m_ValidKeywords: - - _CLIPPING_BORDER - _CLIPPING_PLANE - _DIRECTIONAL_LIGHT - _DISABLE_ALBEDO_MAP + - _EMISSION - _HOVER_LIGHT - _REFLECTIONS - _SPECULAR_HIGHLIGHTS @@ -19684,6 +18832,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _EmissiveMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _IridescentSpectrumMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -19693,7 +18845,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 32c57306df745a147a2e02f8827a8cdc, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: @@ -19733,7 +18885,7 @@ Material: - _BorderWidthHorizontal: 0.1 - _BorderWidthVertical: 0.1 - _BumpScale: 1 - - _ClippingBorder: 1 + - _ClippingBorder: 0 - _ClippingBorderWidth: 0.025 - _ClippingBox: 0 - _ClippingPlane: 1 @@ -19742,16 +18894,17 @@ Material: - _ClippingSphere: 0 - _ColorWriteMask: 15 - _Cull: 2 - - _CullMode: 2 + - _CullMode: 1 - _CustomMode: 0 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DirectionalLight: 1 - _DstBlend: 0 + - _DstBlendAlpha: 1 - _EdgeSmoothingMode: 0 - _EdgeSmoothingValue: 0.002 - _EnableChannelMap: 0 - - _EnableEmission: 0 + - _EnableEmission: 1 - _EnableHoverColorOpaqueOverride: 0 - _EnableHoverColorOverride: 0 - _EnableLightMap: 0 @@ -19785,10 +18938,11 @@ Material: - _IridescenceAngle: -0.78 - _IridescenceIntensity: 0.5 - _IridescenceThreshold: 0.05 - - _Metallic: 0 + - _Metallic: 0.036 - _MipmapBias: -2 - _Mode: 0 - _MyCullVariable: 1 + - _NPR: 0 - _NearLightFade: 0 - _NearPlaneFade: 0 - _NormalMapScale: 1 @@ -19813,6 +18967,7 @@ Material: - _SpecularHighlights: 1 - _SphericalHarmonics: 0 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Stencil: 0 - _StencilComparison: 0 - _StencilOperation: 0 @@ -19824,6 +18979,7 @@ Material: - _UseWorldScale: 1 - _VertexColors: 0 - _VertexExtrusion: 0 + - _VertexExtrusionConstantWidth: 0 - _VertexExtrusionSmoothNormals: 0 - _VertexExtrusionValue: 0 - _ZOffsetFactor: 0 @@ -19836,9 +18992,9 @@ Material: - _ClipPlane: {r: 0, g: 1, b: 0, a: 0} - _ClippingBorderColor: {r: 1, g: 0.2, b: 0, a: 1} - _ClippingPlaneBorderColor: {r: 1, g: 0.2, b: 0, a: 1} - - _Color: {r: 0.5754717, g: 0.4325086, b: 0.4325086, a: 1} + - _Color: {r: 1, g: 0.6827586, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1} + - _EmissiveColor: {r: 0.9411765, g: 0, b: 0, a: 1} - _EnvironmentColorX: {r: 1, g: 0, b: 0, a: 1} - _EnvironmentColorY: {r: 0, g: 1, b: 0, a: 1} - _EnvironmentColorZ: {r: 0, g: 0, b: 1, a: 1} @@ -19859,27 +19015,162 @@ Material: - _RimColor: {r: 1, g: 1, b: 1, a: 1} - _RoundCornersRadius: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} m_BuildTextureStacks: [] ---- !u!21 &1882377000 +--- !u!1001 &1838185220 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 37496078} + m_Modifications: + - target: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_Name + value: ShaderBall + objectReference: {fileID: 0} + - target: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_CastShadows + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_MotionVectors + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_ReceiveShadows + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LightProbeUsage + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_ReflectionProbeUsage + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2113792908} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} +--- !u!4 &1838185221 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + m_PrefabInstance: {fileID: 1838185220} + m_PrefabAsset: {fileID: 0} +--- !u!1 &1838185222 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + m_PrefabInstance: {fileID: 1838185220} + m_PrefabAsset: {fileID: 0} +--- !u!64 &1838185223 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1838185222} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 4300002, guid: 1104611d051d4e42a68391888b61b32e, type: 3} +--- !u!23 &1838185224 stripped +MeshRenderer: + m_CorrespondingSourceObject: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + m_PrefabInstance: {fileID: 1838185220} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1838185226 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1838185222} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c53e2b0613597e849870c4a691d25e0f, type: 3} + m_Name: + m_EditorClassIdentifier: + defaultMaterials: + - {fileID: 2100000, guid: 9f21cf60c2137a64dbe161430f7c0b75, type: 2} +--- !u!21 &1854907411 Material: serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: ShaderBallClippingBox (Instance) + m_Name: ShaderBallClippingPlane (Instance) m_Shader: {fileID: 4800000, guid: c331f6c43a2ef0945864cb668f2653c9, type: 3} m_ValidKeywords: - - _BORDER_LIGHT_USES_HOVER_COLOR - - _CLIPPING_BOX + - _CLIPPING_BORDER + - _CLIPPING_PLANE - _DIRECTIONAL_LIGHT - _DISABLE_ALBEDO_MAP - - _HOVER_COLOR_OVERRIDE - _HOVER_LIGHT - _REFLECTIONS - - _RIM_LIGHT - _SPECULAR_HIGHLIGHTS - _USE_WORLD_SCALE - m_InvalidKeywords: [] + m_InvalidKeywords: + - _CLIPPING_PLANE_BORDER m_LightmapFlags: 4 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 @@ -19914,6 +19205,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _EmissiveMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _IridescentSpectrumMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -19923,7 +19218,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: 32c57306df745a147a2e02f8827a8cdc, type: 3} + m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: @@ -19957,35 +19252,34 @@ Material: - _BorderLightOpaque: 0 - _BorderLightOpaqueAlpha: 1 - _BorderLightReplacesAlbedo: 0 - - _BorderLightUsesHoverColor: 1 + - _BorderLightUsesHoverColor: 0 - _BorderMinValue: 0.02 - _BorderWidth: 0.1 - _BorderWidthHorizontal: 0.1 - _BorderWidthVertical: 0.1 - _BumpScale: 1 - - _ClipBoxSide: 1 - - _ClipPlaneSide: 1 - - _ClipSphereSide: 1 - - _ClippingBorder: 0 + - _ClippingBorder: 1 - _ClippingBorderWidth: 0.025 - - _ClippingBox: 1 - - _ClippingPlane: 0 - - _ClippingPlaneBorder: 0 - - _ClippingPlaneBorderWidth: 0.025 + - _ClippingBox: 0 + - _ClippingPlane: 1 + - _ClippingPlaneBorder: 1 + - _ClippingPlaneBorderWidth: 0.02 - _ClippingSphere: 0 - _ColorWriteMask: 15 - - _CullMode: 0 + - _Cull: 2 + - _CullMode: 2 - _CustomMode: 0 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DirectionalLight: 1 - _DstBlend: 0 + - _DstBlendAlpha: 1 - _EdgeSmoothingMode: 0 - _EdgeSmoothingValue: 0.002 - _EnableChannelMap: 0 - _EnableEmission: 0 - _EnableHoverColorOpaqueOverride: 0 - - _EnableHoverColorOverride: 1 + - _EnableHoverColorOverride: 0 - _EnableLightMap: 0 - _EnableLocalSpaceTriplanarMapping: 0 - _EnableNormalMap: 0 @@ -20020,6 +19314,8 @@ Material: - _Metallic: 0 - _MipmapBias: -2 - _Mode: 0 + - _MyCullVariable: 1 + - _NPR: 0 - _NearLightFade: 0 - _NearPlaneFade: 0 - _NormalMapScale: 1 @@ -20032,17 +19328,19 @@ Material: - _Refraction: 0 - _RefractiveIndex: 1.1 - _RenderQueueOverride: -1 - - _RimLight: 1 + - _RimLight: 0 - _RimPower: 3 - _RoundCornerMargin: 0 + - _RoundCornerPower: 0.4 - _RoundCornerRadius: 0.25 - _RoundCorners: 0 - _RoundCornersHideInterior: 0 - - _Smoothness: 1 + - _Smoothness: 0.5 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SphericalHarmonics: 0 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Stencil: 0 - _StencilComparison: 0 - _StencilOperation: 0 @@ -20054,6 +19352,7 @@ Material: - _UseWorldScale: 1 - _VertexColors: 0 - _VertexExtrusion: 0 + - _VertexExtrusionConstantWidth: 0 - _VertexExtrusionSmoothNormals: 0 - _VertexExtrusionValue: 0 - _ZOffsetFactor: 0 @@ -20063,12 +19362,10 @@ Material: m_Colors: - _BlurBackgroundRect: {r: 0, g: 0, b: 1, a: 1} - _BorderColor: {r: 1, g: 1, b: 1, a: 0} - - _ClipBoxSize: {r: 1, g: 1, b: 1, a: 0} - _ClipPlane: {r: 0, g: 1, b: 0, a: 0} - - _ClipSphere: {r: 0, g: 0, b: 0, a: 0.5} - _ClippingBorderColor: {r: 1, g: 0.2, b: 0, a: 1} - _ClippingPlaneBorderColor: {r: 1, g: 0.2, b: 0, a: 1} - - _Color: {r: 0.72794116, g: 0, b: 0, a: 1} + - _Color: {r: 0.5754717, g: 0.4325086, b: 0.4325086, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1} - _EnvironmentColorX: {r: 1, g: 0, b: 0, a: 1} @@ -20081,36 +19378,263 @@ Material: - _GradientColor2: {r: 0, g: 0.32999998, b: 0.88, a: 0.5} - _GradientColor3: {r: 0, g: 0.32999998, b: 0.88, a: 1} - _GradientColor4: {r: 1, g: 1, b: 1, a: 1} + - _HoverColor: {r: 1, g: 0, b: 0, a: 1} - _HoverColorOpaqueOverride: {r: 1, g: 1, b: 1, a: 1} - - _HoverColorOverride: {r: 0, g: 0.007843138, b: 1, a: 1} + - _HoverColorOverride: {r: 1, g: 1, b: 1, a: 1} - _InnerGlowColor: {r: 1, g: 1, b: 1, a: 0.75} - _ProximityLightCenterColorOverride: {r: 1, g: 0, b: 0, a: 0} - _ProximityLightMiddleColorOverride: {r: 0, g: 1, b: 0, a: 0.5} - _ProximityLightOuterColorOverride: {r: 0, g: 0, b: 1, a: 1} - - _RimColor: {r: 0, g: 0.006896496, b: 1, a: 1} + - _RimColor: {r: 1, g: 1, b: 1, a: 1} - _RoundCornersRadius: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} m_BuildTextureStacks: [] ---- !u!21 &1887142162 +--- !u!1 &1862493833 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1862493834} + - component: {fileID: 1862493835} + m_Layer: 0 + m_Name: ClippingBox + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1862493834 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1862493833} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: -0, z: 3.21} + m_LocalScale: {x: 0.25, y: 1, z: 8.14} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1790579014} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1862493835 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1862493833} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a976746b0d99e6f4b89504219cc67824, type: 3} + m_Name: + m_EditorClassIdentifier: + applyToSharedMaterial: 0 + renderers: + - {fileID: 1322392166} + - {fileID: 696814945} + - {fileID: 2074424269} + - {fileID: 2105085698} + - {fileID: 1719678901} + - {fileID: 588131906} + - {fileID: 1226438756} + - {fileID: 2078021580} + - {fileID: 360322620} + materials: [] + clippingSide: -1 + useOnPreRender: 0 +--- !u!1001 &1865679673 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 955809413} + m_Modifications: + - target: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_Name + value: ShaderBall + objectReference: {fileID: 0} + - target: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_CastShadows + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_MotionVectors + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_ReceiveShadows + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_LightProbeUsage + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_ReflectionProbeUsage + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 1115790161} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} +--- !u!4 &1865679674 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 400000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + m_PrefabInstance: {fileID: 1865679673} + m_PrefabAsset: {fileID: 0} +--- !u!1 &1865679675 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 100000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + m_PrefabInstance: {fileID: 1865679673} + m_PrefabAsset: {fileID: 0} +--- !u!64 &1865679676 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1865679675} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 4300002, guid: 1104611d051d4e42a68391888b61b32e, type: 3} +--- !u!23 &1865679677 stripped +MeshRenderer: + m_CorrespondingSourceObject: {fileID: 2300000, guid: 1104611d051d4e42a68391888b61b32e, type: 3} + m_PrefabInstance: {fileID: 1865679673} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1865679679 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1865679675} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c53e2b0613597e849870c4a691d25e0f, type: 3} + m_Name: + m_EditorClassIdentifier: + defaultMaterials: + - {fileID: 2100000, guid: 9f21cf60c2137a64dbe161430f7c0b75, type: 2} +--- !u!1 &1872109878 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1872109879} + m_Layer: 0 + m_Name: ShaderBall (6) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1872109879 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1872109878} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -4.8, y: 0.2, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 48176119} + - {fileID: 781216072} + m_Father: {fileID: 1595900778} + m_RootOrder: 7 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!21 &1875027688 Material: serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: ShaderBallClippingBox (Instance) + m_Name: ShaderBallClippingPlane (Instance) m_Shader: {fileID: 4800000, guid: c331f6c43a2ef0945864cb668f2653c9, type: 3} m_ValidKeywords: - - _BORDER_LIGHT_USES_HOVER_COLOR - - _CLIPPING_BOX + - _CLIPPING_BORDER + - _CLIPPING_PLANE - _DIRECTIONAL_LIGHT - _DISABLE_ALBEDO_MAP - - _HOVER_COLOR_OVERRIDE - _HOVER_LIGHT - _REFLECTIONS - - _RIM_LIGHT - _SPECULAR_HIGHLIGHTS - _USE_WORLD_SCALE - m_InvalidKeywords: [] + m_InvalidKeywords: + - _CLIPPING_PLANE_BORDER m_LightmapFlags: 4 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 @@ -20145,10 +19669,6 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - - _EmissiveMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - _IridescentSpectrumMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -20158,7 +19678,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: 32c57306df745a147a2e02f8827a8cdc, type: 3} + m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: @@ -20192,36 +19712,33 @@ Material: - _BorderLightOpaque: 0 - _BorderLightOpaqueAlpha: 1 - _BorderLightReplacesAlbedo: 0 - - _BorderLightUsesHoverColor: 1 + - _BorderLightUsesHoverColor: 0 - _BorderMinValue: 0.02 - _BorderWidth: 0.1 - _BorderWidthHorizontal: 0.1 - _BorderWidthVertical: 0.1 - _BumpScale: 1 - - _ClipBoxSide: 1 - - _ClipPlaneSide: 1 - - _ClipSphereSide: 1 - - _ClippingBorder: 0 + - _ClippingBorder: 1 - _ClippingBorderWidth: 0.025 - - _ClippingBox: 1 - - _ClippingPlane: 0 - - _ClippingPlaneBorder: 0 - - _ClippingPlaneBorderWidth: 0.025 + - _ClippingBox: 0 + - _ClippingPlane: 1 + - _ClippingPlaneBorder: 1 + - _ClippingPlaneBorderWidth: 0.02 - _ClippingSphere: 0 - _ColorWriteMask: 15 - - _CullMode: 0 + - _Cull: 2 + - _CullMode: 2 - _CustomMode: 0 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DirectionalLight: 1 - _DstBlend: 0 - - _DstBlendAlpha: 1 - _EdgeSmoothingMode: 0 - _EdgeSmoothingValue: 0.002 - _EnableChannelMap: 0 - _EnableEmission: 0 - _EnableHoverColorOpaqueOverride: 0 - - _EnableHoverColorOverride: 1 + - _EnableHoverColorOverride: 0 - _EnableLightMap: 0 - _EnableLocalSpaceTriplanarMapping: 0 - _EnableNormalMap: 0 @@ -20256,7 +19773,7 @@ Material: - _Metallic: 0 - _MipmapBias: -2 - _Mode: 0 - - _NPR: 0 + - _MyCullVariable: 1 - _NearLightFade: 0 - _NearPlaneFade: 0 - _NormalMapScale: 1 @@ -20269,18 +19786,18 @@ Material: - _Refraction: 0 - _RefractiveIndex: 1.1 - _RenderQueueOverride: -1 - - _RimLight: 1 + - _RimLight: 0 - _RimPower: 3 - _RoundCornerMargin: 0 + - _RoundCornerPower: 0.4 - _RoundCornerRadius: 0.25 - _RoundCorners: 0 - _RoundCornersHideInterior: 0 - - _Smoothness: 1 + - _Smoothness: 0.5 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SphericalHarmonics: 0 - _SrcBlend: 1 - - _SrcBlendAlpha: 1 - _Stencil: 0 - _StencilComparison: 0 - _StencilOperation: 0 @@ -20292,7 +19809,6 @@ Material: - _UseWorldScale: 1 - _VertexColors: 0 - _VertexExtrusion: 0 - - _VertexExtrusionConstantWidth: 0 - _VertexExtrusionSmoothNormals: 0 - _VertexExtrusionValue: 0 - _ZOffsetFactor: 0 @@ -20302,12 +19818,10 @@ Material: m_Colors: - _BlurBackgroundRect: {r: 0, g: 0, b: 1, a: 1} - _BorderColor: {r: 1, g: 1, b: 1, a: 0} - - _ClipBoxSize: {r: 1, g: 1, b: 1, a: 0} - _ClipPlane: {r: 0, g: 1, b: 0, a: 0} - - _ClipSphere: {r: 0, g: 0, b: 0, a: 0.5} - _ClippingBorderColor: {r: 1, g: 0.2, b: 0, a: 1} - _ClippingPlaneBorderColor: {r: 1, g: 0.2, b: 0, a: 1} - - _Color: {r: 0.72794116, g: 0, b: 0, a: 1} + - _Color: {r: 0.5754717, g: 0.4325086, b: 0.4325086, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1} - _EnvironmentColorX: {r: 1, g: 0, b: 0, a: 1} @@ -20320,35 +19834,37 @@ Material: - _GradientColor2: {r: 0, g: 0.32999998, b: 0.88, a: 0.5} - _GradientColor3: {r: 0, g: 0.32999998, b: 0.88, a: 1} - _GradientColor4: {r: 1, g: 1, b: 1, a: 1} + - _HoverColor: {r: 1, g: 0, b: 0, a: 1} - _HoverColorOpaqueOverride: {r: 1, g: 1, b: 1, a: 1} - - _HoverColorOverride: {r: 0, g: 0.007843138, b: 1, a: 1} + - _HoverColorOverride: {r: 1, g: 1, b: 1, a: 1} - _InnerGlowColor: {r: 1, g: 1, b: 1, a: 0.75} - _ProximityLightCenterColorOverride: {r: 1, g: 0, b: 0, a: 0} - _ProximityLightMiddleColorOverride: {r: 0, g: 1, b: 0, a: 0.5} - _ProximityLightOuterColorOverride: {r: 0, g: 0, b: 1, a: 1} - - _RimColor: {r: 0, g: 0.006896496, b: 1, a: 1} + - _RimColor: {r: 1, g: 1, b: 1, a: 1} - _RoundCornersRadius: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} m_BuildTextureStacks: [] ---- !u!21 &1888485389 +--- !u!21 &1882377000 Material: serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: ShaderBallClippingPlane (Instance) + m_Name: ShaderBallClippingBox (Instance) m_Shader: {fileID: 4800000, guid: c331f6c43a2ef0945864cb668f2653c9, type: 3} m_ValidKeywords: - - _CLIPPING_BORDER - - _CLIPPING_PLANE + - _BORDER_LIGHT_USES_HOVER_COLOR + - _CLIPPING_BOX - _DIRECTIONAL_LIGHT - _DISABLE_ALBEDO_MAP + - _HOVER_COLOR_OVERRIDE - _HOVER_LIGHT - _REFLECTIONS + - _RIM_LIGHT - _SPECULAR_HIGHLIGHTS - _USE_WORLD_SCALE - m_InvalidKeywords: - - _CLIPPING_PLANE_BORDER + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 @@ -20383,10 +19899,6 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - - _EmissiveMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - _IridescentSpectrumMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -20396,7 +19908,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 32c57306df745a147a2e02f8827a8cdc, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: @@ -20430,34 +19942,35 @@ Material: - _BorderLightOpaque: 0 - _BorderLightOpaqueAlpha: 1 - _BorderLightReplacesAlbedo: 0 - - _BorderLightUsesHoverColor: 0 + - _BorderLightUsesHoverColor: 1 - _BorderMinValue: 0.02 - _BorderWidth: 0.1 - _BorderWidthHorizontal: 0.1 - _BorderWidthVertical: 0.1 - _BumpScale: 1 - - _ClippingBorder: 1 + - _ClipBoxSide: 1 + - _ClipPlaneSide: 1 + - _ClipSphereSide: 1 + - _ClippingBorder: 0 - _ClippingBorderWidth: 0.025 - - _ClippingBox: 0 - - _ClippingPlane: 1 - - _ClippingPlaneBorder: 1 - - _ClippingPlaneBorderWidth: 0.02 + - _ClippingBox: 1 + - _ClippingPlane: 0 + - _ClippingPlaneBorder: 0 + - _ClippingPlaneBorderWidth: 0.025 - _ClippingSphere: 0 - _ColorWriteMask: 15 - - _Cull: 2 - - _CullMode: 2 + - _CullMode: 0 - _CustomMode: 0 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DirectionalLight: 1 - _DstBlend: 0 - - _DstBlendAlpha: 1 - _EdgeSmoothingMode: 0 - _EdgeSmoothingValue: 0.002 - _EnableChannelMap: 0 - _EnableEmission: 0 - _EnableHoverColorOpaqueOverride: 0 - - _EnableHoverColorOverride: 0 + - _EnableHoverColorOverride: 1 - _EnableLightMap: 0 - _EnableLocalSpaceTriplanarMapping: 0 - _EnableNormalMap: 0 @@ -20492,8 +20005,6 @@ Material: - _Metallic: 0 - _MipmapBias: -2 - _Mode: 0 - - _MyCullVariable: 1 - - _NPR: 0 - _NearLightFade: 0 - _NearPlaneFade: 0 - _NormalMapScale: 1 @@ -20506,19 +20017,17 @@ Material: - _Refraction: 0 - _RefractiveIndex: 1.1 - _RenderQueueOverride: -1 - - _RimLight: 0 + - _RimLight: 1 - _RimPower: 3 - _RoundCornerMargin: 0 - - _RoundCornerPower: 0.4 - _RoundCornerRadius: 0.25 - _RoundCorners: 0 - _RoundCornersHideInterior: 0 - - _Smoothness: 0.5 + - _Smoothness: 1 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SphericalHarmonics: 0 - _SrcBlend: 1 - - _SrcBlendAlpha: 1 - _Stencil: 0 - _StencilComparison: 0 - _StencilOperation: 0 @@ -20530,7 +20039,6 @@ Material: - _UseWorldScale: 1 - _VertexColors: 0 - _VertexExtrusion: 0 - - _VertexExtrusionConstantWidth: 0 - _VertexExtrusionSmoothNormals: 0 - _VertexExtrusionValue: 0 - _ZOffsetFactor: 0 @@ -20540,10 +20048,12 @@ Material: m_Colors: - _BlurBackgroundRect: {r: 0, g: 0, b: 1, a: 1} - _BorderColor: {r: 1, g: 1, b: 1, a: 0} + - _ClipBoxSize: {r: 1, g: 1, b: 1, a: 0} - _ClipPlane: {r: 0, g: 1, b: 0, a: 0} + - _ClipSphere: {r: 0, g: 0, b: 0, a: 0.5} - _ClippingBorderColor: {r: 1, g: 0.2, b: 0, a: 1} - _ClippingPlaneBorderColor: {r: 1, g: 0.2, b: 0, a: 1} - - _Color: {r: 0.5754717, g: 0.4325086, b: 0.4325086, a: 1} + - _Color: {r: 0.72794116, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1} - _EnvironmentColorX: {r: 1, g: 0, b: 0, a: 1} @@ -20556,30 +20066,29 @@ Material: - _GradientColor2: {r: 0, g: 0.32999998, b: 0.88, a: 0.5} - _GradientColor3: {r: 0, g: 0.32999998, b: 0.88, a: 1} - _GradientColor4: {r: 1, g: 1, b: 1, a: 1} - - _HoverColor: {r: 1, g: 0, b: 0, a: 1} - _HoverColorOpaqueOverride: {r: 1, g: 1, b: 1, a: 1} - - _HoverColorOverride: {r: 1, g: 1, b: 1, a: 1} + - _HoverColorOverride: {r: 0, g: 0.007843138, b: 1, a: 1} - _InnerGlowColor: {r: 1, g: 1, b: 1, a: 0.75} - _ProximityLightCenterColorOverride: {r: 1, g: 0, b: 0, a: 0} - _ProximityLightMiddleColorOverride: {r: 0, g: 1, b: 0, a: 0.5} - _ProximityLightOuterColorOverride: {r: 0, g: 0, b: 1, a: 1} - - _RimColor: {r: 1, g: 1, b: 1, a: 1} + - _RimColor: {r: 0, g: 0.006896496, b: 1, a: 1} - _RoundCornersRadius: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} m_BuildTextureStacks: [] ---- !u!21 &1894295199 +--- !u!21 &1895418661 Material: serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: ShaderBallClippingPlaneInner (Instance) + m_Name: ShaderBallClippingPlane (Instance) m_Shader: {fileID: 4800000, guid: c331f6c43a2ef0945864cb668f2653c9, type: 3} m_ValidKeywords: + - _CLIPPING_BORDER - _CLIPPING_PLANE - _DIRECTIONAL_LIGHT - _DISABLE_ALBEDO_MAP - - _EMISSION - _HOVER_LIGHT - _REFLECTIONS - _SPECULAR_HIGHLIGHTS @@ -20633,7 +20142,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: 32c57306df745a147a2e02f8827a8cdc, type: 3} + m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: @@ -20673,7 +20182,7 @@ Material: - _BorderWidthHorizontal: 0.1 - _BorderWidthVertical: 0.1 - _BumpScale: 1 - - _ClippingBorder: 0 + - _ClippingBorder: 1 - _ClippingBorderWidth: 0.025 - _ClippingBox: 0 - _ClippingPlane: 1 @@ -20682,7 +20191,7 @@ Material: - _ClippingSphere: 0 - _ColorWriteMask: 15 - _Cull: 2 - - _CullMode: 1 + - _CullMode: 2 - _CustomMode: 0 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 @@ -20692,7 +20201,7 @@ Material: - _EdgeSmoothingMode: 0 - _EdgeSmoothingValue: 0.002 - _EnableChannelMap: 0 - - _EnableEmission: 1 + - _EnableEmission: 0 - _EnableHoverColorOpaqueOverride: 0 - _EnableHoverColorOverride: 0 - _EnableLightMap: 0 @@ -20726,7 +20235,7 @@ Material: - _IridescenceAngle: -0.78 - _IridescenceIntensity: 0.5 - _IridescenceThreshold: 0.05 - - _Metallic: 0.036 + - _Metallic: 0 - _MipmapBias: -2 - _Mode: 0 - _MyCullVariable: 1 @@ -20780,9 +20289,9 @@ Material: - _ClipPlane: {r: 0, g: 1, b: 0, a: 0} - _ClippingBorderColor: {r: 1, g: 0.2, b: 0, a: 1} - _ClippingPlaneBorderColor: {r: 1, g: 0.2, b: 0, a: 1} - - _Color: {r: 1, g: 0.6827586, b: 0, a: 1} + - _Color: {r: 0.5754717, g: 0.4325086, b: 0.4325086, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _EmissiveColor: {r: 0.9411765, g: 0, b: 0, a: 1} + - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1} - _EnvironmentColorX: {r: 1, g: 0, b: 0, a: 1} - _EnvironmentColorY: {r: 0, g: 1, b: 0, a: 1} - _EnvironmentColorZ: {r: 0, g: 0, b: 1, a: 1} @@ -21168,22 +20677,24 @@ MonoBehaviour: m_EditorClassIdentifier: defaultMaterials: - {fileID: 2100000, guid: 72beba80472642299b6651a33cc160df, type: 2} ---- !u!21 &1941513589 +--- !u!21 &1943686114 Material: serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: ShaderBallClippingSphere (Instance) + m_Name: ShaderBallClippingBox (Instance) m_Shader: {fileID: 4800000, guid: c331f6c43a2ef0945864cb668f2653c9, type: 3} m_ValidKeywords: - _BORDER_LIGHT_USES_HOVER_COLOR - - _CLIPPING_SPHERE + - _CLIPPING_BOX - _DIRECTIONAL_LIGHT - _DISABLE_ALBEDO_MAP + - _HOVER_COLOR_OVERRIDE - _HOVER_LIGHT - _REFLECTIONS + - _RIM_LIGHT - _SPECULAR_HIGHLIGHTS - _USE_WORLD_SCALE m_InvalidKeywords: [] @@ -21279,25 +20790,259 @@ Material: - _ClipSphereSide: 1 - _ClippingBorder: 0 - _ClippingBorderWidth: 0.025 - - _ClippingBox: 0 + - _ClippingBox: 1 + - _ClippingPlane: 0 + - _ClippingPlaneBorder: 0 + - _ClippingPlaneBorderWidth: 0.025 + - _ClippingSphere: 0 + - _ColorWriteMask: 15 + - _CullMode: 0 + - _CustomMode: 0 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DirectionalLight: 1 + - _DstBlend: 0 + - _DstBlendAlpha: 1 + - _EdgeSmoothingMode: 0 + - _EdgeSmoothingValue: 0.002 + - _EnableChannelMap: 0 + - _EnableEmission: 0 + - _EnableHoverColorOpaqueOverride: 0 + - _EnableHoverColorOverride: 1 + - _EnableLightMap: 0 + - _EnableLocalSpaceTriplanarMapping: 0 + - _EnableNormalMap: 0 + - _EnableProximityLightColorOverride: 0 + - _EnableSSAA: 0 + - _EnableStencil: 0 + - _EnableTriplanarMapping: 0 + - _EnvironmentColorIntensity: 0.5 + - _EnvironmentColorThreshold: 1.5 + - _EnvironmentColoring: 0 + - _Fade: 1 + - _FadeBeginDistance: 0.85 + - _FadeCompleteDistance: 0.5 + - _FadeMinValue: 0 + - _FluentLightIntensity: 1 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _GradientAngle: 180 + - _GradientMode: 0 + - _HoverLight: 1 + - _HoverLightOpaque: 0 + - _IgnoreZScale: 0 + - _IndependentCorners: 0 + - _InnerGlow: 0 + - _InnerGlowPower: 4 + - _InstancedColor: 0 + - _Iridescence: 0 + - _IridescenceAngle: -0.78 + - _IridescenceIntensity: 0.5 + - _IridescenceThreshold: 0.05 + - _Metallic: 0 + - _MipmapBias: -2 + - _Mode: 0 + - _NPR: 0 + - _NearLightFade: 0 + - _NearPlaneFade: 0 + - _NormalMapScale: 1 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _ProximityLight: 0 + - _ProximityLightSubtractive: 0 + - _ProximityLightTwoSided: 0 + - _Reflections: 1 + - _Refraction: 0 + - _RefractiveIndex: 1.1 + - _RenderQueueOverride: -1 + - _RimLight: 1 + - _RimPower: 3 + - _RoundCornerMargin: 0 + - _RoundCornerRadius: 0.25 + - _RoundCorners: 0 + - _RoundCornersHideInterior: 0 + - _Smoothness: 1 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SphericalHarmonics: 0 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Stencil: 0 + - _StencilComparison: 0 + - _StencilOperation: 0 + - _StencilReadMask: 255 + - _StencilReference: 0 + - _StencilWriteMask: 255 + - _TriplanarMappingBlendSharpness: 4 + - _UVSec: 0 + - _UseWorldScale: 1 + - _VertexColors: 0 + - _VertexExtrusion: 0 + - _VertexExtrusionConstantWidth: 0 + - _VertexExtrusionSmoothNormals: 0 + - _VertexExtrusionValue: 0 + - _ZOffsetFactor: 0 + - _ZOffsetUnits: 0 + - _ZTest: 4 + - _ZWrite: 1 + m_Colors: + - _BlurBackgroundRect: {r: 0, g: 0, b: 1, a: 1} + - _BorderColor: {r: 1, g: 1, b: 1, a: 0} + - _ClipBoxSize: {r: 1, g: 1, b: 1, a: 0} + - _ClipPlane: {r: 0, g: 1, b: 0, a: 0} + - _ClipSphere: {r: 0, g: 0, b: 0, a: 0.5} + - _ClippingBorderColor: {r: 1, g: 0.2, b: 0, a: 1} + - _ClippingPlaneBorderColor: {r: 1, g: 0.2, b: 0, a: 1} + - _Color: {r: 0.72794116, g: 0, b: 0, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1} + - _EnvironmentColorX: {r: 1, g: 0, b: 0, a: 1} + - _EnvironmentColorY: {r: 0, g: 1, b: 0, a: 1} + - _EnvironmentColorZ: {r: 0, g: 0, b: 1, a: 1} + - _GradientAlpha: {r: 1, g: 1, b: 1, a: 1} + - _GradientAlphaTime: {r: 0, g: 0, b: 0, a: 0} + - _GradientColor0: {r: 0.631373, g: 0.631373, b: 0.631373, a: 0} + - _GradientColor1: {r: 1, g: 0.690196, b: 0.976471, a: 0.25} + - _GradientColor2: {r: 0, g: 0.32999998, b: 0.88, a: 0.5} + - _GradientColor3: {r: 0, g: 0.32999998, b: 0.88, a: 1} + - _GradientColor4: {r: 1, g: 1, b: 1, a: 1} + - _HoverColorOpaqueOverride: {r: 1, g: 1, b: 1, a: 1} + - _HoverColorOverride: {r: 0, g: 0.007843138, b: 1, a: 1} + - _InnerGlowColor: {r: 1, g: 1, b: 1, a: 0.75} + - _ProximityLightCenterColorOverride: {r: 1, g: 0, b: 0, a: 0} + - _ProximityLightMiddleColorOverride: {r: 0, g: 1, b: 0, a: 0.5} + - _ProximityLightOuterColorOverride: {r: 0, g: 0, b: 1, a: 1} + - _RimColor: {r: 0, g: 0.006896496, b: 1, a: 1} + - _RoundCornersRadius: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} + m_BuildTextureStacks: [] +--- !u!21 &1994230391 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: ShaderBallClippingBox (Instance) + m_Shader: {fileID: 4800000, guid: c331f6c43a2ef0945864cb668f2653c9, type: 3} + m_ValidKeywords: + - _BORDER_LIGHT_USES_HOVER_COLOR + - _CLIPPING_BOX + - _DIRECTIONAL_LIGHT + - _DISABLE_ALBEDO_MAP + - _HOVER_COLOR_OVERRIDE + - _HOVER_LIGHT + - _REFLECTIONS + - _RIM_LIGHT + - _SPECULAR_HIGHLIGHTS + - _USE_WORLD_SCALE + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 1 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 2000 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ChannelMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _IridescentSpectrumMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _LightMapTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: 32c57306df745a147a2e02f8827a8cdc, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _NormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AlbedoAlphaMode: 0 + - _AlbedoAlphaSmoothness: 0 + - _AlbedoAssignedAtRuntime: 0 + - _BlendOp: 0 + - _BlendedClippingWidth: 1 + - _BlurBorderIntensity: 0 + - _BlurMode: 0 + - _BlurTextureIntensity: 1 + - _BorderColorMode: 0 + - _BorderLight: 0 + - _BorderLightOpaque: 0 + - _BorderLightOpaqueAlpha: 1 + - _BorderLightReplacesAlbedo: 0 + - _BorderLightUsesHoverColor: 1 + - _BorderMinValue: 0.02 + - _BorderWidth: 0.1 + - _BorderWidthHorizontal: 0.1 + - _BorderWidthVertical: 0.1 + - _BumpScale: 1 + - _ClipBoxSide: 1 + - _ClipPlaneSide: 1 + - _ClipSphereSide: 1 + - _ClippingBorder: 0 + - _ClippingBorderWidth: 0.025 + - _ClippingBox: 1 - _ClippingPlane: 0 - _ClippingPlaneBorder: 0 - _ClippingPlaneBorderWidth: 0.025 - - _ClippingSphere: 1 + - _ClippingSphere: 0 - _ColorWriteMask: 15 - - _CullMode: 2 + - _CullMode: 0 - _CustomMode: 0 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DirectionalLight: 1 - _DstBlend: 0 - - _DstBlendAlpha: 1 - _EdgeSmoothingMode: 0 - _EdgeSmoothingValue: 0.002 - _EnableChannelMap: 0 - _EnableEmission: 0 - _EnableHoverColorOpaqueOverride: 0 - - _EnableHoverColorOverride: 0 + - _EnableHoverColorOverride: 1 - _EnableLightMap: 0 - _EnableLocalSpaceTriplanarMapping: 0 - _EnableNormalMap: 0 @@ -21332,7 +21077,6 @@ Material: - _Metallic: 0 - _MipmapBias: -2 - _Mode: 0 - - _NPR: 0 - _NearLightFade: 0 - _NearPlaneFade: 0 - _NormalMapScale: 1 @@ -21345,7 +21089,7 @@ Material: - _Refraction: 0 - _RefractiveIndex: 1.1 - _RenderQueueOverride: -1 - - _RimLight: 0 + - _RimLight: 1 - _RimPower: 3 - _RoundCornerMargin: 0 - _RoundCornerRadius: 0.25 @@ -21356,7 +21100,6 @@ Material: - _SpecularHighlights: 1 - _SphericalHarmonics: 0 - _SrcBlend: 1 - - _SrcBlendAlpha: 1 - _Stencil: 0 - _StencilComparison: 0 - _StencilOperation: 0 @@ -21368,7 +21111,6 @@ Material: - _UseWorldScale: 1 - _VertexColors: 0 - _VertexExtrusion: 0 - - _VertexExtrusionConstantWidth: 0 - _VertexExtrusionSmoothNormals: 0 - _VertexExtrusionValue: 0 - _ZOffsetFactor: 0 @@ -21383,7 +21125,7 @@ Material: - _ClipSphere: {r: 0, g: 0, b: 0, a: 0.5} - _ClippingBorderColor: {r: 1, g: 0.2, b: 0, a: 1} - _ClippingPlaneBorderColor: {r: 1, g: 0.2, b: 0, a: 1} - - _Color: {r: 0, g: 0.5862069, b: 1, a: 1} + - _Color: {r: 0.72794116, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1} - _EnvironmentColorX: {r: 1, g: 0, b: 0, a: 1} @@ -21397,28 +21139,28 @@ Material: - _GradientColor3: {r: 0, g: 0.32999998, b: 0.88, a: 1} - _GradientColor4: {r: 1, g: 1, b: 1, a: 1} - _HoverColorOpaqueOverride: {r: 1, g: 1, b: 1, a: 1} - - _HoverColorOverride: {r: 1, g: 1, b: 1, a: 1} + - _HoverColorOverride: {r: 0, g: 0.007843138, b: 1, a: 1} - _InnerGlowColor: {r: 1, g: 1, b: 1, a: 0.75} - _ProximityLightCenterColorOverride: {r: 1, g: 0, b: 0, a: 0} - _ProximityLightMiddleColorOverride: {r: 0, g: 1, b: 0, a: 0.5} - _ProximityLightOuterColorOverride: {r: 0, g: 0, b: 1, a: 1} - - _RimColor: {r: 1, g: 1, b: 1, a: 1} + - _RimColor: {r: 0, g: 0.006896496, b: 1, a: 1} - _RoundCornersRadius: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} m_BuildTextureStacks: [] ---- !u!21 &1955424776 +--- !u!21 &2003900054 Material: serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: ShaderBallClippingPlaneInner (Instance) + m_Name: ShaderBallClippingPlane (Instance) m_Shader: {fileID: 4800000, guid: c331f6c43a2ef0945864cb668f2653c9, type: 3} m_ValidKeywords: + - _CLIPPING_BORDER - _CLIPPING_PLANE - _DIRECTIONAL_LIGHT - _DISABLE_ALBEDO_MAP - - _EMISSION - _HOVER_LIGHT - _REFLECTIONS - _SPECULAR_HIGHLIGHTS @@ -21472,7 +21214,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: 32c57306df745a147a2e02f8827a8cdc, type: 3} + m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: @@ -21512,7 +21254,7 @@ Material: - _BorderWidthHorizontal: 0.1 - _BorderWidthVertical: 0.1 - _BumpScale: 1 - - _ClippingBorder: 0 + - _ClippingBorder: 1 - _ClippingBorderWidth: 0.025 - _ClippingBox: 0 - _ClippingPlane: 1 @@ -21521,7 +21263,7 @@ Material: - _ClippingSphere: 0 - _ColorWriteMask: 15 - _Cull: 2 - - _CullMode: 1 + - _CullMode: 2 - _CustomMode: 0 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 @@ -21531,7 +21273,7 @@ Material: - _EdgeSmoothingMode: 0 - _EdgeSmoothingValue: 0.002 - _EnableChannelMap: 0 - - _EnableEmission: 1 + - _EnableEmission: 0 - _EnableHoverColorOpaqueOverride: 0 - _EnableHoverColorOverride: 0 - _EnableLightMap: 0 @@ -21565,7 +21307,7 @@ Material: - _IridescenceAngle: -0.78 - _IridescenceIntensity: 0.5 - _IridescenceThreshold: 0.05 - - _Metallic: 0.036 + - _Metallic: 0 - _MipmapBias: -2 - _Mode: 0 - _MyCullVariable: 1 @@ -21619,9 +21361,9 @@ Material: - _ClipPlane: {r: 0, g: 1, b: 0, a: 0} - _ClippingBorderColor: {r: 1, g: 0.2, b: 0, a: 1} - _ClippingPlaneBorderColor: {r: 1, g: 0.2, b: 0, a: 1} - - _Color: {r: 1, g: 0.6827586, b: 0, a: 1} + - _Color: {r: 0.5754717, g: 0.4325086, b: 0.4325086, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _EmissiveColor: {r: 0.9411765, g: 0, b: 0, a: 1} + - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1} - _EnvironmentColorX: {r: 1, g: 0, b: 0, a: 1} - _EnvironmentColorY: {r: 0, g: 1, b: 0, a: 1} - _EnvironmentColorZ: {r: 0, g: 0, b: 1, a: 1} @@ -21642,27 +21384,26 @@ Material: - _RimColor: {r: 1, g: 1, b: 1, a: 1} - _RoundCornersRadius: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} m_BuildTextureStacks: [] ---- !u!21 &1994230391 +--- !u!21 &2010519469 Material: serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: ShaderBallClippingBox (Instance) + m_Name: ShaderBallClippingPlaneInner (Instance) m_Shader: {fileID: 4800000, guid: c331f6c43a2ef0945864cb668f2653c9, type: 3} m_ValidKeywords: - - _BORDER_LIGHT_USES_HOVER_COLOR - - _CLIPPING_BOX + - _CLIPPING_PLANE - _DIRECTIONAL_LIGHT - _DISABLE_ALBEDO_MAP - - _HOVER_COLOR_OVERRIDE + - _EMISSION - _HOVER_LIGHT - _REFLECTIONS - - _RIM_LIGHT - _SPECULAR_HIGHLIGHTS - _USE_WORLD_SCALE - m_InvalidKeywords: [] + m_InvalidKeywords: + - _CLIPPING_PLANE_BORDER m_LightmapFlags: 4 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 @@ -21740,24 +21481,22 @@ Material: - _BorderLightOpaque: 0 - _BorderLightOpaqueAlpha: 1 - _BorderLightReplacesAlbedo: 0 - - _BorderLightUsesHoverColor: 1 + - _BorderLightUsesHoverColor: 0 - _BorderMinValue: 0.02 - _BorderWidth: 0.1 - _BorderWidthHorizontal: 0.1 - _BorderWidthVertical: 0.1 - _BumpScale: 1 - - _ClipBoxSide: 1 - - _ClipPlaneSide: 1 - - _ClipSphereSide: 1 - _ClippingBorder: 0 - _ClippingBorderWidth: 0.025 - - _ClippingBox: 1 - - _ClippingPlane: 0 - - _ClippingPlaneBorder: 0 - - _ClippingPlaneBorderWidth: 0.025 + - _ClippingBox: 0 + - _ClippingPlane: 1 + - _ClippingPlaneBorder: 1 + - _ClippingPlaneBorderWidth: 0.02 - _ClippingSphere: 0 - _ColorWriteMask: 15 - - _CullMode: 0 + - _Cull: 2 + - _CullMode: 1 - _CustomMode: 0 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 @@ -21766,9 +21505,9 @@ Material: - _EdgeSmoothingMode: 0 - _EdgeSmoothingValue: 0.002 - _EnableChannelMap: 0 - - _EnableEmission: 0 + - _EnableEmission: 1 - _EnableHoverColorOpaqueOverride: 0 - - _EnableHoverColorOverride: 1 + - _EnableHoverColorOverride: 0 - _EnableLightMap: 0 - _EnableLocalSpaceTriplanarMapping: 0 - _EnableNormalMap: 0 @@ -21800,9 +21539,10 @@ Material: - _IridescenceAngle: -0.78 - _IridescenceIntensity: 0.5 - _IridescenceThreshold: 0.05 - - _Metallic: 0 + - _Metallic: 0.036 - _MipmapBias: -2 - _Mode: 0 + - _MyCullVariable: 1 - _NearLightFade: 0 - _NearPlaneFade: 0 - _NormalMapScale: 1 @@ -21815,13 +21555,14 @@ Material: - _Refraction: 0 - _RefractiveIndex: 1.1 - _RenderQueueOverride: -1 - - _RimLight: 1 + - _RimLight: 0 - _RimPower: 3 - _RoundCornerMargin: 0 + - _RoundCornerPower: 0.4 - _RoundCornerRadius: 0.25 - _RoundCorners: 0 - _RoundCornersHideInterior: 0 - - _Smoothness: 1 + - _Smoothness: 0.5 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SphericalHarmonics: 0 @@ -21846,14 +21587,12 @@ Material: m_Colors: - _BlurBackgroundRect: {r: 0, g: 0, b: 1, a: 1} - _BorderColor: {r: 1, g: 1, b: 1, a: 0} - - _ClipBoxSize: {r: 1, g: 1, b: 1, a: 0} - _ClipPlane: {r: 0, g: 1, b: 0, a: 0} - - _ClipSphere: {r: 0, g: 0, b: 0, a: 0.5} - _ClippingBorderColor: {r: 1, g: 0.2, b: 0, a: 1} - _ClippingPlaneBorderColor: {r: 1, g: 0.2, b: 0, a: 1} - - _Color: {r: 0.72794116, g: 0, b: 0, a: 1} + - _Color: {r: 1, g: 0.6827586, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1} + - _EmissiveColor: {r: 0.9411765, g: 0, b: 0, a: 1} - _EnvironmentColorX: {r: 1, g: 0, b: 0, a: 1} - _EnvironmentColorY: {r: 0, g: 1, b: 0, a: 1} - _EnvironmentColorZ: {r: 0, g: 0, b: 1, a: 1} @@ -21864,35 +21603,35 @@ Material: - _GradientColor2: {r: 0, g: 0.32999998, b: 0.88, a: 0.5} - _GradientColor3: {r: 0, g: 0.32999998, b: 0.88, a: 1} - _GradientColor4: {r: 1, g: 1, b: 1, a: 1} + - _HoverColor: {r: 1, g: 0, b: 0, a: 1} - _HoverColorOpaqueOverride: {r: 1, g: 1, b: 1, a: 1} - - _HoverColorOverride: {r: 0, g: 0.007843138, b: 1, a: 1} + - _HoverColorOverride: {r: 1, g: 1, b: 1, a: 1} - _InnerGlowColor: {r: 1, g: 1, b: 1, a: 0.75} - _ProximityLightCenterColorOverride: {r: 1, g: 0, b: 0, a: 0} - _ProximityLightMiddleColorOverride: {r: 0, g: 1, b: 0, a: 0.5} - _ProximityLightOuterColorOverride: {r: 0, g: 0, b: 1, a: 1} - - _RimColor: {r: 0, g: 0.006896496, b: 1, a: 1} + - _RimColor: {r: 1, g: 1, b: 1, a: 1} - _RoundCornersRadius: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} m_BuildTextureStacks: [] ---- !u!21 &2010519469 +--- !u!21 &2016824403 Material: serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: ShaderBallClippingPlaneInner (Instance) + m_Name: ShaderBallClippingSphere (Instance) m_Shader: {fileID: 4800000, guid: c331f6c43a2ef0945864cb668f2653c9, type: 3} m_ValidKeywords: - - _CLIPPING_PLANE + - _BORDER_LIGHT_USES_HOVER_COLOR + - _CLIPPING_SPHERE - _DIRECTIONAL_LIGHT - _DISABLE_ALBEDO_MAP - - _EMISSION - _HOVER_LIGHT - _REFLECTIONS - _SPECULAR_HIGHLIGHTS - _USE_WORLD_SCALE - m_InvalidKeywords: - - _CLIPPING_PLANE_BORDER + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 @@ -21927,6 +21666,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _EmissiveMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _IridescentSpectrumMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -21970,31 +21713,34 @@ Material: - _BorderLightOpaque: 0 - _BorderLightOpaqueAlpha: 1 - _BorderLightReplacesAlbedo: 0 - - _BorderLightUsesHoverColor: 0 + - _BorderLightUsesHoverColor: 1 - _BorderMinValue: 0.02 - _BorderWidth: 0.1 - _BorderWidthHorizontal: 0.1 - _BorderWidthVertical: 0.1 - _BumpScale: 1 + - _ClipBoxSide: 1 + - _ClipPlaneSide: 1 + - _ClipSphereSide: 1 - _ClippingBorder: 0 - _ClippingBorderWidth: 0.025 - _ClippingBox: 0 - - _ClippingPlane: 1 - - _ClippingPlaneBorder: 1 - - _ClippingPlaneBorderWidth: 0.02 - - _ClippingSphere: 0 + - _ClippingPlane: 0 + - _ClippingPlaneBorder: 0 + - _ClippingPlaneBorderWidth: 0.025 + - _ClippingSphere: 1 - _ColorWriteMask: 15 - - _Cull: 2 - - _CullMode: 1 + - _CullMode: 2 - _CustomMode: 0 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DirectionalLight: 1 - _DstBlend: 0 + - _DstBlendAlpha: 1 - _EdgeSmoothingMode: 0 - _EdgeSmoothingValue: 0.002 - _EnableChannelMap: 0 - - _EnableEmission: 1 + - _EnableEmission: 0 - _EnableHoverColorOpaqueOverride: 0 - _EnableHoverColorOverride: 0 - _EnableLightMap: 0 @@ -22028,10 +21774,10 @@ Material: - _IridescenceAngle: -0.78 - _IridescenceIntensity: 0.5 - _IridescenceThreshold: 0.05 - - _Metallic: 0.036 + - _Metallic: 0 - _MipmapBias: -2 - _Mode: 0 - - _MyCullVariable: 1 + - _NPR: 0 - _NearLightFade: 0 - _NearPlaneFade: 0 - _NormalMapScale: 1 @@ -22047,15 +21793,15 @@ Material: - _RimLight: 0 - _RimPower: 3 - _RoundCornerMargin: 0 - - _RoundCornerPower: 0.4 - _RoundCornerRadius: 0.25 - _RoundCorners: 0 - _RoundCornersHideInterior: 0 - - _Smoothness: 0.5 + - _Smoothness: 1 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SphericalHarmonics: 0 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Stencil: 0 - _StencilComparison: 0 - _StencilOperation: 0 @@ -22067,6 +21813,7 @@ Material: - _UseWorldScale: 1 - _VertexColors: 0 - _VertexExtrusion: 0 + - _VertexExtrusionConstantWidth: 0 - _VertexExtrusionSmoothNormals: 0 - _VertexExtrusionValue: 0 - _ZOffsetFactor: 0 @@ -22076,12 +21823,14 @@ Material: m_Colors: - _BlurBackgroundRect: {r: 0, g: 0, b: 1, a: 1} - _BorderColor: {r: 1, g: 1, b: 1, a: 0} + - _ClipBoxSize: {r: 1, g: 1, b: 1, a: 0} - _ClipPlane: {r: 0, g: 1, b: 0, a: 0} + - _ClipSphere: {r: 0, g: 0, b: 0, a: 0.5} - _ClippingBorderColor: {r: 1, g: 0.2, b: 0, a: 1} - _ClippingPlaneBorderColor: {r: 1, g: 0.2, b: 0, a: 1} - - _Color: {r: 1, g: 0.6827586, b: 0, a: 1} + - _Color: {r: 0, g: 0.5862069, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _EmissiveColor: {r: 0.9411765, g: 0, b: 0, a: 1} + - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1} - _EnvironmentColorX: {r: 1, g: 0, b: 0, a: 1} - _EnvironmentColorY: {r: 0, g: 1, b: 0, a: 1} - _EnvironmentColorZ: {r: 0, g: 0, b: 1, a: 1} @@ -22092,7 +21841,6 @@ Material: - _GradientColor2: {r: 0, g: 0.32999998, b: 0.88, a: 0.5} - _GradientColor3: {r: 0, g: 0.32999998, b: 0.88, a: 1} - _GradientColor4: {r: 1, g: 1, b: 1, a: 1} - - _HoverColor: {r: 1, g: 0, b: 0, a: 1} - _HoverColorOpaqueOverride: {r: 1, g: 1, b: 1, a: 1} - _HoverColorOverride: {r: 1, g: 1, b: 1, a: 1} - _InnerGlowColor: {r: 1, g: 1, b: 1, a: 0.75} @@ -22102,25 +21850,59 @@ Material: - _RimColor: {r: 1, g: 1, b: 1, a: 1} - _RoundCornersRadius: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} m_BuildTextureStacks: [] ---- !u!21 &2020214759 +--- !u!1 &2021874964 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2021874965} + m_Layer: 0 + m_Name: ShaderBall (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2021874965 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2021874964} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -1.600001, y: 0.19999972, z: -0.00000023007642} + m_LocalScale: {x: 1, y: 0.99999994, z: 0.99999994} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 2046883229} + - {fileID: 745713250} + m_Father: {fileID: 1595900778} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!21 &2023465726 Material: serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: ShaderBallClippingSphere (Instance) + m_Name: ShaderBallClippingPlane (Instance) m_Shader: {fileID: 4800000, guid: c331f6c43a2ef0945864cb668f2653c9, type: 3} m_ValidKeywords: - - _BORDER_LIGHT_USES_HOVER_COLOR - - _CLIPPING_SPHERE + - _CLIPPING_BORDER + - _CLIPPING_PLANE - _DIRECTIONAL_LIGHT - _DISABLE_ALBEDO_MAP - _HOVER_LIGHT - _REFLECTIONS - _SPECULAR_HIGHLIGHTS - _USE_WORLD_SCALE - m_InvalidKeywords: [] + m_InvalidKeywords: + - _CLIPPING_PLANE_BORDER m_LightmapFlags: 4 m_EnableInstancingVariants: 1 m_DoubleSidedGI: 0 @@ -22168,7 +21950,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: 32c57306df745a147a2e02f8827a8cdc, type: 3} + m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: @@ -22202,23 +21984,21 @@ Material: - _BorderLightOpaque: 0 - _BorderLightOpaqueAlpha: 1 - _BorderLightReplacesAlbedo: 0 - - _BorderLightUsesHoverColor: 1 + - _BorderLightUsesHoverColor: 0 - _BorderMinValue: 0.02 - _BorderWidth: 0.1 - _BorderWidthHorizontal: 0.1 - _BorderWidthVertical: 0.1 - _BumpScale: 1 - - _ClipBoxSide: 1 - - _ClipPlaneSide: 1 - - _ClipSphereSide: 1 - - _ClippingBorder: 0 + - _ClippingBorder: 1 - _ClippingBorderWidth: 0.025 - _ClippingBox: 0 - - _ClippingPlane: 0 - - _ClippingPlaneBorder: 0 - - _ClippingPlaneBorderWidth: 0.025 - - _ClippingSphere: 1 + - _ClippingPlane: 1 + - _ClippingPlaneBorder: 1 + - _ClippingPlaneBorderWidth: 0.02 + - _ClippingSphere: 0 - _ColorWriteMask: 15 + - _Cull: 2 - _CullMode: 2 - _CustomMode: 0 - _Cutoff: 0.5 @@ -22266,6 +22046,7 @@ Material: - _Metallic: 0 - _MipmapBias: -2 - _Mode: 0 + - _MyCullVariable: 1 - _NPR: 0 - _NearLightFade: 0 - _NearPlaneFade: 0 @@ -22282,10 +22063,11 @@ Material: - _RimLight: 0 - _RimPower: 3 - _RoundCornerMargin: 0 + - _RoundCornerPower: 0.4 - _RoundCornerRadius: 0.25 - _RoundCorners: 0 - _RoundCornersHideInterior: 0 - - _Smoothness: 1 + - _Smoothness: 0.5 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SphericalHarmonics: 0 @@ -22312,66 +22094,32 @@ Material: m_Colors: - _BlurBackgroundRect: {r: 0, g: 0, b: 1, a: 1} - _BorderColor: {r: 1, g: 1, b: 1, a: 0} - - _ClipBoxSize: {r: 1, g: 1, b: 1, a: 0} - _ClipPlane: {r: 0, g: 1, b: 0, a: 0} - - _ClipSphere: {r: 0, g: 0, b: 0, a: 0.5} - _ClippingBorderColor: {r: 1, g: 0.2, b: 0, a: 1} - _ClippingPlaneBorderColor: {r: 1, g: 0.2, b: 0, a: 1} - - _Color: {r: 0, g: 0.5862069, b: 1, a: 1} + - _Color: {r: 0.5754717, g: 0.4325086, b: 0.4325086, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1} - _EnvironmentColorX: {r: 1, g: 0, b: 0, a: 1} - _EnvironmentColorY: {r: 0, g: 1, b: 0, a: 1} - - _EnvironmentColorZ: {r: 0, g: 0, b: 1, a: 1} - - _GradientAlpha: {r: 1, g: 1, b: 1, a: 1} - - _GradientAlphaTime: {r: 0, g: 0, b: 0, a: 0} - - _GradientColor0: {r: 0.631373, g: 0.631373, b: 0.631373, a: 0} - - _GradientColor1: {r: 1, g: 0.690196, b: 0.976471, a: 0.25} - - _GradientColor2: {r: 0, g: 0.32999998, b: 0.88, a: 0.5} - - _GradientColor3: {r: 0, g: 0.32999998, b: 0.88, a: 1} - - _GradientColor4: {r: 1, g: 1, b: 1, a: 1} - - _HoverColorOpaqueOverride: {r: 1, g: 1, b: 1, a: 1} - - _HoverColorOverride: {r: 1, g: 1, b: 1, a: 1} - - _InnerGlowColor: {r: 1, g: 1, b: 1, a: 0.75} - - _ProximityLightCenterColorOverride: {r: 1, g: 0, b: 0, a: 0} - - _ProximityLightMiddleColorOverride: {r: 0, g: 1, b: 0, a: 0.5} - - _ProximityLightOuterColorOverride: {r: 0, g: 0, b: 1, a: 1} - - _RimColor: {r: 1, g: 1, b: 1, a: 1} - - _RoundCornersRadius: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} - m_BuildTextureStacks: [] ---- !u!1 &2021874964 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2021874965} - m_Layer: 0 - m_Name: ShaderBall (2) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &2021874965 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2021874964} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -1.600001, y: 0.19999972, z: -0.00000023007642} - m_LocalScale: {x: 1, y: 0.99999994, z: 0.99999994} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 2046883229} - - {fileID: 745713250} - m_Father: {fileID: 1595900778} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + - _EnvironmentColorZ: {r: 0, g: 0, b: 1, a: 1} + - _GradientAlpha: {r: 1, g: 1, b: 1, a: 1} + - _GradientAlphaTime: {r: 0, g: 0, b: 0, a: 0} + - _GradientColor0: {r: 0.631373, g: 0.631373, b: 0.631373, a: 0} + - _GradientColor1: {r: 1, g: 0.690196, b: 0.976471, a: 0.25} + - _GradientColor2: {r: 0, g: 0.32999998, b: 0.88, a: 0.5} + - _GradientColor3: {r: 0, g: 0.32999998, b: 0.88, a: 1} + - _GradientColor4: {r: 1, g: 1, b: 1, a: 1} + - _HoverColor: {r: 1, g: 0, b: 0, a: 1} + - _HoverColorOpaqueOverride: {r: 1, g: 1, b: 1, a: 1} + - _HoverColorOverride: {r: 1, g: 1, b: 1, a: 1} + - _InnerGlowColor: {r: 1, g: 1, b: 1, a: 0.75} + - _ProximityLightCenterColorOverride: {r: 1, g: 0, b: 0, a: 0} + - _ProximityLightMiddleColorOverride: {r: 0, g: 1, b: 0, a: 0.5} + - _ProximityLightOuterColorOverride: {r: 0, g: 0, b: 1, a: 1} + - _RimColor: {r: 1, g: 1, b: 1, a: 1} + - _RoundCornersRadius: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} + m_BuildTextureStacks: [] --- !u!1001 &2046883228 PrefabInstance: m_ObjectHideFlags: 0 @@ -22512,7 +22260,7 @@ MonoBehaviour: m_EditorClassIdentifier: defaultMaterials: - {fileID: 2100000, guid: 72beba80472642299b6651a33cc160df, type: 2} ---- !u!21 &2057376286 +--- !u!21 &2058180335 Material: serializedVersion: 8 m_ObjectHideFlags: 0 @@ -24348,7 +24096,7 @@ Material: - _RimColor: {r: 1, g: 1, b: 1, a: 1} - _RoundCornersRadius: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} m_BuildTextureStacks: [] ---- !u!21 &2136657810 +--- !u!21 &2124299343 Material: serializedVersion: 8 m_ObjectHideFlags: 0 @@ -24585,6 +24333,245 @@ Material: - _RimColor: {r: 1, g: 1, b: 1, a: 1} - _RoundCornersRadius: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} m_BuildTextureStacks: [] +--- !u!21 &2146966958 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: ShaderBallClippingBox (Instance) + m_Shader: {fileID: 4800000, guid: c331f6c43a2ef0945864cb668f2653c9, type: 3} + m_ValidKeywords: + - _BORDER_LIGHT_USES_HOVER_COLOR + - _CLIPPING_BOX + - _DIRECTIONAL_LIGHT + - _DISABLE_ALBEDO_MAP + - _HOVER_COLOR_OVERRIDE + - _HOVER_LIGHT + - _REFLECTIONS + - _RIM_LIGHT + - _SPECULAR_HIGHLIGHTS + - _USE_WORLD_SCALE + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 1 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 2000 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ChannelMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissiveMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _IridescentSpectrumMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _LightMapTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: 32c57306df745a147a2e02f8827a8cdc, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _NormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AlbedoAlphaMode: 0 + - _AlbedoAlphaSmoothness: 0 + - _AlbedoAssignedAtRuntime: 0 + - _BlendOp: 0 + - _BlendedClippingWidth: 1 + - _BlurBorderIntensity: 0 + - _BlurMode: 0 + - _BlurTextureIntensity: 1 + - _BorderColorMode: 0 + - _BorderLight: 0 + - _BorderLightOpaque: 0 + - _BorderLightOpaqueAlpha: 1 + - _BorderLightReplacesAlbedo: 0 + - _BorderLightUsesHoverColor: 1 + - _BorderMinValue: 0.02 + - _BorderWidth: 0.1 + - _BorderWidthHorizontal: 0.1 + - _BorderWidthVertical: 0.1 + - _BumpScale: 1 + - _ClipBoxSide: 1 + - _ClipPlaneSide: 1 + - _ClipSphereSide: 1 + - _ClippingBorder: 0 + - _ClippingBorderWidth: 0.025 + - _ClippingBox: 1 + - _ClippingPlane: 0 + - _ClippingPlaneBorder: 0 + - _ClippingPlaneBorderWidth: 0.025 + - _ClippingSphere: 0 + - _ColorWriteMask: 15 + - _CullMode: 0 + - _CustomMode: 0 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DirectionalLight: 1 + - _DstBlend: 0 + - _DstBlendAlpha: 1 + - _EdgeSmoothingMode: 0 + - _EdgeSmoothingValue: 0.002 + - _EnableChannelMap: 0 + - _EnableEmission: 0 + - _EnableHoverColorOpaqueOverride: 0 + - _EnableHoverColorOverride: 1 + - _EnableLightMap: 0 + - _EnableLocalSpaceTriplanarMapping: 0 + - _EnableNormalMap: 0 + - _EnableProximityLightColorOverride: 0 + - _EnableSSAA: 0 + - _EnableStencil: 0 + - _EnableTriplanarMapping: 0 + - _EnvironmentColorIntensity: 0.5 + - _EnvironmentColorThreshold: 1.5 + - _EnvironmentColoring: 0 + - _Fade: 1 + - _FadeBeginDistance: 0.85 + - _FadeCompleteDistance: 0.5 + - _FadeMinValue: 0 + - _FluentLightIntensity: 1 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _GradientAngle: 180 + - _GradientMode: 0 + - _HoverLight: 1 + - _HoverLightOpaque: 0 + - _IgnoreZScale: 0 + - _IndependentCorners: 0 + - _InnerGlow: 0 + - _InnerGlowPower: 4 + - _InstancedColor: 0 + - _Iridescence: 0 + - _IridescenceAngle: -0.78 + - _IridescenceIntensity: 0.5 + - _IridescenceThreshold: 0.05 + - _Metallic: 0 + - _MipmapBias: -2 + - _Mode: 0 + - _NPR: 0 + - _NearLightFade: 0 + - _NearPlaneFade: 0 + - _NormalMapScale: 1 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _ProximityLight: 0 + - _ProximityLightSubtractive: 0 + - _ProximityLightTwoSided: 0 + - _Reflections: 1 + - _Refraction: 0 + - _RefractiveIndex: 1.1 + - _RenderQueueOverride: -1 + - _RimLight: 1 + - _RimPower: 3 + - _RoundCornerMargin: 0 + - _RoundCornerRadius: 0.25 + - _RoundCorners: 0 + - _RoundCornersHideInterior: 0 + - _Smoothness: 1 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SphericalHarmonics: 0 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Stencil: 0 + - _StencilComparison: 0 + - _StencilOperation: 0 + - _StencilReadMask: 255 + - _StencilReference: 0 + - _StencilWriteMask: 255 + - _TriplanarMappingBlendSharpness: 4 + - _UVSec: 0 + - _UseWorldScale: 1 + - _VertexColors: 0 + - _VertexExtrusion: 0 + - _VertexExtrusionConstantWidth: 0 + - _VertexExtrusionSmoothNormals: 0 + - _VertexExtrusionValue: 0 + - _ZOffsetFactor: 0 + - _ZOffsetUnits: 0 + - _ZTest: 4 + - _ZWrite: 1 + m_Colors: + - _BlurBackgroundRect: {r: 0, g: 0, b: 1, a: 1} + - _BorderColor: {r: 1, g: 1, b: 1, a: 0} + - _ClipBoxSize: {r: 1, g: 1, b: 1, a: 0} + - _ClipPlane: {r: 0, g: 1, b: 0, a: 0} + - _ClipSphere: {r: 0, g: 0, b: 0, a: 0.5} + - _ClippingBorderColor: {r: 1, g: 0.2, b: 0, a: 1} + - _ClippingPlaneBorderColor: {r: 1, g: 0.2, b: 0, a: 1} + - _Color: {r: 0.72794116, g: 0, b: 0, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1} + - _EnvironmentColorX: {r: 1, g: 0, b: 0, a: 1} + - _EnvironmentColorY: {r: 0, g: 1, b: 0, a: 1} + - _EnvironmentColorZ: {r: 0, g: 0, b: 1, a: 1} + - _GradientAlpha: {r: 1, g: 1, b: 1, a: 1} + - _GradientAlphaTime: {r: 0, g: 0, b: 0, a: 0} + - _GradientColor0: {r: 0.631373, g: 0.631373, b: 0.631373, a: 0} + - _GradientColor1: {r: 1, g: 0.690196, b: 0.976471, a: 0.25} + - _GradientColor2: {r: 0, g: 0.32999998, b: 0.88, a: 0.5} + - _GradientColor3: {r: 0, g: 0.32999998, b: 0.88, a: 1} + - _GradientColor4: {r: 1, g: 1, b: 1, a: 1} + - _HoverColorOpaqueOverride: {r: 1, g: 1, b: 1, a: 1} + - _HoverColorOverride: {r: 0, g: 0.007843138, b: 1, a: 1} + - _InnerGlowColor: {r: 1, g: 1, b: 1, a: 0.75} + - _ProximityLightCenterColorOverride: {r: 1, g: 0, b: 0, a: 0} + - _ProximityLightMiddleColorOverride: {r: 0, g: 1, b: 0, a: 0.5} + - _ProximityLightOuterColorOverride: {r: 0, g: 0, b: 1, a: 1} + - _RimColor: {r: 0, g: 0.006896496, b: 1, a: 1} + - _RoundCornersRadius: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} + m_BuildTextureStacks: [] --- !u!1001 &5264854134733198569 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/UnityProjects/MRTKDevTemplate/Assets/Scenes/DiagnosticsDemo.unity b/UnityProjects/MRTKDevTemplate/Assets/Scenes/DiagnosticsDemo.unity index 95b7140f5..54d128b88 100644 --- a/UnityProjects/MRTKDevTemplate/Assets/Scenes/DiagnosticsDemo.unity +++ b/UnityProjects/MRTKDevTemplate/Assets/Scenes/DiagnosticsDemo.unity @@ -399,74 +399,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} ---- !u!1001 &525252187 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_RootOrder - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720334, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_Name - value: MRTK XR Rig - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} ---- !u!114 &525252188 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 5569439093497552269, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - m_PrefabInstance: {fileID: 525252187} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 83e4e6cca11330d4088d729ab4fc9d9f, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1001 &640980041 PrefabInstance: m_ObjectHideFlags: 0 @@ -513,15 +445,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d9ad66e7cc9a2754d8ea989740c9f00d, type: 3} m_Name: m_EditorClassIdentifier: - m_InteractionManager: {fileID: 525252188} + m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 1 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -554,42 +484,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_OnLastHoverExited: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnHoverEntered: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectEntered: - m_PersistentCalls: - m_Calls: [] - m_OnSelectExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -704,6 +619,7 @@ MonoBehaviour: hostTransform: {fileID: 199943738} allowedManipulations: 3 allowedInteractionTypes: -2147483641 + rigidbodyMovementType: 0 applyTorque: 1 springForceSoftness: 0.1 springTorqueSoftness: 0.1 @@ -726,8 +642,7 @@ MonoBehaviour: moveLogicType: reference: MixedReality.Toolkit.SpatialManipulation.MoveLogic, MixedReality.Toolkit.SpatialManipulation rotateLogicType: - reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, - MixedReality.Toolkit.SpatialManipulation + reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, MixedReality.Toolkit.SpatialManipulation scaleLogicType: reference: MixedReality.Toolkit.SpatialManipulation.ScaleLogic, MixedReality.Toolkit.SpatialManipulation --- !u!114 &686896109 @@ -879,6 +794,67 @@ BoxCollider: serializedVersion: 2 m_Size: {x: 0.99999994, y: 1, z: 0.099999994} m_Center: {x: 0, y: 0, z: 0.04998474} +--- !u!1001 &1472753677 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720334, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_Name + value: MRTK XR Rig + objectReference: {fileID: 0} + - target: {fileID: 8479077998186684813, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} --- !u!1001 &1789277895 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/UnityProjects/MRTKDevTemplate/Assets/Scenes/DialogExample.unity b/UnityProjects/MRTKDevTemplate/Assets/Scenes/DialogExample.unity index b2f42aa74..93fe0c08b 100644 --- a/UnityProjects/MRTKDevTemplate/Assets/Scenes/DialogExample.unity +++ b/UnityProjects/MRTKDevTemplate/Assets/Scenes/DialogExample.unity @@ -1479,6 +1479,67 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} +--- !u!1001 &666296028 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720334, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_Name + value: MRTK XR Rig + objectReference: {fileID: 0} + - target: {fileID: 8479077998186684813, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} --- !u!1 &694430461 GameObject: m_ObjectHideFlags: 0 @@ -2635,71 +2696,10 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} m_PrefabInstance: {fileID: 110026553} m_PrefabAsset: {fileID: 0} ---- !u!1001 &1990843813 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720334, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_Name - value: MRTK XR Rig - objectReference: {fileID: 0} - - target: {fileID: 8479077998186684813, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} --- !u!114 &1990843814 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 5569439093497552269, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - m_PrefabInstance: {fileID: 1990843813} + m_CorrespondingSourceObject: {fileID: 800708247703322884, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + m_PrefabInstance: {fileID: 666296028} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 diff --git a/UnityProjects/MRTKDevTemplate/Assets/Scenes/DictationExample.unity b/UnityProjects/MRTKDevTemplate/Assets/Scenes/DictationExample.unity index 4740d15db..01320cb4b 100644 --- a/UnityProjects/MRTKDevTemplate/Assets/Scenes/DictationExample.unity +++ b/UnityProjects/MRTKDevTemplate/Assets/Scenes/DictationExample.unity @@ -301,78 +301,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07c4bd04b45c014fad0e3cd30747f06, type: 3} ---- !u!1001 &525252187 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720334, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_Name - value: MRTK XR Rig - objectReference: {fileID: 0} - - target: {fileID: 8479077998186684813, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} ---- !u!114 &525252188 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 5569439093497552269, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - m_PrefabInstance: {fileID: 525252187} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 83e4e6cca11330d4088d729ab4fc9d9f, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1001 &640980041 PrefabInstance: m_ObjectHideFlags: 0 @@ -653,6 +581,67 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 +--- !u!1001 &1136283421 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720334, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_Name + value: MRTK XR Rig + objectReference: {fileID: 0} + - target: {fileID: 8479077998186684813, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} --- !u!1 &1245148836 GameObject: m_ObjectHideFlags: 0 @@ -1336,15 +1325,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d9ad66e7cc9a2754d8ea989740c9f00d, type: 3} m_Name: m_EditorClassIdentifier: - m_InteractionManager: {fileID: 525252188} + m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 1 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -1377,42 +1364,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnHoverEntered: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_OnHoverExited: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectEntered: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectExited: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -1527,6 +1499,7 @@ MonoBehaviour: hostTransform: {fileID: 1570749438} allowedManipulations: 7 allowedInteractionTypes: -2147483641 + rigidbodyMovementType: 0 applyTorque: 1 springForceSoftness: 0.1 springTorqueSoftness: 0.1 @@ -1549,8 +1522,7 @@ MonoBehaviour: moveLogicType: reference: MixedReality.Toolkit.SpatialManipulation.MoveLogic, MixedReality.Toolkit.SpatialManipulation rotateLogicType: - reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, - MixedReality.Toolkit.SpatialManipulation + reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, MixedReality.Toolkit.SpatialManipulation scaleLogicType: reference: MixedReality.Toolkit.SpatialManipulation.ScaleLogic, MixedReality.Toolkit.SpatialManipulation --- !u!114 &1728047444 diff --git a/UnityProjects/MRTKDevTemplate/Assets/Scenes/DirectionalIndicatorExample.unity b/UnityProjects/MRTKDevTemplate/Assets/Scenes/DirectionalIndicatorExample.unity index 47edc2531..68524f971 100644 --- a/UnityProjects/MRTKDevTemplate/Assets/Scenes/DirectionalIndicatorExample.unity +++ b/UnityProjects/MRTKDevTemplate/Assets/Scenes/DirectionalIndicatorExample.unity @@ -195,7 +195,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3220012215463627515, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} propertyPath: m_RootOrder - value: 2 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3220012215463627515, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} propertyPath: m_AnchorMax.x @@ -339,13 +339,11 @@ MonoBehaviour: m_EditorClassIdentifier: m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 1 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -378,42 +376,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_OnLastHoverExited: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_OnHoverEntered: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnHoverExited: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectEntered: - m_PersistentCalls: - m_Calls: [] - m_OnSelectExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -528,6 +511,7 @@ MonoBehaviour: hostTransform: {fileID: 1203713056} allowedManipulations: 7 allowedInteractionTypes: -2147483641 + rigidbodyMovementType: 0 applyTorque: 1 springForceSoftness: 0.1 springTorqueSoftness: 0.1 @@ -550,8 +534,7 @@ MonoBehaviour: moveLogicType: reference: MixedReality.Toolkit.SpatialManipulation.MoveLogic, MixedReality.Toolkit.SpatialManipulation rotateLogicType: - reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, - MixedReality.Toolkit.SpatialManipulation + reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, MixedReality.Toolkit.SpatialManipulation scaleLogicType: reference: MixedReality.Toolkit.SpatialManipulation.ScaleLogic, MixedReality.Toolkit.SpatialManipulation --- !u!65 &551354405 @@ -698,6 +681,67 @@ MeshCollider: m_Convex: 1 m_CookingOptions: 30 m_Mesh: {fileID: -1636560234873357706, guid: 3ceb984318b1e34419d826d447ca4eec, type: 3} +--- !u!1001 &1109593206 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720334, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_Name + value: MRTK XR Rig + objectReference: {fileID: 0} + - target: {fileID: 8479077998186684813, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} --- !u!1 &1162267363 stripped GameObject: m_CorrespondingSourceObject: {fileID: 100004, guid: 6ceef383a3dfd0a4e9c38b8d793170e4, type: 3} @@ -831,63 +875,6 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} ---- !u!1001 &1530487694 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720334, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_Name - value: MRTK XR Rig - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} --- !u!1001 &1544634037 PrefabInstance: m_ObjectHideFlags: 0 @@ -1058,7 +1045,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 400000, guid: 6988e14e52783e347b09ecad4bed776f, type: 3} propertyPath: m_RootOrder - value: 3 + value: 2 objectReference: {fileID: 0} - target: {fileID: 400000, guid: 6988e14e52783e347b09ecad4bed776f, type: 3} propertyPath: m_LocalScale.x @@ -1363,13 +1350,11 @@ MonoBehaviour: m_EditorClassIdentifier: m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 1 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -1426,42 +1411,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_OnLastHoverExited: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_OnHoverEntered: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnHoverExited: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectEntered: - m_PersistentCalls: - m_Calls: [] - m_OnSelectExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -1676,6 +1646,7 @@ MonoBehaviour: hostTransform: {fileID: 2059194504} allowedManipulations: 7 allowedInteractionTypes: -2147483641 + rigidbodyMovementType: 0 applyTorque: 1 springForceSoftness: 0.1 springTorqueSoftness: 0.1 @@ -1698,8 +1669,7 @@ MonoBehaviour: moveLogicType: reference: MixedReality.Toolkit.SpatialManipulation.MoveLogic, MixedReality.Toolkit.SpatialManipulation rotateLogicType: - reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, - MixedReality.Toolkit.SpatialManipulation + reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, MixedReality.Toolkit.SpatialManipulation scaleLogicType: reference: MixedReality.Toolkit.SpatialManipulation.ScaleLogic, MixedReality.Toolkit.SpatialManipulation --- !u!114 &809220060255365106 @@ -1733,7 +1703,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 400002, guid: 6ceef383a3dfd0a4e9c38b8d793170e4, type: 3} propertyPath: m_RootOrder - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 400002, guid: 6ceef383a3dfd0a4e9c38b8d793170e4, type: 3} propertyPath: m_LocalScale.x diff --git a/UnityProjects/MRTKDevTemplate/Assets/Scenes/DisableInteractorsExample.unity b/UnityProjects/MRTKDevTemplate/Assets/Scenes/DisableInteractorsExample.unity index 1559cf14b..6546e86f5 100644 --- a/UnityProjects/MRTKDevTemplate/Assets/Scenes/DisableInteractorsExample.unity +++ b/UnityProjects/MRTKDevTemplate/Assets/Scenes/DisableInteractorsExample.unity @@ -252,13 +252,11 @@ MonoBehaviour: m_EditorClassIdentifier: m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 1 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -339,42 +337,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnHoverExited: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectEntered: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectExited: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectCanceled: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -585,6 +568,7 @@ MonoBehaviour: hostTransform: {fileID: 41639239} allowedManipulations: 7 allowedInteractionTypes: -2147483641 + rigidbodyMovementType: 0 applyTorque: 1 springForceSoftness: 0.1 springTorqueSoftness: 0.1 @@ -607,8 +591,7 @@ MonoBehaviour: moveLogicType: reference: MixedReality.Toolkit.SpatialManipulation.MoveLogic, MixedReality.Toolkit.SpatialManipulation rotateLogicType: - reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, - MixedReality.Toolkit.SpatialManipulation + reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, MixedReality.Toolkit.SpatialManipulation scaleLogicType: reference: MixedReality.Toolkit.SpatialManipulation.ScaleLogic, MixedReality.Toolkit.SpatialManipulation --- !u!114 &41639244 @@ -920,8 +903,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: k__BackingField.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: MixedReality.Toolkit.Examples.InteractorBehaviorControls, - Assembly-CSharp + value: MixedReality.Toolkit.Examples.InteractorBehaviorControls, Assembly-CSharp objectReference: {fileID: 0} - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: k__BackingField.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName @@ -1178,17 +1160,6 @@ AudioSource: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 ---- !u!114 &155054521 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 8988800969130450167, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - m_PrefabInstance: {fileID: 1530487694} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e85416945309f8244a5715a2ec5c254f, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1001 &199029538 PrefabInstance: m_ObjectHideFlags: 0 @@ -1633,13 +1604,11 @@ MonoBehaviour: m_EditorClassIdentifier: m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 1 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -1696,42 +1665,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnHoverExited: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectEntered: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectExited: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectCanceled: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -1946,6 +1900,7 @@ MonoBehaviour: hostTransform: {fileID: 216599392} allowedManipulations: 7 allowedInteractionTypes: -2147483641 + rigidbodyMovementType: 0 applyTorque: 1 springForceSoftness: 0.1 springTorqueSoftness: 0.1 @@ -1968,8 +1923,7 @@ MonoBehaviour: moveLogicType: reference: MixedReality.Toolkit.SpatialManipulation.MoveLogic, MixedReality.Toolkit.SpatialManipulation rotateLogicType: - reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, - MixedReality.Toolkit.SpatialManipulation + reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, MixedReality.Toolkit.SpatialManipulation scaleLogicType: reference: MixedReality.Toolkit.SpatialManipulation.ScaleLogic, MixedReality.Toolkit.SpatialManipulation --- !u!114 &216599400 @@ -2145,28 +2099,6 @@ Transform: m_Father: {fileID: 1203713056} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 45, z: 0} ---- !u!114 &353077557 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 5870931076040997456, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - m_PrefabInstance: {fileID: 1530487694} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 99aa5862f175caa4991960caf87f88aa, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &369830089 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 5727148872130156898, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - m_PrefabInstance: {fileID: 1530487694} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 99aa5862f175caa4991960caf87f88aa, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1001 &393493389 PrefabInstance: m_ObjectHideFlags: 0 @@ -3034,13 +2966,11 @@ MonoBehaviour: m_EditorClassIdentifier: m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 1 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -3097,42 +3027,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnHoverExited: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectEntered: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectExited: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectCanceled: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -3247,6 +3162,7 @@ MonoBehaviour: hostTransform: {fileID: 436788245} allowedManipulations: 7 allowedInteractionTypes: -2147483641 + rigidbodyMovementType: 0 applyTorque: 1 springForceSoftness: 0.1 springTorqueSoftness: 0.1 @@ -3269,8 +3185,7 @@ MonoBehaviour: moveLogicType: reference: MixedReality.Toolkit.SpatialManipulation.MoveLogic, MixedReality.Toolkit.SpatialManipulation rotateLogicType: - reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, - MixedReality.Toolkit.SpatialManipulation + reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, MixedReality.Toolkit.SpatialManipulation scaleLogicType: reference: MixedReality.Toolkit.SpatialManipulation.ScaleLogic, MixedReality.Toolkit.SpatialManipulation --- !u!82 &436788261 @@ -3527,13 +3442,11 @@ MonoBehaviour: m_EditorClassIdentifier: m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 1 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -3614,42 +3527,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_Deactivated: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectEntered: - m_PersistentCalls: - m_Calls: [] - m_OnSelectExited: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectCanceled: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -3860,6 +3758,7 @@ MonoBehaviour: hostTransform: {fileID: 497739112} allowedManipulations: 7 allowedInteractionTypes: -2147483641 + rigidbodyMovementType: 0 applyTorque: 1 springForceSoftness: 0.1 springTorqueSoftness: 0.1 @@ -3882,8 +3781,7 @@ MonoBehaviour: moveLogicType: reference: MixedReality.Toolkit.SpatialManipulation.MoveLogic, MixedReality.Toolkit.SpatialManipulation rotateLogicType: - reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, - MixedReality.Toolkit.SpatialManipulation + reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, MixedReality.Toolkit.SpatialManipulation scaleLogicType: reference: MixedReality.Toolkit.SpatialManipulation.ScaleLogic, MixedReality.Toolkit.SpatialManipulation --- !u!114 &497739117 @@ -4397,8 +4295,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: k__BackingField.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: MixedReality.Toolkit.Examples.InteractorBehaviorControls, - Assembly-CSharp + value: MixedReality.Toolkit.Examples.InteractorBehaviorControls, Assembly-CSharp objectReference: {fileID: 0} - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: k__BackingField.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName @@ -4746,8 +4643,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: k__BackingField.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: MixedReality.Toolkit.Examples.InteractorBehaviorControls, - Assembly-CSharp + value: MixedReality.Toolkit.Examples.InteractorBehaviorControls, Assembly-CSharp objectReference: {fileID: 0} - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: k__BackingField.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName @@ -5797,13 +5693,11 @@ MonoBehaviour: m_EditorClassIdentifier: m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 1 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -5884,42 +5778,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnHoverEntered: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_OnHoverExited: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectEntered: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectExited: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -6082,6 +5961,7 @@ MonoBehaviour: hostTransform: {fileID: 891822454} allowedManipulations: -1 allowedInteractionTypes: -1 + rigidbodyMovementType: 0 applyTorque: 1 springForceSoftness: 0.1 springTorqueSoftness: 0.1 @@ -6104,8 +5984,7 @@ MonoBehaviour: moveLogicType: reference: MixedReality.Toolkit.SpatialManipulation.MoveLogic, MixedReality.Toolkit.SpatialManipulation rotateLogicType: - reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, - MixedReality.Toolkit.SpatialManipulation + reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, MixedReality.Toolkit.SpatialManipulation scaleLogicType: reference: MixedReality.Toolkit.SpatialManipulation.ScaleLogic, MixedReality.Toolkit.SpatialManipulation --- !u!95 &891822464 @@ -6427,13 +6306,11 @@ MonoBehaviour: m_EditorClassIdentifier: m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 1 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -6466,42 +6343,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnHoverExited: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectEntered: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectExited: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectCanceled: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -6616,6 +6478,7 @@ MonoBehaviour: hostTransform: {fileID: 1203713056} allowedManipulations: 7 allowedInteractionTypes: -2147483641 + rigidbodyMovementType: 0 applyTorque: 1 springForceSoftness: 0.1 springTorqueSoftness: 0.1 @@ -6638,8 +6501,7 @@ MonoBehaviour: moveLogicType: reference: MixedReality.Toolkit.SpatialManipulation.MoveLogic, MixedReality.Toolkit.SpatialManipulation rotateLogicType: - reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, - MixedReality.Toolkit.SpatialManipulation + reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, MixedReality.Toolkit.SpatialManipulation scaleLogicType: reference: MixedReality.Toolkit.SpatialManipulation.ScaleLogic, MixedReality.Toolkit.SpatialManipulation --- !u!114 &958324216 @@ -8379,6 +8241,166 @@ AudioSource: m_CorrespondingSourceObject: {fileID: 303053968431071717, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} m_PrefabInstance: {fileID: 1026994552} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1080649295 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720334, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_Name + value: MRTK XR Rig + objectReference: {fileID: 0} + - target: {fileID: 8479077998186684813, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} +--- !u!114 &1080649296 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 529201713281613631, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + m_PrefabInstance: {fileID: 1080649295} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1175590bcfccd6d44a4c8f9a15292536, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &1080649297 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 7294214613729321936, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + m_PrefabInstance: {fileID: 1080649295} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 99aa5862f175caa4991960caf87f88aa, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &1080649298 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 5769779418973319051, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + m_PrefabInstance: {fileID: 1080649295} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 99aa5862f175caa4991960caf87f88aa, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &1080649299 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 6737912048308794102, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + m_PrefabInstance: {fileID: 1080649295} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 791c89e58d8ff384f8b341768a70fd77, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &1080649300 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 7541771307181555373, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + m_PrefabInstance: {fileID: 1080649295} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 791c89e58d8ff384f8b341768a70fd77, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &1080649301 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 6268457481263998533, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + m_PrefabInstance: {fileID: 1080649295} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e85416945309f8244a5715a2ec5c254f, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &1080649302 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 7193962308655016478, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + m_PrefabInstance: {fileID: 1080649295} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e85416945309f8244a5715a2ec5c254f, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &1080649303 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 800708247703322884, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + m_PrefabInstance: {fileID: 1080649295} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 83e4e6cca11330d4088d729ab4fc9d9f, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &1080649304 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 1074856417076994649, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + m_PrefabInstance: {fileID: 1080649295} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d3536f62630b2574398eeabe8558df62, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &1096915128 PrefabInstance: m_ObjectHideFlags: 0 @@ -8498,13 +8520,11 @@ MonoBehaviour: m_EditorClassIdentifier: m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 0 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -8537,42 +8557,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnHoverEntered: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_OnHoverExited: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectEntered: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectExited: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -9105,13 +9110,11 @@ MonoBehaviour: m_EditorClassIdentifier: m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 1 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -9192,42 +9195,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_OnHoverEntered: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_OnHoverExited: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectEntered: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -9390,6 +9378,7 @@ MonoBehaviour: hostTransform: {fileID: 1101161345} allowedManipulations: 7 allowedInteractionTypes: -2147483641 + rigidbodyMovementType: 0 applyTorque: 1 springForceSoftness: 0.1 springTorqueSoftness: 0.1 @@ -9412,8 +9401,7 @@ MonoBehaviour: moveLogicType: reference: MixedReality.Toolkit.SpatialManipulation.MoveLogic, MixedReality.Toolkit.SpatialManipulation rotateLogicType: - reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, - MixedReality.Toolkit.SpatialManipulation + reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, MixedReality.Toolkit.SpatialManipulation scaleLogicType: reference: MixedReality.Toolkit.SpatialManipulation.ScaleLogic, MixedReality.Toolkit.SpatialManipulation --- !u!114 &1101161353 @@ -11155,17 +11143,6 @@ AudioSource: m_CorrespondingSourceObject: {fileID: 4061946723569116281, guid: 32fa8a656cfcde24da6a4ec1fdc0bdef, type: 3} m_PrefabInstance: {fileID: 1382996322} m_PrefabAsset: {fileID: 0} ---- !u!114 &1412555925 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 5241231772802432720, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - m_PrefabInstance: {fileID: 1530487694} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d3536f62630b2574398eeabe8558df62, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!82 &1456919983 stripped AudioSource: m_CorrespondingSourceObject: {fileID: 8376646494505211228, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -11207,17 +11184,6 @@ Transform: m_Father: {fileID: 1203713056} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1477205579 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 7620691388890360694, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - m_PrefabInstance: {fileID: 1530487694} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 791c89e58d8ff384f8b341768a70fd77, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &1501100350 GameObject: m_ObjectHideFlags: 0 @@ -11374,105 +11340,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1501100350} m_CullTransparentMesh: 1 ---- !u!1001 &1530487694 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_RootOrder - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720334, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_Name - value: MRTK XR Rig - objectReference: {fileID: 0} - - target: {fileID: 5241231772802432720, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: prioritizedInteractionModes.Array.size - value: 7 - objectReference: {fileID: 0} - - target: {fileID: 5241231772802432720, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: prioritizedInteractionModes.Array.data[7].modeName - value: AlwaysOff - objectReference: {fileID: 0} - - target: {fileID: 5241231772802432720, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: prioritizedInteractionModes.Array.data[7].associatedTypes.Array.size - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5241231772802432720, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: prioritizedInteractionModes.Array.data[7].associatedTypes.Array.data[0].reference - value: MixedReality.Toolkit.UX.CanvasProxyInteractor, MixedReality.Toolkit.UXCore - objectReference: {fileID: 0} - - target: {fileID: 8479077998186684813, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} ---- !u!114 &1530487695 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 5569439093497552269, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - m_PrefabInstance: {fileID: 1530487694} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 83e4e6cca11330d4088d729ab4fc9d9f, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &1548884023 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 8629307323091863620, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - m_PrefabInstance: {fileID: 1530487694} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 791c89e58d8ff384f8b341768a70fd77, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &1551252956 GameObject: m_ObjectHideFlags: 0 @@ -11693,8 +11560,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: k__BackingField.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: MixedReality.Toolkit.Examples.InteractorBehaviorControls, - Assembly-CSharp + value: MixedReality.Toolkit.Examples.InteractorBehaviorControls, Assembly-CSharp objectReference: {fileID: 0} - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: k__BackingField.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName @@ -12079,8 +11945,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: k__BackingField.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: MixedReality.Toolkit.Examples.InteractorBehaviorControls, - Assembly-CSharp + value: MixedReality.Toolkit.Examples.InteractorBehaviorControls, Assembly-CSharp objectReference: {fileID: 0} - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: k__BackingField.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName @@ -12339,13 +12204,11 @@ MonoBehaviour: m_EditorClassIdentifier: m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 1 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -12426,42 +12289,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_OnLastHoverExited: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnHoverEntered: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectEntered: - m_PersistentCalls: - m_Calls: [] - m_OnSelectExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -12672,6 +12520,7 @@ MonoBehaviour: hostTransform: {fileID: 1799479904} allowedManipulations: 7 allowedInteractionTypes: -2147483641 + rigidbodyMovementType: 0 applyTorque: 1 springForceSoftness: 0.1 springTorqueSoftness: 0.1 @@ -12694,8 +12543,7 @@ MonoBehaviour: moveLogicType: reference: MixedReality.Toolkit.SpatialManipulation.MoveLogic, MixedReality.Toolkit.SpatialManipulation rotateLogicType: - reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, - MixedReality.Toolkit.SpatialManipulation + reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, MixedReality.Toolkit.SpatialManipulation scaleLogicType: reference: MixedReality.Toolkit.SpatialManipulation.ScaleLogic, MixedReality.Toolkit.SpatialManipulation --- !u!114 &1799479909 @@ -13102,17 +12950,6 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!114 &1825836323 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 7115113329451106245, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - m_PrefabInstance: {fileID: 1530487694} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e85416945309f8244a5715a2ec5c254f, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1001 &1829973569 PrefabInstance: m_ObjectHideFlags: 0 @@ -14093,13 +13930,11 @@ MonoBehaviour: m_EditorClassIdentifier: m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 0 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -14132,42 +13967,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnHoverEntered: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_OnHoverExited: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectEntered: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectExited: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -14555,13 +14375,11 @@ MonoBehaviour: m_EditorClassIdentifier: m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 1 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -14642,42 +14460,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_OnHoverEntered: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_OnHoverExited: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectEntered: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -14888,6 +14691,7 @@ MonoBehaviour: hostTransform: {fileID: 1983413294} allowedManipulations: 7 allowedInteractionTypes: -2147483641 + rigidbodyMovementType: 0 applyTorque: 1 springForceSoftness: 0.1 springTorqueSoftness: 0.1 @@ -14910,8 +14714,7 @@ MonoBehaviour: moveLogicType: reference: MixedReality.Toolkit.SpatialManipulation.MoveLogic, MixedReality.Toolkit.SpatialManipulation rotateLogicType: - reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, - MixedReality.Toolkit.SpatialManipulation + reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, MixedReality.Toolkit.SpatialManipulation scaleLogicType: reference: MixedReality.Toolkit.SpatialManipulation.ScaleLogic, MixedReality.Toolkit.SpatialManipulation --- !u!114 &1983413299 @@ -15249,13 +15052,11 @@ MonoBehaviour: m_EditorClassIdentifier: m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 0 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -15288,42 +15089,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnHoverEntered: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_OnHoverExited: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectEntered: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectExited: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -15713,8 +15499,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: - m_Target: {fileID: 2011699559} - m_TargetAssemblyTypeName: MixedReality.Toolkit.UX.ToggleCollection, - MixedReality.Toolkit.UXCore + m_TargetAssemblyTypeName: MixedReality.Toolkit.UX.ToggleCollection, MixedReality.Toolkit.UXCore m_MethodName: set_CurrentIndex m_Mode: 3 m_Arguments: @@ -15737,17 +15522,6 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 ---- !u!114 &2017196369 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 4102833070697430761, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - m_PrefabInstance: {fileID: 1530487694} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1175590bcfccd6d44a4c8f9a15292536, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1001 &2076624898 PrefabInstance: m_ObjectHideFlags: 0 @@ -15868,8 +15642,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: k__BackingField.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: MixedReality.Toolkit.Examples.InteractorBehaviorControls, - Assembly-CSharp + value: MixedReality.Toolkit.Examples.InteractorBehaviorControls, Assembly-CSharp objectReference: {fileID: 0} - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: k__BackingField.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName @@ -16395,20 +16168,20 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 06ca6b0ace50ad249b68cfe603aef0d6, type: 3} m_Name: m_EditorClassIdentifier: - interactionModeManager: {fileID: 1412555925} - interactionManager: {fileID: 1530487695} + interactionModeManager: {fileID: 1080649304} + interactionManager: {fileID: 1080649303} handRaysInteractors: - - {fileID: 155054521} - - {fileID: 1825836323} + - {fileID: 1080649302} + - {fileID: 1080649301} controllerRayInteractors: [] grabInteractors: - - {fileID: 1548884023} - - {fileID: 1477205579} + - {fileID: 1080649300} + - {fileID: 1080649299} pokeInteractors: - - {fileID: 369830089} - - {fileID: 353077557} + - {fileID: 1080649298} + - {fileID: 1080649297} gazePinchInteractors: [] - gazeInteractor: {fileID: 2017196369} + gazeInteractor: {fileID: 1080649296} --- !u!1001 &5905304273903168958 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/UnityProjects/MRTKDevTemplate/Assets/Scenes/DwellExample.unity b/UnityProjects/MRTKDevTemplate/Assets/Scenes/DwellExample.unity index 6431fbd2d..403a4d1bc 100644 --- a/UnityProjects/MRTKDevTemplate/Assets/Scenes/DwellExample.unity +++ b/UnityProjects/MRTKDevTemplate/Assets/Scenes/DwellExample.unity @@ -377,6 +377,67 @@ AudioSource: m_CorrespondingSourceObject: {fileID: 2783974331088143781, guid: c25d8f2d22117bd40ad824684551fbde, type: 3} m_PrefabInstance: {fileID: 14822139} m_PrefabAsset: {fileID: 0} +--- !u!1001 &112344674 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720334, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_Name + value: MRTK XR Rig + objectReference: {fileID: 0} + - target: {fileID: 8479077998186684813, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} --- !u!1001 &813304976 PrefabInstance: m_ObjectHideFlags: 0 @@ -476,15 +537,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d9ad66e7cc9a2754d8ea989740c9f00d, type: 3} m_Name: m_EditorClassIdentifier: - m_InteractionManager: {fileID: 1537567897} + m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 1 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -517,42 +576,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_OnHoverEntered: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_OnHoverExited: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectEntered: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -667,6 +711,7 @@ MonoBehaviour: hostTransform: {fileID: 1136070305} allowedManipulations: 7 allowedInteractionTypes: -2147483641 + rigidbodyMovementType: 0 applyTorque: 1 springForceSoftness: 0.1 springTorqueSoftness: 0.1 @@ -689,8 +734,7 @@ MonoBehaviour: moveLogicType: reference: MixedReality.Toolkit.SpatialManipulation.MoveLogic, MixedReality.Toolkit.SpatialManipulation rotateLogicType: - reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, - MixedReality.Toolkit.SpatialManipulation + reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, MixedReality.Toolkit.SpatialManipulation scaleLogicType: reference: MixedReality.Toolkit.SpatialManipulation.ScaleLogic, MixedReality.Toolkit.SpatialManipulation --- !u!114 &813304979 @@ -1221,74 +1265,6 @@ AudioSource: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 ---- !u!1001 &1537567896 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720334, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_Name - value: MRTK XR Rig - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} ---- !u!114 &1537567897 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 5569439093497552269, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - m_PrefabInstance: {fileID: 1537567896} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 83e4e6cca11330d4088d729ab4fc9d9f, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1001 &1985204942 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/UnityProjects/MRTKDevTemplate/Assets/Scenes/EmptyScene/SampleEmptyMRTKScene.unity b/UnityProjects/MRTKDevTemplate/Assets/Scenes/EmptyScene/SampleEmptyMRTKScene.unity index ee000b5ab..1f9352d46 100644 --- a/UnityProjects/MRTKDevTemplate/Assets/Scenes/EmptyScene/SampleEmptyMRTKScene.unity +++ b/UnityProjects/MRTKDevTemplate/Assets/Scenes/EmptyScene/SampleEmptyMRTKScene.unity @@ -123,63 +123,6 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!1001 &525252187 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720334, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_Name - value: MRTK XR Rig - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} --- !u!1001 &640980041 PrefabInstance: m_ObjectHideFlags: 0 @@ -298,10 +241,72 @@ 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 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} +--- !u!1001 &1235912133 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720334, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_Name + value: MRTK XR Rig + objectReference: {fileID: 0} + - target: {fileID: 8479077998186684813, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} --- !u!1001 &1789277895 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/UnityProjects/MRTKDevTemplate/Assets/Scenes/Experimental/CanvasExampleSimpleActionButton.unity b/UnityProjects/MRTKDevTemplate/Assets/Scenes/Experimental/CanvasExampleSimpleActionButton.unity index 9afb3c379..b1abe9869 100644 --- a/UnityProjects/MRTKDevTemplate/Assets/Scenes/Experimental/CanvasExampleSimpleActionButton.unity +++ b/UnityProjects/MRTKDevTemplate/Assets/Scenes/Experimental/CanvasExampleSimpleActionButton.unity @@ -1211,7 +1211,7 @@ Canvas: m_Enabled: 1 serializedVersion: 3 m_RenderMode: 2 - m_Camera: {fileID: 619048528} + m_Camera: {fileID: 0} m_PlaneDistance: 100 m_PixelPerfect: 0 m_ReceivesEvents: 1 @@ -1244,67 +1244,6 @@ RectTransform: m_AnchoredPosition: {x: -0.091, y: 1.473} m_SizeDelta: {x: 480.5, y: 427.3138} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1001 &525252187 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_RootOrder - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720334, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_Name - value: MRTK XR Rig - objectReference: {fileID: 0} - - target: {fileID: 8479077998186684813, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} --- !u!1001 &586436635 PrefabInstance: m_ObjectHideFlags: 0 @@ -1427,11 +1366,6 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 2211332204183893664, guid: a2b07dcaa4b2f8e4fa68b319f1477f4c, type: 3} m_PrefabInstance: {fileID: 586436635} m_PrefabAsset: {fileID: 0} ---- !u!20 &619048528 stripped -Camera: - m_CorrespondingSourceObject: {fileID: 2351505566771328527, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - m_PrefabInstance: {fileID: 525252187} - m_PrefabAsset: {fileID: 0} --- !u!1 &682241248 GameObject: m_ObjectHideFlags: 0 @@ -1483,7 +1417,7 @@ Canvas: m_Enabled: 1 serializedVersion: 3 m_RenderMode: 2 - m_Camera: {fileID: 619048528} + m_Camera: {fileID: 0} m_PlaneDistance: 100 m_PixelPerfect: 0 m_ReceivesEvents: 1 @@ -2190,27 +2124,6 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 2211332204183893664, guid: a2b07dcaa4b2f8e4fa68b319f1477f4c, type: 3} m_PrefabInstance: {fileID: 1007873215} m_PrefabAsset: {fileID: 0} ---- !u!1 &1014540484 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 2351505566771328562, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - m_PrefabInstance: {fileID: 525252187} - m_PrefabAsset: {fileID: 0} ---- !u!114 &1014540488 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1014540484} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c49b4cc203aa6414fae5c798d1d0e7d6, type: 3} - m_Name: - m_EditorClassIdentifier: - m_EventMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_MaxRayIntersections: 0 --- !u!1 &1058175708 GameObject: m_ObjectHideFlags: 0 @@ -3531,6 +3444,67 @@ MonoBehaviour: m_ChildScaleWidth: 1 m_ChildScaleHeight: 0 m_ReverseArrangement: 0 +--- !u!1001 &1968346242 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720334, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_Name + value: MRTK XR Rig + objectReference: {fileID: 0} + - target: {fileID: 8479077998186684813, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} --- !u!1001 &1979019953 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/UnityProjects/MRTKDevTemplate/Assets/Scenes/Experimental/NonNativeKeyboard.unity b/UnityProjects/MRTKDevTemplate/Assets/Scenes/Experimental/NonNativeKeyboard.unity index 9b487cf51..e3b44172b 100644 --- a/UnityProjects/MRTKDevTemplate/Assets/Scenes/Experimental/NonNativeKeyboard.unity +++ b/UnityProjects/MRTKDevTemplate/Assets/Scenes/Experimental/NonNativeKeyboard.unity @@ -534,7 +534,7 @@ PrefabInstance: - target: {fileID: 22335612, guid: 74b589d1efab94a4cb70e4b5c22783f8, type: 3} propertyPath: m_Camera value: - objectReference: {fileID: 713136850} + objectReference: {fileID: 0} - target: {fileID: 22451778, guid: 74b589d1efab94a4cb70e4b5c22783f8, type: 3} propertyPath: m_LocalScale.x value: 18000 @@ -994,11 +994,67 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: df4899a7e84d2794a9428337bba8a253, type: 3} ---- !u!20 &713136850 stripped -Camera: - m_CorrespondingSourceObject: {fileID: 2351505566771328527, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - m_PrefabInstance: {fileID: 2063621600} - m_PrefabAsset: {fileID: 0} +--- !u!1001 &994546706 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720334, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_Name + value: MRTK XR Rig + objectReference: {fileID: 0} + - target: {fileID: 8479077998186684813, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} --- !u!224 &1067229166 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 22458684, guid: 74b589d1efab94a4cb70e4b5c22783f8, type: 3} @@ -1266,64 +1322,3 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: field: {fileID: 97959863} ---- !u!1001 &2063621600 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720334, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_Name - value: MRTK XR Rig - objectReference: {fileID: 0} - - target: {fileID: 8479077998186684813, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} diff --git a/UnityProjects/MRTKDevTemplate/Assets/Scenes/Experimental/ScrollingExample.unity b/UnityProjects/MRTKDevTemplate/Assets/Scenes/Experimental/ScrollingExample.unity index f22919078..64eecce9e 100644 --- a/UnityProjects/MRTKDevTemplate/Assets/Scenes/Experimental/ScrollingExample.unity +++ b/UnityProjects/MRTKDevTemplate/Assets/Scenes/Experimental/ScrollingExample.unity @@ -751,17 +751,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} ---- !u!114 &35339495 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 5569439093497552269, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - m_PrefabInstance: {fileID: 525252187} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 83e4e6cca11330d4088d729ab4fc9d9f, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1001 &98293164 PrefabInstance: m_ObjectHideFlags: 0 @@ -6836,6 +6825,7 @@ MonoBehaviour: attachedRectTransform: {fileID: 352806570} padding: {x: 0, y: 0} forceUpdateEveryFrame: 0 + canToggleCollider: 1 --- !u!65 &352806572 BoxCollider: m_ObjectHideFlags: 0 @@ -6899,16 +6889,14 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 176128389fc683e46b4646cf264c5efe, type: 3} m_Name: m_EditorClassIdentifier: - m_InteractionManager: {fileID: 35339495} + m_InteractionManager: {fileID: 0} m_Colliders: - {fileID: 352806572} - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 0 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -6941,42 +6929,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnHoverExited: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectEntered: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectExited: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectCanceled: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -7786,7 +7759,7 @@ Canvas: m_Enabled: 1 serializedVersion: 3 m_RenderMode: 2 - m_Camera: {fileID: 619048528} + m_Camera: {fileID: 0} m_PlaneDistance: 100 m_PixelPerfect: 0 m_ReceivesEvents: 1 @@ -7818,95 +7791,6 @@ RectTransform: m_AnchoredPosition: {x: 0.008, y: -0.015} m_SizeDelta: {x: 285.66977, y: 188.0363} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1001 &525252187 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_RootOrder - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720334, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_Name - value: MRTK XR Rig - objectReference: {fileID: 0} - - target: {fileID: 4010398537980277936, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_Enabled - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4916007892446746270, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_Enabled - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5569439093497552269, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_StartingSelectFilters.Array.size - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5569439093497552269, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_StartingSelectFilters.Array.data[0] - value: - objectReference: {fileID: 0} - - target: {fileID: 5870931076965904817, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7735890427496681069, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8479077998186684813, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8551748678063523509, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} --- !u!1 &554553886 GameObject: m_ObjectHideFlags: 0 @@ -8397,11 +8281,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} ---- !u!20 &619048528 stripped -Camera: - m_CorrespondingSourceObject: {fileID: 2351505566771328527, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - m_PrefabInstance: {fileID: 525252187} - m_PrefabAsset: {fileID: 0} --- !u!224 &641079559 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -8736,6 +8615,7 @@ MonoBehaviour: attachedRectTransform: {fileID: 688579849} padding: {x: 0, y: 0} forceUpdateEveryFrame: 0 + canToggleCollider: 1 --- !u!65 &688579855 BoxCollider: m_ObjectHideFlags: 0 @@ -8804,16 +8684,14 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 176128389fc683e46b4646cf264c5efe, type: 3} m_Name: m_EditorClassIdentifier: - m_InteractionManager: {fileID: 35339495} + m_InteractionManager: {fileID: 0} m_Colliders: - {fileID: 688579855} - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 0 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -8846,42 +8724,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnHoverEntered: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_OnHoverExited: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectEntered: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectExited: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -9326,15 +9189,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d9ad66e7cc9a2754d8ea989740c9f00d, type: 3} m_Name: m_EditorClassIdentifier: - m_InteractionManager: {fileID: 35339495} + m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 1 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -9367,42 +9228,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnHoverExited: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectEntered: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectExited: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectCanceled: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -9517,6 +9363,7 @@ MonoBehaviour: hostTransform: {fileID: 1263054766} allowedManipulations: 7 allowedInteractionTypes: -2147483641 + rigidbodyMovementType: 0 applyTorque: 1 springForceSoftness: 0.1 springTorqueSoftness: 0.1 @@ -9539,8 +9386,7 @@ MonoBehaviour: moveLogicType: reference: MixedReality.Toolkit.SpatialManipulation.MoveLogic, MixedReality.Toolkit.SpatialManipulation rotateLogicType: - reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, - MixedReality.Toolkit.SpatialManipulation + reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, MixedReality.Toolkit.SpatialManipulation scaleLogicType: reference: MixedReality.Toolkit.SpatialManipulation.ScaleLogic, MixedReality.Toolkit.SpatialManipulation --- !u!114 &731041500 @@ -11355,27 +11201,6 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} m_PrefabInstance: {fileID: 1974997851} m_PrefabAsset: {fileID: 0} ---- !u!1 &1014540484 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 2351505566771328562, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - m_PrefabInstance: {fileID: 525252187} - m_PrefabAsset: {fileID: 0} ---- !u!114 &1014540488 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1014540484} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c49b4cc203aa6414fae5c798d1d0e7d6, type: 3} - m_Name: - m_EditorClassIdentifier: - m_EventMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_MaxRayIntersections: 0 --- !u!1001 &1101345707 PrefabInstance: m_ObjectHideFlags: 0 @@ -14665,6 +14490,67 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} +--- !u!1001 &1714160775 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720334, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_Name + value: MRTK XR Rig + objectReference: {fileID: 0} + - target: {fileID: 8479077998186684813, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} --- !u!1 &1741977896 GameObject: m_ObjectHideFlags: 0 @@ -16056,6 +15942,7 @@ MonoBehaviour: attachedRectTransform: {fileID: 1871826339} padding: {x: 0, y: 0} forceUpdateEveryFrame: 0 + canToggleCollider: 1 --- !u!65 &1871826341 BoxCollider: m_ObjectHideFlags: 0 @@ -16119,16 +16006,14 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 176128389fc683e46b4646cf264c5efe, type: 3} m_Name: m_EditorClassIdentifier: - m_InteractionManager: {fileID: 35339495} + m_InteractionManager: {fileID: 0} m_Colliders: - {fileID: 1871826341} - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 0 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -16161,42 +16046,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_OnLastHoverExited: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnHoverEntered: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectEntered: - m_PersistentCalls: - m_Calls: [] - m_OnSelectExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -21923,7 +21793,7 @@ Canvas: m_Enabled: 1 serializedVersion: 3 m_RenderMode: 2 - m_Camera: {fileID: 619048528} + m_Camera: {fileID: 0} m_PlaneDistance: 100 m_PixelPerfect: 0 m_ReceivesEvents: 1 @@ -22105,7 +21975,7 @@ Canvas: m_Enabled: 1 serializedVersion: 3 m_RenderMode: 2 - m_Camera: {fileID: 619048528} + m_Camera: {fileID: 0} m_PlaneDistance: 100 m_PixelPerfect: 0 m_ReceivesEvents: 1 diff --git a/UnityProjects/MRTKDevTemplate/Assets/Scenes/Experimental/SpatialMouseSample.unity b/UnityProjects/MRTKDevTemplate/Assets/Scenes/Experimental/SpatialMouseSample.unity index 8ad7f3f05..964e48db2 100644 --- a/UnityProjects/MRTKDevTemplate/Assets/Scenes/Experimental/SpatialMouseSample.unity +++ b/UnityProjects/MRTKDevTemplate/Assets/Scenes/Experimental/SpatialMouseSample.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 705507994} - m_IndirectSpecularColor: {r: 0.18028328, g: 0.22571322, b: 0.30692163, a: 1} + m_IndirectSpecularColor: {r: 0.18028378, g: 0.22571412, b: 0.30692285, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -128,6 +128,63 @@ AudioSource: m_CorrespondingSourceObject: {fileID: 1918766681897676798, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} m_PrefabInstance: {fileID: 364946991195464072} m_PrefabAsset: {fileID: 0} +--- !u!1001 &209679828 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1687818733} + m_Modifications: + - target: {fileID: 5604401826787249420, guid: dc525621b8522034e867ed2799129315, type: 3} + propertyPath: m_RootOrder + value: 0 + 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!1001 &235624890 PrefabInstance: m_ObjectHideFlags: 0 @@ -255,13 +312,11 @@ MonoBehaviour: m_EditorClassIdentifier: m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 1 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -294,42 +349,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_OnHoverEntered: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_OnHoverExited: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectEntered: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -594,6 +634,7 @@ MonoBehaviour: hostTransform: {fileID: 235624891} allowedManipulations: 7 allowedInteractionTypes: -2147483641 + rigidbodyMovementType: 0 applyTorque: 1 springForceSoftness: 0.1 springTorqueSoftness: 0.1 @@ -616,8 +657,7 @@ MonoBehaviour: moveLogicType: reference: MixedReality.Toolkit.SpatialManipulation.MoveLogic, MixedReality.Toolkit.SpatialManipulation rotateLogicType: - reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, - MixedReality.Toolkit.SpatialManipulation + reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, MixedReality.Toolkit.SpatialManipulation scaleLogicType: reference: MixedReality.Toolkit.SpatialManipulation.ScaleLogic, MixedReality.Toolkit.SpatialManipulation --- !u!114 &235624896 @@ -668,6 +708,16 @@ MonoBehaviour: translateLerpTime: 0.00001 enableConstraints: 1 constraintsManager: {fileID: 235624896} + manipulationLogicTypes: + moveLogicType: + reference: MixedReality.Toolkit.SpatialManipulation.BoundsControlMoveLogic, + MixedReality.Toolkit.SpatialManipulation + rotateLogicType: + reference: MixedReality.Toolkit.SpatialManipulation.BoundsControlRotateLogic, + MixedReality.Toolkit.SpatialManipulation + scaleLogicType: + reference: MixedReality.Toolkit.SpatialManipulation.BoundsControlScaleLogic, + MixedReality.Toolkit.SpatialManipulation manipulationStarted: m_PersistentCalls: m_Calls: [] @@ -1774,63 +1824,6 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} ---- !u!1001 &733453395 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 1340760100} - 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!4 &735511181 stripped Transform: m_CorrespondingSourceObject: {fileID: 7781529056550460865, guid: c07c4bd04b45c014fad0e3cd30747f06, type: 3} @@ -1937,13 +1930,11 @@ MonoBehaviour: m_EditorClassIdentifier: m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 1 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -1976,42 +1967,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_OnHoverEntered: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_OnHoverExited: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectEntered: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -2126,6 +2102,7 @@ MonoBehaviour: hostTransform: {fileID: 1203713056} allowedManipulations: 7 allowedInteractionTypes: -2147483641 + rigidbodyMovementType: 0 applyTorque: 1 springForceSoftness: 0.1 springTorqueSoftness: 0.1 @@ -2148,8 +2125,7 @@ MonoBehaviour: moveLogicType: reference: MixedReality.Toolkit.SpatialManipulation.MoveLogic, MixedReality.Toolkit.SpatialManipulation rotateLogicType: - reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, - MixedReality.Toolkit.SpatialManipulation + reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, MixedReality.Toolkit.SpatialManipulation scaleLogicType: reference: MixedReality.Toolkit.SpatialManipulation.ScaleLogic, MixedReality.Toolkit.SpatialManipulation --- !u!114 &958324216 @@ -2938,13 +2914,11 @@ MonoBehaviour: m_EditorClassIdentifier: m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 1 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -3025,42 +2999,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnHoverExited: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectEntered: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectExited: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectCanceled: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -3223,6 +3182,7 @@ MonoBehaviour: hostTransform: {fileID: 1232423737} allowedManipulations: 7 allowedInteractionTypes: -2147483641 + rigidbodyMovementType: 0 applyTorque: 1 springForceSoftness: 0.1 springTorqueSoftness: 0.1 @@ -3245,8 +3205,7 @@ MonoBehaviour: moveLogicType: reference: MixedReality.Toolkit.SpatialManipulation.MoveLogic, MixedReality.Toolkit.SpatialManipulation rotateLogicType: - reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, - MixedReality.Toolkit.SpatialManipulation + reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, MixedReality.Toolkit.SpatialManipulation scaleLogicType: reference: MixedReality.Toolkit.SpatialManipulation.ScaleLogic, MixedReality.Toolkit.SpatialManipulation --- !u!114 &1232423741 @@ -3769,11 +3728,6 @@ AudioSource: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 ---- !u!4 &1340760100 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 2351505566903569412, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - m_PrefabInstance: {fileID: 1530487694} - m_PrefabAsset: {fileID: 0} --- !u!1 &1346790086 stripped GameObject: m_CorrespondingSourceObject: {fileID: 7781529056550460866, guid: c07c4bd04b45c014fad0e3cd30747f06, type: 3} @@ -3960,67 +3914,6 @@ MonoBehaviour: stencilWriteMaterial: {fileID: 0} outlineOffset: 0 stencilReference: 1 ---- !u!1001 &1530487694 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_RootOrder - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720334, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_Name - value: MRTK XR Rig - objectReference: {fileID: 0} - - target: {fileID: 8479077998186684813, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} --- !u!1 &1551252956 GameObject: m_ObjectHideFlags: 0 @@ -4229,6 +4122,72 @@ Transform: m_CorrespondingSourceObject: {fileID: 1220126736778559586, guid: 5e1e5c2fb89ded5469dd37ccbed1a896, type: 3} m_PrefabInstance: {fileID: 1669647713} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1687818732 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720334, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_Name + value: MRTK XR Rig + objectReference: {fileID: 0} + - target: {fileID: 8479077998186684813, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} +--- !u!4 &1687818733 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2351505566771328526, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + m_PrefabInstance: {fileID: 1687818732} + m_PrefabAsset: {fileID: 0} --- !u!1 &1708103289 GameObject: m_ObjectHideFlags: 0 @@ -4280,13 +4239,11 @@ MonoBehaviour: m_EditorClassIdentifier: m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 1 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -4367,42 +4324,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_OnHoverEntered: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_OnHoverExited: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectEntered: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -4565,6 +4507,7 @@ MonoBehaviour: hostTransform: {fileID: 1923515645} allowedManipulations: -1 allowedInteractionTypes: -1 + rigidbodyMovementType: 0 applyTorque: 1 springForceSoftness: 0.1 springTorqueSoftness: 0.1 @@ -4587,8 +4530,7 @@ MonoBehaviour: moveLogicType: reference: MixedReality.Toolkit.SpatialManipulation.MoveLogic, MixedReality.Toolkit.SpatialManipulation rotateLogicType: - reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, - MixedReality.Toolkit.SpatialManipulation + reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, MixedReality.Toolkit.SpatialManipulation scaleLogicType: reference: MixedReality.Toolkit.SpatialManipulation.ScaleLogic, MixedReality.Toolkit.SpatialManipulation --- !u!114 &1724991367 diff --git a/UnityProjects/MRTKDevTemplate/Assets/Scenes/Experimental/VirtualizedScrollRectList.unity b/UnityProjects/MRTKDevTemplate/Assets/Scenes/Experimental/VirtualizedScrollRectList.unity index 5cd049194..18bc71f1b 100644 --- a/UnityProjects/MRTKDevTemplate/Assets/Scenes/Experimental/VirtualizedScrollRectList.unity +++ b/UnityProjects/MRTKDevTemplate/Assets/Scenes/Experimental/VirtualizedScrollRectList.unity @@ -128,27 +128,6 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} m_PrefabInstance: {fileID: 785132927} m_PrefabAsset: {fileID: 0} ---- !u!1 &194720982 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 2351505566771328562, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - m_PrefabInstance: {fileID: 2068877531} - m_PrefabAsset: {fileID: 0} ---- !u!114 &194720984 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 194720982} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c49b4cc203aa6414fae5c798d1d0e7d6, type: 3} - m_Name: - m_EditorClassIdentifier: - m_EventMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_MaxRayIntersections: 0 --- !u!1 &225147361 GameObject: m_ObjectHideFlags: 0 @@ -238,6 +217,67 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0fda4953718e0264291c42cb2a637fb5, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1001 &279215078 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720334, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_Name + value: MRTK XR Rig + objectReference: {fileID: 0} + - target: {fileID: 8479077998186684813, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} --- !u!1 &312921293 stripped GameObject: m_CorrespondingSourceObject: {fileID: 6540126486176102408, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} @@ -827,17 +867,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} ---- !u!114 &872156569 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 5569439093497552269, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - m_PrefabInstance: {fileID: 2068877531} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 83e4e6cca11330d4088d729ab4fc9d9f, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1001 &1028759421 PrefabInstance: m_ObjectHideFlags: 0 @@ -1001,15 +1030,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d9ad66e7cc9a2754d8ea989740c9f00d, type: 3} m_Name: m_EditorClassIdentifier: - m_InteractionManager: {fileID: 872156569} + m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 1 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -1042,42 +1069,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_OnLastHoverExited: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_OnHoverEntered: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnHoverExited: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectEntered: - m_PersistentCalls: - m_Calls: [] - m_OnSelectExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -1192,6 +1204,7 @@ MonoBehaviour: hostTransform: {fileID: 1753344512} allowedManipulations: 7 allowedInteractionTypes: -2147483641 + rigidbodyMovementType: 0 applyTorque: 1 springForceSoftness: 0.1 springTorqueSoftness: 0.1 @@ -1214,8 +1227,7 @@ MonoBehaviour: moveLogicType: reference: MixedReality.Toolkit.SpatialManipulation.MoveLogic, MixedReality.Toolkit.SpatialManipulation rotateLogicType: - reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, - MixedReality.Toolkit.SpatialManipulation + reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, MixedReality.Toolkit.SpatialManipulation scaleLogicType: reference: MixedReality.Toolkit.SpatialManipulation.ScaleLogic, MixedReality.Toolkit.SpatialManipulation --- !u!114 &1028759426 @@ -1760,16 +1772,14 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 176128389fc683e46b4646cf264c5efe, type: 3} m_Name: m_EditorClassIdentifier: - m_InteractionManager: {fileID: 872156569} + m_InteractionManager: {fileID: 0} m_Colliders: - {fileID: 1332440645} - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 0 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -1802,42 +1812,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_Deactivated: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnHoverExited: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectEntered: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -1963,6 +1958,7 @@ MonoBehaviour: attachedRectTransform: {fileID: 1332440636} padding: {x: 0, y: 0} forceUpdateEveryFrame: 0 + canToggleCollider: 1 --- !u!65 &1332440645 BoxCollider: m_ObjectHideFlags: 0 @@ -2302,39 +2298,6 @@ BoxCollider: serializedVersion: 2 m_Size: {x: 0.99999994, y: 1, z: 0.099999994} m_Center: {x: 0.000000059604645, y: 0.0000009536743, z: 0.049999997} ---- !u!1001 &2068877531 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720334, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_Name - value: MRTK XR Rig - objectReference: {fileID: 0} - - target: {fileID: 8479077998186684813, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} --- !u!1001 &2107570178 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/UnityProjects/MRTKDevTemplate/Assets/Scenes/EyeGazeExample.unity b/UnityProjects/MRTKDevTemplate/Assets/Scenes/EyeGazeExample.unity index f37674338..76ab99c72 100644 --- a/UnityProjects/MRTKDevTemplate/Assets/Scenes/EyeGazeExample.unity +++ b/UnityProjects/MRTKDevTemplate/Assets/Scenes/EyeGazeExample.unity @@ -188,9 +188,6 @@ MonoBehaviour: m_EditorClassIdentifier: m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 @@ -249,33 +246,6 @@ MonoBehaviour: m_StartingHoverFilters: [] m_StartingSelectFilters: [] m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectEntered: - m_PersistentCalls: - m_Calls: [] - m_OnSelectExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: - m_PersistentCalls: - m_Calls: [] - m_OnDeactivate: - m_PersistentCalls: - m_Calls: [] isGazePinchSelected: active: 0 onEntered: @@ -537,6 +507,67 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07c4bd04b45c014fad0e3cd30747f06, type: 3} +--- !u!1001 &86719969 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720334, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_Name + value: MRTK XR Rig + objectReference: {fileID: 0} + - target: {fileID: 8479077998186684813, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} --- !u!1 &88945691 GameObject: m_ObjectHideFlags: 0 @@ -603,9 +634,6 @@ MonoBehaviour: m_EditorClassIdentifier: m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 @@ -664,33 +692,6 @@ MonoBehaviour: m_StartingHoverFilters: [] m_StartingSelectFilters: [] m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectEntered: - m_PersistentCalls: - m_Calls: [] - m_OnSelectExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: - m_PersistentCalls: - m_Calls: [] - m_OnDeactivate: - m_PersistentCalls: - m_Calls: [] isGazePinchSelected: active: 0 onEntered: @@ -957,9 +958,6 @@ MonoBehaviour: m_EditorClassIdentifier: m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 @@ -1018,33 +1016,6 @@ MonoBehaviour: m_StartingHoverFilters: [] m_StartingSelectFilters: [] m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectEntered: - m_PersistentCalls: - m_Calls: [] - m_OnSelectExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: - m_PersistentCalls: - m_Calls: [] - m_OnDeactivate: - m_PersistentCalls: - m_Calls: [] isGazePinchSelected: active: 0 onEntered: @@ -1311,9 +1282,6 @@ MonoBehaviour: m_EditorClassIdentifier: m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 @@ -1372,33 +1340,6 @@ MonoBehaviour: m_StartingHoverFilters: [] m_StartingSelectFilters: [] m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectEntered: - m_PersistentCalls: - m_Calls: [] - m_OnSelectExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: - m_PersistentCalls: - m_Calls: [] - m_OnDeactivate: - m_PersistentCalls: - m_Calls: [] isGazePinchSelected: active: 0 onEntered: @@ -1665,9 +1606,6 @@ MonoBehaviour: m_EditorClassIdentifier: m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 @@ -1726,33 +1664,6 @@ MonoBehaviour: m_StartingHoverFilters: [] m_StartingSelectFilters: [] m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectEntered: - m_PersistentCalls: - m_Calls: [] - m_OnSelectExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: - m_PersistentCalls: - m_Calls: [] - m_OnDeactivate: - m_PersistentCalls: - m_Calls: [] isGazePinchSelected: active: 0 onEntered: @@ -2131,9 +2042,6 @@ MonoBehaviour: m_EditorClassIdentifier: m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 @@ -2192,33 +2100,6 @@ MonoBehaviour: m_StartingHoverFilters: [] m_StartingSelectFilters: [] m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectEntered: - m_PersistentCalls: - m_Calls: [] - m_OnSelectExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: - m_PersistentCalls: - m_Calls: [] - m_OnDeactivate: - m_PersistentCalls: - m_Calls: [] isGazePinchSelected: active: 0 onEntered: @@ -2513,9 +2394,6 @@ MonoBehaviour: m_EditorClassIdentifier: m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 @@ -2574,33 +2452,6 @@ MonoBehaviour: m_StartingHoverFilters: [] m_StartingSelectFilters: [] m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectEntered: - m_PersistentCalls: - m_Calls: [] - m_OnSelectExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: - m_PersistentCalls: - m_Calls: [] - m_OnDeactivate: - m_PersistentCalls: - m_Calls: [] isGazePinchSelected: active: 0 onEntered: @@ -3029,9 +2880,6 @@ MonoBehaviour: m_EditorClassIdentifier: m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 @@ -3090,33 +2938,6 @@ MonoBehaviour: m_StartingHoverFilters: [] m_StartingSelectFilters: [] m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectEntered: - m_PersistentCalls: - m_Calls: [] - m_OnSelectExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: - m_PersistentCalls: - m_Calls: [] - m_OnDeactivate: - m_PersistentCalls: - m_Calls: [] isGazePinchSelected: active: 0 onEntered: @@ -3447,9 +3268,6 @@ MonoBehaviour: m_EditorClassIdentifier: m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 @@ -3508,33 +3326,6 @@ MonoBehaviour: m_StartingHoverFilters: [] m_StartingSelectFilters: [] m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectEntered: - m_PersistentCalls: - m_Calls: [] - m_OnSelectExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: - m_PersistentCalls: - m_Calls: [] - m_OnDeactivate: - m_PersistentCalls: - m_Calls: [] isGazePinchSelected: active: 0 onEntered: @@ -4005,9 +3796,6 @@ MonoBehaviour: m_EditorClassIdentifier: m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 @@ -4066,33 +3854,6 @@ MonoBehaviour: m_StartingHoverFilters: [] m_StartingSelectFilters: [] m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectEntered: - m_PersistentCalls: - m_Calls: [] - m_OnSelectExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: - m_PersistentCalls: - m_Calls: [] - m_OnDeactivate: - m_PersistentCalls: - m_Calls: [] isGazePinchSelected: active: 0 onEntered: @@ -4359,9 +4120,6 @@ MonoBehaviour: m_EditorClassIdentifier: m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 @@ -4420,33 +4178,6 @@ MonoBehaviour: m_StartingHoverFilters: [] m_StartingSelectFilters: [] m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectEntered: - m_PersistentCalls: - m_Calls: [] - m_OnSelectExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: - m_PersistentCalls: - m_Calls: [] - m_OnDeactivate: - m_PersistentCalls: - m_Calls: [] isGazePinchSelected: active: 0 onEntered: @@ -4713,9 +4444,6 @@ MonoBehaviour: m_EditorClassIdentifier: m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 @@ -4774,33 +4502,6 @@ MonoBehaviour: m_StartingHoverFilters: [] m_StartingSelectFilters: [] m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectEntered: - m_PersistentCalls: - m_Calls: [] - m_OnSelectExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: - m_PersistentCalls: - m_Calls: [] - m_OnDeactivate: - m_PersistentCalls: - m_Calls: [] isGazePinchSelected: active: 0 onEntered: @@ -5067,9 +4768,6 @@ MonoBehaviour: m_EditorClassIdentifier: m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 @@ -5128,33 +4826,6 @@ MonoBehaviour: m_StartingHoverFilters: [] m_StartingSelectFilters: [] m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectEntered: - m_PersistentCalls: - m_Calls: [] - m_OnSelectExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: - m_PersistentCalls: - m_Calls: [] - m_OnDeactivate: - m_PersistentCalls: - m_Calls: [] isGazePinchSelected: active: 0 onEntered: @@ -5421,9 +5092,6 @@ MonoBehaviour: m_EditorClassIdentifier: m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 @@ -5482,33 +5150,6 @@ MonoBehaviour: m_StartingHoverFilters: [] m_StartingSelectFilters: [] m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectEntered: - m_PersistentCalls: - m_Calls: [] - m_OnSelectExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: - m_PersistentCalls: - m_Calls: [] - m_OnDeactivate: - m_PersistentCalls: - m_Calls: [] isGazePinchSelected: active: 0 onEntered: @@ -5742,75 +5383,6 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &1530487694 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720334, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_Name - value: MRTK XR Rig - objectReference: {fileID: 0} - - target: {fileID: 4102833070697430761, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: precision - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 5334666798807300184, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6056176063914695530, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} --- !u!1 &1868973377 GameObject: m_ObjectHideFlags: 0 @@ -5877,9 +5449,6 @@ MonoBehaviour: m_EditorClassIdentifier: m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 @@ -5938,33 +5507,6 @@ MonoBehaviour: m_StartingHoverFilters: [] m_StartingSelectFilters: [] m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectEntered: - m_PersistentCalls: - m_Calls: [] - m_OnSelectExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: - m_PersistentCalls: - m_Calls: [] - m_OnDeactivate: - m_PersistentCalls: - m_Calls: [] isGazePinchSelected: active: 0 onEntered: @@ -6383,9 +5925,6 @@ MonoBehaviour: m_EditorClassIdentifier: m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 @@ -6444,33 +5983,6 @@ MonoBehaviour: m_StartingHoverFilters: [] m_StartingSelectFilters: [] m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectEntered: - m_PersistentCalls: - m_Calls: [] - m_OnSelectExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: - m_PersistentCalls: - m_Calls: [] - m_OnDeactivate: - m_PersistentCalls: - m_Calls: [] isGazePinchSelected: active: 0 onEntered: @@ -6737,9 +6249,6 @@ MonoBehaviour: m_EditorClassIdentifier: m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 @@ -6798,33 +6307,6 @@ MonoBehaviour: m_StartingHoverFilters: [] m_StartingSelectFilters: [] m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectEntered: - m_PersistentCalls: - m_Calls: [] - m_OnSelectExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: - m_PersistentCalls: - m_Calls: [] - m_OnDeactivate: - m_PersistentCalls: - m_Calls: [] isGazePinchSelected: active: 0 onEntered: @@ -7060,9 +6542,6 @@ MonoBehaviour: m_EditorClassIdentifier: m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 @@ -7121,33 +6600,6 @@ MonoBehaviour: m_StartingHoverFilters: [] m_StartingSelectFilters: [] m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectEntered: - m_PersistentCalls: - m_Calls: [] - m_OnSelectExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: - m_PersistentCalls: - m_Calls: [] - m_OnDeactivate: - m_PersistentCalls: - m_Calls: [] isGazePinchSelected: active: 0 onEntered: diff --git a/UnityProjects/MRTKDevTemplate/Assets/Scenes/EyeTracking/EyeTrackingBasicSetupExample.unity b/UnityProjects/MRTKDevTemplate/Assets/Scenes/EyeTracking/EyeTrackingBasicSetupExample.unity index 814e6de5d..f9f2a383e 100644 --- a/UnityProjects/MRTKDevTemplate/Assets/Scenes/EyeTracking/EyeTrackingBasicSetupExample.unity +++ b/UnityProjects/MRTKDevTemplate/Assets/Scenes/EyeTracking/EyeTrackingBasicSetupExample.unity @@ -38,7 +38,6 @@ 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_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -104,7 +103,7 @@ NavMeshSettings: serializedVersion: 2 m_ObjectHideFlags: 0 m_BuildSettings: - serializedVersion: 2 + serializedVersion: 3 agentTypeID: 0 agentRadius: 0.5 agentHeight: 2 @@ -117,7 +116,7 @@ NavMeshSettings: cellSize: 0.16666667 manualTileSize: 0 tileSize: 256 - accuratePlacement: 0 + buildHeightMesh: 0 maxJobWorkers: 0 preserveTilesOutsideBounds: 0 debug: @@ -151,13 +150,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 81134804} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0.625087, y: -0.123, z: 0} m_LocalScale: {x: 0.09658819, y: 0.09658819, z: 0.09658819} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1486523324} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &81134806 BoxCollider: @@ -167,9 +166,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 81134804} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0, y: 0, z: 0} --- !u!23 &81134807 @@ -234,15 +241,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 2dd6a517ee866ae45ae8fac60a8d0547, type: 3} m_Name: m_EditorClassIdentifier: - m_InteractionManager: {fileID: 1152038354} + m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 0 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 1 m_AllowGazeSelect: 0 @@ -301,42 +306,27 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnHoverExited: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectEntered: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectExited: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectCanceled: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -506,6 +496,9 @@ MonoBehaviour: k__BackingField: 1 allowSelectByVoice: 1 speechRecognitionKeyword: select + k__BackingField: + m_PersistentCalls: + m_Calls: [] k__BackingField: 1 k__BackingField: 0 k__BackingField: @@ -550,6 +543,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 7781529056550460865, guid: c07c4bd04b45c014fad0e3cd30747f06, type: 3} @@ -605,6 +599,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07c4bd04b45c014fad0e3cd30747f06, type: 3} --- !u!1 &365753907 stripped GameObject: @@ -628,15 +625,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d9ad66e7cc9a2754d8ea989740c9f00d, type: 3} m_Name: m_EditorClassIdentifier: - m_InteractionManager: {fileID: 1152038354} + m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 1 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -669,42 +664,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_OnLastHoverExited: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnHoverEntered: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectEntered: - m_PersistentCalls: - m_Calls: [] - m_OnSelectExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -797,6 +777,9 @@ MonoBehaviour: k__BackingField: 1 allowSelectByVoice: 1 speechRecognitionKeyword: select + k__BackingField: + m_PersistentCalls: + m_Calls: [] k__BackingField: 1 k__BackingField: 0 k__BackingField: @@ -819,6 +802,7 @@ MonoBehaviour: hostTransform: {fileID: 563801817} allowedManipulations: 1 allowedInteractionTypes: -2147483641 + rigidbodyMovementType: 0 applyTorque: 1 springForceSoftness: 0.1 springTorqueSoftness: 0.1 @@ -841,8 +825,7 @@ MonoBehaviour: moveLogicType: reference: MixedReality.Toolkit.SpatialManipulation.MoveLogic, MixedReality.Toolkit.SpatialManipulation rotateLogicType: - reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, - MixedReality.Toolkit.SpatialManipulation + reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, MixedReality.Toolkit.SpatialManipulation scaleLogicType: reference: MixedReality.Toolkit.SpatialManipulation.ScaleLogic, MixedReality.Toolkit.SpatialManipulation --- !u!114 &365753910 @@ -882,6 +865,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 3493013819197874656, guid: ad5b753b73e311143a85055b15cea562, type: 3} @@ -909,6 +893,9 @@ PrefabInstance: value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: ad5b753b73e311143a85055b15cea562, type: 3} --- !u!1 &563801816 GameObject: @@ -933,6 +920,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 563801816} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 1.3380473, z: 1.1} m_LocalScale: {x: 1, y: 1, z: 1} @@ -942,7 +930,6 @@ Transform: - {fileID: 90326106} - {fileID: 1486523324} m_Father: {fileID: 0} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &705507993 GameObject: @@ -1030,24 +1017,20 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 705507993} + serializedVersion: 2 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 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} ---- !u!4 &890841641 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 4661674953859262252, guid: c9d9edba85c2c504c962d7cd830d9e3e, type: 3} - m_PrefabInstance: {fileID: 1077719795} - m_PrefabAsset: {fileID: 0} --- !u!1001 &904301779 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 5905304275062509466, guid: df4899a7e84d2794a9428337bba8a253, type: 3} @@ -1071,12 +1054,16 @@ PrefabInstance: value: EventSystem objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: df4899a7e84d2794a9428337bba8a253, type: 3} --- !u!1001 &1012231986 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 563801817} m_Modifications: - target: {fileID: 566361764857432160, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} @@ -1210,6 +1197,21 @@ PrefabInstance: value: -35.8 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 6540126486176102408, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} + insertIndex: -1 + addedObject: {fileID: 365753909} + - targetCorrespondingSourceObject: {fileID: 6540126486176102408, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} + insertIndex: -1 + addedObject: {fileID: 365753910} + - targetCorrespondingSourceObject: {fileID: 6540126486176102408, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} + insertIndex: -1 + addedObject: {fileID: 365753911} + - targetCorrespondingSourceObject: {fileID: 8323939510892415185, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} + insertIndex: -1 + addedObject: {fileID: 1374246331} m_SourcePrefab: {fileID: 100100000, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} --- !u!1 &1015847537 GameObject: @@ -1239,13 +1241,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1015847537} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: -0.123, z: 0} m_LocalScale: {x: 0.09658819, y: 0.09658819, z: 0.09658819} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1486523324} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &1015847539 BoxCollider: @@ -1255,9 +1257,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1015847537} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0, y: 0, z: 0} --- !u!23 &1015847540 @@ -1322,15 +1332,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 2dd6a517ee866ae45ae8fac60a8d0547, type: 3} m_Name: m_EditorClassIdentifier: - m_InteractionManager: {fileID: 1152038354} + m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 0 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 1 m_AllowGazeSelect: 0 @@ -1389,42 +1397,27 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_OnHoverEntered: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_OnHoverExited: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectEntered: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -1594,6 +1587,9 @@ MonoBehaviour: k__BackingField: 1 allowSelectByVoice: 1 speechRecognitionKeyword: select + k__BackingField: + m_PersistentCalls: + m_Calls: [] k__BackingField: 1 k__BackingField: 0 k__BackingField: @@ -1656,13 +1652,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1027535233} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0.3021, y: -0.123, z: 0} m_LocalScale: {x: 0.09658819, y: 0.09658819, z: 0.09658819} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1486523324} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &1027535235 BoxCollider: @@ -1672,9 +1668,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1027535233} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0, y: 0, z: 0} --- !u!23 &1027535236 @@ -1739,15 +1743,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 2dd6a517ee866ae45ae8fac60a8d0547, type: 3} m_Name: m_EditorClassIdentifier: - m_InteractionManager: {fileID: 1152038354} + m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 0 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 1 m_AllowGazeSelect: 0 @@ -1806,42 +1808,27 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnHoverEntered: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_OnHoverExited: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectEntered: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectExited: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -2011,6 +1998,9 @@ MonoBehaviour: k__BackingField: 1 allowSelectByVoice: 1 speechRecognitionKeyword: select + k__BackingField: + m_PersistentCalls: + m_Calls: [] k__BackingField: 1 k__BackingField: 0 k__BackingField: @@ -2050,6 +2040,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 4661674953859262252, guid: c9d9edba85c2c504c962d7cd830d9e3e, type: 3} @@ -2103,20 +2094,20 @@ PrefabInstance: - target: {fileID: 8364151238423769580, guid: c9d9edba85c2c504c962d7cd830d9e3e, type: 3} propertyPath: gazeController value: - objectReference: {fileID: 1530487695} + objectReference: {fileID: 0} + - target: {fileID: 8364151238423769580, guid: c9d9edba85c2c504c962d7cd830d9e3e, type: 3} + propertyPath: gazeInteractor + value: + objectReference: {fileID: 1778446323} + - target: {fileID: 8364151238423769580, guid: c9d9edba85c2c504c962d7cd830d9e3e, type: 3} + propertyPath: gazePoseDriver + value: + objectReference: {fileID: 1778446324} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c9d9edba85c2c504c962d7cd830d9e3e, type: 3} ---- !u!114 &1152038354 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 5569439093497552269, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - m_PrefabInstance: {fileID: 1530487694} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 83e4e6cca11330d4088d729ab4fc9d9f, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &1288200904 GameObject: m_ObjectHideFlags: 0 @@ -2145,13 +2136,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1288200904} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0.625087, y: -0.123, z: 0} m_LocalScale: {x: 0.09658819, y: 0.09658819, z: 0.09658819} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1486523324} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &1288200906 BoxCollider: @@ -2161,9 +2152,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1288200904} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0, y: 0, z: 0} --- !u!23 &1288200907 @@ -2228,15 +2227,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 2dd6a517ee866ae45ae8fac60a8d0547, type: 3} m_Name: m_EditorClassIdentifier: - m_InteractionManager: {fileID: 1152038354} + m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 0 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 1 m_AllowGazeSelect: 0 @@ -2295,42 +2292,27 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_OnLastHoverExited: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_OnHoverEntered: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnHoverExited: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectEntered: - m_PersistentCalls: - m_Calls: [] - m_OnSelectExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -2500,6 +2482,9 @@ MonoBehaviour: k__BackingField: 1 allowSelectByVoice: 1 speechRecognitionKeyword: select + k__BackingField: + m_PersistentCalls: + m_Calls: [] k__BackingField: 1 k__BackingField: 0 k__BackingField: @@ -2547,9 +2532,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1374246329} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 0.99999994, y: 1, z: 0.099999994} m_Center: {x: -0.0000000037252903, y: 0, z: 0.049999997} --- !u!1 &1486523323 @@ -2575,6 +2568,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1486523323} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0.13767275, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -2587,7 +2581,6 @@ Transform: - {fileID: 1027535234} - {fileID: 81134805} m_Father: {fileID: 563801817} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1510900176 GameObject: @@ -2613,13 +2606,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1510900176} + serializedVersion: 2 m_LocalRotation: {x: -0.7071068, y: -0, z: -0, w: 0.7071068} m_LocalPosition: {x: 0.45897397, y: -0.5069043, z: 0.052114647} m_LocalScale: {x: 0.0025675425, y: 0.009207609, z: 0.005764065} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1924121440} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} --- !u!212 &1510900178 SpriteRenderer: @@ -2673,168 +2666,91 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1001 &1530487694 +--- !u!1001 &1778446322 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} propertyPath: m_RootOrder value: 1 objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 2351505567455720334, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} + - target: {fileID: 2351505567455720334, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} propertyPath: m_Name value: MRTK XR Rig objectReference: {fileID: 0} - - target: {fileID: 4102833070697430761, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: precision - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 5334666798807300184, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6056176063914695530, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7115113329451106245, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_Enabled - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7115113329451106245, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: aimPoseSource - value: -2 - objectReference: {fileID: 0} - - target: {fileID: 7115113329451106245, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_UseForceGrab - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7115113329451106245, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: devicePoseSource - value: -2 - objectReference: {fileID: 0} - - target: {fileID: 7115113329451106245, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_HitClosestOnly - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7115113329451106245, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_AllowAnchorControl - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7115113329451106245, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_InteractionManager - value: - objectReference: {fileID: 1152038354} - - target: {fileID: 7115113329451106245, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_MaxRaycastDistance - value: 30 - objectReference: {fileID: 0} - - target: {fileID: 7115113329451106245, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: managedReferences[-2] - value: - objectReference: {fileID: 0} - - target: {fileID: 7304020826145247389, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_Model - value: - objectReference: {fileID: 890841641} - - target: {fileID: 7304020826145247389, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_EnableInputActions - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8479077998186684813, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} + - target: {fileID: 8479077998186684813, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} - - target: {fileID: 8988800969130450167, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_Enabled - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8988800969130450167, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: aimPoseSource - value: -2 - objectReference: {fileID: 0} - - target: {fileID: 8988800969130450167, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_UseForceGrab - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8988800969130450167, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: devicePoseSource - value: -2 - objectReference: {fileID: 0} - - target: {fileID: 8988800969130450167, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_HitClosestOnly - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8988800969130450167, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_AllowAnchorControl - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8988800969130450167, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_InteractionManager - value: - objectReference: {fileID: 1152038354} - - target: {fileID: 8988800969130450167, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_MaxRaycastDistance - value: 30 - objectReference: {fileID: 0} - - target: {fileID: 8988800969130450167, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: managedReferences[-2] - value: - objectReference: {fileID: 0} m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} ---- !u!114 &1530487695 stripped + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} +--- !u!114 &1778446323 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 5302893730759227071, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - m_PrefabInstance: {fileID: 1530487694} + m_CorrespondingSourceObject: {fileID: 529201713281613631, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + m_PrefabInstance: {fileID: 1778446322} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: b5ecb302c7ea48344b3a839df64a77a5, type: 3} + m_Script: {fileID: 11500000, guid: 1175590bcfccd6d44a4c8f9a15292536, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &1778446324 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 6369988576007060339, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + m_PrefabInstance: {fileID: 1778446322} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a248d282774a21744b8cf69201ce8279, type: 3} m_Name: m_EditorClassIdentifier: --- !u!1001 &1924121438 @@ -2842,6 +2758,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1486523324} m_Modifications: - target: {fileID: 3148769097004162997, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} @@ -2933,6 +2850,15 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 7759758375038403720, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} + insertIndex: -1 + addedObject: {fileID: 1510900177} + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 6056454165148638616, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} + insertIndex: -1 + addedObject: {fileID: 1924121442} m_SourcePrefab: {fileID: 100100000, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} --- !u!4 &1924121439 stripped Transform: @@ -2957,9 +2883,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1924121441} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 1, y: 1.0000004, z: 0.100000024} m_Center: {x: 0.00000017881393, y: -4.440892e-17, z: 0.050000012} --- !u!1001 &1972210168 @@ -2967,6 +2901,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 2082148069247382453, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} @@ -3078,6 +3013,9 @@ PrefabInstance: value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} --- !u!1 &2014063033 GameObject: @@ -3107,13 +3045,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2014063033} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0.312, y: -0.123, z: 0} m_LocalScale: {x: 0.09658819, y: 0.09658819, z: 0.09658819} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1486523324} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &2014063035 BoxCollider: @@ -3123,9 +3061,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2014063033} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0, y: 0, z: 0} --- !u!23 &2014063036 @@ -3190,15 +3136,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 2dd6a517ee866ae45ae8fac60a8d0547, type: 3} m_Name: m_EditorClassIdentifier: - m_InteractionManager: {fileID: 1152038354} + m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 0 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 1 m_AllowGazeSelect: 0 @@ -3257,42 +3201,27 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_OnLastHoverExited: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_OnHoverEntered: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnHoverExited: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectEntered: - m_PersistentCalls: - m_Calls: [] - m_OnSelectExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -3462,6 +3391,9 @@ MonoBehaviour: k__BackingField: 1 allowSelectByVoice: 1 speechRecognitionKeyword: select + k__BackingField: + m_PersistentCalls: + m_Calls: [] k__BackingField: 1 k__BackingField: 0 k__BackingField: @@ -3501,6 +3433,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 563801817} m_Modifications: - target: {fileID: 729302939670514188, guid: cea6f24b8f65d5444ba5379c831cce58, type: 3} @@ -3672,4 +3605,19 @@ PrefabInstance: value: -99.96 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: cea6f24b8f65d5444ba5379c831cce58, type: 3} +--- !u!1660057539 &9223372036854775807 +SceneRoots: + m_ObjectHideFlags: 0 + m_Roots: + - {fileID: 705507995} + - {fileID: 1778446322} + - {fileID: 530525190} + - {fileID: 1972210168} + - {fileID: 904301779} + - {fileID: 563801817} + - {fileID: 1077719795} + - {fileID: 149727843} diff --git a/UnityProjects/MRTKDevTemplate/Assets/Scenes/EyeTracking/EyeTrackingExampleNavigationExample.unity b/UnityProjects/MRTKDevTemplate/Assets/Scenes/EyeTracking/EyeTrackingExampleNavigationExample.unity index f83999f5f..e40ba38cd 100644 --- a/UnityProjects/MRTKDevTemplate/Assets/Scenes/EyeTracking/EyeTrackingExampleNavigationExample.unity +++ b/UnityProjects/MRTKDevTemplate/Assets/Scenes/EyeTracking/EyeTrackingExampleNavigationExample.unity @@ -123,6 +123,67 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1001 &60426931 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720334, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_Name + value: MRTK XR Rig + objectReference: {fileID: 0} + - target: {fileID: 8479077998186684813, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} --- !u!1 &80744875 GameObject: m_ObjectHideFlags: 0 @@ -251,7 +312,7 @@ Canvas: m_Enabled: 1 serializedVersion: 3 m_RenderMode: 2 - m_Camera: {fileID: 1530487695} + m_Camera: {fileID: 0} m_PlaneDistance: 100 m_PixelPerfect: 0 m_ReceivesEvents: 1 @@ -896,17 +957,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07c4bd04b45c014fad0e3cd30747f06, type: 3} ---- !u!114 &1152038354 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 5569439093497552269, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - m_PrefabInstance: {fileID: 1530487694} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 83e4e6cca11330d4088d729ab4fc9d9f, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &1156823075 GameObject: m_ObjectHideFlags: 0 @@ -957,15 +1007,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d9ad66e7cc9a2754d8ea989740c9f00d, type: 3} m_Name: m_EditorClassIdentifier: - m_InteractionManager: {fileID: 1152038354} + m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 1 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -998,42 +1046,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnHoverExited: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectEntered: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectExited: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectCanceled: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -1148,6 +1181,7 @@ MonoBehaviour: hostTransform: {fileID: 563801817} allowedManipulations: 7 allowedInteractionTypes: -2147483641 + rigidbodyMovementType: 0 applyTorque: 1 springForceSoftness: 0.1 springTorqueSoftness: 0.1 @@ -1170,8 +1204,7 @@ MonoBehaviour: moveLogicType: reference: MixedReality.Toolkit.SpatialManipulation.MoveLogic, MixedReality.Toolkit.SpatialManipulation rotateLogicType: - reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, - MixedReality.Toolkit.SpatialManipulation + reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, MixedReality.Toolkit.SpatialManipulation scaleLogicType: reference: MixedReality.Toolkit.SpatialManipulation.ScaleLogic, MixedReality.Toolkit.SpatialManipulation --- !u!114 &1439882844 @@ -1223,15 +1256,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d9ad66e7cc9a2754d8ea989740c9f00d, type: 3} m_Name: m_EditorClassIdentifier: - m_InteractionManager: {fileID: 1152038354} + m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 1 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -1264,42 +1295,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_Deactivated: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnLastHoverExited: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectEntered: - m_PersistentCalls: - m_Calls: [] - m_OnSelectExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -1414,6 +1430,7 @@ MonoBehaviour: hostTransform: {fileID: 563801817} allowedManipulations: 7 allowedInteractionTypes: -2147483641 + rigidbodyMovementType: 0 applyTorque: 1 springForceSoftness: 0.1 springTorqueSoftness: 0.1 @@ -1436,8 +1453,7 @@ MonoBehaviour: moveLogicType: reference: MixedReality.Toolkit.SpatialManipulation.MoveLogic, MixedReality.Toolkit.SpatialManipulation rotateLogicType: - reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, - MixedReality.Toolkit.SpatialManipulation + reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, MixedReality.Toolkit.SpatialManipulation scaleLogicType: reference: MixedReality.Toolkit.SpatialManipulation.ScaleLogic, MixedReality.Toolkit.SpatialManipulation --- !u!114 &1472106427 @@ -1663,15 +1679,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d9ad66e7cc9a2754d8ea989740c9f00d, type: 3} m_Name: m_EditorClassIdentifier: - m_InteractionManager: {fileID: 1152038354} + m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 1 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -1704,42 +1718,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_Deactivated: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnLastHoverExited: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectEntered: - m_PersistentCalls: - m_Calls: [] - m_OnSelectExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -1854,6 +1853,7 @@ MonoBehaviour: hostTransform: {fileID: 563801817} allowedManipulations: 7 allowedInteractionTypes: -2147483641 + rigidbodyMovementType: 0 applyTorque: 1 springForceSoftness: 0.1 springTorqueSoftness: 0.1 @@ -1876,8 +1876,7 @@ MonoBehaviour: moveLogicType: reference: MixedReality.Toolkit.SpatialManipulation.MoveLogic, MixedReality.Toolkit.SpatialManipulation rotateLogicType: - reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, - MixedReality.Toolkit.SpatialManipulation + reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, MixedReality.Toolkit.SpatialManipulation scaleLogicType: reference: MixedReality.Toolkit.SpatialManipulation.ScaleLogic, MixedReality.Toolkit.SpatialManipulation --- !u!114 &1525532818 @@ -1912,100 +1911,6 @@ MonoBehaviour: minimumScale: {x: 0.2, y: 0.2, z: 0.2} maximumScale: {x: 2, y: 2, z: 2} relativeToInitialState: 1 ---- !u!1001 &1530487694 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720334, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_Name - value: MRTK XR Rig - objectReference: {fileID: 0} - - target: {fileID: 4102833070697430761, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: precision - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 4102833070697430761, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_MaxRaycastDistance - value: 40 - objectReference: {fileID: 0} - - target: {fileID: 5334666798807300184, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6056176063914695530, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7304020826145247389, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_Model - value: - objectReference: {fileID: 0} - - target: {fileID: 7304020826145247389, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_EnableInputActions - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7720573869748407015, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_InteractionManager - value: - objectReference: {fileID: 1152038354} - - target: {fileID: 8479077998186684813, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} ---- !u!20 &1530487695 stripped -Camera: - m_CorrespondingSourceObject: {fileID: 2351505566771328527, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - m_PrefabInstance: {fileID: 1530487694} - m_PrefabAsset: {fileID: 0} --- !u!1 &1625564608 GameObject: m_ObjectHideFlags: 0 @@ -2505,7 +2410,7 @@ PrefabInstance: - target: {fileID: 348134654325234971, guid: d341ff791a3249540a0c38121c47a9b9, type: 3} propertyPath: m_InteractionManager value: - objectReference: {fileID: 1152038354} + objectReference: {fileID: 0} - target: {fileID: 348134654325234971, guid: d341ff791a3249540a0c38121c47a9b9, type: 3} propertyPath: isRaySelected.onExited.m_PersistentCalls.m_Calls.Array.size value: 2 @@ -2728,63 +2633,51 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 348134654325234971, guid: d341ff791a3249540a0c38121c47a9b9, type: 3} propertyPath: isRaySelected.onExited.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: MixedReality.Toolkit.Examples.Demos.EyeTracking.PanZoomBase, - Assembly-CSharp + value: MixedReality.Toolkit.Examples.Demos.EyeTracking.PanZoomBase, Assembly-CSharp objectReference: {fileID: 0} - target: {fileID: 348134654325234971, guid: d341ff791a3249540a0c38121c47a9b9, type: 3} propertyPath: isRaySelected.onExited.m_PersistentCalls.m_Calls.Array.data[1].m_TargetAssemblyTypeName - value: MixedReality.Toolkit.Examples.Demos.EyeTracking.PanZoomBase, - Assembly-CSharp + value: MixedReality.Toolkit.Examples.Demos.EyeTracking.PanZoomBase, Assembly-CSharp objectReference: {fileID: 0} - target: {fileID: 348134654325234971, guid: d341ff791a3249540a0c38121c47a9b9, type: 3} propertyPath: isGrabSelected.onExited.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: MixedReality.Toolkit.Examples.Demos.EyeTracking.PanZoomBase, - Assembly-CSharp + value: MixedReality.Toolkit.Examples.Demos.EyeTracking.PanZoomBase, Assembly-CSharp objectReference: {fileID: 0} - target: {fileID: 348134654325234971, guid: d341ff791a3249540a0c38121c47a9b9, type: 3} propertyPath: isGrabSelected.onExited.m_PersistentCalls.m_Calls.Array.data[1].m_TargetAssemblyTypeName - value: MixedReality.Toolkit.Examples.Demos.EyeTracking.PanZoomBase, - Assembly-CSharp + value: MixedReality.Toolkit.Examples.Demos.EyeTracking.PanZoomBase, Assembly-CSharp objectReference: {fileID: 0} - target: {fileID: 348134654325234971, guid: d341ff791a3249540a0c38121c47a9b9, type: 3} propertyPath: isRaySelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: MixedReality.Toolkit.Examples.Demos.EyeTracking.PanZoomBase, - Assembly-CSharp + value: MixedReality.Toolkit.Examples.Demos.EyeTracking.PanZoomBase, Assembly-CSharp objectReference: {fileID: 0} - target: {fileID: 348134654325234971, guid: d341ff791a3249540a0c38121c47a9b9, type: 3} propertyPath: isRaySelected.onEntered.m_PersistentCalls.m_Calls.Array.data[1].m_TargetAssemblyTypeName - value: MixedReality.Toolkit.Examples.Demos.EyeTracking.PanZoomBase, - Assembly-CSharp + value: MixedReality.Toolkit.Examples.Demos.EyeTracking.PanZoomBase, Assembly-CSharp objectReference: {fileID: 0} - target: {fileID: 348134654325234971, guid: d341ff791a3249540a0c38121c47a9b9, type: 3} propertyPath: isGrabSelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: MixedReality.Toolkit.Examples.Demos.EyeTracking.PanZoomBase, - Assembly-CSharp + value: MixedReality.Toolkit.Examples.Demos.EyeTracking.PanZoomBase, Assembly-CSharp objectReference: {fileID: 0} - target: {fileID: 348134654325234971, guid: d341ff791a3249540a0c38121c47a9b9, type: 3} propertyPath: isGrabSelected.onEntered.m_PersistentCalls.m_Calls.Array.data[1].m_TargetAssemblyTypeName - value: MixedReality.Toolkit.Examples.Demos.EyeTracking.PanZoomBase, - Assembly-CSharp + value: MixedReality.Toolkit.Examples.Demos.EyeTracking.PanZoomBase, Assembly-CSharp objectReference: {fileID: 0} - target: {fileID: 348134654325234971, guid: d341ff791a3249540a0c38121c47a9b9, type: 3} propertyPath: isGazePinchSelected.onExited.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: MixedReality.Toolkit.Examples.Demos.EyeTracking.PanZoomBase, - Assembly-CSharp + value: MixedReality.Toolkit.Examples.Demos.EyeTracking.PanZoomBase, Assembly-CSharp objectReference: {fileID: 0} - target: {fileID: 348134654325234971, guid: d341ff791a3249540a0c38121c47a9b9, type: 3} propertyPath: isGazePinchSelected.onExited.m_PersistentCalls.m_Calls.Array.data[1].m_TargetAssemblyTypeName - value: MixedReality.Toolkit.Examples.Demos.EyeTracking.PanZoomBase, - Assembly-CSharp + value: MixedReality.Toolkit.Examples.Demos.EyeTracking.PanZoomBase, Assembly-CSharp objectReference: {fileID: 0} - target: {fileID: 348134654325234971, guid: d341ff791a3249540a0c38121c47a9b9, type: 3} propertyPath: isGazePinchSelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: MixedReality.Toolkit.Examples.Demos.EyeTracking.PanZoomBase, - Assembly-CSharp + value: MixedReality.Toolkit.Examples.Demos.EyeTracking.PanZoomBase, Assembly-CSharp objectReference: {fileID: 0} - target: {fileID: 348134654325234971, guid: d341ff791a3249540a0c38121c47a9b9, type: 3} propertyPath: isGazePinchSelected.onEntered.m_PersistentCalls.m_Calls.Array.data[1].m_TargetAssemblyTypeName - value: MixedReality.Toolkit.Examples.Demos.EyeTracking.PanZoomBase, - Assembly-CSharp + value: MixedReality.Toolkit.Examples.Demos.EyeTracking.PanZoomBase, Assembly-CSharp objectReference: {fileID: 0} - target: {fileID: 348134654325234971, guid: d341ff791a3249540a0c38121c47a9b9, type: 3} propertyPath: isRaySelected.onExited.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName @@ -3023,7 +2916,7 @@ PrefabInstance: - target: {fileID: 1808124033441462828, guid: 9715efe25e795694e9e2df61c9d8c6bb, type: 3} propertyPath: m_InteractionManager value: - objectReference: {fileID: 1152038354} + objectReference: {fileID: 0} - target: {fileID: 1808124033984213305, guid: 9715efe25e795694e9e2df61c9d8c6bb, type: 3} propertyPath: m_Name value: EyeGazeVoiceCommand @@ -3075,7 +2968,7 @@ PrefabInstance: - target: {fileID: 1808124033984213307, guid: 9715efe25e795694e9e2df61c9d8c6bb, type: 3} propertyPath: m_InteractionManager value: - objectReference: {fileID: 1152038354} + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9715efe25e795694e9e2df61c9d8c6bb, type: 3} --- !u!1001 &2362020299669090848 @@ -3223,7 +3116,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2362020300155552838, guid: 223005b231c33c5449426df912d4de39, type: 3} propertyPath: m_AnchoredPosition.y - value: -0.00024414062 + value: -0.00019836426 objectReference: {fileID: 0} - target: {fileID: 2362020300408418987, guid: 223005b231c33c5449426df912d4de39, type: 3} propertyPath: m_Name @@ -3329,7 +3222,7 @@ PrefabInstance: - target: {fileID: 7173684231665593442, guid: b8c2db479bb02b34eb1ef845e1dba9a5, type: 3} propertyPath: m_InteractionManager value: - objectReference: {fileID: 1152038354} + objectReference: {fileID: 0} - target: {fileID: 7173684231665593443, guid: b8c2db479bb02b34eb1ef845e1dba9a5, type: 3} propertyPath: m_RootOrder value: 1 diff --git a/UnityProjects/MRTKDevTemplate/Assets/Scenes/EyeTracking/EyeTrackingTargetPositioningExample.unity b/UnityProjects/MRTKDevTemplate/Assets/Scenes/EyeTracking/EyeTrackingTargetPositioningExample.unity index cf3db1829..61daf7bd8 100644 --- a/UnityProjects/MRTKDevTemplate/Assets/Scenes/EyeTracking/EyeTrackingTargetPositioningExample.unity +++ b/UnityProjects/MRTKDevTemplate/Assets/Scenes/EyeTracking/EyeTrackingTargetPositioningExample.unity @@ -123,17 +123,6 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!114 &42435681 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 4102833070697430761, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - m_PrefabInstance: {fileID: 1530487694} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1175590bcfccd6d44a4c8f9a15292536, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &66248574 GameObject: m_ObjectHideFlags: 0 @@ -271,15 +260,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a415ba6cec0361045be083a0a48abf4f, type: 3} m_Name: m_EditorClassIdentifier: - m_InteractionManager: {fileID: 1152038354} + m_InteractionManager: {fileID: 1878270909} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 0 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 1 m_AllowGazeSelect: 0 @@ -304,8 +291,7 @@ MonoBehaviour: m_BoolArgument: 1 m_CallState: 2 - m_Target: {fileID: 66248584} - m_TargetAssemblyTypeName: MixedReality.Toolkit.Examples.ColorTap, - Assembly-CSharp + m_TargetAssemblyTypeName: MixedReality.Toolkit.Examples.ColorTap, Assembly-CSharp m_MethodName: OnGazeHoverEntered m_Mode: 1 m_Arguments: @@ -332,8 +318,7 @@ MonoBehaviour: m_BoolArgument: 0 m_CallState: 2 - m_Target: {fileID: 66248584} - m_TargetAssemblyTypeName: MixedReality.Toolkit.Examples.ColorTap, - Assembly-CSharp + m_TargetAssemblyTypeName: MixedReality.Toolkit.Examples.ColorTap, Assembly-CSharp m_MethodName: OnGazeHoverExited m_Mode: 1 m_Arguments: @@ -354,8 +339,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: - m_Target: {fileID: 66248584} - m_TargetAssemblyTypeName: MixedReality.Toolkit.Examples.ColorTap, - Assembly-CSharp + m_TargetAssemblyTypeName: MixedReality.Toolkit.Examples.ColorTap, Assembly-CSharp m_MethodName: OnGazePinchEntered m_Mode: 1 m_Arguments: @@ -370,8 +354,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: - m_Target: {fileID: 66248584} - m_TargetAssemblyTypeName: MixedReality.Toolkit.Examples.ColorTap, - Assembly-CSharp + m_TargetAssemblyTypeName: MixedReality.Toolkit.Examples.ColorTap, Assembly-CSharp m_MethodName: OnGazePinchExited m_Mode: 1 m_Arguments: @@ -412,42 +395,27 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - m_Activated: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_Deactivated: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnLastHoverExited: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectEntered: - m_PersistentCalls: - m_Calls: [] - m_OnSelectExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -636,7 +604,7 @@ MonoBehaviour: k__BackingField: m_PersistentCalls: m_Calls: [] - gazeInteractor: {fileID: 42435681} + gazeInteractor: {fileID: 1878270910} useEyeSupportedTargetPlacement: 1 minLookAwayDistToEnableEyeWarp: 5 handInputEnabled: 1 @@ -1000,15 +968,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a415ba6cec0361045be083a0a48abf4f, type: 3} m_Name: m_EditorClassIdentifier: - m_InteractionManager: {fileID: 1152038354} + m_InteractionManager: {fileID: 1878270909} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 0 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 1 m_AllowGazeSelect: 0 @@ -1033,8 +999,7 @@ MonoBehaviour: m_BoolArgument: 1 m_CallState: 2 - m_Target: {fileID: 111582326} - m_TargetAssemblyTypeName: MixedReality.Toolkit.Examples.ColorTap, - Assembly-CSharp + m_TargetAssemblyTypeName: MixedReality.Toolkit.Examples.ColorTap, Assembly-CSharp m_MethodName: OnGazeHoverEntered m_Mode: 1 m_Arguments: @@ -1061,8 +1026,7 @@ MonoBehaviour: m_BoolArgument: 0 m_CallState: 2 - m_Target: {fileID: 111582326} - m_TargetAssemblyTypeName: MixedReality.Toolkit.Examples.ColorTap, - Assembly-CSharp + m_TargetAssemblyTypeName: MixedReality.Toolkit.Examples.ColorTap, Assembly-CSharp m_MethodName: OnGazeHoverExited m_Mode: 1 m_Arguments: @@ -1083,8 +1047,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: - m_Target: {fileID: 111582326} - m_TargetAssemblyTypeName: MixedReality.Toolkit.Examples.ColorTap, - Assembly-CSharp + m_TargetAssemblyTypeName: MixedReality.Toolkit.Examples.ColorTap, Assembly-CSharp m_MethodName: OnGazePinchEntered m_Mode: 1 m_Arguments: @@ -1099,8 +1062,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: - m_Target: {fileID: 111582326} - m_TargetAssemblyTypeName: MixedReality.Toolkit.Examples.ColorTap, - Assembly-CSharp + m_TargetAssemblyTypeName: MixedReality.Toolkit.Examples.ColorTap, Assembly-CSharp m_MethodName: OnGazePinchExited m_Mode: 1 m_Arguments: @@ -1141,42 +1103,27 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_OnHoverEntered: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_OnHoverExited: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectEntered: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -1365,7 +1312,7 @@ MonoBehaviour: k__BackingField: m_PersistentCalls: m_Calls: [] - gazeInteractor: {fileID: 42435681} + gazeInteractor: {fileID: 1878270910} useEyeSupportedTargetPlacement: 1 minLookAwayDistToEnableEyeWarp: 5 handInputEnabled: 1 @@ -1717,15 +1664,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 2dd6a517ee866ae45ae8fac60a8d0547, type: 3} m_Name: m_EditorClassIdentifier: - m_InteractionManager: {fileID: 1152038354} + m_InteractionManager: {fileID: 1878270909} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 0 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 1 m_AllowGazeSelect: 0 @@ -1758,42 +1703,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnHoverExited: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectEntered: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectExited: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectCanceled: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -2265,15 +2195,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d9ad66e7cc9a2754d8ea989740c9f00d, type: 3} m_Name: m_EditorClassIdentifier: - m_InteractionManager: {fileID: 1152038354} + m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 1 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -2306,42 +2234,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_Deactivated: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnLastHoverExited: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectEntered: - m_PersistentCalls: - m_Calls: [] - m_OnSelectExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -2456,6 +2369,7 @@ MonoBehaviour: hostTransform: {fileID: 563801817} allowedManipulations: 1 allowedInteractionTypes: -2147483641 + rigidbodyMovementType: 0 applyTorque: 1 springForceSoftness: 0.1 springTorqueSoftness: 0.1 @@ -2473,13 +2387,12 @@ MonoBehaviour: rotateLerpTime: 0.001 scaleLerpTime: 0.001 enableConstraints: 1 - constraintsManager: {fileID: 0} + constraintsManager: {fileID: 376689154} manipulationLogicTypes: moveLogicType: reference: MixedReality.Toolkit.SpatialManipulation.MoveLogic, MixedReality.Toolkit.SpatialManipulation rotateLogicType: - reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, - MixedReality.Toolkit.SpatialManipulation + reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, MixedReality.Toolkit.SpatialManipulation scaleLogicType: reference: MixedReality.Toolkit.SpatialManipulation.ScaleLogic, MixedReality.Toolkit.SpatialManipulation --- !u!114 &376689154 @@ -2837,15 +2750,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 2dd6a517ee866ae45ae8fac60a8d0547, type: 3} m_Name: m_EditorClassIdentifier: - m_InteractionManager: {fileID: 1152038354} + m_InteractionManager: {fileID: 1878270909} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 0 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 1 m_AllowGazeSelect: 0 @@ -2878,42 +2789,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnHoverExited: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectEntered: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectExited: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectCanceled: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -13300,15 +13196,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a415ba6cec0361045be083a0a48abf4f, type: 3} m_Name: m_EditorClassIdentifier: - m_InteractionManager: {fileID: 1152038354} + m_InteractionManager: {fileID: 1878270909} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 0 + m_FocusMode: 1 m_CustomReticle: {fileID: 3867428799850922015, guid: fddee8b412d753e40a02681891de4a7b, type: 3} m_AllowGazeInteraction: 1 m_AllowGazeSelect: 0 @@ -13333,8 +13227,7 @@ MonoBehaviour: m_BoolArgument: 1 m_CallState: 2 - m_Target: {fileID: 1007007020} - m_TargetAssemblyTypeName: MixedReality.Toolkit.Examples.ColorTap, - Assembly-CSharp + m_TargetAssemblyTypeName: MixedReality.Toolkit.Examples.ColorTap, Assembly-CSharp m_MethodName: OnGazeHoverEntered m_Mode: 1 m_Arguments: @@ -13361,8 +13254,7 @@ MonoBehaviour: m_BoolArgument: 0 m_CallState: 2 - m_Target: {fileID: 1007007020} - m_TargetAssemblyTypeName: MixedReality.Toolkit.Examples.ColorTap, - Assembly-CSharp + m_TargetAssemblyTypeName: MixedReality.Toolkit.Examples.ColorTap, Assembly-CSharp m_MethodName: OnGazeHoverExited m_Mode: 1 m_Arguments: @@ -13383,8 +13275,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: - m_Target: {fileID: 1007007020} - m_TargetAssemblyTypeName: MixedReality.Toolkit.Examples.ColorTap, - Assembly-CSharp + m_TargetAssemblyTypeName: MixedReality.Toolkit.Examples.ColorTap, Assembly-CSharp m_MethodName: OnGazePinchEntered m_Mode: 1 m_Arguments: @@ -13399,8 +13290,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: - m_Target: {fileID: 1007007020} - m_TargetAssemblyTypeName: MixedReality.Toolkit.Examples.ColorTap, - Assembly-CSharp + m_TargetAssemblyTypeName: MixedReality.Toolkit.Examples.ColorTap, Assembly-CSharp m_MethodName: OnGazePinchExited m_Mode: 1 m_Arguments: @@ -13441,42 +13331,27 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - m_Activated: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_Deactivated: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnLastHoverExited: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectEntered: - m_PersistentCalls: - m_Calls: [] - m_OnSelectExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -13665,7 +13540,7 @@ MonoBehaviour: k__BackingField: m_PersistentCalls: m_Calls: [] - gazeInteractor: {fileID: 42435681} + gazeInteractor: {fileID: 1878270910} useEyeSupportedTargetPlacement: 1 minLookAwayDistToEnableEyeWarp: 5 handInputEnabled: 1 @@ -13922,17 +13797,6 @@ Transform: m_Father: {fileID: 1856399375} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1152038354 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 5569439093497552269, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - m_PrefabInstance: {fileID: 1530487694} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 83e4e6cca11330d4088d729ab4fc9d9f, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1001 &1176626741 PrefabInstance: m_ObjectHideFlags: 0 @@ -14125,15 +13989,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a415ba6cec0361045be083a0a48abf4f, type: 3} m_Name: m_EditorClassIdentifier: - m_InteractionManager: {fileID: 1152038354} + m_InteractionManager: {fileID: 1878270909} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 0 + m_FocusMode: 1 m_CustomReticle: {fileID: 3867428799850922015, guid: fddee8b412d753e40a02681891de4a7b, type: 3} m_AllowGazeInteraction: 1 m_AllowGazeSelect: 0 @@ -14158,8 +14020,7 @@ MonoBehaviour: m_BoolArgument: 1 m_CallState: 2 - m_Target: {fileID: 1196524889} - m_TargetAssemblyTypeName: MixedReality.Toolkit.Examples.ColorTap, - Assembly-CSharp + m_TargetAssemblyTypeName: MixedReality.Toolkit.Examples.ColorTap, Assembly-CSharp m_MethodName: OnGazeHoverEntered m_Mode: 1 m_Arguments: @@ -14186,8 +14047,7 @@ MonoBehaviour: m_BoolArgument: 0 m_CallState: 2 - m_Target: {fileID: 1196524889} - m_TargetAssemblyTypeName: MixedReality.Toolkit.Examples.ColorTap, - Assembly-CSharp + m_TargetAssemblyTypeName: MixedReality.Toolkit.Examples.ColorTap, Assembly-CSharp m_MethodName: OnGazeHoverExited m_Mode: 1 m_Arguments: @@ -14208,8 +14068,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: - m_Target: {fileID: 1196524889} - m_TargetAssemblyTypeName: MixedReality.Toolkit.Examples.ColorTap, - Assembly-CSharp + m_TargetAssemblyTypeName: MixedReality.Toolkit.Examples.ColorTap, Assembly-CSharp m_MethodName: OnGazePinchEntered m_Mode: 1 m_Arguments: @@ -14224,8 +14083,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: - m_Target: {fileID: 1196524889} - m_TargetAssemblyTypeName: MixedReality.Toolkit.Examples.ColorTap, - Assembly-CSharp + m_TargetAssemblyTypeName: MixedReality.Toolkit.Examples.ColorTap, Assembly-CSharp m_MethodName: OnGazePinchExited m_Mode: 1 m_Arguments: @@ -14266,42 +14124,27 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_OnHoverEntered: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_OnHoverExited: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectEntered: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -14490,7 +14333,7 @@ MonoBehaviour: k__BackingField: m_PersistentCalls: m_Calls: [] - gazeInteractor: {fileID: 42435681} + gazeInteractor: {fileID: 1878270910} useEyeSupportedTargetPlacement: 1 minLookAwayDistToEnableEyeWarp: 5 handInputEnabled: 1 @@ -15043,15 +14886,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 2dd6a517ee866ae45ae8fac60a8d0547, type: 3} m_Name: m_EditorClassIdentifier: - m_InteractionManager: {fileID: 1152038354} + m_InteractionManager: {fileID: 1878270909} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 0 + m_FocusMode: 1 m_CustomReticle: {fileID: 3867428799850922015, guid: fddee8b412d753e40a02681891de4a7b, type: 3} m_AllowGazeInteraction: 1 m_AllowGazeSelect: 0 @@ -15084,42 +14925,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnHoverExited: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectEntered: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectExited: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectCanceled: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -15230,95 +15056,6 @@ MonoBehaviour: k__BackingField: m_PersistentCalls: m_Calls: [] ---- !u!1001 &1530487694 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720334, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_Name - value: MRTK XR Rig - objectReference: {fileID: 0} - - target: {fileID: 4102833070697430761, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: precision - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 4102833070697430761, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_MaxRaycastDistance - value: 40 - objectReference: {fileID: 0} - - target: {fileID: 5334666798807300184, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6056176063914695530, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7304020826145247389, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_Model - value: - objectReference: {fileID: 0} - - target: {fileID: 7304020826145247389, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_EnableInputActions - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7720573869748407015, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_InteractionManager - value: - objectReference: {fileID: 1152038354} - - target: {fileID: 8479077998186684813, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} --- !u!1 &1577239094 GameObject: m_ObjectHideFlags: 0 @@ -20209,7 +19946,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7895759338294865978, guid: 882e525521c52cb4ab9230fe77b5cd72, type: 3} propertyPath: m_LocalScale.x - value: 0.1400001 + value: 0.14000012 objectReference: {fileID: 0} - target: {fileID: 7895759338294865978, guid: 882e525521c52cb4ab9230fe77b5cd72, type: 3} propertyPath: m_LocalPosition.x @@ -35035,15 +34772,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a415ba6cec0361045be083a0a48abf4f, type: 3} m_Name: m_EditorClassIdentifier: - m_InteractionManager: {fileID: 1152038354} + m_InteractionManager: {fileID: 1878270909} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 0 + m_FocusMode: 1 m_CustomReticle: {fileID: 3867428799850922015, guid: fddee8b412d753e40a02681891de4a7b, type: 3} m_AllowGazeInteraction: 1 m_AllowGazeSelect: 0 @@ -35068,8 +34803,7 @@ MonoBehaviour: m_BoolArgument: 1 m_CallState: 2 - m_Target: {fileID: 1857432981} - m_TargetAssemblyTypeName: MixedReality.Toolkit.Examples.ColorTap, - Assembly-CSharp + m_TargetAssemblyTypeName: MixedReality.Toolkit.Examples.ColorTap, Assembly-CSharp m_MethodName: OnGazeHoverEntered m_Mode: 1 m_Arguments: @@ -35096,8 +34830,7 @@ MonoBehaviour: m_BoolArgument: 0 m_CallState: 2 - m_Target: {fileID: 1857432981} - m_TargetAssemblyTypeName: MixedReality.Toolkit.Examples.ColorTap, - Assembly-CSharp + m_TargetAssemblyTypeName: MixedReality.Toolkit.Examples.ColorTap, Assembly-CSharp m_MethodName: OnGazeHoverExited m_Mode: 1 m_Arguments: @@ -35118,8 +34851,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: - m_Target: {fileID: 1857432981} - m_TargetAssemblyTypeName: MixedReality.Toolkit.Examples.ColorTap, - Assembly-CSharp + m_TargetAssemblyTypeName: MixedReality.Toolkit.Examples.ColorTap, Assembly-CSharp m_MethodName: OnGazePinchEntered m_Mode: 1 m_Arguments: @@ -35134,8 +34866,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: - m_Target: {fileID: 1857432981} - m_TargetAssemblyTypeName: MixedReality.Toolkit.Examples.ColorTap, - Assembly-CSharp + m_TargetAssemblyTypeName: MixedReality.Toolkit.Examples.ColorTap, Assembly-CSharp m_MethodName: OnGazePinchExited m_Mode: 1 m_Arguments: @@ -35176,42 +34907,27 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnHoverEntered: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_OnHoverExited: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectEntered: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -35400,7 +35116,7 @@ MonoBehaviour: k__BackingField: m_PersistentCalls: m_Calls: [] - gazeInteractor: {fileID: 42435681} + gazeInteractor: {fileID: 1878270910} useEyeSupportedTargetPlacement: 1 minLookAwayDistToEnableEyeWarp: 5 handInputEnabled: 1 @@ -35622,6 +35338,89 @@ MonoBehaviour: idleStateColor: {r: 0, g: 0.17254902, b: 1, a: 1} onHoverColor: {r: 0, g: 0.11623976, b: 0.6509434, a: 1} onSelectColor: {r: 0.4713927, g: 0, b: 0.764151, a: 1} +--- !u!1001 &1878270908 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720334, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_Name + value: MRTK XR Rig + objectReference: {fileID: 0} + - target: {fileID: 8479077998186684813, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} +--- !u!114 &1878270909 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 800708247703322884, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + m_PrefabInstance: {fileID: 1878270908} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 83e4e6cca11330d4088d729ab4fc9d9f, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &1878270910 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 529201713281613631, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + m_PrefabInstance: {fileID: 1878270908} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1175590bcfccd6d44a4c8f9a15292536, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1888760292 GameObject: m_ObjectHideFlags: 0 @@ -36071,15 +35870,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a415ba6cec0361045be083a0a48abf4f, type: 3} m_Name: m_EditorClassIdentifier: - m_InteractionManager: {fileID: 1152038354} + m_InteractionManager: {fileID: 1878270909} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 0 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 1 m_AllowGazeSelect: 0 @@ -36104,8 +35901,7 @@ MonoBehaviour: m_BoolArgument: 1 m_CallState: 2 - m_Target: {fileID: 2004111541} - m_TargetAssemblyTypeName: MixedReality.Toolkit.Examples.ColorTap, - Assembly-CSharp + m_TargetAssemblyTypeName: MixedReality.Toolkit.Examples.ColorTap, Assembly-CSharp m_MethodName: OnGazeHoverEntered m_Mode: 1 m_Arguments: @@ -36132,8 +35928,7 @@ MonoBehaviour: m_BoolArgument: 0 m_CallState: 2 - m_Target: {fileID: 2004111541} - m_TargetAssemblyTypeName: MixedReality.Toolkit.Examples.ColorTap, - Assembly-CSharp + m_TargetAssemblyTypeName: MixedReality.Toolkit.Examples.ColorTap, Assembly-CSharp m_MethodName: OnGazeHoverExited m_Mode: 1 m_Arguments: @@ -36154,8 +35949,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: - m_Target: {fileID: 2004111541} - m_TargetAssemblyTypeName: MixedReality.Toolkit.Examples.ColorTap, - Assembly-CSharp + m_TargetAssemblyTypeName: MixedReality.Toolkit.Examples.ColorTap, Assembly-CSharp m_MethodName: OnGazePinchEntered m_Mode: 1 m_Arguments: @@ -36170,8 +35964,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: - m_Target: {fileID: 2004111541} - m_TargetAssemblyTypeName: MixedReality.Toolkit.Examples.ColorTap, - Assembly-CSharp + m_TargetAssemblyTypeName: MixedReality.Toolkit.Examples.ColorTap, Assembly-CSharp m_MethodName: OnGazePinchExited m_Mode: 1 m_Arguments: @@ -36212,42 +36005,27 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - m_Activated: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_Deactivated: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnLastHoverExited: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectEntered: - m_PersistentCalls: - m_Calls: [] - m_OnSelectExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -36436,7 +36214,7 @@ MonoBehaviour: k__BackingField: m_PersistentCalls: m_Calls: [] - gazeInteractor: {fileID: 42435681} + gazeInteractor: {fileID: 1878270910} useEyeSupportedTargetPlacement: 1 minLookAwayDistToEnableEyeWarp: 5 handInputEnabled: 1 @@ -36788,15 +36566,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 2dd6a517ee866ae45ae8fac60a8d0547, type: 3} m_Name: m_EditorClassIdentifier: - m_InteractionManager: {fileID: 1152038354} + m_InteractionManager: {fileID: 1878270909} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 0 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 1 m_AllowGazeSelect: 0 @@ -36829,42 +36605,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_Deactivated: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnLastHoverExited: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectEntered: - m_PersistentCalls: - m_Calls: [] - m_OnSelectExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: diff --git a/UnityProjects/MRTKDevTemplate/Assets/Scenes/EyeTracking/EyeTrackingTargetSelectionExample.unity b/UnityProjects/MRTKDevTemplate/Assets/Scenes/EyeTracking/EyeTrackingTargetSelectionExample.unity index d76be34d4..2ffe0affa 100644 --- a/UnityProjects/MRTKDevTemplate/Assets/Scenes/EyeTracking/EyeTrackingTargetSelectionExample.unity +++ b/UnityProjects/MRTKDevTemplate/Assets/Scenes/EyeTracking/EyeTrackingTargetSelectionExample.unity @@ -495,6 +495,67 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} +--- !u!1001 &759818305 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720334, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_Name + value: MRTK XR Rig + objectReference: {fileID: 0} + - target: {fileID: 8479077998186684813, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} --- !u!1001 &904301779 PrefabInstance: m_ObjectHideFlags: 0 @@ -566,17 +627,6 @@ Transform: m_Father: {fileID: 563801817} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1152038354 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 5569439093497552269, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - m_PrefabInstance: {fileID: 1530487694} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 83e4e6cca11330d4088d729ab4fc9d9f, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &1486523323 GameObject: m_ObjectHideFlags: 0 @@ -610,95 +660,6 @@ Transform: m_Father: {fileID: 563801817} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &1530487694 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720334, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_Name - value: MRTK XR Rig - objectReference: {fileID: 0} - - target: {fileID: 4102833070697430761, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: precision - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 4102833070697430761, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_MaxRaycastDistance - value: 40 - objectReference: {fileID: 0} - - target: {fileID: 5334666798807300184, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6056176063914695530, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7304020826145247389, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_Model - value: - objectReference: {fileID: 0} - - target: {fileID: 7304020826145247389, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_EnableInputActions - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7720573869748407015, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_InteractionManager - value: - objectReference: {fileID: 1152038354} - - target: {fileID: 8479077998186684813, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} --- !u!1001 &1737121329 PrefabInstance: m_ObjectHideFlags: 0 @@ -859,15 +820,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d9ad66e7cc9a2754d8ea989740c9f00d, type: 3} m_Name: m_EditorClassIdentifier: - m_InteractionManager: {fileID: 1152038354} + m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 1 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -900,42 +859,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnHoverExited: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectEntered: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectExited: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectCanceled: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -1050,6 +994,7 @@ MonoBehaviour: hostTransform: {fileID: 563801817} allowedManipulations: 1 allowedInteractionTypes: -2147483641 + rigidbodyMovementType: 0 applyTorque: 1 springForceSoftness: 0.1 springTorqueSoftness: 0.1 @@ -1072,8 +1017,7 @@ MonoBehaviour: moveLogicType: reference: MixedReality.Toolkit.SpatialManipulation.MoveLogic, MixedReality.Toolkit.SpatialManipulation rotateLogicType: - reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, - MixedReality.Toolkit.SpatialManipulation + reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, MixedReality.Toolkit.SpatialManipulation scaleLogicType: reference: MixedReality.Toolkit.SpatialManipulation.ScaleLogic, MixedReality.Toolkit.SpatialManipulation --- !u!114 &1737121335 @@ -1411,7 +1355,7 @@ PrefabInstance: - target: {fileID: 4091664850906067342, guid: 05fbbb687f366c5499829e1b78065bd0, type: 3} propertyPath: m_InteractionManager value: - objectReference: {fileID: 1152038354} + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 05fbbb687f366c5499829e1b78065bd0, type: 3} --- !u!1001 &6674691430074130123 @@ -1481,7 +1425,7 @@ PrefabInstance: - target: {fileID: 5941023475792674562, guid: 6102b26b85c007d41a8472c839272fee, type: 3} propertyPath: m_InteractionManager value: - objectReference: {fileID: 1152038354} + objectReference: {fileID: 0} - target: {fileID: 7847039400930239022, guid: 6102b26b85c007d41a8472c839272fee, type: 3} propertyPath: m_RootOrder value: 2 @@ -1751,7 +1695,7 @@ PrefabInstance: - target: {fileID: 5879030968845645572, guid: e408c5b5ebddbab48a20adb8f2d31192, type: 3} propertyPath: m_InteractionManager value: - objectReference: {fileID: 1152038354} + objectReference: {fileID: 0} - target: {fileID: 8787754652671033235, guid: e408c5b5ebddbab48a20adb8f2d31192, type: 3} propertyPath: m_RootOrder value: 1 diff --git a/UnityProjects/MRTKDevTemplate/Assets/Scenes/EyeTracking/EyeTrackingVisualizerExample.unity b/UnityProjects/MRTKDevTemplate/Assets/Scenes/EyeTracking/EyeTrackingVisualizerExample.unity index e6a71f90d..dd6af0f44 100644 --- a/UnityProjects/MRTKDevTemplate/Assets/Scenes/EyeTracking/EyeTrackingVisualizerExample.unity +++ b/UnityProjects/MRTKDevTemplate/Assets/Scenes/EyeTracking/EyeTrackingVisualizerExample.unity @@ -123,6 +123,78 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1001 &99326521 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720334, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_Name + value: MRTK XR Rig + objectReference: {fileID: 0} + - target: {fileID: 8479077998186684813, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} +--- !u!114 &99326522 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 529201713281613631, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + m_PrefabInstance: {fileID: 99326521} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1175590bcfccd6d44a4c8f9a15292536, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &149182377 PrefabInstance: m_ObjectHideFlags: 0 @@ -408,74 +480,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} ---- !u!1001 &525252187 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720334, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_Name - value: MRTK XR Rig - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} ---- !u!114 &525252188 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 5569439093497552269, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - m_PrefabInstance: {fileID: 525252187} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 83e4e6cca11330d4088d729ab4fc9d9f, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &705507993 GameObject: m_ObjectHideFlags: 0 @@ -683,17 +687,6 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1517009107 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 4102833070697430761, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - m_PrefabInstance: {fileID: 525252187} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1175590bcfccd6d44a4c8f9a15292536, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1001 &1540434733 PrefabInstance: m_ObjectHideFlags: 0 @@ -893,15 +886,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d9ad66e7cc9a2754d8ea989740c9f00d, type: 3} m_Name: m_EditorClassIdentifier: - m_InteractionManager: {fileID: 525252188} + m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 1 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -934,42 +925,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_Deactivated: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnLastHoverExited: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectEntered: - m_PersistentCalls: - m_Calls: [] - m_OnSelectExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -1084,6 +1060,7 @@ MonoBehaviour: hostTransform: {fileID: 1396832895} allowedManipulations: 7 allowedInteractionTypes: -2147483641 + rigidbodyMovementType: 0 applyTorque: 1 springForceSoftness: 0.1 springTorqueSoftness: 0.1 @@ -1106,8 +1083,7 @@ MonoBehaviour: moveLogicType: reference: MixedReality.Toolkit.SpatialManipulation.MoveLogic, MixedReality.Toolkit.SpatialManipulation rotateLogicType: - reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, - MixedReality.Toolkit.SpatialManipulation + reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, MixedReality.Toolkit.SpatialManipulation scaleLogicType: reference: MixedReality.Toolkit.SpatialManipulation.ScaleLogic, MixedReality.Toolkit.SpatialManipulation --- !u!114 &1544308324 @@ -1296,7 +1272,7 @@ PrefabInstance: - target: {fileID: 1524931721158149771, guid: 7fee940c81bcd264699d55f5dacdcf88, type: 3} propertyPath: m_InteractionManager value: - objectReference: {fileID: 525252188} + objectReference: {fileID: 0} - target: {fileID: 3200108193205774659, guid: 7fee940c81bcd264699d55f5dacdcf88, type: 3} propertyPath: m_Name value: LiveTrackingSample @@ -1488,7 +1464,7 @@ PrefabInstance: - target: {fileID: 9111033687875367441, guid: 0745c2d3ca133584e996e8cd69f6d0aa, type: 3} propertyPath: gazeInteractor value: - objectReference: {fileID: 1517009107} + objectReference: {fileID: 99326522} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 0745c2d3ca133584e996e8cd69f6d0aa, type: 3} --- !u!4 &7887614037481751900 stripped diff --git a/UnityProjects/MRTKDevTemplate/Assets/Scenes/FontIconExample.unity b/UnityProjects/MRTKDevTemplate/Assets/Scenes/FontIconExample.unity index 1436db87a..28d9256ae 100644 --- a/UnityProjects/MRTKDevTemplate/Assets/Scenes/FontIconExample.unity +++ b/UnityProjects/MRTKDevTemplate/Assets/Scenes/FontIconExample.unity @@ -2368,13 +2368,11 @@ MonoBehaviour: m_EditorClassIdentifier: m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 1 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -2407,42 +2405,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnHoverEntered: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_OnHoverExited: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectEntered: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectExited: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -2628,67 +2611,6 @@ MonoBehaviour: minimumScale: {x: 0.2, y: 0.2, z: 0.2} maximumScale: {x: 2, y: 2, z: 2} relativeToInitialState: 1 ---- !u!1001 &1090894842 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720334, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_Name - value: MRTK XR Rig - objectReference: {fileID: 0} - - target: {fileID: 8479077998186684813, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} --- !u!1001 &1098705068 PrefabInstance: m_ObjectHideFlags: 0 @@ -3020,6 +2942,67 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &1266722034 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720334, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_Name + value: MRTK XR Rig + objectReference: {fileID: 0} + - target: {fileID: 8479077998186684813, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} --- !u!1 &1268994938 GameObject: m_ObjectHideFlags: 0 diff --git a/UnityProjects/MRTKDevTemplate/Assets/Scenes/HandInteractionExamples.unity b/UnityProjects/MRTKDevTemplate/Assets/Scenes/HandInteractionExamples.unity index 8cd7f0466..9afb8a7df 100644 --- a/UnityProjects/MRTKDevTemplate/Assets/Scenes/HandInteractionExamples.unity +++ b/UnityProjects/MRTKDevTemplate/Assets/Scenes/HandInteractionExamples.unity @@ -13,7 +13,7 @@ OcclusionCullingSettings: --- !u!104 &2 RenderSettings: m_ObjectHideFlags: 0 - serializedVersion: 9 + serializedVersion: 10 m_Fog: 0 m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} m_FogMode: 3 @@ -38,13 +38,12 @@ 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_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 12 - m_GIWorkflowMode: 1 + serializedVersion: 13 + m_BakeOnSceneLoad: 0 m_GISettings: serializedVersion: 2 m_BounceScale: 1 @@ -67,9 +66,6 @@ LightmapSettings: m_LightmapParameters: {fileID: 0} m_LightmapsBakeMode: 1 m_TextureCompression: 1 - m_FinalGather: 0 - m_FinalGatherFiltering: 1 - m_FinalGatherRayCount: 256 m_ReflectionCompression: 2 m_MixedBakeMode: 2 m_BakeBackend: 1 @@ -97,14 +93,14 @@ LightmapSettings: m_ExportTrainingData: 0 m_TrainingDataDestination: TrainingData m_LightProbeSampleCountMultiplier: 4 - m_LightingDataAsset: {fileID: 0} + m_LightingDataAsset: {fileID: 20201, guid: 0000000000000000f000000000000000, type: 0} m_LightingSettings: {fileID: 0} --- !u!196 &4 NavMeshSettings: serializedVersion: 2 m_ObjectHideFlags: 0 m_BuildSettings: - serializedVersion: 2 + serializedVersion: 3 agentTypeID: 0 agentRadius: 0.5 agentHeight: 2 @@ -117,7 +113,7 @@ NavMeshSettings: cellSize: 0.16666667 manualTileSize: 0 tileSize: 256 - accuratePlacement: 0 + buildHeightMesh: 0 maxJobWorkers: 0 preserveTilesOutsideBounds: 0 debug: @@ -151,6 +147,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5174431} + serializedVersion: 2 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} @@ -159,7 +156,6 @@ Transform: - {fileID: 1710053220} - {fileID: 1998461902} m_Father: {fileID: 1203713056} - m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: -45, z: 0} --- !u!1 &6284416 GameObject: @@ -185,13 +181,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6284416} + serializedVersion: 2 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 m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} --- !u!212 &6284418 SpriteRenderer: @@ -210,6 +206,9 @@ SpriteRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -270,13 +269,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 37486930} + serializedVersion: 2 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 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!23 &37486933 MeshRenderer: @@ -295,6 +294,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -346,9 +348,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 76807523} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 0.10026801, y: 0.082757965, z: 0.093791895} m_Center: {x: -0.00011960028, y: -0.000000057742, z: -0.008266095} --- !u!1 &76865735 @@ -382,7 +392,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 150862479} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -449,20 +458,23 @@ MonoBehaviour: m_VerticalAlignment: 256 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 0 m_isCullingEnabled: 0 @@ -500,6 +512,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -530,6 +545,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1727403011} m_Modifications: - target: {fileID: 100002, guid: 6ceef383a3dfd0a4e9c38b8d793170e4, type: 3} @@ -597,14 +613,44 @@ PrefabInstance: value: -1.22 objectReference: {fileID: 0} - target: {fileID: 2300000, guid: 6ceef383a3dfd0a4e9c38b8d793170e4, type: 3} - propertyPath: m_Materials.Array.data[0] + propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: cfecafee97b1bac42be6698465e5bd45, type: 2} - target: {fileID: 2300002, guid: 6ceef383a3dfd0a4e9c38b8d793170e4, type: 3} - propertyPath: m_Materials.Array.data[0] + propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: edc81f8444b03444eae776bfc3a3dd00, type: 2} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 400004, guid: 6ceef383a3dfd0a4e9c38b8d793170e4, type: 3} + insertIndex: -1 + addedObject: {fileID: 37486931} + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 100002, guid: 6ceef383a3dfd0a4e9c38b8d793170e4, type: 3} + insertIndex: -1 + addedObject: {fileID: 79416687} + - targetCorrespondingSourceObject: {fileID: 100002, guid: 6ceef383a3dfd0a4e9c38b8d793170e4, type: 3} + insertIndex: -1 + addedObject: {fileID: 79416690} + - targetCorrespondingSourceObject: {fileID: 100002, guid: 6ceef383a3dfd0a4e9c38b8d793170e4, type: 3} + insertIndex: -1 + addedObject: {fileID: 79416686} + - targetCorrespondingSourceObject: {fileID: 100002, guid: 6ceef383a3dfd0a4e9c38b8d793170e4, type: 3} + insertIndex: -1 + addedObject: {fileID: 79416688} + - targetCorrespondingSourceObject: {fileID: 100002, guid: 6ceef383a3dfd0a4e9c38b8d793170e4, type: 3} + insertIndex: -1 + addedObject: {fileID: 79416689} + - targetCorrespondingSourceObject: {fileID: 100002, guid: 6ceef383a3dfd0a4e9c38b8d793170e4, type: 3} + insertIndex: -1 + addedObject: {fileID: 79416691} + - targetCorrespondingSourceObject: {fileID: 100002, guid: 6ceef383a3dfd0a4e9c38b8d793170e4, type: 3} + insertIndex: -1 + addedObject: {fileID: 79416692} + - targetCorrespondingSourceObject: {fileID: 100004, guid: 6ceef383a3dfd0a4e9c38b8d793170e4, type: 3} + insertIndex: -1 + addedObject: {fileID: 1146931006} m_SourcePrefab: {fileID: 100100000, guid: 6ceef383a3dfd0a4e9c38b8d793170e4, type: 3} --- !u!4 &79416684 stripped Transform: @@ -637,10 +683,21 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 79416685} - serializedVersion: 2 + serializedVersion: 4 m_Mass: 0.1 m_Drag: 0 m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 m_UseGravity: 1 m_IsKinematic: 0 m_Interpolate: 1 @@ -673,13 +730,11 @@ MonoBehaviour: m_EditorClassIdentifier: m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 1 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -736,42 +791,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnHoverExited: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectEntered: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectExited: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectCanceled: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -964,6 +1004,9 @@ MonoBehaviour: k__BackingField: 1 allowSelectByVoice: 1 speechRecognitionKeyword: select + k__BackingField: + m_PersistentCalls: + m_Calls: [] k__BackingField: 1 k__BackingField: 0 k__BackingField: @@ -986,6 +1029,7 @@ MonoBehaviour: hostTransform: {fileID: 79416684} allowedManipulations: 7 allowedInteractionTypes: -2147483641 + rigidbodyMovementType: 0 applyTorque: 1 springForceSoftness: 0.1 springTorqueSoftness: 0.1 @@ -1008,8 +1052,7 @@ MonoBehaviour: moveLogicType: reference: MixedReality.Toolkit.SpatialManipulation.MoveLogic, MixedReality.Toolkit.SpatialManipulation rotateLogicType: - reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, - MixedReality.Toolkit.SpatialManipulation + reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, MixedReality.Toolkit.SpatialManipulation scaleLogicType: reference: MixedReality.Toolkit.SpatialManipulation.ScaleLogic, MixedReality.Toolkit.SpatialManipulation --- !u!82 &79416690 @@ -1023,6 +1066,7 @@ AudioSource: serializedVersion: 4 OutputAudioMixerGroup: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} m_audioClip: {fileID: 0} + m_Resource: {fileID: 0} m_PlayOnAwake: 1 m_Volume: 1 m_Pitch: 1 @@ -1200,7 +1244,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1913468802} - m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -1268,20 +1311,23 @@ MonoBehaviour: m_VerticalAlignment: 256 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 0 m_isCullingEnabled: 0 @@ -1319,6 +1365,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1367,6 +1416,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 150862478} + serializedVersion: 2 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} @@ -1379,7 +1429,6 @@ Transform: - {fileID: 1180287156} - {fileID: 4654093213557177395} m_Father: {fileID: 1203713056} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!224 &186579027 stripped RectTransform: @@ -1391,16 +1440,13 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1913468802} m_Modifications: - target: {fileID: 4125495309553998321, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} propertyPath: m_Name value: FlatPanel (1) objectReference: {fileID: 0} - - target: {fileID: 4205010513405509735, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - target: {fileID: 4205010513405509735, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} propertyPath: m_LocalScale.x value: 1 @@ -1470,6 +1516,33 @@ PrefabInstance: value: 0.00014997 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 4205010513405509735, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} + insertIndex: -1 + addedObject: {fileID: 305342091} + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 4125495309553998321, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} + insertIndex: -1 + addedObject: {fileID: 235624898} + - targetCorrespondingSourceObject: {fileID: 4125495309553998321, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} + insertIndex: -1 + addedObject: {fileID: 235624895} + - targetCorrespondingSourceObject: {fileID: 4125495309553998321, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} + insertIndex: -1 + addedObject: {fileID: 235624896} + - targetCorrespondingSourceObject: {fileID: 4125495309553998321, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} + insertIndex: -1 + addedObject: {fileID: 235624897} + - targetCorrespondingSourceObject: {fileID: 4125495309553998321, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} + insertIndex: -1 + addedObject: {fileID: 235624903} + - targetCorrespondingSourceObject: {fileID: 4125495309553998321, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} + insertIndex: -1 + addedObject: {fileID: 235624904} + - targetCorrespondingSourceObject: {fileID: 6056454165148638616, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} + insertIndex: -1 + addedObject: {fileID: 235624894} m_SourcePrefab: {fileID: 100100000, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} --- !u!4 &235624891 stripped Transform: @@ -1494,9 +1567,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 235624892} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 1, y: 0.99999994, z: 0.1} m_Center: {x: 0, y: 0.000000074505806, z: 0.05} --- !u!114 &235624895 @@ -1513,13 +1594,11 @@ MonoBehaviour: m_EditorClassIdentifier: m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 1 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -1552,42 +1631,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnHoverEntered: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_OnHoverExited: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectEntered: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectExited: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -1830,6 +1894,9 @@ MonoBehaviour: k__BackingField: 1 allowSelectByVoice: 1 speechRecognitionKeyword: select + k__BackingField: + m_PersistentCalls: + m_Calls: [] k__BackingField: 1 k__BackingField: 0 k__BackingField: @@ -1852,6 +1919,7 @@ MonoBehaviour: hostTransform: {fileID: 235624891} allowedManipulations: 7 allowedInteractionTypes: -2147483641 + rigidbodyMovementType: 0 applyTorque: 1 springForceSoftness: 0.1 springTorqueSoftness: 0.1 @@ -1874,8 +1942,7 @@ MonoBehaviour: moveLogicType: reference: MixedReality.Toolkit.SpatialManipulation.MoveLogic, MixedReality.Toolkit.SpatialManipulation rotateLogicType: - reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, - MixedReality.Toolkit.SpatialManipulation + reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, MixedReality.Toolkit.SpatialManipulation scaleLogicType: reference: MixedReality.Toolkit.SpatialManipulation.ScaleLogic, MixedReality.Toolkit.SpatialManipulation --- !u!114 &235624896 @@ -1926,6 +1993,16 @@ MonoBehaviour: translateLerpTime: 0.00001 enableConstraints: 1 constraintsManager: {fileID: 235624896} + manipulationLogicTypes: + moveLogicType: + reference: MixedReality.Toolkit.SpatialManipulation.BoundsControlMoveLogic, + MixedReality.Toolkit.SpatialManipulation + rotateLogicType: + reference: MixedReality.Toolkit.SpatialManipulation.BoundsControlRotateLogic, + MixedReality.Toolkit.SpatialManipulation + scaleLogicType: + reference: MixedReality.Toolkit.SpatialManipulation.BoundsControlScaleLogic, + MixedReality.Toolkit.SpatialManipulation manipulationStarted: m_PersistentCalls: m_Calls: [] @@ -1943,6 +2020,7 @@ AudioSource: serializedVersion: 4 OutputAudioMixerGroup: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} m_audioClip: {fileID: 0} + m_Resource: {fileID: 0} m_PlayOnAwake: 1 m_Volume: 1 m_Pitch: 1 @@ -2119,17 +2197,16 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 243610128} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0.0029} + m_LocalRotation: {x: -0, y: -0.38268343, z: -0, w: 0.92387956} + m_LocalPosition: {x: 0, y: 0, z: -0.25979865} m_LocalScale: {x: 0.01, y: 0.01, z: 0.01} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 1583599066} - m_RootOrder: 3 + m_Father: {fileID: 1848983997} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -0.021, y: 0.2228} + m_AnchoredPosition: {x: -0.85889983, y: -0.0048999935} m_SizeDelta: {x: 25.4548, y: 5} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &243610130 @@ -2198,20 +2275,23 @@ MonoBehaviour: m_VerticalAlignment: 256 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 0 m_isCullingEnabled: 0 @@ -2249,6 +2329,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2303,13 +2386,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 305342090} + serializedVersion: 2 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 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &305342092 SpriteRenderer: @@ -2328,6 +2411,9 @@ SpriteRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2379,6 +2465,7 @@ AudioSource: serializedVersion: 4 OutputAudioMixerGroup: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} m_audioClip: {fileID: 0} + m_Resource: {fileID: 0} m_PlayOnAwake: 1 m_Volume: 1 m_Pitch: 1 @@ -2480,6 +2567,7 @@ AudioSource: serializedVersion: 4 OutputAudioMixerGroup: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} m_audioClip: {fileID: 0} + m_Resource: {fileID: 0} m_PlayOnAwake: 1 m_Volume: 1 m_Pitch: 1 @@ -2570,6 +2658,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 782737666} m_Modifications: - target: {fileID: 7017536481509416457, guid: 14887583e6d2db941b221cb765bee7c5, type: 3} @@ -2697,6 +2786,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 14887583e6d2db941b221cb765bee7c5, type: 3} --- !u!224 &392741045 stripped RectTransform: @@ -2727,8 +2819,17 @@ CapsuleCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 422166483} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 + serializedVersion: 2 m_Radius: 0.032281224 m_Height: 0.15444483 m_Direction: 1 @@ -2764,7 +2865,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1852224431} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -2802,9 +2902,9 @@ MonoBehaviour: PressableButtons - use StatefulInteractable''s selection progress to model the compressability of a 3D - pressable surface. These interactables drive selection progress through a combination - of any number of interactors.' + use StatefulInteractable''s selection progress to model the compressability of + a 3D pressable surface. These interactables drive selection progress through + a combination of any number of interactors.' m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 533bdd8d5c92b52448ee2ecf7bd828a4, type: 2} m_sharedMaterial: {fileID: 2100000, guid: b082f80c6b45164418a354f7e116f0a3, type: 2} @@ -2842,20 +2942,23 @@ MonoBehaviour: m_VerticalAlignment: 256 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 0 m_isCullingEnabled: 0 @@ -2893,6 +2996,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2923,6 +3029,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1852224431} m_Modifications: - target: {fileID: 593722386012418505, guid: 7d421b6091df2b5439be946871d23d28, type: 3} @@ -2986,7 +3093,205 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7d421b6091df2b5439be946871d23d28, type: 3} +--- !u!1001 &460835580 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1848983997} + m_Modifications: + - target: {fileID: 1503546110793399400, guid: cd0f0697f0939504389ec612388f609a, type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1503546110793399400, guid: cd0f0697f0939504389ec612388f609a, type: 3} + propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.size + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 1503546110793399400, guid: cd0f0697f0939504389ec612388f609a, type: 3} + propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 1503546110793399400, guid: cd0f0697f0939504389ec612388f609a, type: 3} + propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[1].m_Mode + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 1503546110793399400, guid: cd0f0697f0939504389ec612388f609a, type: 3} + propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 1824793670} + - target: {fileID: 1503546110793399400, guid: cd0f0697f0939504389ec612388f609a, type: 3} + propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[1].m_Target + value: + objectReference: {fileID: 460835582} + - target: {fileID: 1503546110793399400, guid: cd0f0697f0939504389ec612388f609a, type: 3} + propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 1503546110793399400, guid: cd0f0697f0939504389ec612388f609a, type: 3} + propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[1].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 1503546110793399400, guid: cd0f0697f0939504389ec612388f609a, type: 3} + propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: SetActive + objectReference: {fileID: 0} + - target: {fileID: 1503546110793399400, guid: cd0f0697f0939504389ec612388f609a, type: 3} + propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName + value: set_enabled + objectReference: {fileID: 0} + - target: {fileID: 1503546110793399400, guid: cd0f0697f0939504389ec612388f609a, type: 3} + propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: UnityEngine.GameObject, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 1503546110793399400, guid: cd0f0697f0939504389ec612388f609a, type: 3} + propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[1].m_TargetAssemblyTypeName + value: UnityEngine.Behaviour, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 1503546110793399400, guid: cd0f0697f0939504389ec612388f609a, type: 3} + propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_BoolArgument + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1503546110793399400, guid: cd0f0697f0939504389ec612388f609a, type: 3} + propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_BoolArgument + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1503546110793399400, guid: cd0f0697f0939504389ec612388f609a, type: 3} + propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 1503546110793399400, guid: cd0f0697f0939504389ec612388f609a, type: 3} + propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 2244185730444192509, guid: cd0f0697f0939504389ec612388f609a, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2244185730444192511, guid: cd0f0697f0939504389ec612388f609a, type: 3} + propertyPath: m_text + value: Open + objectReference: {fileID: 0} + - target: {fileID: 2244185731031694095, guid: cd0f0697f0939504389ec612388f609a, type: 3} + propertyPath: m_Name + value: WhiteboardExampleButton + objectReference: {fileID: 0} + - target: {fileID: 2244185731585867246, guid: cd0f0697f0939504389ec612388f609a, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2244185731585867246, guid: cd0f0697f0939504389ec612388f609a, type: 3} + propertyPath: m_LocalPosition.x + value: -0.7445607 + objectReference: {fileID: 0} + - target: {fileID: 2244185731585867246, guid: cd0f0697f0939504389ec612388f609a, type: 3} + propertyPath: m_LocalPosition.y + value: -0.008599997 + objectReference: {fileID: 0} + - target: {fileID: 2244185731585867246, guid: cd0f0697f0939504389ec612388f609a, type: 3} + propertyPath: m_LocalPosition.z + value: -0.15521753 + objectReference: {fileID: 0} + - target: {fileID: 2244185731585867246, guid: cd0f0697f0939504389ec612388f609a, type: 3} + propertyPath: m_LocalRotation.w + value: 0.92387956 + objectReference: {fileID: 0} + - target: {fileID: 2244185731585867246, guid: cd0f0697f0939504389ec612388f609a, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2244185731585867246, guid: cd0f0697f0939504389ec612388f609a, type: 3} + propertyPath: m_LocalRotation.y + value: -0.38268343 + objectReference: {fileID: 0} + - target: {fileID: 2244185731585867246, guid: cd0f0697f0939504389ec612388f609a, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2244185731585867246, guid: cd0f0697f0939504389ec612388f609a, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2244185731585867246, guid: cd0f0697f0939504389ec612388f609a, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2244185731585867246, guid: cd0f0697f0939504389ec612388f609a, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6397459067767180594, guid: cd0f0697f0939504389ec612388f609a, type: 3} + propertyPath: m_text + value: "\uF3DE" + objectReference: {fileID: 0} + - target: {fileID: 6397459067767180594, guid: cd0f0697f0939504389ec612388f609a, type: 3} + propertyPath: m_sharedMaterial + value: + objectReference: {fileID: 5762245003366665926, guid: 9b0d0ee11ff70b04d901a29b519cbaa0, type: 2} + - target: {fileID: 6397459067767180594, guid: cd0f0697f0939504389ec612388f609a, type: 3} + propertyPath: m_hasFontAssetChanged + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6663514093482171836, guid: cd0f0697f0939504389ec612388f609a, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7797914476011694290, guid: cd0f0697f0939504389ec612388f609a, type: 3} + propertyPath: currentIconName + value: Icon 85 + objectReference: {fileID: 0} + - target: {fileID: 7855682163667943843, guid: cd0f0697f0939504389ec612388f609a, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 5762245003366665926, guid: 9b0d0ee11ff70b04d901a29b519cbaa0, type: 2} + - target: {fileID: 7867802180497734224, guid: cd0f0697f0939504389ec612388f609a, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9163244421988730544, guid: cd0f0697f0939504389ec612388f609a, type: 3} + propertyPath: Spatialize + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 9163244421988730544, guid: cd0f0697f0939504389ec612388f609a, type: 3} + propertyPath: OutputAudioMixerGroup + value: + objectReference: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} + - target: {fileID: 9163244421988730544, guid: cd0f0697f0939504389ec612388f609a, type: 3} + propertyPath: panLevelCustomCurve.m_Curve.Array.data[0].value + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 2244185730444192509, guid: cd0f0697f0939504389ec612388f609a, type: 3} + insertIndex: -1 + addedObject: {fileID: 0} + - targetCorrespondingSourceObject: {fileID: 4659777866328155393, guid: cd0f0697f0939504389ec612388f609a, type: 3} + insertIndex: -1 + addedObject: {fileID: 0} + m_SourcePrefab: {fileID: 100100000, guid: cd0f0697f0939504389ec612388f609a, type: 3} +--- !u!4 &460835581 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2244185731585867246, guid: cd0f0697f0939504389ec612388f609a, type: 3} + m_PrefabInstance: {fileID: 460835580} + m_PrefabAsset: {fileID: 0} +--- !u!114 &460835582 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 1503546110793399400, guid: cd0f0697f0939504389ec612388f609a, type: 3} + m_PrefabInstance: {fileID: 460835580} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c32e8a7644144f8419bb881ad588ed0e, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!4 &469873930 stripped Transform: m_CorrespondingSourceObject: {fileID: 2415827607033482817, guid: 5be1d1dda43e3ed40b18f4eb09e144fa, type: 3} @@ -2997,6 +3302,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1089489031} m_Modifications: - target: {fileID: 3695091241684208261, guid: a88695280288b5643abe2a6c33bad9cd, type: 3} @@ -3088,6 +3394,12 @@ PrefabInstance: value: UnityEngine.Object, UnityEngine objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 6001337464062027464, guid: a88695280288b5643abe2a6c33bad9cd, type: 3} + insertIndex: -1 + addedObject: {fileID: 0} m_SourcePrefab: {fileID: 100100000, guid: a88695280288b5643abe2a6c33bad9cd, type: 3} --- !u!4 &502884643 stripped Transform: @@ -3099,12 +3411,9 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 3493013819197874656, guid: ad5b753b73e311143a85055b15cea562, type: 3} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - target: {fileID: 3493013819197874656, guid: ad5b753b73e311143a85055b15cea562, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 @@ -3122,6 +3431,9 @@ PrefabInstance: value: MRTKInputSimulator objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: ad5b753b73e311143a85055b15cea562, type: 3} --- !u!1 &563549573 GameObject: @@ -3156,13 +3468,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 563549573} + serializedVersion: 2 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 m_LocalEulerAnglesHint: {x: 0, y: -29.743002, z: 0} --- !u!82 &563549575 AudioSource: @@ -3175,6 +3487,7 @@ AudioSource: serializedVersion: 4 OutputAudioMixerGroup: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} m_audioClip: {fileID: 0} + m_Resource: {fileID: 0} m_PlayOnAwake: 1 m_Volume: 1 m_Pitch: 1 @@ -3274,13 +3587,11 @@ MonoBehaviour: m_EditorClassIdentifier: m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 1 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -3361,42 +3672,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnHoverExited: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectEntered: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectExited: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectCanceled: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -3585,6 +3881,9 @@ MonoBehaviour: k__BackingField: 1 allowSelectByVoice: 1 speechRecognitionKeyword: select + k__BackingField: + m_PersistentCalls: + m_Calls: [] k__BackingField: 1 k__BackingField: 0 k__BackingField: @@ -3607,6 +3906,7 @@ MonoBehaviour: hostTransform: {fileID: 563549574} allowedManipulations: 7 allowedInteractionTypes: -2147483641 + rigidbodyMovementType: 0 applyTorque: 1 springForceSoftness: 0.1 springTorqueSoftness: 0.1 @@ -3629,8 +3929,7 @@ MonoBehaviour: moveLogicType: reference: MixedReality.Toolkit.SpatialManipulation.MoveLogic, MixedReality.Toolkit.SpatialManipulation rotateLogicType: - reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, - MixedReality.Toolkit.SpatialManipulation + reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, MixedReality.Toolkit.SpatialManipulation scaleLogicType: reference: MixedReality.Toolkit.SpatialManipulation.ScaleLogic, MixedReality.Toolkit.SpatialManipulation --- !u!114 &563549577 @@ -3654,10 +3953,21 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 563549573} - serializedVersion: 2 + serializedVersion: 4 m_Mass: 0.1 m_Drag: 1 m_AngularDrag: 1 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 m_UseGravity: 1 m_IsKinematic: 0 m_Interpolate: 1 @@ -3671,9 +3981,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 563549573} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0, y: 0, z: 0} --- !u!23 &563549580 @@ -3693,6 +4011,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -3821,6 +4142,7 @@ AudioSource: serializedVersion: 4 OutputAudioMixerGroup: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} m_audioClip: {fileID: 0} + m_Resource: {fileID: 0} m_PlayOnAwake: 1 m_Volume: 1 m_Pitch: 1 @@ -3911,6 +4233,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1404428861} m_Modifications: - target: {fileID: 2712310172936119071, guid: 698c502bf492aec45af6a7b04219d34b, type: 3} @@ -4090,7 +4413,7 @@ PrefabInstance: value: UnityEngine.AudioClip, UnityEngine objectReference: {fileID: 0} - target: {fileID: 3409721415966526836, guid: 698c502bf492aec45af6a7b04219d34b, type: 3} - propertyPath: m_Materials.Array.data[0] + propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: aed69361010390840abc588081f8e964, type: 2} - target: {fileID: 4639606898651727610, guid: 698c502bf492aec45af6a7b04219d34b, type: 3} @@ -4142,6 +4465,12 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 4639606898651727610, guid: 698c502bf492aec45af6a7b04219d34b, type: 3} + insertIndex: -1 + addedObject: {fileID: 343732524} m_SourcePrefab: {fileID: 100100000, guid: 698c502bf492aec45af6a7b04219d34b, type: 3} --- !u!4 &607222683 stripped Transform: @@ -4161,9 +4490,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 624982108} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 1, y: 0.99999994, z: 0.1} m_Center: {x: 0, y: 0.000000074505806, z: 0.05} --- !u!1001 &663760220 @@ -4171,6 +4508,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1913468802} m_Modifications: - target: {fileID: 251265376, guid: 0d3b2fd2079cd514d8dbce654f929320, type: 3} @@ -4189,10 +4527,6 @@ PrefabInstance: propertyPath: panLevelCustomCurve.m_Curve.Array.data[0].value value: 1 objectReference: {fileID: 0} - - target: {fileID: 1214529608091387485, guid: 0d3b2fd2079cd514d8dbce654f929320, type: 3} - propertyPath: m_RootOrder - value: 4 - objectReference: {fileID: 0} - target: {fileID: 1214529608091387485, guid: 0d3b2fd2079cd514d8dbce654f929320, type: 3} propertyPath: m_LocalPosition.x value: -0.406 @@ -4238,6 +4572,9 @@ PrefabInstance: value: CoffeeBoundsControl (1) objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 0d3b2fd2079cd514d8dbce654f929320, type: 3} --- !u!1 &665858362 GameObject: @@ -4270,7 +4607,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 782737666} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -4338,20 +4674,23 @@ MonoBehaviour: m_VerticalAlignment: 256 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 0 m_isCullingEnabled: 0 @@ -4389,6 +4728,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4444,9 +4786,8 @@ Light: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 705507993} m_Enabled: 1 - serializedVersion: 10 + serializedVersion: 11 m_Type: 1 - m_Shape: 0 m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1} m_Intensity: 1 m_Range: 10 @@ -4496,8 +4837,12 @@ Light: m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 m_UseViewFrustumForShadowCasterCull: 1 + m_ForceVisible: 0 m_ShadowRadius: 0 m_ShadowAngle: 0 + m_LightUnit: 1 + m_LuxAtDistance: 1 + m_EnableSpotReflector: 1 --- !u!4 &705507995 Transform: m_ObjectHideFlags: 0 @@ -4505,13 +4850,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 705507993} + serializedVersion: 2 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 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} --- !u!1 &730431820 GameObject: @@ -4544,7 +4889,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1913468802} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -4612,20 +4956,23 @@ MonoBehaviour: m_VerticalAlignment: 256 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 0 m_isCullingEnabled: 0 @@ -4663,6 +5010,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4703,12 +5053,9 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 7781529056550460865, guid: c07c4bd04b45c014fad0e3cd30747f06, type: 3} - propertyPath: m_RootOrder - value: 6 - objectReference: {fileID: 0} - target: {fileID: 7781529056550460865, guid: c07c4bd04b45c014fad0e3cd30747f06, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -4758,6 +5105,12 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 7781529056550460865, guid: c07c4bd04b45c014fad0e3cd30747f06, type: 3} + insertIndex: -1 + addedObject: {fileID: 1551252957} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07c4bd04b45c014fad0e3cd30747f06, type: 3} --- !u!1 &782737665 GameObject: @@ -4782,6 +5135,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 782737665} + serializedVersion: 2 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} @@ -4792,7 +5146,6 @@ Transform: - {fileID: 2128020770} - {fileID: 392741045} m_Father: {fileID: 1203713056} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: -45, z: 0} --- !u!1 &828245819 GameObject: @@ -4825,7 +5178,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1913468802} - m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -4893,20 +5245,23 @@ MonoBehaviour: m_VerticalAlignment: 256 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 0 m_isCullingEnabled: 0 @@ -4944,6 +5299,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4974,6 +5332,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 150862479} m_Modifications: - target: {fileID: 3482465368609989420, guid: 8beb1e0a00bf1eb42921a53ffb52bdeb, type: 3} @@ -5041,10 +5400,22 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} - target: {fileID: 5486639398703893882, guid: 8beb1e0a00bf1eb42921a53ffb52bdeb, type: 3} - propertyPath: m_Materials.Array.data[0] + propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: b499c1bdbc12cd648937c46a2a6f8b01, type: 2} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 3482465368609989420, guid: 8beb1e0a00bf1eb42921a53ffb52bdeb, type: 3} + insertIndex: -1 + addedObject: {fileID: 1256458038} + - targetCorrespondingSourceObject: {fileID: 3482465368609989420, guid: 8beb1e0a00bf1eb42921a53ffb52bdeb, type: 3} + insertIndex: -1 + addedObject: {fileID: 1256458039} + - targetCorrespondingSourceObject: {fileID: 7047533903058496966, guid: 8beb1e0a00bf1eb42921a53ffb52bdeb, type: 3} + insertIndex: -1 + addedObject: {fileID: 1617622750} m_SourcePrefab: {fileID: 100100000, guid: 8beb1e0a00bf1eb42921a53ffb52bdeb, type: 3} --- !u!4 &831445128 stripped Transform: @@ -5056,16 +5427,13 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1913468802} m_Modifications: - target: {fileID: 4125495309553998321, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} propertyPath: m_Name value: FlatPanel objectReference: {fileID: 0} - - target: {fileID: 4205010513405509735, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - target: {fileID: 4205010513405509735, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} propertyPath: m_LocalScale.x value: 1 @@ -5135,6 +5503,33 @@ PrefabInstance: value: 0.00014997 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 4205010513405509735, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} + insertIndex: -1 + addedObject: {fileID: 2026715037} + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 4125495309553998321, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} + insertIndex: -1 + addedObject: {fileID: 840468523} + - targetCorrespondingSourceObject: {fileID: 4125495309553998321, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} + insertIndex: -1 + addedObject: {fileID: 840468519} + - targetCorrespondingSourceObject: {fileID: 4125495309553998321, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} + insertIndex: -1 + addedObject: {fileID: 840468520} + - targetCorrespondingSourceObject: {fileID: 4125495309553998321, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} + insertIndex: -1 + addedObject: {fileID: 840468521} + - targetCorrespondingSourceObject: {fileID: 4125495309553998321, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} + insertIndex: -1 + addedObject: {fileID: 840468522} + - targetCorrespondingSourceObject: {fileID: 4125495309553998321, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} + insertIndex: -1 + addedObject: {fileID: 840468524} + - targetCorrespondingSourceObject: {fileID: 6056454165148638616, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} + insertIndex: -1 + addedObject: {fileID: 624982110} m_SourcePrefab: {fileID: 100100000, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} --- !u!4 &840468517 stripped Transform: @@ -5198,6 +5593,16 @@ MonoBehaviour: translateLerpTime: 0.00001 enableConstraints: 1 constraintsManager: {fileID: 840468521} + manipulationLogicTypes: + moveLogicType: + reference: MixedReality.Toolkit.SpatialManipulation.BoundsControlMoveLogic, + MixedReality.Toolkit.SpatialManipulation + rotateLogicType: + reference: MixedReality.Toolkit.SpatialManipulation.BoundsControlRotateLogic, + MixedReality.Toolkit.SpatialManipulation + scaleLogicType: + reference: MixedReality.Toolkit.SpatialManipulation.BoundsControlScaleLogic, + MixedReality.Toolkit.SpatialManipulation manipulationStarted: m_PersistentCalls: m_Calls: [] @@ -5232,13 +5637,11 @@ MonoBehaviour: m_EditorClassIdentifier: m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 1 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -5271,42 +5674,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_Deactivated: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectEntered: - m_PersistentCalls: - m_Calls: [] - m_OnSelectExited: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectCanceled: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -5549,6 +5937,9 @@ MonoBehaviour: k__BackingField: 1 allowSelectByVoice: 1 speechRecognitionKeyword: select + k__BackingField: + m_PersistentCalls: + m_Calls: [] k__BackingField: 1 k__BackingField: 0 k__BackingField: @@ -5571,6 +5962,7 @@ MonoBehaviour: hostTransform: {fileID: 840468517} allowedManipulations: 7 allowedInteractionTypes: -2147483641 + rigidbodyMovementType: 0 applyTorque: 1 springForceSoftness: 0.1 springTorqueSoftness: 0.1 @@ -5593,8 +5985,7 @@ MonoBehaviour: moveLogicType: reference: MixedReality.Toolkit.SpatialManipulation.MoveLogic, MixedReality.Toolkit.SpatialManipulation rotateLogicType: - reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, - MixedReality.Toolkit.SpatialManipulation + reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, MixedReality.Toolkit.SpatialManipulation scaleLogicType: reference: MixedReality.Toolkit.SpatialManipulation.ScaleLogic, MixedReality.Toolkit.SpatialManipulation --- !u!82 &840468523 @@ -5608,6 +5999,7 @@ AudioSource: serializedVersion: 4 OutputAudioMixerGroup: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} m_audioClip: {fileID: 0} + m_Resource: {fileID: 0} m_PlayOnAwake: 1 m_Volume: 1 m_Pitch: 1 @@ -5790,13 +6182,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 888851581} + serializedVersion: 2 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 m_LocalEulerAnglesHint: {x: 0, y: -51.498, z: 0} --- !u!114 &888851583 MonoBehaviour: @@ -5812,13 +6204,11 @@ MonoBehaviour: m_EditorClassIdentifier: m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 1 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -5899,42 +6289,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_Deactivated: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnLastHoverExited: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectEntered: - m_PersistentCalls: - m_Calls: [] - m_OnSelectExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -6123,6 +6498,9 @@ MonoBehaviour: k__BackingField: 1 allowSelectByVoice: 1 speechRecognitionKeyword: select + k__BackingField: + m_PersistentCalls: + m_Calls: [] k__BackingField: 1 k__BackingField: 0 k__BackingField: @@ -6145,6 +6523,7 @@ MonoBehaviour: hostTransform: {fileID: 888851582} allowedManipulations: 7 allowedInteractionTypes: -2147483641 + rigidbodyMovementType: 0 applyTorque: 1 springForceSoftness: 0.1 springTorqueSoftness: 0.1 @@ -6167,8 +6546,7 @@ MonoBehaviour: moveLogicType: reference: MixedReality.Toolkit.SpatialManipulation.MoveLogic, MixedReality.Toolkit.SpatialManipulation rotateLogicType: - reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, - MixedReality.Toolkit.SpatialManipulation + reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, MixedReality.Toolkit.SpatialManipulation scaleLogicType: reference: MixedReality.Toolkit.SpatialManipulation.ScaleLogic, MixedReality.Toolkit.SpatialManipulation --- !u!114 &888851584 @@ -6196,6 +6574,7 @@ AudioSource: serializedVersion: 4 OutputAudioMixerGroup: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} m_audioClip: {fileID: 0} + m_Resource: {fileID: 0} m_PlayOnAwake: 1 m_Volume: 1 m_Pitch: 1 @@ -6288,10 +6667,21 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 888851581} - serializedVersion: 2 + serializedVersion: 4 m_Mass: 0.1 m_Drag: 1 m_AngularDrag: 1 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 m_UseGravity: 1 m_IsKinematic: 0 m_Interpolate: 1 @@ -6305,9 +6695,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 888851581} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0, y: 0, z: 0} --- !u!23 &888851588 @@ -6327,6 +6725,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -6465,7 +6866,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2131597836} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -6496,13 +6896,14 @@ MonoBehaviour: Dynamic - visual feedback based on the amount of pinch gesture (selection progress) using StateVisualizer''s - ''Playback Time Matches Value''. Hover highlight is activated by MeshOutline - script. + visual feedback based on the amount of pinch gesture (selection progress) using + StateVisualizer''s ''Playback Time Matches Value''. Hover highlight is activated + by MeshOutline script. - ObjectManipulator.cs allows for the intuitive - manipulation of objects using near grab, far ray, and gaze + pinch manipulation.' + ObjectManipulator.cs allows + for the intuitive manipulation of objects using near grab, far ray, and gaze + + pinch manipulation.' m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 533bdd8d5c92b52448ee2ecf7bd828a4, type: 2} m_sharedMaterial: {fileID: 2100000, guid: b082f80c6b45164418a354f7e116f0a3, type: 2} @@ -6540,20 +6941,23 @@ MonoBehaviour: m_VerticalAlignment: 256 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 0 m_isCullingEnabled: 0 @@ -6591,6 +6995,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -6635,13 +7042,11 @@ MonoBehaviour: m_EditorClassIdentifier: m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 1 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -6674,42 +7079,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_Deactivated: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnLastHoverExited: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectEntered: - m_PersistentCalls: - m_Calls: [] - m_OnSelectExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -6802,6 +7192,9 @@ MonoBehaviour: k__BackingField: 1 allowSelectByVoice: 1 speechRecognitionKeyword: select + k__BackingField: + m_PersistentCalls: + m_Calls: [] k__BackingField: 1 k__BackingField: 0 k__BackingField: @@ -6824,6 +7217,7 @@ MonoBehaviour: hostTransform: {fileID: 1203713056} allowedManipulations: 7 allowedInteractionTypes: -2147483641 + rigidbodyMovementType: 0 applyTorque: 1 springForceSoftness: 0.1 springTorqueSoftness: 0.1 @@ -6846,8 +7240,7 @@ MonoBehaviour: moveLogicType: reference: MixedReality.Toolkit.SpatialManipulation.MoveLogic, MixedReality.Toolkit.SpatialManipulation rotateLogicType: - reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, - MixedReality.Toolkit.SpatialManipulation + reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, MixedReality.Toolkit.SpatialManipulation scaleLogicType: reference: MixedReality.Toolkit.SpatialManipulation.ScaleLogic, MixedReality.Toolkit.SpatialManipulation --- !u!114 &958324216 @@ -6872,9 +7265,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 958324214} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 0.99999994, y: 1.0000001, z: 0.099999994} m_Center: {x: 0, y: 0, z: 0.049999997} --- !u!114 &958324218 @@ -6900,6 +7301,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1089489031} m_Modifications: - target: {fileID: 372063525408016474, guid: ebf6a177e3199274b8bd12a0c8157f29, type: 3} @@ -6991,6 +7393,12 @@ PrefabInstance: value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 372063526549692233, guid: ebf6a177e3199274b8bd12a0c8157f29, type: 3} + insertIndex: -1 + addedObject: {fileID: 0} m_SourcePrefab: {fileID: 100100000, guid: ebf6a177e3199274b8bd12a0c8157f29, type: 3} --- !u!4 &1001175448 stripped Transform: @@ -7002,6 +7410,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1404428861} m_Modifications: - target: {fileID: 1963561307345040800, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} @@ -7241,10 +7650,16 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} - target: {fileID: 1963561309274324397, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} - propertyPath: m_Materials.Array.data[0] + propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: 0c3570eeff29ef44e9fed596a4cc3ffd, type: 2} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 1963561307345040800, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} + insertIndex: -1 + addedObject: {fileID: 573431357} m_SourcePrefab: {fileID: 100100000, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} --- !u!4 &1002036032 stripped Transform: @@ -7279,6 +7694,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1089489030} + serializedVersion: 2 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} @@ -7291,7 +7707,6 @@ Transform: - {fileID: 1001175448} - {fileID: 1669647714} m_Father: {fileID: 1852224431} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1099479633 GameObject: @@ -7324,7 +7739,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 782737666} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -7389,20 +7803,23 @@ MonoBehaviour: m_VerticalAlignment: 256 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 0 m_isCullingEnabled: 0 @@ -7440,6 +7857,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -7483,9 +7903,17 @@ MeshCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1146931002} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 4 + serializedVersion: 5 m_Convex: 1 m_CookingOptions: -1 m_Mesh: {fileID: -1636560234873357706, guid: 3ceb984318b1e34419d826d447ca4eec, type: 3} @@ -7502,9 +7930,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1149607822} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 1, y: 1.0000004, z: 0.100000024} m_Center: {x: 0.00000017881393, y: -4.440892e-17, z: 0.050000012} --- !u!1001 &1170466718 @@ -7512,6 +7948,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1203713056} m_Modifications: - target: {fileID: 566361764857432160, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} @@ -7544,10 +7981,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 3220012215463627515, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - target: {fileID: 3220012215463627515, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -7651,6 +8084,21 @@ PrefabInstance: BasicPressableButtonVisuals.cs' objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 8323939510892415185, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} + insertIndex: -1 + addedObject: {fileID: 958324217} + - targetCorrespondingSourceObject: {fileID: 8323939510892415185, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} + insertIndex: -1 + addedObject: {fileID: 958324215} + - targetCorrespondingSourceObject: {fileID: 8323939510892415185, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} + insertIndex: -1 + addedObject: {fileID: 958324216} + - targetCorrespondingSourceObject: {fileID: 8323939510892415185, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} + insertIndex: -1 + addedObject: {fileID: 958324218} m_SourcePrefab: {fileID: 100100000, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} --- !u!224 &1170466719 stripped RectTransform: @@ -7688,7 +8136,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 150862479} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -7762,20 +8209,23 @@ MonoBehaviour: m_VerticalAlignment: 256 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 0 m_isCullingEnabled: 0 @@ -7813,6 +8263,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -7861,6 +8314,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1203713055} + serializedVersion: 2 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} @@ -7872,11 +8326,11 @@ Transform: - {fileID: 1708103290} - {fileID: 150862479} - {fileID: 782737666} + - {fileID: 1848983997} - {fileID: 1583599066} - {fileID: 469873930} - {fileID: 5174432} m_Father: {fileID: 0} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1232423736 GameObject: @@ -7909,6 +8363,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1232423736} + serializedVersion: 2 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} @@ -7916,7 +8371,6 @@ Transform: m_Children: - {fileID: 1823018503} m_Father: {fileID: 2131597836} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &1232423738 BoxCollider: @@ -7926,9 +8380,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1232423736} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 0.16749653, y: 0.16336748, z: 0.15683585} m_Center: {x: 0.0008220735, y: 0.0052850842, z: -0.024257582} --- !u!82 &1232423739 @@ -7942,6 +8404,7 @@ AudioSource: serializedVersion: 4 OutputAudioMixerGroup: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} m_audioClip: {fileID: 0} + m_Resource: {fileID: 0} m_PlayOnAwake: 1 m_Volume: 1 m_Pitch: 1 @@ -8041,13 +8504,11 @@ MonoBehaviour: m_EditorClassIdentifier: m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 1 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -8128,42 +8589,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_Deactivated: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnLastHoverExited: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectEntered: - m_PersistentCalls: - m_Calls: [] - m_OnSelectExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -8304,6 +8750,9 @@ MonoBehaviour: k__BackingField: 1 allowSelectByVoice: 1 speechRecognitionKeyword: select + k__BackingField: + m_PersistentCalls: + m_Calls: [] k__BackingField: 1 k__BackingField: 0 k__BackingField: @@ -8326,6 +8775,7 @@ MonoBehaviour: hostTransform: {fileID: 1232423737} allowedManipulations: 7 allowedInteractionTypes: -2147483641 + rigidbodyMovementType: 0 applyTorque: 1 springForceSoftness: 0.1 springTorqueSoftness: 0.1 @@ -8348,8 +8798,7 @@ MonoBehaviour: moveLogicType: reference: MixedReality.Toolkit.SpatialManipulation.MoveLogic, MixedReality.Toolkit.SpatialManipulation rotateLogicType: - reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, - MixedReality.Toolkit.SpatialManipulation + reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, MixedReality.Toolkit.SpatialManipulation scaleLogicType: reference: MixedReality.Toolkit.SpatialManipulation.ScaleLogic, MixedReality.Toolkit.SpatialManipulation --- !u!114 &1232423741 @@ -8480,7 +8929,7 @@ MonoBehaviour: transitionDuration: 0 --- !u!95 &1232423744 Animator: - serializedVersion: 5 + serializedVersion: 7 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -8494,6 +8943,7 @@ Animator: m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 m_StabilizeFeet: 0 + m_AnimatePhysics: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 @@ -8517,6 +8967,67 @@ MonoBehaviour: minimumScale: {x: 0.2, y: 0.2, z: 0.2} maximumScale: {x: 2, y: 2, z: 2} relativeToInitialState: 1 +--- !u!1001 &1241509141 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720334, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_Name + value: MRTK XR Rig + objectReference: {fileID: 0} + - target: {fileID: 8479077998186684813, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} --- !u!1 &1256458037 stripped GameObject: m_CorrespondingSourceObject: {fileID: 3482465368609989420, guid: 8beb1e0a00bf1eb42921a53ffb52bdeb, type: 3} @@ -8533,6 +9044,7 @@ AudioSource: serializedVersion: 4 OutputAudioMixerGroup: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} m_audioClip: {fileID: 0} + m_Resource: {fileID: 0} m_PlayOnAwake: 1 m_Volume: 1 m_Pitch: 1 @@ -8632,13 +9144,11 @@ MonoBehaviour: m_EditorClassIdentifier: m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 0 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -8671,42 +9181,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_Deactivated: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectEntered: - m_PersistentCalls: - m_Calls: [] - m_OnSelectExited: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectCanceled: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -8810,6 +9305,9 @@ MonoBehaviour: k__BackingField: 1 allowSelectByVoice: 1 speechRecognitionKeyword: select + k__BackingField: + m_PersistentCalls: + m_Calls: [] k__BackingField: 1 k__BackingField: 0 k__BackingField: @@ -8834,6 +9332,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1404428861} m_Modifications: - target: {fileID: 1963561307345040800, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} @@ -9073,10 +9572,16 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} - target: {fileID: 1963561309274324397, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} - propertyPath: m_Materials.Array.data[0] + propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: 0c3570eeff29ef44e9fed596a4cc3ffd, type: 2} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 1963561307345040800, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} + insertIndex: -1 + addedObject: {fileID: 1270236527} m_SourcePrefab: {fileID: 100100000, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} --- !u!4 &1270236525 stripped Transform: @@ -9099,6 +9604,7 @@ AudioSource: serializedVersion: 4 OutputAudioMixerGroup: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} m_audioClip: {fileID: 0} + m_Resource: {fileID: 0} m_PlayOnAwake: 1 m_Volume: 1 m_Pitch: 1 @@ -9189,6 +9695,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1727403011} m_Modifications: - target: {fileID: 100018, guid: f9a8072f5d9b92347a999f10f01b8012, type: 3} @@ -9300,6 +9807,45 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 100018, guid: f9a8072f5d9b92347a999f10f01b8012, type: 3} + insertIndex: -1 + addedObject: {fileID: 1294530694} + - targetCorrespondingSourceObject: {fileID: 100018, guid: f9a8072f5d9b92347a999f10f01b8012, type: 3} + insertIndex: -1 + addedObject: {fileID: 1294530698} + - targetCorrespondingSourceObject: {fileID: 100018, guid: f9a8072f5d9b92347a999f10f01b8012, type: 3} + insertIndex: -1 + addedObject: {fileID: 1294530696} + - targetCorrespondingSourceObject: {fileID: 100018, guid: f9a8072f5d9b92347a999f10f01b8012, type: 3} + insertIndex: -1 + addedObject: {fileID: 1294530697} + - targetCorrespondingSourceObject: {fileID: 100018, guid: f9a8072f5d9b92347a999f10f01b8012, type: 3} + insertIndex: -1 + addedObject: {fileID: 1294530699} + - targetCorrespondingSourceObject: {fileID: 100018, guid: f9a8072f5d9b92347a999f10f01b8012, type: 3} + insertIndex: -1 + addedObject: {fileID: 1294530700} + - targetCorrespondingSourceObject: {fileID: 100018, guid: f9a8072f5d9b92347a999f10f01b8012, type: 3} + insertIndex: -1 + addedObject: {fileID: 1294530701} + - targetCorrespondingSourceObject: {fileID: 100020, guid: f9a8072f5d9b92347a999f10f01b8012, type: 3} + insertIndex: -1 + addedObject: {fileID: 1959878137} + - targetCorrespondingSourceObject: {fileID: 100022, guid: f9a8072f5d9b92347a999f10f01b8012, type: 3} + insertIndex: -1 + addedObject: {fileID: 422166484} + - targetCorrespondingSourceObject: {fileID: 100024, guid: f9a8072f5d9b92347a999f10f01b8012, type: 3} + insertIndex: -1 + addedObject: {fileID: 2126969655} + - targetCorrespondingSourceObject: {fileID: 100012, guid: f9a8072f5d9b92347a999f10f01b8012, type: 3} + insertIndex: -1 + addedObject: {fileID: 1393598444} + - targetCorrespondingSourceObject: {fileID: 100016, guid: f9a8072f5d9b92347a999f10f01b8012, type: 3} + insertIndex: -1 + addedObject: {fileID: 76807524} m_SourcePrefab: {fileID: 100100000, guid: f9a8072f5d9b92347a999f10f01b8012, type: 3} --- !u!4 &1294530692 stripped Transform: @@ -9318,10 +9864,21 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1294530693} - serializedVersion: 2 + serializedVersion: 4 m_Mass: 0.1 m_Drag: 0 m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 m_UseGravity: 1 m_IsKinematic: 0 m_Interpolate: 1 @@ -9341,13 +9898,11 @@ MonoBehaviour: m_EditorClassIdentifier: m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 1 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -9404,42 +9959,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_Deactivated: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnLastHoverExited: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectEntered: - m_PersistentCalls: - m_Calls: [] - m_OnSelectExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -9532,6 +10072,9 @@ MonoBehaviour: k__BackingField: 1 allowSelectByVoice: 1 speechRecognitionKeyword: select + k__BackingField: + m_PersistentCalls: + m_Calls: [] k__BackingField: 1 k__BackingField: 0 k__BackingField: @@ -9554,6 +10097,7 @@ MonoBehaviour: hostTransform: {fileID: 1294530692} allowedManipulations: 7 allowedInteractionTypes: -2147483641 + rigidbodyMovementType: 0 applyTorque: 1 springForceSoftness: 0.1 springTorqueSoftness: 0.1 @@ -9576,8 +10120,7 @@ MonoBehaviour: moveLogicType: reference: MixedReality.Toolkit.SpatialManipulation.MoveLogic, MixedReality.Toolkit.SpatialManipulation rotateLogicType: - reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, - MixedReality.Toolkit.SpatialManipulation + reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, MixedReality.Toolkit.SpatialManipulation scaleLogicType: reference: MixedReality.Toolkit.SpatialManipulation.ScaleLogic, MixedReality.Toolkit.SpatialManipulation --- !u!114 &1294530697 @@ -9605,6 +10148,7 @@ AudioSource: serializedVersion: 4 OutputAudioMixerGroup: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} m_audioClip: {fileID: 0} + m_Resource: {fileID: 0} m_PlayOnAwake: 1 m_Volume: 1 m_Pitch: 1 @@ -9764,11 +10308,6 @@ MonoBehaviour: minimumScale: {x: 0.2, y: 0.2, z: 0.2} maximumScale: {x: 2, y: 2, z: 2} relativeToInitialState: 1 ---- !u!1 &1346790086 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 7781529056550460866, guid: c07c4bd04b45c014fad0e3cd30747f06, type: 3} - m_PrefabInstance: {fileID: 771189643} - m_PrefabAsset: {fileID: 0} --- !u!82 &1351537950 stripped AudioSource: m_CorrespondingSourceObject: {fileID: 155148266066309764, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} @@ -9807,13 +10346,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1357057977} + serializedVersion: 2 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 m_LocalEulerAnglesHint: {x: 0, y: -29.743002, z: 0} --- !u!114 &1357057979 MonoBehaviour: @@ -9829,13 +10368,11 @@ MonoBehaviour: m_EditorClassIdentifier: m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 1 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -9916,42 +10453,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_OnHoverEntered: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_OnHoverExited: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectEntered: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -10140,6 +10662,9 @@ MonoBehaviour: k__BackingField: 1 allowSelectByVoice: 1 speechRecognitionKeyword: select + k__BackingField: + m_PersistentCalls: + m_Calls: [] k__BackingField: 1 k__BackingField: 0 k__BackingField: @@ -10162,6 +10687,7 @@ MonoBehaviour: hostTransform: {fileID: 1357057978} allowedManipulations: 7 allowedInteractionTypes: -2147483641 + rigidbodyMovementType: 0 applyTorque: 1 springForceSoftness: 0.1 springTorqueSoftness: 0.1 @@ -10184,8 +10710,7 @@ MonoBehaviour: moveLogicType: reference: MixedReality.Toolkit.SpatialManipulation.MoveLogic, MixedReality.Toolkit.SpatialManipulation rotateLogicType: - reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, - MixedReality.Toolkit.SpatialManipulation + reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, MixedReality.Toolkit.SpatialManipulation scaleLogicType: reference: MixedReality.Toolkit.SpatialManipulation.ScaleLogic, MixedReality.Toolkit.SpatialManipulation --- !u!114 &1357057980 @@ -10213,6 +10738,7 @@ AudioSource: serializedVersion: 4 OutputAudioMixerGroup: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} m_audioClip: {fileID: 0} + m_Resource: {fileID: 0} m_PlayOnAwake: 1 m_Volume: 1 m_Pitch: 1 @@ -10305,10 +10831,21 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1357057977} - serializedVersion: 2 + serializedVersion: 4 m_Mass: 0.1 m_Drag: 1 m_AngularDrag: 1 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 m_UseGravity: 1 m_IsKinematic: 0 m_Interpolate: 1 @@ -10322,9 +10859,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1357057977} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0, y: 0, z: 0} --- !u!23 &1357057984 @@ -10344,6 +10889,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -10482,7 +11030,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1852224431} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -10548,20 +11095,23 @@ MonoBehaviour: m_VerticalAlignment: 256 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 0 m_isCullingEnabled: 0 @@ -10599,6 +11149,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -10657,13 +11210,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1357838088} + serializedVersion: 2 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 m_LocalEulerAnglesHint: {x: 0, y: 3.76, z: 0} --- !u!114 &1357838090 MonoBehaviour: @@ -10679,13 +11232,11 @@ MonoBehaviour: m_EditorClassIdentifier: m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 1 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -10766,42 +11317,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnHoverEntered: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_OnHoverExited: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectEntered: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectExited: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -10990,6 +11526,9 @@ MonoBehaviour: k__BackingField: 1 allowSelectByVoice: 1 speechRecognitionKeyword: select + k__BackingField: + m_PersistentCalls: + m_Calls: [] k__BackingField: 1 k__BackingField: 0 k__BackingField: @@ -11012,6 +11551,7 @@ MonoBehaviour: hostTransform: {fileID: 1357838089} allowedManipulations: 7 allowedInteractionTypes: -2147483641 + rigidbodyMovementType: 0 applyTorque: 1 springForceSoftness: 0.1 springTorqueSoftness: 0.1 @@ -11034,8 +11574,7 @@ MonoBehaviour: moveLogicType: reference: MixedReality.Toolkit.SpatialManipulation.MoveLogic, MixedReality.Toolkit.SpatialManipulation rotateLogicType: - reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, - MixedReality.Toolkit.SpatialManipulation + reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, MixedReality.Toolkit.SpatialManipulation scaleLogicType: reference: MixedReality.Toolkit.SpatialManipulation.ScaleLogic, MixedReality.Toolkit.SpatialManipulation --- !u!114 &1357838091 @@ -11063,6 +11602,7 @@ AudioSource: serializedVersion: 4 OutputAudioMixerGroup: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} m_audioClip: {fileID: 0} + m_Resource: {fileID: 0} m_PlayOnAwake: 1 m_Volume: 1 m_Pitch: 1 @@ -11155,10 +11695,21 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1357838088} - serializedVersion: 2 + serializedVersion: 4 m_Mass: 0.1 m_Drag: 1 m_AngularDrag: 1 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 m_UseGravity: 1 m_IsKinematic: 0 m_Interpolate: 1 @@ -11172,9 +11723,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1357838088} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0, y: 0, z: 0} --- !u!23 &1357838095 @@ -11194,6 +11753,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -11306,6 +11868,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1089489031} m_Modifications: - target: {fileID: 2783974331088143781, guid: c25d8f2d22117bd40ad824684551fbde, type: 3} @@ -11393,6 +11956,15 @@ PrefabInstance: value: UnityEngine.Object, UnityEngine objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 5092507606405556712, guid: c25d8f2d22117bd40ad824684551fbde, type: 3} + insertIndex: -1 + addedObject: {fileID: 0} + - targetCorrespondingSourceObject: {fileID: 1811028555225687572, guid: c25d8f2d22117bd40ad824684551fbde, type: 3} + insertIndex: -1 + addedObject: {fileID: 0} m_SourcePrefab: {fileID: 100100000, guid: c25d8f2d22117bd40ad824684551fbde, type: 3} --- !u!4 &1364289930 stripped Transform: @@ -11404,10 +11976,11 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1708103290} m_Modifications: - target: {fileID: 3148769097004162997, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} - propertyPath: m_Materials.Array.data[0] + propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: fa21a874e3f75f84f8a7d806d8809ca0, type: 2} - target: {fileID: 4125495309553998321, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} @@ -11491,6 +12064,15 @@ PrefabInstance: value: -0.0072 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 4205010513405509735, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} + insertIndex: -1 + addedObject: {fileID: 6284417} + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 6056454165148638616, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} + insertIndex: -1 + addedObject: {fileID: 1149607826} m_SourcePrefab: {fileID: 100100000, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} --- !u!4 &1376890154 stripped Transform: @@ -11510,9 +12092,17 @@ SphereCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1393598443} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Radius: 0.08828581 m_Center: {x: 0, y: 0, z: 0} --- !u!1 &1404428860 @@ -11538,6 +12128,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1404428860} + serializedVersion: 2 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} @@ -11549,7 +12140,6 @@ Transform: - {fileID: 4326491061339189} - {fileID: 1270236525} m_Father: {fileID: 1852224431} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!82 &1455400526 stripped AudioSource: @@ -11569,9 +12159,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1470489459} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 0.14754184, y: 0.24699001, z: 0.14326136} m_Center: {x: 0.00059055915, y: 0.12349499, z: -0.011793165} --- !u!114 &1470489464 @@ -11592,68 +12190,7 @@ MonoBehaviour: useStencilOutline: 0 stencilWriteMaterial: {fileID: 0} outlineOffset: 0 - stencilReference: 1 ---- !u!1001 &1530487694 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_RootOrder - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720334, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_Name - value: MRTK XR Rig - objectReference: {fileID: 0} - - target: {fileID: 8479077998186684813, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} + stencilReference: 1 --- !u!1 &1551252956 GameObject: m_ObjectHideFlags: 0 @@ -11680,13 +12217,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1551252956} + serializedVersion: 2 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 m_LocalEulerAnglesHint: {x: 33.644, y: 0, z: 0} --- !u!64 &1551252958 MeshCollider: @@ -11696,9 +12233,17 @@ MeshCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1551252956} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 4 + serializedVersion: 5 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} @@ -11719,6 +12264,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -11770,9 +12318,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1617622746} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 1.7013047, y: 1.7013043, z: 1.7013047} m_Center: {x: 0.00000047683716, y: -0.00000011920929, z: 0} --- !u!1001 &1669647713 @@ -11780,6 +12336,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1089489031} m_Modifications: - target: {fileID: 1220126735185249923, guid: 5e1e5c2fb89ded5469dd37ccbed1a896, type: 3} @@ -11863,7 +12420,7 @@ PrefabInstance: value: objectReference: {fileID: 9100000, guid: e3404cf816858784985fd5888cefbbb1, type: 2} - target: {fileID: 7119852961148484655, guid: 5e1e5c2fb89ded5469dd37ccbed1a896, type: 3} - propertyPath: m_Materials.Array.data[0] + propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 5762245003366665926, guid: 9b0d0ee11ff70b04d901a29b519cbaa0, type: 2} - target: {fileID: 8133592760163744572, guid: 5e1e5c2fb89ded5469dd37ccbed1a896, type: 3} @@ -11879,6 +12436,15 @@ PrefabInstance: value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 1220126735637944177, guid: 5e1e5c2fb89ded5469dd37ccbed1a896, type: 3} + insertIndex: -1 + addedObject: {fileID: 0} + - targetCorrespondingSourceObject: {fileID: 5719829374270691469, guid: 5e1e5c2fb89ded5469dd37ccbed1a896, type: 3} + insertIndex: -1 + addedObject: {fileID: 0} m_SourcePrefab: {fileID: 100100000, guid: 5e1e5c2fb89ded5469dd37ccbed1a896, type: 3} --- !u!4 &1669647714 stripped Transform: @@ -11890,6 +12456,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 150862479} m_Modifications: - target: {fileID: 854254128426986228, guid: 7148f9ce86f62ab4b8d89dc6cfa369a0, type: 3} @@ -12025,6 +12592,9 @@ PrefabInstance: value: objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7148f9ce86f62ab4b8d89dc6cfa369a0, type: 3} --- !u!4 &1685298795 stripped Transform: @@ -12054,6 +12624,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1708103289} + serializedVersion: 2 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} @@ -12063,7 +12634,6 @@ Transform: - {fileID: 2131597836} - {fileID: 1727403011} m_Father: {fileID: 1203713056} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 45, z: 0} --- !u!1 &1710053216 GameObject: @@ -12120,6 +12690,16 @@ MonoBehaviour: translateLerpTime: 0.00001 enableConstraints: 1 constraintsManager: {fileID: 0} + manipulationLogicTypes: + moveLogicType: + reference: MixedReality.Toolkit.SpatialManipulation.BoundsControlMoveLogic, + MixedReality.Toolkit.SpatialManipulation + rotateLogicType: + reference: MixedReality.Toolkit.SpatialManipulation.BoundsControlRotateLogic, + MixedReality.Toolkit.SpatialManipulation + scaleLogicType: + reference: MixedReality.Toolkit.SpatialManipulation.BoundsControlScaleLogic, + MixedReality.Toolkit.SpatialManipulation manipulationStarted: m_PersistentCalls: m_Calls: [] @@ -12142,13 +12722,11 @@ MonoBehaviour: m_Colliders: - {fileID: 862305034} - {fileID: 1069515631} - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 1 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -12205,42 +12783,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnHoverEntered: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_OnHoverExited: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectEntered: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectExited: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -12333,6 +12896,9 @@ MonoBehaviour: k__BackingField: 1 allowSelectByVoice: 1 speechRecognitionKeyword: select + k__BackingField: + m_PersistentCalls: + m_Calls: [] k__BackingField: 1 k__BackingField: 0 k__BackingField: @@ -12355,6 +12921,7 @@ MonoBehaviour: hostTransform: {fileID: 1710053220} allowedManipulations: 7 allowedInteractionTypes: -2147483641 + rigidbodyMovementType: 0 applyTorque: 1 springForceSoftness: 0.1 springTorqueSoftness: 0.1 @@ -12377,8 +12944,7 @@ MonoBehaviour: moveLogicType: reference: MixedReality.Toolkit.SpatialManipulation.MoveLogic, MixedReality.Toolkit.SpatialManipulation rotateLogicType: - reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, - MixedReality.Toolkit.SpatialManipulation + reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, MixedReality.Toolkit.SpatialManipulation scaleLogicType: reference: MixedReality.Toolkit.SpatialManipulation.ScaleLogic, MixedReality.Toolkit.SpatialManipulation --- !u!114 &1710053219 @@ -12402,6 +12968,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1710053216} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -12409,7 +12976,6 @@ Transform: m_Children: - {fileID: 186579027} m_Father: {fileID: 5174432} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!82 &1710053221 AudioSource: @@ -12422,6 +12988,7 @@ AudioSource: serializedVersion: 4 OutputAudioMixerGroup: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} m_audioClip: {fileID: 0} + m_Resource: {fileID: 0} m_PlayOnAwake: 1 m_Volume: 1 m_Pitch: 1 @@ -12544,13 +13111,11 @@ MonoBehaviour: m_EditorClassIdentifier: m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 1 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -12631,42 +13196,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_OnHoverEntered: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_OnHoverExited: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectEntered: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -12807,6 +13357,9 @@ MonoBehaviour: k__BackingField: 1 allowSelectByVoice: 1 speechRecognitionKeyword: select + k__BackingField: + m_PersistentCalls: + m_Calls: [] k__BackingField: 1 k__BackingField: 0 k__BackingField: @@ -12829,6 +13382,7 @@ MonoBehaviour: hostTransform: {fileID: 1923515645} allowedManipulations: -1 allowedInteractionTypes: -1 + rigidbodyMovementType: 0 applyTorque: 1 springForceSoftness: 0.1 springTorqueSoftness: 0.1 @@ -12851,8 +13405,7 @@ MonoBehaviour: moveLogicType: reference: MixedReality.Toolkit.SpatialManipulation.MoveLogic, MixedReality.Toolkit.SpatialManipulation rotateLogicType: - reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, - MixedReality.Toolkit.SpatialManipulation + reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, MixedReality.Toolkit.SpatialManipulation scaleLogicType: reference: MixedReality.Toolkit.SpatialManipulation.ScaleLogic, MixedReality.Toolkit.SpatialManipulation --- !u!114 &1724991367 @@ -12880,6 +13433,7 @@ AudioSource: serializedVersion: 4 OutputAudioMixerGroup: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} m_audioClip: {fileID: 0} + m_Resource: {fileID: 0} m_PlayOnAwake: 1 m_Volume: 1 m_Pitch: 1 @@ -13079,7 +13633,7 @@ MonoBehaviour: transitionDuration: 0 --- !u!95 &1724991371 Animator: - serializedVersion: 5 + serializedVersion: 7 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -13093,6 +13647,7 @@ Animator: m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 m_StabilizeFeet: 0 + m_AnimatePhysics: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 @@ -13121,6 +13676,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1727403010} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -13133,7 +13689,6 @@ Transform: - {fileID: 79416684} - {fileID: 1294530692} m_Father: {fileID: 1708103290} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!82 &1729004921 stripped AudioSource: @@ -13145,6 +13700,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1089489031} m_Modifications: - target: {fileID: 2285124468144155093, guid: 8ace9c04082e8ce4ea440f9bef681ce3, type: 3} @@ -13156,7 +13712,7 @@ PrefabInstance: value: objectReference: {fileID: 5762245003366665926, guid: 9b0d0ee11ff70b04d901a29b519cbaa0, type: 2} - target: {fileID: 3060986453813667140, guid: 8ace9c04082e8ce4ea440f9bef681ce3, type: 3} - propertyPath: m_Materials.Array.data[0] + propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 5762245003366665926, guid: 9b0d0ee11ff70b04d901a29b519cbaa0, type: 2} - target: {fileID: 3119290704008432693, guid: 8ace9c04082e8ce4ea440f9bef681ce3, type: 3} @@ -13252,6 +13808,15 @@ PrefabInstance: value: PressableButton_128x32mm_IconAndText_L objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 6366612889032461850, guid: 8ace9c04082e8ce4ea440f9bef681ce3, type: 3} + insertIndex: -1 + addedObject: {fileID: 0} + - targetCorrespondingSourceObject: {fileID: 564332035890725350, guid: 8ace9c04082e8ce4ea440f9bef681ce3, type: 3} + insertIndex: -1 + addedObject: {fileID: 0} m_SourcePrefab: {fileID: 100100000, guid: 8ace9c04082e8ce4ea440f9bef681ce3, type: 3} --- !u!4 &1758148431 stripped Transform: @@ -13289,7 +13854,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1852224431} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -13354,20 +13918,23 @@ MonoBehaviour: m_VerticalAlignment: 256 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 0 m_isCullingEnabled: 0 @@ -13405,6 +13972,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -13456,13 +14026,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1823018502} + serializedVersion: 2 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 m_LocalEulerAnglesHint: {x: -0.107, y: 115.546, z: -0.068} --- !u!23 &1823018504 MeshRenderer: @@ -13481,6 +14051,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -13538,6 +14111,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1203713056} m_Modifications: - target: {fileID: 443995632, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} @@ -13588,18 +14162,6 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 150949528621185834, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} - propertyPath: m_LocalScale.x - value: 0.04 - objectReference: {fileID: 0} - - target: {fileID: 150949528621185834, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} - propertyPath: m_LocalScale.y - value: 0.137 - objectReference: {fileID: 0} - - target: {fileID: 150949528621185834, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} - propertyPath: m_LocalPosition.y - value: 0.048499994 - objectReference: {fileID: 0} - target: {fileID: 284030044009447867, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} propertyPath: Spatialize value: 1 @@ -13612,18 +14174,6 @@ PrefabInstance: propertyPath: panLevelCustomCurve.m_Curve.Array.data[0].value value: 1 objectReference: {fileID: 0} - - target: {fileID: 402277338338922732, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} - propertyPath: m_UseGravity - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 534244713576997589, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} - propertyPath: m_text - value: "\uF34D" - objectReference: {fileID: 0} - - target: {fileID: 534244713576997589, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} - propertyPath: m_sharedMaterial - value: - objectReference: {fileID: 5762245003366665926, guid: 9b0d0ee11ff70b04d901a29b519cbaa0, type: 2} - target: {fileID: 724323403903675551, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -13644,18 +14194,6 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 942987468863586275, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} - propertyPath: m_LocalPosition.y - value: 0.03299999 - objectReference: {fileID: 0} - - target: {fileID: 942987469246865708, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} - propertyPath: m_LocalPosition.y - value: 0.06499999 - objectReference: {fileID: 0} - - target: {fileID: 942987469383587423, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} - propertyPath: m_LocalPosition.y - value: 0.09699999 - objectReference: {fileID: 0} - target: {fileID: 986953982429952368, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} propertyPath: m_Name value: WhiteboardExample @@ -13689,7 +14227,7 @@ PrefabInstance: value: Icon 79 objectReference: {fileID: 0} - target: {fileID: 1287902911309006504, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} - propertyPath: m_Materials.Array.data[0] + propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 5762245003366665926, guid: 9b0d0ee11ff70b04d901a29b519cbaa0, type: 2} - target: {fileID: 1510911413115419833, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} @@ -13740,10 +14278,6 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 2236187689672624870, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - target: {fileID: 2599463952435006009, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} propertyPath: m_text value: "\uF36A" @@ -13780,18 +14314,6 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 3484184696762796712, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3649796767034289732, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 5762245003366665926, guid: 9b0d0ee11ff70b04d901a29b519cbaa0, type: 2} - - target: {fileID: 3717038121812215605, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} - propertyPath: currentIconName - value: Icon 76 - objectReference: {fileID: 0} - target: {fileID: 4024654762168814417, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} propertyPath: m_Size.y value: 32 @@ -13828,14 +14350,6 @@ PrefabInstance: propertyPath: panLevelCustomCurve.m_Curve.Array.data[0].value value: 1 objectReference: {fileID: 0} - - target: {fileID: 4649580226607449371, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4649580226607449371, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0.007 - objectReference: {fileID: 0} - target: {fileID: 5037185138549003642, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -13944,14 +14458,6 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 6439058074634937319, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} - propertyPath: m_LocalPosition.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 6439058074634937319, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} - propertyPath: m_AnchoredPosition.x - value: -0.0245 - objectReference: {fileID: 0} - target: {fileID: 6709910909478096088, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -14000,21 +14506,37 @@ PrefabInstance: propertyPath: panLevelCustomCurve.m_Curve.Array.data[0].value value: 1 objectReference: {fileID: 0} - - target: {fileID: 7613463721665348061, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} - propertyPath: m_LocalPosition.y - value: 0.016499994 + - target: {fileID: 7495919053237500771, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.size + value: 2 objectReference: {fileID: 0} - - target: {fileID: 7613463722260290446, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} - propertyPath: m_RootOrder - value: 5 + - target: {fileID: 7495919053237500771, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[1].m_Mode + value: 6 objectReference: {fileID: 0} - - target: {fileID: 8403003260084890620, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} - propertyPath: m_IsActive - value: 0 + - target: {fileID: 7495919053237500771, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[1].m_Target + value: + objectReference: {fileID: 460835582} + - target: {fileID: 7495919053237500771, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[1].m_CallState + value: 2 objectReference: {fileID: 0} - - target: {fileID: 8468582706564339464, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} - propertyPath: m_RootOrder - value: 6 + - target: {fileID: 7495919053237500771, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName + value: set_enabled + objectReference: {fileID: 0} + - target: {fileID: 7495919053237500771, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[1].m_TargetAssemblyTypeName + value: UnityEngine.Behaviour, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 7495919053237500771, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_BoolArgument + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7495919053237500771, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine objectReference: {fileID: 0} - target: {fileID: 8468582706564339464, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} propertyPath: m_LocalPosition.x @@ -14069,6 +14591,18 @@ PrefabInstance: value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 8372833645970865070, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + insertIndex: -1 + addedObject: {fileID: 1824793669} + - targetCorrespondingSourceObject: {fileID: 8549021144382954156, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + insertIndex: -1 + addedObject: {fileID: 0} + - targetCorrespondingSourceObject: {fileID: 4355450153607930378, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + insertIndex: -1 + addedObject: {fileID: 0} m_SourcePrefab: {fileID: 100100000, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} --- !u!1 &1824793668 stripped GameObject: @@ -14093,6 +14627,44 @@ MonoBehaviour: minimumScale: {x: 0.2, y: 0.2, z: 0.2} maximumScale: {x: 2, y: 2, z: 2} relativeToInitialState: 1 +--- !u!1 &1824793670 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 986953982429952368, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + m_PrefabInstance: {fileID: 1824793667} + m_PrefabAsset: {fileID: 0} +--- !u!1 &1848983996 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1848983997} + m_Layer: 0 + m_Name: WhiteboardExampleInfo + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1848983997 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1848983996} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 460835581} + - {fileID: 243610129} + m_Father: {fileID: 1203713056} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1852224430 GameObject: m_ObjectHideFlags: 0 @@ -14116,6 +14688,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1852224430} + serializedVersion: 2 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} @@ -14128,19 +14701,15 @@ Transform: - {fileID: 1089489031} - {fileID: 1404428861} m_Father: {fileID: 1203713056} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1866417129 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1203713056} m_Modifications: - - target: {fileID: 2415827607033482817, guid: 5be1d1dda43e3ed40b18f4eb09e144fa, type: 3} - propertyPath: m_RootOrder - value: 7 - objectReference: {fileID: 0} - target: {fileID: 2415827607033482817, guid: 5be1d1dda43e3ed40b18f4eb09e144fa, type: 3} propertyPath: m_LocalPosition.x value: -0.689 @@ -14186,6 +14755,12 @@ PrefabInstance: value: Pen objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 3084243108605482235, guid: 5be1d1dda43e3ed40b18f4eb09e144fa, type: 3} + insertIndex: -1 + addedObject: {fileID: 1866417131} m_SourcePrefab: {fileID: 100100000, guid: 5be1d1dda43e3ed40b18f4eb09e144fa, type: 3} --- !u!1 &1866417130 stripped GameObject: @@ -14238,6 +14813,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1913468801} + serializedVersion: 2 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} @@ -14253,13 +14829,13 @@ Transform: - {fileID: 2059242324} - {fileID: 828245820} m_Father: {fileID: 1203713056} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1923515644 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2131597836} m_Modifications: - target: {fileID: 100000, guid: 1b72c1e6302ca7542afd89257b6367aa, type: 3} @@ -14335,6 +14911,36 @@ PrefabInstance: value: 0.00005 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 100000, guid: 1b72c1e6302ca7542afd89257b6367aa, type: 3} + insertIndex: -1 + addedObject: {fileID: 1724991368} + - targetCorrespondingSourceObject: {fileID: 100000, guid: 1b72c1e6302ca7542afd89257b6367aa, type: 3} + insertIndex: -1 + addedObject: {fileID: 1724991371} + - targetCorrespondingSourceObject: {fileID: 100000, guid: 1b72c1e6302ca7542afd89257b6367aa, type: 3} + insertIndex: -1 + addedObject: {fileID: 1724991366} + - targetCorrespondingSourceObject: {fileID: 100000, guid: 1b72c1e6302ca7542afd89257b6367aa, type: 3} + insertIndex: -1 + addedObject: {fileID: 1724991367} + - targetCorrespondingSourceObject: {fileID: 100000, guid: 1b72c1e6302ca7542afd89257b6367aa, type: 3} + insertIndex: -1 + addedObject: {fileID: 1724991369} + - targetCorrespondingSourceObject: {fileID: 100000, guid: 1b72c1e6302ca7542afd89257b6367aa, type: 3} + insertIndex: -1 + addedObject: {fileID: 1724991370} + - targetCorrespondingSourceObject: {fileID: 100000, guid: 1b72c1e6302ca7542afd89257b6367aa, type: 3} + insertIndex: -1 + addedObject: {fileID: 1923515646} + - targetCorrespondingSourceObject: {fileID: 100002, guid: 1b72c1e6302ca7542afd89257b6367aa, type: 3} + insertIndex: -1 + addedObject: {fileID: 1470489463} + - targetCorrespondingSourceObject: {fileID: 100002, guid: 1b72c1e6302ca7542afd89257b6367aa, type: 3} + insertIndex: -1 + addedObject: {fileID: 1470489464} m_SourcePrefab: {fileID: 100100000, guid: 1b72c1e6302ca7542afd89257b6367aa, type: 3} --- !u!4 &1923515645 stripped Transform: @@ -14367,8 +14973,17 @@ CapsuleCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4654093213557177396} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 + serializedVersion: 2 m_Radius: 10.918639 m_Height: 26.952131 m_Direction: 1 @@ -14387,13 +15002,11 @@ MonoBehaviour: m_EditorClassIdentifier: m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 0 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -14426,42 +15039,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnHoverExited: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectEntered: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectExited: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectCanceled: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -14591,6 +15189,9 @@ MonoBehaviour: k__BackingField: 1 allowSelectByVoice: 1 speechRecognitionKeyword: select + k__BackingField: + m_PersistentCalls: + m_Calls: [] k__BackingField: 1 k__BackingField: 0 k__BackingField: @@ -14635,6 +15236,7 @@ AudioSource: serializedVersion: 4 OutputAudioMixerGroup: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} m_audioClip: {fileID: 0} + m_Resource: {fileID: 0} m_PlayOnAwake: 1 m_Volume: 1 m_Pitch: 1 @@ -14738,8 +15340,17 @@ CapsuleCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1959878136} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 + serializedVersion: 2 m_Radius: 0.03228122 m_Height: 0.15444481 m_Direction: 1 @@ -14749,6 +15360,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1404428861} m_Modifications: - target: {fileID: 2712310172936119071, guid: 698c502bf492aec45af6a7b04219d34b, type: 3} @@ -14980,6 +15592,12 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 4639606898651727610, guid: 698c502bf492aec45af6a7b04219d34b, type: 3} + insertIndex: -1 + addedObject: {fileID: 380279361} m_SourcePrefab: {fileID: 100100000, guid: 698c502bf492aec45af6a7b04219d34b, type: 3} --- !u!4 &1996988710 stripped Transform: @@ -15017,7 +15635,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5174432} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -15085,20 +15702,23 @@ MonoBehaviour: m_VerticalAlignment: 256 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 0 m_isCullingEnabled: 0 @@ -15136,6 +15756,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -15185,13 +15808,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2026715036} + serializedVersion: 2 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 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &2026715038 SpriteRenderer: @@ -15210,6 +15833,9 @@ SpriteRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -15276,7 +15902,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1913468802} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -15348,20 +15973,23 @@ MonoBehaviour: m_VerticalAlignment: 256 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 0 m_isCullingEnabled: 0 @@ -15399,6 +16027,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -15455,7 +16086,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1913468802} - m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -15523,20 +16153,23 @@ MonoBehaviour: m_VerticalAlignment: 256 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 0 m_isCullingEnabled: 0 @@ -15574,6 +16207,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -15609,6 +16245,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1089489031} m_Modifications: - target: {fileID: 3738767603136113390, guid: c9b1a111fa131cc48b6c4daedd47efe3, type: 3} @@ -15912,6 +16549,33 @@ PrefabInstance: value: "\uF342" objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 4042998139673148539, guid: c9b1a111fa131cc48b6c4daedd47efe3, type: 3} + insertIndex: -1 + addedObject: {fileID: 0} + - targetCorrespondingSourceObject: {fileID: 7464071161666581383, guid: c9b1a111fa131cc48b6c4daedd47efe3, type: 3} + insertIndex: -1 + addedObject: {fileID: 0} + - targetCorrespondingSourceObject: {fileID: 4042998139036849028, guid: c9b1a111fa131cc48b6c4daedd47efe3, type: 3} + insertIndex: -1 + addedObject: {fileID: 0} + - targetCorrespondingSourceObject: {fileID: 7464071162302864504, guid: c9b1a111fa131cc48b6c4daedd47efe3, type: 3} + insertIndex: -1 + addedObject: {fileID: 0} + - targetCorrespondingSourceObject: {fileID: 4042998140648635396, guid: c9b1a111fa131cc48b6c4daedd47efe3, type: 3} + insertIndex: -1 + addedObject: {fileID: 0} + - targetCorrespondingSourceObject: {fileID: 7464071160695288824, guid: c9b1a111fa131cc48b6c4daedd47efe3, type: 3} + insertIndex: -1 + addedObject: {fileID: 0} + - targetCorrespondingSourceObject: {fileID: 4042998139867488095, guid: c9b1a111fa131cc48b6c4daedd47efe3, type: 3} + insertIndex: -1 + addedObject: {fileID: 0} + - targetCorrespondingSourceObject: {fileID: 7464071161472225443, guid: c9b1a111fa131cc48b6c4daedd47efe3, type: 3} + insertIndex: -1 + addedObject: {fileID: 0} m_SourcePrefab: {fileID: 100100000, guid: c9b1a111fa131cc48b6c4daedd47efe3, type: 3} --- !u!4 &2096650620 stripped Transform: @@ -15947,13 +16611,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2123527392} + serializedVersion: 2 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 m_LocalEulerAnglesHint: {x: 24.512, y: -96.121, z: -22.092} --- !u!23 &2123527394 MeshRenderer: @@ -15972,6 +16636,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -16016,6 +16683,7 @@ AudioSource: serializedVersion: 4 OutputAudioMixerGroup: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} m_audioClip: {fileID: 0} + m_Resource: {fileID: 0} m_PlayOnAwake: 1 m_Volume: 1 m_Pitch: 1 @@ -16115,13 +16783,11 @@ MonoBehaviour: m_EditorClassIdentifier: m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 0 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -16154,42 +16820,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnHoverEntered: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_OnHoverExited: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectEntered: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectExited: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -16319,6 +16970,9 @@ MonoBehaviour: k__BackingField: 1 allowSelectByVoice: 1 speechRecognitionKeyword: select + k__BackingField: + m_PersistentCalls: + m_Calls: [] k__BackingField: 1 k__BackingField: 0 k__BackingField: @@ -16346,9 +17000,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2123527392} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 0.112064324, y: 0.13389134, z: 0.11896934} m_Center: {x: -0.004010728, y: 0.012695584, z: -0.00058461254} --- !u!114 &2123527399 @@ -16378,8 +17040,17 @@ CapsuleCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2126969654} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 + serializedVersion: 2 m_Radius: 0.032281216 m_Height: 0.15444481 m_Direction: 1 @@ -16389,6 +17060,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 782737666} m_Modifications: - target: {fileID: 2783974331088143781, guid: c25d8f2d22117bd40ad824684551fbde, type: 3} @@ -16485,14 +17157,25 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5572466351762964349, guid: c25d8f2d22117bd40ad824684551fbde, type: 3} propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: MixedReality.Toolkit.Examples.Demos.SystemKeyboardExample, - Assembly-CSharp + value: MixedReality.Toolkit.Examples.Demos.SystemKeyboardExample, Assembly-CSharp objectReference: {fileID: 0} - target: {fileID: 5572466351762964349, guid: c25d8f2d22117bd40ad824684551fbde, type: 3} propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName value: UnityEngine.Object, UnityEngine objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 5092507606858315802, guid: c25d8f2d22117bd40ad824684551fbde, type: 3} + insertIndex: -1 + addedObject: {fileID: 2128020772} + - targetCorrespondingSourceObject: {fileID: 5092507606405556712, guid: c25d8f2d22117bd40ad824684551fbde, type: 3} + insertIndex: -1 + addedObject: {fileID: 0} + - targetCorrespondingSourceObject: {fileID: 1811028555225687572, guid: c25d8f2d22117bd40ad824684551fbde, type: 3} + insertIndex: -1 + addedObject: {fileID: 0} m_SourcePrefab: {fileID: 100100000, guid: c25d8f2d22117bd40ad824684551fbde, type: 3} --- !u!4 &2128020770 stripped Transform: @@ -16541,6 +17224,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2131597835} + serializedVersion: 2 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} @@ -16550,7 +17234,6 @@ Transform: - {fileID: 1923515645} - {fileID: 956891493} m_Father: {fileID: 1708103290} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &4326491061339189 stripped Transform: @@ -16562,6 +17245,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1404428861} m_Modifications: - target: {fileID: 38784627857828811, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} @@ -17621,6 +18305,9 @@ PrefabInstance: value: UnityEngine.Object, UnityEngine objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} --- !u!82 &364946991195464073 stripped AudioSource: @@ -17632,6 +18319,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1913468802} m_Modifications: - target: {fileID: 251265377, guid: 0d3b2fd2079cd514d8dbce654f929320, type: 3} @@ -17654,10 +18342,6 @@ PrefabInstance: propertyPath: m_Enabled value: 0 objectReference: {fileID: 0} - - target: {fileID: 1214529608091387485, guid: 0d3b2fd2079cd514d8dbce654f929320, type: 3} - propertyPath: m_RootOrder - value: 3 - objectReference: {fileID: 0} - target: {fileID: 1214529608091387485, guid: 0d3b2fd2079cd514d8dbce654f929320, type: 3} propertyPath: m_LocalPosition.x value: -0.191 @@ -17703,12 +18387,16 @@ PrefabInstance: value: CoffeeBoundsControl objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 0d3b2fd2079cd514d8dbce654f929320, type: 3} --- !u!1001 &2578649064215403923 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1710053220} m_Modifications: - target: {fileID: 238993406236766840, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} @@ -19261,7 +19949,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6776978392589374212, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} propertyPath: m_Size.y - value: 47.01599 + value: 47.04004 objectReference: {fileID: 0} - target: {fileID: 6776978392589374212, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} propertyPath: m_Enabled @@ -19269,7 +19957,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6776978392589374212, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} propertyPath: m_Center.y - value: 4.2420044 + value: 4.2299805 objectReference: {fileID: 0} - target: {fileID: 6776978392769446706, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} propertyPath: Spatialize @@ -19313,7 +20001,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6776978392769446710, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} propertyPath: m_Size.y - value: 47.01599 + value: 47.04004 objectReference: {fileID: 0} - target: {fileID: 6776978392769446710, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} propertyPath: m_Enabled @@ -19321,7 +20009,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6776978392769446710, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} propertyPath: m_Center.y - value: 4.2420044 + value: 4.2299805 objectReference: {fileID: 0} - target: {fileID: 6776978392855206650, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} propertyPath: m_Size.x @@ -19329,7 +20017,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6776978392855206650, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} propertyPath: m_Size.y - value: 128 + value: 127.97656 objectReference: {fileID: 0} - target: {fileID: 6776978392855206650, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} propertyPath: m_Enabled @@ -19341,7 +20029,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6776978392855206650, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} propertyPath: m_Center.y - value: 0 + value: -0.01171875 objectReference: {fileID: 0} - target: {fileID: 6776978392855206654, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} propertyPath: Spatialize @@ -19417,7 +20105,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6776978393435224398, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} propertyPath: m_Size.y - value: 47.01599 + value: 47.04004 objectReference: {fileID: 0} - target: {fileID: 6776978393435224398, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} propertyPath: m_Enabled @@ -19429,7 +20117,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6776978393435224398, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} propertyPath: m_Center.y - value: 4.2420044 + value: 4.2299805 objectReference: {fileID: 0} - target: {fileID: 6790485856255541986, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} propertyPath: m_Size.x @@ -19812,12 +20500,16 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} --- !u!1001 &4654093213557177394 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 150862479} m_Modifications: - target: {fileID: -3910990755373119420, guid: aa94f0fa662d8bd4e84361cc9f0d065a, type: 3} @@ -19881,6 +20573,21 @@ PrefabInstance: value: MRTK_Logo objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 8771091787928289351, guid: aa94f0fa662d8bd4e84361cc9f0d065a, type: 3} + insertIndex: -1 + addedObject: {fileID: 1929573049} + - targetCorrespondingSourceObject: {fileID: 8771091787928289351, guid: aa94f0fa662d8bd4e84361cc9f0d065a, type: 3} + insertIndex: -1 + addedObject: {fileID: 1929573052} + - targetCorrespondingSourceObject: {fileID: 8771091787928289351, guid: aa94f0fa662d8bd4e84361cc9f0d065a, type: 3} + insertIndex: -1 + addedObject: {fileID: 1929573050} + - targetCorrespondingSourceObject: {fileID: 8771091787928289351, guid: aa94f0fa662d8bd4e84361cc9f0d065a, type: 3} + insertIndex: -1 + addedObject: {fileID: 1929573051} m_SourcePrefab: {fileID: -4161369568681901532, guid: aa94f0fa662d8bd4e84361cc9f0d065a, type: 3} --- !u!4 &4654093213557177395 stripped Transform: @@ -19897,12 +20604,9 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 5905304275062509466, guid: df4899a7e84d2794a9428337bba8a253, type: 3} - propertyPath: m_RootOrder - value: 4 - objectReference: {fileID: 0} - target: {fileID: 5905304275062509466, guid: df4899a7e84d2794a9428337bba8a253, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 @@ -19920,54 +20624,18 @@ PrefabInstance: value: EventSystem objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: df4899a7e84d2794a9428337bba8a253, type: 3} --- !u!1001 &7372669236719069155 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 1667384560894720772, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} - propertyPath: isToggled.onExited.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 1667384560894720772, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} - propertyPath: isToggled.onExited.m_PersistentCalls.m_Calls.Array.data[1].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 1667384560894720772, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} - propertyPath: isToggled.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 1667384560894720772, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} - propertyPath: isToggled.onEntered.m_PersistentCalls.m_Calls.Array.data[1].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 1667384561245672091, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} - propertyPath: isToggled.onExited.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 1667384561245672091, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} - propertyPath: isToggled.onExited.m_PersistentCalls.m_Calls.Array.data[1].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 1667384561245672091, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} - propertyPath: isToggled.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 1667384561245672091, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} - propertyPath: isToggled.onEntered.m_PersistentCalls.m_Calls.Array.data[1].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 1667384562270007169, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} - propertyPath: isToggled.onExited.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 1346790086} - - target: {fileID: 1667384562270007169, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} - propertyPath: isToggled.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 1346790086} - target: {fileID: 2082148069247382453, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} propertyPath: Spatialize value: 1 @@ -20020,10 +20688,6 @@ PrefabInstance: propertyPath: m_Name value: HandMenu objectReference: {fileID: 0} - - target: {fileID: 7372669237086358568, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - target: {fileID: 7372669237086358568, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -20077,4 +20741,18 @@ PrefabInstance: value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} +--- !u!1660057539 &9223372036854775807 +SceneRoots: + m_ObjectHideFlags: 0 + m_Roots: + - {fileID: 705507995} + - {fileID: 7372669236719069155} + - {fileID: 530525190} + - {fileID: 1241509141} + - {fileID: 5905304273903168958} + - {fileID: 1203713056} + - {fileID: 771189643} diff --git a/UnityProjects/MRTKDevTemplate/Assets/Scenes/HandMenuExamples.unity b/UnityProjects/MRTKDevTemplate/Assets/Scenes/HandMenuExamples.unity index d06895879..3eba63d09 100644 --- a/UnityProjects/MRTKDevTemplate/Assets/Scenes/HandMenuExamples.unity +++ b/UnityProjects/MRTKDevTemplate/Assets/Scenes/HandMenuExamples.unity @@ -142,13 +142,11 @@ MonoBehaviour: m_EditorClassIdentifier: m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 0 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -181,42 +179,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnHoverEntered: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_OnHoverExited: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectEntered: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectExited: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -332,6 +315,7 @@ MonoBehaviour: hostTransform: {fileID: 1947783662} allowedManipulations: 7 allowedInteractionTypes: -1 + rigidbodyMovementType: 0 applyTorque: 1 springForceSoftness: 0.1 springTorqueSoftness: 0.1 @@ -354,8 +338,7 @@ MonoBehaviour: moveLogicType: reference: MixedReality.Toolkit.SpatialManipulation.MoveLogic, MixedReality.Toolkit.SpatialManipulation rotateLogicType: - reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, - MixedReality.Toolkit.SpatialManipulation + reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, MixedReality.Toolkit.SpatialManipulation scaleLogicType: reference: MixedReality.Toolkit.SpatialManipulation.ScaleLogic, MixedReality.Toolkit.SpatialManipulation --- !u!114 &151308756 @@ -1284,39 +1267,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: df4899a7e84d2794a9428337bba8a253, type: 3} ---- !u!1001 &525252187 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720334, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_Name - value: MRTK XR Rig - objectReference: {fileID: 0} - - target: {fileID: 8479077998186684813, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} --- !u!1001 &530525190 PrefabInstance: m_ObjectHideFlags: 0 @@ -2507,6 +2457,67 @@ MonoBehaviour: minimumScale: {x: 0.2, y: 0.2, z: 0.2} maximumScale: {x: 2, y: 2, z: 2} relativeToInitialState: 1 +--- !u!1001 &1215326428 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720334, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_Name + value: MRTK XR Rig + objectReference: {fileID: 0} + - target: {fileID: 8479077998186684813, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} --- !u!1001 &1407079547 PrefabInstance: m_ObjectHideFlags: 0 @@ -5257,11 +5268,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5677198132670553562, guid: f64620d502cdf0f429efa27703913cb7, type: 3} propertyPath: m_AnchoredPosition.x - value: -0.000015258789 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5677198132670553562, guid: f64620d502cdf0f429efa27703913cb7, type: 3} propertyPath: m_AnchoredPosition.y - value: 0.00007009506 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5677198132965683087, guid: f64620d502cdf0f429efa27703913cb7, type: 3} propertyPath: m_AnchorMax.x @@ -5456,13 +5467,11 @@ MonoBehaviour: m_EditorClassIdentifier: m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 1 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -5557,42 +5566,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnHoverExited: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectEntered: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectExited: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectCanceled: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -5707,6 +5701,7 @@ MonoBehaviour: hostTransform: {fileID: 365982912235277918} allowedManipulations: 7 allowedInteractionTypes: -2147483641 + rigidbodyMovementType: 0 applyTorque: 1 springForceSoftness: 0.1 springTorqueSoftness: 0.1 @@ -5729,8 +5724,7 @@ MonoBehaviour: moveLogicType: reference: MixedReality.Toolkit.SpatialManipulation.MoveLogic, MixedReality.Toolkit.SpatialManipulation rotateLogicType: - reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, - MixedReality.Toolkit.SpatialManipulation + reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, MixedReality.Toolkit.SpatialManipulation scaleLogicType: reference: MixedReality.Toolkit.SpatialManipulation.ScaleLogic, MixedReality.Toolkit.SpatialManipulation --- !u!95 &3627404587453849990 @@ -7070,11 +7064,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5677198132670553562, guid: f64620d502cdf0f429efa27703913cb7, type: 3} propertyPath: m_AnchoredPosition.x - value: 0.0000076293945 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5677198132670553562, guid: f64620d502cdf0f429efa27703913cb7, type: 3} propertyPath: m_AnchoredPosition.y - value: 0.00007009506 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5677198132965683087, guid: f64620d502cdf0f429efa27703913cb7, type: 3} propertyPath: m_AnchorMax.x @@ -7251,6 +7245,7 @@ MonoBehaviour: attachedRectTransform: {fileID: 8609691717537239632} padding: {x: 5, y: 5} forceUpdateEveryFrame: 0 + canToggleCollider: 1 --- !u!1 &6130766254372893326 GameObject: m_ObjectHideFlags: 0 diff --git a/UnityProjects/MRTKDevTemplate/Assets/Scenes/InputFieldExamples.unity b/UnityProjects/MRTKDevTemplate/Assets/Scenes/InputFieldExamples.unity index 28bf959cb..e94adb3ee 100644 --- a/UnityProjects/MRTKDevTemplate/Assets/Scenes/InputFieldExamples.unity +++ b/UnityProjects/MRTKDevTemplate/Assets/Scenes/InputFieldExamples.unity @@ -263,67 +263,6 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 7291631689291610058, guid: d4ba24552c5dc52438a24daebf18b488, type: 3} m_PrefabInstance: {fileID: 6223184834466892460} m_PrefabAsset: {fileID: 0} ---- !u!1001 &1264779368 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720334, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_Name - value: MRTK XR Rig - objectReference: {fileID: 0} - - target: {fileID: 8479077998186684813, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} --- !u!1 &1381973820 GameObject: m_ObjectHideFlags: 0 @@ -459,6 +398,67 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1381973820} m_CullTransparentMesh: 0 +--- !u!1001 &1639214690 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720334, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_Name + value: MRTK XR Rig + objectReference: {fileID: 0} + - target: {fileID: 8479077998186684813, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} --- !u!1001 &1780241270 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/UnityProjects/MRTKDevTemplate/Assets/Scenes/InteractableButtonExamples.unity b/UnityProjects/MRTKDevTemplate/Assets/Scenes/InteractableButtonExamples.unity index 1b305fbb6..be121bd35 100644 --- a/UnityProjects/MRTKDevTemplate/Assets/Scenes/InteractableButtonExamples.unity +++ b/UnityProjects/MRTKDevTemplate/Assets/Scenes/InteractableButtonExamples.unity @@ -5650,8 +5650,8 @@ PrefabInstance: selection. - The virtual GetSelectionProgress() method can be overridden to - support more kinds of variable selection, like volumetric press. By default, + The virtual GetSelectionProgress() method can be overridden + to support more kinds of variable selection, like volumetric press. By default, StatefulInteractables will receive the variable selection amount from all participating IVariableSelectInteractors.' objectReference: {fileID: 0} @@ -26251,6 +26251,67 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1246517295} m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1001 &1298395134 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720334, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_Name + value: MRTK XR Rig + objectReference: {fileID: 0} + - target: {fileID: 8479077998186684813, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} --- !u!1001 &1336905036 PrefabInstance: m_ObjectHideFlags: 0 @@ -26698,67 +26759,6 @@ MonoBehaviour: onToggleSelected: m_PersistentCalls: m_Calls: [] ---- !u!1001 &1530487694 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_RootOrder - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720334, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_Name - value: MRTK XR Rig - objectReference: {fileID: 0} - - target: {fileID: 8479077998186684813, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} --- !u!1 &1551252956 GameObject: m_ObjectHideFlags: 0 @@ -27481,13 +27481,11 @@ MonoBehaviour: m_EditorClassIdentifier: m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 1 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -27545,42 +27543,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnHoverEntered: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_OnHoverExited: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectEntered: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectExited: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: diff --git a/UnityProjects/MRTKDevTemplate/Assets/Scenes/LegacyConstraintsExample.unity b/UnityProjects/MRTKDevTemplate/Assets/Scenes/LegacyConstraintsExample.unity index d8b5cc5b9..a562e920e 100644 --- a/UnityProjects/MRTKDevTemplate/Assets/Scenes/LegacyConstraintsExample.unity +++ b/UnityProjects/MRTKDevTemplate/Assets/Scenes/LegacyConstraintsExample.unity @@ -240,17 +240,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} ---- !u!114 &96287344 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 5569439093497552269, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - m_PrefabInstance: {fileID: 525252187} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 83e4e6cca11330d4088d729ab4fc9d9f, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1001 &98972786 PrefabInstance: m_ObjectHideFlags: 0 @@ -528,15 +517,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d9ad66e7cc9a2754d8ea989740c9f00d, type: 3} m_Name: m_EditorClassIdentifier: - m_InteractionManager: {fileID: 96287344} + m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 1 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -569,42 +556,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnHoverExited: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectEntered: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectExited: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectCanceled: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -719,6 +691,7 @@ MonoBehaviour: hostTransform: {fileID: 2044717239} allowedManipulations: 7 allowedInteractionTypes: -2147483641 + rigidbodyMovementType: 0 applyTorque: 1 springForceSoftness: 0.1 springTorqueSoftness: 0.1 @@ -741,8 +714,7 @@ MonoBehaviour: moveLogicType: reference: MixedReality.Toolkit.SpatialManipulation.MoveLogic, MixedReality.Toolkit.SpatialManipulation rotateLogicType: - reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, - MixedReality.Toolkit.SpatialManipulation + reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, MixedReality.Toolkit.SpatialManipulation scaleLogicType: reference: MixedReality.Toolkit.SpatialManipulation.ScaleLogic, MixedReality.Toolkit.SpatialManipulation --- !u!114 &206300810 @@ -759,6 +731,67 @@ MonoBehaviour: m_EditorClassIdentifier: autoConstraintSelection: 1 selectedConstraints: [] +--- !u!1001 &209520987 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720334, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_Name + value: MRTK XR Rig + objectReference: {fileID: 0} + - target: {fileID: 8479077998186684813, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} --- !u!1 &241560933 stripped GameObject: m_CorrespondingSourceObject: {fileID: 100002, guid: 6ceef383a3dfd0a4e9c38b8d793170e4, type: 3} @@ -857,13 +890,11 @@ MonoBehaviour: m_EditorClassIdentifier: m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 1 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -920,42 +951,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_OnHoverEntered: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_OnHoverExited: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectEntered: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -1220,6 +1236,7 @@ MonoBehaviour: hostTransform: {fileID: 241560934} allowedManipulations: 7 allowedInteractionTypes: -2147483641 + rigidbodyMovementType: 0 applyTorque: 1 springForceSoftness: 0.1 springTorqueSoftness: 0.1 @@ -1242,8 +1259,7 @@ MonoBehaviour: moveLogicType: reference: MixedReality.Toolkit.SpatialManipulation.MoveLogic, MixedReality.Toolkit.SpatialManipulation rotateLogicType: - reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, - MixedReality.Toolkit.SpatialManipulation + reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, MixedReality.Toolkit.SpatialManipulation scaleLogicType: reference: MixedReality.Toolkit.SpatialManipulation.ScaleLogic, MixedReality.Toolkit.SpatialManipulation --- !u!82 &241560939 @@ -1535,13 +1551,11 @@ MonoBehaviour: m_EditorClassIdentifier: m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 1 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -1598,42 +1612,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnHoverEntered: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_OnHoverExited: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectEntered: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectExited: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -1898,6 +1897,7 @@ MonoBehaviour: hostTransform: {fileID: 401502850} allowedManipulations: 7 allowedInteractionTypes: -2147483641 + rigidbodyMovementType: 0 applyTorque: 1 springForceSoftness: 0.1 springTorqueSoftness: 0.1 @@ -1920,8 +1920,7 @@ MonoBehaviour: moveLogicType: reference: MixedReality.Toolkit.SpatialManipulation.MoveLogic, MixedReality.Toolkit.SpatialManipulation rotateLogicType: - reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, - MixedReality.Toolkit.SpatialManipulation + reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, MixedReality.Toolkit.SpatialManipulation scaleLogicType: reference: MixedReality.Toolkit.SpatialManipulation.ScaleLogic, MixedReality.Toolkit.SpatialManipulation --- !u!82 &401502855 @@ -2215,13 +2214,11 @@ MonoBehaviour: m_EditorClassIdentifier: m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 1 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -2278,42 +2275,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_Deactivated: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnLastHoverExited: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectEntered: - m_PersistentCalls: - m_Calls: [] - m_OnSelectExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -2578,6 +2560,7 @@ MonoBehaviour: hostTransform: {fileID: 519116930} allowedManipulations: 7 allowedInteractionTypes: -2147483641 + rigidbodyMovementType: 0 applyTorque: 1 springForceSoftness: 0.1 springTorqueSoftness: 0.1 @@ -2600,8 +2583,7 @@ MonoBehaviour: moveLogicType: reference: MixedReality.Toolkit.SpatialManipulation.MoveLogic, MixedReality.Toolkit.SpatialManipulation rotateLogicType: - reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, - MixedReality.Toolkit.SpatialManipulation + reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, MixedReality.Toolkit.SpatialManipulation scaleLogicType: reference: MixedReality.Toolkit.SpatialManipulation.ScaleLogic, MixedReality.Toolkit.SpatialManipulation --- !u!114 &519116938 @@ -2757,67 +2739,6 @@ AudioSource: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 ---- !u!1001 &525252187 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720334, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_Name - value: MRTK XR Rig - objectReference: {fileID: 0} - - target: {fileID: 8479077998186684813, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} --- !u!1001 &590813533 PrefabInstance: m_ObjectHideFlags: 0 @@ -2960,13 +2881,11 @@ MonoBehaviour: m_EditorClassIdentifier: m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 1 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -3023,42 +2942,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnHoverEntered: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_OnHoverExited: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectEntered: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectExited: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -3323,6 +3227,7 @@ MonoBehaviour: hostTransform: {fileID: 590813534} allowedManipulations: 7 allowedInteractionTypes: -2147483641 + rigidbodyMovementType: 0 applyTorque: 1 springForceSoftness: 0.1 springTorqueSoftness: 0.1 @@ -3345,8 +3250,7 @@ MonoBehaviour: moveLogicType: reference: MixedReality.Toolkit.SpatialManipulation.MoveLogic, MixedReality.Toolkit.SpatialManipulation rotateLogicType: - reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, - MixedReality.Toolkit.SpatialManipulation + reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, MixedReality.Toolkit.SpatialManipulation scaleLogicType: reference: MixedReality.Toolkit.SpatialManipulation.ScaleLogic, MixedReality.Toolkit.SpatialManipulation --- !u!114 &590813541 @@ -4846,13 +4750,11 @@ MonoBehaviour: m_EditorClassIdentifier: m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 1 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -4909,42 +4811,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_OnHoverEntered: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_OnHoverExited: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectEntered: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -5209,6 +5096,7 @@ MonoBehaviour: hostTransform: {fileID: 1259012960} allowedManipulations: 7 allowedInteractionTypes: -2147483641 + rigidbodyMovementType: 0 applyTorque: 1 springForceSoftness: 0.1 springTorqueSoftness: 0.1 @@ -5231,8 +5119,7 @@ MonoBehaviour: moveLogicType: reference: MixedReality.Toolkit.SpatialManipulation.MoveLogic, MixedReality.Toolkit.SpatialManipulation rotateLogicType: - reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, - MixedReality.Toolkit.SpatialManipulation + reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, MixedReality.Toolkit.SpatialManipulation scaleLogicType: reference: MixedReality.Toolkit.SpatialManipulation.ScaleLogic, MixedReality.Toolkit.SpatialManipulation --- !u!82 &1259012970 @@ -5467,13 +5354,11 @@ MonoBehaviour: m_EditorClassIdentifier: m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 1 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -5530,42 +5415,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_Deactivated: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnLastHoverExited: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectEntered: - m_PersistentCalls: - m_Calls: [] - m_OnSelectExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -5830,6 +5700,7 @@ MonoBehaviour: hostTransform: {fileID: 1214529607436804868} allowedManipulations: 3 allowedInteractionTypes: -2147483641 + rigidbodyMovementType: 0 applyTorque: 1 springForceSoftness: 0.1 springTorqueSoftness: 0.1 @@ -5852,8 +5723,7 @@ MonoBehaviour: moveLogicType: reference: MixedReality.Toolkit.SpatialManipulation.MoveLogic, MixedReality.Toolkit.SpatialManipulation rotateLogicType: - reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, - MixedReality.Toolkit.SpatialManipulation + reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, MixedReality.Toolkit.SpatialManipulation scaleLogicType: reference: MixedReality.Toolkit.SpatialManipulation.ScaleLogic, MixedReality.Toolkit.SpatialManipulation --- !u!82 &1375102008 diff --git a/UnityProjects/MRTKDevTemplate/Assets/Scenes/MagicWindowExample.unity b/UnityProjects/MRTKDevTemplate/Assets/Scenes/MagicWindowExample.unity index 4dc08f9c5..6c2e39ef3 100644 --- a/UnityProjects/MRTKDevTemplate/Assets/Scenes/MagicWindowExample.unity +++ b/UnityProjects/MRTKDevTemplate/Assets/Scenes/MagicWindowExample.unity @@ -283,6 +283,67 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: ad5b753b73e311143a85055b15cea562, type: 3} +--- !u!1001 &629218106 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720334, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_Name + value: MRTK XR Rig + objectReference: {fileID: 0} + - target: {fileID: 8479077998186684813, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} --- !u!1 &705507993 GameObject: m_ObjectHideFlags: 0 @@ -462,13 +523,11 @@ MonoBehaviour: m_EditorClassIdentifier: m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 1 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -501,42 +560,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnHoverEntered: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_OnHoverExited: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectEntered: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectExited: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -651,6 +695,7 @@ MonoBehaviour: hostTransform: {fileID: 1203713056} allowedManipulations: 7 allowedInteractionTypes: -2147483641 + rigidbodyMovementType: 0 applyTorque: 1 springForceSoftness: 0.1 springTorqueSoftness: 0.1 @@ -673,8 +718,7 @@ MonoBehaviour: moveLogicType: reference: MixedReality.Toolkit.SpatialManipulation.MoveLogic, MixedReality.Toolkit.SpatialManipulation rotateLogicType: - reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, - MixedReality.Toolkit.SpatialManipulation + reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, MixedReality.Toolkit.SpatialManipulation scaleLogicType: reference: MixedReality.Toolkit.SpatialManipulation.ScaleLogic, MixedReality.Toolkit.SpatialManipulation --- !u!114 &958324216 @@ -926,67 +970,6 @@ GameObject: m_CorrespondingSourceObject: {fileID: 7781529056550460866, guid: c07c4bd04b45c014fad0e3cd30747f06, type: 3} m_PrefabInstance: {fileID: 771189643} m_PrefabAsset: {fileID: 0} ---- !u!1001 &1530487694 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_RootOrder - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720334, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_Name - value: MRTK XR Rig - objectReference: {fileID: 0} - - target: {fileID: 8479077998186684813, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} --- !u!1 &1551252956 GameObject: m_ObjectHideFlags: 0 diff --git a/UnityProjects/MRTKDevTemplate/Assets/Scenes/NearMenuExamples.unity b/UnityProjects/MRTKDevTemplate/Assets/Scenes/NearMenuExamples.unity index ebdb0947e..26bb6fba3 100644 --- a/UnityProjects/MRTKDevTemplate/Assets/Scenes/NearMenuExamples.unity +++ b/UnityProjects/MRTKDevTemplate/Assets/Scenes/NearMenuExamples.unity @@ -790,6 +790,67 @@ Transform: m_CorrespondingSourceObject: {fileID: 791738712976538213, guid: f443144a6d408c34bb8a7d70a73644c4, type: 3} m_PrefabInstance: {fileID: 795824529} m_PrefabAsset: {fileID: 0} +--- !u!1001 &294895314 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720334, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_Name + value: MRTK XR Rig + objectReference: {fileID: 0} + - target: {fileID: 8479077998186684813, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} --- !u!1001 &308774567 PrefabInstance: m_ObjectHideFlags: 0 @@ -1525,39 +1586,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} ---- !u!1001 &525252187 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720334, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_Name - value: MRTK XR Rig - objectReference: {fileID: 0} - - target: {fileID: 8479077998186684813, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} --- !u!1001 &530525190 PrefabInstance: m_ObjectHideFlags: 0 @@ -1596,17 +1624,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 791738712976538213, guid: f443144a6d408c34bb8a7d70a73644c4, type: 3} m_PrefabInstance: {fileID: 918144028} m_PrefabAsset: {fileID: 0} ---- !u!114 &696145723 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 5569439093497552269, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - m_PrefabInstance: {fileID: 525252187} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 83e4e6cca11330d4088d729ab4fc9d9f, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &705507993 GameObject: m_ObjectHideFlags: 0 @@ -3150,15 +3167,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d9ad66e7cc9a2754d8ea989740c9f00d, type: 3} m_Name: m_EditorClassIdentifier: - m_InteractionManager: {fileID: 696145723} + m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 1 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -3191,42 +3206,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnHoverExited: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectEntered: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectExited: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectCanceled: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -3341,6 +3341,7 @@ MonoBehaviour: hostTransform: {fileID: 1947783662} allowedManipulations: 7 allowedInteractionTypes: -2147483641 + rigidbodyMovementType: 0 applyTorque: 1 springForceSoftness: 0.1 springTorqueSoftness: 0.1 @@ -3363,8 +3364,7 @@ MonoBehaviour: moveLogicType: reference: MixedReality.Toolkit.SpatialManipulation.MoveLogic, MixedReality.Toolkit.SpatialManipulation rotateLogicType: - reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, - MixedReality.Toolkit.SpatialManipulation + reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, MixedReality.Toolkit.SpatialManipulation scaleLogicType: reference: MixedReality.Toolkit.SpatialManipulation.ScaleLogic, MixedReality.Toolkit.SpatialManipulation --- !u!4 &1297402049 stripped diff --git a/UnityProjects/MRTKDevTemplate/Assets/Scenes/NonCanvasDialogExample.unity b/UnityProjects/MRTKDevTemplate/Assets/Scenes/NonCanvasDialogExample.unity index fe786f291..73a25242e 100644 --- a/UnityProjects/MRTKDevTemplate/Assets/Scenes/NonCanvasDialogExample.unity +++ b/UnityProjects/MRTKDevTemplate/Assets/Scenes/NonCanvasDialogExample.unity @@ -2384,71 +2384,71 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} m_PrefabInstance: {fileID: 110026553} m_PrefabAsset: {fileID: 0} ---- !u!1001 &1990843813 +--- !u!1001 &1798130885 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} propertyPath: m_RootOrder value: 0 objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 2351505567455720334, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} + - target: {fileID: 2351505567455720334, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} propertyPath: m_Name value: MRTK XR Rig objectReference: {fileID: 0} - - target: {fileID: 8479077998186684813, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} + - target: {fileID: 8479077998186684813, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} + m_SourcePrefab: {fileID: 100100000, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} --- !u!114 &1990843814 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 5569439093497552269, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - m_PrefabInstance: {fileID: 1990843813} + m_CorrespondingSourceObject: {fileID: 800708247703322884, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + m_PrefabInstance: {fileID: 1798130885} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 diff --git a/UnityProjects/MRTKDevTemplate/Assets/Scenes/NonCanvasObjectBarExample.unity b/UnityProjects/MRTKDevTemplate/Assets/Scenes/NonCanvasObjectBarExample.unity index fc18c2c18..99f9444bf 100644 --- a/UnityProjects/MRTKDevTemplate/Assets/Scenes/NonCanvasObjectBarExample.unity +++ b/UnityProjects/MRTKDevTemplate/Assets/Scenes/NonCanvasObjectBarExample.unity @@ -1178,82 +1178,6 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!1001 &1092060479 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720333, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_RequestedTrackingOriginMode - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720334, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_Name - value: MRTK XR Rig - objectReference: {fileID: 0} - - target: {fileID: 8479077998186684813, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} ---- !u!114 &1092060480 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 5569439093497552269, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - m_PrefabInstance: {fileID: 1092060479} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 83e4e6cca11330d4088d729ab4fc9d9f, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &1103622757 GameObject: m_ObjectHideFlags: 0 @@ -1620,15 +1544,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d9ad66e7cc9a2754d8ea989740c9f00d, type: 3} m_Name: m_EditorClassIdentifier: - m_InteractionManager: {fileID: 1092060480} + m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 1 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -1661,42 +1583,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnHoverEntered: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_OnHoverExited: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectEntered: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectExited: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -1811,6 +1718,7 @@ MonoBehaviour: hostTransform: {fileID: 202369026} allowedManipulations: 7 allowedInteractionTypes: -2147483641 + rigidbodyMovementType: 0 applyTorque: 1 springForceSoftness: 0.1 springTorqueSoftness: 0.1 @@ -1833,8 +1741,7 @@ MonoBehaviour: moveLogicType: reference: MixedReality.Toolkit.SpatialManipulation.MoveLogic, MixedReality.Toolkit.SpatialManipulation rotateLogicType: - reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, - MixedReality.Toolkit.SpatialManipulation + reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, MixedReality.Toolkit.SpatialManipulation scaleLogicType: reference: MixedReality.Toolkit.SpatialManipulation.ScaleLogic, MixedReality.Toolkit.SpatialManipulation --- !u!114 &1170466725 @@ -2347,6 +2254,67 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} +--- !u!1001 &2087680863 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720334, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_Name + value: MRTK XR Rig + objectReference: {fileID: 0} + - target: {fileID: 8479077998186684813, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} --- !u!1001 &1214183256315780632 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/UnityProjects/MRTKDevTemplate/Assets/Scenes/NonCanvasUIBackplateExample.unity b/UnityProjects/MRTKDevTemplate/Assets/Scenes/NonCanvasUIBackplateExample.unity index 9170ba011..a3e0cee06 100644 --- a/UnityProjects/MRTKDevTemplate/Assets/Scenes/NonCanvasUIBackplateExample.unity +++ b/UnityProjects/MRTKDevTemplate/Assets/Scenes/NonCanvasUIBackplateExample.unity @@ -1054,39 +1054,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 2244185731585867246, guid: cd0f0697f0939504389ec612388f609a, type: 3} m_PrefabInstance: {fileID: 435941452} m_PrefabAsset: {fileID: 0} ---- !u!1001 &525252187 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720334, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_Name - value: MRTK XR Rig - objectReference: {fileID: 0} - - target: {fileID: 8479077998186684813, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} --- !u!1001 &530525190 PrefabInstance: m_ObjectHideFlags: 0 @@ -2282,6 +2249,67 @@ Transform: m_CorrespondingSourceObject: {fileID: 2244185731585867246, guid: cd0f0697f0939504389ec612388f609a, type: 3} m_PrefabInstance: {fileID: 1101607046} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1116803318 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720334, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_Name + value: MRTK XR Rig + objectReference: {fileID: 0} + - target: {fileID: 8479077998186684813, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} --- !u!1001 &1341997848 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/UnityProjects/MRTKDevTemplate/Assets/Scenes/NonCanvasUITearSheet.unity b/UnityProjects/MRTKDevTemplate/Assets/Scenes/NonCanvasUITearSheet.unity index aed30bc1a..9047969e1 100644 --- a/UnityProjects/MRTKDevTemplate/Assets/Scenes/NonCanvasUITearSheet.unity +++ b/UnityProjects/MRTKDevTemplate/Assets/Scenes/NonCanvasUITearSheet.unity @@ -517,13 +517,11 @@ MonoBehaviour: m_EditorClassIdentifier: m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 0 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -556,42 +554,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnHoverEntered: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_OnHoverExited: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectEntered: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectExited: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -707,6 +690,7 @@ MonoBehaviour: hostTransform: {fileID: 1947783662} allowedManipulations: 7 allowedInteractionTypes: -1 + rigidbodyMovementType: 0 applyTorque: 1 springForceSoftness: 0.1 springTorqueSoftness: 0.1 @@ -729,8 +713,7 @@ MonoBehaviour: moveLogicType: reference: MixedReality.Toolkit.SpatialManipulation.MoveLogic, MixedReality.Toolkit.SpatialManipulation rotateLogicType: - reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, - MixedReality.Toolkit.SpatialManipulation + reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, MixedReality.Toolkit.SpatialManipulation scaleLogicType: reference: MixedReality.Toolkit.SpatialManipulation.ScaleLogic, MixedReality.Toolkit.SpatialManipulation --- !u!114 &151308756 @@ -1718,39 +1701,6 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!1001 &525252187 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720334, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_Name - value: MRTK XR Rig - objectReference: {fileID: 0} - - target: {fileID: 8479077998186684813, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} --- !u!1001 &526542948 PrefabInstance: m_ObjectHideFlags: 0 @@ -7727,6 +7677,67 @@ Transform: m_CorrespondingSourceObject: {fileID: 5691419709062267402, guid: 3e816bc244e720a44bdea29af72e0b8b, type: 3} m_PrefabInstance: {fileID: 1517089657} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1536445504 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720334, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_Name + value: MRTK XR Rig + objectReference: {fileID: 0} + - target: {fileID: 8479077998186684813, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} --- !u!1 &1551252956 GameObject: m_ObjectHideFlags: 0 diff --git a/UnityProjects/MRTKDevTemplate/Assets/Scenes/ObsoleteHandInteractionExamples.unity b/UnityProjects/MRTKDevTemplate/Assets/Scenes/ObsoleteHandInteractionExamples.unity new file mode 100644 index 000000000..2f597ae55 --- /dev/null +++ b/UnityProjects/MRTKDevTemplate/Assets/Scenes/ObsoleteHandInteractionExamples.unity @@ -0,0 +1,19864 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!29 &1 +OcclusionCullingSettings: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_OcclusionBakeSettings: + smallestOccluder: 5 + smallestHole: 0.25 + backfaceThreshold: 100 + m_SceneGUID: 00000000000000000000000000000000 + m_OcclusionCullingData: {fileID: 0} +--- !u!104 &2 +RenderSettings: + m_ObjectHideFlags: 0 + serializedVersion: 9 + m_Fog: 0 + m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_FogMode: 3 + m_FogDensity: 0.01 + m_LinearFogStart: 0 + m_LinearFogEnd: 300 + m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} + m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} + m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} + m_AmbientIntensity: 1 + m_AmbientMode: 0 + m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} + m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0} + m_HaloStrength: 0.5 + m_FlareStrength: 1 + m_FlareFadeSpeed: 3 + m_HaloTexture: {fileID: 0} + m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} + m_DefaultReflectionMode: 0 + m_DefaultReflectionResolution: 128 + m_ReflectionBounces: 1 + 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_UseRadianceAmbientProbe: 0 +--- !u!157 &3 +LightmapSettings: + m_ObjectHideFlags: 0 + serializedVersion: 12 + m_GIWorkflowMode: 1 + m_GISettings: + serializedVersion: 2 + m_BounceScale: 1 + m_IndirectOutputScale: 1 + m_AlbedoBoost: 1 + m_EnvironmentLightingMode: 0 + m_EnableBakedLightmaps: 1 + m_EnableRealtimeLightmaps: 0 + m_LightmapEditorSettings: + serializedVersion: 12 + m_Resolution: 2 + m_BakeResolution: 40 + m_AtlasSize: 1024 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 1 + m_CompAOExponentDirect: 0 + m_ExtractAmbientOcclusion: 0 + m_Padding: 2 + m_LightmapParameters: {fileID: 0} + m_LightmapsBakeMode: 1 + m_TextureCompression: 1 + m_FinalGather: 0 + m_FinalGatherFiltering: 1 + m_FinalGatherRayCount: 256 + m_ReflectionCompression: 2 + m_MixedBakeMode: 2 + m_BakeBackend: 1 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 500 + m_PVRBounces: 2 + m_PVREnvironmentSampleCount: 500 + m_PVREnvironmentReferencePointCount: 2048 + m_PVRFilteringMode: 2 + m_PVRDenoiserTypeDirect: 0 + m_PVRDenoiserTypeIndirect: 0 + m_PVRDenoiserTypeAO: 0 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVREnvironmentMIS: 0 + m_PVRCulling: 1 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 5 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_LightProbeSampleCountMultiplier: 4 + m_LightingDataAsset: {fileID: 0} + m_LightingSettings: {fileID: 0} +--- !u!196 &4 +NavMeshSettings: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_BuildSettings: + serializedVersion: 2 + agentTypeID: 0 + agentRadius: 0.5 + agentHeight: 2 + agentSlope: 45 + agentClimb: 0.4 + ledgeDropHeight: 0 + maxJumpAcrossDistance: 0 + minRegionArea: 2 + manualCellSize: 0 + cellSize: 0.16666667 + manualTileSize: 0 + tileSize: 256 + accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 + debug: + m_Flags: 0 + m_NavMeshData: {fileID: 0} +--- !u!82 &3514977 stripped +AudioSource: + m_CorrespondingSourceObject: {fileID: 1918766681897676798, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + m_PrefabInstance: {fileID: 364946991195464072} + m_PrefabAsset: {fileID: 0} +--- !u!1 &5174431 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5174432} + m_Layer: 0 + m_Name: CanvasUIExample + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5174432 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5174431} + 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} + m_Father: {fileID: 1203713056} + m_RootOrder: 8 + m_LocalEulerAnglesHint: {x: 0, y: -45, z: 0} +--- !u!1 &6284416 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6284417} + - component: {fileID: 6284418} + m_Layer: 0 + m_Name: MRTK_Logo_White (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6284417 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6284416} + 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 + m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} +--- !u!212 &6284418 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6284416} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300000, guid: fe5cc215f12ea5e40b5021c4040bce24, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 20.48, y: 10.24} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &37486930 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 37486931} + - component: {fileID: 37486934} + - component: {fileID: 37486933} + m_Layer: 0 + m_Name: Coffee + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &37486931 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 37486930} + 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 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &37486933 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 37486930} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: cfecafee97b1bac42be6698465e5bd45, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &37486934 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 37486930} + m_Mesh: {fileID: 10206, guid: 0000000000000000e000000000000000, type: 0} +--- !u!4 &37831752 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1214529608091387485, guid: 0d3b2fd2079cd514d8dbce654f929320, type: 3} + m_PrefabInstance: {fileID: 663760220} + m_PrefabAsset: {fileID: 0} +--- !u!1 &76807523 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 100016, guid: f9a8072f5d9b92347a999f10f01b8012, type: 3} + m_PrefabInstance: {fileID: 1294530691} + m_PrefabAsset: {fileID: 0} +--- !u!65 &76807524 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 76807523} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 0.10026801, y: 0.082757965, z: 0.093791895} + m_Center: {x: -0.00011960028, y: -0.000000057742, z: -0.008266095} +--- !u!1 &76865735 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 76865736} + - component: {fileID: 76865738} + - component: {fileID: 76865737} + m_Layer: 0 + m_Name: SectionTitle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &76865736 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 76865735} + 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 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0.44469, y: -0.0049726367} + m_SizeDelta: {x: 21.48273, y: 5} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &76865737 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 76865735} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9541d86e2fd84c1d9990edf0852d74ab, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: "Touch Interaction\n\nExamples of direct touch events using + StatefulInteractable.cs > MRTK Events > Poke Hovered event + \nDoes not work with hand ray or other indirect input methods" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 533bdd8d5c92b52448ee2ecf7bd828a4, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: b082f80c6b45164418a354f7e116f0a3, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 8 + m_fontSizeBase: 8 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 0 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + 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 +--- !u!23 &76865738 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 76865735} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: b082f80c6b45164418a354f7e116f0a3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!1001 &79416683 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1727403011} + m_Modifications: + - target: {fileID: 100002, guid: 6ceef383a3dfd0a4e9c38b8d793170e4, type: 3} + propertyPath: m_Name + value: CoffeeCup + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 6ceef383a3dfd0a4e9c38b8d793170e4, type: 3} + propertyPath: m_LocalPosition.y + value: 0.42102012 + objectReference: {fileID: 0} + - target: {fileID: 400002, guid: 6ceef383a3dfd0a4e9c38b8d793170e4, type: 3} + propertyPath: m_RootOrder + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 400002, guid: 6ceef383a3dfd0a4e9c38b8d793170e4, type: 3} + propertyPath: m_LocalScale.x + value: 0.062000006 + objectReference: {fileID: 0} + - target: {fileID: 400002, guid: 6ceef383a3dfd0a4e9c38b8d793170e4, type: 3} + propertyPath: m_LocalScale.y + value: 0.062000003 + objectReference: {fileID: 0} + - target: {fileID: 400002, guid: 6ceef383a3dfd0a4e9c38b8d793170e4, type: 3} + propertyPath: m_LocalScale.z + value: 0.062000006 + objectReference: {fileID: 0} + - target: {fileID: 400002, guid: 6ceef383a3dfd0a4e9c38b8d793170e4, type: 3} + propertyPath: m_LocalPosition.x + value: 0.888 + objectReference: {fileID: 0} + - target: {fileID: 400002, guid: 6ceef383a3dfd0a4e9c38b8d793170e4, type: 3} + propertyPath: m_LocalPosition.y + value: -0.478 + objectReference: {fileID: 0} + - target: {fileID: 400002, guid: 6ceef383a3dfd0a4e9c38b8d793170e4, type: 3} + propertyPath: m_LocalPosition.z + value: 0.433 + objectReference: {fileID: 0} + - target: {fileID: 400002, guid: 6ceef383a3dfd0a4e9c38b8d793170e4, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 400002, guid: 6ceef383a3dfd0a4e9c38b8d793170e4, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 400002, guid: 6ceef383a3dfd0a4e9c38b8d793170e4, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 400002, guid: 6ceef383a3dfd0a4e9c38b8d793170e4, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400002, guid: 6ceef383a3dfd0a4e9c38b8d793170e4, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400002, guid: 6ceef383a3dfd0a4e9c38b8d793170e4, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400004, guid: 6ceef383a3dfd0a4e9c38b8d793170e4, type: 3} + propertyPath: m_LocalPosition.y + value: -1.22 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 6ceef383a3dfd0a4e9c38b8d793170e4, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: cfecafee97b1bac42be6698465e5bd45, type: 2} + - target: {fileID: 2300002, guid: 6ceef383a3dfd0a4e9c38b8d793170e4, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: edc81f8444b03444eae776bfc3a3dd00, type: 2} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 6ceef383a3dfd0a4e9c38b8d793170e4, type: 3} +--- !u!4 &79416684 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 400002, guid: 6ceef383a3dfd0a4e9c38b8d793170e4, type: 3} + m_PrefabInstance: {fileID: 79416683} + m_PrefabAsset: {fileID: 0} +--- !u!1 &79416685 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 100002, guid: 6ceef383a3dfd0a4e9c38b8d793170e4, type: 3} + m_PrefabInstance: {fileID: 79416683} + m_PrefabAsset: {fileID: 0} +--- !u!114 &79416686 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 79416685} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 50cdab0cd5a0916419324bb54314773d, type: 3} + m_Name: + m_EditorClassIdentifier: + autoConstraintSelection: 1 + selectedConstraints: [] +--- !u!54 &79416687 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 79416685} + serializedVersion: 2 + m_Mass: 0.1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 1 + m_IsKinematic: 0 + m_Interpolate: 1 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!114 &79416688 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 79416685} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe9323ca265114b4282b5d33b41f7adc, type: 3} + m_Name: + m_EditorClassIdentifier: + distanceThreshold: 20 +--- !u!114 &79416689 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 79416685} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d9ad66e7cc9a2754d8ea989740c9f00d, type: 3} + m_Name: + m_EditorClassIdentifier: + m_InteractionManager: {fileID: 0} + m_Colliders: [] + m_InteractionLayers: + m_Bits: 1 + m_DistanceCalculationMode: 1 + m_SelectMode: 1 + m_FocusMode: 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: [] + m_LastHoverExited: + m_PersistentCalls: + m_Calls: [] + m_HoverEntered: + m_PersistentCalls: + m_Calls: [] + m_HoverExited: + m_PersistentCalls: + m_Calls: [] + m_FirstSelectEntered: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 79416690} + m_TargetAssemblyTypeName: UnityEngine.AudioSource, UnityEngine + m_MethodName: PlayOneShot + m_Mode: 2 + m_Arguments: + m_ObjectArgument: {fileID: 8300000, guid: 29437a55b95f2eb489a5ec8574f185e9, type: 3} + m_ObjectArgumentAssemblyTypeName: UnityEngine.AudioClip, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_LastSelectExited: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 79416690} + m_TargetAssemblyTypeName: UnityEngine.AudioSource, UnityEngine + m_MethodName: PlayOneShot + m_Mode: 2 + m_Arguments: + m_ObjectArgument: {fileID: 8300000, guid: 9f512430eba32d845aab8de9ba5e393c, type: 3} + m_ObjectArgumentAssemblyTypeName: UnityEngine.AudioClip, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_SelectEntered: + m_PersistentCalls: + m_Calls: [] + m_SelectExited: + m_PersistentCalls: + m_Calls: [] + m_FirstFocusEntered: + m_PersistentCalls: + m_Calls: [] + m_LastFocusExited: + m_PersistentCalls: + m_Calls: [] + m_FocusEntered: + m_PersistentCalls: + m_Calls: [] + m_FocusExited: + m_PersistentCalls: + m_Calls: [] + m_Activated: + m_PersistentCalls: + m_Calls: [] + m_Deactivated: + m_PersistentCalls: + m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] + isGazePinchSelected: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 0} + m_TargetAssemblyTypeName: UnityEngine.AudioSource, UnityEngine + m_MethodName: PlayOneShot + m_Mode: 2 + m_Arguments: + m_ObjectArgument: {fileID: 8300000, guid: 29437a55b95f2eb489a5ec8574f185e9, type: 3} + m_ObjectArgumentAssemblyTypeName: UnityEngine.AudioClip, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - m_Target: {fileID: 0} + m_TargetAssemblyTypeName: MixedReality.Toolkit.SpatialManipulation.BoundsControl, + MixedReality.Toolkit.SpatialManipulation + m_MethodName: HighlightWires + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + onExited: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 0} + m_TargetAssemblyTypeName: UnityEngine.AudioSource, UnityEngine + m_MethodName: PlayOneShot + m_Mode: 2 + m_Arguments: + m_ObjectArgument: {fileID: 8300000, guid: 9f512430eba32d845aab8de9ba5e393c, type: 3} + m_ObjectArgumentAssemblyTypeName: UnityEngine.AudioClip, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - m_Target: {fileID: 0} + m_TargetAssemblyTypeName: MixedReality.Toolkit.SpatialManipulation.BoundsControl, + MixedReality.Toolkit.SpatialManipulation + m_MethodName: UnhighlightWires + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + isRaySelected: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 0} + m_TargetAssemblyTypeName: UnityEngine.AudioSource, UnityEngine + m_MethodName: PlayOneShot + m_Mode: 2 + m_Arguments: + m_ObjectArgument: {fileID: 8300000, guid: 29437a55b95f2eb489a5ec8574f185e9, type: 3} + m_ObjectArgumentAssemblyTypeName: UnityEngine.AudioClip, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - m_Target: {fileID: 0} + m_TargetAssemblyTypeName: MixedReality.Toolkit.SpatialManipulation.BoundsControl, + MixedReality.Toolkit.SpatialManipulation + m_MethodName: HighlightWires + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + onExited: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 0} + m_TargetAssemblyTypeName: UnityEngine.AudioSource, UnityEngine + m_MethodName: PlayOneShot + m_Mode: 2 + m_Arguments: + m_ObjectArgument: {fileID: 8300000, guid: 9f512430eba32d845aab8de9ba5e393c, type: 3} + m_ObjectArgumentAssemblyTypeName: UnityEngine.AudioClip, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - m_Target: {fileID: 0} + m_TargetAssemblyTypeName: MixedReality.Toolkit.SpatialManipulation.BoundsControl, + MixedReality.Toolkit.SpatialManipulation + m_MethodName: UnhighlightWires + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + isPokeSelected: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isGrabSelected: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isGazeHovered: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isGazePinchHovered: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isRayHovered: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isGrabHovered: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isPokeHovered: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isActiveHovered: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + disabledInteractorTypes: + - reference: MixedReality.Toolkit.IPokeInteractor, MixedReality.Toolkit.Core + k__BackingField: 0 + k__BackingField: 0.9 + k__BackingField: 0.1 + k__BackingField: 1 + k__BackingField: 0 + k__BackingField: 1 + k__BackingField: 0 + k__BackingField: 1 + allowSelectByVoice: 1 + speechRecognitionKeyword: select + k__BackingField: 1 + k__BackingField: 0 + k__BackingField: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + k__BackingField: + m_PersistentCalls: + m_Calls: [] + k__BackingField: + m_PersistentCalls: + m_Calls: [] + k__BackingField: + m_PersistentCalls: + m_Calls: [] + hostTransform: {fileID: 79416684} + allowedManipulations: 7 + allowedInteractionTypes: -2147483641 + rigidbodyMovementType: 0 + applyTorque: 1 + springForceSoftness: 0.1 + springTorqueSoftness: 0.1 + springDamping: 1 + springForceLimit: 100 + rotationAnchorNear: 1 + rotationAnchorFar: 1 + releaseBehavior: 3 + transformSmoothingLogicType: + reference: MixedReality.Toolkit.SpatialManipulation.DefaultTransformSmoothingLogic, + MixedReality.Toolkit.SpatialManipulation + smoothingFar: 0 + smoothingNear: 0 + moveLerpTime: 0.001 + rotateLerpTime: 0.001 + scaleLerpTime: 0.001 + enableConstraints: 1 + constraintsManager: {fileID: 79416686} + manipulationLogicTypes: + moveLogicType: + reference: MixedReality.Toolkit.SpatialManipulation.MoveLogic, MixedReality.Toolkit.SpatialManipulation + rotateLogicType: + reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, MixedReality.Toolkit.SpatialManipulation + scaleLogicType: + reference: MixedReality.Toolkit.SpatialManipulation.ScaleLogic, MixedReality.Toolkit.SpatialManipulation +--- !u!82 &79416690 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 79416685} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} + m_audioClip: {fileID: 0} + m_PlayOnAwake: 1 + m_Volume: 1 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 1 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 +--- !u!114 &79416691 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 79416685} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3a1bf44e2291e8741ab3dec75055d9db, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 0 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 0} + movableAxes: 0 + onMoveDelta: 0.01 +--- !u!114 &79416692 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 79416685} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 80f85af46f9bddd4ea78f11cee5e3b2e, type: 3} + m_Name: + m_EditorClassIdentifier: + handType: 3 + proximityType: 3 + executionOrder: 0 + minimumScale: {x: 0.2, y: 0.2, z: 0.2} + maximumScale: {x: 2, y: 2, z: 2} + relativeToInitialState: 1 +--- !u!1 &105991071 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 105991072} + - component: {fileID: 105991074} + - component: {fileID: 105991073} + m_Layer: 0 + m_Name: Text (TMP) (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &105991072 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 105991071} + 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 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -0.1895, y: -0.2} + m_SizeDelta: {x: 17.27645, y: 5} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &105991073 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 105991071} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9541d86e2fd84c1d9990edf0852d74ab, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: 'Flattened Style + + Handle Always + On' + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 533bdd8d5c92b52448ee2ecf7bd828a4, type: 2} + m_sharedMaterial: {fileID: -1005824763306460071, guid: 533bdd8d5c92b52448ee2ecf7bd828a4, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 36 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 0 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + 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 +--- !u!23 &105991074 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 105991071} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: -1005824763306460071, guid: 533bdd8d5c92b52448ee2ecf7bd828a4, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!1 &150862478 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 150862479} + m_Layer: 0 + m_Name: Touch Interaction + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &150862479 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 150862478} + 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} + - {fileID: 831445128} + - {fileID: 1685298795} + - {fileID: 1180287156} + - {fileID: 4654093213557177395} + m_Father: {fileID: 1203713056} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!224 &186579027 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2578649064399513024, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + m_PrefabInstance: {fileID: 2578649064215403923} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &235624890 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1913468802} + m_Modifications: + - target: {fileID: 4125495309553998321, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} + propertyPath: m_Name + value: FlatPanel (1) + objectReference: {fileID: 0} + - target: {fileID: 4205010513405509735, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 4205010513405509735, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4205010513405509735, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} + propertyPath: m_LocalPosition.x + value: -0.18570001 + objectReference: {fileID: 0} + - target: {fileID: 4205010513405509735, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} + propertyPath: m_LocalPosition.y + value: -0.1234 + objectReference: {fileID: 0} + - target: {fileID: 4205010513405509735, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} + propertyPath: m_LocalPosition.z + value: 0.0055999756 + objectReference: {fileID: 0} + - target: {fileID: 4205010513405509735, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4205010513405509735, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4205010513405509735, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4205010513405509735, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4205010513405509735, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4205010513405509735, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4205010513405509735, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7759758375038403720, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} + propertyPath: m_LocalScale.x + value: 0.17586362 + objectReference: {fileID: 0} + - target: {fileID: 7759758375038403720, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} + propertyPath: m_LocalScale.y + value: 0.078615054 + objectReference: {fileID: 0} + - target: {fileID: 7759758375038403720, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} + propertyPath: m_LocalScale.z + value: 0.017 + objectReference: {fileID: 0} + - target: {fileID: 7759758375038403720, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} + propertyPath: m_LocalPosition.x + value: -0.0028 + objectReference: {fileID: 0} + - target: {fileID: 7759758375038403720, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} + propertyPath: m_LocalPosition.y + value: 0.0008 + objectReference: {fileID: 0} + - target: {fileID: 7759758375038403720, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} + propertyPath: m_LocalPosition.z + value: 0.00014997 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} +--- !u!4 &235624891 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4205010513405509735, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} + m_PrefabInstance: {fileID: 235624890} + m_PrefabAsset: {fileID: 0} +--- !u!1 &235624892 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6056454165148638616, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} + m_PrefabInstance: {fileID: 235624890} + m_PrefabAsset: {fileID: 0} +--- !u!1 &235624893 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 4125495309553998321, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} + m_PrefabInstance: {fileID: 235624890} + m_PrefabAsset: {fileID: 0} +--- !u!65 &235624894 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 235624892} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 0.99999994, z: 0.1} + m_Center: {x: 0, y: 0.000000074505806, z: 0.05} +--- !u!114 &235624895 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 235624893} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d9ad66e7cc9a2754d8ea989740c9f00d, type: 3} + m_Name: + m_EditorClassIdentifier: + m_InteractionManager: {fileID: 0} + m_Colliders: [] + m_InteractionLayers: + m_Bits: 1 + m_DistanceCalculationMode: 1 + m_SelectMode: 1 + m_FocusMode: 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: [] + m_LastHoverExited: + m_PersistentCalls: + m_Calls: [] + m_HoverEntered: + m_PersistentCalls: + m_Calls: [] + m_HoverExited: + m_PersistentCalls: + m_Calls: [] + m_FirstSelectEntered: + m_PersistentCalls: + m_Calls: [] + m_LastSelectExited: + m_PersistentCalls: + m_Calls: [] + m_SelectEntered: + m_PersistentCalls: + m_Calls: [] + m_SelectExited: + m_PersistentCalls: + m_Calls: [] + m_FirstFocusEntered: + m_PersistentCalls: + m_Calls: [] + m_LastFocusExited: + m_PersistentCalls: + m_Calls: [] + m_FocusEntered: + m_PersistentCalls: + m_Calls: [] + m_FocusExited: + m_PersistentCalls: + m_Calls: [] + m_Activated: + m_PersistentCalls: + m_Calls: [] + m_Deactivated: + m_PersistentCalls: + m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] + isGazePinchSelected: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 235624898} + m_TargetAssemblyTypeName: UnityEngine.AudioSource, UnityEngine + m_MethodName: PlayOneShot + m_Mode: 2 + m_Arguments: + m_ObjectArgument: {fileID: 8300000, guid: 29437a55b95f2eb489a5ec8574f185e9, type: 3} + m_ObjectArgumentAssemblyTypeName: UnityEngine.AudioClip, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - m_Target: {fileID: 235624897} + m_TargetAssemblyTypeName: MixedReality.Toolkit.SpatialManipulation.BoundsControl, + MixedReality.Toolkit.SpatialManipulation + m_MethodName: HighlightWires + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + onExited: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 235624898} + m_TargetAssemblyTypeName: UnityEngine.AudioSource, UnityEngine + m_MethodName: PlayOneShot + m_Mode: 2 + m_Arguments: + m_ObjectArgument: {fileID: 8300000, guid: 9f512430eba32d845aab8de9ba5e393c, type: 3} + m_ObjectArgumentAssemblyTypeName: UnityEngine.AudioClip, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - m_Target: {fileID: 235624897} + m_TargetAssemblyTypeName: MixedReality.Toolkit.SpatialManipulation.BoundsControl, + MixedReality.Toolkit.SpatialManipulation + m_MethodName: UnhighlightWires + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + isRaySelected: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 235624898} + m_TargetAssemblyTypeName: UnityEngine.AudioSource, UnityEngine + m_MethodName: PlayOneShot + m_Mode: 2 + m_Arguments: + m_ObjectArgument: {fileID: 8300000, guid: 29437a55b95f2eb489a5ec8574f185e9, type: 3} + m_ObjectArgumentAssemblyTypeName: UnityEngine.AudioClip, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - m_Target: {fileID: 235624897} + m_TargetAssemblyTypeName: MixedReality.Toolkit.SpatialManipulation.BoundsControl, + MixedReality.Toolkit.SpatialManipulation + m_MethodName: HighlightWires + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + onExited: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 235624898} + m_TargetAssemblyTypeName: UnityEngine.AudioSource, UnityEngine + m_MethodName: PlayOneShot + m_Mode: 2 + m_Arguments: + m_ObjectArgument: {fileID: 8300000, guid: 9f512430eba32d845aab8de9ba5e393c, type: 3} + m_ObjectArgumentAssemblyTypeName: UnityEngine.AudioClip, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - m_Target: {fileID: 235624897} + m_TargetAssemblyTypeName: MixedReality.Toolkit.SpatialManipulation.BoundsControl, + MixedReality.Toolkit.SpatialManipulation + m_MethodName: UnhighlightWires + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + isPokeSelected: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isGrabSelected: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 235624898} + m_TargetAssemblyTypeName: UnityEngine.AudioSource, UnityEngine + m_MethodName: PlayOneShot + m_Mode: 2 + m_Arguments: + m_ObjectArgument: {fileID: 8300000, guid: 29437a55b95f2eb489a5ec8574f185e9, type: 3} + m_ObjectArgumentAssemblyTypeName: UnityEngine.AudioClip, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - m_Target: {fileID: 235624897} + m_TargetAssemblyTypeName: MixedReality.Toolkit.SpatialManipulation.BoundsControl, + MixedReality.Toolkit.SpatialManipulation + m_MethodName: HighlightWires + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + onExited: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 235624898} + m_TargetAssemblyTypeName: UnityEngine.AudioSource, UnityEngine + m_MethodName: PlayOneShot + m_Mode: 2 + m_Arguments: + m_ObjectArgument: {fileID: 8300000, guid: 9f512430eba32d845aab8de9ba5e393c, type: 3} + m_ObjectArgumentAssemblyTypeName: UnityEngine.AudioClip, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - m_Target: {fileID: 235624897} + m_TargetAssemblyTypeName: MixedReality.Toolkit.SpatialManipulation.BoundsControl, + MixedReality.Toolkit.SpatialManipulation + m_MethodName: UnhighlightWires + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + isGazeHovered: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isGazePinchHovered: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isRayHovered: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isGrabHovered: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isPokeHovered: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isActiveHovered: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + disabledInteractorTypes: + - reference: MixedReality.Toolkit.IPokeInteractor, MixedReality.Toolkit.Core + k__BackingField: 0 + k__BackingField: 0.9 + k__BackingField: 0.1 + k__BackingField: 1 + k__BackingField: 0 + k__BackingField: 1 + k__BackingField: 0 + k__BackingField: 1 + allowSelectByVoice: 1 + speechRecognitionKeyword: select + k__BackingField: 1 + k__BackingField: 0 + k__BackingField: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + k__BackingField: + m_PersistentCalls: + m_Calls: [] + k__BackingField: + m_PersistentCalls: + m_Calls: [] + k__BackingField: + m_PersistentCalls: + m_Calls: [] + hostTransform: {fileID: 235624891} + allowedManipulations: 7 + allowedInteractionTypes: -2147483641 + rigidbodyMovementType: 0 + applyTorque: 1 + springForceSoftness: 0.1 + springTorqueSoftness: 0.1 + springDamping: 1 + springForceLimit: 100 + rotationAnchorNear: 1 + rotationAnchorFar: 1 + releaseBehavior: 3 + transformSmoothingLogicType: + reference: MixedReality.Toolkit.SpatialManipulation.DefaultTransformSmoothingLogic, + MixedReality.Toolkit.SpatialManipulation + smoothingFar: 1 + smoothingNear: 1 + moveLerpTime: 0.001 + rotateLerpTime: 0.001 + scaleLerpTime: 0.001 + enableConstraints: 1 + constraintsManager: {fileID: 235624896} + manipulationLogicTypes: + moveLogicType: + reference: MixedReality.Toolkit.SpatialManipulation.MoveLogic, MixedReality.Toolkit.SpatialManipulation + rotateLogicType: + reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, MixedReality.Toolkit.SpatialManipulation + scaleLogicType: + reference: MixedReality.Toolkit.SpatialManipulation.ScaleLogic, MixedReality.Toolkit.SpatialManipulation +--- !u!114 &235624896 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 235624893} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 50cdab0cd5a0916419324bb54314773d, type: 3} + m_Name: + m_EditorClassIdentifier: + autoConstraintSelection: 1 + selectedConstraints: [] +--- !u!114 &235624897 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 235624893} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f3f2652d4ff14543be4d1ece28036a0, type: 3} + m_Name: + m_EditorClassIdentifier: + boundsVisualsPrefab: {fileID: 5671351296789090341, guid: 7b542306e34a62f4c9a822fcb19b7d99, type: 3} + boundsCalculationMethod: 0 + includeInactiveObjects: 0 + overrideBounds: 0 + boundsOverride: {fileID: 0} + flattenMode: 1 + boundsPadding: 0.01 + interactable: {fileID: 0} + toggleHandlesOnClick: 0 + dragToggleThreshold: 0.005 + target: {fileID: 0} + handlesActive: 1 + enabledHandles: 2 + rotateAnchor: 0 + scaleAnchor: 0 + scaleBehavior: 0 + smoothingActive: 1 + rotateLerpTime: 0.00001 + scaleLerpTime: 0.00001 + translateLerpTime: 0.00001 + enableConstraints: 1 + constraintsManager: {fileID: 235624896} + manipulationLogicTypes: + moveLogicType: + reference: MixedReality.Toolkit.SpatialManipulation.BoundsControlMoveLogic, + MixedReality.Toolkit.SpatialManipulation + rotateLogicType: + reference: MixedReality.Toolkit.SpatialManipulation.BoundsControlRotateLogic, + MixedReality.Toolkit.SpatialManipulation + scaleLogicType: + reference: MixedReality.Toolkit.SpatialManipulation.BoundsControlScaleLogic, + MixedReality.Toolkit.SpatialManipulation + manipulationStarted: + m_PersistentCalls: + m_Calls: [] + manipulationEnded: + m_PersistentCalls: + m_Calls: [] +--- !u!82 &235624898 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 235624893} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} + m_audioClip: {fileID: 0} + m_PlayOnAwake: 1 + m_Volume: 1 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 1 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 +--- !u!114 &235624903 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 235624893} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 80f85af46f9bddd4ea78f11cee5e3b2e, type: 3} + m_Name: + m_EditorClassIdentifier: + handType: 3 + proximityType: 3 + executionOrder: 0 + minimumScale: {x: 0.2, y: 0.2, z: 0.2} + maximumScale: {x: 2, y: 2, z: 2} + relativeToInitialState: 1 +--- !u!114 &235624904 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 235624893} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3a1bf44e2291e8741ab3dec75055d9db, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 0 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 0} + movableAxes: 0 + onMoveDelta: 0.01 +--- !u!82 &241673872 stripped +AudioSource: + m_CorrespondingSourceObject: {fileID: 2074071492310221335, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + m_PrefabInstance: {fileID: 364946991195464072} + m_PrefabAsset: {fileID: 0} +--- !u!1 &243610128 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 243610129} + - component: {fileID: 243610131} + - component: {fileID: 243610130} + m_Layer: 0 + m_Name: SectionTitle (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &243610129 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 243610128} + 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 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -0.021, y: 0.2228} + m_SizeDelta: {x: 25.4548, y: 5} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &243610130 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 243610128} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9541d86e2fd84c1d9990edf0852d74ab, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: 'Indirect Interaction + + with Custom Interactor + + + XRI''s + Interactor doesn''t have to be on the controllers. This example shows custom + Interactor attached to the pen object, interacting with a whiteboard Interactable + surface' + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 533bdd8d5c92b52448ee2ecf7bd828a4, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: b082f80c6b45164418a354f7e116f0a3, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 8 + m_fontSizeBase: 8 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 0 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + 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 +--- !u!23 &243610131 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 243610128} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: b082f80c6b45164418a354f7e116f0a3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!4 &251265372 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1214529608091387485, guid: 0d3b2fd2079cd514d8dbce654f929320, type: 3} + m_PrefabInstance: {fileID: 1214529608259952004} + m_PrefabAsset: {fileID: 0} +--- !u!1 &305342090 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 305342091} + - component: {fileID: 305342092} + m_Layer: 0 + m_Name: MRTK_Logo_White + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &305342091 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 305342090} + 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 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &305342092 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 305342090} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300000, guid: fe5cc215f12ea5e40b5021c4040bce24, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 20.48, y: 10.24} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &343732520 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 4639606898651727610, guid: 698c502bf492aec45af6a7b04219d34b, type: 3} + m_PrefabInstance: {fileID: 607222682} + m_PrefabAsset: {fileID: 0} +--- !u!82 &343732524 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 343732520} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} + m_audioClip: {fileID: 0} + m_PlayOnAwake: 1 + m_Volume: 1 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 1 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 +--- !u!1 &380279357 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 4639606898651727610, guid: 698c502bf492aec45af6a7b04219d34b, type: 3} + m_PrefabInstance: {fileID: 1996988709} + m_PrefabAsset: {fileID: 0} +--- !u!82 &380279361 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 380279357} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} + m_audioClip: {fileID: 0} + m_PlayOnAwake: 1 + m_Volume: 1 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 1 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 +--- !u!1001 &392741044 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 782737666} + m_Modifications: + - target: {fileID: 7017536481509416457, guid: 14887583e6d2db941b221cb765bee7c5, type: 3} + propertyPath: Spatialize + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7017536481509416457, guid: 14887583e6d2db941b221cb765bee7c5, type: 3} + propertyPath: OutputAudioMixerGroup + value: + objectReference: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} + - target: {fileID: 7017536481509416457, guid: 14887583e6d2db941b221cb765bee7c5, type: 3} + propertyPath: panLevelCustomCurve.m_Curve.Array.data[0].value + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7980448365335647764, guid: 14887583e6d2db941b221cb765bee7c5, type: 3} + propertyPath: m_Name + value: MixedRealityKeyboardPreview + objectReference: {fileID: 0} + - target: {fileID: 8159570493184885537, guid: 14887583e6d2db941b221cb765bee7c5, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8159570493184885537, guid: 14887583e6d2db941b221cb765bee7c5, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8159570493184885537, guid: 14887583e6d2db941b221cb765bee7c5, type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 8159570493184885537, guid: 14887583e6d2db941b221cb765bee7c5, type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8159570493184885537, guid: 14887583e6d2db941b221cb765bee7c5, type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8159570493184885537, guid: 14887583e6d2db941b221cb765bee7c5, type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8159570493184885537, guid: 14887583e6d2db941b221cb765bee7c5, type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8159570493184885537, guid: 14887583e6d2db941b221cb765bee7c5, type: 3} + propertyPath: m_SizeDelta.x + value: 170 + objectReference: {fileID: 0} + - target: {fileID: 8159570493184885537, guid: 14887583e6d2db941b221cb765bee7c5, type: 3} + propertyPath: m_SizeDelta.y + value: 40 + objectReference: {fileID: 0} + - target: {fileID: 8159570493184885537, guid: 14887583e6d2db941b221cb765bee7c5, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8159570493184885537, guid: 14887583e6d2db941b221cb765bee7c5, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8159570493184885537, guid: 14887583e6d2db941b221cb765bee7c5, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8159570493184885537, guid: 14887583e6d2db941b221cb765bee7c5, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8159570493184885537, guid: 14887583e6d2db941b221cb765bee7c5, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8159570493184885537, guid: 14887583e6d2db941b221cb765bee7c5, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8159570493184885537, guid: 14887583e6d2db941b221cb765bee7c5, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8159570493184885537, guid: 14887583e6d2db941b221cb765bee7c5, type: 3} + propertyPath: m_AnchoredPosition.x + value: -0.0738 + objectReference: {fileID: 0} + - target: {fileID: 8159570493184885537, guid: 14887583e6d2db941b221cb765bee7c5, type: 3} + propertyPath: m_AnchoredPosition.y + value: -0.0754 + objectReference: {fileID: 0} + - target: {fileID: 8159570493184885537, guid: 14887583e6d2db941b221cb765bee7c5, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8159570493184885537, guid: 14887583e6d2db941b221cb765bee7c5, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8159570493184885537, guid: 14887583e6d2db941b221cb765bee7c5, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8177194094163521522, guid: 14887583e6d2db941b221cb765bee7c5, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8177194094163521522, guid: 14887583e6d2db941b221cb765bee7c5, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8177194094163521522, guid: 14887583e6d2db941b221cb765bee7c5, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8177194094163521522, guid: 14887583e6d2db941b221cb765bee7c5, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8177194094163521522, guid: 14887583e6d2db941b221cb765bee7c5, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8177194094163521522, guid: 14887583e6d2db941b221cb765bee7c5, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 14887583e6d2db941b221cb765bee7c5, type: 3} +--- !u!224 &392741045 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 8159570493184885537, guid: 14887583e6d2db941b221cb765bee7c5, type: 3} + m_PrefabInstance: {fileID: 392741044} + m_PrefabAsset: {fileID: 0} +--- !u!114 &392741046 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 260466191685692226, guid: 14887583e6d2db941b221cb765bee7c5, type: 3} + m_PrefabInstance: {fileID: 392741044} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 87b5dae2c37568d4b93b1add68554deb, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &422166483 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 100022, guid: f9a8072f5d9b92347a999f10f01b8012, type: 3} + m_PrefabInstance: {fileID: 1294530691} + m_PrefabAsset: {fileID: 0} +--- !u!136 &422166484 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 422166483} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + m_Radius: 0.032281224 + m_Height: 0.15444483 + m_Direction: 1 + m_Center: {x: 0.0000022638612, y: -0.055035494, z: 0.006171904} +--- !u!1 &429539737 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 429539738} + - component: {fileID: 429539740} + - component: {fileID: 429539739} + m_Layer: 0 + m_Name: SectionTitle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &429539738 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 429539737} + 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 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -0.10434, y: -0.4372} + m_SizeDelta: {x: 31.65629, y: 5} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &429539739 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 429539737} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9541d86e2fd84c1d9990edf0852d74ab, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: 'Multi-Modal Interaction + + Poke (Press), GazePinch, + Ray + + + Buttons with Microsoft Mixed Reality Design Language and other + custom button examples using PressableButton.cs and StateVisualizer.cs + + + PressableButtons + use StatefulInteractable''s selection progress to model the compressability of + a 3D pressable surface. These interactables drive selection progress through + a combination of any number of interactors.' + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 533bdd8d5c92b52448ee2ecf7bd828a4, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: b082f80c6b45164418a354f7e116f0a3, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 8 + m_fontSizeBase: 8 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 0 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + 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 +--- !u!23 &429539740 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 429539737} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: b082f80c6b45164418a354f7e116f0a3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!1001 &434590702 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1852224431} + m_Modifications: + - target: {fileID: 593722386012418505, guid: 7d421b6091df2b5439be946871d23d28, type: 3} + propertyPath: m_Name + value: ColorChangingCube + objectReference: {fileID: 0} + - target: {fileID: 800348947636869897, guid: 7d421b6091df2b5439be946871d23d28, type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 800348947636869897, guid: 7d421b6091df2b5439be946871d23d28, type: 3} + propertyPath: m_LocalScale.x + value: 0.01 + objectReference: {fileID: 0} + - target: {fileID: 800348947636869897, guid: 7d421b6091df2b5439be946871d23d28, type: 3} + propertyPath: m_LocalScale.y + value: 0.01 + objectReference: {fileID: 0} + - target: {fileID: 800348947636869897, guid: 7d421b6091df2b5439be946871d23d28, type: 3} + propertyPath: m_LocalScale.z + value: 0.01 + objectReference: {fileID: 0} + - target: {fileID: 800348947636869897, guid: 7d421b6091df2b5439be946871d23d28, type: 3} + propertyPath: m_LocalPosition.x + value: -0.2569 + objectReference: {fileID: 0} + - target: {fileID: 800348947636869897, guid: 7d421b6091df2b5439be946871d23d28, type: 3} + propertyPath: m_LocalPosition.y + value: -0.5393 + objectReference: {fileID: 0} + - target: {fileID: 800348947636869897, guid: 7d421b6091df2b5439be946871d23d28, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 800348947636869897, guid: 7d421b6091df2b5439be946871d23d28, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 800348947636869897, guid: 7d421b6091df2b5439be946871d23d28, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 800348947636869897, guid: 7d421b6091df2b5439be946871d23d28, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 800348947636869897, guid: 7d421b6091df2b5439be946871d23d28, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 800348947636869897, guid: 7d421b6091df2b5439be946871d23d28, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 800348947636869897, guid: 7d421b6091df2b5439be946871d23d28, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 800348947636869897, guid: 7d421b6091df2b5439be946871d23d28, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 7d421b6091df2b5439be946871d23d28, type: 3} +--- !u!4 &469873930 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2415827607033482817, guid: 5be1d1dda43e3ed40b18f4eb09e144fa, type: 3} + m_PrefabInstance: {fileID: 1866417129} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &502884642 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1089489031} + m_Modifications: + - target: {fileID: 3695091241684208261, guid: a88695280288b5643abe2a6c33bad9cd, type: 3} + propertyPath: Spatialize + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3695091241684208261, guid: a88695280288b5643abe2a6c33bad9cd, type: 3} + propertyPath: OutputAudioMixerGroup + value: + objectReference: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} + - target: {fileID: 3695091241684208261, guid: a88695280288b5643abe2a6c33bad9cd, type: 3} + propertyPath: panLevelCustomCurve.m_Curve.Array.data[0].value + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6001337464683083578, guid: a88695280288b5643abe2a6c33bad9cd, type: 3} + propertyPath: m_Name + value: TogglePressableButton_32x32mm_Switch + objectReference: {fileID: 0} + - target: {fileID: 6001337465202651611, guid: a88695280288b5643abe2a6c33bad9cd, type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 6001337465202651611, guid: a88695280288b5643abe2a6c33bad9cd, type: 3} + propertyPath: m_LocalPosition.x + value: -0.1962 + objectReference: {fileID: 0} + - target: {fileID: 6001337465202651611, guid: a88695280288b5643abe2a6c33bad9cd, type: 3} + propertyPath: m_LocalPosition.y + value: -0.537 + objectReference: {fileID: 0} + - target: {fileID: 6001337465202651611, guid: a88695280288b5643abe2a6c33bad9cd, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6001337465202651611, guid: a88695280288b5643abe2a6c33bad9cd, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6001337465202651611, guid: a88695280288b5643abe2a6c33bad9cd, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6001337465202651611, guid: a88695280288b5643abe2a6c33bad9cd, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6001337465202651611, guid: a88695280288b5643abe2a6c33bad9cd, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6001337465202651611, guid: a88695280288b5643abe2a6c33bad9cd, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6001337465202651611, guid: a88695280288b5643abe2a6c33bad9cd, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6001337465202651611, guid: a88695280288b5643abe2a6c33bad9cd, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6390696451429363805, guid: a88695280288b5643abe2a6c33bad9cd, type: 3} + propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6390696451429363805, guid: a88695280288b5643abe2a6c33bad9cd, type: 3} + propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6390696451429363805, guid: a88695280288b5643abe2a6c33bad9cd, type: 3} + propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 884765058} + - target: {fileID: 6390696451429363805, guid: a88695280288b5643abe2a6c33bad9cd, type: 3} + propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 6390696451429363805, guid: a88695280288b5643abe2a6c33bad9cd, type: 3} + propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: Increment + objectReference: {fileID: 0} + - target: {fileID: 6390696451429363805, guid: a88695280288b5643abe2a6c33bad9cd, type: 3} + propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: MixedReality.Toolkit.Examples.Demos.ColorChanger, Assembly-CSharp + objectReference: {fileID: 0} + - target: {fileID: 6390696451429363805, guid: a88695280288b5643abe2a6c33bad9cd, type: 3} + propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: a88695280288b5643abe2a6c33bad9cd, type: 3} +--- !u!4 &502884643 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6001337465202651611, guid: a88695280288b5643abe2a6c33bad9cd, type: 3} + m_PrefabInstance: {fileID: 502884642} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &530525190 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 3493013819197874656, guid: ad5b753b73e311143a85055b15cea562, type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3493013819197874656, guid: ad5b753b73e311143a85055b15cea562, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3493013819197874656, guid: ad5b753b73e311143a85055b15cea562, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3493013819197874656, guid: ad5b753b73e311143a85055b15cea562, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7585035320575375756, guid: ad5b753b73e311143a85055b15cea562, type: 3} + propertyPath: m_Name + value: MRTKInputSimulator + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: ad5b753b73e311143a85055b15cea562, type: 3} +--- !u!1 &563549573 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 563549574} + - component: {fileID: 563549581} + - component: {fileID: 563549580} + - component: {fileID: 563549579} + - component: {fileID: 563549578} + - component: {fileID: 563549575} + - component: {fileID: 563549577} + - component: {fileID: 563549576} + - component: {fileID: 563549582} + - component: {fileID: 563549583} + - component: {fileID: 563549584} + m_Layer: 0 + m_Name: Cube3 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &563549574 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 563549573} + 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 + m_LocalEulerAnglesHint: {x: 0, y: -29.743002, z: 0} +--- !u!82 &563549575 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 563549573} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} + m_audioClip: {fileID: 0} + m_PlayOnAwake: 1 + m_Volume: 1 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 1 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 +--- !u!114 &563549576 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 563549573} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d9ad66e7cc9a2754d8ea989740c9f00d, type: 3} + m_Name: + m_EditorClassIdentifier: + m_InteractionManager: {fileID: 0} + m_Colliders: [] + m_InteractionLayers: + m_Bits: 1 + m_DistanceCalculationMode: 1 + m_SelectMode: 1 + m_FocusMode: 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: [] + m_LastHoverExited: + m_PersistentCalls: + m_Calls: [] + m_HoverEntered: + m_PersistentCalls: + m_Calls: [] + m_HoverExited: + m_PersistentCalls: + m_Calls: [] + m_FirstSelectEntered: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 563549575} + m_TargetAssemblyTypeName: UnityEngine.AudioSource, UnityEngine + m_MethodName: PlayOneShot + m_Mode: 2 + m_Arguments: + m_ObjectArgument: {fileID: 8300000, guid: 29437a55b95f2eb489a5ec8574f185e9, type: 3} + m_ObjectArgumentAssemblyTypeName: UnityEngine.AudioClip, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - m_Target: {fileID: 563549580} + m_TargetAssemblyTypeName: UnityEngine.Renderer, UnityEngine + m_MethodName: set_sharedMaterial + m_Mode: 2 + m_Arguments: + m_ObjectArgument: {fileID: 2100000, guid: 47143234b7100be4db97188f8ee82805, type: 2} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Material, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_LastSelectExited: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 563549575} + m_TargetAssemblyTypeName: UnityEngine.AudioSource, UnityEngine + m_MethodName: PlayOneShot + m_Mode: 2 + m_Arguments: + m_ObjectArgument: {fileID: 8300000, guid: 9f512430eba32d845aab8de9ba5e393c, type: 3} + m_ObjectArgumentAssemblyTypeName: UnityEngine.AudioClip, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - m_Target: {fileID: 563549580} + m_TargetAssemblyTypeName: UnityEngine.Renderer, UnityEngine + m_MethodName: set_sharedMaterial + m_Mode: 2 + m_Arguments: + m_ObjectArgument: {fileID: 2100000, guid: b1ac50d5d67970a49a49c29519977b61, type: 2} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Material, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_SelectEntered: + m_PersistentCalls: + m_Calls: [] + m_SelectExited: + m_PersistentCalls: + m_Calls: [] + m_FirstFocusEntered: + m_PersistentCalls: + m_Calls: [] + m_LastFocusExited: + m_PersistentCalls: + m_Calls: [] + m_FocusEntered: + m_PersistentCalls: + m_Calls: [] + m_FocusExited: + m_PersistentCalls: + m_Calls: [] + m_Activated: + m_PersistentCalls: + m_Calls: [] + m_Deactivated: + m_PersistentCalls: + m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] + isGazePinchSelected: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 563549575} + m_TargetAssemblyTypeName: UnityEngine.AudioSource, UnityEngine + m_MethodName: PlayOneShot + m_Mode: 2 + m_Arguments: + m_ObjectArgument: {fileID: 8300000, guid: 29437a55b95f2eb489a5ec8574f185e9, type: 3} + m_ObjectArgumentAssemblyTypeName: UnityEngine.AudioClip, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - m_Target: {fileID: 563549580} + m_TargetAssemblyTypeName: UnityEngine.Renderer, UnityEngine + m_MethodName: set_sharedMaterial + m_Mode: 2 + m_Arguments: + m_ObjectArgument: {fileID: 2100000, guid: 1e1949131aa56c54396b361b35a942e6, type: 2} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Material, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + onExited: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 563549575} + m_TargetAssemblyTypeName: UnityEngine.AudioSource, UnityEngine + m_MethodName: PlayOneShot + m_Mode: 2 + m_Arguments: + m_ObjectArgument: {fileID: 8300000, guid: 9f512430eba32d845aab8de9ba5e393c, type: 3} + m_ObjectArgumentAssemblyTypeName: UnityEngine.AudioClip, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - m_Target: {fileID: 563549580} + m_TargetAssemblyTypeName: UnityEngine.Renderer, UnityEngine + m_MethodName: set_sharedMaterial + m_Mode: 2 + m_Arguments: + m_ObjectArgument: {fileID: 2100000, guid: b1ac50d5d67970a49a49c29519977b61, type: 2} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Material, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + isRaySelected: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 563549575} + m_TargetAssemblyTypeName: UnityEngine.AudioSource, UnityEngine + m_MethodName: PlayOneShot + m_Mode: 2 + m_Arguments: + m_ObjectArgument: {fileID: 8300000, guid: 29437a55b95f2eb489a5ec8574f185e9, type: 3} + m_ObjectArgumentAssemblyTypeName: UnityEngine.AudioClip, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - m_Target: {fileID: 563549580} + m_TargetAssemblyTypeName: UnityEngine.Renderer, UnityEngine + m_MethodName: set_sharedMaterial + m_Mode: 2 + m_Arguments: + m_ObjectArgument: {fileID: 2100000, guid: 1e1949131aa56c54396b361b35a942e6, type: 2} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Material, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + onExited: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 563549575} + m_TargetAssemblyTypeName: UnityEngine.AudioSource, UnityEngine + m_MethodName: PlayOneShot + m_Mode: 2 + m_Arguments: + m_ObjectArgument: {fileID: 8300000, guid: 9f512430eba32d845aab8de9ba5e393c, type: 3} + m_ObjectArgumentAssemblyTypeName: UnityEngine.AudioClip, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - m_Target: {fileID: 563549580} + m_TargetAssemblyTypeName: UnityEngine.Renderer, UnityEngine + m_MethodName: set_sharedMaterial + m_Mode: 2 + m_Arguments: + m_ObjectArgument: {fileID: 2100000, guid: b1ac50d5d67970a49a49c29519977b61, type: 2} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Material, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + isPokeSelected: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isGrabSelected: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isGazeHovered: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isGazePinchHovered: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isRayHovered: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isGrabHovered: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isPokeHovered: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isActiveHovered: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + disabledInteractorTypes: + - reference: MixedReality.Toolkit.IPokeInteractor, MixedReality.Toolkit.Core + k__BackingField: 0 + k__BackingField: 0.9 + k__BackingField: 0.1 + k__BackingField: 1 + k__BackingField: 0 + k__BackingField: 1 + k__BackingField: 0 + k__BackingField: 1 + allowSelectByVoice: 1 + speechRecognitionKeyword: select + k__BackingField: 1 + k__BackingField: 0 + k__BackingField: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + k__BackingField: + m_PersistentCalls: + m_Calls: [] + k__BackingField: + m_PersistentCalls: + m_Calls: [] + k__BackingField: + m_PersistentCalls: + m_Calls: [] + hostTransform: {fileID: 563549574} + allowedManipulations: 7 + allowedInteractionTypes: -2147483641 + rigidbodyMovementType: 0 + applyTorque: 1 + springForceSoftness: 0.1 + springTorqueSoftness: 0.1 + springDamping: 1 + springForceLimit: 100 + rotationAnchorNear: 1 + rotationAnchorFar: 1 + releaseBehavior: 3 + transformSmoothingLogicType: + reference: MixedReality.Toolkit.SpatialManipulation.DefaultTransformSmoothingLogic, + MixedReality.Toolkit.SpatialManipulation + smoothingFar: 0 + smoothingNear: 0 + moveLerpTime: 0.001 + rotateLerpTime: 0.001 + scaleLerpTime: 0.001 + enableConstraints: 1 + constraintsManager: {fileID: 563549577} + manipulationLogicTypes: + moveLogicType: + reference: MixedReality.Toolkit.SpatialManipulation.MoveLogic, MixedReality.Toolkit.SpatialManipulation + rotateLogicType: + reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, MixedReality.Toolkit.SpatialManipulation + scaleLogicType: + reference: MixedReality.Toolkit.SpatialManipulation.ScaleLogic, MixedReality.Toolkit.SpatialManipulation +--- !u!114 &563549577 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 563549573} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 50cdab0cd5a0916419324bb54314773d, type: 3} + m_Name: + m_EditorClassIdentifier: + autoConstraintSelection: 1 + selectedConstraints: [] +--- !u!54 &563549578 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 563549573} + serializedVersion: 2 + m_Mass: 0.1 + m_Drag: 1 + m_AngularDrag: 1 + m_UseGravity: 1 + m_IsKinematic: 0 + m_Interpolate: 1 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!65 &563549579 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 563549573} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!23 &563549580 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 563549573} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 4294967295 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: b1ac50d5d67970a49a49c29519977b61, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &563549581 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 563549573} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!114 &563549582 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 563549573} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe9323ca265114b4282b5d33b41f7adc, type: 3} + m_Name: + m_EditorClassIdentifier: + distanceThreshold: 20 +--- !u!114 &563549583 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 563549573} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3a1bf44e2291e8741ab3dec75055d9db, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 0 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 0} + movableAxes: 0 + onMoveDelta: 0.01 +--- !u!114 &563549584 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 563549573} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 80f85af46f9bddd4ea78f11cee5e3b2e, type: 3} + m_Name: + m_EditorClassIdentifier: + handType: 3 + proximityType: 3 + executionOrder: 0 + minimumScale: {x: 0.2, y: 0.2, z: 0.2} + maximumScale: {x: 2, y: 2, z: 2} + relativeToInitialState: 1 +--- !u!82 &566404410 stripped +AudioSource: + m_CorrespondingSourceObject: {fileID: 3976558279943476820, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + m_PrefabInstance: {fileID: 364946991195464072} + m_PrefabAsset: {fileID: 0} +--- !u!1 &573431353 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1963561307345040800, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} + m_PrefabInstance: {fileID: 1002036031} + m_PrefabAsset: {fileID: 0} +--- !u!82 &573431357 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 573431353} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} + m_audioClip: {fileID: 0} + m_PlayOnAwake: 1 + m_Volume: 1 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 1 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 +--- !u!1001 &607222682 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1404428861} + m_Modifications: + - target: {fileID: 2712310172936119071, guid: 698c502bf492aec45af6a7b04219d34b, type: 3} + propertyPath: OnClicked.m_PersistentCalls.m_Calls.Array.size + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2712310172936119071, guid: 698c502bf492aec45af6a7b04219d34b, type: 3} + propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2712310172936119071, guid: 698c502bf492aec45af6a7b04219d34b, type: 3} + propertyPath: m_LastSelectExited.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2712310172936119071, guid: 698c502bf492aec45af6a7b04219d34b, type: 3} + propertyPath: OnClicked.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 2712310172936119071, guid: 698c502bf492aec45af6a7b04219d34b, type: 3} + propertyPath: OnClicked.m_PersistentCalls.m_Calls.Array.data[1].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2712310172936119071, guid: 698c502bf492aec45af6a7b04219d34b, type: 3} + propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2712310172936119071, guid: 698c502bf492aec45af6a7b04219d34b, type: 3} + propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[1].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2712310172936119071, guid: 698c502bf492aec45af6a7b04219d34b, type: 3} + propertyPath: m_FirstSelectEntered.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2712310172936119071, guid: 698c502bf492aec45af6a7b04219d34b, type: 3} + propertyPath: OnClicked.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 0} + - target: {fileID: 2712310172936119071, guid: 698c502bf492aec45af6a7b04219d34b, type: 3} + propertyPath: OnClicked.m_PersistentCalls.m_Calls.Array.data[1].m_Target + value: + objectReference: {fileID: 884765058} + - target: {fileID: 2712310172936119071, guid: 698c502bf492aec45af6a7b04219d34b, type: 3} + propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 884765058} + - target: {fileID: 2712310172936119071, guid: 698c502bf492aec45af6a7b04219d34b, type: 3} + propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[1].m_Target + value: + objectReference: {fileID: 884765058} + - target: {fileID: 2712310172936119071, guid: 698c502bf492aec45af6a7b04219d34b, type: 3} + propertyPath: OnClicked.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2712310172936119071, guid: 698c502bf492aec45af6a7b04219d34b, type: 3} + propertyPath: OnClicked.m_PersistentCalls.m_Calls.Array.data[1].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2712310172936119071, guid: 698c502bf492aec45af6a7b04219d34b, type: 3} + propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2712310172936119071, guid: 698c502bf492aec45af6a7b04219d34b, type: 3} + propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[1].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2712310172936119071, guid: 698c502bf492aec45af6a7b04219d34b, type: 3} + propertyPath: OnClicked.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: Play + objectReference: {fileID: 0} + - target: {fileID: 2712310172936119071, guid: 698c502bf492aec45af6a7b04219d34b, type: 3} + propertyPath: OnClicked.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName + value: Increment + objectReference: {fileID: 0} + - target: {fileID: 2712310172936119071, guid: 698c502bf492aec45af6a7b04219d34b, type: 3} + propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: Increment + objectReference: {fileID: 0} + - target: {fileID: 2712310172936119071, guid: 698c502bf492aec45af6a7b04219d34b, type: 3} + propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName + value: Increment + objectReference: {fileID: 0} + - target: {fileID: 2712310172936119071, guid: 698c502bf492aec45af6a7b04219d34b, type: 3} + propertyPath: m_LastSelectExited.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2712310172936119071, guid: 698c502bf492aec45af6a7b04219d34b, type: 3} + propertyPath: m_FirstSelectEntered.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2712310172936119071, guid: 698c502bf492aec45af6a7b04219d34b, type: 3} + propertyPath: m_LastSelectExited.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 343732524} + - target: {fileID: 2712310172936119071, guid: 698c502bf492aec45af6a7b04219d34b, type: 3} + propertyPath: m_FirstSelectEntered.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 343732524} + - target: {fileID: 2712310172936119071, guid: 698c502bf492aec45af6a7b04219d34b, type: 3} + propertyPath: m_LastSelectExited.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2712310172936119071, guid: 698c502bf492aec45af6a7b04219d34b, type: 3} + propertyPath: m_LastSelectExited.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: PlayOneShot + objectReference: {fileID: 0} + - target: {fileID: 2712310172936119071, guid: 698c502bf492aec45af6a7b04219d34b, type: 3} + propertyPath: m_FirstSelectEntered.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2712310172936119071, guid: 698c502bf492aec45af6a7b04219d34b, type: 3} + propertyPath: m_FirstSelectEntered.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: PlayOneShot + objectReference: {fileID: 0} + - target: {fileID: 2712310172936119071, guid: 698c502bf492aec45af6a7b04219d34b, type: 3} + propertyPath: OnClicked.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: UnityEngine.ParticleSystem, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 2712310172936119071, guid: 698c502bf492aec45af6a7b04219d34b, type: 3} + propertyPath: OnClicked.m_PersistentCalls.m_Calls.Array.data[1].m_TargetAssemblyTypeName + value: MixedReality.Toolkit.Examples.Demos.ColorChanger, Assembly-CSharp + objectReference: {fileID: 0} + - target: {fileID: 2712310172936119071, guid: 698c502bf492aec45af6a7b04219d34b, type: 3} + propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: MixedReality.Toolkit.Examples.Demos.ColorChanger, Assembly-CSharp + objectReference: {fileID: 0} + - target: {fileID: 2712310172936119071, guid: 698c502bf492aec45af6a7b04219d34b, type: 3} + propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[1].m_TargetAssemblyTypeName + value: MixedReality.Toolkit.Examples.Demos.ColorChanger, Assembly-CSharp + objectReference: {fileID: 0} + - target: {fileID: 2712310172936119071, guid: 698c502bf492aec45af6a7b04219d34b, type: 3} + propertyPath: OnClicked.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_BoolArgument + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2712310172936119071, guid: 698c502bf492aec45af6a7b04219d34b, type: 3} + propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_BoolArgument + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2712310172936119071, guid: 698c502bf492aec45af6a7b04219d34b, type: 3} + propertyPath: m_LastSelectExited.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: UnityEngine.AudioSource, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 2712310172936119071, guid: 698c502bf492aec45af6a7b04219d34b, type: 3} + propertyPath: m_FirstSelectEntered.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: UnityEngine.AudioSource, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 2712310172936119071, guid: 698c502bf492aec45af6a7b04219d34b, type: 3} + propertyPath: m_LastSelectExited.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgument + value: + objectReference: {fileID: 8300000, guid: f2b39c1fa02395640bced3c8e5f9696e, type: 3} + - target: {fileID: 2712310172936119071, guid: 698c502bf492aec45af6a7b04219d34b, type: 3} + propertyPath: m_FirstSelectEntered.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgument + value: + objectReference: {fileID: 8300000, guid: 3e4887b6014c9e04290e816ac261a414, type: 3} + - target: {fileID: 2712310172936119071, guid: 698c502bf492aec45af6a7b04219d34b, type: 3} + propertyPath: OnClicked.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 2712310172936119071, guid: 698c502bf492aec45af6a7b04219d34b, type: 3} + propertyPath: OnClicked.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 2712310172936119071, guid: 698c502bf492aec45af6a7b04219d34b, type: 3} + propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 2712310172936119071, guid: 698c502bf492aec45af6a7b04219d34b, type: 3} + propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 2712310172936119071, guid: 698c502bf492aec45af6a7b04219d34b, type: 3} + propertyPath: m_LastSelectExited.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.AudioClip, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 2712310172936119071, guid: 698c502bf492aec45af6a7b04219d34b, type: 3} + propertyPath: m_FirstSelectEntered.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.AudioClip, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 3409721415966526836, guid: 698c502bf492aec45af6a7b04219d34b, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: aed69361010390840abc588081f8e964, type: 2} + - target: {fileID: 4639606898651727610, guid: 698c502bf492aec45af6a7b04219d34b, type: 3} + propertyPath: m_Name + value: PressableButton_Custom_Cylinder (2) + objectReference: {fileID: 0} + - target: {fileID: 5415826251688893504, guid: 698c502bf492aec45af6a7b04219d34b, type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 5415826251688893504, guid: 698c502bf492aec45af6a7b04219d34b, type: 3} + propertyPath: m_LocalPosition.x + value: -0.0196 + objectReference: {fileID: 0} + - target: {fileID: 5415826251688893504, guid: 698c502bf492aec45af6a7b04219d34b, type: 3} + propertyPath: m_LocalPosition.y + value: -0.7 + objectReference: {fileID: 0} + - target: {fileID: 5415826251688893504, guid: 698c502bf492aec45af6a7b04219d34b, type: 3} + propertyPath: m_LocalPosition.z + value: -0.0346 + objectReference: {fileID: 0} + - target: {fileID: 5415826251688893504, guid: 698c502bf492aec45af6a7b04219d34b, type: 3} + propertyPath: m_LocalRotation.w + value: 0.92387956 + objectReference: {fileID: 0} + - target: {fileID: 5415826251688893504, guid: 698c502bf492aec45af6a7b04219d34b, type: 3} + propertyPath: m_LocalRotation.x + value: 0.38268343 + objectReference: {fileID: 0} + - target: {fileID: 5415826251688893504, guid: 698c502bf492aec45af6a7b04219d34b, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5415826251688893504, guid: 698c502bf492aec45af6a7b04219d34b, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5415826251688893504, guid: 698c502bf492aec45af6a7b04219d34b, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 45 + objectReference: {fileID: 0} + - target: {fileID: 5415826251688893504, guid: 698c502bf492aec45af6a7b04219d34b, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5415826251688893504, guid: 698c502bf492aec45af6a7b04219d34b, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 698c502bf492aec45af6a7b04219d34b, type: 3} +--- !u!4 &607222683 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5415826251688893504, guid: 698c502bf492aec45af6a7b04219d34b, type: 3} + m_PrefabInstance: {fileID: 607222682} + m_PrefabAsset: {fileID: 0} +--- !u!1 &624982108 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6056454165148638616, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} + m_PrefabInstance: {fileID: 840468516} + m_PrefabAsset: {fileID: 0} +--- !u!65 &624982110 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 624982108} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 0.99999994, z: 0.1} + m_Center: {x: 0, y: 0.000000074505806, z: 0.05} +--- !u!1001 &663760220 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1913468802} + m_Modifications: + - target: {fileID: 251265376, guid: 0d3b2fd2079cd514d8dbce654f929320, type: 3} + propertyPath: boundsVisualsPrefab + value: + objectReference: {fileID: 5671351296789090341, guid: ecbf05ce2121a744cb893e82377ba3cd, type: 3} + - target: {fileID: 251265377, guid: 0d3b2fd2079cd514d8dbce654f929320, type: 3} + propertyPath: Spatialize + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 251265377, guid: 0d3b2fd2079cd514d8dbce654f929320, type: 3} + propertyPath: OutputAudioMixerGroup + value: + objectReference: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} + - target: {fileID: 251265377, guid: 0d3b2fd2079cd514d8dbce654f929320, type: 3} + propertyPath: panLevelCustomCurve.m_Curve.Array.data[0].value + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1214529608091387485, guid: 0d3b2fd2079cd514d8dbce654f929320, type: 3} + propertyPath: m_RootOrder + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 1214529608091387485, guid: 0d3b2fd2079cd514d8dbce654f929320, type: 3} + propertyPath: m_LocalPosition.x + value: -0.406 + objectReference: {fileID: 0} + - target: {fileID: 1214529608091387485, guid: 0d3b2fd2079cd514d8dbce654f929320, type: 3} + propertyPath: m_LocalPosition.y + value: -0.441 + objectReference: {fileID: 0} + - target: {fileID: 1214529608091387485, guid: 0d3b2fd2079cd514d8dbce654f929320, type: 3} + propertyPath: m_LocalPosition.z + value: -0.0838 + objectReference: {fileID: 0} + - target: {fileID: 1214529608091387485, guid: 0d3b2fd2079cd514d8dbce654f929320, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1214529608091387485, guid: 0d3b2fd2079cd514d8dbce654f929320, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1214529608091387485, guid: 0d3b2fd2079cd514d8dbce654f929320, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1214529608091387485, guid: 0d3b2fd2079cd514d8dbce654f929320, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1214529608091387485, guid: 0d3b2fd2079cd514d8dbce654f929320, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1214529608091387485, guid: 0d3b2fd2079cd514d8dbce654f929320, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1214529608091387485, guid: 0d3b2fd2079cd514d8dbce654f929320, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1214529608091490941, guid: 0d3b2fd2079cd514d8dbce654f929320, type: 3} + propertyPath: m_Name + value: CoffeeBoundsControl (1) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 0d3b2fd2079cd514d8dbce654f929320, type: 3} +--- !u!1 &665858362 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 665858363} + - component: {fileID: 665858365} + - component: {fileID: 665858364} + m_Layer: 0 + m_Name: SectionTitle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &665858363 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 665858362} + 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 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 31.65629, y: 5} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &665858364 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 665858362} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9541d86e2fd84c1d9990edf0852d74ab, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: 'Keyboard Interaction + + Opens the native keyboard + provided by OS' + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 533bdd8d5c92b52448ee2ecf7bd828a4, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: b082f80c6b45164418a354f7e116f0a3, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 8 + m_fontSizeBase: 8 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 0 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + 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 +--- !u!23 &665858365 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 665858362} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: b082f80c6b45164418a354f7e116f0a3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!82 &683629778 stripped +AudioSource: + m_CorrespondingSourceObject: {fileID: 4719360172523708786, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + m_PrefabInstance: {fileID: 364946991195464072} + m_PrefabAsset: {fileID: 0} +--- !u!1 &705507993 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 705507995} + - component: {fileID: 705507994} + m_Layer: 0 + m_Name: Directional Light + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!108 &705507994 +Light: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 705507993} + m_Enabled: 1 + serializedVersion: 10 + m_Type: 1 + m_Shape: 0 + m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1} + m_Intensity: 1 + m_Range: 10 + m_SpotAngle: 30 + m_InnerSpotAngle: 21.80208 + m_CookieSize: 10 + m_Shadows: + m_Type: 2 + m_Resolution: -1 + m_CustomResolution: -1 + m_Strength: 1 + m_Bias: 0.05 + m_NormalBias: 0.4 + m_NearPlane: 0.2 + m_CullingMatrixOverride: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_UseCullingMatrixOverride: 0 + m_Cookie: {fileID: 0} + m_DrawHalo: 0 + m_Flare: {fileID: 0} + m_RenderMode: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingLayerMask: 1 + m_Lightmapping: 1 + m_LightShadowCasterMode: 0 + m_AreaSize: {x: 1, y: 1} + m_BounceIntensity: 1 + m_ColorTemperature: 6570 + m_UseColorTemperature: 0 + m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} + m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 + m_ShadowRadius: 0 + m_ShadowAngle: 0 +--- !u!4 &705507995 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 705507993} + 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 + m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} +--- !u!1 &730431820 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 730431821} + - component: {fileID: 730431823} + - component: {fileID: 730431822} + m_Layer: 0 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &730431821 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 730431820} + 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 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -0.38796, y: -0.2} + m_SizeDelta: {x: 17.27645, y: 5} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &730431822 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 730431820} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9541d86e2fd84c1d9990edf0852d74ab, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: 'Flattened Style + + Select to + Activate' + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 533bdd8d5c92b52448ee2ecf7bd828a4, type: 2} + m_sharedMaterial: {fileID: -1005824763306460071, guid: 533bdd8d5c92b52448ee2ecf7bd828a4, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 36 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 0 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + 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 +--- !u!23 &730431823 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 730431820} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: -1005824763306460071, guid: 533bdd8d5c92b52448ee2ecf7bd828a4, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!4 &735511181 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7781529056550460865, guid: c07c4bd04b45c014fad0e3cd30747f06, type: 3} + m_PrefabInstance: {fileID: 771189643} + m_PrefabAsset: {fileID: 0} +--- !u!82 &766270403 stripped +AudioSource: + m_CorrespondingSourceObject: {fileID: 7123489524880090206, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + m_PrefabInstance: {fileID: 364946991195464072} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &771189643 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 7781529056550460865, guid: c07c4bd04b45c014fad0e3cd30747f06, type: 3} + propertyPath: m_RootOrder + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 7781529056550460865, guid: c07c4bd04b45c014fad0e3cd30747f06, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7781529056550460865, guid: c07c4bd04b45c014fad0e3cd30747f06, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7781529056550460865, guid: c07c4bd04b45c014fad0e3cd30747f06, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7781529056550460865, guid: c07c4bd04b45c014fad0e3cd30747f06, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7781529056550460865, guid: c07c4bd04b45c014fad0e3cd30747f06, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7781529056550460865, guid: c07c4bd04b45c014fad0e3cd30747f06, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7781529056550460865, guid: c07c4bd04b45c014fad0e3cd30747f06, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7781529056550460865, guid: c07c4bd04b45c014fad0e3cd30747f06, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7781529056550460865, guid: c07c4bd04b45c014fad0e3cd30747f06, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7781529056550460865, guid: c07c4bd04b45c014fad0e3cd30747f06, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7781529056550460866, guid: c07c4bd04b45c014fad0e3cd30747f06, type: 3} + propertyPath: m_Name + value: SimpleProfiler + objectReference: {fileID: 0} + - target: {fileID: 7781529056550460866, guid: c07c4bd04b45c014fad0e3cd30747f06, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: c07c4bd04b45c014fad0e3cd30747f06, type: 3} +--- !u!1 &782737665 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 782737666} + m_Layer: 0 + m_Name: KeyboardExample + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &782737666 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 782737665} + 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} + - {fileID: 2128020770} + - {fileID: 392741045} + m_Father: {fileID: 1203713056} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: -45, z: 0} +--- !u!1 &828245819 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 828245820} + - component: {fileID: 828245822} + - component: {fileID: 828245821} + m_Layer: 0 + m_Name: Text (TMP) (3) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &828245820 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 828245819} + 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 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -0.1895, y: -0.5461} + m_SizeDelta: {x: 17.27645, y: 5} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &828245821 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 828245819} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9541d86e2fd84c1d9990edf0852d74ab, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: '3D Occluded Style + + Select + to Activate' + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 533bdd8d5c92b52448ee2ecf7bd828a4, type: 2} + m_sharedMaterial: {fileID: -1005824763306460071, guid: 533bdd8d5c92b52448ee2ecf7bd828a4, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 36 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 0 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + 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 +--- !u!23 &828245822 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 828245819} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: -1005824763306460071, guid: 533bdd8d5c92b52448ee2ecf7bd828a4, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!1001 &831445127 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 150862479} + m_Modifications: + - target: {fileID: 3482465368609989420, guid: 8beb1e0a00bf1eb42921a53ffb52bdeb, type: 3} + propertyPath: m_Name + value: Model_Icosa + objectReference: {fileID: 0} + - target: {fileID: 3482465368609989420, guid: 8beb1e0a00bf1eb42921a53ffb52bdeb, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4517675688263086351, guid: 8beb1e0a00bf1eb42921a53ffb52bdeb, type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 4517675688263086351, guid: 8beb1e0a00bf1eb42921a53ffb52bdeb, type: 3} + propertyPath: m_LocalScale.x + value: 0.1332956 + objectReference: {fileID: 0} + - target: {fileID: 4517675688263086351, guid: 8beb1e0a00bf1eb42921a53ffb52bdeb, type: 3} + propertyPath: m_LocalScale.y + value: 0.1332956 + objectReference: {fileID: 0} + - target: {fileID: 4517675688263086351, guid: 8beb1e0a00bf1eb42921a53ffb52bdeb, type: 3} + propertyPath: m_LocalScale.z + value: 0.1332956 + objectReference: {fileID: 0} + - target: {fileID: 4517675688263086351, guid: 8beb1e0a00bf1eb42921a53ffb52bdeb, type: 3} + propertyPath: m_LocalPosition.x + value: 0.446 + objectReference: {fileID: 0} + - target: {fileID: 4517675688263086351, guid: 8beb1e0a00bf1eb42921a53ffb52bdeb, type: 3} + propertyPath: m_LocalPosition.y + value: -0.344 + objectReference: {fileID: 0} + - target: {fileID: 4517675688263086351, guid: 8beb1e0a00bf1eb42921a53ffb52bdeb, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4517675688263086351, guid: 8beb1e0a00bf1eb42921a53ffb52bdeb, type: 3} + propertyPath: m_LocalRotation.w + value: 0.85716736 + objectReference: {fileID: 0} + - target: {fileID: 4517675688263086351, guid: 8beb1e0a00bf1eb42921a53ffb52bdeb, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4517675688263086351, guid: 8beb1e0a00bf1eb42921a53ffb52bdeb, type: 3} + propertyPath: m_LocalRotation.y + value: 0.5150381 + objectReference: {fileID: 0} + - target: {fileID: 4517675688263086351, guid: 8beb1e0a00bf1eb42921a53ffb52bdeb, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4517675688263086351, guid: 8beb1e0a00bf1eb42921a53ffb52bdeb, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4517675688263086351, guid: 8beb1e0a00bf1eb42921a53ffb52bdeb, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 62 + objectReference: {fileID: 0} + - target: {fileID: 4517675688263086351, guid: 8beb1e0a00bf1eb42921a53ffb52bdeb, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5486639398703893882, guid: 8beb1e0a00bf1eb42921a53ffb52bdeb, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: b499c1bdbc12cd648937c46a2a6f8b01, type: 2} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 8beb1e0a00bf1eb42921a53ffb52bdeb, type: 3} +--- !u!4 &831445128 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4517675688263086351, guid: 8beb1e0a00bf1eb42921a53ffb52bdeb, type: 3} + m_PrefabInstance: {fileID: 831445127} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &840468516 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1913468802} + m_Modifications: + - target: {fileID: 4125495309553998321, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} + propertyPath: m_Name + value: FlatPanel + objectReference: {fileID: 0} + - target: {fileID: 4205010513405509735, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4205010513405509735, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4205010513405509735, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} + propertyPath: m_LocalPosition.x + value: -0.3862 + objectReference: {fileID: 0} + - target: {fileID: 4205010513405509735, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} + propertyPath: m_LocalPosition.y + value: -0.1234 + objectReference: {fileID: 0} + - target: {fileID: 4205010513405509735, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} + propertyPath: m_LocalPosition.z + value: 0.0055999756 + objectReference: {fileID: 0} + - target: {fileID: 4205010513405509735, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4205010513405509735, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4205010513405509735, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4205010513405509735, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4205010513405509735, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4205010513405509735, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4205010513405509735, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7759758375038403720, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} + propertyPath: m_LocalScale.x + value: 0.17586362 + objectReference: {fileID: 0} + - target: {fileID: 7759758375038403720, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} + propertyPath: m_LocalScale.y + value: 0.078615054 + objectReference: {fileID: 0} + - target: {fileID: 7759758375038403720, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} + propertyPath: m_LocalScale.z + value: 0.017 + objectReference: {fileID: 0} + - target: {fileID: 7759758375038403720, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} + propertyPath: m_LocalPosition.x + value: -0.0028 + objectReference: {fileID: 0} + - target: {fileID: 7759758375038403720, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} + propertyPath: m_LocalPosition.y + value: 0.0008 + objectReference: {fileID: 0} + - target: {fileID: 7759758375038403720, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} + propertyPath: m_LocalPosition.z + value: 0.00014997 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} +--- !u!4 &840468517 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4205010513405509735, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} + m_PrefabInstance: {fileID: 840468516} + m_PrefabAsset: {fileID: 0} +--- !u!1 &840468518 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 4125495309553998321, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} + m_PrefabInstance: {fileID: 840468516} + m_PrefabAsset: {fileID: 0} +--- !u!114 &840468519 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 840468518} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 80f85af46f9bddd4ea78f11cee5e3b2e, type: 3} + m_Name: + m_EditorClassIdentifier: + handType: 3 + proximityType: 3 + executionOrder: 0 + minimumScale: {x: 0.2, y: 0.2, z: 0.2} + maximumScale: {x: 2, y: 2, z: 2} + relativeToInitialState: 1 +--- !u!114 &840468520 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 840468518} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f3f2652d4ff14543be4d1ece28036a0, type: 3} + m_Name: + m_EditorClassIdentifier: + boundsVisualsPrefab: {fileID: 5671351296789090341, guid: 7b542306e34a62f4c9a822fcb19b7d99, type: 3} + boundsCalculationMethod: 0 + includeInactiveObjects: 0 + overrideBounds: 0 + boundsOverride: {fileID: 0} + flattenMode: 1 + boundsPadding: 0.01 + interactable: {fileID: 0} + toggleHandlesOnClick: 1 + dragToggleThreshold: 0.005 + target: {fileID: 0} + handlesActive: 0 + enabledHandles: 2 + rotateAnchor: 0 + scaleAnchor: 0 + scaleBehavior: 0 + smoothingActive: 1 + rotateLerpTime: 0.00001 + scaleLerpTime: 0.00001 + translateLerpTime: 0.00001 + enableConstraints: 1 + constraintsManager: {fileID: 840468521} + manipulationLogicTypes: + moveLogicType: + reference: MixedReality.Toolkit.SpatialManipulation.BoundsControlMoveLogic, + MixedReality.Toolkit.SpatialManipulation + rotateLogicType: + reference: MixedReality.Toolkit.SpatialManipulation.BoundsControlRotateLogic, + MixedReality.Toolkit.SpatialManipulation + scaleLogicType: + reference: MixedReality.Toolkit.SpatialManipulation.BoundsControlScaleLogic, + MixedReality.Toolkit.SpatialManipulation + manipulationStarted: + m_PersistentCalls: + m_Calls: [] + manipulationEnded: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &840468521 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 840468518} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 50cdab0cd5a0916419324bb54314773d, type: 3} + m_Name: + m_EditorClassIdentifier: + autoConstraintSelection: 1 + selectedConstraints: [] +--- !u!114 &840468522 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 840468518} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d9ad66e7cc9a2754d8ea989740c9f00d, type: 3} + m_Name: + m_EditorClassIdentifier: + m_InteractionManager: {fileID: 0} + m_Colliders: [] + m_InteractionLayers: + m_Bits: 1 + m_DistanceCalculationMode: 1 + m_SelectMode: 1 + m_FocusMode: 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: [] + m_LastHoverExited: + m_PersistentCalls: + m_Calls: [] + m_HoverEntered: + m_PersistentCalls: + m_Calls: [] + m_HoverExited: + m_PersistentCalls: + m_Calls: [] + m_FirstSelectEntered: + m_PersistentCalls: + m_Calls: [] + m_LastSelectExited: + m_PersistentCalls: + m_Calls: [] + m_SelectEntered: + m_PersistentCalls: + m_Calls: [] + m_SelectExited: + m_PersistentCalls: + m_Calls: [] + m_FirstFocusEntered: + m_PersistentCalls: + m_Calls: [] + m_LastFocusExited: + m_PersistentCalls: + m_Calls: [] + m_FocusEntered: + m_PersistentCalls: + m_Calls: [] + m_FocusExited: + m_PersistentCalls: + m_Calls: [] + m_Activated: + m_PersistentCalls: + m_Calls: [] + m_Deactivated: + m_PersistentCalls: + m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] + isGazePinchSelected: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 840468523} + m_TargetAssemblyTypeName: UnityEngine.AudioSource, UnityEngine + m_MethodName: PlayOneShot + m_Mode: 2 + m_Arguments: + m_ObjectArgument: {fileID: 8300000, guid: 29437a55b95f2eb489a5ec8574f185e9, type: 3} + m_ObjectArgumentAssemblyTypeName: UnityEngine.AudioClip, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - m_Target: {fileID: 840468520} + m_TargetAssemblyTypeName: MixedReality.Toolkit.SpatialManipulation.BoundsControl, + MixedReality.Toolkit.SpatialManipulation + m_MethodName: HighlightWires + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + onExited: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 840468523} + m_TargetAssemblyTypeName: UnityEngine.AudioSource, UnityEngine + m_MethodName: PlayOneShot + m_Mode: 2 + m_Arguments: + m_ObjectArgument: {fileID: 8300000, guid: 9f512430eba32d845aab8de9ba5e393c, type: 3} + m_ObjectArgumentAssemblyTypeName: UnityEngine.AudioClip, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - m_Target: {fileID: 840468520} + m_TargetAssemblyTypeName: MixedReality.Toolkit.SpatialManipulation.BoundsControl, + MixedReality.Toolkit.SpatialManipulation + m_MethodName: UnhighlightWires + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + isRaySelected: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 840468523} + m_TargetAssemblyTypeName: UnityEngine.AudioSource, UnityEngine + m_MethodName: PlayOneShot + m_Mode: 2 + m_Arguments: + m_ObjectArgument: {fileID: 8300000, guid: 29437a55b95f2eb489a5ec8574f185e9, type: 3} + m_ObjectArgumentAssemblyTypeName: UnityEngine.AudioClip, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - m_Target: {fileID: 840468520} + m_TargetAssemblyTypeName: MixedReality.Toolkit.SpatialManipulation.BoundsControl, + MixedReality.Toolkit.SpatialManipulation + m_MethodName: HighlightWires + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + onExited: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 840468523} + m_TargetAssemblyTypeName: UnityEngine.AudioSource, UnityEngine + m_MethodName: PlayOneShot + m_Mode: 2 + m_Arguments: + m_ObjectArgument: {fileID: 8300000, guid: 9f512430eba32d845aab8de9ba5e393c, type: 3} + m_ObjectArgumentAssemblyTypeName: UnityEngine.AudioClip, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - m_Target: {fileID: 840468520} + m_TargetAssemblyTypeName: MixedReality.Toolkit.SpatialManipulation.BoundsControl, + MixedReality.Toolkit.SpatialManipulation + m_MethodName: UnhighlightWires + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + isPokeSelected: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isGrabSelected: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 840468523} + m_TargetAssemblyTypeName: UnityEngine.AudioSource, UnityEngine + m_MethodName: PlayOneShot + m_Mode: 2 + m_Arguments: + m_ObjectArgument: {fileID: 8300000, guid: 29437a55b95f2eb489a5ec8574f185e9, type: 3} + m_ObjectArgumentAssemblyTypeName: UnityEngine.AudioClip, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - m_Target: {fileID: 840468520} + m_TargetAssemblyTypeName: MixedReality.Toolkit.SpatialManipulation.BoundsControl, + MixedReality.Toolkit.SpatialManipulation + m_MethodName: HighlightWires + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + onExited: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 840468523} + m_TargetAssemblyTypeName: UnityEngine.AudioSource, UnityEngine + m_MethodName: PlayOneShot + m_Mode: 2 + m_Arguments: + m_ObjectArgument: {fileID: 8300000, guid: 9f512430eba32d845aab8de9ba5e393c, type: 3} + m_ObjectArgumentAssemblyTypeName: UnityEngine.AudioClip, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - m_Target: {fileID: 840468520} + m_TargetAssemblyTypeName: MixedReality.Toolkit.SpatialManipulation.BoundsControl, + MixedReality.Toolkit.SpatialManipulation + m_MethodName: UnhighlightWires + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + isGazeHovered: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isGazePinchHovered: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isRayHovered: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isGrabHovered: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isPokeHovered: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isActiveHovered: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + disabledInteractorTypes: + - reference: MixedReality.Toolkit.IPokeInteractor, MixedReality.Toolkit.Core + k__BackingField: 0 + k__BackingField: 0.9 + k__BackingField: 0.1 + k__BackingField: 1 + k__BackingField: 0 + k__BackingField: 1 + k__BackingField: 0 + k__BackingField: 1 + allowSelectByVoice: 1 + speechRecognitionKeyword: select + k__BackingField: 1 + k__BackingField: 0 + k__BackingField: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + k__BackingField: + m_PersistentCalls: + m_Calls: [] + k__BackingField: + m_PersistentCalls: + m_Calls: [] + k__BackingField: + m_PersistentCalls: + m_Calls: [] + hostTransform: {fileID: 840468517} + allowedManipulations: 7 + allowedInteractionTypes: -2147483641 + rigidbodyMovementType: 0 + applyTorque: 1 + springForceSoftness: 0.1 + springTorqueSoftness: 0.1 + springDamping: 1 + springForceLimit: 100 + rotationAnchorNear: 1 + rotationAnchorFar: 1 + releaseBehavior: 3 + transformSmoothingLogicType: + reference: MixedReality.Toolkit.SpatialManipulation.DefaultTransformSmoothingLogic, + MixedReality.Toolkit.SpatialManipulation + smoothingFar: 1 + smoothingNear: 1 + moveLerpTime: 0.001 + rotateLerpTime: 0.001 + scaleLerpTime: 0.001 + enableConstraints: 1 + constraintsManager: {fileID: 840468521} + manipulationLogicTypes: + moveLogicType: + reference: MixedReality.Toolkit.SpatialManipulation.MoveLogic, MixedReality.Toolkit.SpatialManipulation + rotateLogicType: + reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, MixedReality.Toolkit.SpatialManipulation + scaleLogicType: + reference: MixedReality.Toolkit.SpatialManipulation.ScaleLogic, MixedReality.Toolkit.SpatialManipulation +--- !u!82 &840468523 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 840468518} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} + m_audioClip: {fileID: 0} + m_PlayOnAwake: 1 + m_Volume: 1 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 1 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 +--- !u!114 &840468524 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 840468518} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3a1bf44e2291e8741ab3dec75055d9db, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 0 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 0} + movableAxes: 0 + onMoveDelta: 0.01 +--- !u!65 &862305034 stripped +BoxCollider: + m_CorrespondingSourceObject: {fileID: 2578649063991174809, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + m_PrefabInstance: {fileID: 2578649064215403923} + m_PrefabAsset: {fileID: 0} +--- !u!4 &884765057 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 800348947636869897, guid: 7d421b6091df2b5439be946871d23d28, type: 3} + m_PrefabInstance: {fileID: 434590702} + m_PrefabAsset: {fileID: 0} +--- !u!114 &884765058 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 2603518900594662515, guid: 7d421b6091df2b5439be946871d23d28, type: 3} + m_PrefabInstance: {fileID: 434590702} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6cc71cf53860e9a4b8cc5b2aed46bb76, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &888851581 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 888851582} + - component: {fileID: 888851589} + - component: {fileID: 888851588} + - component: {fileID: 888851587} + - component: {fileID: 888851586} + - component: {fileID: 888851585} + - component: {fileID: 888851584} + - component: {fileID: 888851583} + - component: {fileID: 888851590} + - component: {fileID: 888851591} + - component: {fileID: 888851592} + m_Layer: 0 + m_Name: Cube2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &888851582 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 888851581} + 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 + m_LocalEulerAnglesHint: {x: 0, y: -51.498, z: 0} +--- !u!114 &888851583 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 888851581} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d9ad66e7cc9a2754d8ea989740c9f00d, type: 3} + m_Name: + m_EditorClassIdentifier: + m_InteractionManager: {fileID: 0} + m_Colliders: [] + m_InteractionLayers: + m_Bits: 1 + m_DistanceCalculationMode: 1 + m_SelectMode: 1 + m_FocusMode: 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: [] + m_LastHoverExited: + m_PersistentCalls: + m_Calls: [] + m_HoverEntered: + m_PersistentCalls: + m_Calls: [] + m_HoverExited: + m_PersistentCalls: + m_Calls: [] + m_FirstSelectEntered: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 888851585} + m_TargetAssemblyTypeName: UnityEngine.AudioSource, UnityEngine + m_MethodName: PlayOneShot + m_Mode: 2 + m_Arguments: + m_ObjectArgument: {fileID: 8300000, guid: 29437a55b95f2eb489a5ec8574f185e9, type: 3} + m_ObjectArgumentAssemblyTypeName: UnityEngine.AudioClip, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - m_Target: {fileID: 888851588} + m_TargetAssemblyTypeName: UnityEngine.Renderer, UnityEngine + m_MethodName: set_sharedMaterial + m_Mode: 2 + m_Arguments: + m_ObjectArgument: {fileID: 2100000, guid: dfc7ad8279e3c564fb48199b93024f44, type: 2} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Material, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_LastSelectExited: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 888851585} + m_TargetAssemblyTypeName: UnityEngine.AudioSource, UnityEngine + m_MethodName: PlayOneShot + m_Mode: 2 + m_Arguments: + m_ObjectArgument: {fileID: 8300000, guid: 9f512430eba32d845aab8de9ba5e393c, type: 3} + m_ObjectArgumentAssemblyTypeName: UnityEngine.AudioClip, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - m_Target: {fileID: 888851588} + m_TargetAssemblyTypeName: UnityEngine.Renderer, UnityEngine + m_MethodName: set_sharedMaterial + m_Mode: 2 + m_Arguments: + m_ObjectArgument: {fileID: 2100000, guid: aed69361010390840abc588081f8e964, type: 2} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Material, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_SelectEntered: + m_PersistentCalls: + m_Calls: [] + m_SelectExited: + m_PersistentCalls: + m_Calls: [] + m_FirstFocusEntered: + m_PersistentCalls: + m_Calls: [] + m_LastFocusExited: + m_PersistentCalls: + m_Calls: [] + m_FocusEntered: + m_PersistentCalls: + m_Calls: [] + m_FocusExited: + m_PersistentCalls: + m_Calls: [] + m_Activated: + m_PersistentCalls: + m_Calls: [] + m_Deactivated: + m_PersistentCalls: + m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] + isGazePinchSelected: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 888851585} + m_TargetAssemblyTypeName: UnityEngine.AudioSource, UnityEngine + m_MethodName: PlayOneShot + m_Mode: 2 + m_Arguments: + m_ObjectArgument: {fileID: 8300000, guid: 29437a55b95f2eb489a5ec8574f185e9, type: 3} + m_ObjectArgumentAssemblyTypeName: UnityEngine.AudioClip, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - m_Target: {fileID: 888851588} + m_TargetAssemblyTypeName: UnityEngine.Renderer, UnityEngine + m_MethodName: set_sharedMaterial + m_Mode: 2 + m_Arguments: + m_ObjectArgument: {fileID: 2100000, guid: 1e1949131aa56c54396b361b35a942e6, type: 2} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Material, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + onExited: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 888851585} + m_TargetAssemblyTypeName: UnityEngine.AudioSource, UnityEngine + m_MethodName: PlayOneShot + m_Mode: 2 + m_Arguments: + m_ObjectArgument: {fileID: 8300000, guid: 9f512430eba32d845aab8de9ba5e393c, type: 3} + m_ObjectArgumentAssemblyTypeName: UnityEngine.AudioClip, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - m_Target: {fileID: 888851588} + m_TargetAssemblyTypeName: UnityEngine.Renderer, UnityEngine + m_MethodName: set_sharedMaterial + m_Mode: 2 + m_Arguments: + m_ObjectArgument: {fileID: 2100000, guid: b1ac50d5d67970a49a49c29519977b61, type: 2} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Material, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + isRaySelected: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 888851585} + m_TargetAssemblyTypeName: UnityEngine.AudioSource, UnityEngine + m_MethodName: PlayOneShot + m_Mode: 2 + m_Arguments: + m_ObjectArgument: {fileID: 8300000, guid: 29437a55b95f2eb489a5ec8574f185e9, type: 3} + m_ObjectArgumentAssemblyTypeName: UnityEngine.AudioClip, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - m_Target: {fileID: 888851588} + m_TargetAssemblyTypeName: UnityEngine.Renderer, UnityEngine + m_MethodName: set_sharedMaterial + m_Mode: 2 + m_Arguments: + m_ObjectArgument: {fileID: 2100000, guid: 1e1949131aa56c54396b361b35a942e6, type: 2} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Material, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + onExited: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 888851585} + m_TargetAssemblyTypeName: UnityEngine.AudioSource, UnityEngine + m_MethodName: PlayOneShot + m_Mode: 2 + m_Arguments: + m_ObjectArgument: {fileID: 8300000, guid: 9f512430eba32d845aab8de9ba5e393c, type: 3} + m_ObjectArgumentAssemblyTypeName: UnityEngine.AudioClip, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - m_Target: {fileID: 888851588} + m_TargetAssemblyTypeName: UnityEngine.Renderer, UnityEngine + m_MethodName: set_sharedMaterial + m_Mode: 2 + m_Arguments: + m_ObjectArgument: {fileID: 2100000, guid: b1ac50d5d67970a49a49c29519977b61, type: 2} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Material, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + isPokeSelected: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isGrabSelected: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isGazeHovered: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isGazePinchHovered: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isRayHovered: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isGrabHovered: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isPokeHovered: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isActiveHovered: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + disabledInteractorTypes: + - reference: MixedReality.Toolkit.IPokeInteractor, MixedReality.Toolkit.Core + k__BackingField: 0 + k__BackingField: 0.9 + k__BackingField: 0.1 + k__BackingField: 1 + k__BackingField: 0 + k__BackingField: 1 + k__BackingField: 0 + k__BackingField: 1 + allowSelectByVoice: 1 + speechRecognitionKeyword: select + k__BackingField: 1 + k__BackingField: 0 + k__BackingField: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + k__BackingField: + m_PersistentCalls: + m_Calls: [] + k__BackingField: + m_PersistentCalls: + m_Calls: [] + k__BackingField: + m_PersistentCalls: + m_Calls: [] + hostTransform: {fileID: 888851582} + allowedManipulations: 7 + allowedInteractionTypes: -2147483641 + rigidbodyMovementType: 0 + applyTorque: 1 + springForceSoftness: 0.1 + springTorqueSoftness: 0.1 + springDamping: 1 + springForceLimit: 100 + rotationAnchorNear: 1 + rotationAnchorFar: 1 + releaseBehavior: 3 + transformSmoothingLogicType: + reference: MixedReality.Toolkit.SpatialManipulation.DefaultTransformSmoothingLogic, + MixedReality.Toolkit.SpatialManipulation + smoothingFar: 0 + smoothingNear: 0 + moveLerpTime: 0.001 + rotateLerpTime: 0.001 + scaleLerpTime: 0.001 + enableConstraints: 1 + constraintsManager: {fileID: 888851584} + manipulationLogicTypes: + moveLogicType: + reference: MixedReality.Toolkit.SpatialManipulation.MoveLogic, MixedReality.Toolkit.SpatialManipulation + rotateLogicType: + reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, MixedReality.Toolkit.SpatialManipulation + scaleLogicType: + reference: MixedReality.Toolkit.SpatialManipulation.ScaleLogic, MixedReality.Toolkit.SpatialManipulation +--- !u!114 &888851584 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 888851581} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 50cdab0cd5a0916419324bb54314773d, type: 3} + m_Name: + m_EditorClassIdentifier: + autoConstraintSelection: 1 + selectedConstraints: [] +--- !u!82 &888851585 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 888851581} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} + m_audioClip: {fileID: 0} + m_PlayOnAwake: 1 + m_Volume: 1 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 1 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 +--- !u!54 &888851586 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 888851581} + serializedVersion: 2 + m_Mass: 0.1 + m_Drag: 1 + m_AngularDrag: 1 + m_UseGravity: 1 + m_IsKinematic: 0 + m_Interpolate: 1 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!65 &888851587 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 888851581} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!23 &888851588 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 888851581} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 4294967295 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: aed69361010390840abc588081f8e964, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &888851589 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 888851581} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!114 &888851590 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 888851581} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe9323ca265114b4282b5d33b41f7adc, type: 3} + m_Name: + m_EditorClassIdentifier: + distanceThreshold: 20 +--- !u!114 &888851591 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 888851581} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3a1bf44e2291e8741ab3dec75055d9db, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 0 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 0} + movableAxes: 0 + onMoveDelta: 0.01 +--- !u!114 &888851592 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 888851581} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 80f85af46f9bddd4ea78f11cee5e3b2e, type: 3} + m_Name: + m_EditorClassIdentifier: + handType: 3 + proximityType: 3 + executionOrder: 0 + minimumScale: {x: 0.2, y: 0.2, z: 0.2} + maximumScale: {x: 2, y: 2, z: 2} + relativeToInitialState: 1 +--- !u!1 &956891492 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 956891493} + - component: {fileID: 956891495} + - component: {fileID: 956891494} + m_Layer: 0 + m_Name: ObjectLabel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &956891493 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 956891492} + 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 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0.955, y: 0.026} + m_SizeDelta: {x: 41.5131, y: 5} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &956891494 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 956891492} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9541d86e2fd84c1d9990edf0852d74ab, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: 'Manipulation with ObjectManipulator + + + Dynamic + visual feedback based on the amount of pinch gesture (selection progress) using + StateVisualizer''s ''Playback Time Matches Value''. Hover highlight is activated + by MeshOutline script. + + + ObjectManipulator.cs allows + for the intuitive manipulation of objects using near grab, far ray, and gaze + + pinch manipulation.' + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 533bdd8d5c92b52448ee2ecf7bd828a4, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: b082f80c6b45164418a354f7e116f0a3, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 26 + m_fontSizeBase: 26 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 0 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + 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 +--- !u!23 &956891495 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 956891492} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: b082f80c6b45164418a354f7e116f0a3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!1 &958324214 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 8323939510892415185, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} + m_PrefabInstance: {fileID: 1170466718} + m_PrefabAsset: {fileID: 0} +--- !u!114 &958324215 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 958324214} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d9ad66e7cc9a2754d8ea989740c9f00d, type: 3} + m_Name: + m_EditorClassIdentifier: + m_InteractionManager: {fileID: 0} + m_Colliders: [] + m_InteractionLayers: + m_Bits: 1 + m_DistanceCalculationMode: 1 + m_SelectMode: 1 + m_FocusMode: 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: [] + m_LastHoverExited: + m_PersistentCalls: + m_Calls: [] + m_HoverEntered: + m_PersistentCalls: + m_Calls: [] + m_HoverExited: + m_PersistentCalls: + m_Calls: [] + m_FirstSelectEntered: + m_PersistentCalls: + m_Calls: [] + m_LastSelectExited: + m_PersistentCalls: + m_Calls: [] + m_SelectEntered: + m_PersistentCalls: + m_Calls: [] + m_SelectExited: + m_PersistentCalls: + m_Calls: [] + m_FirstFocusEntered: + m_PersistentCalls: + m_Calls: [] + m_LastFocusExited: + m_PersistentCalls: + m_Calls: [] + m_FocusEntered: + m_PersistentCalls: + m_Calls: [] + m_FocusExited: + m_PersistentCalls: + m_Calls: [] + m_Activated: + m_PersistentCalls: + m_Calls: [] + m_Deactivated: + m_PersistentCalls: + m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] + isGazePinchSelected: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isRaySelected: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isPokeSelected: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isGrabSelected: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isGazeHovered: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isGazePinchHovered: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isRayHovered: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isGrabHovered: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isPokeHovered: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isActiveHovered: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + disabledInteractorTypes: + - reference: MixedReality.Toolkit.IPokeInteractor, MixedReality.Toolkit.Core + k__BackingField: 0 + k__BackingField: 0.9 + k__BackingField: 0.1 + k__BackingField: 1 + k__BackingField: 0 + k__BackingField: 1 + k__BackingField: 0 + k__BackingField: 1 + allowSelectByVoice: 1 + speechRecognitionKeyword: select + k__BackingField: 1 + k__BackingField: 0 + k__BackingField: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + k__BackingField: + m_PersistentCalls: + m_Calls: [] + k__BackingField: + m_PersistentCalls: + m_Calls: [] + k__BackingField: + m_PersistentCalls: + m_Calls: [] + hostTransform: {fileID: 1203713056} + allowedManipulations: 7 + allowedInteractionTypes: -2147483641 + rigidbodyMovementType: 0 + applyTorque: 1 + springForceSoftness: 0.1 + springTorqueSoftness: 0.1 + springDamping: 1 + springForceLimit: 100 + rotationAnchorNear: 1 + rotationAnchorFar: 1 + releaseBehavior: 3 + transformSmoothingLogicType: + reference: MixedReality.Toolkit.SpatialManipulation.DefaultTransformSmoothingLogic, + MixedReality.Toolkit.SpatialManipulation + smoothingFar: 1 + smoothingNear: 1 + moveLerpTime: 0.001 + rotateLerpTime: 0.001 + scaleLerpTime: 0.001 + enableConstraints: 1 + constraintsManager: {fileID: 958324216} + manipulationLogicTypes: + moveLogicType: + reference: MixedReality.Toolkit.SpatialManipulation.MoveLogic, MixedReality.Toolkit.SpatialManipulation + rotateLogicType: + reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, MixedReality.Toolkit.SpatialManipulation + scaleLogicType: + reference: MixedReality.Toolkit.SpatialManipulation.ScaleLogic, MixedReality.Toolkit.SpatialManipulation +--- !u!114 &958324216 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 958324214} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 50cdab0cd5a0916419324bb54314773d, type: 3} + m_Name: + m_EditorClassIdentifier: + autoConstraintSelection: 1 + selectedConstraints: [] +--- !u!65 &958324217 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 958324214} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 0.99999994, y: 1.0000001, z: 0.099999994} + m_Center: {x: 0, y: 0, z: 0.049999997} +--- !u!114 &958324218 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 958324214} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 80f85af46f9bddd4ea78f11cee5e3b2e, type: 3} + m_Name: + m_EditorClassIdentifier: + handType: 3 + proximityType: 3 + executionOrder: 0 + minimumScale: {x: 0.2, y: 0.2, z: 0.2} + maximumScale: {x: 2, y: 2, z: 2} + relativeToInitialState: 1 +--- !u!1001 &1001175447 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1089489031} + m_Modifications: + - target: {fileID: 372063525408016474, guid: ebf6a177e3199274b8bd12a0c8157f29, type: 3} + propertyPath: m_RootOrder + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 372063525408016474, guid: ebf6a177e3199274b8bd12a0c8157f29, type: 3} + propertyPath: m_LocalPosition.x + value: -0.1483 + objectReference: {fileID: 0} + - target: {fileID: 372063525408016474, guid: ebf6a177e3199274b8bd12a0c8157f29, type: 3} + propertyPath: m_LocalPosition.y + value: -0.537 + objectReference: {fileID: 0} + - target: {fileID: 372063525408016474, guid: ebf6a177e3199274b8bd12a0c8157f29, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 372063525408016474, guid: ebf6a177e3199274b8bd12a0c8157f29, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 372063525408016474, guid: ebf6a177e3199274b8bd12a0c8157f29, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 372063525408016474, guid: ebf6a177e3199274b8bd12a0c8157f29, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 372063525408016474, guid: ebf6a177e3199274b8bd12a0c8157f29, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 372063525408016474, guid: ebf6a177e3199274b8bd12a0c8157f29, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 372063525408016474, guid: ebf6a177e3199274b8bd12a0c8157f29, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 372063525408016474, guid: ebf6a177e3199274b8bd12a0c8157f29, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 372063527002377915, guid: ebf6a177e3199274b8bd12a0c8157f29, type: 3} + propertyPath: m_Name + value: TogglePressableButton_32x32mm_Radio + objectReference: {fileID: 0} + - target: {fileID: 1067509237937949148, guid: ebf6a177e3199274b8bd12a0c8157f29, type: 3} + propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1067509237937949148, guid: ebf6a177e3199274b8bd12a0c8157f29, type: 3} + propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1067509237937949148, guid: ebf6a177e3199274b8bd12a0c8157f29, type: 3} + propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 884765058} + - target: {fileID: 1067509237937949148, guid: ebf6a177e3199274b8bd12a0c8157f29, type: 3} + propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 1067509237937949148, guid: ebf6a177e3199274b8bd12a0c8157f29, type: 3} + propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: Increment + objectReference: {fileID: 0} + - target: {fileID: 1067509237937949148, guid: ebf6a177e3199274b8bd12a0c8157f29, type: 3} + propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: MixedReality.Toolkit.Examples.Demos.ColorChanger, Assembly-CSharp + objectReference: {fileID: 0} + - target: {fileID: 1067509237937949148, guid: ebf6a177e3199274b8bd12a0c8157f29, type: 3} + propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 7288869868504888068, guid: ebf6a177e3199274b8bd12a0c8157f29, type: 3} + propertyPath: Spatialize + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7288869868504888068, guid: ebf6a177e3199274b8bd12a0c8157f29, type: 3} + propertyPath: OutputAudioMixerGroup + value: + objectReference: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} + - target: {fileID: 7288869868504888068, guid: ebf6a177e3199274b8bd12a0c8157f29, type: 3} + propertyPath: panLevelCustomCurve.m_Curve.Array.data[0].value + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: ebf6a177e3199274b8bd12a0c8157f29, type: 3} +--- !u!4 &1001175448 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 372063525408016474, guid: ebf6a177e3199274b8bd12a0c8157f29, type: 3} + m_PrefabInstance: {fileID: 1001175447} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &1002036031 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1404428861} + m_Modifications: + - target: {fileID: 1963561307345040800, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} + propertyPath: m_Name + value: BasicPressableButton + objectReference: {fileID: 0} + - target: {fileID: 1963561307345040802, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} + propertyPath: OnClicked.m_PersistentCalls.m_Calls.Array.size + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 1963561307345040802, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} + propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1963561307345040802, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} + propertyPath: m_LastSelectExited.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1963561307345040802, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} + propertyPath: OnClicked.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 1963561307345040802, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} + propertyPath: OnClicked.m_PersistentCalls.m_Calls.Array.data[1].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1963561307345040802, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} + propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1963561307345040802, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} + propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[1].m_Mode + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 1963561307345040802, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} + propertyPath: m_FirstSelectEntered.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1963561307345040802, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} + propertyPath: OnClicked.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 0} + - target: {fileID: 1963561307345040802, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} + propertyPath: OnClicked.m_PersistentCalls.m_Calls.Array.data[1].m_Target + value: + objectReference: {fileID: 884765058} + - target: {fileID: 1963561307345040802, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} + propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 884765058} + - target: {fileID: 1963561307345040802, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} + propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[1].m_Target + value: + objectReference: {fileID: 573431357} + - target: {fileID: 1963561307345040802, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} + propertyPath: OnClicked.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 1963561307345040802, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} + propertyPath: OnClicked.m_PersistentCalls.m_Calls.Array.data[1].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 1963561307345040802, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} + propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 1963561307345040802, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} + propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[1].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 1963561307345040802, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} + propertyPath: OnClicked.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: Play + objectReference: {fileID: 0} + - target: {fileID: 1963561307345040802, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} + propertyPath: OnClicked.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName + value: Increment + objectReference: {fileID: 0} + - target: {fileID: 1963561307345040802, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} + propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: Increment + objectReference: {fileID: 0} + - target: {fileID: 1963561307345040802, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} + propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName + value: PlayOneShot + objectReference: {fileID: 0} + - target: {fileID: 1963561307345040802, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} + propertyPath: m_LastSelectExited.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 1963561307345040802, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} + propertyPath: m_FirstSelectEntered.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 1963561307345040802, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} + propertyPath: m_LastSelectExited.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 573431357} + - target: {fileID: 1963561307345040802, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} + propertyPath: m_FirstSelectEntered.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 573431357} + - target: {fileID: 1963561307345040802, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} + propertyPath: m_LastSelectExited.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 1963561307345040802, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} + propertyPath: m_LastSelectExited.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: PlayOneShot + objectReference: {fileID: 0} + - target: {fileID: 1963561307345040802, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} + propertyPath: m_FirstSelectEntered.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 1963561307345040802, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} + propertyPath: m_FirstSelectEntered.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: PlayOneShot + objectReference: {fileID: 0} + - target: {fileID: 1963561307345040802, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} + propertyPath: OnClicked.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: UnityEngine.ParticleSystem, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 1963561307345040802, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} + propertyPath: OnClicked.m_PersistentCalls.m_Calls.Array.data[1].m_TargetAssemblyTypeName + value: MixedReality.Toolkit.Examples.Demos.ColorChanger, Assembly-CSharp + objectReference: {fileID: 0} + - target: {fileID: 1963561307345040802, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} + propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: MixedReality.Toolkit.Examples.Demos.ColorChanger, Assembly-CSharp + objectReference: {fileID: 0} + - target: {fileID: 1963561307345040802, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} + propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[1].m_TargetAssemblyTypeName + value: UnityEngine.AudioSource, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 1963561307345040802, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} + propertyPath: OnClicked.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_BoolArgument + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1963561307345040802, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} + propertyPath: OnClicked.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_BoolArgument + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1963561307345040802, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} + propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_BoolArgument + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1963561307345040802, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} + propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_BoolArgument + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1963561307345040802, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} + propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_ObjectArgument + value: + objectReference: {fileID: 8300000, guid: 3e4887b6014c9e04290e816ac261a414, type: 3} + - target: {fileID: 1963561307345040802, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} + propertyPath: m_LastSelectExited.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: UnityEngine.AudioSource, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 1963561307345040802, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} + propertyPath: m_FirstSelectEntered.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: UnityEngine.AudioSource, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 1963561307345040802, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} + propertyPath: m_LastSelectExited.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgument + value: + objectReference: {fileID: 8300000, guid: f2b39c1fa02395640bced3c8e5f9696e, type: 3} + - target: {fileID: 1963561307345040802, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} + propertyPath: m_FirstSelectEntered.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgument + value: + objectReference: {fileID: 8300000, guid: 3e4887b6014c9e04290e816ac261a414, type: 3} + - target: {fileID: 1963561307345040802, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} + propertyPath: OnClicked.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 1963561307345040802, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} + propertyPath: OnClicked.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 1963561307345040802, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} + propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 1963561307345040802, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} + propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.AudioClip, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 1963561307345040802, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} + propertyPath: m_LastSelectExited.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.AudioClip, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 1963561307345040802, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} + propertyPath: m_FirstSelectEntered.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.AudioClip, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 1963561307345040812, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1963561307345040812, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} + propertyPath: m_LocalPosition.x + value: -0.2361 + objectReference: {fileID: 0} + - target: {fileID: 1963561307345040812, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} + propertyPath: m_LocalPosition.y + value: -0.6999 + objectReference: {fileID: 0} + - target: {fileID: 1963561307345040812, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} + propertyPath: m_LocalPosition.z + value: -0.03460002 + objectReference: {fileID: 0} + - target: {fileID: 1963561307345040812, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} + propertyPath: m_LocalRotation.w + value: 0.92387956 + objectReference: {fileID: 0} + - target: {fileID: 1963561307345040812, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} + propertyPath: m_LocalRotation.x + value: 0.38268343 + objectReference: {fileID: 0} + - target: {fileID: 1963561307345040812, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1963561307345040812, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1963561307345040812, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 45 + objectReference: {fileID: 0} + - target: {fileID: 1963561307345040812, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1963561307345040812, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1963561309274324397, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 0c3570eeff29ef44e9fed596a4cc3ffd, type: 2} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} +--- !u!4 &1002036032 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1963561307345040812, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} + m_PrefabInstance: {fileID: 1002036031} + m_PrefabAsset: {fileID: 0} +--- !u!65 &1069515631 stripped +BoxCollider: + m_CorrespondingSourceObject: {fileID: 2578649064187649788, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + m_PrefabInstance: {fileID: 2578649064215403923} + m_PrefabAsset: {fileID: 0} +--- !u!1 &1089489030 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1089489031} + m_Layer: 0 + m_Name: MRDesignLanguageExamples + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1089489031 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1089489030} + 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} + - {fileID: 1758148431} + - {fileID: 502884643} + - {fileID: 1001175448} + - {fileID: 1669647714} + m_Father: {fileID: 1852224431} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1099479633 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1099479634} + - component: {fileID: 1099479636} + - component: {fileID: 1099479635} + m_Layer: 0 + m_Name: KeyboardOutput + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1099479634 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1099479633} + 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 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: -0.06} + m_SizeDelta: {x: 31.65629, y: 5} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1099479635 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1099479633} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9541d86e2fd84c1d9990edf0852d74ab, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: Keyboard output. + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 533bdd8d5c92b52448ee2ecf7bd828a4, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: b082f80c6b45164418a354f7e116f0a3, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 12 + m_fontSizeBase: 12 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 0 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + 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 +--- !u!23 &1099479636 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1099479633} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: b082f80c6b45164418a354f7e116f0a3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!1 &1146931002 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 100004, guid: 6ceef383a3dfd0a4e9c38b8d793170e4, type: 3} + m_PrefabInstance: {fileID: 79416683} + m_PrefabAsset: {fileID: 0} +--- !u!4 &1146931003 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 400004, guid: 6ceef383a3dfd0a4e9c38b8d793170e4, type: 3} + m_PrefabInstance: {fileID: 79416683} + m_PrefabAsset: {fileID: 0} +--- !u!64 &1146931006 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1146931002} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 1 + m_CookingOptions: -1 + m_Mesh: {fileID: -1636560234873357706, guid: 3ceb984318b1e34419d826d447ca4eec, type: 3} +--- !u!1 &1149607822 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6056454165148638616, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} + m_PrefabInstance: {fileID: 1376890153} + m_PrefabAsset: {fileID: 0} +--- !u!65 &1149607826 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1149607822} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + 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!1001 &1170466718 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1203713056} + m_Modifications: + - target: {fileID: 566361764857432160, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} + propertyPath: m_AnchoredPosition.y + value: -34.5 + objectReference: {fileID: 0} + - target: {fileID: 1438325884843275054, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2446705927233332293, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} + propertyPath: m_text + value: '(Obsolete) Hand Interaction Examples + + + This + example scene demonstrates various types of hand tracking interactions such + as Press, Touch, Grab, Scroll, Move, Rotate, and Scale. You can find common + UI and interaction building blocks that are part of HoloLens shell. + + + Note: + This scene uses the obsolete pre-XRI3 MRTK3 rig and not the new XRI3+ controllerless + rig. This scene is included for testing purposes only.' + objectReference: {fileID: 0} + - target: {fileID: 2446705927233332293, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} + propertyPath: m_fontStyle + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3220012215463627515, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3220012215463627515, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3220012215463627515, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3220012215463627515, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3220012215463627515, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3220012215463627515, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3220012215463627515, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3220012215463627515, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} + propertyPath: m_SizeDelta.x + value: 213.2298 + objectReference: {fileID: 0} + - target: {fileID: 3220012215463627515, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} + propertyPath: m_SizeDelta.y + value: 93.4684 + objectReference: {fileID: 0} + - target: {fileID: 3220012215463627515, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3220012215463627515, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3220012215463627515, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} + propertyPath: m_LocalPosition.z + value: 0.0463 + objectReference: {fileID: 0} + - target: {fileID: 3220012215463627515, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3220012215463627515, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3220012215463627515, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3220012215463627515, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3220012215463627515, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0.018962938 + objectReference: {fileID: 0} + - target: {fileID: 3220012215463627515, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0.12 + objectReference: {fileID: 0} + - target: {fileID: 3220012215463627515, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3220012215463627515, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3220012215463627515, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4568172237328552037, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} + propertyPath: m_text + value: Button with Basic Visuals + objectReference: {fileID: 0} + - target: {fileID: 5158546944129612579, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} + propertyPath: m_LocalScale.y + value: 1.45 + objectReference: {fileID: 0} + - target: {fileID: 5158546944129612579, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} + propertyPath: m_LocalPosition.y + value: -54.4 + objectReference: {fileID: 0} + - target: {fileID: 5493534032387613222, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} + propertyPath: m_LocalScale.y + value: 119.04798 + objectReference: {fileID: 0} + - target: {fileID: 5493534032387613222, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} + propertyPath: m_LocalPosition.y + value: 31.13 + objectReference: {fileID: 0} + - target: {fileID: 5929991690626966069, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6540126486176102408, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} + propertyPath: m_Name + value: DescriptionPanel + objectReference: {fileID: 0} + - target: {fileID: 6809291684801504143, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} + propertyPath: m_text + value: 'PressableButtonStateful.cs + + BasicPressableButtonVisuals.cs' + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} +--- !u!224 &1170466719 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3220012215463627515, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} + m_PrefabInstance: {fileID: 1170466718} + m_PrefabAsset: {fileID: 0} +--- !u!1 &1180287155 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1180287156} + - component: {fileID: 1180287158} + - component: {fileID: 1180287157} + m_Layer: 0 + m_Name: SectionTitle (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1180287156 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1180287155} + 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 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0.42808, y: -0.5251} + m_SizeDelta: {x: 18.15896, y: 5} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1180287157 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1180287155} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9541d86e2fd84c1d9990edf0852d74ab, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: 'Pinch Interaction + + + Slider, like PressableButton, + is visual-agnostic and can be used in any visual configuration with the same + underlying state script. + + + To demonstrate pinch interactions, this Slider + has been set to IsTouchable = false, which disables poking interactions.' + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 533bdd8d5c92b52448ee2ecf7bd828a4, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: b082f80c6b45164418a354f7e116f0a3, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 8 + m_fontSizeBase: 8 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 0 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + 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 +--- !u!23 &1180287158 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1180287155} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: b082f80c6b45164418a354f7e116f0a3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!1 &1203713055 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1203713056} + m_Layer: 0 + m_Name: MixedRealitySceneContent + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1203713056 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1203713055} + 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} + - {fileID: 1913468802} + - {fileID: 1708103290} + - {fileID: 150862479} + - {fileID: 782737666} + - {fileID: 1583599066} + - {fileID: 469873930} + - {fileID: 5174432} + m_Father: {fileID: 0} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1232423736 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1232423737} + - component: {fileID: 1232423741} + - component: {fileID: 1232423740} + - component: {fileID: 1232423739} + - component: {fileID: 1232423738} + - component: {fileID: 1232423742} + - component: {fileID: 1232423744} + - component: {fileID: 1232423743} + - component: {fileID: 1232423745} + m_Layer: 0 + m_Name: EarthCore + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1232423737 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1232423736} + 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} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &1232423738 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1232423736} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 0.16749653, y: 0.16336748, z: 0.15683585} + m_Center: {x: 0.0008220735, y: 0.0052850842, z: -0.024257582} +--- !u!82 &1232423739 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1232423736} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} + m_audioClip: {fileID: 0} + m_PlayOnAwake: 1 + m_Volume: 1 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 1 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 +--- !u!114 &1232423740 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1232423736} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d9ad66e7cc9a2754d8ea989740c9f00d, type: 3} + m_Name: + m_EditorClassIdentifier: + m_InteractionManager: {fileID: 0} + m_Colliders: [] + m_InteractionLayers: + m_Bits: 1 + m_DistanceCalculationMode: 1 + m_SelectMode: 1 + m_FocusMode: 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: [] + m_LastHoverExited: + m_PersistentCalls: + m_Calls: [] + m_HoverEntered: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1823018506} + m_TargetAssemblyTypeName: UnityEngine.Behaviour, UnityEngine + m_MethodName: set_enabled + m_Mode: 6 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 1 + m_CallState: 2 + m_HoverExited: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1823018506} + m_TargetAssemblyTypeName: UnityEngine.Behaviour, UnityEngine + m_MethodName: set_enabled + m_Mode: 6 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_FirstSelectEntered: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1232423739} + m_TargetAssemblyTypeName: UnityEngine.AudioSource, UnityEngine + m_MethodName: PlayOneShot + m_Mode: 2 + m_Arguments: + m_ObjectArgument: {fileID: 8300000, guid: 29437a55b95f2eb489a5ec8574f185e9, type: 3} + m_ObjectArgumentAssemblyTypeName: UnityEngine.AudioClip, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_LastSelectExited: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1232423739} + m_TargetAssemblyTypeName: UnityEngine.AudioSource, UnityEngine + m_MethodName: PlayOneShot + m_Mode: 2 + m_Arguments: + m_ObjectArgument: {fileID: 8300000, guid: 9f512430eba32d845aab8de9ba5e393c, type: 3} + m_ObjectArgumentAssemblyTypeName: UnityEngine.AudioClip, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_SelectEntered: + m_PersistentCalls: + m_Calls: [] + m_SelectExited: + m_PersistentCalls: + m_Calls: [] + m_FirstFocusEntered: + m_PersistentCalls: + m_Calls: [] + m_LastFocusExited: + m_PersistentCalls: + m_Calls: [] + m_FocusEntered: + m_PersistentCalls: + m_Calls: [] + m_FocusExited: + m_PersistentCalls: + m_Calls: [] + m_Activated: + m_PersistentCalls: + m_Calls: [] + m_Deactivated: + m_PersistentCalls: + m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] + isGazePinchSelected: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1232423739} + m_TargetAssemblyTypeName: UnityEngine.AudioSource, UnityEngine + m_MethodName: PlayOneShot + m_Mode: 2 + m_Arguments: + m_ObjectArgument: {fileID: 8300000, guid: 29437a55b95f2eb489a5ec8574f185e9, type: 3} + m_ObjectArgumentAssemblyTypeName: UnityEngine.AudioClip, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + onExited: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1232423739} + m_TargetAssemblyTypeName: UnityEngine.AudioSource, UnityEngine + m_MethodName: PlayOneShot + m_Mode: 2 + m_Arguments: + m_ObjectArgument: {fileID: 8300000, guid: 9f512430eba32d845aab8de9ba5e393c, type: 3} + m_ObjectArgumentAssemblyTypeName: UnityEngine.AudioClip, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + isRaySelected: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1232423739} + m_TargetAssemblyTypeName: UnityEngine.AudioSource, UnityEngine + m_MethodName: PlayOneShot + m_Mode: 2 + m_Arguments: + m_ObjectArgument: {fileID: 8300000, guid: 29437a55b95f2eb489a5ec8574f185e9, type: 3} + m_ObjectArgumentAssemblyTypeName: UnityEngine.AudioClip, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + onExited: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1232423739} + m_TargetAssemblyTypeName: UnityEngine.AudioSource, UnityEngine + m_MethodName: PlayOneShot + m_Mode: 2 + m_Arguments: + m_ObjectArgument: {fileID: 8300000, guid: 9f512430eba32d845aab8de9ba5e393c, type: 3} + m_ObjectArgumentAssemblyTypeName: UnityEngine.AudioClip, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + isPokeSelected: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isGrabSelected: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isGazeHovered: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isGazePinchHovered: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isRayHovered: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isGrabHovered: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isPokeHovered: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isActiveHovered: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + disabledInteractorTypes: + - reference: MixedReality.Toolkit.IPokeInteractor, MixedReality.Toolkit.Core + k__BackingField: 0 + k__BackingField: 0.9 + k__BackingField: 0.1 + k__BackingField: 1 + k__BackingField: 0 + k__BackingField: 1 + k__BackingField: 0 + k__BackingField: 1 + allowSelectByVoice: 1 + speechRecognitionKeyword: select + k__BackingField: 1 + k__BackingField: 0 + k__BackingField: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + k__BackingField: + m_PersistentCalls: + m_Calls: [] + k__BackingField: + m_PersistentCalls: + m_Calls: [] + k__BackingField: + m_PersistentCalls: + m_Calls: [] + hostTransform: {fileID: 1232423737} + allowedManipulations: 7 + allowedInteractionTypes: -2147483641 + rigidbodyMovementType: 0 + applyTorque: 1 + springForceSoftness: 0.1 + springTorqueSoftness: 0.1 + springDamping: 1 + springForceLimit: 100 + rotationAnchorNear: 1 + rotationAnchorFar: 1 + releaseBehavior: 3 + transformSmoothingLogicType: + reference: MixedReality.Toolkit.SpatialManipulation.DefaultTransformSmoothingLogic, + MixedReality.Toolkit.SpatialManipulation + smoothingFar: 1 + smoothingNear: 1 + moveLerpTime: 0.001 + rotateLerpTime: 0.001 + scaleLerpTime: 0.001 + enableConstraints: 1 + constraintsManager: {fileID: 1232423741} + manipulationLogicTypes: + moveLogicType: + reference: MixedReality.Toolkit.SpatialManipulation.MoveLogic, MixedReality.Toolkit.SpatialManipulation + rotateLogicType: + reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, MixedReality.Toolkit.SpatialManipulation + scaleLogicType: + reference: MixedReality.Toolkit.SpatialManipulation.ScaleLogic, MixedReality.Toolkit.SpatialManipulation +--- !u!114 &1232423741 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1232423736} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 50cdab0cd5a0916419324bb54314773d, type: 3} + m_Name: + m_EditorClassIdentifier: + autoConstraintSelection: 1 + selectedConstraints: [] +--- !u!114 &1232423742 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1232423736} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3a1bf44e2291e8741ab3dec75055d9db, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 0 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 0} + movableAxes: 0 + onMoveDelta: 0.01 +--- !u!114 &1232423743 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1232423736} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 02df0dfd31465cf42bd60027ac90b874, type: 3} + m_Name: + m_EditorClassIdentifier: + stateContainers: + entries: + - key: Disabled + value: + effects: [] + isVariable: 0 + - key: PassiveHover + value: + effects: + - rid: 0 + isVariable: 0 + - key: ActiveHover + value: + effects: + - rid: 1 + isVariable: 0 + - key: Select + value: + effects: + - rid: 2 + isVariable: 1 + - key: Toggle + value: + effects: [] + isVariable: 0 + interactable: {fileID: 1232423740} + animator: {fileID: 1232423744} + references: + version: 2 + RefIds: + - rid: 0 + type: {class: AnimationEffect, ns: MixedReality.Toolkit.UX, asm: MixedReality.Toolkit.UXCore} + data: + name: Animation + clip: {fileID: 7400000, guid: 093b2401940cf8644b996677ae059793, type: 2} + speed: 1 + playbackMode: 0 + weightMode: 0 + transitionDuration: 0 + - rid: 1 + type: {class: AnimationEffect, ns: MixedReality.Toolkit.UX, asm: MixedReality.Toolkit.UXCore} + data: + name: Animation + clip: {fileID: 7400000, guid: a415c269559729447ae831d7f14c533e, type: 2} + speed: 1 + playbackMode: 0 + weightMode: 0 + transitionDuration: 0 + - rid: 2 + type: {class: AnimationEffect, ns: MixedReality.Toolkit.UX, asm: MixedReality.Toolkit.UXCore} + data: + name: Animation + clip: {fileID: 7400000, guid: 2512ea21f2da7c648bf6864e8b0f8de7, type: 2} + speed: 1 + playbackMode: 1 + weightMode: 0 + transitionDuration: 0 +--- !u!95 &1232423744 +Animator: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1232423736} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 0} + m_CullingMode: 0 + 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 +--- !u!114 &1232423745 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1232423736} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 80f85af46f9bddd4ea78f11cee5e3b2e, type: 3} + m_Name: + m_EditorClassIdentifier: + handType: 3 + proximityType: 3 + executionOrder: 0 + minimumScale: {x: 0.2, y: 0.2, z: 0.2} + maximumScale: {x: 2, y: 2, z: 2} + relativeToInitialState: 1 +--- !u!1 &1256458037 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3482465368609989420, guid: 8beb1e0a00bf1eb42921a53ffb52bdeb, type: 3} + m_PrefabInstance: {fileID: 831445127} + m_PrefabAsset: {fileID: 0} +--- !u!82 &1256458038 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1256458037} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} + m_audioClip: {fileID: 0} + m_PlayOnAwake: 1 + m_Volume: 1 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 1 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 +--- !u!114 &1256458039 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1256458037} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2dd6a517ee866ae45ae8fac60a8d0547, type: 3} + m_Name: + m_EditorClassIdentifier: + m_InteractionManager: {fileID: 0} + m_Colliders: [] + m_InteractionLayers: + m_Bits: 1 + m_DistanceCalculationMode: 1 + m_SelectMode: 0 + m_FocusMode: 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: [] + m_LastHoverExited: + m_PersistentCalls: + m_Calls: [] + m_HoverEntered: + m_PersistentCalls: + m_Calls: [] + m_HoverExited: + m_PersistentCalls: + m_Calls: [] + m_FirstSelectEntered: + m_PersistentCalls: + m_Calls: [] + m_LastSelectExited: + m_PersistentCalls: + m_Calls: [] + m_SelectEntered: + m_PersistentCalls: + m_Calls: [] + m_SelectExited: + m_PersistentCalls: + m_Calls: [] + m_FirstFocusEntered: + m_PersistentCalls: + m_Calls: [] + m_LastFocusExited: + m_PersistentCalls: + m_Calls: [] + m_FocusEntered: + m_PersistentCalls: + m_Calls: [] + m_FocusExited: + m_PersistentCalls: + m_Calls: [] + m_Activated: + m_PersistentCalls: + m_Calls: [] + m_Deactivated: + m_PersistentCalls: + m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] + isGazePinchSelected: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isRaySelected: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isPokeSelected: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isGrabSelected: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isGazeHovered: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isGazePinchHovered: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isRayHovered: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isGrabHovered: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isPokeHovered: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1256458038} + m_TargetAssemblyTypeName: UnityEngine.AudioSource, UnityEngine + m_MethodName: PlayOneShot + m_Mode: 2 + m_Arguments: + m_ObjectArgument: {fileID: 8300000, guid: c6586241cbe52ba44b40351d74c9dc39, type: 3} + m_ObjectArgumentAssemblyTypeName: UnityEngine.AudioClip, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + onExited: + m_PersistentCalls: + m_Calls: [] + isActiveHovered: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + disabledInteractorTypes: [] + k__BackingField: 0 + k__BackingField: 0.9 + k__BackingField: 0.1 + k__BackingField: 1 + k__BackingField: 0 + k__BackingField: 1 + k__BackingField: 0 + k__BackingField: 1 + allowSelectByVoice: 1 + speechRecognitionKeyword: select + k__BackingField: 1 + k__BackingField: 0 + k__BackingField: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + k__BackingField: + m_PersistentCalls: + m_Calls: [] + k__BackingField: + m_PersistentCalls: + m_Calls: [] + k__BackingField: + m_PersistentCalls: + m_Calls: [] +--- !u!1001 &1270236524 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1404428861} + m_Modifications: + - target: {fileID: 1963561307345040800, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} + propertyPath: m_Name + value: BasicPressableButton (1) + objectReference: {fileID: 0} + - target: {fileID: 1963561307345040802, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} + propertyPath: OnClicked.m_PersistentCalls.m_Calls.Array.size + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 1963561307345040802, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} + propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1963561307345040802, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} + propertyPath: m_LastSelectExited.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1963561307345040802, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} + propertyPath: OnClicked.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 1963561307345040802, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} + propertyPath: OnClicked.m_PersistentCalls.m_Calls.Array.data[1].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1963561307345040802, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} + propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1963561307345040802, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} + propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[1].m_Mode + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 1963561307345040802, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} + propertyPath: m_FirstSelectEntered.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1963561307345040802, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} + propertyPath: OnClicked.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 0} + - target: {fileID: 1963561307345040802, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} + propertyPath: OnClicked.m_PersistentCalls.m_Calls.Array.data[1].m_Target + value: + objectReference: {fileID: 884765058} + - target: {fileID: 1963561307345040802, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} + propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 884765058} + - target: {fileID: 1963561307345040802, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} + propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[1].m_Target + value: + objectReference: {fileID: 1270236527} + - target: {fileID: 1963561307345040802, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} + propertyPath: OnClicked.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 1963561307345040802, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} + propertyPath: OnClicked.m_PersistentCalls.m_Calls.Array.data[1].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 1963561307345040802, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} + propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 1963561307345040802, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} + propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[1].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 1963561307345040802, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} + propertyPath: OnClicked.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: Play + objectReference: {fileID: 0} + - target: {fileID: 1963561307345040802, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} + propertyPath: OnClicked.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName + value: Increment + objectReference: {fileID: 0} + - target: {fileID: 1963561307345040802, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} + propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: Increment + objectReference: {fileID: 0} + - target: {fileID: 1963561307345040802, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} + propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName + value: PlayOneShot + objectReference: {fileID: 0} + - target: {fileID: 1963561307345040802, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} + propertyPath: m_LastSelectExited.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 1963561307345040802, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} + propertyPath: m_FirstSelectEntered.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 1963561307345040802, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} + propertyPath: m_LastSelectExited.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 1270236527} + - target: {fileID: 1963561307345040802, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} + propertyPath: m_FirstSelectEntered.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 1270236527} + - target: {fileID: 1963561307345040802, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} + propertyPath: m_LastSelectExited.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 1963561307345040802, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} + propertyPath: m_LastSelectExited.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: PlayOneShot + objectReference: {fileID: 0} + - target: {fileID: 1963561307345040802, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} + propertyPath: m_FirstSelectEntered.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 1963561307345040802, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} + propertyPath: m_FirstSelectEntered.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: PlayOneShot + objectReference: {fileID: 0} + - target: {fileID: 1963561307345040802, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} + propertyPath: OnClicked.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: UnityEngine.ParticleSystem, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 1963561307345040802, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} + propertyPath: OnClicked.m_PersistentCalls.m_Calls.Array.data[1].m_TargetAssemblyTypeName + value: MixedReality.Toolkit.Examples.Demos.ColorChanger, Assembly-CSharp + objectReference: {fileID: 0} + - target: {fileID: 1963561307345040802, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} + propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: MixedReality.Toolkit.Examples.Demos.ColorChanger, Assembly-CSharp + objectReference: {fileID: 0} + - target: {fileID: 1963561307345040802, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} + propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[1].m_TargetAssemblyTypeName + value: UnityEngine.AudioSource, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 1963561307345040802, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} + propertyPath: OnClicked.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_BoolArgument + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1963561307345040802, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} + propertyPath: OnClicked.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_BoolArgument + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1963561307345040802, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} + propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_BoolArgument + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1963561307345040802, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} + propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_BoolArgument + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1963561307345040802, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} + propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_ObjectArgument + value: + objectReference: {fileID: 8300000, guid: 3e4887b6014c9e04290e816ac261a414, type: 3} + - target: {fileID: 1963561307345040802, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} + propertyPath: m_LastSelectExited.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: UnityEngine.AudioSource, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 1963561307345040802, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} + propertyPath: m_FirstSelectEntered.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: UnityEngine.AudioSource, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 1963561307345040802, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} + propertyPath: m_LastSelectExited.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgument + value: + objectReference: {fileID: 8300000, guid: f2b39c1fa02395640bced3c8e5f9696e, type: 3} + - target: {fileID: 1963561307345040802, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} + propertyPath: m_FirstSelectEntered.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgument + value: + objectReference: {fileID: 8300000, guid: 3e4887b6014c9e04290e816ac261a414, type: 3} + - target: {fileID: 1963561307345040802, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} + propertyPath: OnClicked.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 1963561307345040802, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} + propertyPath: OnClicked.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 1963561307345040802, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} + propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 1963561307345040802, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} + propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.AudioClip, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 1963561307345040802, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} + propertyPath: m_LastSelectExited.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.AudioClip, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 1963561307345040802, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} + propertyPath: m_FirstSelectEntered.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.AudioClip, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 1963561307345040812, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} + propertyPath: m_RootOrder + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 1963561307345040812, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} + propertyPath: m_LocalPosition.x + value: -0.1657 + objectReference: {fileID: 0} + - target: {fileID: 1963561307345040812, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} + propertyPath: m_LocalPosition.y + value: -0.6999 + objectReference: {fileID: 0} + - target: {fileID: 1963561307345040812, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} + propertyPath: m_LocalPosition.z + value: -0.03460002 + objectReference: {fileID: 0} + - target: {fileID: 1963561307345040812, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} + propertyPath: m_LocalRotation.w + value: 0.92387956 + objectReference: {fileID: 0} + - target: {fileID: 1963561307345040812, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} + propertyPath: m_LocalRotation.x + value: 0.38268343 + objectReference: {fileID: 0} + - target: {fileID: 1963561307345040812, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1963561307345040812, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1963561307345040812, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 45 + objectReference: {fileID: 0} + - target: {fileID: 1963561307345040812, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1963561307345040812, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1963561309274324397, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 0c3570eeff29ef44e9fed596a4cc3ffd, type: 2} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} +--- !u!4 &1270236525 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1963561307345040812, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} + m_PrefabInstance: {fileID: 1270236524} + m_PrefabAsset: {fileID: 0} +--- !u!1 &1270236526 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1963561307345040800, guid: 05b6a9dff71e6224982f4d56166f710f, type: 3} + m_PrefabInstance: {fileID: 1270236524} + m_PrefabAsset: {fileID: 0} +--- !u!82 &1270236527 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1270236526} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} + m_audioClip: {fileID: 0} + m_PlayOnAwake: 1 + m_Volume: 1 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 1 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 +--- !u!1001 &1294530691 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1727403011} + m_Modifications: + - target: {fileID: 100018, guid: f9a8072f5d9b92347a999f10f01b8012, type: 3} + propertyPath: m_Name + value: Lander + objectReference: {fileID: 0} + - target: {fileID: 400018, guid: f9a8072f5d9b92347a999f10f01b8012, type: 3} + propertyPath: m_RootOrder + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 400018, guid: f9a8072f5d9b92347a999f10f01b8012, type: 3} + propertyPath: m_LocalScale.x + value: 0.24477057 + objectReference: {fileID: 0} + - target: {fileID: 400018, guid: f9a8072f5d9b92347a999f10f01b8012, type: 3} + propertyPath: m_LocalScale.y + value: 0.24477054 + objectReference: {fileID: 0} + - target: {fileID: 400018, guid: f9a8072f5d9b92347a999f10f01b8012, type: 3} + propertyPath: m_LocalScale.z + value: 0.24477057 + objectReference: {fileID: 0} + - target: {fileID: 400018, guid: f9a8072f5d9b92347a999f10f01b8012, type: 3} + propertyPath: m_LocalPosition.x + value: 1.143 + objectReference: {fileID: 0} + - target: {fileID: 400018, guid: f9a8072f5d9b92347a999f10f01b8012, type: 3} + propertyPath: m_LocalPosition.y + value: -0.5546 + objectReference: {fileID: 0} + - target: {fileID: 400018, guid: f9a8072f5d9b92347a999f10f01b8012, type: 3} + propertyPath: m_LocalPosition.z + value: 0.453 + objectReference: {fileID: 0} + - target: {fileID: 400018, guid: f9a8072f5d9b92347a999f10f01b8012, type: 3} + propertyPath: m_LocalRotation.w + value: 0.9238796 + objectReference: {fileID: 0} + - target: {fileID: 400018, guid: f9a8072f5d9b92347a999f10f01b8012, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 400018, guid: f9a8072f5d9b92347a999f10f01b8012, type: 3} + propertyPath: m_LocalRotation.y + value: 0.38268337 + objectReference: {fileID: 0} + - target: {fileID: 400018, guid: f9a8072f5d9b92347a999f10f01b8012, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 400018, guid: f9a8072f5d9b92347a999f10f01b8012, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400018, guid: f9a8072f5d9b92347a999f10f01b8012, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 45 + objectReference: {fileID: 0} + - target: {fileID: 400018, guid: f9a8072f5d9b92347a999f10f01b8012, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6400000, guid: f9a8072f5d9b92347a999f10f01b8012, type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6400002, guid: f9a8072f5d9b92347a999f10f01b8012, type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6400004, guid: f9a8072f5d9b92347a999f10f01b8012, type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6400006, guid: f9a8072f5d9b92347a999f10f01b8012, type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6400008, guid: f9a8072f5d9b92347a999f10f01b8012, type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6400010, guid: f9a8072f5d9b92347a999f10f01b8012, type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6400012, guid: f9a8072f5d9b92347a999f10f01b8012, type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6400014, guid: f9a8072f5d9b92347a999f10f01b8012, type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6400016, guid: f9a8072f5d9b92347a999f10f01b8012, type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6400018, guid: f9a8072f5d9b92347a999f10f01b8012, type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6400020, guid: f9a8072f5d9b92347a999f10f01b8012, type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6400022, guid: f9a8072f5d9b92347a999f10f01b8012, type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: f9a8072f5d9b92347a999f10f01b8012, type: 3} +--- !u!4 &1294530692 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 400018, guid: f9a8072f5d9b92347a999f10f01b8012, type: 3} + m_PrefabInstance: {fileID: 1294530691} + m_PrefabAsset: {fileID: 0} +--- !u!1 &1294530693 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 100018, guid: f9a8072f5d9b92347a999f10f01b8012, type: 3} + m_PrefabInstance: {fileID: 1294530691} + m_PrefabAsset: {fileID: 0} +--- !u!54 &1294530694 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1294530693} + serializedVersion: 2 + m_Mass: 0.1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 1 + m_IsKinematic: 0 + m_Interpolate: 1 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!114 &1294530696 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1294530693} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d9ad66e7cc9a2754d8ea989740c9f00d, type: 3} + m_Name: + m_EditorClassIdentifier: + m_InteractionManager: {fileID: 0} + m_Colliders: [] + m_InteractionLayers: + m_Bits: 1 + m_DistanceCalculationMode: 1 + m_SelectMode: 1 + m_FocusMode: 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: [] + m_LastHoverExited: + m_PersistentCalls: + m_Calls: [] + m_HoverEntered: + m_PersistentCalls: + m_Calls: [] + m_HoverExited: + m_PersistentCalls: + m_Calls: [] + m_FirstSelectEntered: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1294530698} + m_TargetAssemblyTypeName: UnityEngine.AudioSource, UnityEngine + m_MethodName: PlayOneShot + m_Mode: 2 + m_Arguments: + m_ObjectArgument: {fileID: 8300000, guid: 29437a55b95f2eb489a5ec8574f185e9, type: 3} + m_ObjectArgumentAssemblyTypeName: UnityEngine.AudioClip, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_LastSelectExited: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1294530698} + m_TargetAssemblyTypeName: UnityEngine.AudioSource, UnityEngine + m_MethodName: PlayOneShot + m_Mode: 2 + m_Arguments: + m_ObjectArgument: {fileID: 8300000, guid: 9f512430eba32d845aab8de9ba5e393c, type: 3} + m_ObjectArgumentAssemblyTypeName: UnityEngine.AudioClip, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_SelectEntered: + m_PersistentCalls: + m_Calls: [] + m_SelectExited: + m_PersistentCalls: + m_Calls: [] + m_FirstFocusEntered: + m_PersistentCalls: + m_Calls: [] + m_LastFocusExited: + m_PersistentCalls: + m_Calls: [] + m_FocusEntered: + m_PersistentCalls: + m_Calls: [] + m_FocusExited: + m_PersistentCalls: + m_Calls: [] + m_Activated: + m_PersistentCalls: + m_Calls: [] + m_Deactivated: + m_PersistentCalls: + m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] + isGazePinchSelected: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isRaySelected: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isPokeSelected: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isGrabSelected: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isGazeHovered: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isGazePinchHovered: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isRayHovered: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isGrabHovered: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isPokeHovered: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isActiveHovered: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + disabledInteractorTypes: + - reference: MixedReality.Toolkit.IPokeInteractor, MixedReality.Toolkit.Core + k__BackingField: 0 + k__BackingField: 0.9 + k__BackingField: 0.1 + k__BackingField: 1 + k__BackingField: 0 + k__BackingField: 1 + k__BackingField: 0 + k__BackingField: 1 + allowSelectByVoice: 1 + speechRecognitionKeyword: select + k__BackingField: 1 + k__BackingField: 0 + k__BackingField: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + k__BackingField: + m_PersistentCalls: + m_Calls: [] + k__BackingField: + m_PersistentCalls: + m_Calls: [] + k__BackingField: + m_PersistentCalls: + m_Calls: [] + hostTransform: {fileID: 1294530692} + allowedManipulations: 7 + allowedInteractionTypes: -2147483641 + rigidbodyMovementType: 0 + applyTorque: 1 + springForceSoftness: 0.1 + springTorqueSoftness: 0.1 + springDamping: 1 + springForceLimit: 100 + rotationAnchorNear: 1 + rotationAnchorFar: 1 + releaseBehavior: 3 + transformSmoothingLogicType: + reference: MixedReality.Toolkit.SpatialManipulation.DefaultTransformSmoothingLogic, + MixedReality.Toolkit.SpatialManipulation + smoothingFar: 1 + smoothingNear: 1 + moveLerpTime: 0.001 + rotateLerpTime: 0.001 + scaleLerpTime: 0.001 + enableConstraints: 1 + constraintsManager: {fileID: 0} + manipulationLogicTypes: + moveLogicType: + reference: MixedReality.Toolkit.SpatialManipulation.MoveLogic, MixedReality.Toolkit.SpatialManipulation + rotateLogicType: + reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, MixedReality.Toolkit.SpatialManipulation + scaleLogicType: + reference: MixedReality.Toolkit.SpatialManipulation.ScaleLogic, MixedReality.Toolkit.SpatialManipulation +--- !u!114 &1294530697 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1294530693} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 50cdab0cd5a0916419324bb54314773d, type: 3} + m_Name: + m_EditorClassIdentifier: + autoConstraintSelection: 1 + selectedConstraints: [] +--- !u!82 &1294530698 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1294530693} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} + m_audioClip: {fileID: 0} + m_PlayOnAwake: 1 + m_Volume: 1 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 1 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 +--- !u!114 &1294530699 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1294530693} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe9323ca265114b4282b5d33b41f7adc, type: 3} + m_Name: + m_EditorClassIdentifier: + distanceThreshold: 20 +--- !u!114 &1294530700 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1294530693} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3a1bf44e2291e8741ab3dec75055d9db, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 0 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 0} + movableAxes: 0 + onMoveDelta: 0.01 +--- !u!114 &1294530701 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1294530693} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 80f85af46f9bddd4ea78f11cee5e3b2e, type: 3} + m_Name: + m_EditorClassIdentifier: + handType: 3 + proximityType: 3 + executionOrder: 0 + minimumScale: {x: 0.2, y: 0.2, z: 0.2} + maximumScale: {x: 2, y: 2, z: 2} + relativeToInitialState: 1 +--- !u!1 &1346790086 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 7781529056550460866, guid: c07c4bd04b45c014fad0e3cd30747f06, type: 3} + m_PrefabInstance: {fileID: 771189643} + m_PrefabAsset: {fileID: 0} +--- !u!82 &1351537950 stripped +AudioSource: + m_CorrespondingSourceObject: {fileID: 155148266066309764, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + m_PrefabInstance: {fileID: 364946991195464072} + m_PrefabAsset: {fileID: 0} +--- !u!1 &1357057977 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1357057978} + - component: {fileID: 1357057985} + - component: {fileID: 1357057984} + - component: {fileID: 1357057983} + - component: {fileID: 1357057982} + - component: {fileID: 1357057981} + - component: {fileID: 1357057980} + - component: {fileID: 1357057979} + - component: {fileID: 1357057986} + - component: {fileID: 1357057987} + - component: {fileID: 1357057988} + m_Layer: 0 + m_Name: Cube0 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1357057978 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1357057977} + 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 + m_LocalEulerAnglesHint: {x: 0, y: -29.743002, z: 0} +--- !u!114 &1357057979 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1357057977} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d9ad66e7cc9a2754d8ea989740c9f00d, type: 3} + m_Name: + m_EditorClassIdentifier: + m_InteractionManager: {fileID: 0} + m_Colliders: [] + m_InteractionLayers: + m_Bits: 1 + m_DistanceCalculationMode: 1 + m_SelectMode: 1 + m_FocusMode: 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: [] + m_LastHoverExited: + m_PersistentCalls: + m_Calls: [] + m_HoverEntered: + m_PersistentCalls: + m_Calls: [] + m_HoverExited: + m_PersistentCalls: + m_Calls: [] + m_FirstSelectEntered: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1357057981} + m_TargetAssemblyTypeName: UnityEngine.AudioSource, UnityEngine + m_MethodName: PlayOneShot + m_Mode: 2 + m_Arguments: + m_ObjectArgument: {fileID: 8300000, guid: 29437a55b95f2eb489a5ec8574f185e9, type: 3} + m_ObjectArgumentAssemblyTypeName: UnityEngine.AudioClip, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - m_Target: {fileID: 1357057984} + m_TargetAssemblyTypeName: UnityEngine.Renderer, UnityEngine + m_MethodName: set_sharedMaterial + m_Mode: 2 + m_Arguments: + m_ObjectArgument: {fileID: 2100000, guid: b58412850b0e285438390ed39ffa2be3, type: 2} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Material, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_LastSelectExited: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1357057981} + m_TargetAssemblyTypeName: UnityEngine.AudioSource, UnityEngine + m_MethodName: PlayOneShot + m_Mode: 2 + m_Arguments: + m_ObjectArgument: {fileID: 8300000, guid: 9f512430eba32d845aab8de9ba5e393c, type: 3} + m_ObjectArgumentAssemblyTypeName: UnityEngine.AudioClip, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - m_Target: {fileID: 1357057984} + m_TargetAssemblyTypeName: UnityEngine.Renderer, UnityEngine + m_MethodName: set_sharedMaterial + m_Mode: 2 + m_Arguments: + m_ObjectArgument: {fileID: 2100000, guid: ecf898134fc873c48b1263a093f12178, type: 2} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Material, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_SelectEntered: + m_PersistentCalls: + m_Calls: [] + m_SelectExited: + m_PersistentCalls: + m_Calls: [] + m_FirstFocusEntered: + m_PersistentCalls: + m_Calls: [] + m_LastFocusExited: + m_PersistentCalls: + m_Calls: [] + m_FocusEntered: + m_PersistentCalls: + m_Calls: [] + m_FocusExited: + m_PersistentCalls: + m_Calls: [] + m_Activated: + m_PersistentCalls: + m_Calls: [] + m_Deactivated: + m_PersistentCalls: + m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] + isGazePinchSelected: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1357057981} + m_TargetAssemblyTypeName: UnityEngine.AudioSource, UnityEngine + m_MethodName: PlayOneShot + m_Mode: 2 + m_Arguments: + m_ObjectArgument: {fileID: 8300000, guid: 29437a55b95f2eb489a5ec8574f185e9, type: 3} + m_ObjectArgumentAssemblyTypeName: UnityEngine.AudioClip, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - m_Target: {fileID: 1357057984} + m_TargetAssemblyTypeName: UnityEngine.Renderer, UnityEngine + m_MethodName: set_sharedMaterial + m_Mode: 2 + m_Arguments: + m_ObjectArgument: {fileID: 2100000, guid: 1e1949131aa56c54396b361b35a942e6, type: 2} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Material, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + onExited: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1357057981} + m_TargetAssemblyTypeName: UnityEngine.AudioSource, UnityEngine + m_MethodName: PlayOneShot + m_Mode: 2 + m_Arguments: + m_ObjectArgument: {fileID: 8300000, guid: 9f512430eba32d845aab8de9ba5e393c, type: 3} + m_ObjectArgumentAssemblyTypeName: UnityEngine.AudioClip, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - m_Target: {fileID: 1357057984} + m_TargetAssemblyTypeName: UnityEngine.Renderer, UnityEngine + m_MethodName: set_sharedMaterial + m_Mode: 2 + m_Arguments: + m_ObjectArgument: {fileID: 2100000, guid: b1ac50d5d67970a49a49c29519977b61, type: 2} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Material, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + isRaySelected: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1357057981} + m_TargetAssemblyTypeName: UnityEngine.AudioSource, UnityEngine + m_MethodName: PlayOneShot + m_Mode: 2 + m_Arguments: + m_ObjectArgument: {fileID: 8300000, guid: 29437a55b95f2eb489a5ec8574f185e9, type: 3} + m_ObjectArgumentAssemblyTypeName: UnityEngine.AudioClip, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - m_Target: {fileID: 1357057984} + m_TargetAssemblyTypeName: UnityEngine.Renderer, UnityEngine + m_MethodName: set_sharedMaterial + m_Mode: 2 + m_Arguments: + m_ObjectArgument: {fileID: 2100000, guid: 1e1949131aa56c54396b361b35a942e6, type: 2} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Material, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + onExited: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1357057981} + m_TargetAssemblyTypeName: UnityEngine.AudioSource, UnityEngine + m_MethodName: PlayOneShot + m_Mode: 2 + m_Arguments: + m_ObjectArgument: {fileID: 8300000, guid: 9f512430eba32d845aab8de9ba5e393c, type: 3} + m_ObjectArgumentAssemblyTypeName: UnityEngine.AudioClip, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - m_Target: {fileID: 1357057984} + m_TargetAssemblyTypeName: UnityEngine.Renderer, UnityEngine + m_MethodName: set_sharedMaterial + m_Mode: 2 + m_Arguments: + m_ObjectArgument: {fileID: 2100000, guid: b1ac50d5d67970a49a49c29519977b61, type: 2} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Material, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + isPokeSelected: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isGrabSelected: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isGazeHovered: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isGazePinchHovered: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isRayHovered: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isGrabHovered: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isPokeHovered: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isActiveHovered: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + disabledInteractorTypes: + - reference: MixedReality.Toolkit.IPokeInteractor, MixedReality.Toolkit.Core + k__BackingField: 0 + k__BackingField: 0.9 + k__BackingField: 0.1 + k__BackingField: 1 + k__BackingField: 0 + k__BackingField: 1 + k__BackingField: 0 + k__BackingField: 1 + allowSelectByVoice: 1 + speechRecognitionKeyword: select + k__BackingField: 1 + k__BackingField: 0 + k__BackingField: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + k__BackingField: + m_PersistentCalls: + m_Calls: [] + k__BackingField: + m_PersistentCalls: + m_Calls: [] + k__BackingField: + m_PersistentCalls: + m_Calls: [] + hostTransform: {fileID: 1357057978} + allowedManipulations: 7 + allowedInteractionTypes: -2147483641 + rigidbodyMovementType: 0 + applyTorque: 1 + springForceSoftness: 0.1 + springTorqueSoftness: 0.1 + springDamping: 1 + springForceLimit: 100 + rotationAnchorNear: 1 + rotationAnchorFar: 1 + releaseBehavior: 3 + transformSmoothingLogicType: + reference: MixedReality.Toolkit.SpatialManipulation.DefaultTransformSmoothingLogic, + MixedReality.Toolkit.SpatialManipulation + smoothingFar: 0 + smoothingNear: 0 + moveLerpTime: 0.001 + rotateLerpTime: 0.001 + scaleLerpTime: 0.001 + enableConstraints: 1 + constraintsManager: {fileID: 1357057980} + manipulationLogicTypes: + moveLogicType: + reference: MixedReality.Toolkit.SpatialManipulation.MoveLogic, MixedReality.Toolkit.SpatialManipulation + rotateLogicType: + reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, MixedReality.Toolkit.SpatialManipulation + scaleLogicType: + reference: MixedReality.Toolkit.SpatialManipulation.ScaleLogic, MixedReality.Toolkit.SpatialManipulation +--- !u!114 &1357057980 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1357057977} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 50cdab0cd5a0916419324bb54314773d, type: 3} + m_Name: + m_EditorClassIdentifier: + autoConstraintSelection: 1 + selectedConstraints: [] +--- !u!82 &1357057981 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1357057977} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} + m_audioClip: {fileID: 0} + m_PlayOnAwake: 1 + m_Volume: 1 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 1 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 +--- !u!54 &1357057982 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1357057977} + serializedVersion: 2 + m_Mass: 0.1 + m_Drag: 1 + m_AngularDrag: 1 + m_UseGravity: 1 + m_IsKinematic: 0 + m_Interpolate: 1 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!65 &1357057983 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1357057977} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!23 &1357057984 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1357057977} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 4294967295 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: ecf898134fc873c48b1263a093f12178, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &1357057985 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1357057977} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!114 &1357057986 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1357057977} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe9323ca265114b4282b5d33b41f7adc, type: 3} + m_Name: + m_EditorClassIdentifier: + distanceThreshold: 20 +--- !u!114 &1357057987 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1357057977} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3a1bf44e2291e8741ab3dec75055d9db, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 0 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 0} + movableAxes: 0 + onMoveDelta: 0.01 +--- !u!114 &1357057988 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1357057977} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 80f85af46f9bddd4ea78f11cee5e3b2e, type: 3} + m_Name: + m_EditorClassIdentifier: + handType: 3 + proximityType: 3 + executionOrder: 0 + minimumScale: {x: 0.2, y: 0.2, z: 0.2} + maximumScale: {x: 2, y: 2, z: 2} + relativeToInitialState: 1 +--- !u!1 &1357577557 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1357577558} + - component: {fileID: 1357577560} + - component: {fileID: 1357577559} + m_Layer: 0 + m_Name: SectionTitle (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1357577558 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1357577557} + 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 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -0.1504, y: -0.82} + m_SizeDelta: {x: 22.4515, y: 5} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1357577559 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1357577557} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9541d86e2fd84c1d9990edf0852d74ab, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: These examples share the same logic and interaction details. The visual + and states are completely separated. + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 533bdd8d5c92b52448ee2ecf7bd828a4, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: b082f80c6b45164418a354f7e116f0a3, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 8 + m_fontSizeBase: 8 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 0 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + 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 +--- !u!23 &1357577560 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1357577557} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: b082f80c6b45164418a354f7e116f0a3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!1 &1357838088 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1357838089} + - component: {fileID: 1357838096} + - component: {fileID: 1357838095} + - component: {fileID: 1357838094} + - component: {fileID: 1357838093} + - component: {fileID: 1357838092} + - component: {fileID: 1357838091} + - component: {fileID: 1357838090} + - component: {fileID: 1357838097} + - component: {fileID: 1357838098} + - component: {fileID: 1357838099} + m_Layer: 0 + m_Name: Cube1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1357838089 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1357838088} + 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 + m_LocalEulerAnglesHint: {x: 0, y: 3.76, z: 0} +--- !u!114 &1357838090 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1357838088} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d9ad66e7cc9a2754d8ea989740c9f00d, type: 3} + m_Name: + m_EditorClassIdentifier: + m_InteractionManager: {fileID: 0} + m_Colliders: [] + m_InteractionLayers: + m_Bits: 1 + m_DistanceCalculationMode: 1 + m_SelectMode: 1 + m_FocusMode: 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: [] + m_LastHoverExited: + m_PersistentCalls: + m_Calls: [] + m_HoverEntered: + m_PersistentCalls: + m_Calls: [] + m_HoverExited: + m_PersistentCalls: + m_Calls: [] + m_FirstSelectEntered: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1357838092} + m_TargetAssemblyTypeName: UnityEngine.AudioSource, UnityEngine + m_MethodName: PlayOneShot + m_Mode: 2 + m_Arguments: + m_ObjectArgument: {fileID: 8300000, guid: 29437a55b95f2eb489a5ec8574f185e9, type: 3} + m_ObjectArgumentAssemblyTypeName: UnityEngine.AudioClip, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - m_Target: {fileID: 1357838095} + m_TargetAssemblyTypeName: UnityEngine.Renderer, UnityEngine + m_MethodName: set_sharedMaterial + m_Mode: 2 + m_Arguments: + m_ObjectArgument: {fileID: 2100000, guid: 1e1949131aa56c54396b361b35a942e6, type: 2} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Material, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_LastSelectExited: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1357838092} + m_TargetAssemblyTypeName: UnityEngine.AudioSource, UnityEngine + m_MethodName: PlayOneShot + m_Mode: 2 + m_Arguments: + m_ObjectArgument: {fileID: 8300000, guid: 9f512430eba32d845aab8de9ba5e393c, type: 3} + m_ObjectArgumentAssemblyTypeName: UnityEngine.AudioClip, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - m_Target: {fileID: 1357838095} + m_TargetAssemblyTypeName: UnityEngine.Renderer, UnityEngine + m_MethodName: set_sharedMaterial + m_Mode: 2 + m_Arguments: + m_ObjectArgument: {fileID: 2100000, guid: 4d9634496b867de43ab769506b202b67, type: 2} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Material, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_SelectEntered: + m_PersistentCalls: + m_Calls: [] + m_SelectExited: + m_PersistentCalls: + m_Calls: [] + m_FirstFocusEntered: + m_PersistentCalls: + m_Calls: [] + m_LastFocusExited: + m_PersistentCalls: + m_Calls: [] + m_FocusEntered: + m_PersistentCalls: + m_Calls: [] + m_FocusExited: + m_PersistentCalls: + m_Calls: [] + m_Activated: + m_PersistentCalls: + m_Calls: [] + m_Deactivated: + m_PersistentCalls: + m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] + isGazePinchSelected: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1357838092} + m_TargetAssemblyTypeName: UnityEngine.AudioSource, UnityEngine + m_MethodName: PlayOneShot + m_Mode: 2 + m_Arguments: + m_ObjectArgument: {fileID: 8300000, guid: 29437a55b95f2eb489a5ec8574f185e9, type: 3} + m_ObjectArgumentAssemblyTypeName: UnityEngine.AudioClip, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - m_Target: {fileID: 1357838095} + m_TargetAssemblyTypeName: UnityEngine.Renderer, UnityEngine + m_MethodName: set_sharedMaterial + m_Mode: 2 + m_Arguments: + m_ObjectArgument: {fileID: 2100000, guid: 1e1949131aa56c54396b361b35a942e6, type: 2} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Material, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + onExited: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1357838092} + m_TargetAssemblyTypeName: UnityEngine.AudioSource, UnityEngine + m_MethodName: PlayOneShot + m_Mode: 2 + m_Arguments: + m_ObjectArgument: {fileID: 8300000, guid: 9f512430eba32d845aab8de9ba5e393c, type: 3} + m_ObjectArgumentAssemblyTypeName: UnityEngine.AudioClip, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - m_Target: {fileID: 1357838095} + m_TargetAssemblyTypeName: UnityEngine.Renderer, UnityEngine + m_MethodName: set_sharedMaterial + m_Mode: 2 + m_Arguments: + m_ObjectArgument: {fileID: 2100000, guid: b1ac50d5d67970a49a49c29519977b61, type: 2} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Material, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + isRaySelected: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1357838092} + m_TargetAssemblyTypeName: UnityEngine.AudioSource, UnityEngine + m_MethodName: PlayOneShot + m_Mode: 2 + m_Arguments: + m_ObjectArgument: {fileID: 8300000, guid: 29437a55b95f2eb489a5ec8574f185e9, type: 3} + m_ObjectArgumentAssemblyTypeName: UnityEngine.AudioClip, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - m_Target: {fileID: 1357838095} + m_TargetAssemblyTypeName: UnityEngine.Renderer, UnityEngine + m_MethodName: set_sharedMaterial + m_Mode: 2 + m_Arguments: + m_ObjectArgument: {fileID: 2100000, guid: 1e1949131aa56c54396b361b35a942e6, type: 2} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Material, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + onExited: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1357838092} + m_TargetAssemblyTypeName: UnityEngine.AudioSource, UnityEngine + m_MethodName: PlayOneShot + m_Mode: 2 + m_Arguments: + m_ObjectArgument: {fileID: 8300000, guid: 9f512430eba32d845aab8de9ba5e393c, type: 3} + m_ObjectArgumentAssemblyTypeName: UnityEngine.AudioClip, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - m_Target: {fileID: 1357838095} + m_TargetAssemblyTypeName: UnityEngine.Renderer, UnityEngine + m_MethodName: set_sharedMaterial + m_Mode: 2 + m_Arguments: + m_ObjectArgument: {fileID: 2100000, guid: b1ac50d5d67970a49a49c29519977b61, type: 2} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Material, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + isPokeSelected: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isGrabSelected: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isGazeHovered: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isGazePinchHovered: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isRayHovered: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isGrabHovered: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isPokeHovered: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isActiveHovered: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + disabledInteractorTypes: + - reference: MixedReality.Toolkit.IPokeInteractor, MixedReality.Toolkit.Core + k__BackingField: 0 + k__BackingField: 0.9 + k__BackingField: 0.1 + k__BackingField: 1 + k__BackingField: 0 + k__BackingField: 1 + k__BackingField: 0 + k__BackingField: 1 + allowSelectByVoice: 1 + speechRecognitionKeyword: select + k__BackingField: 1 + k__BackingField: 0 + k__BackingField: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + k__BackingField: + m_PersistentCalls: + m_Calls: [] + k__BackingField: + m_PersistentCalls: + m_Calls: [] + k__BackingField: + m_PersistentCalls: + m_Calls: [] + hostTransform: {fileID: 1357838089} + allowedManipulations: 7 + allowedInteractionTypes: -2147483641 + rigidbodyMovementType: 0 + applyTorque: 1 + springForceSoftness: 0.1 + springTorqueSoftness: 0.1 + springDamping: 1 + springForceLimit: 100 + rotationAnchorNear: 1 + rotationAnchorFar: 1 + releaseBehavior: 3 + transformSmoothingLogicType: + reference: MixedReality.Toolkit.SpatialManipulation.DefaultTransformSmoothingLogic, + MixedReality.Toolkit.SpatialManipulation + smoothingFar: 0 + smoothingNear: 0 + moveLerpTime: 0.001 + rotateLerpTime: 0.001 + scaleLerpTime: 0.001 + enableConstraints: 1 + constraintsManager: {fileID: 1357838091} + manipulationLogicTypes: + moveLogicType: + reference: MixedReality.Toolkit.SpatialManipulation.MoveLogic, MixedReality.Toolkit.SpatialManipulation + rotateLogicType: + reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, MixedReality.Toolkit.SpatialManipulation + scaleLogicType: + reference: MixedReality.Toolkit.SpatialManipulation.ScaleLogic, MixedReality.Toolkit.SpatialManipulation +--- !u!114 &1357838091 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1357838088} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 50cdab0cd5a0916419324bb54314773d, type: 3} + m_Name: + m_EditorClassIdentifier: + autoConstraintSelection: 1 + selectedConstraints: [] +--- !u!82 &1357838092 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1357838088} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} + m_audioClip: {fileID: 0} + m_PlayOnAwake: 1 + m_Volume: 1 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 1 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 +--- !u!54 &1357838093 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1357838088} + serializedVersion: 2 + m_Mass: 0.1 + m_Drag: 1 + m_AngularDrag: 1 + m_UseGravity: 1 + m_IsKinematic: 0 + m_Interpolate: 1 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!65 &1357838094 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1357838088} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!23 &1357838095 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1357838088} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 4294967295 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 4d9634496b867de43ab769506b202b67, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &1357838096 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1357838088} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!114 &1357838097 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1357838088} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe9323ca265114b4282b5d33b41f7adc, type: 3} + m_Name: + m_EditorClassIdentifier: + distanceThreshold: 20 +--- !u!114 &1357838098 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1357838088} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3a1bf44e2291e8741ab3dec75055d9db, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 0 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 0} + movableAxes: 0 + onMoveDelta: 0.01 +--- !u!114 &1357838099 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1357838088} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 80f85af46f9bddd4ea78f11cee5e3b2e, type: 3} + m_Name: + m_EditorClassIdentifier: + handType: 3 + proximityType: 3 + executionOrder: 0 + minimumScale: {x: 0.2, y: 0.2, z: 0.2} + maximumScale: {x: 2, y: 2, z: 2} + relativeToInitialState: 1 +--- !u!1001 &1364289929 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1089489031} + m_Modifications: + - target: {fileID: 2783974331088143781, guid: c25d8f2d22117bd40ad824684551fbde, type: 3} + propertyPath: Spatialize + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2783974331088143781, guid: c25d8f2d22117bd40ad824684551fbde, type: 3} + propertyPath: OutputAudioMixerGroup + value: + objectReference: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} + - target: {fileID: 5092507605265006331, guid: c25d8f2d22117bd40ad824684551fbde, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5092507605265006331, guid: c25d8f2d22117bd40ad824684551fbde, type: 3} + propertyPath: m_LocalPosition.x + value: -0.2437 + objectReference: {fileID: 0} + - target: {fileID: 5092507605265006331, guid: c25d8f2d22117bd40ad824684551fbde, type: 3} + propertyPath: m_LocalPosition.y + value: -0.5371 + objectReference: {fileID: 0} + - target: {fileID: 5092507605265006331, guid: c25d8f2d22117bd40ad824684551fbde, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5092507605265006331, guid: c25d8f2d22117bd40ad824684551fbde, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5092507605265006331, guid: c25d8f2d22117bd40ad824684551fbde, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5092507605265006331, guid: c25d8f2d22117bd40ad824684551fbde, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5092507605265006331, guid: c25d8f2d22117bd40ad824684551fbde, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5092507605265006331, guid: c25d8f2d22117bd40ad824684551fbde, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5092507605265006331, guid: c25d8f2d22117bd40ad824684551fbde, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5092507605265006331, guid: c25d8f2d22117bd40ad824684551fbde, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5092507606858315802, guid: c25d8f2d22117bd40ad824684551fbde, type: 3} + propertyPath: m_Name + value: PressableButton_32x32mm_IconAndText + objectReference: {fileID: 0} + - target: {fileID: 5572466351762964349, guid: c25d8f2d22117bd40ad824684551fbde, type: 3} + propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5572466351762964349, guid: c25d8f2d22117bd40ad824684551fbde, type: 3} + propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5572466351762964349, guid: c25d8f2d22117bd40ad824684551fbde, type: 3} + propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 884765058} + - target: {fileID: 5572466351762964349, guid: c25d8f2d22117bd40ad824684551fbde, type: 3} + propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 5572466351762964349, guid: c25d8f2d22117bd40ad824684551fbde, type: 3} + propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: Increment + objectReference: {fileID: 0} + - target: {fileID: 5572466351762964349, guid: c25d8f2d22117bd40ad824684551fbde, type: 3} + propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: MixedReality.Toolkit.Examples.Demos.ColorChanger, Assembly-CSharp + objectReference: {fileID: 0} + - target: {fileID: 5572466351762964349, guid: c25d8f2d22117bd40ad824684551fbde, type: 3} + propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: c25d8f2d22117bd40ad824684551fbde, type: 3} +--- !u!4 &1364289930 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5092507605265006331, guid: c25d8f2d22117bd40ad824684551fbde, type: 3} + m_PrefabInstance: {fileID: 1364289929} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &1376890153 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1708103290} + m_Modifications: + - target: {fileID: 3148769097004162997, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: fa21a874e3f75f84f8a7d806d8809ca0, type: 2} + - target: {fileID: 4125495309553998321, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} + propertyPath: m_Name + value: Stageplate + objectReference: {fileID: 0} + - target: {fileID: 4205010513405509735, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4205010513405509735, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} + propertyPath: m_LocalScale.x + value: 4.0017004 + objectReference: {fileID: 0} + - target: {fileID: 4205010513405509735, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} + propertyPath: m_LocalScale.y + value: 0.8635202 + objectReference: {fileID: 0} + - target: {fileID: 4205010513405509735, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} + propertyPath: m_LocalPosition.x + value: 0.8383498 + objectReference: {fileID: 0} + - target: {fileID: 4205010513405509735, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} + propertyPath: m_LocalPosition.y + value: -0.5591 + objectReference: {fileID: 0} + - target: {fileID: 4205010513405509735, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} + propertyPath: m_LocalPosition.z + value: 0.37586448 + objectReference: {fileID: 0} + - target: {fileID: 4205010513405509735, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 4205010513405509735, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} + propertyPath: m_LocalRotation.x + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 4205010513405509735, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} + propertyPath: m_LocalRotation.y + value: -0.000000029802319 + objectReference: {fileID: 0} + - target: {fileID: 4205010513405509735, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} + propertyPath: m_LocalRotation.z + value: 0.000000029802319 + objectReference: {fileID: 0} + - target: {fileID: 4205010513405509735, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 4205010513405509735, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4205010513405509735, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7759758375038403720, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} + propertyPath: m_LocalScale.x + value: 0.19473875 + objectReference: {fileID: 0} + - target: {fileID: 7759758375038403720, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} + propertyPath: m_LocalScale.y + value: 0.29611117 + objectReference: {fileID: 0} + - target: {fileID: 7759758375038403720, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} + propertyPath: m_LocalScale.z + value: 0.45093003 + objectReference: {fileID: 0} + - target: {fileID: 7759758375038403720, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} + propertyPath: m_LocalPosition.x + value: 0.0114 + objectReference: {fileID: 0} + - target: {fileID: 7759758375038403720, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} + propertyPath: m_LocalPosition.y + value: 0.083 + objectReference: {fileID: 0} + - target: {fileID: 7759758375038403720, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} + propertyPath: m_LocalPosition.z + value: -0.0072 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} +--- !u!4 &1376890154 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4205010513405509735, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} + m_PrefabInstance: {fileID: 1376890153} + m_PrefabAsset: {fileID: 0} +--- !u!1 &1393598443 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 100012, guid: f9a8072f5d9b92347a999f10f01b8012, type: 3} + m_PrefabInstance: {fileID: 1294530691} + m_PrefabAsset: {fileID: 0} +--- !u!135 &1393598444 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1393598443} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Radius: 0.08828581 + m_Center: {x: 0, y: 0, z: 0} +--- !u!1 &1404428860 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1404428861} + m_Layer: 0 + m_Name: CustomButtonExamples + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1404428861 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1404428860} + 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} + - {fileID: 607222683} + - {fileID: 4326491061339189} + - {fileID: 1270236525} + m_Father: {fileID: 1852224431} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!82 &1455400526 stripped +AudioSource: + m_CorrespondingSourceObject: {fileID: 8377650841631071081, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + m_PrefabInstance: {fileID: 364946991195464072} + m_PrefabAsset: {fileID: 0} +--- !u!1 &1470489459 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 100002, guid: 1b72c1e6302ca7542afd89257b6367aa, type: 3} + m_PrefabInstance: {fileID: 1923515644} + m_PrefabAsset: {fileID: 0} +--- !u!65 &1470489463 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1470489459} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 0.14754184, y: 0.24699001, z: 0.14326136} + m_Center: {x: 0.00059055915, y: 0.12349499, z: -0.011793165} +--- !u!114 &1470489464 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1470489459} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 90adb44e17279dc4db8f0fc595f1f52f, type: 3} + m_Name: + 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 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720334, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} + propertyPath: m_Name + value: MRTK XR Rig + objectReference: {fileID: 0} + - target: {fileID: 8479077998186684813, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} +--- !u!1 &1551252956 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1551252957} + - component: {fileID: 1551252960} + - component: {fileID: 1551252959} + - component: {fileID: 1551252958} + m_Layer: 0 + m_Name: Quad + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1551252957 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1551252956} + 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 + m_LocalEulerAnglesHint: {x: 33.644, y: 0, z: 0} +--- !u!64 &1551252958 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1551252956} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &1551252959 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1551252956} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 3940a7658692e0047aac8452e250f1d7, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &1551252960 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1551252956} + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} +--- !u!4 &1583599066 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8468582706564339464, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + m_PrefabInstance: {fileID: 1824793667} + m_PrefabAsset: {fileID: 0} +--- !u!1 &1617622746 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 7047533903058496966, guid: 8beb1e0a00bf1eb42921a53ffb52bdeb, type: 3} + m_PrefabInstance: {fileID: 831445127} + m_PrefabAsset: {fileID: 0} +--- !u!65 &1617622750 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1617622746} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1.7013047, y: 1.7013043, z: 1.7013047} + m_Center: {x: 0.00000047683716, y: -0.00000011920929, z: 0} +--- !u!1001 &1669647713 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1089489031} + m_Modifications: + - target: {fileID: 1220126735185249923, guid: 5e1e5c2fb89ded5469dd37ccbed1a896, type: 3} + propertyPath: m_Name + value: PressableButton_80x32mm_IconAndText + objectReference: {fileID: 0} + - target: {fileID: 1220126736778559586, guid: 5e1e5c2fb89ded5469dd37ccbed1a896, type: 3} + propertyPath: m_RootOrder + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 1220126736778559586, guid: 5e1e5c2fb89ded5469dd37ccbed1a896, type: 3} + propertyPath: m_LocalPosition.x + value: -0.028899997 + objectReference: {fileID: 0} + - target: {fileID: 1220126736778559586, guid: 5e1e5c2fb89ded5469dd37ccbed1a896, type: 3} + propertyPath: m_LocalPosition.y + value: -0.5369 + objectReference: {fileID: 0} + - target: {fileID: 1220126736778559586, guid: 5e1e5c2fb89ded5469dd37ccbed1a896, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1220126736778559586, guid: 5e1e5c2fb89ded5469dd37ccbed1a896, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1220126736778559586, guid: 5e1e5c2fb89ded5469dd37ccbed1a896, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1220126736778559586, guid: 5e1e5c2fb89ded5469dd37ccbed1a896, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1220126736778559586, guid: 5e1e5c2fb89ded5469dd37ccbed1a896, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1220126736778559586, guid: 5e1e5c2fb89ded5469dd37ccbed1a896, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1220126736778559586, guid: 5e1e5c2fb89ded5469dd37ccbed1a896, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1220126736778559586, guid: 5e1e5c2fb89ded5469dd37ccbed1a896, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1952199377435673060, guid: 5e1e5c2fb89ded5469dd37ccbed1a896, type: 3} + propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1952199377435673060, guid: 5e1e5c2fb89ded5469dd37ccbed1a896, type: 3} + propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1952199377435673060, guid: 5e1e5c2fb89ded5469dd37ccbed1a896, type: 3} + propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 884765058} + - target: {fileID: 1952199377435673060, guid: 5e1e5c2fb89ded5469dd37ccbed1a896, type: 3} + propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 1952199377435673060, guid: 5e1e5c2fb89ded5469dd37ccbed1a896, type: 3} + propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: Increment + objectReference: {fileID: 0} + - target: {fileID: 1952199377435673060, guid: 5e1e5c2fb89ded5469dd37ccbed1a896, type: 3} + propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: MixedReality.Toolkit.Examples.Demos.ColorChanger, Assembly-CSharp + objectReference: {fileID: 0} + - target: {fileID: 1952199377435673060, guid: 5e1e5c2fb89ded5469dd37ccbed1a896, type: 3} + propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 2248730045335728886, guid: 5e1e5c2fb89ded5469dd37ccbed1a896, type: 3} + propertyPath: m_Controller + value: + objectReference: {fileID: 9100000, guid: e3404cf816858784985fd5888cefbbb1, type: 2} + - target: {fileID: 7119852961148484655, guid: 5e1e5c2fb89ded5469dd37ccbed1a896, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 5762245003366665926, guid: 9b0d0ee11ff70b04d901a29b519cbaa0, type: 2} + - target: {fileID: 8133592760163744572, guid: 5e1e5c2fb89ded5469dd37ccbed1a896, type: 3} + propertyPath: Spatialize + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8133592760163744572, guid: 5e1e5c2fb89ded5469dd37ccbed1a896, type: 3} + propertyPath: OutputAudioMixerGroup + value: + objectReference: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} + - target: {fileID: 8133592760163744572, guid: 5e1e5c2fb89ded5469dd37ccbed1a896, type: 3} + propertyPath: panLevelCustomCurve.m_Curve.Array.data[0].value + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 5e1e5c2fb89ded5469dd37ccbed1a896, type: 3} +--- !u!4 &1669647714 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1220126736778559586, guid: 5e1e5c2fb89ded5469dd37ccbed1a896, type: 3} + m_PrefabInstance: {fileID: 1669647713} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &1685298794 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 150862479} + m_Modifications: + - target: {fileID: 854254128426986228, guid: 7148f9ce86f62ab4b8d89dc6cfa369a0, type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 854254128426986228, guid: 7148f9ce86f62ab4b8d89dc6cfa369a0, type: 3} + propertyPath: m_LocalPosition.x + value: 0.4198 + objectReference: {fileID: 0} + - target: {fileID: 854254128426986228, guid: 7148f9ce86f62ab4b8d89dc6cfa369a0, type: 3} + propertyPath: m_LocalPosition.y + value: -0.472 + objectReference: {fileID: 0} + - target: {fileID: 854254128426986228, guid: 7148f9ce86f62ab4b8d89dc6cfa369a0, type: 3} + propertyPath: m_LocalPosition.z + value: -0.1663 + objectReference: {fileID: 0} + - target: {fileID: 854254128426986228, guid: 7148f9ce86f62ab4b8d89dc6cfa369a0, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 854254128426986228, guid: 7148f9ce86f62ab4b8d89dc6cfa369a0, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 854254128426986228, guid: 7148f9ce86f62ab4b8d89dc6cfa369a0, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 854254128426986228, guid: 7148f9ce86f62ab4b8d89dc6cfa369a0, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 854254128426986228, guid: 7148f9ce86f62ab4b8d89dc6cfa369a0, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 854254128426986228, guid: 7148f9ce86f62ab4b8d89dc6cfa369a0, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 854254128426986228, guid: 7148f9ce86f62ab4b8d89dc6cfa369a0, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 854254128426986230, guid: 7148f9ce86f62ab4b8d89dc6cfa369a0, type: 3} + propertyPath: m_Name + value: Slider_168x40mm_IconAndValue + objectReference: {fileID: 0} + - target: {fileID: 4014846479790359150, guid: 7148f9ce86f62ab4b8d89dc6cfa369a0, type: 3} + propertyPath: m_LocalScale.x + value: 0.13999999 + objectReference: {fileID: 0} + - target: {fileID: 4014846479790359150, guid: 7148f9ce86f62ab4b8d89dc6cfa369a0, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4014846479790359150, guid: 7148f9ce86f62ab4b8d89dc6cfa369a0, type: 3} + propertyPath: m_LocalPosition.y + value: -0.000000029802322 + objectReference: {fileID: 0} + - target: {fileID: 4014846479790359150, guid: 7148f9ce86f62ab4b8d89dc6cfa369a0, type: 3} + propertyPath: m_LocalPosition.z + value: 0.000000012922101 + objectReference: {fileID: 0} + - target: {fileID: 6593650948243348711, guid: 7148f9ce86f62ab4b8d89dc6cfa369a0, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6593650948243348711, guid: 7148f9ce86f62ab4b8d89dc6cfa369a0, type: 3} + propertyPath: m_LocalPosition.y + value: -0.000000029802322 + objectReference: {fileID: 0} + - target: {fileID: 6593650948243348711, guid: 7148f9ce86f62ab4b8d89dc6cfa369a0, type: 3} + propertyPath: m_LocalPosition.z + value: 0.000000012922101 + objectReference: {fileID: 0} + - target: {fileID: 9075688916865880869, guid: 7148f9ce86f62ab4b8d89dc6cfa369a0, type: 3} + propertyPath: isTouchable + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9075688916865880869, guid: 7148f9ce86f62ab4b8d89dc6cfa369a0, type: 3} + propertyPath: onValueUpdated.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 9075688916865880869, guid: 7148f9ce86f62ab4b8d89dc6cfa369a0, type: 3} + propertyPath: onValueUpdated.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9075688916865880869, guid: 7148f9ce86f62ab4b8d89dc6cfa369a0, type: 3} + propertyPath: onValueUpdated.m_PersistentCalls.m_Calls.Array.data[1].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 9075688916865880869, guid: 7148f9ce86f62ab4b8d89dc6cfa369a0, type: 3} + propertyPath: onValueUpdated.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 2123527399} + - target: {fileID: 9075688916865880869, guid: 7148f9ce86f62ab4b8d89dc6cfa369a0, type: 3} + propertyPath: onValueUpdated.m_PersistentCalls.m_Calls.Array.data[1].m_Target + value: + objectReference: {fileID: 0} + - target: {fileID: 9075688916865880869, guid: 7148f9ce86f62ab4b8d89dc6cfa369a0, type: 3} + propertyPath: onValueUpdated.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 9075688916865880869, guid: 7148f9ce86f62ab4b8d89dc6cfa369a0, type: 3} + propertyPath: onValueUpdated.m_PersistentCalls.m_Calls.Array.data[1].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 9075688916865880869, guid: 7148f9ce86f62ab4b8d89dc6cfa369a0, type: 3} + propertyPath: onValueUpdated.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: SpinObjectWithSlider + objectReference: {fileID: 0} + - target: {fileID: 9075688916865880869, guid: 7148f9ce86f62ab4b8d89dc6cfa369a0, type: 3} + propertyPath: onValueUpdated.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName + value: + objectReference: {fileID: 0} + - target: {fileID: 9075688916865880869, guid: 7148f9ce86f62ab4b8d89dc6cfa369a0, type: 3} + propertyPath: onValueUpdated.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: MixedReality.Toolkit.Examples.Demos.ObjectSpinner, Assembly-CSharp + objectReference: {fileID: 0} + - target: {fileID: 9075688916865880869, guid: 7148f9ce86f62ab4b8d89dc6cfa369a0, type: 3} + propertyPath: onValueUpdated.m_PersistentCalls.m_Calls.Array.data[1].m_TargetAssemblyTypeName + value: MixedReality.Toolkit.Examples.Demos.SliderGemSpinner, Assembly-CSharp + objectReference: {fileID: 0} + - target: {fileID: 9075688916865880869, guid: 7148f9ce86f62ab4b8d89dc6cfa369a0, type: 3} + propertyPath: onValueUpdated.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 9075688916865880869, guid: 7148f9ce86f62ab4b8d89dc6cfa369a0, type: 3} + propertyPath: onValueUpdated.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 7148f9ce86f62ab4b8d89dc6cfa369a0, type: 3} +--- !u!4 &1685298795 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 854254128426986228, guid: 7148f9ce86f62ab4b8d89dc6cfa369a0, type: 3} + m_PrefabInstance: {fileID: 1685298794} + m_PrefabAsset: {fileID: 0} +--- !u!1 &1708103289 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1708103290} + m_Layer: 0 + m_Name: ObjectManipulator + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1708103290 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1708103289} + 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} + - {fileID: 1727403011} + m_Father: {fileID: 1203713056} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 45, z: 0} +--- !u!1 &1710053216 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1710053220} + - component: {fileID: 1710053219} + - component: {fileID: 1710053218} + - component: {fileID: 1710053217} + - component: {fileID: 1710053221} + - component: {fileID: 1710053222} + m_Layer: 0 + m_Name: Container + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1710053217 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1710053216} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f3f2652d4ff14543be4d1ece28036a0, type: 3} + m_Name: + m_EditorClassIdentifier: + boundsVisualsPrefab: {fileID: 5671351296789090341, guid: 7b542306e34a62f4c9a822fcb19b7d99, type: 3} + boundsCalculationMethod: 0 + includeInactiveObjects: 0 + overrideBounds: 0 + boundsOverride: {fileID: 0} + flattenMode: 2 + boundsPadding: 0.01 + interactable: {fileID: 0} + toggleHandlesOnClick: 1 + dragToggleThreshold: 0.005 + target: {fileID: 0} + handlesActive: 0 + enabledHandles: 2 + rotateAnchor: 1 + scaleAnchor: 0 + scaleBehavior: 0 + smoothingActive: 1 + rotateLerpTime: 0.00001 + scaleLerpTime: 0.00001 + translateLerpTime: 0.00001 + enableConstraints: 1 + constraintsManager: {fileID: 0} + manipulationLogicTypes: + moveLogicType: + reference: MixedReality.Toolkit.SpatialManipulation.BoundsControlMoveLogic, + MixedReality.Toolkit.SpatialManipulation + rotateLogicType: + reference: MixedReality.Toolkit.SpatialManipulation.BoundsControlRotateLogic, + MixedReality.Toolkit.SpatialManipulation + scaleLogicType: + reference: MixedReality.Toolkit.SpatialManipulation.BoundsControlScaleLogic, + MixedReality.Toolkit.SpatialManipulation + manipulationStarted: + m_PersistentCalls: + m_Calls: [] + manipulationEnded: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &1710053218 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1710053216} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d9ad66e7cc9a2754d8ea989740c9f00d, type: 3} + m_Name: + m_EditorClassIdentifier: + m_InteractionManager: {fileID: 0} + m_Colliders: + - {fileID: 862305034} + - {fileID: 1069515631} + m_InteractionLayers: + m_Bits: 1 + m_DistanceCalculationMode: 1 + m_SelectMode: 1 + m_FocusMode: 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: [] + m_LastHoverExited: + m_PersistentCalls: + m_Calls: [] + m_HoverEntered: + m_PersistentCalls: + m_Calls: [] + m_HoverExited: + m_PersistentCalls: + m_Calls: [] + m_FirstSelectEntered: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1710053221} + m_TargetAssemblyTypeName: UnityEngine.AudioSource, UnityEngine + m_MethodName: PlayOneShot + m_Mode: 2 + m_Arguments: + m_ObjectArgument: {fileID: 8300000, guid: 29437a55b95f2eb489a5ec8574f185e9, type: 3} + m_ObjectArgumentAssemblyTypeName: UnityEngine.AudioClip, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_LastSelectExited: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1710053221} + m_TargetAssemblyTypeName: UnityEngine.AudioSource, UnityEngine + m_MethodName: PlayOneShot + m_Mode: 2 + m_Arguments: + m_ObjectArgument: {fileID: 8300000, guid: 9f512430eba32d845aab8de9ba5e393c, type: 3} + m_ObjectArgumentAssemblyTypeName: UnityEngine.AudioClip, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_SelectEntered: + m_PersistentCalls: + m_Calls: [] + m_SelectExited: + m_PersistentCalls: + m_Calls: [] + m_FirstFocusEntered: + m_PersistentCalls: + m_Calls: [] + m_LastFocusExited: + m_PersistentCalls: + m_Calls: [] + m_FocusEntered: + m_PersistentCalls: + m_Calls: [] + m_FocusExited: + m_PersistentCalls: + m_Calls: [] + m_Activated: + m_PersistentCalls: + m_Calls: [] + m_Deactivated: + m_PersistentCalls: + m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] + isGazePinchSelected: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isRaySelected: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isPokeSelected: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isGrabSelected: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isGazeHovered: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isGazePinchHovered: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isRayHovered: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isGrabHovered: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isPokeHovered: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isActiveHovered: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + disabledInteractorTypes: + - reference: MixedReality.Toolkit.IPokeInteractor, MixedReality.Toolkit.Core + k__BackingField: 0 + k__BackingField: 0.9 + k__BackingField: 0.1 + k__BackingField: 1 + k__BackingField: 0 + k__BackingField: 1 + k__BackingField: 0 + k__BackingField: 1 + allowSelectByVoice: 1 + speechRecognitionKeyword: select + k__BackingField: 1 + k__BackingField: 0 + k__BackingField: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + k__BackingField: + m_PersistentCalls: + m_Calls: [] + k__BackingField: + m_PersistentCalls: + m_Calls: [] + k__BackingField: + m_PersistentCalls: + m_Calls: [] + hostTransform: {fileID: 1710053220} + allowedManipulations: 7 + allowedInteractionTypes: -2147483641 + rigidbodyMovementType: 0 + applyTorque: 1 + springForceSoftness: 0.1 + springTorqueSoftness: 0.1 + springDamping: 1 + springForceLimit: 100 + rotationAnchorNear: 1 + rotationAnchorFar: 1 + releaseBehavior: 3 + transformSmoothingLogicType: + reference: MixedReality.Toolkit.SpatialManipulation.DefaultTransformSmoothingLogic, + MixedReality.Toolkit.SpatialManipulation + smoothingFar: 1 + smoothingNear: 1 + moveLerpTime: 0.001 + rotateLerpTime: 0.001 + scaleLerpTime: 0.001 + enableConstraints: 1 + constraintsManager: {fileID: 0} + manipulationLogicTypes: + moveLogicType: + reference: MixedReality.Toolkit.SpatialManipulation.MoveLogic, MixedReality.Toolkit.SpatialManipulation + rotateLogicType: + reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, MixedReality.Toolkit.SpatialManipulation + scaleLogicType: + reference: MixedReality.Toolkit.SpatialManipulation.ScaleLogic, MixedReality.Toolkit.SpatialManipulation +--- !u!114 &1710053219 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1710053216} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 50cdab0cd5a0916419324bb54314773d, type: 3} + m_Name: + m_EditorClassIdentifier: + autoConstraintSelection: 1 + selectedConstraints: [] +--- !u!4 &1710053220 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1710053216} + 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} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!82 &1710053221 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1710053216} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} + m_audioClip: {fileID: 0} + m_PlayOnAwake: 1 + m_Volume: 1 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 1 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 +--- !u!114 &1710053222 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1710053216} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 80f85af46f9bddd4ea78f11cee5e3b2e, type: 3} + m_Name: + m_EditorClassIdentifier: + handType: 3 + proximityType: 3 + executionOrder: 0 + minimumScale: {x: 0.2, y: 0.2, z: 0.2} + maximumScale: {x: 2, y: 2, z: 2} + relativeToInitialState: 1 +--- !u!1 &1724991365 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 100000, guid: 1b72c1e6302ca7542afd89257b6367aa, type: 3} + m_PrefabInstance: {fileID: 1923515644} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1724991366 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1724991365} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d9ad66e7cc9a2754d8ea989740c9f00d, type: 3} + m_Name: + m_EditorClassIdentifier: + m_InteractionManager: {fileID: 0} + m_Colliders: [] + m_InteractionLayers: + m_Bits: 1 + m_DistanceCalculationMode: 1 + m_SelectMode: 1 + m_FocusMode: 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: [] + m_LastHoverExited: + m_PersistentCalls: + m_Calls: [] + m_HoverEntered: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1470489464} + m_TargetAssemblyTypeName: UnityEngine.Behaviour, UnityEngine + m_MethodName: set_enabled + m_Mode: 6 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 1 + m_CallState: 2 + m_HoverExited: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1470489464} + m_TargetAssemblyTypeName: UnityEngine.Behaviour, UnityEngine + m_MethodName: set_enabled + m_Mode: 6 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_FirstSelectEntered: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1724991368} + m_TargetAssemblyTypeName: UnityEngine.AudioSource, UnityEngine + m_MethodName: PlayOneShot + m_Mode: 2 + m_Arguments: + m_ObjectArgument: {fileID: 8300000, guid: 29437a55b95f2eb489a5ec8574f185e9, type: 3} + m_ObjectArgumentAssemblyTypeName: UnityEngine.AudioClip, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_LastSelectExited: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1724991368} + m_TargetAssemblyTypeName: UnityEngine.AudioSource, UnityEngine + m_MethodName: PlayOneShot + m_Mode: 2 + m_Arguments: + m_ObjectArgument: {fileID: 8300000, guid: 9f512430eba32d845aab8de9ba5e393c, type: 3} + m_ObjectArgumentAssemblyTypeName: UnityEngine.AudioClip, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_SelectEntered: + m_PersistentCalls: + m_Calls: [] + m_SelectExited: + m_PersistentCalls: + m_Calls: [] + m_FirstFocusEntered: + m_PersistentCalls: + m_Calls: [] + m_LastFocusExited: + m_PersistentCalls: + m_Calls: [] + m_FocusEntered: + m_PersistentCalls: + m_Calls: [] + m_FocusExited: + m_PersistentCalls: + m_Calls: [] + m_Activated: + m_PersistentCalls: + m_Calls: [] + m_Deactivated: + m_PersistentCalls: + m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] + isGazePinchSelected: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1724991368} + m_TargetAssemblyTypeName: UnityEngine.AudioSource, UnityEngine + m_MethodName: PlayOneShot + m_Mode: 2 + m_Arguments: + m_ObjectArgument: {fileID: 8300000, guid: 29437a55b95f2eb489a5ec8574f185e9, type: 3} + m_ObjectArgumentAssemblyTypeName: UnityEngine.AudioClip, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + onExited: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1724991368} + m_TargetAssemblyTypeName: UnityEngine.AudioSource, UnityEngine + m_MethodName: PlayOneShot + m_Mode: 2 + m_Arguments: + m_ObjectArgument: {fileID: 8300000, guid: 9f512430eba32d845aab8de9ba5e393c, type: 3} + m_ObjectArgumentAssemblyTypeName: UnityEngine.AudioClip, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + isRaySelected: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1724991368} + m_TargetAssemblyTypeName: UnityEngine.AudioSource, UnityEngine + m_MethodName: PlayOneShot + m_Mode: 2 + m_Arguments: + m_ObjectArgument: {fileID: 8300000, guid: 29437a55b95f2eb489a5ec8574f185e9, type: 3} + m_ObjectArgumentAssemblyTypeName: UnityEngine.AudioClip, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + onExited: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1724991368} + m_TargetAssemblyTypeName: UnityEngine.AudioSource, UnityEngine + m_MethodName: PlayOneShot + m_Mode: 2 + m_Arguments: + m_ObjectArgument: {fileID: 8300000, guid: 9f512430eba32d845aab8de9ba5e393c, type: 3} + m_ObjectArgumentAssemblyTypeName: UnityEngine.AudioClip, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + isPokeSelected: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isGrabSelected: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isGazeHovered: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isGazePinchHovered: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isRayHovered: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isGrabHovered: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isPokeHovered: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isActiveHovered: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + disabledInteractorTypes: + - reference: MixedReality.Toolkit.IPokeInteractor, MixedReality.Toolkit.Core + k__BackingField: 0 + k__BackingField: 0.9 + k__BackingField: 0.1 + k__BackingField: 1 + k__BackingField: 0 + k__BackingField: 1 + k__BackingField: 0 + k__BackingField: 1 + allowSelectByVoice: 1 + speechRecognitionKeyword: select + k__BackingField: 1 + k__BackingField: 0 + k__BackingField: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + k__BackingField: + m_PersistentCalls: + m_Calls: [] + k__BackingField: + m_PersistentCalls: + m_Calls: [] + k__BackingField: + m_PersistentCalls: + m_Calls: [] + hostTransform: {fileID: 1923515645} + allowedManipulations: -1 + allowedInteractionTypes: -1 + rigidbodyMovementType: 0 + applyTorque: 1 + springForceSoftness: 0.1 + springTorqueSoftness: 0.1 + springDamping: 1 + springForceLimit: 100 + rotationAnchorNear: 1 + rotationAnchorFar: 1 + releaseBehavior: 3 + transformSmoothingLogicType: + reference: MixedReality.Toolkit.SpatialManipulation.DefaultTransformSmoothingLogic, + MixedReality.Toolkit.SpatialManipulation + smoothingFar: 1 + smoothingNear: 1 + moveLerpTime: 0.001 + rotateLerpTime: 0.001 + scaleLerpTime: 0.001 + enableConstraints: 1 + constraintsManager: {fileID: 1724991367} + manipulationLogicTypes: + moveLogicType: + reference: MixedReality.Toolkit.SpatialManipulation.MoveLogic, MixedReality.Toolkit.SpatialManipulation + rotateLogicType: + reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, MixedReality.Toolkit.SpatialManipulation + scaleLogicType: + reference: MixedReality.Toolkit.SpatialManipulation.ScaleLogic, MixedReality.Toolkit.SpatialManipulation +--- !u!114 &1724991367 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1724991365} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 50cdab0cd5a0916419324bb54314773d, type: 3} + m_Name: + m_EditorClassIdentifier: + autoConstraintSelection: 1 + selectedConstraints: [] +--- !u!82 &1724991368 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1724991365} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} + m_audioClip: {fileID: 0} + m_PlayOnAwake: 1 + m_Volume: 1 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 1 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 +--- !u!114 &1724991369 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1724991365} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3a1bf44e2291e8741ab3dec75055d9db, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 0 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 0} + movableAxes: 0 + onMoveDelta: 0.01 +--- !u!114 &1724991370 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1724991365} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 02df0dfd31465cf42bd60027ac90b874, type: 3} + m_Name: + m_EditorClassIdentifier: + stateContainers: + entries: + - key: Disabled + value: + effects: [] + isVariable: 0 + - key: PassiveHover + value: + effects: + - rid: 0 + isVariable: 0 + - key: ActiveHover + value: + effects: + - rid: 1 + isVariable: 0 + - key: Select + value: + effects: + - rid: 2 + isVariable: 1 + - key: Toggle + value: + effects: [] + isVariable: 0 + interactable: {fileID: 1724991366} + animator: {fileID: 1724991371} + references: + version: 2 + RefIds: + - rid: 0 + type: {class: AnimationEffect, ns: MixedReality.Toolkit.UX, asm: MixedReality.Toolkit.UXCore} + data: + name: Animation + clip: {fileID: 7400000, guid: 093b2401940cf8644b996677ae059793, type: 2} + speed: 1 + playbackMode: 0 + weightMode: 0 + transitionDuration: 0 + - rid: 1 + type: {class: AnimationEffect, ns: MixedReality.Toolkit.UX, asm: MixedReality.Toolkit.UXCore} + data: + name: Animation + clip: {fileID: 7400000, guid: a415c269559729447ae831d7f14c533e, type: 2} + speed: 1 + playbackMode: 0 + weightMode: 0 + transitionDuration: 0 + - rid: 2 + type: {class: AnimationEffect, ns: MixedReality.Toolkit.UX, asm: MixedReality.Toolkit.UXCore} + data: + name: Animation + clip: {fileID: 7400000, guid: 2512ea21f2da7c648bf6864e8b0f8de7, type: 2} + speed: 1 + playbackMode: 1 + weightMode: 0 + transitionDuration: 0 +--- !u!95 &1724991371 +Animator: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1724991365} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 0} + m_CullingMode: 0 + 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 +--- !u!1 &1727403010 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1727403011} + m_Layer: 0 + m_Name: Near Interactions + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1727403011 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1727403010} + 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} + - {fileID: 888851582} + - {fileID: 563549574} + - {fileID: 79416684} + - {fileID: 1294530692} + m_Father: {fileID: 1708103290} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!82 &1729004921 stripped +AudioSource: + m_CorrespondingSourceObject: {fileID: 4540244754419273873, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + m_PrefabInstance: {fileID: 364946991195464072} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &1758148430 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1089489031} + m_Modifications: + - target: {fileID: 2285124468144155093, guid: 8ace9c04082e8ce4ea440f9bef681ce3, type: 3} + propertyPath: m_text + value: "\uF419" + objectReference: {fileID: 0} + - target: {fileID: 2285124468144155093, guid: 8ace9c04082e8ce4ea440f9bef681ce3, type: 3} + propertyPath: m_sharedMaterial + value: + objectReference: {fileID: 5762245003366665926, guid: 9b0d0ee11ff70b04d901a29b519cbaa0, type: 2} + - target: {fileID: 3060986453813667140, guid: 8ace9c04082e8ce4ea440f9bef681ce3, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 5762245003366665926, guid: 9b0d0ee11ff70b04d901a29b519cbaa0, type: 2} + - target: {fileID: 3119290704008432693, guid: 8ace9c04082e8ce4ea440f9bef681ce3, type: 3} + propertyPath: currentIconName + value: Icon 89 + objectReference: {fileID: 0} + - target: {fileID: 4058959291818943063, guid: 8ace9c04082e8ce4ea440f9bef681ce3, type: 3} + propertyPath: Spatialize + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4058959291818943063, guid: 8ace9c04082e8ce4ea440f9bef681ce3, type: 3} + propertyPath: OutputAudioMixerGroup + value: + objectReference: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} + - target: {fileID: 4058959291818943063, guid: 8ace9c04082e8ce4ea440f9bef681ce3, type: 3} + propertyPath: panLevelCustomCurve.m_Curve.Array.data[0].value + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6026828403977934991, guid: 8ace9c04082e8ce4ea440f9bef681ce3, type: 3} + propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6026828403977934991, guid: 8ace9c04082e8ce4ea440f9bef681ce3, type: 3} + propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6026828403977934991, guid: 8ace9c04082e8ce4ea440f9bef681ce3, type: 3} + propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 884765058} + - target: {fileID: 6026828403977934991, guid: 8ace9c04082e8ce4ea440f9bef681ce3, type: 3} + propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 6026828403977934991, guid: 8ace9c04082e8ce4ea440f9bef681ce3, type: 3} + propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: Increment + objectReference: {fileID: 0} + - target: {fileID: 6026828403977934991, guid: 8ace9c04082e8ce4ea440f9bef681ce3, type: 3} + propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: MixedReality.Toolkit.Examples.Demos.ColorChanger, Assembly-CSharp + objectReference: {fileID: 0} + - target: {fileID: 6026828403977934991, guid: 8ace9c04082e8ce4ea440f9bef681ce3, type: 3} + propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 6366612888026126601, guid: 8ace9c04082e8ce4ea440f9bef681ce3, type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 6366612888026126601, guid: 8ace9c04082e8ce4ea440f9bef681ce3, type: 3} + propertyPath: m_LocalPosition.x + value: -0.196 + objectReference: {fileID: 0} + - target: {fileID: 6366612888026126601, guid: 8ace9c04082e8ce4ea440f9bef681ce3, type: 3} + propertyPath: m_LocalPosition.y + value: -0.5968 + objectReference: {fileID: 0} + - target: {fileID: 6366612888026126601, guid: 8ace9c04082e8ce4ea440f9bef681ce3, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6366612888026126601, guid: 8ace9c04082e8ce4ea440f9bef681ce3, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6366612888026126601, guid: 8ace9c04082e8ce4ea440f9bef681ce3, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6366612888026126601, guid: 8ace9c04082e8ce4ea440f9bef681ce3, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6366612888026126601, guid: 8ace9c04082e8ce4ea440f9bef681ce3, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6366612888026126601, guid: 8ace9c04082e8ce4ea440f9bef681ce3, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6366612888026126601, guid: 8ace9c04082e8ce4ea440f9bef681ce3, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6366612888026126601, guid: 8ace9c04082e8ce4ea440f9bef681ce3, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6366612889619439592, guid: 8ace9c04082e8ce4ea440f9bef681ce3, type: 3} + propertyPath: m_Name + value: PressableButton_128x32mm_IconAndText_L + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 8ace9c04082e8ce4ea440f9bef681ce3, type: 3} +--- !u!4 &1758148431 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6366612888026126601, guid: 8ace9c04082e8ce4ea440f9bef681ce3, type: 3} + m_PrefabInstance: {fileID: 1758148430} + m_PrefabAsset: {fileID: 0} +--- !u!1 &1802540759 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1802540760} + - component: {fileID: 1802540762} + - component: {fileID: 1802540761} + m_Layer: 0 + m_Name: Subtitle2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1802540760 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1802540759} + 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 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -0.1461, y: -0.5589} + m_SizeDelta: {x: 20, y: 5} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1802540761 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1802540759} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9541d86e2fd84c1d9990edf0852d74ab, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: Color Change on StatefulInteractable's OnClick() Event + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 533bdd8d5c92b52448ee2ecf7bd828a4, type: 2} + m_sharedMaterial: {fileID: -1005824763306460071, guid: 533bdd8d5c92b52448ee2ecf7bd828a4, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 8 + m_fontSizeBase: 8 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 0 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + 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 +--- !u!23 &1802540762 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1802540759} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: -1005824763306460071, guid: 533bdd8d5c92b52448ee2ecf7bd828a4, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!1 &1823018502 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1823018503} + - component: {fileID: 1823018505} + - component: {fileID: 1823018504} + - component: {fileID: 1823018506} + m_Layer: 0 + m_Name: Model + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1823018503 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1823018502} + 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 + m_LocalEulerAnglesHint: {x: -0.107, y: 115.546, z: -0.068} +--- !u!23 &1823018504 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1823018502} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 2877a47ddf5b5d04d8c3cac2862ddf25, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &1823018505 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1823018502} + m_Mesh: {fileID: 4300000, guid: 0a30b3edc4f8ea24da9177aeae1b1e34, type: 3} +--- !u!114 &1823018506 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1823018502} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 90adb44e17279dc4db8f0fc595f1f52f, type: 3} + m_Name: + 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 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1203713056} + m_Modifications: + - target: {fileID: 443995632, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + propertyPath: m_Size.z + value: 0.029271265 + objectReference: {fileID: 0} + - target: {fileID: 443995632, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + propertyPath: m_Center.z + value: 0.010364364 + objectReference: {fileID: 0} + - target: {fileID: 443995633, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + propertyPath: drawingColor.rgba + value: 4278235903 + objectReference: {fileID: 0} + - target: {fileID: 9437446510852594, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + propertyPath: m_Size.y + value: 32 + objectReference: {fileID: 0} + - target: {fileID: 9437446510852598, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + propertyPath: Spatialize + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 9437446510852598, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + propertyPath: OutputAudioMixerGroup + value: + objectReference: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} + - target: {fileID: 9437446510852598, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + propertyPath: panLevelCustomCurve.m_Curve.Array.data[0].value + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 9437446510852599, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9437446510852599, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9437446510852599, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9437446510852599, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9437446510852599, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 150949528621185834, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + propertyPath: m_LocalScale.x + value: 0.04 + objectReference: {fileID: 0} + - target: {fileID: 150949528621185834, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + propertyPath: m_LocalScale.y + value: 0.137 + objectReference: {fileID: 0} + - target: {fileID: 150949528621185834, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + propertyPath: m_LocalPosition.y + value: 0.048499994 + objectReference: {fileID: 0} + - target: {fileID: 284030044009447867, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + propertyPath: Spatialize + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 284030044009447867, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + propertyPath: OutputAudioMixerGroup + value: + objectReference: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} + - target: {fileID: 284030044009447867, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + propertyPath: panLevelCustomCurve.m_Curve.Array.data[0].value + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 402277338338922732, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + propertyPath: m_UseGravity + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 534244713576997589, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + propertyPath: m_text + value: "\uF34D" + objectReference: {fileID: 0} + - target: {fileID: 534244713576997589, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + propertyPath: m_sharedMaterial + value: + objectReference: {fileID: 5762245003366665926, guid: 9b0d0ee11ff70b04d901a29b519cbaa0, type: 2} + - target: {fileID: 724323403903675551, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 724323403903675551, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 724323403903675551, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 724323403903675551, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 724323403903675551, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 942987468863586275, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + propertyPath: m_LocalPosition.y + value: 0.03299999 + objectReference: {fileID: 0} + - target: {fileID: 942987469246865708, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + propertyPath: m_LocalPosition.y + value: 0.06499999 + objectReference: {fileID: 0} + - target: {fileID: 942987469383587423, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + propertyPath: m_LocalPosition.y + value: 0.09699999 + objectReference: {fileID: 0} + - target: {fileID: 986953982429952368, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + propertyPath: m_Name + value: WhiteboardExample + objectReference: {fileID: 0} + - target: {fileID: 1169231408273737741, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1169231408273737741, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1169231408273737741, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1169231408273737741, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1169231408273737741, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1169231408273737741, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1219543627873824729, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + propertyPath: currentIconName + value: Icon 79 + objectReference: {fileID: 0} + - target: {fileID: 1287902911309006504, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 5762245003366665926, guid: 9b0d0ee11ff70b04d901a29b519cbaa0, type: 2} + - target: {fileID: 1510911413115419833, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + propertyPath: Spatialize + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1510911413115419833, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + propertyPath: OutputAudioMixerGroup + value: + objectReference: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} + - target: {fileID: 1510911413115419833, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + propertyPath: panLevelCustomCurve.m_Curve.Array.data[0].value + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1574045221918205079, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + propertyPath: Spatialize + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1574045221918205079, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + propertyPath: OutputAudioMixerGroup + value: + objectReference: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} + - target: {fileID: 1574045221918205079, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + propertyPath: panLevelCustomCurve.m_Curve.Array.data[0].value + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1715477249078649596, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1715477249078649596, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1715477249078649596, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1715477249078649596, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1715477249078649596, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1715477249078649596, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2236187689672624870, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2599463952435006009, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + propertyPath: m_text + value: "\uF36A" + objectReference: {fileID: 0} + - target: {fileID: 2599463952435006009, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + propertyPath: m_sharedMaterial + value: + objectReference: {fileID: 5762245003366665926, guid: 9b0d0ee11ff70b04d901a29b519cbaa0, type: 2} + - target: {fileID: 2599463952435006009, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + propertyPath: m_hasFontAssetChanged + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2864857420249135790, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2864857420249135790, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2864857420249135790, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2864857420249135790, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2864857420249135790, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2864857420249135790, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3484184696762796712, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3649796767034289732, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 5762245003366665926, guid: 9b0d0ee11ff70b04d901a29b519cbaa0, type: 2} + - target: {fileID: 3717038121812215605, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + propertyPath: currentIconName + value: Icon 76 + objectReference: {fileID: 0} + - target: {fileID: 4024654762168814417, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + propertyPath: m_Size.y + value: 32 + objectReference: {fileID: 0} + - target: {fileID: 4024654762168814420, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4024654762168814420, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4024654762168814420, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4024654762168814420, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4024654762168814420, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4024654762168814421, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + propertyPath: Spatialize + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4024654762168814421, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + propertyPath: OutputAudioMixerGroup + value: + objectReference: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} + - target: {fileID: 4024654762168814421, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + propertyPath: panLevelCustomCurve.m_Curve.Array.data[0].value + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4649580226607449371, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4649580226607449371, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0.007 + objectReference: {fileID: 0} + - target: {fileID: 5037185138549003642, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5037185138549003642, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5037185138549003642, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5037185138549003642, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5037185138549003642, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5037185138549003643, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + propertyPath: Spatialize + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5037185138549003643, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + propertyPath: OutputAudioMixerGroup + value: + objectReference: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} + - target: {fileID: 5037185138549003643, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + propertyPath: panLevelCustomCurve.m_Curve.Array.data[0].value + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5037185138549003647, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + propertyPath: m_Size.y + value: 32 + objectReference: {fileID: 0} + - target: {fileID: 5041229438117663422, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5041229438117663422, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5041229438117663422, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5041229438117663422, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5041229438117663422, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5041229438117663422, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5550144344218582306, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5550144344218582306, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5550144344218582306, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5550144344218582306, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5550144344218582306, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5550144344218582306, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6196913203719988352, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6196913203719988352, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6196913203719988352, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6196913203719988352, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6196913203719988352, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6196913203719988352, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6439058074634937319, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + propertyPath: m_LocalPosition.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6439058074634937319, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + propertyPath: m_AnchoredPosition.x + value: -0.0245 + objectReference: {fileID: 0} + - target: {fileID: 6709910909478096088, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6709910909478096088, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6709910909478096088, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6709910909478096088, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6709910909478096088, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6709910909478096089, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + propertyPath: Spatialize + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6709910909478096089, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + propertyPath: OutputAudioMixerGroup + value: + objectReference: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} + - target: {fileID: 6709910909478096089, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + propertyPath: panLevelCustomCurve.m_Curve.Array.data[0].value + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6709910909478096093, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + propertyPath: m_Size.y + value: 32 + objectReference: {fileID: 0} + - target: {fileID: 7319868907967457361, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + propertyPath: Spatialize + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7319868907967457361, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + propertyPath: OutputAudioMixerGroup + value: + objectReference: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} + - target: {fileID: 7319868907967457361, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + propertyPath: panLevelCustomCurve.m_Curve.Array.data[0].value + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7613463721665348061, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + propertyPath: m_LocalPosition.y + value: 0.016499994 + objectReference: {fileID: 0} + - target: {fileID: 7613463722260290446, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + propertyPath: m_RootOrder + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 8403003260084890620, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8468582706564339464, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + propertyPath: m_RootOrder + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 8468582706564339464, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + propertyPath: m_LocalPosition.x + value: -0.842 + objectReference: {fileID: 0} + - target: {fileID: 8468582706564339464, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + propertyPath: m_LocalPosition.y + value: -0.22770001 + objectReference: {fileID: 0} + - target: {fileID: 8468582706564339464, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + propertyPath: m_LocalPosition.z + value: -0.247 + objectReference: {fileID: 0} + - target: {fileID: 8468582706564339464, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + propertyPath: m_LocalRotation.w + value: 0.92387956 + objectReference: {fileID: 0} + - target: {fileID: 8468582706564339464, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8468582706564339464, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + propertyPath: m_LocalRotation.y + value: -0.38268343 + objectReference: {fileID: 0} + - target: {fileID: 8468582706564339464, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8468582706564339464, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8468582706564339464, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -45 + objectReference: {fileID: 0} + - target: {fileID: 8468582706564339464, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8709965229930214236, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + propertyPath: Spatialize + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8709965229930214236, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + propertyPath: OutputAudioMixerGroup + value: + objectReference: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} + - target: {fileID: 8709965229930214236, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + propertyPath: panLevelCustomCurve.m_Curve.Array.data[0].value + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} +--- !u!1 &1824793668 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 8372833645970865070, guid: a31291e7cd07cc34f9b29ec2a6ab7224, type: 3} + m_PrefabInstance: {fileID: 1824793667} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1824793669 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1824793668} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 80f85af46f9bddd4ea78f11cee5e3b2e, type: 3} + m_Name: + m_EditorClassIdentifier: + handType: 3 + proximityType: 3 + executionOrder: 0 + minimumScale: {x: 0.2, y: 0.2, z: 0.2} + maximumScale: {x: 2, y: 2, z: 2} + relativeToInitialState: 1 +--- !u!1 &1852224430 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1852224431} + m_Layer: 0 + m_Name: Press Interaction + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1852224431 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1852224430} + 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} + - {fileID: 1357577558} + - {fileID: 884765057} + - {fileID: 1089489031} + - {fileID: 1404428861} + m_Father: {fileID: 1203713056} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &1866417129 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1203713056} + m_Modifications: + - target: {fileID: 2415827607033482817, guid: 5be1d1dda43e3ed40b18f4eb09e144fa, type: 3} + propertyPath: m_RootOrder + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 2415827607033482817, guid: 5be1d1dda43e3ed40b18f4eb09e144fa, type: 3} + propertyPath: m_LocalPosition.x + value: -0.689 + objectReference: {fileID: 0} + - target: {fileID: 2415827607033482817, guid: 5be1d1dda43e3ed40b18f4eb09e144fa, type: 3} + propertyPath: m_LocalPosition.y + value: -0.17869999 + objectReference: {fileID: 0} + - target: {fileID: 2415827607033482817, guid: 5be1d1dda43e3ed40b18f4eb09e144fa, type: 3} + propertyPath: m_LocalPosition.z + value: -0.22100002 + objectReference: {fileID: 0} + - target: {fileID: 2415827607033482817, guid: 5be1d1dda43e3ed40b18f4eb09e144fa, type: 3} + propertyPath: m_LocalRotation.w + value: 0.68816733 + objectReference: {fileID: 0} + - target: {fileID: 2415827607033482817, guid: 5be1d1dda43e3ed40b18f4eb09e144fa, type: 3} + propertyPath: m_LocalRotation.x + value: -0.6654007 + objectReference: {fileID: 0} + - target: {fileID: 2415827607033482817, guid: 5be1d1dda43e3ed40b18f4eb09e144fa, type: 3} + propertyPath: m_LocalRotation.y + value: 0.23925261 + objectReference: {fileID: 0} + - target: {fileID: 2415827607033482817, guid: 5be1d1dda43e3ed40b18f4eb09e144fa, type: 3} + propertyPath: m_LocalRotation.z + value: -0.1625602 + objectReference: {fileID: 0} + - target: {fileID: 2415827607033482817, guid: 5be1d1dda43e3ed40b18f4eb09e144fa, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -56.932 + objectReference: {fileID: 0} + - target: {fileID: 2415827607033482817, guid: 5be1d1dda43e3ed40b18f4eb09e144fa, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 2415827607033482817, guid: 5be1d1dda43e3ed40b18f4eb09e144fa, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -83.514 + objectReference: {fileID: 0} + - target: {fileID: 3084243108605482235, guid: 5be1d1dda43e3ed40b18f4eb09e144fa, type: 3} + propertyPath: m_Name + value: Pen + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 5be1d1dda43e3ed40b18f4eb09e144fa, type: 3} +--- !u!1 &1866417130 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3084243108605482235, guid: 5be1d1dda43e3ed40b18f4eb09e144fa, type: 3} + m_PrefabInstance: {fileID: 1866417129} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1866417131 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1866417130} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 80f85af46f9bddd4ea78f11cee5e3b2e, type: 3} + m_Name: + m_EditorClassIdentifier: + handType: 3 + proximityType: 3 + executionOrder: 0 + minimumScale: {x: 0.2, y: 0.2, z: 0.2} + maximumScale: {x: 2, y: 2, z: 2} + relativeToInitialState: 1 +--- !u!82 &1893505840 stripped +AudioSource: + m_CorrespondingSourceObject: {fileID: 7701165343254955965, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + m_PrefabInstance: {fileID: 364946991195464072} + m_PrefabAsset: {fileID: 0} +--- !u!1 &1913468801 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1913468802} + m_Layer: 0 + m_Name: Bounding Box + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1913468802 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1913468801} + 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} + - {fileID: 235624891} + - {fileID: 251265372} + - {fileID: 37831752} + - {fileID: 730431821} + - {fileID: 105991072} + - {fileID: 2059242324} + - {fileID: 828245820} + m_Father: {fileID: 1203713056} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &1923515644 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 2131597836} + m_Modifications: + - target: {fileID: 100000, guid: 1b72c1e6302ca7542afd89257b6367aa, type: 3} + propertyPath: m_Name + value: HumanHeart + objectReference: {fileID: 0} + - target: {fileID: 100002, guid: 1b72c1e6302ca7542afd89257b6367aa, type: 3} + propertyPath: m_Name + value: Model + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1b72c1e6302ca7542afd89257b6367aa, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1b72c1e6302ca7542afd89257b6367aa, type: 3} + propertyPath: m_LocalScale.x + value: 53.783936 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1b72c1e6302ca7542afd89257b6367aa, type: 3} + propertyPath: m_LocalScale.y + value: 53.783928 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1b72c1e6302ca7542afd89257b6367aa, type: 3} + propertyPath: m_LocalScale.z + value: 53.783936 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1b72c1e6302ca7542afd89257b6367aa, type: 3} + propertyPath: m_LocalPosition.x + value: 1.186 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1b72c1e6302ca7542afd89257b6367aa, type: 3} + propertyPath: m_LocalPosition.y + value: -0.02785001 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1b72c1e6302ca7542afd89257b6367aa, type: 3} + propertyPath: m_LocalPosition.z + value: 0.686 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1b72c1e6302ca7542afd89257b6367aa, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1b72c1e6302ca7542afd89257b6367aa, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1b72c1e6302ca7542afd89257b6367aa, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1b72c1e6302ca7542afd89257b6367aa, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1b72c1e6302ca7542afd89257b6367aa, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1b72c1e6302ca7542afd89257b6367aa, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 1b72c1e6302ca7542afd89257b6367aa, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400002, guid: 1b72c1e6302ca7542afd89257b6367aa, type: 3} + propertyPath: m_LocalPosition.x + value: -0.00001 + objectReference: {fileID: 0} + - target: {fileID: 400002, guid: 1b72c1e6302ca7542afd89257b6367aa, type: 3} + propertyPath: m_LocalPosition.z + value: 0.00005 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 1b72c1e6302ca7542afd89257b6367aa, type: 3} +--- !u!4 &1923515645 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 400000, guid: 1b72c1e6302ca7542afd89257b6367aa, type: 3} + m_PrefabInstance: {fileID: 1923515644} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1923515646 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1724991365} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 80f85af46f9bddd4ea78f11cee5e3b2e, type: 3} + m_Name: + m_EditorClassIdentifier: + handType: 3 + proximityType: 3 + executionOrder: 0 + minimumScale: {x: 0.2, y: 0.2, z: 0.2} + maximumScale: {x: 2, y: 2, z: 2} + relativeToInitialState: 1 +--- !u!136 &1929573049 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4654093213557177396} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + m_Radius: 10.918639 + m_Height: 26.952131 + m_Direction: 1 + m_Center: {x: 0.15130833, y: 8.446082, z: 0.49216396} +--- !u!114 &1929573050 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4654093213557177396} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2dd6a517ee866ae45ae8fac60a8d0547, type: 3} + m_Name: + m_EditorClassIdentifier: + m_InteractionManager: {fileID: 0} + m_Colliders: [] + m_InteractionLayers: + m_Bits: 1 + m_DistanceCalculationMode: 1 + m_SelectMode: 0 + m_FocusMode: 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: [] + m_LastHoverExited: + m_PersistentCalls: + m_Calls: [] + m_HoverEntered: + m_PersistentCalls: + m_Calls: [] + m_HoverExited: + m_PersistentCalls: + m_Calls: [] + m_FirstSelectEntered: + m_PersistentCalls: + m_Calls: [] + m_LastSelectExited: + m_PersistentCalls: + m_Calls: [] + m_SelectEntered: + m_PersistentCalls: + m_Calls: [] + m_SelectExited: + m_PersistentCalls: + m_Calls: [] + m_FirstFocusEntered: + m_PersistentCalls: + m_Calls: [] + m_LastFocusExited: + m_PersistentCalls: + m_Calls: [] + m_FocusEntered: + m_PersistentCalls: + m_Calls: [] + m_FocusExited: + m_PersistentCalls: + m_Calls: [] + m_Activated: + m_PersistentCalls: + m_Calls: [] + m_Deactivated: + m_PersistentCalls: + m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] + isGazePinchSelected: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isRaySelected: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isPokeSelected: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isGrabSelected: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isGazeHovered: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isGazePinchHovered: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isRayHovered: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isGrabHovered: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isPokeHovered: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1929573051} + m_TargetAssemblyTypeName: MixedReality.Toolkit.Examples.Demos.ObjectSpinner, + Assembly-CSharp + m_MethodName: StartRotation + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - m_Target: {fileID: 1929573052} + m_TargetAssemblyTypeName: UnityEngine.AudioSource, UnityEngine + m_MethodName: PlayOneShot + m_Mode: 2 + m_Arguments: + m_ObjectArgument: {fileID: 8300000, guid: c6586241cbe52ba44b40351d74c9dc39, type: 3} + m_ObjectArgumentAssemblyTypeName: UnityEngine.AudioClip, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + onExited: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1929573051} + m_TargetAssemblyTypeName: MixedReality.Toolkit.Examples.Demos.ObjectSpinner, + Assembly-CSharp + m_MethodName: StopRotation + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + isActiveHovered: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + disabledInteractorTypes: [] + k__BackingField: 0 + k__BackingField: 0.9 + k__BackingField: 0.1 + k__BackingField: 1 + k__BackingField: 0 + k__BackingField: 1 + k__BackingField: 0 + k__BackingField: 1 + allowSelectByVoice: 1 + speechRecognitionKeyword: select + k__BackingField: 1 + k__BackingField: 0 + k__BackingField: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + k__BackingField: + m_PersistentCalls: + m_Calls: [] + k__BackingField: + m_PersistentCalls: + m_Calls: [] + k__BackingField: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &1929573051 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4654093213557177396} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6346906f655068741b42219fbe2aeec1, type: 3} + m_Name: + m_EditorClassIdentifier: + angularVelocity: 300 + rotationAxis: {x: 0, y: 1, z: 0} +--- !u!82 &1929573052 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4654093213557177396} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} + m_audioClip: {fileID: 0} + m_PlayOnAwake: 1 + m_Volume: 1 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 1 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 +--- !u!82 &1951404609 stripped +AudioSource: + m_CorrespondingSourceObject: {fileID: 7513506229924595575, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + m_PrefabInstance: {fileID: 364946991195464072} + m_PrefabAsset: {fileID: 0} +--- !u!1 &1959878136 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 100020, guid: f9a8072f5d9b92347a999f10f01b8012, type: 3} + m_PrefabInstance: {fileID: 1294530691} + m_PrefabAsset: {fileID: 0} +--- !u!136 &1959878137 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1959878136} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + m_Radius: 0.03228122 + m_Height: 0.15444481 + m_Direction: 1 + m_Center: {x: 0.0000022076192, y: -0.055035967, z: 0.00617202} +--- !u!1001 &1996988709 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1404428861} + m_Modifications: + - target: {fileID: 2712310172936119071, guid: 698c502bf492aec45af6a7b04219d34b, type: 3} + propertyPath: OnClicked.m_PersistentCalls.m_Calls.Array.size + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2712310172936119071, guid: 698c502bf492aec45af6a7b04219d34b, type: 3} + propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2712310172936119071, guid: 698c502bf492aec45af6a7b04219d34b, type: 3} + propertyPath: m_LastSelectExited.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2712310172936119071, guid: 698c502bf492aec45af6a7b04219d34b, type: 3} + propertyPath: OnClicked.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 2712310172936119071, guid: 698c502bf492aec45af6a7b04219d34b, type: 3} + propertyPath: OnClicked.m_PersistentCalls.m_Calls.Array.data[1].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2712310172936119071, guid: 698c502bf492aec45af6a7b04219d34b, type: 3} + propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2712310172936119071, guid: 698c502bf492aec45af6a7b04219d34b, type: 3} + propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[1].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2712310172936119071, guid: 698c502bf492aec45af6a7b04219d34b, type: 3} + propertyPath: m_FirstSelectEntered.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2712310172936119071, guid: 698c502bf492aec45af6a7b04219d34b, type: 3} + propertyPath: OnClicked.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 0} + - target: {fileID: 2712310172936119071, guid: 698c502bf492aec45af6a7b04219d34b, type: 3} + propertyPath: OnClicked.m_PersistentCalls.m_Calls.Array.data[1].m_Target + value: + objectReference: {fileID: 884765058} + - target: {fileID: 2712310172936119071, guid: 698c502bf492aec45af6a7b04219d34b, type: 3} + propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 884765058} + - target: {fileID: 2712310172936119071, guid: 698c502bf492aec45af6a7b04219d34b, type: 3} + propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[1].m_Target + value: + objectReference: {fileID: 884765058} + - target: {fileID: 2712310172936119071, guid: 698c502bf492aec45af6a7b04219d34b, type: 3} + propertyPath: OnClicked.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2712310172936119071, guid: 698c502bf492aec45af6a7b04219d34b, type: 3} + propertyPath: OnClicked.m_PersistentCalls.m_Calls.Array.data[1].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2712310172936119071, guid: 698c502bf492aec45af6a7b04219d34b, type: 3} + propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2712310172936119071, guid: 698c502bf492aec45af6a7b04219d34b, type: 3} + propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[1].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2712310172936119071, guid: 698c502bf492aec45af6a7b04219d34b, type: 3} + propertyPath: OnClicked.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: Play + objectReference: {fileID: 0} + - target: {fileID: 2712310172936119071, guid: 698c502bf492aec45af6a7b04219d34b, type: 3} + propertyPath: OnClicked.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName + value: Increment + objectReference: {fileID: 0} + - target: {fileID: 2712310172936119071, guid: 698c502bf492aec45af6a7b04219d34b, type: 3} + propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: Increment + objectReference: {fileID: 0} + - target: {fileID: 2712310172936119071, guid: 698c502bf492aec45af6a7b04219d34b, type: 3} + propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName + value: Increment + objectReference: {fileID: 0} + - target: {fileID: 2712310172936119071, guid: 698c502bf492aec45af6a7b04219d34b, type: 3} + propertyPath: m_LastSelectExited.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2712310172936119071, guid: 698c502bf492aec45af6a7b04219d34b, type: 3} + propertyPath: m_FirstSelectEntered.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2712310172936119071, guid: 698c502bf492aec45af6a7b04219d34b, type: 3} + propertyPath: m_LastSelectExited.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 380279361} + - target: {fileID: 2712310172936119071, guid: 698c502bf492aec45af6a7b04219d34b, type: 3} + propertyPath: m_FirstSelectEntered.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 380279361} + - target: {fileID: 2712310172936119071, guid: 698c502bf492aec45af6a7b04219d34b, type: 3} + propertyPath: m_LastSelectExited.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2712310172936119071, guid: 698c502bf492aec45af6a7b04219d34b, type: 3} + propertyPath: m_LastSelectExited.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: PlayOneShot + objectReference: {fileID: 0} + - target: {fileID: 2712310172936119071, guid: 698c502bf492aec45af6a7b04219d34b, type: 3} + propertyPath: m_FirstSelectEntered.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2712310172936119071, guid: 698c502bf492aec45af6a7b04219d34b, type: 3} + propertyPath: m_FirstSelectEntered.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: PlayOneShot + objectReference: {fileID: 0} + - target: {fileID: 2712310172936119071, guid: 698c502bf492aec45af6a7b04219d34b, type: 3} + propertyPath: OnClicked.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: UnityEngine.ParticleSystem, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 2712310172936119071, guid: 698c502bf492aec45af6a7b04219d34b, type: 3} + propertyPath: OnClicked.m_PersistentCalls.m_Calls.Array.data[1].m_TargetAssemblyTypeName + value: MixedReality.Toolkit.Examples.Demos.ColorChanger, Assembly-CSharp + objectReference: {fileID: 0} + - target: {fileID: 2712310172936119071, guid: 698c502bf492aec45af6a7b04219d34b, type: 3} + propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: MixedReality.Toolkit.Examples.Demos.ColorChanger, Assembly-CSharp + objectReference: {fileID: 0} + - target: {fileID: 2712310172936119071, guid: 698c502bf492aec45af6a7b04219d34b, type: 3} + propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[1].m_TargetAssemblyTypeName + value: MixedReality.Toolkit.Examples.Demos.ColorChanger, Assembly-CSharp + objectReference: {fileID: 0} + - target: {fileID: 2712310172936119071, guid: 698c502bf492aec45af6a7b04219d34b, type: 3} + propertyPath: OnClicked.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_BoolArgument + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2712310172936119071, guid: 698c502bf492aec45af6a7b04219d34b, type: 3} + propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_BoolArgument + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2712310172936119071, guid: 698c502bf492aec45af6a7b04219d34b, type: 3} + propertyPath: m_LastSelectExited.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: UnityEngine.AudioSource, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 2712310172936119071, guid: 698c502bf492aec45af6a7b04219d34b, type: 3} + propertyPath: m_FirstSelectEntered.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: UnityEngine.AudioSource, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 2712310172936119071, guid: 698c502bf492aec45af6a7b04219d34b, type: 3} + propertyPath: m_LastSelectExited.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgument + value: + objectReference: {fileID: 8300000, guid: f2b39c1fa02395640bced3c8e5f9696e, type: 3} + - target: {fileID: 2712310172936119071, guid: 698c502bf492aec45af6a7b04219d34b, type: 3} + propertyPath: m_FirstSelectEntered.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgument + value: + objectReference: {fileID: 8300000, guid: 3e4887b6014c9e04290e816ac261a414, type: 3} + - target: {fileID: 2712310172936119071, guid: 698c502bf492aec45af6a7b04219d34b, type: 3} + propertyPath: OnClicked.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 2712310172936119071, guid: 698c502bf492aec45af6a7b04219d34b, type: 3} + propertyPath: OnClicked.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 2712310172936119071, guid: 698c502bf492aec45af6a7b04219d34b, type: 3} + propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 2712310172936119071, guid: 698c502bf492aec45af6a7b04219d34b, type: 3} + propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 2712310172936119071, guid: 698c502bf492aec45af6a7b04219d34b, type: 3} + propertyPath: m_LastSelectExited.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.AudioClip, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 2712310172936119071, guid: 698c502bf492aec45af6a7b04219d34b, type: 3} + propertyPath: m_FirstSelectEntered.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.AudioClip, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 3445153172489160041, guid: 698c502bf492aec45af6a7b04219d34b, type: 3} + propertyPath: m_LocalPosition.z + value: -0.37946695 + objectReference: {fileID: 0} + - target: {fileID: 4639606898651727610, guid: 698c502bf492aec45af6a7b04219d34b, type: 3} + propertyPath: m_Name + value: PressableButton_Custom_Cylinder (1) + objectReference: {fileID: 0} + - target: {fileID: 5415826251688893504, guid: 698c502bf492aec45af6a7b04219d34b, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5415826251688893504, guid: 698c502bf492aec45af6a7b04219d34b, type: 3} + propertyPath: m_LocalPosition.x + value: -0.0929 + objectReference: {fileID: 0} + - target: {fileID: 5415826251688893504, guid: 698c502bf492aec45af6a7b04219d34b, type: 3} + propertyPath: m_LocalPosition.y + value: -0.7 + objectReference: {fileID: 0} + - target: {fileID: 5415826251688893504, guid: 698c502bf492aec45af6a7b04219d34b, type: 3} + propertyPath: m_LocalPosition.z + value: -0.03460002 + objectReference: {fileID: 0} + - target: {fileID: 5415826251688893504, guid: 698c502bf492aec45af6a7b04219d34b, type: 3} + propertyPath: m_LocalRotation.w + value: 0.92387956 + objectReference: {fileID: 0} + - target: {fileID: 5415826251688893504, guid: 698c502bf492aec45af6a7b04219d34b, type: 3} + propertyPath: m_LocalRotation.x + value: 0.38268343 + objectReference: {fileID: 0} + - target: {fileID: 5415826251688893504, guid: 698c502bf492aec45af6a7b04219d34b, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5415826251688893504, guid: 698c502bf492aec45af6a7b04219d34b, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5415826251688893504, guid: 698c502bf492aec45af6a7b04219d34b, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 45 + objectReference: {fileID: 0} + - target: {fileID: 5415826251688893504, guid: 698c502bf492aec45af6a7b04219d34b, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5415826251688893504, guid: 698c502bf492aec45af6a7b04219d34b, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 698c502bf492aec45af6a7b04219d34b, type: 3} +--- !u!4 &1996988710 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5415826251688893504, guid: 698c502bf492aec45af6a7b04219d34b, type: 3} + m_PrefabInstance: {fileID: 1996988709} + m_PrefabAsset: {fileID: 0} +--- !u!1 &1998461901 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1998461902} + - component: {fileID: 1998461904} + - component: {fileID: 1998461903} + m_Layer: 0 + m_Name: SectionTitle (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1998461902 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1998461901} + 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 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -0.1158, y: 0.14752} + m_SizeDelta: {x: 26.29578, y: 8.84} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1998461903 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1998461901} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9541d86e2fd84c1d9990edf0852d74ab, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: "Canvas + Volumetric UI\n\nMRTK3 provides rich volumetric + UI integrated with Unity\u2019s Canvas system. It allows you to build flexible, + responsive, and systematic UI\r \nusing Canvas capabilities such as Layout Group, + Content Size Fitter, and Layout Element." + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 533bdd8d5c92b52448ee2ecf7bd828a4, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: b082f80c6b45164418a354f7e116f0a3, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 8 + m_fontSizeBase: 8 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 0 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + 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 +--- !u!23 &1998461904 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1998461901} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: b082f80c6b45164418a354f7e116f0a3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!1 &2026715036 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2026715037} + - component: {fileID: 2026715038} + m_Layer: 0 + m_Name: MRTK_Logo_White + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2026715037 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2026715036} + 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 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &2026715038 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2026715036} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300000, guid: fe5cc215f12ea5e40b5021c4040bce24, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 20.48, y: 10.24} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &2040252716 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2040252717} + - component: {fileID: 2040252719} + - component: {fileID: 2040252718} + m_Layer: 0 + m_Name: SectionTitle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2040252717 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2040252716} + 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 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -0.326, y: -0.0052} + m_SizeDelta: {x: 29.3811, y: 5} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2040252718 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2040252716} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9541d86e2fd84c1d9990edf0852d74ab, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: 'BoundsControl + + with Bounding Box + + + New + design language, feedback, and architecture for handle-based manipulations with + BoundsControl.cs' + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 533bdd8d5c92b52448ee2ecf7bd828a4, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: b082f80c6b45164418a354f7e116f0a3, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 8 + m_fontSizeBase: 8 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 0 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + 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 +--- !u!23 &2040252719 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2040252716} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: b082f80c6b45164418a354f7e116f0a3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!1 &2059242323 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2059242324} + - component: {fileID: 2059242326} + - component: {fileID: 2059242325} + m_Layer: 0 + m_Name: Text (TMP) (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2059242324 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2059242323} + 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 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -0.38796, y: -0.5461} + m_SizeDelta: {x: 17.27645, y: 5} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2059242325 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2059242323} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9541d86e2fd84c1d9990edf0852d74ab, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: 'Traditional Style + + Select + to Activate' + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 533bdd8d5c92b52448ee2ecf7bd828a4, type: 2} + m_sharedMaterial: {fileID: -1005824763306460071, guid: 533bdd8d5c92b52448ee2ecf7bd828a4, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 36 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 0 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + 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 +--- !u!23 &2059242326 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2059242323} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: -1005824763306460071, guid: 533bdd8d5c92b52448ee2ecf7bd828a4, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!82 &2067303307 stripped +AudioSource: + m_CorrespondingSourceObject: {fileID: 6913780721799234531, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + m_PrefabInstance: {fileID: 364946991195464072} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &2096650619 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1089489031} + m_Modifications: + - target: {fileID: 3738767603136113390, guid: c9b1a111fa131cc48b6c4daedd47efe3, type: 3} + propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3738767603136113390, guid: c9b1a111fa131cc48b6c4daedd47efe3, type: 3} + propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3738767603136113390, guid: c9b1a111fa131cc48b6c4daedd47efe3, type: 3} + propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 884765058} + - target: {fileID: 3738767603136113390, guid: c9b1a111fa131cc48b6c4daedd47efe3, type: 3} + propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3738767603136113390, guid: c9b1a111fa131cc48b6c4daedd47efe3, type: 3} + propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: Increment + objectReference: {fileID: 0} + - target: {fileID: 3738767603136113390, guid: c9b1a111fa131cc48b6c4daedd47efe3, type: 3} + propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: MixedReality.Toolkit.Examples.Demos.ColorChanger, Assembly-CSharp + objectReference: {fileID: 0} + - target: {fileID: 3738767603136113390, guid: c9b1a111fa131cc48b6c4daedd47efe3, type: 3} + propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 3738767603464604106, guid: c9b1a111fa131cc48b6c4daedd47efe3, type: 3} + propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3738767603464604106, guid: c9b1a111fa131cc48b6c4daedd47efe3, type: 3} + propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3738767603464604106, guid: c9b1a111fa131cc48b6c4daedd47efe3, type: 3} + propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 884765058} + - target: {fileID: 3738767603464604106, guid: c9b1a111fa131cc48b6c4daedd47efe3, type: 3} + propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3738767603464604106, guid: c9b1a111fa131cc48b6c4daedd47efe3, type: 3} + propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: Increment + objectReference: {fileID: 0} + - target: {fileID: 3738767603464604106, guid: c9b1a111fa131cc48b6c4daedd47efe3, type: 3} + propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: MixedReality.Toolkit.Examples.Demos.ColorChanger, Assembly-CSharp + objectReference: {fileID: 0} + - target: {fileID: 3738767603464604106, guid: c9b1a111fa131cc48b6c4daedd47efe3, type: 3} + propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 3738767603707512081, guid: c9b1a111fa131cc48b6c4daedd47efe3, type: 3} + propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3738767603707512081, guid: c9b1a111fa131cc48b6c4daedd47efe3, type: 3} + propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3738767603707512081, guid: c9b1a111fa131cc48b6c4daedd47efe3, type: 3} + propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 884765058} + - target: {fileID: 3738767603707512081, guid: c9b1a111fa131cc48b6c4daedd47efe3, type: 3} + propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3738767603707512081, guid: c9b1a111fa131cc48b6c4daedd47efe3, type: 3} + propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: Increment + objectReference: {fileID: 0} + - target: {fileID: 3738767603707512081, guid: c9b1a111fa131cc48b6c4daedd47efe3, type: 3} + propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: MixedReality.Toolkit.Examples.Demos.ColorChanger, Assembly-CSharp + objectReference: {fileID: 0} + - target: {fileID: 3738767603707512081, guid: c9b1a111fa131cc48b6c4daedd47efe3, type: 3} + propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 3738767604241656465, guid: c9b1a111fa131cc48b6c4daedd47efe3, type: 3} + propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3738767604241656465, guid: c9b1a111fa131cc48b6c4daedd47efe3, type: 3} + propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3738767604241656465, guid: c9b1a111fa131cc48b6c4daedd47efe3, type: 3} + propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 884765058} + - target: {fileID: 3738767604241656465, guid: c9b1a111fa131cc48b6c4daedd47efe3, type: 3} + propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3738767604241656465, guid: c9b1a111fa131cc48b6c4daedd47efe3, type: 3} + propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: Increment + objectReference: {fileID: 0} + - target: {fileID: 3738767604241656465, guid: c9b1a111fa131cc48b6c4daedd47efe3, type: 3} + propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: MixedReality.Toolkit.Examples.Demos.ColorChanger, Assembly-CSharp + objectReference: {fileID: 0} + - target: {fileID: 3738767604241656465, guid: c9b1a111fa131cc48b6c4daedd47efe3, type: 3} + propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 3969343301381823962, guid: c9b1a111fa131cc48b6c4daedd47efe3, type: 3} + propertyPath: m_LocalScale.x + value: 0.13700001 + objectReference: {fileID: 0} + - target: {fileID: 3969343301381823962, guid: c9b1a111fa131cc48b6c4daedd47efe3, type: 3} + propertyPath: m_LocalScale.y + value: 0.040000003 + objectReference: {fileID: 0} + - target: {fileID: 3969343301381823962, guid: c9b1a111fa131cc48b6c4daedd47efe3, type: 3} + propertyPath: m_LocalPosition.x + value: 0.0485 + objectReference: {fileID: 0} + - target: {fileID: 3969343301381823962, guid: c9b1a111fa131cc48b6c4daedd47efe3, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3969343301381823962, guid: c9b1a111fa131cc48b6c4daedd47efe3, type: 3} + propertyPath: m_LocalPosition.z + value: 0.005 + objectReference: {fileID: 0} + - target: {fileID: 4042998139036849030, guid: c9b1a111fa131cc48b6c4daedd47efe3, type: 3} + propertyPath: m_TextStyleHashCode + value: -1183493901 + objectReference: {fileID: 0} + - target: {fileID: 4042998139641244439, guid: c9b1a111fa131cc48b6c4daedd47efe3, type: 3} + propertyPath: m_LocalPosition.x + value: 0.064 + objectReference: {fileID: 0} + - target: {fileID: 4042998139673148537, guid: c9b1a111fa131cc48b6c4daedd47efe3, type: 3} + propertyPath: m_TextStyleHashCode + value: -1183493901 + objectReference: {fileID: 0} + - target: {fileID: 4042998139867488093, guid: c9b1a111fa131cc48b6c4daedd47efe3, type: 3} + propertyPath: m_TextStyleHashCode + value: -1183493901 + objectReference: {fileID: 0} + - target: {fileID: 4042998140177466519, guid: c9b1a111fa131cc48b6c4daedd47efe3, type: 3} + propertyPath: m_LocalPosition.x + value: 0.032 + objectReference: {fileID: 0} + - target: {fileID: 4042998140648635398, guid: c9b1a111fa131cc48b6c4daedd47efe3, type: 3} + propertyPath: m_TextStyleHashCode + value: -1183493901 + objectReference: {fileID: 0} + - target: {fileID: 4042998141007513676, guid: c9b1a111fa131cc48b6c4daedd47efe3, type: 3} + propertyPath: m_LocalPosition.x + value: 0.09700001 + objectReference: {fileID: 0} + - target: {fileID: 5406764374972338603, guid: c9b1a111fa131cc48b6c4daedd47efe3, type: 3} + propertyPath: currentIconName + value: Icon 74 + objectReference: {fileID: 0} + - target: {fileID: 5406764375541661268, guid: c9b1a111fa131cc48b6c4daedd47efe3, type: 3} + propertyPath: currentIconName + value: Icon 91 + objectReference: {fileID: 0} + - target: {fileID: 5406764375752056176, guid: c9b1a111fa131cc48b6c4daedd47efe3, type: 3} + propertyPath: currentIconName + value: Icon 139 + objectReference: {fileID: 0} + - target: {fileID: 5406764376579440171, guid: c9b1a111fa131cc48b6c4daedd47efe3, type: 3} + propertyPath: currentIconName + value: Icon 26 + objectReference: {fileID: 0} + - target: {fileID: 6346992630909358134, guid: c9b1a111fa131cc48b6c4daedd47efe3, type: 3} + propertyPath: Spatialize + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6346992630909358134, guid: c9b1a111fa131cc48b6c4daedd47efe3, type: 3} + propertyPath: OutputAudioMixerGroup + value: + objectReference: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} + - target: {fileID: 6346992630909358134, guid: c9b1a111fa131cc48b6c4daedd47efe3, type: 3} + propertyPath: panLevelCustomCurve.m_Curve.Array.data[0].value + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6346992631117673234, guid: c9b1a111fa131cc48b6c4daedd47efe3, type: 3} + propertyPath: Spatialize + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6346992631117673234, guid: c9b1a111fa131cc48b6c4daedd47efe3, type: 3} + propertyPath: OutputAudioMixerGroup + value: + objectReference: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} + - target: {fileID: 6346992631117673234, guid: c9b1a111fa131cc48b6c4daedd47efe3, type: 3} + propertyPath: panLevelCustomCurve.m_Curve.Array.data[0].value + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6346992631411441609, guid: c9b1a111fa131cc48b6c4daedd47efe3, type: 3} + propertyPath: Spatialize + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6346992631411441609, guid: c9b1a111fa131cc48b6c4daedd47efe3, type: 3} + propertyPath: OutputAudioMixerGroup + value: + objectReference: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} + - target: {fileID: 6346992631411441609, guid: c9b1a111fa131cc48b6c4daedd47efe3, type: 3} + propertyPath: panLevelCustomCurve.m_Curve.Array.data[0].value + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6346992631951298633, guid: c9b1a111fa131cc48b6c4daedd47efe3, type: 3} + propertyPath: Spatialize + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6346992631951298633, guid: c9b1a111fa131cc48b6c4daedd47efe3, type: 3} + propertyPath: OutputAudioMixerGroup + value: + objectReference: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} + - target: {fileID: 6346992631951298633, guid: c9b1a111fa131cc48b6c4daedd47efe3, type: 3} + propertyPath: panLevelCustomCurve.m_Curve.Array.data[0].value + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6675957057147064828, guid: c9b1a111fa131cc48b6c4daedd47efe3, type: 3} + propertyPath: m_LocalPosition.x + value: 0.08050001 + objectReference: {fileID: 0} + - target: {fileID: 6675957057147064828, guid: c9b1a111fa131cc48b6c4daedd47efe3, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6675957057147064828, guid: c9b1a111fa131cc48b6c4daedd47efe3, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6675957057942723116, guid: c9b1a111fa131cc48b6c4daedd47efe3, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6675957057942723116, guid: c9b1a111fa131cc48b6c4daedd47efe3, type: 3} + propertyPath: m_LocalPosition.x + value: -0.101600006 + objectReference: {fileID: 0} + - target: {fileID: 6675957057942723116, guid: c9b1a111fa131cc48b6c4daedd47efe3, type: 3} + propertyPath: m_LocalPosition.y + value: -0.597 + objectReference: {fileID: 0} + - target: {fileID: 6675957057942723116, guid: c9b1a111fa131cc48b6c4daedd47efe3, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6675957057942723116, guid: c9b1a111fa131cc48b6c4daedd47efe3, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6675957057942723116, guid: c9b1a111fa131cc48b6c4daedd47efe3, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6675957057942723116, guid: c9b1a111fa131cc48b6c4daedd47efe3, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6675957057942723116, guid: c9b1a111fa131cc48b6c4daedd47efe3, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6675957057942723116, guid: c9b1a111fa131cc48b6c4daedd47efe3, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6675957057942723116, guid: c9b1a111fa131cc48b6c4daedd47efe3, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6675957057942723116, guid: c9b1a111fa131cc48b6c4daedd47efe3, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6675957057942723118, guid: c9b1a111fa131cc48b6c4daedd47efe3, type: 3} + propertyPath: m_Name + value: HorizontalAppBarWithDivider + objectReference: {fileID: 0} + - target: {fileID: 9220901756459817931, guid: c9b1a111fa131cc48b6c4daedd47efe3, type: 3} + propertyPath: m_text + value: "\uEB43" + objectReference: {fileID: 0} + - target: {fileID: 9220901757435337652, guid: c9b1a111fa131cc48b6c4daedd47efe3, type: 3} + propertyPath: m_text + value: "\uF472" + objectReference: {fileID: 0} + - target: {fileID: 9220901757761157264, guid: c9b1a111fa131cc48b6c4daedd47efe3, type: 3} + propertyPath: m_text + value: "\uF84D" + objectReference: {fileID: 0} + - target: {fileID: 9220901758071895115, guid: c9b1a111fa131cc48b6c4daedd47efe3, type: 3} + propertyPath: m_text + value: "\uF342" + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: c9b1a111fa131cc48b6c4daedd47efe3, type: 3} +--- !u!4 &2096650620 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6675957057942723116, guid: c9b1a111fa131cc48b6c4daedd47efe3, type: 3} + m_PrefabInstance: {fileID: 2096650619} + m_PrefabAsset: {fileID: 0} +--- !u!1 &2123527392 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2123527393} + - component: {fileID: 2123527395} + - component: {fileID: 2123527394} + - component: {fileID: 2123527398} + - component: {fileID: 2123527397} + - component: {fileID: 2123527396} + - component: {fileID: 2123527399} + m_Layer: 0 + m_Name: Gem + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2123527393 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2123527392} + 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 + m_LocalEulerAnglesHint: {x: 24.512, y: -96.121, z: -22.092} +--- !u!23 &2123527394 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2123527392} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 4294967295 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 02946a87be9a8be44aca8f1495186a62, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &2123527395 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2123527392} + m_Mesh: {fileID: 6157117880141131119, guid: 99c778b0f87719f4180c4ff6a40ff370, type: 3} +--- !u!82 &2123527396 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2123527392} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} + m_audioClip: {fileID: 0} + m_PlayOnAwake: 1 + m_Volume: 1 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 1 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 +--- !u!114 &2123527397 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2123527392} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2dd6a517ee866ae45ae8fac60a8d0547, type: 3} + m_Name: + m_EditorClassIdentifier: + m_InteractionManager: {fileID: 0} + m_Colliders: [] + m_InteractionLayers: + m_Bits: 1 + m_DistanceCalculationMode: 1 + m_SelectMode: 0 + m_FocusMode: 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: [] + m_LastHoverExited: + m_PersistentCalls: + m_Calls: [] + m_HoverEntered: + m_PersistentCalls: + m_Calls: [] + m_HoverExited: + m_PersistentCalls: + m_Calls: [] + m_FirstSelectEntered: + m_PersistentCalls: + m_Calls: [] + m_LastSelectExited: + m_PersistentCalls: + m_Calls: [] + m_SelectEntered: + m_PersistentCalls: + m_Calls: [] + m_SelectExited: + m_PersistentCalls: + m_Calls: [] + m_FirstFocusEntered: + m_PersistentCalls: + m_Calls: [] + m_LastFocusExited: + m_PersistentCalls: + m_Calls: [] + m_FocusEntered: + m_PersistentCalls: + m_Calls: [] + m_FocusExited: + m_PersistentCalls: + m_Calls: [] + m_Activated: + m_PersistentCalls: + m_Calls: [] + m_Deactivated: + m_PersistentCalls: + m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] + isGazePinchSelected: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isRaySelected: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isPokeSelected: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isGrabSelected: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isGazeHovered: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isGazePinchHovered: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isRayHovered: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isGrabHovered: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + isPokeHovered: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 2123527396} + m_TargetAssemblyTypeName: UnityEngine.AudioSource, UnityEngine + m_MethodName: PlayOneShot + m_Mode: 2 + m_Arguments: + m_ObjectArgument: {fileID: 8300000, guid: 9d2d43ccc2bcea04894322c54263fa4b, type: 3} + m_ObjectArgumentAssemblyTypeName: UnityEngine.AudioClip, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - m_Target: {fileID: 2123527399} + m_TargetAssemblyTypeName: MixedReality.Toolkit.Examples.Demos.ObjectSpinner, + Assembly-CSharp + m_MethodName: StartRotation + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + onExited: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 2123527399} + m_TargetAssemblyTypeName: MixedReality.Toolkit.Examples.Demos.ObjectSpinner, + Assembly-CSharp + m_MethodName: StopRotation + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + isActiveHovered: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + disabledInteractorTypes: [] + k__BackingField: 0 + k__BackingField: 0.9 + k__BackingField: 0.1 + k__BackingField: 1 + k__BackingField: 0 + k__BackingField: 1 + k__BackingField: 0 + k__BackingField: 1 + allowSelectByVoice: 1 + speechRecognitionKeyword: select + k__BackingField: 1 + k__BackingField: 0 + k__BackingField: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] + k__BackingField: + m_PersistentCalls: + m_Calls: [] + k__BackingField: + m_PersistentCalls: + m_Calls: [] + k__BackingField: + m_PersistentCalls: + m_Calls: [] +--- !u!65 &2123527398 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2123527392} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 0.112064324, y: 0.13389134, z: 0.11896934} + m_Center: {x: -0.004010728, y: 0.012695584, z: -0.00058461254} +--- !u!114 &2123527399 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2123527392} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6346906f655068741b42219fbe2aeec1, type: 3} + m_Name: + m_EditorClassIdentifier: + angularVelocity: 300 + rotationAxis: {x: 0, y: 1, z: 0} +--- !u!1 &2126969654 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 100024, guid: f9a8072f5d9b92347a999f10f01b8012, type: 3} + m_PrefabInstance: {fileID: 1294530691} + m_PrefabAsset: {fileID: 0} +--- !u!136 &2126969655 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2126969654} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + m_Radius: 0.032281216 + m_Height: 0.15444481 + m_Direction: 1 + m_Center: {x: 0.00000202417, y: -0.05503555, z: 0.006171601} +--- !u!1001 &2128020769 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 782737666} + m_Modifications: + - target: {fileID: 2783974331088143781, guid: c25d8f2d22117bd40ad824684551fbde, type: 3} + propertyPath: Spatialize + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2783974331088143781, guid: c25d8f2d22117bd40ad824684551fbde, type: 3} + propertyPath: OutputAudioMixerGroup + value: + objectReference: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} + - target: {fileID: 2783974331088143781, guid: c25d8f2d22117bd40ad824684551fbde, type: 3} + propertyPath: panLevelCustomCurve.m_Curve.Array.data[0].value + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2843453459099959776, guid: c25d8f2d22117bd40ad824684551fbde, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 057a7bb98bb3cf64a8d90e1b4a324c0e, type: 3} + - target: {fileID: 5092507605265006331, guid: c25d8f2d22117bd40ad824684551fbde, type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 5092507605265006331, guid: c25d8f2d22117bd40ad824684551fbde, type: 3} + propertyPath: m_LocalPosition.x + value: 0.041 + objectReference: {fileID: 0} + - target: {fileID: 5092507605265006331, guid: c25d8f2d22117bd40ad824684551fbde, type: 3} + propertyPath: m_LocalPosition.y + value: -0.075500004 + objectReference: {fileID: 0} + - target: {fileID: 5092507605265006331, guid: c25d8f2d22117bd40ad824684551fbde, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5092507605265006331, guid: c25d8f2d22117bd40ad824684551fbde, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5092507605265006331, guid: c25d8f2d22117bd40ad824684551fbde, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5092507605265006331, guid: c25d8f2d22117bd40ad824684551fbde, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5092507605265006331, guid: c25d8f2d22117bd40ad824684551fbde, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5092507605265006331, guid: c25d8f2d22117bd40ad824684551fbde, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5092507605265006331, guid: c25d8f2d22117bd40ad824684551fbde, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5092507605265006331, guid: c25d8f2d22117bd40ad824684551fbde, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5092507606405556714, guid: c25d8f2d22117bd40ad824684551fbde, type: 3} + propertyPath: m_text + value: Keyboard + objectReference: {fileID: 0} + - target: {fileID: 5092507606405556714, guid: c25d8f2d22117bd40ad824684551fbde, type: 3} + propertyPath: m_TextStyleHashCode + value: -1183493901 + objectReference: {fileID: 0} + - target: {fileID: 5092507606858315802, guid: c25d8f2d22117bd40ad824684551fbde, type: 3} + propertyPath: m_Name + value: PressableButton_32x32mm_IconAndText + objectReference: {fileID: 0} + - target: {fileID: 5572466351762964349, guid: c25d8f2d22117bd40ad824684551fbde, type: 3} + propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5572466351762964349, guid: c25d8f2d22117bd40ad824684551fbde, type: 3} + propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5572466351762964349, guid: c25d8f2d22117bd40ad824684551fbde, type: 3} + propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 2128020772} + - target: {fileID: 5572466351762964349, guid: c25d8f2d22117bd40ad824684551fbde, type: 3} + propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 5572466351762964349, guid: c25d8f2d22117bd40ad824684551fbde, type: 3} + propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: OpenSystemKeyboard + objectReference: {fileID: 0} + - target: {fileID: 5572466351762964349, guid: c25d8f2d22117bd40ad824684551fbde, type: 3} + propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: MixedReality.Toolkit.Examples.Demos.SystemKeyboardExample, Assembly-CSharp + objectReference: {fileID: 0} + - target: {fileID: 5572466351762964349, guid: c25d8f2d22117bd40ad824684551fbde, type: 3} + propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: c25d8f2d22117bd40ad824684551fbde, type: 3} +--- !u!4 &2128020770 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5092507605265006331, guid: c25d8f2d22117bd40ad824684551fbde, type: 3} + m_PrefabInstance: {fileID: 2128020769} + m_PrefabAsset: {fileID: 0} +--- !u!1 &2128020771 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 5092507606858315802, guid: c25d8f2d22117bd40ad824684551fbde, type: 3} + m_PrefabInstance: {fileID: 2128020769} + m_PrefabAsset: {fileID: 0} +--- !u!114 &2128020772 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2128020771} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b713ab6189cb61a41920eb181d934f47, type: 3} + m_Name: + m_EditorClassIdentifier: + debugMessage: {fileID: 1099479635} + mixedRealityKeyboardPreview: {fileID: 392741046} +--- !u!1 &2131597835 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2131597836} + m_Layer: 0 + m_Name: Far Interactions + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2131597836 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2131597835} + 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} + - {fileID: 956891493} + m_Father: {fileID: 1708103290} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!4 &4326491061339189 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 369246453490017725, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + m_PrefabInstance: {fileID: 364946991195464072} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &364946991195464072 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1404428861} + m_Modifications: + - target: {fileID: 38784627857828811, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: m_LocalPosition.z + value: -0.01550013 + objectReference: {fileID: 0} + - target: {fileID: 155148266066309764, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: Spatialize + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 155148266066309764, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: OutputAudioMixerGroup + value: + objectReference: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} + - target: {fileID: 155148266066309764, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: panLevelCustomCurve.m_Curve.Array.data[0].value + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 219735984879457998, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 303053968431071717, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: Spatialize + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 303053968431071717, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: OutputAudioMixerGroup + value: + objectReference: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} + - target: {fileID: 303053968431071717, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: panLevelCustomCurve.m_Curve.Array.data[0].value + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 364946990060500174, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: startPushPlane + value: -0.01550013 + objectReference: {fileID: 0} + - target: {fileID: 364946990060500174, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: m_InteractionManager + value: + objectReference: {fileID: 0} + - target: {fileID: 364946990060500174, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isRaySelected.onEntered.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 364946990060500174, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isGazePinchSelected.onEntered.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 364946990060500174, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isRaySelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 364946990060500174, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isRaySelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 241673872} + - target: {fileID: 364946990060500174, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isRaySelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 364946990060500174, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isGazePinchSelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 364946990060500174, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isRaySelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: Play + objectReference: {fileID: 0} + - target: {fileID: 364946990060500174, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isGazePinchSelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 241673872} + - target: {fileID: 364946990060500174, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isGazePinchSelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 364946990060500174, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isGazePinchSelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: Play + objectReference: {fileID: 0} + - target: {fileID: 364946990060500174, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isRaySelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: UnityEngine.AudioSource, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 364946990060500174, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isGazePinchSelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: UnityEngine.AudioSource, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 364946990060500174, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isRaySelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 364946990060500174, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isGazePinchSelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 364946990093234557, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: startPushPlane + value: -0.01550013 + objectReference: {fileID: 0} + - target: {fileID: 364946990093234557, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: m_InteractionManager + value: + objectReference: {fileID: 0} + - target: {fileID: 364946990093234557, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isRaySelected.onEntered.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 364946990093234557, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isGazePinchSelected.onEntered.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 364946990093234557, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isRaySelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 364946990093234557, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isRaySelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 3514977} + - target: {fileID: 364946990093234557, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isRaySelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 364946990093234557, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isGazePinchSelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 364946990093234557, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isRaySelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: Play + objectReference: {fileID: 0} + - target: {fileID: 364946990093234557, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isGazePinchSelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 3514977} + - target: {fileID: 364946990093234557, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isGazePinchSelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 364946990093234557, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isGazePinchSelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: Play + objectReference: {fileID: 0} + - target: {fileID: 364946990093234557, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isRaySelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: UnityEngine.AudioSource, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 364946990093234557, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isGazePinchSelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: UnityEngine.AudioSource, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 364946990093234557, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isRaySelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 364946990093234557, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isGazePinchSelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 364946990158920389, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: startPushPlane + value: -0.01550013 + objectReference: {fileID: 0} + - target: {fileID: 364946990158920389, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: m_InteractionManager + value: + objectReference: {fileID: 0} + - target: {fileID: 364946990158920389, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isRaySelected.onEntered.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 364946990158920389, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isGazePinchSelected.onEntered.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 364946990158920389, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isRaySelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 364946990158920389, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isRaySelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 2067303307} + - target: {fileID: 364946990158920389, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isRaySelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 364946990158920389, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isGazePinchSelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 364946990158920389, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isRaySelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: Play + objectReference: {fileID: 0} + - target: {fileID: 364946990158920389, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isGazePinchSelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 2067303307} + - target: {fileID: 364946990158920389, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isGazePinchSelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 364946990158920389, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isGazePinchSelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: Play + objectReference: {fileID: 0} + - target: {fileID: 364946990158920389, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isRaySelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: UnityEngine.AudioSource, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 364946990158920389, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isGazePinchSelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: UnityEngine.AudioSource, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 364946990158920389, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isRaySelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 364946990158920389, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isGazePinchSelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 364946990490256254, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: startPushPlane + value: -0.01550013 + objectReference: {fileID: 0} + - target: {fileID: 364946990490256254, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: m_InteractionManager + value: + objectReference: {fileID: 0} + - target: {fileID: 364946990490256254, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isRaySelected.onEntered.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 364946990490256254, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isGazePinchSelected.onEntered.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 364946990490256254, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isRaySelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 364946990490256254, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isRaySelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 566404410} + - target: {fileID: 364946990490256254, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isRaySelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 364946990490256254, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isGazePinchSelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 364946990490256254, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isRaySelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: Play + objectReference: {fileID: 0} + - target: {fileID: 364946990490256254, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isGazePinchSelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 566404410} + - target: {fileID: 364946990490256254, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isGazePinchSelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 364946990490256254, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isGazePinchSelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: Play + objectReference: {fileID: 0} + - target: {fileID: 364946990490256254, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isRaySelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: UnityEngine.AudioSource, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 364946990490256254, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isGazePinchSelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: UnityEngine.AudioSource, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 364946990490256254, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isRaySelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 364946990490256254, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isGazePinchSelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 364946991423420956, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: m_InteractionManager + value: + objectReference: {fileID: 0} + - target: {fileID: 364946991423420956, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isRaySelected.onEntered.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 364946991423420956, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isGazePinchSelected.onEntered.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 364946991423420956, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isRaySelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 364946991423420956, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isRaySelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 364946991195464073} + - target: {fileID: 364946991423420956, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isRaySelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 364946991423420956, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isGazePinchSelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 364946991423420956, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isRaySelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: Play + objectReference: {fileID: 0} + - target: {fileID: 364946991423420956, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isGazePinchSelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 364946991195464073} + - target: {fileID: 364946991423420956, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isGazePinchSelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 364946991423420956, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isGazePinchSelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: Play + objectReference: {fileID: 0} + - target: {fileID: 364946991423420956, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isRaySelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: UnityEngine.AudioSource, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 364946991423420956, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isGazePinchSelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: UnityEngine.AudioSource, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 364946991423420956, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isRaySelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 364946991423420956, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isGazePinchSelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 364946991772111252, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: startPushPlane + value: -0.01550013 + objectReference: {fileID: 0} + - target: {fileID: 364946991772111252, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: m_InteractionManager + value: + objectReference: {fileID: 0} + - target: {fileID: 364946991772111252, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isRaySelected.onEntered.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 364946991772111252, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isGazePinchSelected.onEntered.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 364946991772111252, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isRaySelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 364946991772111252, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isRaySelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 1893505840} + - target: {fileID: 364946991772111252, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isRaySelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 364946991772111252, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isGazePinchSelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 364946991772111252, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isRaySelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: Play + objectReference: {fileID: 0} + - target: {fileID: 364946991772111252, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isGazePinchSelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 1893505840} + - target: {fileID: 364946991772111252, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isGazePinchSelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 364946991772111252, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isGazePinchSelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: Play + objectReference: {fileID: 0} + - target: {fileID: 364946991772111252, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isRaySelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: UnityEngine.AudioSource, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 364946991772111252, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isGazePinchSelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: UnityEngine.AudioSource, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 364946991772111252, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isRaySelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 364946991772111252, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isGazePinchSelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 364946991780715583, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: startPushPlane + value: -0.01550013 + objectReference: {fileID: 0} + - target: {fileID: 364946991780715583, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: m_InteractionManager + value: + objectReference: {fileID: 0} + - target: {fileID: 364946991780715583, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isRaySelected.onEntered.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 364946991780715583, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isGazePinchSelected.onEntered.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 364946991780715583, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isRaySelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 364946991780715583, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isRaySelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 1351537950} + - target: {fileID: 364946991780715583, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isRaySelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 364946991780715583, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isGazePinchSelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 364946991780715583, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isRaySelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: Play + objectReference: {fileID: 0} + - target: {fileID: 364946991780715583, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isGazePinchSelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 1351537950} + - target: {fileID: 364946991780715583, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isGazePinchSelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 364946991780715583, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isGazePinchSelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: Play + objectReference: {fileID: 0} + - target: {fileID: 364946991780715583, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isRaySelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: UnityEngine.AudioSource, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 364946991780715583, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isGazePinchSelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: UnityEngine.AudioSource, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 364946991780715583, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isRaySelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 364946991780715583, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isGazePinchSelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 366238989958344277, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: m_Name + value: Piano + objectReference: {fileID: 0} + - target: {fileID: 369070640992445871, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 369246453490017725, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 369246453490017725, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: m_LocalPosition.x + value: -0.2452 + objectReference: {fileID: 0} + - target: {fileID: 369246453490017725, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: m_LocalPosition.y + value: -0.8631 + objectReference: {fileID: 0} + - target: {fileID: 369246453490017725, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: m_LocalPosition.z + value: -0.1473 + objectReference: {fileID: 0} + - target: {fileID: 369246453490017725, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 369246453490017725, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 369246453490017725, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 369246453490017725, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 369246453490017725, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 369246453490017725, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 369246453490017725, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 430236327866184865, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: m_Size.x + value: 0.044617217 + objectReference: {fileID: 0} + - target: {fileID: 430236327866184865, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: m_Size.y + value: 0.10021237 + objectReference: {fileID: 0} + - target: {fileID: 430236327866184865, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: m_Size.z + value: 0.046995085 + objectReference: {fileID: 0} + - target: {fileID: 430236327866184865, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: m_Center.x + value: -0.002 + objectReference: {fileID: 0} + - target: {fileID: 430236327866184865, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: m_Center.y + value: 0.46906283 + objectReference: {fileID: 0} + - target: {fileID: 430236327866184865, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: m_Center.z + value: 0.0077164834 + objectReference: {fileID: 0} + - target: {fileID: 1918766681897676798, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: Spatialize + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1918766681897676798, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: OutputAudioMixerGroup + value: + objectReference: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} + - target: {fileID: 1918766681897676798, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: panLevelCustomCurve.m_Curve.Array.data[0].value + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1984765899938696116, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2049106714049806875, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: m_LocalPosition.z + value: 0.00469 + objectReference: {fileID: 0} + - target: {fileID: 2074071492310221335, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: Spatialize + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2074071492310221335, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: OutputAudioMixerGroup + value: + objectReference: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} + - target: {fileID: 2074071492310221335, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: panLevelCustomCurve.m_Curve.Array.data[0].value + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2153581783840482909, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2989620835570271813, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: m_LocalPosition.z + value: 0.00469 + objectReference: {fileID: 0} + - target: {fileID: 3205061225516597562, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isRaySelected.onEntered.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3205061225516597562, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isGazePinchSelected.onEntered.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3205061225516597562, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isRaySelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3205061225516597562, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isRaySelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 1729004921} + - target: {fileID: 3205061225516597562, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isRaySelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3205061225516597562, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isGazePinchSelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3205061225516597562, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isRaySelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: Play + objectReference: {fileID: 0} + - target: {fileID: 3205061225516597562, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isGazePinchSelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 1729004921} + - target: {fileID: 3205061225516597562, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isGazePinchSelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3205061225516597562, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isGazePinchSelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: Play + objectReference: {fileID: 0} + - target: {fileID: 3205061225516597562, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isRaySelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: UnityEngine.AudioSource, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 3205061225516597562, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isGazePinchSelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: UnityEngine.AudioSource, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 3205061225516597562, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isRaySelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 3205061225516597562, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isGazePinchSelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 3862801594646884245, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: m_LocalPosition.z + value: -0.01550013 + objectReference: {fileID: 0} + - target: {fileID: 3892245459998175774, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3976558279943476820, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: Spatialize + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3976558279943476820, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: OutputAudioMixerGroup + value: + objectReference: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} + - target: {fileID: 3976558279943476820, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: panLevelCustomCurve.m_Curve.Array.data[0].value + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4540244754419273873, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: Spatialize + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4540244754419273873, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: OutputAudioMixerGroup + value: + objectReference: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} + - target: {fileID: 4540244754419273873, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: panLevelCustomCurve.m_Curve.Array.data[0].value + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4719360172523708786, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: Spatialize + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4719360172523708786, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: OutputAudioMixerGroup + value: + objectReference: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} + - target: {fileID: 4719360172523708786, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: panLevelCustomCurve.m_Curve.Array.data[0].value + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4736238532587254652, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: m_LocalPosition.z + value: 0.00469 + objectReference: {fileID: 0} + - target: {fileID: 4878508417286007359, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: m_LocalPosition.z + value: -0.01550013 + objectReference: {fileID: 0} + - target: {fileID: 5033811243155195862, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: m_LocalPosition.z + value: -0.01550013 + objectReference: {fileID: 0} + - target: {fileID: 5910433181975228633, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isRaySelected.onEntered.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5910433181975228633, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isGazePinchSelected.onEntered.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5910433181975228633, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isRaySelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5910433181975228633, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isRaySelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 683629778} + - target: {fileID: 5910433181975228633, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isRaySelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 5910433181975228633, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isGazePinchSelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5910433181975228633, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isRaySelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: Play + objectReference: {fileID: 0} + - target: {fileID: 5910433181975228633, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isGazePinchSelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 683629778} + - target: {fileID: 5910433181975228633, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isGazePinchSelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 5910433181975228633, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isGazePinchSelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: Play + objectReference: {fileID: 0} + - target: {fileID: 5910433181975228633, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isRaySelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: UnityEngine.AudioSource, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 5910433181975228633, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isGazePinchSelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: UnityEngine.AudioSource, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 5910433181975228633, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isRaySelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 5910433181975228633, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isGazePinchSelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 6430464606134251014, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: m_LocalPosition.z + value: 0.00469 + objectReference: {fileID: 0} + - target: {fileID: 6579703516827544013, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: m_LocalPosition.z + value: -0.015500131 + objectReference: {fileID: 0} + - target: {fileID: 6727346505438059180, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: m_LocalPosition.z + value: -0.01550013 + objectReference: {fileID: 0} + - target: {fileID: 6791013430707648167, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: m_Size.x + value: 0.044617217 + objectReference: {fileID: 0} + - target: {fileID: 6791013430707648167, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: m_Size.y + value: 0.10021237 + objectReference: {fileID: 0} + - target: {fileID: 6791013430707648167, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: m_Size.z + value: 0.046995085 + objectReference: {fileID: 0} + - target: {fileID: 6834552045730768809, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6869634662548718575, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: m_LocalPosition.z + value: 0.00469 + objectReference: {fileID: 0} + - target: {fileID: 6913780721799234531, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: Spatialize + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6913780721799234531, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: OutputAudioMixerGroup + value: + objectReference: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} + - target: {fileID: 6913780721799234531, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: panLevelCustomCurve.m_Curve.Array.data[0].value + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7123489524880090206, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: Spatialize + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7123489524880090206, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: OutputAudioMixerGroup + value: + objectReference: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} + - target: {fileID: 7123489524880090206, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: panLevelCustomCurve.m_Curve.Array.data[0].value + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7438820363755735746, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isRaySelected.onEntered.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7438820363755735746, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isGazePinchSelected.onEntered.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7438820363755735746, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isRaySelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7438820363755735746, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isRaySelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 1455400526} + - target: {fileID: 7438820363755735746, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isRaySelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 7438820363755735746, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isGazePinchSelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7438820363755735746, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isRaySelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: Play + objectReference: {fileID: 0} + - target: {fileID: 7438820363755735746, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isGazePinchSelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 1455400526} + - target: {fileID: 7438820363755735746, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isGazePinchSelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 7438820363755735746, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isGazePinchSelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: Play + objectReference: {fileID: 0} + - target: {fileID: 7438820363755735746, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isRaySelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: UnityEngine.AudioSource, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 7438820363755735746, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isGazePinchSelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: UnityEngine.AudioSource, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 7438820363755735746, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isRaySelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 7438820363755735746, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isGazePinchSelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 7513506229924595575, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: Spatialize + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7513506229924595575, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: OutputAudioMixerGroup + value: + objectReference: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} + - target: {fileID: 7513506229924595575, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: panLevelCustomCurve.m_Curve.Array.data[0].value + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7517904336347004540, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: m_LocalPosition.z + value: -0.01550013 + objectReference: {fileID: 0} + - target: {fileID: 7701165343254955965, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: Spatialize + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7701165343254955965, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: OutputAudioMixerGroup + value: + objectReference: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} + - target: {fileID: 7701165343254955965, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: panLevelCustomCurve.m_Curve.Array.data[0].value + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7722584021585572601, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: m_Size.x + value: 0.044617217 + objectReference: {fileID: 0} + - target: {fileID: 7722584021585572601, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: m_Size.y + value: 0.10021237 + objectReference: {fileID: 0} + - target: {fileID: 7722584021585572601, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: m_Size.z + value: 0.046995085 + objectReference: {fileID: 0} + - target: {fileID: 7722584021585572601, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: m_Center.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7722584021585572601, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: m_Center.y + value: 0.46906283 + objectReference: {fileID: 0} + - target: {fileID: 7722584021585572601, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: m_Center.z + value: 0.0077164834 + objectReference: {fileID: 0} + - target: {fileID: 7767463763753100279, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8188438316254230005, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isRaySelected.onEntered.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8188438316254230005, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isGazePinchSelected.onEntered.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8188438316254230005, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isRaySelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8188438316254230005, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isRaySelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 766270403} + - target: {fileID: 8188438316254230005, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isRaySelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 8188438316254230005, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isGazePinchSelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8188438316254230005, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isRaySelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: Play + objectReference: {fileID: 0} + - target: {fileID: 8188438316254230005, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isGazePinchSelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 766270403} + - target: {fileID: 8188438316254230005, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isGazePinchSelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 8188438316254230005, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isGazePinchSelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: Play + objectReference: {fileID: 0} + - target: {fileID: 8188438316254230005, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isRaySelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: UnityEngine.AudioSource, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 8188438316254230005, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isGazePinchSelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: UnityEngine.AudioSource, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 8188438316254230005, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isRaySelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 8188438316254230005, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isGazePinchSelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 8377650841631071081, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: Spatialize + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8377650841631071081, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: OutputAudioMixerGroup + value: + objectReference: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} + - target: {fileID: 8377650841631071081, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: panLevelCustomCurve.m_Curve.Array.data[0].value + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8409029690981636012, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: m_LocalPosition.z + value: 0.00469 + objectReference: {fileID: 0} + - target: {fileID: 8880479040937481948, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isRaySelected.onEntered.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8880479040937481948, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isGazePinchSelected.onEntered.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8880479040937481948, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isRaySelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8880479040937481948, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isRaySelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 1951404609} + - target: {fileID: 8880479040937481948, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isRaySelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 8880479040937481948, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isGazePinchSelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8880479040937481948, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isRaySelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: Play + objectReference: {fileID: 0} + - target: {fileID: 8880479040937481948, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isGazePinchSelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 1951404609} + - target: {fileID: 8880479040937481948, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isGazePinchSelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 8880479040937481948, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isGazePinchSelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: Play + objectReference: {fileID: 0} + - target: {fileID: 8880479040937481948, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isRaySelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: UnityEngine.AudioSource, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 8880479040937481948, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isGazePinchSelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: UnityEngine.AudioSource, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 8880479040937481948, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isRaySelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 8880479040937481948, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + propertyPath: isGazePinchSelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} +--- !u!82 &364946991195464073 stripped +AudioSource: + m_CorrespondingSourceObject: {fileID: 303053968431071717, guid: 8f6fb5f907837b645a884d67d7b70393, type: 3} + m_PrefabInstance: {fileID: 364946991195464072} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &1214529608259952004 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1913468802} + m_Modifications: + - target: {fileID: 251265377, guid: 0d3b2fd2079cd514d8dbce654f929320, type: 3} + propertyPath: Spatialize + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 251265377, guid: 0d3b2fd2079cd514d8dbce654f929320, type: 3} + propertyPath: OutputAudioMixerGroup + value: + objectReference: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} + - target: {fileID: 251265377, guid: 0d3b2fd2079cd514d8dbce654f929320, type: 3} + propertyPath: panLevelCustomCurve.m_Curve.Array.data[0].value + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 255187375, guid: 0d3b2fd2079cd514d8dbce654f929320, type: 3} + propertyPath: m_Convex + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 255187375, guid: 0d3b2fd2079cd514d8dbce654f929320, type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1214529608091387485, guid: 0d3b2fd2079cd514d8dbce654f929320, type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 1214529608091387485, guid: 0d3b2fd2079cd514d8dbce654f929320, type: 3} + propertyPath: m_LocalPosition.x + value: -0.191 + objectReference: {fileID: 0} + - target: {fileID: 1214529608091387485, guid: 0d3b2fd2079cd514d8dbce654f929320, type: 3} + propertyPath: m_LocalPosition.y + value: -0.441 + objectReference: {fileID: 0} + - target: {fileID: 1214529608091387485, guid: 0d3b2fd2079cd514d8dbce654f929320, type: 3} + propertyPath: m_LocalPosition.z + value: -0.0838 + objectReference: {fileID: 0} + - target: {fileID: 1214529608091387485, guid: 0d3b2fd2079cd514d8dbce654f929320, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1214529608091387485, guid: 0d3b2fd2079cd514d8dbce654f929320, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1214529608091387485, guid: 0d3b2fd2079cd514d8dbce654f929320, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1214529608091387485, guid: 0d3b2fd2079cd514d8dbce654f929320, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1214529608091387485, guid: 0d3b2fd2079cd514d8dbce654f929320, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1214529608091387485, guid: 0d3b2fd2079cd514d8dbce654f929320, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1214529608091387485, guid: 0d3b2fd2079cd514d8dbce654f929320, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1214529608091490941, guid: 0d3b2fd2079cd514d8dbce654f929320, type: 3} + propertyPath: m_Name + value: CoffeeBoundsControl + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 0d3b2fd2079cd514d8dbce654f929320, type: 3} +--- !u!1001 &2578649064215403923 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1710053220} + m_Modifications: + - target: {fileID: 238993406236766840, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 238993406236766840, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 238993406236766840, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 238993406236766840, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 238993406236766840, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 238993406236766840, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 576968310450018954, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 576968310450018954, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 576968310450018954, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 576968310450018954, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 576968310450018954, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 576968310450018954, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 830797837766093032, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 830797837766093032, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 830797837766093032, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 830797837766093032, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 830797837766093033, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: Spatialize + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 830797837766093033, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: OutputAudioMixerGroup + value: + objectReference: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} + - target: {fileID: 830797837766093033, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: panLevelCustomCurve.m_Curve.Array.data[0].value + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 980537988443892780, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: Spatialize + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 980537988443892780, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: OutputAudioMixerGroup + value: + objectReference: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} + - target: {fileID: 980537988443892780, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: panLevelCustomCurve.m_Curve.Array.data[0].value + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 980537988443892781, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 980537988443892781, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 980537988443892781, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 980537988443892781, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1266614207299526432, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: Spatialize + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1266614207299526432, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: OutputAudioMixerGroup + value: + objectReference: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} + - target: {fileID: 1266614207299526432, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: panLevelCustomCurve.m_Curve.Array.data[0].value + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1266614207299526433, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1266614207299526433, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1266614207299526433, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1266614207299526433, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1389753798734922626, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1389753798734922626, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1389753798734922626, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1389753798734922626, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1389753798734922627, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: Spatialize + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1389753798734922627, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: OutputAudioMixerGroup + value: + objectReference: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} + - target: {fileID: 1389753798734922627, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: panLevelCustomCurve.m_Curve.Array.data[0].value + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1736624830057851760, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1736624830057851760, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1736624830057851760, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1736624830057851760, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1736624830057851761, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: Spatialize + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1736624830057851761, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: OutputAudioMixerGroup + value: + objectReference: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} + - target: {fileID: 1736624830057851761, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: panLevelCustomCurve.m_Curve.Array.data[0].value + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2126794760894422487, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2126794760894422487, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2126794760894422487, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2126794760894422487, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2126794760894422487, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2126794760894422487, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2129273300761110155, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2129273300761110155, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2129273300761110155, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2129273300761110155, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2129273300761110155, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2129273300913913671, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2129273300913913671, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2129273300913913671, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2129273300913913671, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2129273300913913671, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2129273301036347253, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2129273301036347253, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2129273301036347253, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2129273301036347253, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2129273301036347253, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2129273301305066815, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2129273301305066815, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2129273301305066815, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2129273301305066815, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2129273301305066815, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2268278991520882480, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2268278991520882480, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2268278991520882480, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2268278991520882480, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2268278991520882485, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_Size.x + value: 38.6 + objectReference: {fileID: 0} + - target: {fileID: 2268278991520882485, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_Size.y + value: 32 + objectReference: {fileID: 0} + - target: {fileID: 2268278991520882485, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_Center.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2268278991520882485, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_Center.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2356801616050657259, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2356801616050657259, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2492645898474032187, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2492645898474032187, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2492645898474032187, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2492645898474032187, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2492645898474032187, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2492645898474032187, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2578649062778877953, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2578649062778877953, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2578649062778877953, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2578649062778877953, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2578649063139551432, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2578649063139551432, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2578649063139551432, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2578649063139551432, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2578649063139551432, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2578649063139551432, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2578649063324106453, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2578649063324106453, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2578649063324106453, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2578649063324106453, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2578649063324106453, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2578649063324106453, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2578649063327347123, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2578649063327347123, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2578649063327347123, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2578649063327347123, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2578649063327347123, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2578649063749817975, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2578649063749817975, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2578649063749817975, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2578649063749817975, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2578649063749817975, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2578649064017060638, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.x + value: -0.00046069708 + objectReference: {fileID: 0} + - target: {fileID: 2578649064106734587, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2578649064106734587, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2578649064106734587, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2578649064106734587, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2578649064106734587, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2578649064106734587, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2578649064399513024, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2578649064399513024, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2578649064399513024, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2578649064399513024, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2578649064399513024, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2578649064399513024, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2578649064399513024, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2578649064399513024, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_SizeDelta.x + value: 427.9265 + objectReference: {fileID: 0} + - target: {fileID: 2578649064399513024, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_SizeDelta.y + value: 258.24658 + objectReference: {fileID: 0} + - target: {fileID: 2578649064399513024, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2578649064399513024, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2578649064399513024, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2578649064399513024, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2578649064399513024, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2578649064399513024, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2578649064399513024, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2578649064399513024, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.x + value: -0.0454 + objectReference: {fileID: 0} + - target: {fileID: 2578649064399513024, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.y + value: -0.03731 + objectReference: {fileID: 0} + - target: {fileID: 2578649064399513024, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2578649064399513024, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2578649064399513024, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2578649064399513025, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_Name + value: CanvasRoot + objectReference: {fileID: 0} + - target: {fileID: 2578649064399513030, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_PresetInfoIsWorld + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2578649064460067242, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2578649064460067242, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2578649064460067242, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2578649064460067242, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2578649064460067242, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2578649064460067242, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2578649064635381920, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2578649064635381920, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2578649064635381920, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2578649064635381920, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2578649064635381920, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2578649064635381920, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2600508886878431450, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2600508886878431450, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2600508886878431450, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2600508886878431450, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2600508886878431450, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2620935865984789342, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2620935865984789342, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2620935865984789342, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2620935865984789342, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2620935865984789342, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2620935866259006112, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2620935866259006112, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2620935866259006112, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2620935866259006112, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2620935866259006112, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2620935866341030764, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2620935866341030764, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2620935866341030764, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2620935866341030764, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2620935866341030764, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2620935866753155348, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2620935866753155348, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2620935866753155348, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2620935866753155348, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2620935866753155348, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2980826989631512370, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2980826989631512370, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2980826989631512370, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2980826989631512370, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2980826989631512370, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2980826989631512370, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3124354410494147608, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3124354410494147608, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3124354410494147608, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3124354410494147608, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3124354410494147609, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: Spatialize + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3124354410494147609, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: OutputAudioMixerGroup + value: + objectReference: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} + - target: {fileID: 3124354410494147609, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: panLevelCustomCurve.m_Curve.Array.data[0].value + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3206221451534879786, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3206221451534879786, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3206221451534879786, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3206221451534879786, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3206221451534879786, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3206221451534879786, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3921146254104574947, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3921146254104574947, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3921146254104574947, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3921146254104574947, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3921146254104574947, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3921146254104574947, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4127110153585389256, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4127110153585389256, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4127110153585389256, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4127110153585389256, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4127110153585389257, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: Spatialize + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4127110153585389257, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: OutputAudioMixerGroup + value: + objectReference: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} + - target: {fileID: 4127110153585389257, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: panLevelCustomCurve.m_Curve.Array.data[0].value + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4270425386956017122, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4270425386956017122, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4270425386956017122, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4270425386956017122, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4270425386956017122, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4270425386956017122, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4944422466781041638, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4944422466781041638, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4944422466781041638, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4944422466781041638, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4944422466781041638, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4944422466781041638, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5183245938264506822, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5183245938264506822, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5183245938264506822, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5183245938264506822, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5183245938264506822, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5183245938264506822, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5183245938377863135, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5183245938377863135, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5183245938377863135, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5183245938377863135, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5183245938377863135, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5183245938377863135, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5183245939579193457, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5183245939579193457, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5183245939579193457, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5183245939579193457, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5183245939579193457, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5183245939579193457, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5183245939998389653, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5183245939998389653, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5183245939998389653, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5183245939998389653, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5183245939998389653, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5183245939998389653, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5205007086235577429, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5205007086235577429, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5205007086235577429, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5205007086235577429, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5205007086235577429, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5205007086235577429, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5430102739470231659, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5430102739470231659, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5430102739470231659, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5430102739470231659, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5430102739470231659, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5430102739470231659, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5713799368171135293, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5713799368171135293, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5713799368171135293, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5713799368171135293, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5713799368171135293, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5713799369523497847, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5713799369523497847, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5713799369523497847, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5713799369523497847, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5713799369523497847, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5713799369635945285, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5713799369635945285, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5713799369635945285, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5713799369635945285, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5713799369635945285, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5713799369789325961, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5713799369789325961, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5713799369789325961, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5713799369789325961, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5713799369789325961, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5799273798760331512, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5799273798760331512, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5799273798760331512, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5799273798760331512, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5799273798760331512, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5799273798760331512, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5815846148594081005, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5815846148594081005, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5815846148594081005, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5815846148594081005, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5815846148594081005, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5815846148594081005, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6090670456024506905, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_Size.x + value: 128 + objectReference: {fileID: 0} + - target: {fileID: 6090670456024506908, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6090670456024506908, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6090670456024506908, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6090670456024506908, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6090670456024506908, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6090670456024506909, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: Spatialize + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6090670456024506909, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: OutputAudioMixerGroup + value: + objectReference: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} + - target: {fileID: 6090670456024506909, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: panLevelCustomCurve.m_Curve.Array.data[0].value + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6259913217811547972, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6259913217811547972, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6259913217811547972, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6259913217811547972, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6259913217811547972, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6259913217811547972, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6338500037595202670, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: Spatialize + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6338500037595202670, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: OutputAudioMixerGroup + value: + objectReference: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} + - target: {fileID: 6338500037595202670, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: panLevelCustomCurve.m_Curve.Array.data[0].value + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6338500037595202671, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6338500037595202671, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6338500037595202671, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6338500037595202671, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6338500038249281930, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: Spatialize + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6338500038249281930, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: OutputAudioMixerGroup + value: + objectReference: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} + - target: {fileID: 6338500038249281930, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: panLevelCustomCurve.m_Curve.Array.data[0].value + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6338500038249281931, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6338500038249281931, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6338500038249281931, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6338500038249281931, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6338500039060582460, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6338500039060582460, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6338500039060582460, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6338500039060582460, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6338500039060582461, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: Spatialize + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6338500039060582461, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: OutputAudioMixerGroup + value: + objectReference: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} + - target: {fileID: 6338500039060582461, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: panLevelCustomCurve.m_Curve.Array.data[0].value + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6338500039098004376, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6338500039098004376, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6338500039098004376, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6338500039098004376, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6338500039098004377, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: Spatialize + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6338500039098004377, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: OutputAudioMixerGroup + value: + objectReference: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} + - target: {fileID: 6338500039098004377, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: panLevelCustomCurve.m_Curve.Array.data[0].value + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6338500039098004381, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_Size.x + value: 38.6 + objectReference: {fileID: 0} + - target: {fileID: 6338500039098004381, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_Size.y + value: 32 + objectReference: {fileID: 0} + - target: {fileID: 6338500039098004381, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_Center.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6338500039098004381, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_Center.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6338500039190568484, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: Spatialize + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6338500039190568484, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: OutputAudioMixerGroup + value: + objectReference: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} + - target: {fileID: 6338500039190568484, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: panLevelCustomCurve.m_Curve.Array.data[0].value + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6338500039190568485, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6338500039190568485, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6338500039190568485, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6338500039190568485, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6351079148266003882, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_Size.x + value: 128 + objectReference: {fileID: 0} + - target: {fileID: 6351079148266003886, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: Spatialize + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6351079148266003886, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: OutputAudioMixerGroup + value: + objectReference: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} + - target: {fileID: 6351079148266003886, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: panLevelCustomCurve.m_Curve.Array.data[0].value + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6351079148266003887, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6351079148266003887, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6351079148266003887, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6351079148266003887, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6351079148266003887, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6480191133274044593, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6480191133274044593, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6480191133274044593, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6480191133274044593, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6550764639418190640, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6550764639418190640, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6550764639418190640, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6550764639418190640, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6550764639418190641, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: Spatialize + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6550764639418190641, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: OutputAudioMixerGroup + value: + objectReference: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} + - target: {fileID: 6550764639418190641, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: panLevelCustomCurve.m_Curve.Array.data[0].value + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6576362801864956304, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: Spatialize + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6576362801864956304, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: OutputAudioMixerGroup + value: + objectReference: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} + - target: {fileID: 6576362801864956304, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: panLevelCustomCurve.m_Curve.Array.data[0].value + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6576362801864956305, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6576362801864956305, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6576362801864956305, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6576362801864956305, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6576362801864956305, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6576362801864956308, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_Size.x + value: 128 + objectReference: {fileID: 0} + - target: {fileID: 6776978392589374208, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: Spatialize + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6776978392589374208, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: OutputAudioMixerGroup + value: + objectReference: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} + - target: {fileID: 6776978392589374208, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: panLevelCustomCurve.m_Curve.Array.data[0].value + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6776978392589374209, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6776978392589374209, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6776978392589374209, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6776978392589374209, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6776978392589374209, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6776978392589374209, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6776978392589374212, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_Size.x + value: 80.64217 + objectReference: {fileID: 0} + - target: {fileID: 6776978392589374212, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_Size.y + value: 47.01599 + objectReference: {fileID: 0} + - target: {fileID: 6776978392589374212, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6776978392589374212, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_Center.y + value: 4.2420044 + objectReference: {fileID: 0} + - target: {fileID: 6776978392769446706, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: Spatialize + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6776978392769446706, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: OutputAudioMixerGroup + value: + objectReference: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} + - target: {fileID: 6776978392769446706, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: panLevelCustomCurve.m_Curve.Array.data[0].value + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6776978392769446707, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6776978392769446707, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6776978392769446707, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6776978392769446707, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6776978392769446707, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6776978392769446707, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6776978392769446710, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_Size.x + value: 80.64217 + objectReference: {fileID: 0} + - target: {fileID: 6776978392769446710, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_Size.y + value: 47.01599 + objectReference: {fileID: 0} + - target: {fileID: 6776978392769446710, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6776978392769446710, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_Center.y + value: 4.2420044 + objectReference: {fileID: 0} + - target: {fileID: 6776978392855206650, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_Size.x + value: 241.92601 + objectReference: {fileID: 0} + - target: {fileID: 6776978392855206650, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_Size.y + value: 128 + objectReference: {fileID: 0} + - target: {fileID: 6776978392855206650, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6776978392855206650, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_Center.x + value: 0.00025177002 + objectReference: {fileID: 0} + - target: {fileID: 6776978392855206650, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_Center.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6776978392855206654, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: Spatialize + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6776978392855206654, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: OutputAudioMixerGroup + value: + objectReference: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} + - target: {fileID: 6776978392855206654, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: panLevelCustomCurve.m_Curve.Array.data[0].value + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6776978392855206655, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6776978392855206655, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6776978392855206655, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6776978392855206655, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6776978392855206655, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6776978393435224394, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: Spatialize + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6776978393435224394, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: OutputAudioMixerGroup + value: + objectReference: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} + - target: {fileID: 6776978393435224394, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: panLevelCustomCurve.m_Curve.Array.data[0].value + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6776978393435224395, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6776978393435224395, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6776978393435224395, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6776978393435224395, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6776978393435224395, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6776978393435224395, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6776978393435224398, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_Size.x + value: 80.641754 + objectReference: {fileID: 0} + - target: {fileID: 6776978393435224398, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_Size.y + value: 47.01599 + objectReference: {fileID: 0} + - target: {fileID: 6776978393435224398, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6776978393435224398, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_Center.x + value: 0.00020980835 + objectReference: {fileID: 0} + - target: {fileID: 6776978393435224398, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_Center.y + value: 4.2420044 + objectReference: {fileID: 0} + - target: {fileID: 6790485856255541986, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_Size.x + value: 38.6 + objectReference: {fileID: 0} + - target: {fileID: 6790485856255541986, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_Size.y + value: 32 + objectReference: {fileID: 0} + - target: {fileID: 6790485856255541986, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_Center.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6790485856255541986, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_Center.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6790485856255541991, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6790485856255541991, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6790485856255541991, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6790485856255541991, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7192676786408870380, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7192676786408870380, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7192676786408870380, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7192676786408870380, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7192676786408870380, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7192676786408870380, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7335998001774415524, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7335998001774415524, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7335998001774415524, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7335998001774415524, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7335998001774415524, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7335998001774415524, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7399076248656579226, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7399076248656579226, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7399076248656579226, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7399076248656579226, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7399076248656579226, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7399076248656579226, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7423583918923864123, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7423583918923864123, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7423583918923864123, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7423583918923864123, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7423583918923864123, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7423583918923864123, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7474924997753034285, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7474924997753034285, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7474924997753034285, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7474924997753034285, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7474924997753034285, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7474924997753034285, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7596247693873836311, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7596247693873836311, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7596247693873836311, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7596247693873836311, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7596247693873836311, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7596247693873836311, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7645919981045555347, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7645919981045555347, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7645919981045555347, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7645919981045555347, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7645919981045555347, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7645919981045555347, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7724392866144474186, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_Size.x + value: 128 + objectReference: {fileID: 0} + - target: {fileID: 7724392866144474190, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: Spatialize + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7724392866144474190, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: OutputAudioMixerGroup + value: + objectReference: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} + - target: {fileID: 7724392866144474190, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: panLevelCustomCurve.m_Curve.Array.data[0].value + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7724392866144474191, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7724392866144474191, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7724392866144474191, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7724392866144474191, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7724392866144474191, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7879939008530370531, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_Size.x + value: 128 + objectReference: {fileID: 0} + - target: {fileID: 7879939008530370534, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7879939008530370534, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7879939008530370534, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7879939008530370534, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7879939008530370534, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7879939008530370535, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: Spatialize + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7879939008530370535, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: OutputAudioMixerGroup + value: + objectReference: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} + - target: {fileID: 7879939008530370535, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: panLevelCustomCurve.m_Curve.Array.data[0].value + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7896511427050122227, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7896511427050122227, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7896511427050122227, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7896511427050122227, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7896511427050122230, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_Size.x + value: 38.6 + objectReference: {fileID: 0} + - target: {fileID: 7896511427050122230, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_Size.y + value: 32 + objectReference: {fileID: 0} + - target: {fileID: 7896511427050122230, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_Center.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7896511427050122230, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_Center.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8621070723831474134, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: Spatialize + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8621070723831474134, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: OutputAudioMixerGroup + value: + objectReference: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} + - target: {fileID: 8621070723831474134, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: panLevelCustomCurve.m_Curve.Array.data[0].value + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8621070723831474135, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8621070723831474135, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8621070723831474135, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8621070723831474135, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8875179696315508149, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8875179696315508149, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8875179696315508149, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8875179696315508149, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8875179696315508149, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8875179696315508149, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9026159562613145116, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9026159562613145116, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9026159562613145116, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9026159562613145116, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9026159562613145116, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9026159562613145116, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 262b70b02609c85439cdaf12c4713ec3, type: 3} +--- !u!1001 &4654093213557177394 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 150862479} + m_Modifications: + - target: {fileID: -3910990755373119420, guid: aa94f0fa662d8bd4e84361cc9f0d065a, type: 3} + propertyPath: m_RootOrder + value: 5 + objectReference: {fileID: 0} + - target: {fileID: -3910990755373119420, guid: aa94f0fa662d8bd4e84361cc9f0d065a, type: 3} + propertyPath: m_LocalScale.x + value: 0.007056685 + objectReference: {fileID: 0} + - target: {fileID: -3910990755373119420, guid: aa94f0fa662d8bd4e84361cc9f0d065a, type: 3} + propertyPath: m_LocalScale.y + value: 0.0070566875 + objectReference: {fileID: 0} + - target: {fileID: -3910990755373119420, guid: aa94f0fa662d8bd4e84361cc9f0d065a, type: 3} + propertyPath: m_LocalScale.z + value: 0.007056685 + objectReference: {fileID: 0} + - target: {fileID: -3910990755373119420, guid: aa94f0fa662d8bd4e84361cc9f0d065a, type: 3} + propertyPath: m_LocalPosition.x + value: 0.4019 + objectReference: {fileID: 0} + - target: {fileID: -3910990755373119420, guid: aa94f0fa662d8bd4e84361cc9f0d065a, type: 3} + propertyPath: m_LocalPosition.y + value: -0.21005 + objectReference: {fileID: 0} + - target: {fileID: -3910990755373119420, guid: aa94f0fa662d8bd4e84361cc9f0d065a, type: 3} + propertyPath: m_LocalPosition.z + value: -0.0195 + objectReference: {fileID: 0} + - target: {fileID: -3910990755373119420, guid: aa94f0fa662d8bd4e84361cc9f0d065a, type: 3} + propertyPath: m_LocalRotation.w + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -3910990755373119420, guid: aa94f0fa662d8bd4e84361cc9f0d065a, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -3910990755373119420, guid: aa94f0fa662d8bd4e84361cc9f0d065a, type: 3} + propertyPath: m_LocalRotation.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -3910990755373119420, guid: aa94f0fa662d8bd4e84361cc9f0d065a, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -3910990755373119420, guid: aa94f0fa662d8bd4e84361cc9f0d065a, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -3910990755373119420, guid: aa94f0fa662d8bd4e84361cc9f0d065a, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 180 + objectReference: {fileID: 0} + - target: {fileID: -3910990755373119420, guid: aa94f0fa662d8bd4e84361cc9f0d065a, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8771091787928289351, guid: aa94f0fa662d8bd4e84361cc9f0d065a, type: 3} + propertyPath: m_Name + value: MRTK_Logo + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: -4161369568681901532, guid: aa94f0fa662d8bd4e84361cc9f0d065a, type: 3} +--- !u!4 &4654093213557177395 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -3910990755373119420, guid: aa94f0fa662d8bd4e84361cc9f0d065a, type: 3} + m_PrefabInstance: {fileID: 4654093213557177394} + m_PrefabAsset: {fileID: 0} +--- !u!1 &4654093213557177396 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 8771091787928289351, guid: aa94f0fa662d8bd4e84361cc9f0d065a, type: 3} + m_PrefabInstance: {fileID: 4654093213557177394} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &5905304273903168958 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 5905304275062509466, guid: df4899a7e84d2794a9428337bba8a253, type: 3} + propertyPath: m_RootOrder + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 5905304275062509466, guid: df4899a7e84d2794a9428337bba8a253, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5905304275062509466, guid: df4899a7e84d2794a9428337bba8a253, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5905304275062509466, guid: df4899a7e84d2794a9428337bba8a253, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5905304275062509471, guid: df4899a7e84d2794a9428337bba8a253, type: 3} + propertyPath: m_Name + value: EventSystem + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: df4899a7e84d2794a9428337bba8a253, type: 3} +--- !u!1001 &7372669236719069155 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1667384560894720772, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} + propertyPath: isToggled.onExited.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 0} + - target: {fileID: 1667384560894720772, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} + propertyPath: isToggled.onExited.m_PersistentCalls.m_Calls.Array.data[1].m_Target + value: + objectReference: {fileID: 0} + - target: {fileID: 1667384560894720772, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} + propertyPath: isToggled.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 0} + - target: {fileID: 1667384560894720772, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} + propertyPath: isToggled.onEntered.m_PersistentCalls.m_Calls.Array.data[1].m_Target + value: + objectReference: {fileID: 0} + - target: {fileID: 1667384561245672091, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} + propertyPath: isToggled.onExited.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 0} + - target: {fileID: 1667384561245672091, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} + propertyPath: isToggled.onExited.m_PersistentCalls.m_Calls.Array.data[1].m_Target + value: + objectReference: {fileID: 0} + - target: {fileID: 1667384561245672091, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} + propertyPath: isToggled.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 0} + - target: {fileID: 1667384561245672091, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} + propertyPath: isToggled.onEntered.m_PersistentCalls.m_Calls.Array.data[1].m_Target + value: + objectReference: {fileID: 0} + - target: {fileID: 1667384562270007169, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} + propertyPath: isToggled.onExited.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 1346790086} + - target: {fileID: 1667384562270007169, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} + propertyPath: isToggled.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 1346790086} + - target: {fileID: 2082148069247382453, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} + propertyPath: Spatialize + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2082148069247382453, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} + propertyPath: OutputAudioMixerGroup + value: + objectReference: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} + - target: {fileID: 2082148069247382453, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} + propertyPath: panLevelCustomCurve.m_Curve.Array.data[0].value + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3045578032311879198, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} + propertyPath: Spatialize + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3045578032311879198, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} + propertyPath: OutputAudioMixerGroup + value: + objectReference: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} + - target: {fileID: 3045578032311879198, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} + propertyPath: panLevelCustomCurve.m_Curve.Array.data[0].value + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6134130586559970896, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} + propertyPath: Spatialize + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6134130586559970896, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} + propertyPath: OutputAudioMixerGroup + value: + objectReference: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} + - target: {fileID: 6134130586559970896, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} + propertyPath: panLevelCustomCurve.m_Curve.Array.data[0].value + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7326570055845349072, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} + propertyPath: Spatialize + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7326570055845349072, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} + propertyPath: OutputAudioMixerGroup + value: + objectReference: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} + - target: {fileID: 7326570055845349072, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} + propertyPath: panLevelCustomCurve.m_Curve.Array.data[0].value + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7372669237086358564, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} + propertyPath: m_Name + value: HandMenu + objectReference: {fileID: 0} + - target: {fileID: 7372669237086358568, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7372669237086358568, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7372669237086358568, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7372669237086358568, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7372669237086358568, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7372669237086358568, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7372669237086358568, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7372669237086358568, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7372669237086358568, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7372669237086358568, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7372669237086358568, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7618871619398064040, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} + propertyPath: Spatialize + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7618871619398064040, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} + propertyPath: OutputAudioMixerGroup + value: + objectReference: {fileID: 3526612193736648505, guid: c4ec596b04ef53f4581688939092e813, type: 2} + - target: {fileID: 7618871619398064040, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} + propertyPath: panLevelCustomCurve.m_Curve.Array.data[0].value + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} diff --git a/UnityProjects/MRTKDevTemplate/Assets/Scenes/ObsoleteHandInteractionExamples.unity.meta b/UnityProjects/MRTKDevTemplate/Assets/Scenes/ObsoleteHandInteractionExamples.unity.meta new file mode 100644 index 000000000..33a57cc3e --- /dev/null +++ b/UnityProjects/MRTKDevTemplate/Assets/Scenes/ObsoleteHandInteractionExamples.unity.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: ef7e6dc699271434eb9b85e866eadc11 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProjects/MRTKDevTemplate/Assets/Scenes/OutlineExamples.unity b/UnityProjects/MRTKDevTemplate/Assets/Scenes/OutlineExamples.unity index 6383205ca..9572e01d2 100644 --- a/UnityProjects/MRTKDevTemplate/Assets/Scenes/OutlineExamples.unity +++ b/UnityProjects/MRTKDevTemplate/Assets/Scenes/OutlineExamples.unity @@ -145,15 +145,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d9ad66e7cc9a2754d8ea989740c9f00d, type: 3} m_Name: m_EditorClassIdentifier: - m_InteractionManager: {fileID: 1530487695} + m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 1 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -222,42 +220,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_OnHoverEntered: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_OnHoverExited: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectEntered: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -372,6 +355,7 @@ MonoBehaviour: hostTransform: {fileID: 120046066} allowedManipulations: 7 allowedInteractionTypes: -2147483641 + rigidbodyMovementType: 0 applyTorque: 1 springForceSoftness: 0.1 springTorqueSoftness: 0.1 @@ -394,8 +378,7 @@ MonoBehaviour: moveLogicType: reference: MixedReality.Toolkit.SpatialManipulation.MoveLogic, MixedReality.Toolkit.SpatialManipulation rotateLogicType: - reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, - MixedReality.Toolkit.SpatialManipulation + reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, MixedReality.Toolkit.SpatialManipulation scaleLogicType: reference: MixedReality.Toolkit.SpatialManipulation.ScaleLogic, MixedReality.Toolkit.SpatialManipulation --- !u!114 &120046070 @@ -718,15 +701,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d9ad66e7cc9a2754d8ea989740c9f00d, type: 3} m_Name: m_EditorClassIdentifier: - m_InteractionManager: {fileID: 1530487695} + m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 1 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -759,42 +740,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnHoverEntered: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_OnHoverExited: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectEntered: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectExited: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -909,6 +875,7 @@ MonoBehaviour: hostTransform: {fileID: 226473800} allowedManipulations: 7 allowedInteractionTypes: -2147483641 + rigidbodyMovementType: 0 applyTorque: 1 springForceSoftness: 0.1 springTorqueSoftness: 0.1 @@ -931,8 +898,7 @@ MonoBehaviour: moveLogicType: reference: MixedReality.Toolkit.SpatialManipulation.MoveLogic, MixedReality.Toolkit.SpatialManipulation rotateLogicType: - reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, - MixedReality.Toolkit.SpatialManipulation + reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, MixedReality.Toolkit.SpatialManipulation scaleLogicType: reference: MixedReality.Toolkit.SpatialManipulation.ScaleLogic, MixedReality.Toolkit.SpatialManipulation --- !u!114 &226473805 @@ -1008,15 +974,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d9ad66e7cc9a2754d8ea989740c9f00d, type: 3} m_Name: m_EditorClassIdentifier: - m_InteractionManager: {fileID: 1530487695} + m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 1 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -1085,42 +1049,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_OnLastHoverExited: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_OnHoverEntered: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnHoverExited: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectEntered: - m_PersistentCalls: - m_Calls: [] - m_OnSelectExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -1235,6 +1184,7 @@ MonoBehaviour: hostTransform: {fileID: 250065331} allowedManipulations: 7 allowedInteractionTypes: -2147483641 + rigidbodyMovementType: 0 applyTorque: 1 springForceSoftness: 0.1 springTorqueSoftness: 0.1 @@ -1257,8 +1207,7 @@ MonoBehaviour: moveLogicType: reference: MixedReality.Toolkit.SpatialManipulation.MoveLogic, MixedReality.Toolkit.SpatialManipulation rotateLogicType: - reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, - MixedReality.Toolkit.SpatialManipulation + reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, MixedReality.Toolkit.SpatialManipulation scaleLogicType: reference: MixedReality.Toolkit.SpatialManipulation.ScaleLogic, MixedReality.Toolkit.SpatialManipulation --- !u!114 &250065336 @@ -1405,15 +1354,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d9ad66e7cc9a2754d8ea989740c9f00d, type: 3} m_Name: m_EditorClassIdentifier: - m_InteractionManager: {fileID: 1530487695} + m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 1 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -1446,42 +1393,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_OnHoverEntered: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_OnHoverExited: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectEntered: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -1596,6 +1528,7 @@ MonoBehaviour: hostTransform: {fileID: 309684936} allowedManipulations: 7 allowedInteractionTypes: -2147483641 + rigidbodyMovementType: 0 applyTorque: 1 springForceSoftness: 0.1 springTorqueSoftness: 0.1 @@ -1618,8 +1551,7 @@ MonoBehaviour: moveLogicType: reference: MixedReality.Toolkit.SpatialManipulation.MoveLogic, MixedReality.Toolkit.SpatialManipulation rotateLogicType: - reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, - MixedReality.Toolkit.SpatialManipulation + reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, MixedReality.Toolkit.SpatialManipulation scaleLogicType: reference: MixedReality.Toolkit.SpatialManipulation.ScaleLogic, MixedReality.Toolkit.SpatialManipulation --- !u!114 &309684941 @@ -1889,15 +1821,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d9ad66e7cc9a2754d8ea989740c9f00d, type: 3} m_Name: m_EditorClassIdentifier: - m_InteractionManager: {fileID: 1530487695} + m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 1 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -1930,42 +1860,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnHoverExited: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectEntered: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectExited: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectCanceled: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -2080,6 +1995,7 @@ MonoBehaviour: hostTransform: {fileID: 734141029} allowedManipulations: 7 allowedInteractionTypes: -2147483641 + rigidbodyMovementType: 0 applyTorque: 1 springForceSoftness: 0.1 springTorqueSoftness: 0.1 @@ -2102,8 +2018,7 @@ MonoBehaviour: moveLogicType: reference: MixedReality.Toolkit.SpatialManipulation.MoveLogic, MixedReality.Toolkit.SpatialManipulation rotateLogicType: - reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, - MixedReality.Toolkit.SpatialManipulation + reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, MixedReality.Toolkit.SpatialManipulation scaleLogicType: reference: MixedReality.Toolkit.SpatialManipulation.ScaleLogic, MixedReality.Toolkit.SpatialManipulation --- !u!114 &734141034 @@ -2179,15 +2094,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d9ad66e7cc9a2754d8ea989740c9f00d, type: 3} m_Name: m_EditorClassIdentifier: - m_InteractionManager: {fileID: 1530487695} + m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 1 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -2256,42 +2169,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_OnLastHoverExited: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_OnHoverEntered: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnHoverExited: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectEntered: - m_PersistentCalls: - m_Calls: [] - m_OnSelectExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -2406,6 +2304,7 @@ MonoBehaviour: hostTransform: {fileID: 848211343} allowedManipulations: 7 allowedInteractionTypes: -2147483641 + rigidbodyMovementType: 0 applyTorque: 1 springForceSoftness: 0.1 springTorqueSoftness: 0.1 @@ -2428,8 +2327,7 @@ MonoBehaviour: moveLogicType: reference: MixedReality.Toolkit.SpatialManipulation.MoveLogic, MixedReality.Toolkit.SpatialManipulation rotateLogicType: - reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, - MixedReality.Toolkit.SpatialManipulation + reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, MixedReality.Toolkit.SpatialManipulation scaleLogicType: reference: MixedReality.Toolkit.SpatialManipulation.ScaleLogic, MixedReality.Toolkit.SpatialManipulation --- !u!114 &848211348 @@ -2483,13 +2381,11 @@ MonoBehaviour: m_EditorClassIdentifier: m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 1 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -2522,42 +2418,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_OnLastHoverExited: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_OnHoverEntered: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnHoverExited: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectEntered: - m_PersistentCalls: - m_Calls: [] - m_OnSelectExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -2672,6 +2553,7 @@ MonoBehaviour: hostTransform: {fileID: 1203713056} allowedManipulations: 7 allowedInteractionTypes: -2147483641 + rigidbodyMovementType: 0 applyTorque: 1 springForceSoftness: 0.1 springTorqueSoftness: 0.1 @@ -2694,8 +2576,7 @@ MonoBehaviour: moveLogicType: reference: MixedReality.Toolkit.SpatialManipulation.MoveLogic, MixedReality.Toolkit.SpatialManipulation rotateLogicType: - reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, - MixedReality.Toolkit.SpatialManipulation + reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, MixedReality.Toolkit.SpatialManipulation scaleLogicType: reference: MixedReality.Toolkit.SpatialManipulation.ScaleLogic, MixedReality.Toolkit.SpatialManipulation --- !u!114 &958324216 @@ -2855,15 +2736,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d9ad66e7cc9a2754d8ea989740c9f00d, type: 3} m_Name: m_EditorClassIdentifier: - m_InteractionManager: {fileID: 1530487695} + m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 1 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -2896,42 +2775,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnHoverExited: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectEntered: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectExited: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectCanceled: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -3046,6 +2910,7 @@ MonoBehaviour: hostTransform: {fileID: 1089076434} allowedManipulations: 7 allowedInteractionTypes: -2147483641 + rigidbodyMovementType: 0 applyTorque: 1 springForceSoftness: 0.1 springTorqueSoftness: 0.1 @@ -3068,8 +2933,7 @@ MonoBehaviour: moveLogicType: reference: MixedReality.Toolkit.SpatialManipulation.MoveLogic, MixedReality.Toolkit.SpatialManipulation rotateLogicType: - reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, - MixedReality.Toolkit.SpatialManipulation + reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, MixedReality.Toolkit.SpatialManipulation scaleLogicType: reference: MixedReality.Toolkit.SpatialManipulation.ScaleLogic, MixedReality.Toolkit.SpatialManipulation --- !u!114 &1089076439 @@ -3465,78 +3329,6 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} ---- !u!1001 &1530487694 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720334, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_Name - value: MRTK XR Rig - objectReference: {fileID: 0} - - target: {fileID: 8479077998186684813, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} ---- !u!114 &1530487695 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 5569439093497552269, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - m_PrefabInstance: {fileID: 1530487694} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 83e4e6cca11330d4088d729ab4fc9d9f, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &1566835727 GameObject: m_ObjectHideFlags: 0 @@ -3669,15 +3461,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d9ad66e7cc9a2754d8ea989740c9f00d, type: 3} m_Name: m_EditorClassIdentifier: - m_InteractionManager: {fileID: 1530487695} + m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 1 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -3734,42 +3524,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnHoverExited: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectEntered: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectExited: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectCanceled: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -3884,6 +3659,7 @@ MonoBehaviour: hostTransform: {fileID: 1566835728} allowedManipulations: 7 allowedInteractionTypes: -2147483641 + rigidbodyMovementType: 0 applyTorque: 1 springForceSoftness: 0.1 springTorqueSoftness: 0.1 @@ -3906,8 +3682,7 @@ MonoBehaviour: moveLogicType: reference: MixedReality.Toolkit.SpatialManipulation.MoveLogic, MixedReality.Toolkit.SpatialManipulation rotateLogicType: - reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, - MixedReality.Toolkit.SpatialManipulation + reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, MixedReality.Toolkit.SpatialManipulation scaleLogicType: reference: MixedReality.Toolkit.SpatialManipulation.ScaleLogic, MixedReality.Toolkit.SpatialManipulation --- !u!114 &1566835734 @@ -3942,6 +3717,67 @@ MonoBehaviour: minimumScale: {x: 0.2, y: 0.2, z: 0.2} maximumScale: {x: 2, y: 2, z: 2} relativeToInitialState: 1 +--- !u!1001 &1609629610 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720334, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_Name + value: MRTK XR Rig + objectReference: {fileID: 0} + - target: {fileID: 8479077998186684813, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} --- !u!1001 &1686868129 PrefabInstance: m_ObjectHideFlags: 0 @@ -4118,15 +3954,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d9ad66e7cc9a2754d8ea989740c9f00d, type: 3} m_Name: m_EditorClassIdentifier: - m_InteractionManager: {fileID: 1530487695} + m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 1 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -4195,42 +4029,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_OnHoverEntered: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_OnHoverExited: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectEntered: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -4345,6 +4164,7 @@ MonoBehaviour: hostTransform: {fileID: 1686868151} allowedManipulations: 7 allowedInteractionTypes: -2147483641 + rigidbodyMovementType: 0 applyTorque: 1 springForceSoftness: 0.1 springTorqueSoftness: 0.1 @@ -4367,8 +4187,7 @@ MonoBehaviour: moveLogicType: reference: MixedReality.Toolkit.SpatialManipulation.MoveLogic, MixedReality.Toolkit.SpatialManipulation rotateLogicType: - reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, - MixedReality.Toolkit.SpatialManipulation + reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, MixedReality.Toolkit.SpatialManipulation scaleLogicType: reference: MixedReality.Toolkit.SpatialManipulation.ScaleLogic, MixedReality.Toolkit.SpatialManipulation --- !u!114 &1686868200 @@ -4397,15 +4216,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d9ad66e7cc9a2754d8ea989740c9f00d, type: 3} m_Name: m_EditorClassIdentifier: - m_InteractionManager: {fileID: 1530487695} + m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 1 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -4474,42 +4291,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_Deactivated: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnLastHoverExited: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectEntered: - m_PersistentCalls: - m_Calls: [] - m_OnSelectExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -4624,6 +4426,7 @@ MonoBehaviour: hostTransform: {fileID: 1686868155} allowedManipulations: 7 allowedInteractionTypes: -2147483641 + rigidbodyMovementType: 0 applyTorque: 1 springForceSoftness: 0.1 springTorqueSoftness: 0.1 @@ -4646,8 +4449,7 @@ MonoBehaviour: moveLogicType: reference: MixedReality.Toolkit.SpatialManipulation.MoveLogic, MixedReality.Toolkit.SpatialManipulation rotateLogicType: - reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, - MixedReality.Toolkit.SpatialManipulation + reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, MixedReality.Toolkit.SpatialManipulation scaleLogicType: reference: MixedReality.Toolkit.SpatialManipulation.ScaleLogic, MixedReality.Toolkit.SpatialManipulation --- !u!114 &1686868202 diff --git a/UnityProjects/MRTKDevTemplate/Assets/Scenes/PerformanceEvaluation.unity b/UnityProjects/MRTKDevTemplate/Assets/Scenes/PerformanceEvaluation.unity index 191feb93e..c5e651c98 100644 --- a/UnityProjects/MRTKDevTemplate/Assets/Scenes/PerformanceEvaluation.unity +++ b/UnityProjects/MRTKDevTemplate/Assets/Scenes/PerformanceEvaluation.unity @@ -315,75 +315,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: ad5b753b73e311143a85055b15cea562, type: 3} ---- !u!1001 &345759523 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 142007140022173312, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_UpdateTrackingType - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2304670408713330098, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_UpdateTrackingType - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720334, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_Name - value: MRTK XR Rig - objectReference: {fileID: 0} - - target: {fileID: 8479077998186684813, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} --- !u!1 &355904113 GameObject: m_ObjectHideFlags: 0 @@ -577,6 +508,67 @@ MonoBehaviour: columns: 20 rows: 10 targetLowFramerate: 50 +--- !u!1001 &504021091 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720334, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_Name + value: MRTK XR Rig + objectReference: {fileID: 0} + - target: {fileID: 8479077998186684813, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} --- !u!1001 &570352181 PrefabInstance: m_ObjectHideFlags: 0 @@ -1091,15 +1083,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d9ad66e7cc9a2754d8ea989740c9f00d, type: 3} m_Name: m_EditorClassIdentifier: - m_InteractionManager: {fileID: 1458287607} + m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 1 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -1132,42 +1122,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_OnHoverEntered: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_OnHoverExited: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectEntered: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -1282,6 +1257,7 @@ MonoBehaviour: hostTransform: {fileID: 429146682} allowedManipulations: 7 allowedInteractionTypes: -2147483641 + rigidbodyMovementType: 0 applyTorque: 1 springForceSoftness: 0.1 springTorqueSoftness: 0.1 @@ -1304,8 +1280,7 @@ MonoBehaviour: moveLogicType: reference: MixedReality.Toolkit.SpatialManipulation.MoveLogic, MixedReality.Toolkit.SpatialManipulation rotateLogicType: - reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, - MixedReality.Toolkit.SpatialManipulation + reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, MixedReality.Toolkit.SpatialManipulation scaleLogicType: reference: MixedReality.Toolkit.SpatialManipulation.ScaleLogic, MixedReality.Toolkit.SpatialManipulation --- !u!114 &862994346 @@ -2018,17 +1993,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1362098058} m_CullTransparentMesh: 1 ---- !u!114 &1458287607 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 5569439093497552269, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - m_PrefabInstance: {fileID: 345759523} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 83e4e6cca11330d4088d729ab4fc9d9f, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1001 &1554658581 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/UnityProjects/MRTKDevTemplate/Assets/Scenes/SeeItSayItExample.unity b/UnityProjects/MRTKDevTemplate/Assets/Scenes/SeeItSayItExample.unity index 2b49a00df..3edafb024 100644 --- a/UnityProjects/MRTKDevTemplate/Assets/Scenes/SeeItSayItExample.unity +++ b/UnityProjects/MRTKDevTemplate/Assets/Scenes/SeeItSayItExample.unity @@ -244,6 +244,67 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c25d8f2d22117bd40ad824684551fbde, type: 3} +--- !u!1001 &176137479 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720334, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_Name + value: MRTK XR Rig + objectReference: {fileID: 0} + - target: {fileID: 8479077998186684813, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} --- !u!4 &298998572 stripped Transform: m_CorrespondingSourceObject: {fileID: 5092507605265006331, guid: c25d8f2d22117bd40ad824684551fbde, type: 3} @@ -504,15 +565,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d9ad66e7cc9a2754d8ea989740c9f00d, type: 3} m_Name: m_EditorClassIdentifier: - m_InteractionManager: {fileID: 1260032998} + m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 1 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -545,42 +604,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_OnHoverEntered: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_OnHoverExited: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectEntered: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -695,6 +739,7 @@ MonoBehaviour: hostTransform: {fileID: 836419398} allowedManipulations: 7 allowedInteractionTypes: -2147483641 + rigidbodyMovementType: 0 applyTorque: 1 springForceSoftness: 0.1 springTorqueSoftness: 0.1 @@ -717,8 +762,7 @@ MonoBehaviour: moveLogicType: reference: MixedReality.Toolkit.SpatialManipulation.MoveLogic, MixedReality.Toolkit.SpatialManipulation rotateLogicType: - reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, - MixedReality.Toolkit.SpatialManipulation + reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, MixedReality.Toolkit.SpatialManipulation scaleLogicType: reference: MixedReality.Toolkit.SpatialManipulation.ScaleLogic, MixedReality.Toolkit.SpatialManipulation --- !u!114 &1196228790 @@ -753,82 +797,6 @@ MonoBehaviour: minimumScale: {x: 0.2, y: 0.2, z: 0.2} maximumScale: {x: 2, y: 2, z: 2} relativeToInitialState: 1 ---- !u!1001 &1260032997 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720334, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_Name - value: MRTK XR Rig - objectReference: {fileID: 0} - - target: {fileID: 7720573869748407015, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_SelectEntered.m_PersistentCalls.m_Calls.Array.size - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7720573869748407015, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_SelectEntered.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7720573869748407015, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_SelectEntered.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 6264478733034656630, guid: c2a4036cbd244524d828230f1bf7c12c, type: 3} - - target: {fileID: 7720573869748407015, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_SelectEntered.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 8479077998186684813, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} ---- !u!114 &1260032998 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 5569439093497552269, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - m_PrefabInstance: {fileID: 1260032997} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 83e4e6cca11330d4088d729ab4fc9d9f, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1001 &1410618456 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/UnityProjects/MRTKDevTemplate/Assets/Scenes/SlateDrawingExample.unity b/UnityProjects/MRTKDevTemplate/Assets/Scenes/SlateDrawingExample.unity index 11717cc30..d8eb16796 100644 --- a/UnityProjects/MRTKDevTemplate/Assets/Scenes/SlateDrawingExample.unity +++ b/UnityProjects/MRTKDevTemplate/Assets/Scenes/SlateDrawingExample.unity @@ -301,67 +301,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07c4bd04b45c014fad0e3cd30747f06, type: 3} ---- !u!1001 &525252187 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720334, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_Name - value: MRTK XR Rig - objectReference: {fileID: 0} - - target: {fileID: 8479077998186684813, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} --- !u!1 &705507993 GameObject: m_ObjectHideFlags: 0 @@ -456,6 +395,67 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} +--- !u!1001 &906550917 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720334, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_Name + value: MRTK XR Rig + objectReference: {fileID: 0} + - target: {fileID: 8479077998186684813, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} --- !u!1001 &1209299743 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/UnityProjects/MRTKDevTemplate/Assets/Scenes/SolverExamples.unity b/UnityProjects/MRTKDevTemplate/Assets/Scenes/SolverExamples.unity index 487eeb015..27fed2d7a 100644 --- a/UnityProjects/MRTKDevTemplate/Assets/Scenes/SolverExamples.unity +++ b/UnityProjects/MRTKDevTemplate/Assets/Scenes/SolverExamples.unity @@ -585,15 +585,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d9ad66e7cc9a2754d8ea989740c9f00d, type: 3} m_Name: m_EditorClassIdentifier: - m_InteractionManager: {fileID: 1530487695} + m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 1 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -674,42 +672,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_OnLastHoverExited: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnHoverEntered: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectEntered: - m_PersistentCalls: - m_Calls: [] - m_OnSelectExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -824,6 +807,7 @@ MonoBehaviour: hostTransform: {fileID: 320359042} allowedManipulations: 7 allowedInteractionTypes: -2147483641 + rigidbodyMovementType: 0 applyTorque: 1 springForceSoftness: 0.1 springTorqueSoftness: 0.1 @@ -846,8 +830,7 @@ MonoBehaviour: moveLogicType: reference: MixedReality.Toolkit.SpatialManipulation.MoveLogic, MixedReality.Toolkit.SpatialManipulation rotateLogicType: - reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, - MixedReality.Toolkit.SpatialManipulation + reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, MixedReality.Toolkit.SpatialManipulation scaleLogicType: reference: MixedReality.Toolkit.SpatialManipulation.ScaleLogic, MixedReality.Toolkit.SpatialManipulation --- !u!114 &320359046 @@ -1733,15 +1716,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d9ad66e7cc9a2754d8ea989740c9f00d, type: 3} m_Name: m_EditorClassIdentifier: - m_InteractionManager: {fileID: 1530487695} + m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 1 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -1774,42 +1755,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_OnHoverEntered: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnHoverExited: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectEntered: - m_PersistentCalls: - m_Calls: [] - m_OnSelectExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -1924,6 +1890,7 @@ MonoBehaviour: hostTransform: {fileID: 1203713056} allowedManipulations: 7 allowedInteractionTypes: -2147483641 + rigidbodyMovementType: 0 applyTorque: 1 springForceSoftness: 0.1 springTorqueSoftness: 0.1 @@ -1946,8 +1913,7 @@ MonoBehaviour: moveLogicType: reference: MixedReality.Toolkit.SpatialManipulation.MoveLogic, MixedReality.Toolkit.SpatialManipulation rotateLogicType: - reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, - MixedReality.Toolkit.SpatialManipulation + reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, MixedReality.Toolkit.SpatialManipulation scaleLogicType: reference: MixedReality.Toolkit.SpatialManipulation.ScaleLogic, MixedReality.Toolkit.SpatialManipulation --- !u!114 &439076555 @@ -2676,17 +2642,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 616755848} m_CullTransparentMesh: 1 ---- !u!114 &658153185 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 7115113329451106245, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - m_PrefabInstance: {fileID: 1530487694} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e85416945309f8244a5715a2ec5c254f, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &667616751 GameObject: m_ObjectHideFlags: 0 @@ -3549,57 +3504,6 @@ GameObject: m_CorrespondingSourceObject: {fileID: 6540126486176102408, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} m_PrefabInstance: {fileID: 1726050634} m_PrefabAsset: {fileID: 0} ---- !u!1 &896448494 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 896448495} - - component: {fileID: 896448496} - m_Layer: 0 - m_Name: ARMeshManager - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &896448495 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 896448494} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 10, y: 10, z: 10} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1530487696} - m_RootOrder: 4 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &896448496 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 896448494} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 968053edfd89749c48f4ea5d444abf64, type: 3} - m_Name: - m_EditorClassIdentifier: - m_MeshPrefab: {fileID: 5231468805595906662, guid: b2a24ebfc7515a442a7af7b7179de988, type: 3} - m_Density: 0.5 - m_Normals: 1 - m_Tangents: 0 - m_TextureCoordinates: 0 - m_Colors: 0 - m_ConcurrentQueueSize: 4 --- !u!1 &958316058 GameObject: m_ObjectHideFlags: 0 @@ -4165,15 +4069,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d9ad66e7cc9a2754d8ea989740c9f00d, type: 3} m_Name: m_EditorClassIdentifier: - m_InteractionManager: {fileID: 1530487695} + m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 1 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -4206,42 +4108,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_OnLastHoverExited: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_OnHoverEntered: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnHoverExited: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectEntered: - m_PersistentCalls: - m_Calls: [] - m_OnSelectExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -4356,6 +4243,7 @@ MonoBehaviour: hostTransform: {fileID: 1203713056} allowedManipulations: -1 allowedInteractionTypes: -2147483641 + rigidbodyMovementType: 0 applyTorque: 1 springForceSoftness: 0.1 springTorqueSoftness: 0.1 @@ -4378,8 +4266,7 @@ MonoBehaviour: moveLogicType: reference: MixedReality.Toolkit.SpatialManipulation.MoveLogic, MixedReality.Toolkit.SpatialManipulation rotateLogicType: - reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, - MixedReality.Toolkit.SpatialManipulation + reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, MixedReality.Toolkit.SpatialManipulation scaleLogicType: reference: MixedReality.Toolkit.SpatialManipulation.ScaleLogic, MixedReality.Toolkit.SpatialManipulation --- !u!114 &1155491065 @@ -4602,7 +4489,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6540126486176102408, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} propertyPath: m_Name - value: DescriptionPanel - Coffee Cup + value: DescriptionPanel - Solver Handlers objectReference: {fileID: 0} - target: {fileID: 6809291684801504143, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} propertyPath: m_text @@ -4985,6 +4872,89 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07c4bd04b45c014fad0e3cd30747f06, type: 3} +--- !u!1001 &1317663107 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720334, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_Name + value: MRTK XR Rig + objectReference: {fileID: 0} + - target: {fileID: 8479077998186684813, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} +--- !u!114 &1317663108 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 7193962308655016478, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + m_PrefabInstance: {fileID: 1317663107} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e85416945309f8244a5715a2ec5c254f, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &1317663109 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 6268457481263998533, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + m_PrefabInstance: {fileID: 1317663107} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e85416945309f8244a5715a2ec5c254f, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &1350045067 PrefabInstance: m_ObjectHideFlags: 0 @@ -5406,83 +5376,6 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} m_PrefabInstance: {fileID: 1436624310} m_PrefabAsset: {fileID: 0} ---- !u!1001 &1530487694 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720334, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_Name - value: MRTK XR Rig - objectReference: {fileID: 0} - - target: {fileID: 8479077998186684813, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} ---- !u!114 &1530487695 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 5569439093497552269, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - m_PrefabInstance: {fileID: 1530487694} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 83e4e6cca11330d4088d729ab4fc9d9f, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!4 &1530487696 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 2351505566903569412, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - m_PrefabInstance: {fileID: 1530487694} - m_PrefabAsset: {fileID: 0} --- !u!1001 &1575873220 PrefabInstance: m_ObjectHideFlags: 0 @@ -6053,17 +5946,6 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 6922469056340231698, guid: c6b351a67ceb69140b199996bbbea156, type: 3} m_PrefabInstance: {fileID: 1661866071} m_PrefabAsset: {fileID: 0} ---- !u!114 &1684932690 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 8988800969130450167, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - m_PrefabInstance: {fileID: 1530487694} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e85416945309f8244a5715a2ec5c254f, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1001 &1715033574 PrefabInstance: m_ObjectHideFlags: 0 @@ -7154,15 +7036,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d9ad66e7cc9a2754d8ea989740c9f00d, type: 3} m_Name: m_EditorClassIdentifier: - m_InteractionManager: {fileID: 1530487695} + m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 1 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -7243,42 +7123,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnHoverExited: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectEntered: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectExited: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectCanceled: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -7393,6 +7258,7 @@ MonoBehaviour: hostTransform: {fileID: 2059172223} allowedManipulations: 7 allowedInteractionTypes: -2147483641 + rigidbodyMovementType: 0 applyTorque: 1 springForceSoftness: 0.1 springTorqueSoftness: 0.1 @@ -7415,8 +7281,7 @@ MonoBehaviour: moveLogicType: reference: MixedReality.Toolkit.SpatialManipulation.MoveLogic, MixedReality.Toolkit.SpatialManipulation rotateLogicType: - reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, - MixedReality.Toolkit.SpatialManipulation + reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, MixedReality.Toolkit.SpatialManipulation scaleLogicType: reference: MixedReality.Toolkit.SpatialManipulation.ScaleLogic, MixedReality.Toolkit.SpatialManipulation --- !u!114 &2059172220 @@ -8666,8 +8531,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: CustomTrackedObject: {fileID: 7219966623798432840} - LeftInteractor: {fileID: 658153185} - RightInteractor: {fileID: 1684932690} + LeftInteractor: {fileID: 1317663109} + RightInteractor: {fileID: 1317663108} --- !u!4 &2985051721846992313 Transform: m_ObjectHideFlags: 0 @@ -8963,8 +8828,7 @@ MonoBehaviour: m_BoolArgument: 0 m_CallState: 2 - m_Target: {fileID: 1901489904} - m_TargetAssemblyTypeName: MixedReality.Toolkit.UX.ToggleCollection, - MixedReality.Toolkit.UXCore + m_TargetAssemblyTypeName: MixedReality.Toolkit.UX.ToggleCollection, MixedReality.Toolkit.UXCore m_MethodName: set_CurrentIndex m_Mode: 3 m_Arguments: @@ -8976,8 +8840,7 @@ MonoBehaviour: m_BoolArgument: 0 m_CallState: 2 - m_Target: {fileID: 1891339673} - m_TargetAssemblyTypeName: MixedReality.Toolkit.UX.ToggleCollection, - MixedReality.Toolkit.UXCore + m_TargetAssemblyTypeName: MixedReality.Toolkit.UX.ToggleCollection, MixedReality.Toolkit.UXCore m_MethodName: set_CurrentIndex m_Mode: 3 m_Arguments: @@ -10224,6 +10087,16 @@ MonoBehaviour: translateLerpTime: 0.00001 enableConstraints: 1 constraintsManager: {fileID: 8424151715899002730} + manipulationLogicTypes: + moveLogicType: + reference: MixedReality.Toolkit.SpatialManipulation.BoundsControlMoveLogic, + MixedReality.Toolkit.SpatialManipulation + rotateLogicType: + reference: MixedReality.Toolkit.SpatialManipulation.BoundsControlRotateLogic, + MixedReality.Toolkit.SpatialManipulation + scaleLogicType: + reference: MixedReality.Toolkit.SpatialManipulation.BoundsControlScaleLogic, + MixedReality.Toolkit.SpatialManipulation manipulationStarted: m_PersistentCalls: m_Calls: @@ -10300,13 +10173,11 @@ MonoBehaviour: m_EditorClassIdentifier: m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 1 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -10363,42 +10234,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnHoverExited: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectEntered: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectExited: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectCanceled: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -10663,6 +10519,7 @@ MonoBehaviour: hostTransform: {fileID: 7219966623798069352} allowedManipulations: 1 allowedInteractionTypes: -2147483641 + rigidbodyMovementType: 0 applyTorque: 1 springForceSoftness: 0.1 springTorqueSoftness: 0.1 @@ -10685,7 +10542,6 @@ MonoBehaviour: moveLogicType: reference: MixedReality.Toolkit.SpatialManipulation.MoveLogic, MixedReality.Toolkit.SpatialManipulation rotateLogicType: - reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, - MixedReality.Toolkit.SpatialManipulation + reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, MixedReality.Toolkit.SpatialManipulation scaleLogicType: reference: MixedReality.Toolkit.SpatialManipulation.ScaleLogic, MixedReality.Toolkit.SpatialManipulation diff --git a/UnityProjects/MRTKDevTemplate/Assets/Scenes/SpatialMappingExample.unity b/UnityProjects/MRTKDevTemplate/Assets/Scenes/SpatialMappingExample.unity index 7015052ee..e1aeb5e96 100644 --- a/UnityProjects/MRTKDevTemplate/Assets/Scenes/SpatialMappingExample.unity +++ b/UnityProjects/MRTKDevTemplate/Assets/Scenes/SpatialMappingExample.unity @@ -123,57 +123,6 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!1 &108706276 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 108706277} - - component: {fileID: 108706278} - m_Layer: 0 - m_Name: ARSpatialMeshManager - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &108706277 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 108706276} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 10, y: 10, z: 10} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 2005129353} - m_RootOrder: 4 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &108706278 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 108706276} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 968053edfd89749c48f4ea5d444abf64, type: 3} - m_Name: - m_EditorClassIdentifier: - m_MeshPrefab: {fileID: 5231468805595906662, guid: b2a24ebfc7515a442a7af7b7179de988, type: 3} - m_Density: 1 - m_Normals: 1 - m_Tangents: 0 - m_TextureCoordinates: 0 - m_Colors: 1 - m_ConcurrentQueueSize: 4 --- !u!1 &496425430 stripped GameObject: m_CorrespondingSourceObject: {fileID: 8995139278435433182, guid: a6483e229cd4fa742ad3a449648648ee, type: 3} @@ -423,71 +372,10 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 8bfb4497dda968b469f9c0c4a22374d1, type: 3} ---- !u!1001 &1127029050 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720334, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_Name - value: MRTK XR Rig - objectReference: {fileID: 0} - - target: {fileID: 8479077998186684813, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} --- !u!114 &1127029051 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 5569439093497552269, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - m_PrefabInstance: {fileID: 1127029050} + m_CorrespondingSourceObject: {fileID: 800708247703322884, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + m_PrefabInstance: {fileID: 2060945776} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 @@ -769,6 +657,62 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} +--- !u!4 &1687319069 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2351505566903569412, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + m_PrefabInstance: {fileID: 2060945776} + m_PrefabAsset: {fileID: 0} +--- !u!1 &1716111687 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1716111688} + - component: {fileID: 1716111689} + m_Layer: 0 + m_Name: ARSpatialMeshManager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1716111688 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1716111687} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 10, y: 10, z: 10} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1687319069} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1716111689 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1716111687} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 968053edfd89749c48f4ea5d444abf64, type: 3} + m_Name: + m_EditorClassIdentifier: + m_MeshPrefab: {fileID: 5231468805595906662, guid: b2a24ebfc7515a442a7af7b7179de988, type: 3} + m_Density: 1 + m_Normals: 1 + m_Tangents: 0 + m_TextureCoordinates: 0 + m_Colors: 1 + m_ConcurrentQueueSize: 4 --- !u!224 &1636869729 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 3220012215463627515, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} @@ -1088,11 +1032,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: df4899a7e84d2794a9428337bba8a253, type: 3} ---- !u!4 &2005129353 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 2351505566903569412, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - m_PrefabInstance: {fileID: 1127029050} - m_PrefabAsset: {fileID: 0} --- !u!1 &2050252775 GameObject: m_ObjectHideFlags: 0 @@ -1187,3 +1126,64 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} +--- !u!1001 &2060945776 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720334, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_Name + value: MRTK XR Rig + objectReference: {fileID: 0} + - target: {fileID: 8479077998186684813, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} diff --git a/UnityProjects/MRTKDevTemplate/Assets/Scenes/SpeechInputExamples.unity b/UnityProjects/MRTKDevTemplate/Assets/Scenes/SpeechInputExamples.unity index 1101488c9..f2460f5d0 100644 --- a/UnityProjects/MRTKDevTemplate/Assets/Scenes/SpeechInputExamples.unity +++ b/UnityProjects/MRTKDevTemplate/Assets/Scenes/SpeechInputExamples.unity @@ -451,17 +451,6 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 3220012215463627515, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3} m_PrefabInstance: {fileID: 1464615606} m_PrefabAsset: {fileID: 0} ---- !u!114 &364788403 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 5569439093497552269, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - m_PrefabInstance: {fileID: 525252187} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 83e4e6cca11330d4088d729ab4fc9d9f, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1001 &394104796 PrefabInstance: m_ObjectHideFlags: 0 @@ -776,67 +765,6 @@ MonoBehaviour: m_FlexibleWidth: 1 m_FlexibleHeight: -1 m_LayoutPriority: 1 ---- !u!1001 &525252187 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_RootOrder - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720334, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_Name - value: MRTK XR Rig - objectReference: {fileID: 0} - - target: {fileID: 8479077998186684813, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} --- !u!1 &575009333 GameObject: m_ObjectHideFlags: 0 @@ -1131,15 +1059,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 2dd6a517ee866ae45ae8fac60a8d0547, type: 3} m_Name: m_EditorClassIdentifier: - m_InteractionManager: {fileID: 364788403} + m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 0 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -1172,42 +1098,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnHoverEntered: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_OnHoverExited: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectEntered: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectExited: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -1760,15 +1671,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 2dd6a517ee866ae45ae8fac60a8d0547, type: 3} m_Name: m_EditorClassIdentifier: - m_InteractionManager: {fileID: 364788403} + m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 0 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -1801,42 +1710,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_OnHoverEntered: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_OnHoverExited: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectEntered: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -2052,15 +1946,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 2dd6a517ee866ae45ae8fac60a8d0547, type: 3} m_Name: m_EditorClassIdentifier: - m_InteractionManager: {fileID: 364788403} + m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 0 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -2093,42 +1985,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnHoverEntered: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_OnHoverExited: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectEntered: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectExited: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -2826,15 +2703,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 2dd6a517ee866ae45ae8fac60a8d0547, type: 3} m_Name: m_EditorClassIdentifier: - m_InteractionManager: {fileID: 364788403} + m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 0 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -2867,42 +2742,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnHoverExited: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectEntered: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectExited: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectCanceled: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -3055,15 +2915,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d9ad66e7cc9a2754d8ea989740c9f00d, type: 3} m_Name: m_EditorClassIdentifier: - m_InteractionManager: {fileID: 364788403} + m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 1 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -3096,42 +2954,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnHoverExited: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectEntered: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectExited: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectCanceled: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -3246,6 +3089,7 @@ MonoBehaviour: hostTransform: {fileID: 199943738} allowedManipulations: -1 allowedInteractionTypes: -2147483641 + rigidbodyMovementType: 0 applyTorque: 1 springForceSoftness: 0.1 springTorqueSoftness: 0.1 @@ -3268,8 +3112,7 @@ MonoBehaviour: moveLogicType: reference: MixedReality.Toolkit.SpatialManipulation.MoveLogic, MixedReality.Toolkit.SpatialManipulation rotateLogicType: - reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, - MixedReality.Toolkit.SpatialManipulation + reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, MixedReality.Toolkit.SpatialManipulation scaleLogicType: reference: MixedReality.Toolkit.SpatialManipulation.ScaleLogic, MixedReality.Toolkit.SpatialManipulation --- !u!114 &1578855317 @@ -3460,6 +3303,67 @@ MonoBehaviour: m_FlexibleWidth: 1 m_FlexibleHeight: -1 m_LayoutPriority: 1 +--- !u!1001 &1723406867 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720334, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_Name + value: MRTK XR Rig + objectReference: {fileID: 0} + - target: {fileID: 8479077998186684813, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} --- !u!1001 &1789277895 PrefabInstance: m_ObjectHideFlags: 0 @@ -3565,15 +3469,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 2dd6a517ee866ae45ae8fac60a8d0547, type: 3} m_Name: m_EditorClassIdentifier: - m_InteractionManager: {fileID: 364788403} + m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 0 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -3606,42 +3508,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_OnHoverEntered: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_OnHoverExited: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectEntered: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -4298,15 +4185,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 2dd6a517ee866ae45ae8fac60a8d0547, type: 3} m_Name: m_EditorClassIdentifier: - m_InteractionManager: {fileID: 364788403} + m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 0 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -4339,42 +4224,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_Deactivated: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnLastHoverExited: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectEntered: - m_PersistentCalls: - m_Calls: [] - m_OnSelectExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: diff --git a/UnityProjects/MRTKDevTemplate/Assets/Scenes/TapToPlaceExample.unity b/UnityProjects/MRTKDevTemplate/Assets/Scenes/TapToPlaceExample.unity index a9f305d47..f15255e3f 100644 --- a/UnityProjects/MRTKDevTemplate/Assets/Scenes/TapToPlaceExample.unity +++ b/UnityProjects/MRTKDevTemplate/Assets/Scenes/TapToPlaceExample.unity @@ -123,7 +123,7 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!1 &108706276 +--- !u!1 &3684590 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -131,8 +131,8 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 108706277} - - component: {fileID: 108706278} + - component: {fileID: 3684591} + - component: {fileID: 3684592} m_Layer: 0 m_Name: ARSpatialMeshManager m_TagString: Untagged @@ -140,28 +140,28 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &108706277 +--- !u!4 &3684591 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 108706276} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: -1.6, z: 0} + m_GameObject: {fileID: 3684590} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 10, y: 10, z: 10} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 1127029051} + m_Father: {fileID: 1707105629} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &108706278 +--- !u!114 &3684592 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 108706276} + m_GameObject: {fileID: 3684590} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 968053edfd89749c48f4ea5d444abf64, type: 3} @@ -256,8 +256,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 3986155c7a728454f8bbbabd2e274601, type: 3} m_Name: m_EditorClassIdentifier: - leftInteractor: {fileID: 1127029054} - rightInteractor: {fileID: 1127029052} + leftInteractor: {fileID: 1707105631} + rightInteractor: {fileID: 1707105632} trackedTargetType: 1 trackedHandedness: 3 trackedHandJoint: 2 @@ -391,15 +391,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 2dd6a517ee866ae45ae8fac60a8d0547, type: 3} m_Name: m_EditorClassIdentifier: - m_InteractionManager: {fileID: 1127029053} + m_InteractionManager: {fileID: 1707105630} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 0 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -432,42 +430,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnHoverEntered: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_OnHoverExited: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectEntered: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectExited: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -994,113 +977,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07c4bd04b45c014fad0e3cd30747f06, type: 3} ---- !u!1001 &1127029050 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720334, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_Name - value: MRTK XR Rig - objectReference: {fileID: 0} - - target: {fileID: 6448619845270702420, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 7609097064974327368, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_RootOrder - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 8479077998186684813, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} ---- !u!4 &1127029051 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 2351505566903569412, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - m_PrefabInstance: {fileID: 1127029050} - m_PrefabAsset: {fileID: 0} ---- !u!114 &1127029052 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 8988800969130450167, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - m_PrefabInstance: {fileID: 1127029050} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e85416945309f8244a5715a2ec5c254f, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &1127029053 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 5569439093497552269, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - m_PrefabInstance: {fileID: 1127029050} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 83e4e6cca11330d4088d729ab4fc9d9f, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &1127029054 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 7115113329451106245, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - m_PrefabInstance: {fileID: 1127029050} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e85416945309f8244a5715a2ec5c254f, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &1406813211 GameObject: m_ObjectHideFlags: 0 @@ -1553,15 +1429,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d9ad66e7cc9a2754d8ea989740c9f00d, type: 3} m_Name: m_EditorClassIdentifier: - m_InteractionManager: {fileID: 1127029053} + m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 1 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -1594,42 +1468,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnHoverExited: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectEntered: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectExited: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectCanceled: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -1744,6 +1603,7 @@ MonoBehaviour: hostTransform: {fileID: 1745211848} allowedManipulations: 7 allowedInteractionTypes: -2147483641 + rigidbodyMovementType: 0 applyTorque: 1 springForceSoftness: 0.1 springTorqueSoftness: 0.1 @@ -1761,13 +1621,12 @@ MonoBehaviour: rotateLerpTime: 0.001 scaleLerpTime: 0.001 enableConstraints: 1 - constraintsManager: {fileID: 0} + constraintsManager: {fileID: 1636869735} manipulationLogicTypes: moveLogicType: reference: MixedReality.Toolkit.SpatialManipulation.MoveLogic, MixedReality.Toolkit.SpatialManipulation rotateLogicType: - reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, - MixedReality.Toolkit.SpatialManipulation + reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, MixedReality.Toolkit.SpatialManipulation scaleLogicType: reference: MixedReality.Toolkit.SpatialManipulation.ScaleLogic, MixedReality.Toolkit.SpatialManipulation --- !u!114 &1636869735 @@ -1784,6 +1643,105 @@ MonoBehaviour: m_EditorClassIdentifier: autoConstraintSelection: 1 selectedConstraints: [] +--- !u!1001 &1707105628 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720334, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_Name + value: MRTK XR Rig + objectReference: {fileID: 0} + - target: {fileID: 8479077998186684813, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} +--- !u!4 &1707105629 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2351505566903569412, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + m_PrefabInstance: {fileID: 1707105628} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1707105630 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 800708247703322884, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + m_PrefabInstance: {fileID: 1707105628} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 83e4e6cca11330d4088d729ab4fc9d9f, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &1707105631 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 6268457481263998533, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + m_PrefabInstance: {fileID: 1707105628} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e85416945309f8244a5715a2ec5c254f, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &1707105632 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 7193962308655016478, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + m_PrefabInstance: {fileID: 1707105628} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e85416945309f8244a5715a2ec5c254f, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1745211847 GameObject: m_ObjectHideFlags: 0 @@ -2476,15 +2434,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 2dd6a517ee866ae45ae8fac60a8d0547, type: 3} m_Name: m_EditorClassIdentifier: - m_InteractionManager: {fileID: 1127029053} + m_InteractionManager: {fileID: 1707105630} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 0 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -2517,42 +2473,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_OnLastHoverExited: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnHoverEntered: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectEntered: - m_PersistentCalls: - m_Calls: [] - m_OnSelectExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: diff --git a/UnityProjects/MRTKDevTemplate/Assets/Scenes/TextPrefabExamples.unity b/UnityProjects/MRTKDevTemplate/Assets/Scenes/TextPrefabExamples.unity index 37db87295..27eb6f66d 100644 --- a/UnityProjects/MRTKDevTemplate/Assets/Scenes/TextPrefabExamples.unity +++ b/UnityProjects/MRTKDevTemplate/Assets/Scenes/TextPrefabExamples.unity @@ -563,6 +563,67 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} +--- !u!1001 &737101207 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720334, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_Name + value: MRTK XR Rig + objectReference: {fileID: 0} + - target: {fileID: 8479077998186684813, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} --- !u!1 &786831202 GameObject: m_ObjectHideFlags: 0 @@ -689,13 +750,11 @@ MonoBehaviour: m_EditorClassIdentifier: m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 1 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -728,42 +787,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_OnLastHoverExited: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_OnHoverEntered: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnHoverExited: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectEntered: - m_PersistentCalls: - m_Calls: [] - m_OnSelectExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -878,6 +922,7 @@ MonoBehaviour: hostTransform: {fileID: 1203713056} allowedManipulations: 7 allowedInteractionTypes: -2147483641 + rigidbodyMovementType: 0 applyTorque: 1 springForceSoftness: 0.1 springTorqueSoftness: 0.1 @@ -900,8 +945,7 @@ MonoBehaviour: moveLogicType: reference: MixedReality.Toolkit.SpatialManipulation.MoveLogic, MixedReality.Toolkit.SpatialManipulation rotateLogicType: - reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, - MixedReality.Toolkit.SpatialManipulation + reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, MixedReality.Toolkit.SpatialManipulation scaleLogicType: reference: MixedReality.Toolkit.SpatialManipulation.ScaleLogic, MixedReality.Toolkit.SpatialManipulation --- !u!114 &958324216 @@ -1621,35 +1665,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07c4bd04b45c014fad0e3cd30747f06, type: 3} ---- !u!1001 &1530487694 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_RootOrder - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720334, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_Name - value: MRTK XR Rig - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} --- !u!1 &1548792447 GameObject: m_ObjectHideFlags: 0 diff --git a/UnityProjects/MRTKDevTemplate/Assets/Scenes/TextToSpeechExamples.unity b/UnityProjects/MRTKDevTemplate/Assets/Scenes/TextToSpeechExamples.unity index c3cdaae74..9e02a0363 100644 --- a/UnityProjects/MRTKDevTemplate/Assets/Scenes/TextToSpeechExamples.unity +++ b/UnityProjects/MRTKDevTemplate/Assets/Scenes/TextToSpeechExamples.unity @@ -377,15 +377,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 2dd6a517ee866ae45ae8fac60a8d0547, type: 3} m_Name: m_EditorClassIdentifier: - m_InteractionManager: {fileID: 1282048491} + m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 0 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -418,42 +416,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_OnLastHoverExited: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_OnHoverEntered: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnHoverExited: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectEntered: - m_PersistentCalls: - m_Calls: [] - m_OnSelectExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -874,15 +857,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 2dd6a517ee866ae45ae8fac60a8d0547, type: 3} m_Name: m_EditorClassIdentifier: - m_InteractionManager: {fileID: 1282048491} + m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 0 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -915,42 +896,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_OnHoverEntered: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_OnHoverExited: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectEntered: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -1117,63 +1083,6 @@ MonoBehaviour: m_TargetGraphic: {fileID: 0} movableAxes: 0 onMoveDelta: 0.01 ---- !u!1001 &525252187 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720334, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_Name - value: MRTK XR Rig - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} --- !u!1001 &640980041 PrefabInstance: m_ObjectHideFlags: 0 @@ -1297,6 +1206,67 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} +--- !u!1001 &708216548 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720334, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_Name + value: MRTK XR Rig + objectReference: {fileID: 0} + - target: {fileID: 8479077998186684813, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} --- !u!1 &826013516 GameObject: m_ObjectHideFlags: 0 @@ -1551,15 +1521,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 2dd6a517ee866ae45ae8fac60a8d0547, type: 3} m_Name: m_EditorClassIdentifier: - m_InteractionManager: {fileID: 1282048491} + m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 0 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -1592,42 +1560,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_Deactivated: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectEntered: - m_PersistentCalls: - m_Calls: [] - m_OnSelectExited: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectCanceled: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -1904,17 +1857,6 @@ MonoBehaviour: Action: m_PersistentCalls: m_Calls: [] ---- !u!114 &1282048491 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 5569439093497552269, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - m_PrefabInstance: {fileID: 525252187} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 83e4e6cca11330d4088d729ab4fc9d9f, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1001 &1446795993 PrefabInstance: m_ObjectHideFlags: 0 @@ -2153,15 +2095,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d9ad66e7cc9a2754d8ea989740c9f00d, type: 3} m_Name: m_EditorClassIdentifier: - m_InteractionManager: {fileID: 1282048491} + m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 1 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -2194,42 +2134,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnHoverExited: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectEntered: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectExited: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectCanceled: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -2344,6 +2269,7 @@ MonoBehaviour: hostTransform: {fileID: 1570749438} allowedManipulations: 7 allowedInteractionTypes: -2147483641 + rigidbodyMovementType: 0 applyTorque: 1 springForceSoftness: 0.1 springTorqueSoftness: 0.1 @@ -2366,8 +2292,7 @@ MonoBehaviour: moveLogicType: reference: MixedReality.Toolkit.SpatialManipulation.MoveLogic, MixedReality.Toolkit.SpatialManipulation rotateLogicType: - reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, - MixedReality.Toolkit.SpatialManipulation + reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, MixedReality.Toolkit.SpatialManipulation scaleLogicType: reference: MixedReality.Toolkit.SpatialManipulation.ScaleLogic, MixedReality.Toolkit.SpatialManipulation --- !u!114 &1728047436 diff --git a/UnityProjects/MRTKDevTemplate/Assets/Scenes/ToggleCollectionExample.unity b/UnityProjects/MRTKDevTemplate/Assets/Scenes/ToggleCollectionExample.unity index 827a7bbde..f3de28652 100644 --- a/UnityProjects/MRTKDevTemplate/Assets/Scenes/ToggleCollectionExample.unity +++ b/UnityProjects/MRTKDevTemplate/Assets/Scenes/ToggleCollectionExample.unity @@ -2244,6 +2244,67 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c32e8a7644144f8419bb881ad588ed0e, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1001 &1444963630 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720334, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_Name + value: MRTK XR Rig + objectReference: {fileID: 0} + - target: {fileID: 8479077998186684813, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} --- !u!1001 &1447814078 PrefabInstance: m_ObjectHideFlags: 0 @@ -2877,43 +2938,10 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c32e8a7644144f8419bb881ad588ed0e, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1001 &1996034749 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720334, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_Name - value: MRTK XR Rig - objectReference: {fileID: 0} - - target: {fileID: 8479077998186684813, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} --- !u!114 &1996034750 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 5569439093497552269, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - m_PrefabInstance: {fileID: 1996034749} + m_CorrespondingSourceObject: {fileID: 800708247703322884, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + m_PrefabInstance: {fileID: 1444963630} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 diff --git a/UnityProjects/MRTKDevTemplate/Assets/Scenes/TopNavigationExample.unity b/UnityProjects/MRTKDevTemplate/Assets/Scenes/TopNavigationExample.unity index aa3378217..bd5120b1c 100644 --- a/UnityProjects/MRTKDevTemplate/Assets/Scenes/TopNavigationExample.unity +++ b/UnityProjects/MRTKDevTemplate/Assets/Scenes/TopNavigationExample.unity @@ -185,17 +185,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: ad5b753b73e311143a85055b15cea562, type: 3} ---- !u!114 &707681967 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 5569439093497552269, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - m_PrefabInstance: {fileID: 916910416} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 83e4e6cca11330d4088d729ab4fc9d9f, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &799372350 GameObject: m_ObjectHideFlags: 0 @@ -272,39 +261,67 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 799372350} m_CullTransparentMesh: 1 ---- !u!1001 &916910416 +--- !u!1001 &1115565671 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} propertyPath: m_RootOrder value: 1 objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 2351505567455720334, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} + - target: {fileID: 2351505567455720334, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} propertyPath: m_Name value: MRTK XR Rig objectReference: {fileID: 0} - - target: {fileID: 8479077998186684813, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} + - target: {fileID: 8479077998186684813, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} + m_SourcePrefab: {fileID: 100100000, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} --- !u!1 &1230393481 GameObject: m_ObjectHideFlags: 0 @@ -660,6 +677,7 @@ MonoBehaviour: attachedRectTransform: {fileID: 1593975568} padding: {x: 0, y: 0} forceUpdateEveryFrame: 0 + canToggleCollider: 1 --- !u!65 &1593975570 BoxCollider: m_ObjectHideFlags: 0 @@ -757,15 +775,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d9ad66e7cc9a2754d8ea989740c9f00d, type: 3} m_Name: m_EditorClassIdentifier: - m_InteractionManager: {fileID: 707681967} + m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 1 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -798,42 +814,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_OnLastHoverExited: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnHoverEntered: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectEntered: - m_PersistentCalls: - m_Calls: [] - m_OnSelectExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -948,6 +949,7 @@ MonoBehaviour: hostTransform: {fileID: 1230393482} allowedManipulations: 7 allowedInteractionTypes: -2147483641 + rigidbodyMovementType: 0 applyTorque: 1 springForceSoftness: 0.1 springTorqueSoftness: 0.1 @@ -970,8 +972,7 @@ MonoBehaviour: moveLogicType: reference: MixedReality.Toolkit.SpatialManipulation.MoveLogic, MixedReality.Toolkit.SpatialManipulation rotateLogicType: - reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, - MixedReality.Toolkit.SpatialManipulation + reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, MixedReality.Toolkit.SpatialManipulation scaleLogicType: reference: MixedReality.Toolkit.SpatialManipulation.ScaleLogic, MixedReality.Toolkit.SpatialManipulation --- !u!114 &1593975576 @@ -1407,15 +1408,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d9ad66e7cc9a2754d8ea989740c9f00d, type: 3} m_Name: m_EditorClassIdentifier: - m_InteractionManager: {fileID: 707681967} + m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 1 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -1448,42 +1447,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_Deactivated: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnLastHoverExited: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectEntered: - m_PersistentCalls: - m_Calls: [] - m_OnSelectExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -1598,6 +1582,7 @@ MonoBehaviour: hostTransform: {fileID: 1230393482} allowedManipulations: 7 allowedInteractionTypes: -2147483641 + rigidbodyMovementType: 0 applyTorque: 1 springForceSoftness: 0.1 springTorqueSoftness: 0.1 @@ -1620,8 +1605,7 @@ MonoBehaviour: moveLogicType: reference: MixedReality.Toolkit.SpatialManipulation.MoveLogic, MixedReality.Toolkit.SpatialManipulation rotateLogicType: - reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, - MixedReality.Toolkit.SpatialManipulation + reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, MixedReality.Toolkit.SpatialManipulation scaleLogicType: reference: MixedReality.Toolkit.SpatialManipulation.ScaleLogic, MixedReality.Toolkit.SpatialManipulation --- !u!114 &1861840607 diff --git a/UnityProjects/MRTKDevTemplate/Assets/Scenes/VanillaUGUIExample.unity b/UnityProjects/MRTKDevTemplate/Assets/Scenes/VanillaUGUIExample.unity index 6a223df1d..d7fa05373 100644 --- a/UnityProjects/MRTKDevTemplate/Assets/Scenes/VanillaUGUIExample.unity +++ b/UnityProjects/MRTKDevTemplate/Assets/Scenes/VanillaUGUIExample.unity @@ -1882,13 +1882,11 @@ MonoBehaviour: m_EditorClassIdentifier: m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 0 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -1921,42 +1919,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnHoverEntered: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_OnHoverExited: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectEntered: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectExited: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -2072,6 +2055,7 @@ MonoBehaviour: hostTransform: {fileID: 686066625} allowedManipulations: 7 allowedInteractionTypes: -1 + rigidbodyMovementType: 0 applyTorque: 1 springForceSoftness: 0.1 springTorqueSoftness: 0.1 @@ -2094,8 +2078,7 @@ MonoBehaviour: moveLogicType: reference: MixedReality.Toolkit.SpatialManipulation.MoveLogic, MixedReality.Toolkit.SpatialManipulation rotateLogicType: - reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, - MixedReality.Toolkit.SpatialManipulation + reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, MixedReality.Toolkit.SpatialManipulation scaleLogicType: reference: MixedReality.Toolkit.SpatialManipulation.ScaleLogic, MixedReality.Toolkit.SpatialManipulation --- !u!114 &478245716 @@ -2658,7 +2641,7 @@ Canvas: m_Enabled: 1 serializedVersion: 3 m_RenderMode: 2 - m_Camera: {fileID: 637040410} + m_Camera: {fileID: 0} m_PlaneDistance: 100 m_PixelPerfect: 0 m_ReceivesEvents: 1 @@ -2669,67 +2652,6 @@ Canvas: m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 ---- !u!1001 &525252187 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720332, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2351505567455720334, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_Name - value: MRTK XR Rig - objectReference: {fileID: 0} - - target: {fileID: 8479077998186684813, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} --- !u!1 &547058827 GameObject: m_ObjectHideFlags: 0 @@ -3178,11 +3100,6 @@ MonoBehaviour: m_EditorClassIdentifier: m_Padding: {x: -8, y: -5, z: -8, w: -5} m_Softness: {x: 0, y: 0} ---- !u!20 &637040410 stripped -Camera: - m_CorrespondingSourceObject: {fileID: 2351505566771328527, guid: 4d7e2f87fefe0ba468719b15288b46e7, type: 3} - m_PrefabInstance: {fileID: 525252187} - m_PrefabAsset: {fileID: 0} --- !u!1 &684065019 GameObject: m_ObjectHideFlags: 0 @@ -3549,6 +3466,67 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 761587139} m_CullTransparentMesh: 1 +--- !u!1001 &772727539 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720332, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2351505567455720334, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_Name + value: MRTK XR Rig + objectReference: {fileID: 0} + - target: {fileID: 8479077998186684813, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: acbf65a81ce2cf94f82a0809298acf70, type: 3} --- !u!1 &783362213 GameObject: m_ObjectHideFlags: 0 diff --git a/org.mixedrealitytoolkit.uxcore/LegacyDialog.meta b/UnityProjects/MRTKDevTemplate/Assets/Scripts/Editor.meta similarity index 77% rename from org.mixedrealitytoolkit.uxcore/LegacyDialog.meta rename to UnityProjects/MRTKDevTemplate/Assets/Scripts/Editor.meta index f94c516e6..60586f52b 100644 --- a/org.mixedrealitytoolkit.uxcore/LegacyDialog.meta +++ b/UnityProjects/MRTKDevTemplate/Assets/Scripts/Editor.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: f605d08654d10694a8a540b45515da11 +guid: 4c15ba023d835404c8478e6366c833f2 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/UnityProjects/MRTKDevTemplate/Assets/Scripts/Editor/AndroidXRConfig.cs b/UnityProjects/MRTKDevTemplate/Assets/Scripts/Editor/AndroidXRConfig.cs new file mode 100644 index 000000000..885535db5 --- /dev/null +++ b/UnityProjects/MRTKDevTemplate/Assets/Scripts/Editor/AndroidXRConfig.cs @@ -0,0 +1,39 @@ +// Copyright (c) Mixed Reality Toolkit Contributors +// Licensed under the BSD 3-Clause + +using UnityEditor; +using UnityEditor.PackageManager; +using UnityEditor.PackageManager.Requests; +using UnityEngine; + +namespace MixedReality.Toolkit.Examples.Demos.Editor +{ + internal class AndroidXRConfig + { + private static AddAndRemoveRequest request; + + [MenuItem("Mixed Reality/MRTK3/Examples/Configure for Android XR...", priority = int.MaxValue)] + public static void InstallPackages() + { + // Already a request in progress, so don't re-run + if (request != null) + { + return; + } + + Debug.Log("Adding the Unity OpenXR Android XR package..."); + request = Client.AddAndRemove(new[] { "com.unity.xr.androidxr-openxr" }); + EditorApplication.update += Progress; + } + + private static void Progress() + { + if (request.IsCompleted) + { + Debug.Log($"Package install request complete ({request.Status})."); + EditorApplication.update -= Progress; + request = null; + } + } + } +} diff --git a/org.mixedrealitytoolkit.uxcore/LegacyDialog/DialogButton.cs.meta b/UnityProjects/MRTKDevTemplate/Assets/Scripts/Editor/AndroidXRConfig.cs.meta similarity index 83% rename from org.mixedrealitytoolkit.uxcore/LegacyDialog/DialogButton.cs.meta rename to UnityProjects/MRTKDevTemplate/Assets/Scripts/Editor/AndroidXRConfig.cs.meta index db4155a52..94d5d482f 100644 --- a/org.mixedrealitytoolkit.uxcore/LegacyDialog/DialogButton.cs.meta +++ b/UnityProjects/MRTKDevTemplate/Assets/Scripts/Editor/AndroidXRConfig.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 660b2a2578bb7184da54fa6ceb969c2d +guid: affa66227cccb1742ab8a95d518c1787 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/UnityProjects/MRTKDevTemplate/Assets/Scripts/EyeTracking/FollowEyeGaze.cs b/UnityProjects/MRTKDevTemplate/Assets/Scripts/EyeTracking/FollowEyeGaze.cs index a9472da3e..a1bfdb2f7 100644 --- a/UnityProjects/MRTKDevTemplate/Assets/Scripts/EyeTracking/FollowEyeGaze.cs +++ b/UnityProjects/MRTKDevTemplate/Assets/Scripts/EyeTracking/FollowEyeGaze.cs @@ -1,18 +1,19 @@ // Copyright (c) Mixed Reality Toolkit Contributors // Licensed under the BSD 3-Clause -using global::Unity.XR.CoreUtils; using System.Collections.Generic; +using Unity.XR.CoreUtils; using UnityEngine; -using UnityEngine.InputSystem; -using UnityEngine.XR.Interaction.Toolkit; -using UnityEngine.XR.Interaction.Toolkit.Inputs; +using UnityEngine.InputSystem.XR; +using UnityEngine.Serialization; +using UnityEngine.XR.Interaction.Toolkit.Interactables; +using UnityEngine.XR.Interaction.Toolkit.Interactors; namespace MixedReality.Toolkit.Examples { /// /// Sample for allowing the game object that this script is attached to follow the user's eye gaze - /// at a given distance of . + /// at a given distance of . /// [AddComponentMenu("Scripts/MRTK/Examples/FollowEyeGaze")] public class FollowEyeGaze : MonoBehaviour @@ -26,68 +27,62 @@ public class FollowEyeGaze : MonoBehaviour private Color idleStateColor; [Tooltip("The highlight color of the GameObject when hovered over another StatefulInteractable.")] - [SerializeField] - private Color hightlightStateColor; + [SerializeField, FormerlySerializedAs("hightlightStateColor")] + private Color highlightStateColor; private Material material; [SerializeField] - private ActionBasedController gazeController; + [Tooltip("The TrackedPoseDriver that represents the gaze pose.")] + private TrackedPoseDriver gazePoseDriver; [SerializeField] - private InputActionProperty _gazeTranslationAction; + [Tooltip("The IGazeInteractor that represents the gaze interaction.")] + private XRBaseInputInteractor gazeInteractor; - private IGazeInteractor gazeInteractor; private List targets; private void Awake() { material = GetComponent().material; - - gazeInteractor = gazeController.GetComponentInChildren(); - targets = new List(); } - private void OnEnable() - { - if (_gazeTranslationAction == null || _gazeTranslationAction.action == null) - { - return; - } - - _gazeTranslationAction.action.performed += FollowEyeGazeAction; - _gazeTranslationAction.EnableDirectAction(); - } - - private void OnDisable() + private void Update() { - if (_gazeTranslationAction == null || _gazeTranslationAction.action == null) + if (gazeInteractor == null) { return; } - _gazeTranslationAction.DisableDirectAction(); - _gazeTranslationAction.action.performed -= FollowEyeGazeAction; - } - - private void Update() - { targets.Clear(); - gazeInteractor.GetValidTargets(targets); - material.color = targets.Count > 0 ? hightlightStateColor : idleStateColor; + material.color = targets.Count > 0 ? highlightStateColor : idleStateColor; - // Note: A better workflow would be to create and attach a prefab to the MRTK Gaze Controller object. - // Doing this will parent the cursor to the gaze controller transform and be updated automatically. - var pose = gazeController.transform.GetWorldPose(); - transform.position = pose.position + gazeController.transform.forward * defaultDistanceInMeters; + if (TryGetGazeTransform(out Transform gazeTransform)) + { + // Note: A better workflow would be to create and attach a prefab to the MRTK Gaze Controller object. + // Doing this will parent the cursor to the gaze controller transform and be updated automatically. + var pose = gazeTransform.GetWorldPose(); + transform.position = pose.position + gazeTransform.forward * defaultDistanceInMeters; + } } - private void FollowEyeGazeAction(InputAction.CallbackContext obj) + /// + /// Attempt to obtain the gaze transform. + /// + private bool TryGetGazeTransform(out Transform transform) { - // Example of obtaining gaze input action properties - Vector3 translation = _gazeTranslationAction.action.ReadValue(); + if (gazePoseDriver != null) + { + transform = gazePoseDriver.transform; + return true; + } + else + { + transform = null; + return false; + } } } } diff --git a/UnityProjects/MRTKDevTemplate/Assets/Scripts/EyeTracking/TargetPositioning/MoveObjectByEyeGaze.cs b/UnityProjects/MRTKDevTemplate/Assets/Scripts/EyeTracking/TargetPositioning/MoveObjectByEyeGaze.cs index de7fd1c89..8054b6b29 100644 --- a/UnityProjects/MRTKDevTemplate/Assets/Scripts/EyeTracking/TargetPositioning/MoveObjectByEyeGaze.cs +++ b/UnityProjects/MRTKDevTemplate/Assets/Scripts/EyeTracking/TargetPositioning/MoveObjectByEyeGaze.cs @@ -112,7 +112,7 @@ public class MoveObjectByEyeGaze : StatefulInteractable /// Limits the Z position of the GameObject to the specified minimum and maximum. /// public Vector2 LocalMinMaxZ = new Vector2(float.NegativeInfinity, float.PositiveInfinity); - + [Tooltip("Fired when the GameObject is dropped.")] [SerializeField] private UnityEvent onDrop = null; @@ -123,7 +123,7 @@ public class MoveObjectByEyeGaze : StatefulInteractable private bool onlyEyeWarpOnRelease = - true; // Only warp the currently grabbed target to the current look at location once the user releases the pinch gesture. + true; // Only warp the currently grabbed target to the current look at location once the user releases the pinch gesture. private float originalTransparency = -1f; private bool originalUseGravity = false; @@ -366,13 +366,13 @@ private bool IsLookingAwayFromTarget() // Check whether the user is still looking within the proximity of the target float distanceBetweenTargetAndCurrHitPos = Angle_ToCurrHitTarget(gameObject); - // **Note for potential improvement**: It would be better to make this dependent on the target's boundary + // **Note for potential improvement**: It would be better to make this dependent on the target's boundary // instead of its center. The way it is implemented right now may cause problems for large-scale targets. return distanceBetweenTargetAndCurrHitPos > minLookAwayDistToEnableEyeWarp; } /// - /// Determine whether the user is looking away from the preview. + /// Determine whether the user is looking away from the preview. /// private bool IsLookingAwayFromPreview() { @@ -405,7 +405,7 @@ private bool IsLookingAwayFromPreview() /// /// Check if the destination is plausible. For example, this means if the target is placeable - /// on horizontal surfaces then only show a preview for (more or less) horizontal surfaces. + /// on horizontal surfaces then only show a preview for (more or less) horizontal surfaces. /// /// True if the target can be placed on this surface. private bool IsDestinationPlausible() @@ -488,10 +488,10 @@ private void DragAndDrop_Start() if (TryGetComponent(out var rigidbody)) { originalUseGravity = rigidbody.useGravity; - originalDrag = rigidbody.drag; - rigidbody.useGravity = false; - rigidbody.drag = float.PositiveInfinity; + + originalDrag = rigidbody.linearDamping; + rigidbody.linearDamping = float.PositiveInfinity; } } } @@ -520,7 +520,7 @@ private void DragAndDrop_Finish() if (TryGetComponent(out var rigidbody)) { rigidbody.useGravity = originalUseGravity; - rigidbody.drag = originalDrag; + rigidbody.linearDamping = originalDrag; } onDrop.Invoke(); diff --git a/UnityProjects/MRTKDevTemplate/Assets/Scripts/InteractorBehaviorControls.cs b/UnityProjects/MRTKDevTemplate/Assets/Scripts/InteractorBehaviorControls.cs index 334503f17..0b29c7b40 100644 --- a/UnityProjects/MRTKDevTemplate/Assets/Scripts/InteractorBehaviorControls.cs +++ b/UnityProjects/MRTKDevTemplate/Assets/Scripts/InteractorBehaviorControls.cs @@ -5,6 +5,7 @@ using System; using UnityEngine; using UnityEngine.XR.Interaction.Toolkit; +using UnityEngine.XR.Interaction.Toolkit.Interactors; namespace MixedReality.Toolkit.Examples { diff --git a/UnityProjects/MRTKDevTemplate/Assets/Scripts/PenInteractor.cs b/UnityProjects/MRTKDevTemplate/Assets/Scripts/PenInteractor.cs index 7479da37c..650a71924 100644 --- a/UnityProjects/MRTKDevTemplate/Assets/Scripts/PenInteractor.cs +++ b/UnityProjects/MRTKDevTemplate/Assets/Scripts/PenInteractor.cs @@ -1,15 +1,11 @@ // Copyright (c) Mixed Reality Toolkit Contributors // Licensed under the BSD 3-Clause -// Disable "missing XML comment" warning for samples. While nice to have, this XML documentation is not required for samples. -#pragma warning disable CS1591 - -using System; using System.Collections.Generic; -using Unity.Profiling; using UnityEngine; -using UnityEngine.XR; using UnityEngine.XR.Interaction.Toolkit; +using UnityEngine.XR.Interaction.Toolkit.Interactors; +using UnityEngine.XR.Interaction.Toolkit.Interactables; using PokePath = MixedReality.Toolkit.IPokeInteractor.PokePath; @@ -39,14 +35,14 @@ internal class PenInteractor : XRBaseInteractor, IPokeInteractor #region IPokeInteractor Implementation /// - public float PokeRadius => 0.001f; + float IPokeInteractor.PokeRadius => 0.001f; // The last and current poke points, forming a // continuous poking trajectory. private PokePath pokeTrajectory; /// - public PokePath PokeTrajectory => pokeTrajectory; + PokePath IPokeInteractor.PokeTrajectory => pokeTrajectory; #endregion IPokeInteractor Implementation @@ -87,9 +83,13 @@ public override void ProcessInteractor(XRInteractionUpdateOrder.UpdatePhase upda } } - void OnTriggerStay(Collider c) + /// + /// OnTriggerStay is called once per physics update for every Collider that is touching the trigger. + /// + /// The other Collider involved in this collision. + protected void OnTriggerStay(Collider other) { - if (interactionManager.TryGetInteractableForCollider(c, out var associatedInteractable)) + if (interactionManager.TryGetInteractableForCollider(other, out IXRInteractable associatedInteractable)) { hoveredTargets.Add(associatedInteractable); } @@ -98,10 +98,9 @@ void OnTriggerStay(Collider c) /// /// A Unity event function that is called at an framerate independent frequency, and is only called if this object is enabled. /// - private void FixedUpdate() + protected void FixedUpdate() { hoveredTargets.Clear(); } } } -#pragma warning restore CS1591 \ No newline at end of file diff --git a/UnityProjects/MRTKDevTemplate/Assets/Scripts/SampleSceneHandMenu.cs b/UnityProjects/MRTKDevTemplate/Assets/Scripts/SampleSceneHandMenu.cs index c584e132f..1a13843e0 100644 --- a/UnityProjects/MRTKDevTemplate/Assets/Scripts/SampleSceneHandMenu.cs +++ b/UnityProjects/MRTKDevTemplate/Assets/Scripts/SampleSceneHandMenu.cs @@ -54,7 +54,7 @@ private void Awake() previousSceneButton.enabled = IsSceneValid(SceneManager.GetActiveScene().buildIndex - 1); nextSceneButton.enabled = IsSceneValid(SceneManager.GetActiveScene().buildIndex + 1); - SimpleProfiler profiler = FindObjectUtility.FindFirstObjectByType(true); + SimpleProfiler profiler = FindFirstObjectByType(FindObjectsInactive.Include); if (profiler != null) { profilerObject = profiler.gameObject; diff --git a/UnityProjects/MRTKDevTemplate/Assets/Scripts/SolverExampleManager.cs b/UnityProjects/MRTKDevTemplate/Assets/Scripts/SolverExampleManager.cs index 9b8ee00cd..a446480bf 100644 --- a/UnityProjects/MRTKDevTemplate/Assets/Scripts/SolverExampleManager.cs +++ b/UnityProjects/MRTKDevTemplate/Assets/Scripts/SolverExampleManager.cs @@ -2,11 +2,11 @@ // Licensed under the BSD 3-Clause using UnityEngine; +using UnityEngine.XR.Interaction.Toolkit.Interactors; namespace MixedReality.Toolkit.Examples { using SpatialManipulation; - using UnityEngine.XR.Interaction.Toolkit; /// /// Manager class for the solver examples scene. diff --git a/UnityProjects/MRTKDevTemplate/Assets/Scripts/TetheredPlacement.cs b/UnityProjects/MRTKDevTemplate/Assets/Scripts/TetheredPlacement.cs index 369052736..72299c3dc 100644 --- a/UnityProjects/MRTKDevTemplate/Assets/Scripts/TetheredPlacement.cs +++ b/UnityProjects/MRTKDevTemplate/Assets/Scripts/TetheredPlacement.cs @@ -10,7 +10,7 @@ namespace MixedReality.Toolkit.Examples.Demos { /// - /// Helper script to re-spawn objects if they go too far from their original position. + /// Helper script to re-spawn objects if they go too far from their original position. /// /// /// The helper is useful for objects that will fall forever. @@ -28,7 +28,7 @@ internal class TetheredPlacement : MonoBehaviour /// /// A Unity event function that is called on the frame when a script is enabled just before any of the update methods are called the first time. - /// + /// private void Start() { rigidBody = GetComponent(); @@ -49,7 +49,7 @@ private void LateUpdate() // Reset any velocity from falling or moving when re-spawning to original location if (rigidBody != null) { - rigidBody.velocity = Vector3.zero; + rigidBody.linearVelocity = Vector3.zero; rigidBody.angularVelocity = Vector3.zero; } @@ -59,4 +59,4 @@ private void LateUpdate() } } } -#pragma warning restore CS1591 \ No newline at end of file +#pragma warning restore CS1591 diff --git a/UnityProjects/MRTKDevTemplate/Assets/Scripts/Whiteboard.cs b/UnityProjects/MRTKDevTemplate/Assets/Scripts/Whiteboard.cs index db6909f43..b15d494a5 100644 --- a/UnityProjects/MRTKDevTemplate/Assets/Scripts/Whiteboard.cs +++ b/UnityProjects/MRTKDevTemplate/Assets/Scripts/Whiteboard.cs @@ -8,7 +8,7 @@ using UnityEngine; using Unity.Collections; using UnityEngine.XR.Interaction.Toolkit; -using MixedReality.Toolkit.Input; +using UnityEngine.XR.Interaction.Toolkit.Interactors; namespace MixedReality.Toolkit.Examples.Demos { @@ -146,4 +146,4 @@ private void DrawSplat(Vector2 pixelCoordinate, NativeArray data) } } } -#pragma warning restore CS1591 \ No newline at end of file +#pragma warning restore CS1591 diff --git a/UnityProjects/MRTKDevTemplate/Assets/XR/Settings/OpenXR Editor Settings.asset b/UnityProjects/MRTKDevTemplate/Assets/XR/Settings/OpenXR Editor Settings.asset index 87e63a540..25bef9846 100644 --- a/UnityProjects/MRTKDevTemplate/Assets/XR/Settings/OpenXR Editor Settings.asset +++ b/UnityProjects/MRTKDevTemplate/Assets/XR/Settings/OpenXR Editor Settings.asset @@ -19,3 +19,4 @@ MonoBehaviour: - featureSets: - com.microsoft.openxr.featureset.hololens - featureSets: [] + m_vulkanAdditionalGraphicsQueue: 0 diff --git a/UnityProjects/MRTKDevTemplate/Assets/XR/Settings/OpenXR Package Settings.asset b/UnityProjects/MRTKDevTemplate/Assets/XR/Settings/OpenXR Package Settings.asset index 788d71c53..007f71718 100644 --- a/UnityProjects/MRTKDevTemplate/Assets/XR/Settings/OpenXR Package Settings.asset +++ b/UnityProjects/MRTKDevTemplate/Assets/XR/Settings/OpenXR Package Settings.asset @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!114 &-8834606309812823483 +--- !u!114 &-9173909432611776730 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -9,18 +9,22 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 761fdd4502cb7a84e9ec7a2b24f33f37, type: 3} - m_Name: MicrosoftMotionControllerProfile WSA + m_Script: {fileID: 11500000, guid: 056125dd64c0ed540b40a4af74f7b495, type: 3} + m_Name: RuntimeDebuggerOpenXRFeature Standalone m_EditorClassIdentifier: - m_enabled: 1 - nameUi: Microsoft Motion Controller Profile - version: 0.0.1 - featureIdInternal: com.unity.openxr.feature.input.microsoftmotioncontroller + m_enabled: 0 + nameUi: Runtime Debugger + version: 1 + featureIdInternal: com.unity.openxr.features.runtimedebugger openxrExtensionStrings: company: Unity priority: 0 + targetOpenXRApiVersion: required: 0 ---- !u!114 &-8734983254605107581 + customRuntimeLoaderName: + cacheSize: 1048576 + perThreadCacheSize: 51200 +--- !u!114 &-9152424651521319720 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -29,18 +33,42 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: b213d3e3c7f3109449eb46a4c8ee42f0, type: 3} - m_Name: XrPerformanceSettingsFeature iPhone + m_Script: {fileID: 11500000, guid: 2d2e2731103cdda44af77955a0b4814c, type: 3} + m_Name: AppRemotingPlugin Standalone m_EditorClassIdentifier: m_enabled: 0 - nameUi: XR Performance Settings - version: 1.0.0 - featureIdInternal: com.unity.openxr.feature.extension.performance_settings - openxrExtensionStrings: XR_EXT_performance_settings + nameUi: Holographic Remoting remote app + version: 1.11.2 + featureIdInternal: com.microsoft.openxr.feature.appremoting + openxrExtensionStrings: XR_MSFT_holographic_remoting XR_MSFT_holographic_remoting_speech + company: Microsoft + priority: -100 + targetOpenXRApiVersion: + required: 0 + customRuntimeLoaderName: +--- !u!114 &-9152332730062532000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0f6bfdbcb316ed242b30a8798c9eb853, type: 3} + m_Name: KHRSimpleControllerProfile Standalone + m_EditorClassIdentifier: + m_enabled: 0 + nameUi: Khronos Simple Controller Profile + version: 0.0.1 + featureIdInternal: com.unity.openxr.feature.input.khrsimpleprofile + openxrExtensionStrings: company: Unity priority: 0 + targetOpenXRApiVersion: required: 0 ---- !u!114 &-8594885159124533570 + customRuntimeLoaderName: +--- !u!114 &-8319177357708938816 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -49,18 +77,42 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0d6ccd3d0ef0f1d458e69421dccbdae1, type: 3} - m_Name: ValveIndexControllerProfile Standalone + m_Script: {fileID: 11500000, guid: b3cf79659a011bd419c7a2a30eb74e9a, type: 3} + m_Name: EyeGazeInteraction Metro + m_EditorClassIdentifier: + m_enabled: 1 + nameUi: Eye Gaze Interaction Profile + version: 0.0.1 + featureIdInternal: com.unity.openxr.feature.input.eyetracking + openxrExtensionStrings: XR_EXT_eye_gaze_interaction + company: Unity + priority: 0 + targetOpenXRApiVersion: + required: 0 + customRuntimeLoaderName: +--- !u!114 &-8283577154714071237 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 274c02963f889a64e90bc2e596e21d13, type: 3} + m_Name: HTCViveControllerProfile Metro m_EditorClassIdentifier: m_enabled: 0 - nameUi: Valve Index Controller Profile + nameUi: HTC Vive Controller Profile version: 0.0.1 - featureIdInternal: com.unity.openxr.feature.input.valveindex + featureIdInternal: com.unity.openxr.feature.input.htcvive openxrExtensionStrings: company: Unity priority: 0 + targetOpenXRApiVersion: required: 0 ---- !u!114 &-8522947761395393906 + customRuntimeLoaderName: +--- !u!114 &-8186726044552108751 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -70,7 +122,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 9c5b5af5107e35a43818d5411328bfc3, type: 3} - m_Name: DPadInteraction Android + m_Name: DPadInteraction Standalone m_EditorClassIdentifier: m_enabled: 0 nameUi: D-Pad Binding @@ -79,7 +131,9 @@ MonoBehaviour: openxrExtensionStrings: XR_KHR_binding_modification XR_EXT_dpad_binding company: Unity priority: 0 + targetOpenXRApiVersion: required: 0 + customRuntimeLoaderName: forceThresholdLeft: 0.5 forceThresholdReleaseLeft: 0.4 centerRegionLeft: 0.5 @@ -93,7 +147,7 @@ MonoBehaviour: extensionStrings: - XR_KHR_binding_modification - XR_EXT_dpad_binding ---- !u!114 &-8369336400205322800 +--- !u!114 &-7431403579802858517 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -102,18 +156,22 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2b7365b139f7aec43b23d26b7a48b5a6, type: 3} - m_Name: MetaQuestTouchPlusControllerProfile Standalone + m_Script: {fileID: 11500000, guid: 9ef793c31862a37448e907829482ef80, type: 3} + m_Name: OculusQuestFeature Android m_EditorClassIdentifier: m_enabled: 0 - nameUi: Meta Quest Touch Plus Controller Profile - version: 0.0.1 - featureIdInternal: com.unity.openxr.feature.input.metaquestplus - openxrExtensionStrings: XR_META_touch_controller_plus + nameUi: Oculus Quest Support + version: 1.0.0 + featureIdInternal: com.unity.openxr.feature.oculusquest + openxrExtensionStrings: XR_OCULUS_android_initialize_loader company: Unity priority: 0 + targetOpenXRApiVersion: required: 0 ---- !u!114 &-8136130855646488046 + customRuntimeLoaderName: + targetQuest: 1 + targetQuest2: 1 +--- !u!114 &-7229825001273466666 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -122,18 +180,20 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2d2e2731103cdda44af77955a0b4814c, type: 3} - m_Name: AppRemotingPlugin Standalone + m_Script: {fileID: 11500000, guid: f928d0d73a35f294fbe357ca17aa3547, type: 3} + m_Name: MicrosoftHandInteraction Android m_EditorClassIdentifier: m_enabled: 0 - nameUi: Holographic Remoting remote app - version: 1.11.2 - featureIdInternal: com.microsoft.openxr.feature.appremoting - openxrExtensionStrings: XR_MSFT_holographic_remoting XR_MSFT_holographic_remoting_speech - company: Microsoft - priority: -100 + nameUi: Microsoft Hand Interaction Profile + version: 0.0.1 + featureIdInternal: com.unity.openxr.feature.input.handtracking + openxrExtensionStrings: XR_MSFT_hand_interaction + company: Unity + priority: 0 + targetOpenXRApiVersion: required: 0 ---- !u!114 &-8123676160964616339 + customRuntimeLoaderName: +--- !u!114 &-7042059687803235483 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -142,18 +202,20 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: b213d3e3c7f3109449eb46a4c8ee42f0, type: 3} - m_Name: XrPerformanceSettingsFeature Android + m_Script: {fileID: 11500000, guid: f928d0d73a35f294fbe357ca17aa3547, type: 3} + m_Name: MicrosoftHandInteraction Metro m_EditorClassIdentifier: m_enabled: 0 - nameUi: XR Performance Settings - version: 1.0.0 - featureIdInternal: com.unity.openxr.feature.extension.performance_settings - openxrExtensionStrings: XR_EXT_performance_settings + nameUi: Microsoft Hand Interaction Profile + version: 0.0.1 + featureIdInternal: com.unity.openxr.feature.input.handtracking + openxrExtensionStrings: XR_MSFT_hand_interaction company: Unity priority: 0 + targetOpenXRApiVersion: required: 0 ---- !u!114 &-7594407212717573506 + customRuntimeLoaderName: +--- !u!114 &-6794257755403143708 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -162,18 +224,26 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2b7365b139f7aec43b23d26b7a48b5a6, type: 3} - m_Name: MetaQuestTouchPlusControllerProfile WSA + m_Script: {fileID: 11500000, guid: c79c911b38743a649b1c1eddb5097202, type: 3} + m_Name: HandTrackingFeaturePlugin Metro m_EditorClassIdentifier: m_enabled: 0 - nameUi: Meta Quest Touch Plus Controller Profile - version: 0.0.1 - featureIdInternal: com.unity.openxr.feature.input.metaquestplus - openxrExtensionStrings: XR_META_touch_controller_plus - company: Unity + nameUi: Hand Tracking + version: 1.11.2 + featureIdInternal: com.microsoft.openxr.feature.handtracking + openxrExtensionStrings: XR_EXT_hand_tracking XR_EXT_hand_joints_motion_range XR_EXT_hand_tracking_data_source + XR_MSFT_hand_tracking_mesh + company: Microsoft priority: 0 + targetOpenXRApiVersion: required: 0 ---- !u!114 &-7321926629275167846 + customRuntimeLoaderName: + leftHandTrackingOptions: + motionRange: 0 + rightHandTrackingOptions: + motionRange: 0 + questHandTrackingMode: 1 +--- !u!114 &-6733472631637007722 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -182,18 +252,20 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 761fdd4502cb7a84e9ec7a2b24f33f37, type: 3} - m_Name: MicrosoftMotionControllerProfile Standalone + m_Script: {fileID: 11500000, guid: 0c8f1ce8139888c4ab621f6b3c8bb558, type: 3} + m_Name: MotionControllerFeaturePlugin Metro m_EditorClassIdentifier: - m_enabled: 0 - nameUi: Microsoft Motion Controller Profile - version: 0.0.1 - featureIdInternal: com.unity.openxr.feature.input.microsoftmotioncontroller - openxrExtensionStrings: - company: Unity + m_enabled: 1 + nameUi: Motion Controller Model + version: 1.11.2 + featureIdInternal: com.microsoft.openxr.feature.controller + openxrExtensionStrings: XR_MSFT_controller_model XR_FB_render_model + company: Microsoft priority: 0 + targetOpenXRApiVersion: required: 0 ---- !u!114 &-7294554625360543033 + customRuntimeLoaderName: +--- !u!114 &-6174246449855855006 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -202,18 +274,20 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f928d0d73a35f294fbe357ca17aa3547, type: 3} - m_Name: MicrosoftHandInteraction WSA + m_Script: {fileID: 11500000, guid: b3cf79659a011bd419c7a2a30eb74e9a, type: 3} + m_Name: EyeGazeInteraction Android m_EditorClassIdentifier: m_enabled: 1 - nameUi: Microsoft Hand Interaction Profile + nameUi: Eye Gaze Interaction Profile version: 0.0.1 - featureIdInternal: com.unity.openxr.feature.input.handtracking - openxrExtensionStrings: XR_MSFT_hand_interaction + featureIdInternal: com.unity.openxr.feature.input.eyetracking + openxrExtensionStrings: XR_EXT_eye_gaze_interaction company: Unity priority: 0 + targetOpenXRApiVersion: required: 0 ---- !u!114 &-7104108163923222141 + customRuntimeLoaderName: +--- !u!114 &-5492763381520605560 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -222,18 +296,27 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3482401f887b8864183e401715462f46, type: 3} - m_Name: HPMixedRealityControllerProfile Standalone + m_Script: {fileID: 11500000, guid: 3f8ec2975f18d5e479159feb34b4dc86, type: 3} + m_Name: MixedRealityFeaturePlugin Standalone m_EditorClassIdentifier: - m_enabled: 0 - nameUi: HP Reverb G2 Controller Profile + m_enabled: 1 + nameUi: Mixed Reality Features version: 1.11.2 - featureIdInternal: com.microsoft.openxr.feature.interaction.hpmixedrealitycontroller - openxrExtensionStrings: XR_EXT_hp_mixed_reality_controller + featureIdInternal: com.microsoft.openxr.feature.hololens + openxrExtensionStrings: XR_MSFT_holographic_window_attachment XR_KHR_win32_convert_performance_counter_time + XR_MSFT_unbounded_reference_space XR_MSFT_spatial_anchor XR_MSFT_secondary_view_configuration + XR_MSFT_first_person_observer XR_MSFT_spatial_graph_bridge XR_MSFT_perception_anchor_interop + XR_MSFT_spatial_anchor_persistence XR_MSFT_scene_understanding XR_MSFT_scene_understanding_serialization + XR_MSFT_scene_marker XR_MSFT_spatial_anchor_export_preview XR_MSFT_composition_layer_reprojection company: Microsoft priority: 0 - required: 0 ---- !u!114 &-6741064258171348514 + targetOpenXRApiVersion: + required: 1 + customRuntimeLoaderName: + disableFirstPersonObserver: 0 + enablePoseUpdateOnBeforeRender: 0 + validationRuleTarget: 0 +--- !u!114 &-5486743104097466142 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -242,18 +325,33 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f028123e2efe1d443875bc7609b4a98b, type: 3} - m_Name: PalmPoseInteraction WSA + m_Script: {fileID: 11500000, guid: 9c5b5af5107e35a43818d5411328bfc3, type: 3} + m_Name: DPadInteraction Android m_EditorClassIdentifier: m_enabled: 0 - nameUi: Palm Pose + nameUi: D-Pad Binding version: 0.0.1 - featureIdInternal: com.unity.openxr.feature.input.palmpose - openxrExtensionStrings: XR_EXT_palm_pose + featureIdInternal: com.unity.openxr.feature.input.dpadinteraction + openxrExtensionStrings: XR_KHR_binding_modification XR_EXT_dpad_binding company: Unity priority: 0 + targetOpenXRApiVersion: required: 0 ---- !u!114 &-6535441690950590841 + customRuntimeLoaderName: + forceThresholdLeft: 0.5 + forceThresholdReleaseLeft: 0.4 + centerRegionLeft: 0.5 + wedgeAngleLeft: 1.5707964 + isStickyLeft: 0 + forceThresholdRight: 0.5 + forceThresholdReleaseRight: 0.4 + centerRegionRight: 0.5 + wedgeAngleRight: 1.5707964 + isStickyRight: 0 + extensionStrings: + - XR_KHR_binding_modification + - XR_EXT_dpad_binding +--- !u!114 &-5448262054166454653 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -262,18 +360,20 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e314dfef9af0904e80129bcc0a79361, type: 3} - m_Name: HandTracking WSA + m_Script: {fileID: 11500000, guid: f028123e2efe1d443875bc7609b4a98b, type: 3} + m_Name: PalmPoseInteraction Standalone m_EditorClassIdentifier: m_enabled: 0 - nameUi: Hand Tracking Subsystem + nameUi: Palm Pose version: 0.0.1 - featureIdInternal: com.unity.openxr.feature.input.handtracking - openxrExtensionStrings: XR_EXT_hand_tracking + featureIdInternal: com.unity.openxr.feature.input.palmpose + openxrExtensionStrings: XR_EXT_palm_pose company: Unity - priority: -100 + priority: 0 + targetOpenXRApiVersion: required: 0 ---- !u!114 &-6521437262539290955 + customRuntimeLoaderName: +--- !u!114 &-5414823066519608731 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -282,18 +382,20 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e5315f812f023cf4ebf26f7e5d2d70f2, type: 3} - m_Name: HPReverbG2ControllerProfile Standalone + m_Script: {fileID: 11500000, guid: b3aced3429e5911458f4da2dac9d0f29, type: 3} + m_Name: MetaHandTrackingAim Standalone m_EditorClassIdentifier: m_enabled: 0 - nameUi: HP Reverb G2 Controller Profile + nameUi: Meta Hand Tracking Aim version: 0.0.1 - featureIdInternal: com.unity.openxr.feature.input.hpreverb - openxrExtensionStrings: XR_EXT_hp_mixed_reality_controller + featureIdInternal: com.unity.openxr.feature.input.metahandtrackingaim + openxrExtensionStrings: XR_FB_hand_tracking_aim company: Unity priority: 0 + targetOpenXRApiVersion: required: 0 ---- !u!114 &-6365806483391335959 + customRuntimeLoaderName: +--- !u!114 &-5000202051992085229 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -302,18 +404,20 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2d2e2731103cdda44af77955a0b4814c, type: 3} - m_Name: AppRemotingPlugin WSA + m_Script: {fileID: 11500000, guid: 30587bb28b5390644ae70f801841a073, type: 3} + m_Name: MRTKFocusFeature Android m_EditorClassIdentifier: - m_enabled: 0 - nameUi: Holographic Remoting remote app - version: 1.11.2 - featureIdInternal: com.microsoft.openxr.feature.appremoting - openxrExtensionStrings: XR_MSFT_holographic_remoting XR_MSFT_holographic_remoting_speech - company: Microsoft - priority: -100 + m_enabled: 1 + nameUi: MRTK3 Session Focus + version: 4.0.0 + featureIdInternal: org.mixedreality.toolkit.input.focus + openxrExtensionStrings: + company: Mixed Reality Toolkit Contributors + priority: 0 + targetOpenXRApiVersion: required: 0 ---- !u!114 &-6326232607128738207 + customRuntimeLoaderName: +--- !u!114 &-4989097037534641705 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -322,18 +426,50 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0c8f1ce8139888c4ab621f6b3c8bb558, type: 3} - m_Name: MotionControllerFeaturePlugin Android + m_Script: {fileID: 11500000, guid: b5a1f07dc5afe854f9f12a4194aca3fb, type: 3} + m_Name: Standalone m_EditorClassIdentifier: - m_enabled: 1 - nameUi: Motion Controller Model - version: 1.11.2 - featureIdInternal: com.microsoft.openxr.feature.controller - openxrExtensionStrings: XR_MSFT_controller_model XR_FB_render_model - company: Microsoft - priority: 0 - required: 0 ---- !u!114 &-6291567202788476059 + features: + - {fileID: -676329725382200616} + - {fileID: -8186726044552108751} + - {fileID: -1144888657426385825} + - {fileID: -910622493186121033} + - {fileID: 1500523782327561539} + - {fileID: 169602148789327356} + - {fileID: 5521749775559828029} + - {fileID: -4689946533738870081} + - {fileID: 2426265406813202181} + - {fileID: 5076197482031073275} + - {fileID: -9152332730062532000} + - {fileID: -5414823066519608731} + - {fileID: 1865504128796090834} + - {fileID: 4108263696553698169} + - {fileID: 176539555143869308} + - {fileID: 6342154364724310848} + - {fileID: -5492763381520605560} + - {fileID: 720212866400260749} + - {fileID: -2783824018031006640} + - {fileID: -4614918767838866102} + - {fileID: 4334429337943452973} + - {fileID: -5448262054166454653} + - {fileID: -9173909432611776730} + - {fileID: 4825760689371567295} + - {fileID: -2854879879689529201} + - {fileID: 1801456176265505245} + - {fileID: 6710627333171298302} + - {fileID: -9152424651521319720} + customLoaderName: + m_renderMode: 1 + m_latencyOptimization: 0 + m_autoColorSubmissionMode: 1 + m_colorSubmissionModes: + m_List: 00000000 + m_depthSubmissionMode: 2 + m_spacewarpMotionVectorTextureFormat: 0 + m_optimizeBufferDiscards: 0 + m_symmetricProjection: 0 + m_foveatedRenderingApi: 0 +--- !u!114 &-4689946533738870081 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -342,19 +478,20 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7de993716e042c6499d0c18eed3a773c, type: 3} - m_Name: MockRuntime Standalone + m_Script: {fileID: 11500000, guid: e5315f812f023cf4ebf26f7e5d2d70f2, type: 3} + m_Name: HPReverbG2ControllerProfile Standalone m_EditorClassIdentifier: m_enabled: 0 - nameUi: Mock Runtime - version: 0.0.2 - featureIdInternal: com.unity.openxr.feature.mockruntime - openxrExtensionStrings: XR_UNITY_null_gfx XR_UNITY_android_present + nameUi: HP Reverb G2 Controller Profile + version: 0.0.1 + featureIdInternal: com.unity.openxr.feature.input.hpreverb + openxrExtensionStrings: XR_EXT_hp_mixed_reality_controller company: Unity priority: 0 + targetOpenXRApiVersion: required: 0 - ignoreValidationErrors: 0 ---- !u!114 &-6284616687731864893 + customRuntimeLoaderName: +--- !u!114 &-4614918767838866102 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -363,18 +500,20 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: b3aced3429e5911458f4da2dac9d0f29, type: 3} - m_Name: MetaHandTrackingAim Android + m_Script: {fileID: 11500000, guid: 30587bb28b5390644ae70f801841a073, type: 3} + m_Name: MRTKFocusFeature Standalone m_EditorClassIdentifier: - m_enabled: 0 - nameUi: Meta Hand Tracking Aim - version: 0.0.1 - featureIdInternal: com.unity.openxr.feature.input.metahandtrackingaim - openxrExtensionStrings: XR_FB_hand_tracking_aim - company: Unity + m_enabled: 1 + nameUi: MRTK3 Session Focus + version: 4.0.0 + featureIdInternal: org.mixedreality.toolkit.input.focus + openxrExtensionStrings: + company: Mixed Reality Toolkit Contributors priority: 0 + targetOpenXRApiVersion: required: 0 ---- !u!114 &-6240091031804019219 + customRuntimeLoaderName: +--- !u!114 &-4076602338449401114 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -383,18 +522,23 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 486b5e28864f9a94b979b9620ce5006d, type: 3} - m_Name: ConformanceAutomationFeature Standalone + m_Script: {fileID: 11500000, guid: f6a75d1f5ff90154ea2a8e58222a1f59, type: 3} + m_Name: FoveatedRenderingFeature Android m_EditorClassIdentifier: m_enabled: 0 - nameUi: Conformance Automation - version: 0.0.1 - featureIdInternal: com.unity.openxr.feature.conformance - openxrExtensionStrings: XR_EXT_conformance_automation + nameUi: Foveated Rendering + version: 1 + featureIdInternal: com.unity.openxr.feature.foveatedrendering + openxrExtensionStrings: XR_UNITY_foveation XR_FB_foveation XR_FB_foveation_configuration + XR_FB_swapchain_update_state XR_FB_foveation_vulkan XR_META_foveation_eye_tracked + XR_META_vulkan_swapchain_create_info company: Unity priority: 0 + targetOpenXRApiVersion: required: 0 ---- !u!114 &-6082735451881085207 + customRuntimeLoaderName: + enableSubsampledLayout: 0 +--- !u!114 &-3765664599707111037 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -403,18 +547,20 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f028123e2efe1d443875bc7609b4a98b, type: 3} - m_Name: PalmPoseInteraction Android + m_Script: {fileID: 11500000, guid: 2a24be4b5ebfe5f4d8ed1de9b25cb7aa, type: 3} + m_Name: HandCommonPosesInteraction Android m_EditorClassIdentifier: m_enabled: 0 - nameUi: Palm Pose + nameUi: Hand Interaction Poses version: 0.0.1 - featureIdInternal: com.unity.openxr.feature.input.palmpose - openxrExtensionStrings: XR_EXT_palm_pose + featureIdInternal: com.unity.openxr.feature.input.handinteractionposes + openxrExtensionStrings: XR_EXT_hand_interaction company: Unity priority: 0 + targetOpenXRApiVersion: required: 0 ---- !u!114 &-5832260525886948589 + customRuntimeLoaderName: +--- !u!114 &-3273436338079595365 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -423,18 +569,20 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5019471fb2174e5c852ecd4047163007, type: 3} - m_Name: HandInteractionProfile Android + m_Script: {fileID: 11500000, guid: feeef8d85de8db242bdda70cc7ff5acd, type: 3} + m_Name: OculusTouchControllerProfile Android m_EditorClassIdentifier: - m_enabled: 0 - nameUi: Hand Interaction Profile + m_enabled: 1 + nameUi: Oculus Touch Controller Profile version: 0.0.1 - featureIdInternal: com.unity.openxr.feature.input.handinteraction - openxrExtensionStrings: XR_EXT_hand_interaction + featureIdInternal: com.unity.openxr.feature.input.oculustouch + openxrExtensionStrings: company: Unity priority: 0 + targetOpenXRApiVersion: required: 0 ---- !u!114 &-5794149497025949585 + customRuntimeLoaderName: +--- !u!114 &-2965066531462613033 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -443,18 +591,23 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5019471fb2174e5c852ecd4047163007, type: 3} - m_Name: HandInteractionProfile WSA + m_Script: {fileID: 11500000, guid: f6a75d1f5ff90154ea2a8e58222a1f59, type: 3} + m_Name: FoveatedRenderingFeature Metro m_EditorClassIdentifier: m_enabled: 0 - nameUi: Hand Interaction Profile - version: 0.0.1 - featureIdInternal: com.unity.openxr.feature.input.handinteraction - openxrExtensionStrings: XR_EXT_hand_interaction + nameUi: Foveated Rendering + version: 1 + featureIdInternal: com.unity.openxr.feature.foveatedrendering + openxrExtensionStrings: XR_UNITY_foveation XR_FB_foveation XR_FB_foveation_configuration + XR_FB_swapchain_update_state XR_FB_foveation_vulkan XR_META_foveation_eye_tracked + XR_META_vulkan_swapchain_create_info company: Unity priority: 0 + targetOpenXRApiVersion: required: 0 ---- !u!114 &-5515180106887597363 + customRuntimeLoaderName: + enableSubsampledLayout: 0 +--- !u!114 &-2854879879689529201 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -463,18 +616,20 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c4b862ee14fb479fbfe5fffe655d3ed3, type: 3} - m_Name: MetaQuestTouchProControllerProfile WSA + m_Script: {fileID: 11500000, guid: b213d3e3c7f3109449eb46a4c8ee42f0, type: 3} + m_Name: XrPerformanceSettingsFeature Standalone m_EditorClassIdentifier: m_enabled: 0 - nameUi: Meta Quest Touch Pro Controller Profile - version: 0.0.1 - featureIdInternal: com.unity.openxr.feature.input.metaquestpro - openxrExtensionStrings: XR_FB_touch_controller_pro + nameUi: XR Performance Settings + version: 1.0.0 + featureIdInternal: com.unity.openxr.feature.extension.performance_settings + openxrExtensionStrings: XR_EXT_performance_settings company: Unity priority: 0 + targetOpenXRApiVersion: required: 0 ---- !u!114 &-5297537421338403838 + customRuntimeLoaderName: +--- !u!114 &-2783824018031006640 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -483,18 +638,88 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: b3aced3429e5911458f4da2dac9d0f29, type: 3} - m_Name: MetaHandTrackingAim Standalone + m_Script: {fileID: 11500000, guid: 0c8f1ce8139888c4ab621f6b3c8bb558, type: 3} + m_Name: MotionControllerFeaturePlugin Standalone + m_EditorClassIdentifier: + m_enabled: 1 + nameUi: Motion Controller Model + version: 1.11.2 + featureIdInternal: com.microsoft.openxr.feature.controller + openxrExtensionStrings: XR_MSFT_controller_model XR_FB_render_model + company: Microsoft + priority: 0 + targetOpenXRApiVersion: + required: 0 + customRuntimeLoaderName: +--- !u!114 &-2678770202730527855 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b5a1f07dc5afe854f9f12a4194aca3fb, type: 3} + m_Name: Android + m_EditorClassIdentifier: + features: + - {fileID: -2583294156703308178} + - {fileID: -5486743104097466142} + - {fileID: -6174246449855855006} + - {fileID: -4076602338449401114} + - {fileID: -3765664599707111037} + - {fileID: 7747853251997987524} + - {fileID: 2243745316666254909} + - {fileID: 1460439861051510218} + - {fileID: 949057647160003393} + - {fileID: 124253079821610644} + - {fileID: 8871992131841203481} + - {fileID: 7631871841315510880} + - {fileID: -7229825001273466666} + - {fileID: 4508051287823359615} + - {fileID: 2835676197965704550} + - {fileID: -5000202051992085229} + - {fileID: -7431403579802858517} + - {fileID: -3273436338079595365} + - {fileID: 8773911662759437579} + - {fileID: 4340476533682327203} + - {fileID: -1924118926561365233} + - {fileID: 1621992913488806095} + customLoaderName: + m_renderMode: 1 + m_latencyOptimization: 0 + m_autoColorSubmissionMode: 1 + m_colorSubmissionModes: + m_List: 00000000 + m_depthSubmissionMode: 1 + m_spacewarpMotionVectorTextureFormat: 0 + m_optimizeBufferDiscards: 1 + m_symmetricProjection: 0 + m_foveatedRenderingApi: 0 +--- !u!114 &-2583294156703308178 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 486b5e28864f9a94b979b9620ce5006d, type: 3} + m_Name: ConformanceAutomationFeature Android m_EditorClassIdentifier: m_enabled: 0 - nameUi: Meta Hand Tracking Aim + nameUi: Conformance Automation version: 0.0.1 - featureIdInternal: com.unity.openxr.feature.input.metahandtrackingaim - openxrExtensionStrings: XR_FB_hand_tracking_aim + featureIdInternal: com.unity.openxr.feature.conformance + openxrExtensionStrings: XR_EXT_conformance_automation company: Unity priority: 0 + targetOpenXRApiVersion: required: 0 ---- !u!114 &-5212996281295595556 + customRuntimeLoaderName: +--- !u!114 &-2527810363365505607 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -503,23 +728,20 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9f34c86d1a130cc45a438373e1e8a4fc, type: 3} - m_Name: PlayModeRemotingPlugin Standalone + m_Script: {fileID: 11500000, guid: 3482401f887b8864183e401715462f46, type: 3} + m_Name: HPMixedRealityControllerProfile Metro m_EditorClassIdentifier: m_enabled: 0 - nameUi: Holographic Remoting for Play Mode + nameUi: HP Reverb G2 Controller Profile version: 1.11.2 - featureIdInternal: com.microsoft.openxr.feature.playmoderemoting - openxrExtensionStrings: XR_MSFT_holographic_remoting XR_MSFT_holographic_remoting_speech + featureIdInternal: com.microsoft.openxr.feature.interaction.hpmixedrealitycontroller + openxrExtensionStrings: XR_EXT_hp_mixed_reality_controller company: Microsoft - priority: -100 + priority: 0 + targetOpenXRApiVersion: required: 0 - m_remoteHostName: - m_remoteHostPort: 8265 - m_maxBitrate: 20000 - m_videoCodec: 0 - m_enableAudio: 0 ---- !u!114 &-4980378866309187382 + customRuntimeLoaderName: +--- !u!114 &-2219742231848666541 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -528,18 +750,22 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: b3cf79659a011bd419c7a2a30eb74e9a, type: 3} - m_Name: EyeGazeInteraction WSA + m_Script: {fileID: 11500000, guid: 056125dd64c0ed540b40a4af74f7b495, type: 3} + m_Name: RuntimeDebuggerOpenXRFeature Metro m_EditorClassIdentifier: - m_enabled: 1 - nameUi: Eye Gaze Interaction Profile - version: 0.0.1 - featureIdInternal: com.unity.openxr.feature.input.eyetracking - openxrExtensionStrings: XR_EXT_eye_gaze_interaction + m_enabled: 0 + nameUi: Runtime Debugger + version: 1 + featureIdInternal: com.unity.openxr.features.runtimedebugger + openxrExtensionStrings: company: Unity priority: 0 + targetOpenXRApiVersion: required: 0 ---- !u!114 &-4740256116611402092 + customRuntimeLoaderName: + cacheSize: 1048576 + perThreadCacheSize: 51200 +--- !u!114 &-1990190299391547169 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -548,24 +774,20 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c79c911b38743a649b1c1eddb5097202, type: 3} - m_Name: HandTrackingFeaturePlugin WSA + m_Script: {fileID: 11500000, guid: 2b7365b139f7aec43b23d26b7a48b5a6, type: 3} + m_Name: MetaQuestTouchPlusControllerProfile Metro m_EditorClassIdentifier: - m_enabled: 1 - nameUi: Hand Tracking - version: 1.11.2 - featureIdInternal: com.microsoft.openxr.feature.handtracking - openxrExtensionStrings: XR_EXT_hand_tracking XR_EXT_hand_joints_motion_range XR_EXT_hand_tracking_data_source - XR_MSFT_hand_tracking_mesh - company: Microsoft + m_enabled: 0 + nameUi: Meta Quest Touch Plus Controller Profile + version: 0.0.1 + featureIdInternal: com.unity.openxr.feature.input.metaquestplus + openxrExtensionStrings: XR_META_touch_controller_plus + company: Unity priority: 0 + targetOpenXRApiVersion: required: 0 - leftHandTrackingOptions: - motionRange: 0 - rightHandTrackingOptions: - motionRange: 0 - questHandTrackingMode: 1 ---- !u!114 &-4630134788987129440 + customRuntimeLoaderName: +--- !u!114 &-1924118926561365233 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -574,18 +796,20 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0f6bfdbcb316ed242b30a8798c9eb853, type: 3} - m_Name: KHRSimpleControllerProfile Android + m_Script: {fileID: 11500000, guid: b213d3e3c7f3109449eb46a4c8ee42f0, type: 3} + m_Name: XrPerformanceSettingsFeature Android m_EditorClassIdentifier: m_enabled: 0 - nameUi: Khronos Simple Controller Profile - version: 0.0.1 - featureIdInternal: com.unity.openxr.feature.input.khrsimpleprofile - openxrExtensionStrings: + nameUi: XR Performance Settings + version: 1.0.0 + featureIdInternal: com.unity.openxr.feature.extension.performance_settings + openxrExtensionStrings: XR_EXT_performance_settings company: Unity priority: 0 + targetOpenXRApiVersion: required: 0 ---- !u!114 &-4619825313993190921 + customRuntimeLoaderName: +--- !u!114 &-1685409458817180080 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -594,41 +818,20 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: b5a1f07dc5afe854f9f12a4194aca3fb, type: 3} - m_Name: WSA + m_Script: {fileID: 11500000, guid: 30587bb28b5390644ae70f801841a073, type: 3} + m_Name: MRTKFocusFeature Metro m_EditorClassIdentifier: - features: - - {fileID: 2345388348882096190} - - {fileID: -4336299458691191277} - - {fileID: -4980378866309187382} - - {fileID: 8255902311722671649} - - {fileID: -5794149497025949585} - - {fileID: -4740256116611402092} - - {fileID: 5282128220662545123} - - {fileID: 8809846650566260409} - - {fileID: 8830336202024584476} - - {fileID: 3134151582273165400} - - {fileID: -7594407212717573506} - - {fileID: -5515180106887597363} - - {fileID: -7294554625360543033} - - {fileID: -8834606309812823483} - - {fileID: -1487959199633112123} - - {fileID: 4227640669958400424} - - {fileID: 6454520947755431774} - - {fileID: -6741064258171348514} - - {fileID: 2289279436018880081} - - {fileID: 8164470763647245072} - - {fileID: 7298005106529295474} - - {fileID: -6535441690950590841} - - {fileID: -6365806483391335959} - m_renderMode: 1 - m_autoColorSubmissionMode: 1 - m_colorSubmissionModes: - m_List: 00000000 - m_depthSubmissionMode: 1 - m_optimizeBufferDiscards: 0 - m_symmetricProjection: 0 ---- !u!114 &-4336299458691191277 + m_enabled: 1 + nameUi: MRTK3 Session Focus + version: 4.0.0 + featureIdInternal: org.mixedreality.toolkit.input.focus + openxrExtensionStrings: + company: Mixed Reality Toolkit Contributors + priority: 0 + targetOpenXRApiVersion: + required: 0 + customRuntimeLoaderName: +--- !u!114 &-1310172892294911860 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -638,7 +841,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 9c5b5af5107e35a43818d5411328bfc3, type: 3} - m_Name: DPadInteraction WSA + m_Name: DPadInteraction Metro m_EditorClassIdentifier: m_enabled: 0 nameUi: D-Pad Binding @@ -647,7 +850,9 @@ MonoBehaviour: openxrExtensionStrings: XR_KHR_binding_modification XR_EXT_dpad_binding company: Unity priority: 0 + targetOpenXRApiVersion: required: 0 + customRuntimeLoaderName: forceThresholdLeft: 0.5 forceThresholdReleaseLeft: 0.4 centerRegionLeft: 0.5 @@ -661,7 +866,7 @@ MonoBehaviour: extensionStrings: - XR_KHR_binding_modification - XR_EXT_dpad_binding ---- !u!114 &-4085893827450681117 +--- !u!114 &-1144888657426385825 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -670,20 +875,20 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 056125dd64c0ed540b40a4af74f7b495, type: 3} - m_Name: RuntimeDebuggerOpenXRFeature Android + m_Script: {fileID: 11500000, guid: b3cf79659a011bd419c7a2a30eb74e9a, type: 3} + m_Name: EyeGazeInteraction Standalone m_EditorClassIdentifier: - m_enabled: 0 - nameUi: Runtime Debugger - version: 1 - featureIdInternal: com.unity.openxr.features.runtimedebugger - openxrExtensionStrings: + m_enabled: 1 + nameUi: Eye Gaze Interaction Profile + version: 0.0.1 + featureIdInternal: com.unity.openxr.feature.input.eyetracking + openxrExtensionStrings: XR_EXT_eye_gaze_interaction company: Unity priority: 0 + targetOpenXRApiVersion: required: 0 - cacheSize: 1048576 - perThreadCacheSize: 51200 ---- !u!114 &-3540660573686832417 + customRuntimeLoaderName: +--- !u!114 &-910622493186121033 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -692,18 +897,23 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e314dfef9af0904e80129bcc0a79361, type: 3} - m_Name: HandTracking Android + m_Script: {fileID: 11500000, guid: f6a75d1f5ff90154ea2a8e58222a1f59, type: 3} + m_Name: FoveatedRenderingFeature Standalone m_EditorClassIdentifier: - m_enabled: 1 - nameUi: Hand Tracking Subsystem - version: 0.0.1 - featureIdInternal: com.unity.openxr.feature.input.handtracking - openxrExtensionStrings: XR_EXT_hand_tracking + m_enabled: 0 + nameUi: Foveated Rendering + version: 1 + featureIdInternal: com.unity.openxr.feature.foveatedrendering + openxrExtensionStrings: XR_UNITY_foveation XR_FB_foveation XR_FB_foveation_configuration + XR_FB_swapchain_update_state XR_FB_foveation_vulkan XR_META_foveation_eye_tracked + XR_META_vulkan_swapchain_create_info company: Unity - priority: -100 + priority: 0 + targetOpenXRApiVersion: required: 0 ---- !u!114 &-3267254719211769934 + customRuntimeLoaderName: + enableSubsampledLayout: 0 +--- !u!114 &-676329725382200616 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -712,18 +922,20 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e314dfef9af0904e80129bcc0a79361, type: 3} - m_Name: HandTracking Standalone + m_Script: {fileID: 11500000, guid: 486b5e28864f9a94b979b9620ce5006d, type: 3} + m_Name: ConformanceAutomationFeature Standalone m_EditorClassIdentifier: - m_enabled: 1 - nameUi: Hand Tracking Subsystem + m_enabled: 0 + nameUi: Conformance Automation version: 0.0.1 - featureIdInternal: com.unity.openxr.feature.input.handtracking - openxrExtensionStrings: XR_EXT_hand_tracking + featureIdInternal: com.unity.openxr.feature.conformance + openxrExtensionStrings: XR_EXT_conformance_automation company: Unity - priority: -100 + priority: 0 + targetOpenXRApiVersion: required: 0 ---- !u!114 &-2659505044388052374 + customRuntimeLoaderName: +--- !u!114 &-468654872820436234 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -732,18 +944,20 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 274c02963f889a64e90bc2e596e21d13, type: 3} - m_Name: HTCViveControllerProfile Standalone + m_Script: {fileID: 11500000, guid: 486b5e28864f9a94b979b9620ce5006d, type: 3} + m_Name: ConformanceAutomationFeature Metro m_EditorClassIdentifier: m_enabled: 0 - nameUi: HTC Vive Controller Profile + nameUi: Conformance Automation version: 0.0.1 - featureIdInternal: com.unity.openxr.feature.input.htcvive - openxrExtensionStrings: + featureIdInternal: com.unity.openxr.feature.conformance + openxrExtensionStrings: XR_EXT_conformance_automation company: Unity priority: 0 + targetOpenXRApiVersion: required: 0 ---- !u!114 &-1487959199633112123 + customRuntimeLoaderName: +--- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -752,25 +966,15 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3f8ec2975f18d5e479159feb34b4dc86, type: 3} - m_Name: MixedRealityFeaturePlugin WSA + m_Script: {fileID: 11500000, guid: 9f0ebc320a151d3408ea1e9fce54d40e, type: 3} + m_Name: OpenXR Package Settings m_EditorClassIdentifier: - m_enabled: 1 - nameUi: Mixed Reality Features - version: 1.11.2 - featureIdInternal: com.microsoft.openxr.feature.hololens - openxrExtensionStrings: XR_MSFT_holographic_window_attachment XR_KHR_win32_convert_performance_counter_time - XR_MSFT_unbounded_reference_space XR_MSFT_spatial_anchor XR_MSFT_secondary_view_configuration - XR_MSFT_first_person_observer XR_MSFT_spatial_graph_bridge XR_MSFT_perception_anchor_interop - XR_MSFT_spatial_anchor_persistence XR_MSFT_scene_understanding XR_MSFT_scene_understanding_serialization - XR_MSFT_scene_marker XR_MSFT_spatial_anchor_export_preview XR_MSFT_composition_layer_reprojection - company: Microsoft - priority: 0 - required: 1 - disableFirstPersonObserver: 0 - enablePoseUpdateOnBeforeRender: 0 - validationRuleTarget: 0 ---- !u!114 &-854149207148407992 + Keys: 01000000070000000e000000 + Values: + - {fileID: -4989097037534641705} + - {fileID: -2678770202730527855} + - {fileID: 1465162696132078854} +--- !u!114 &124253079821610644 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -779,18 +983,45 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: b213d3e3c7f3109449eb46a4c8ee42f0, type: 3} - m_Name: XrPerformanceSettingsFeature Standalone - m_EditorClassIdentifier: - m_enabled: 0 - nameUi: XR Performance Settings + m_Script: {fileID: 11500000, guid: f647cc0545697264a9878224faada6d5, type: 3} + m_Name: MetaQuestFeature Android + m_EditorClassIdentifier: + m_enabled: 1 + nameUi: Meta Quest Support version: 1.0.0 - featureIdInternal: com.unity.openxr.feature.extension.performance_settings - openxrExtensionStrings: XR_EXT_performance_settings + featureIdInternal: com.unity.openxr.feature.metaquest + openxrExtensionStrings: XR_OCULUS_android_initialize_loader company: Unity priority: 0 + targetOpenXRApiVersion: required: 0 ---- !u!114 &-723969005034834773 + customRuntimeLoaderName: + targetDevices: + - visibleName: Quest + manifestName: quest + enabled: 1 + - visibleName: Quest 2 + manifestName: quest2 + enabled: 1 + - visibleName: Quest Pro + manifestName: cambria + enabled: 1 + - visibleName: Quest 3 + manifestName: eureka + enabled: 1 + - visibleName: Quest 3S + manifestName: quest3s + enabled: 1 + forceRemoveInternetPermission: 0 + m_symmetricProjection: 0 + m_foveatedRenderingApi: 0 + systemSplashScreen: {fileID: 0} + m_optimizeBufferDiscards: 1 + lateLatchingMode: 0 + lateLatchingDebug: 0 + optimizeMultiviewRenderRegions: 0 + spacewarpMotionVectorTextureFormat: 0 +--- !u!114 &169602148789327356 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -799,18 +1030,42 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f028123e2efe1d443875bc7609b4a98b, type: 3} - m_Name: PalmPoseInteraction Standalone + m_Script: {fileID: 11500000, guid: 5019471fb2174e5c852ecd4047163007, type: 3} + m_Name: HandInteractionProfile Standalone + m_EditorClassIdentifier: + m_enabled: 1 + nameUi: Hand Interaction Profile + version: 0.0.1 + featureIdInternal: com.unity.openxr.feature.input.handinteraction + openxrExtensionStrings: XR_EXT_hand_interaction + company: Unity + priority: 0 + targetOpenXRApiVersion: + required: 0 + customRuntimeLoaderName: +--- !u!114 &176539555143869308 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f928d0d73a35f294fbe357ca17aa3547, type: 3} + m_Name: MicrosoftHandInteraction Standalone m_EditorClassIdentifier: m_enabled: 0 - nameUi: Palm Pose + nameUi: Microsoft Hand Interaction Profile version: 0.0.1 - featureIdInternal: com.unity.openxr.feature.input.palmpose - openxrExtensionStrings: XR_EXT_palm_pose + featureIdInternal: com.unity.openxr.feature.input.handtracking + openxrExtensionStrings: XR_MSFT_hand_interaction company: Unity priority: 0 + targetOpenXRApiVersion: required: 0 ---- !u!114 &-500364265400634658 + customRuntimeLoaderName: +--- !u!114 &720212866400260749 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -819,18 +1074,43 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5019471fb2174e5c852ecd4047163007, type: 3} - m_Name: HandInteractionProfile Standalone + m_Script: {fileID: 11500000, guid: 7de993716e042c6499d0c18eed3a773c, type: 3} + m_Name: MockRuntime Standalone m_EditorClassIdentifier: m_enabled: 0 - nameUi: Hand Interaction Profile + nameUi: Mock Runtime + version: 0.0.2 + featureIdInternal: com.unity.openxr.feature.mockruntime + openxrExtensionStrings: XR_UNITY_null_gfx XR_UNITY_android_present + company: Unity + priority: 0 + targetOpenXRApiVersion: + required: 0 + customRuntimeLoaderName: + ignoreValidationErrors: 0 +--- !u!114 &949057647160003393 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b3aced3429e5911458f4da2dac9d0f29, type: 3} + m_Name: MetaHandTrackingAim Android + m_EditorClassIdentifier: + m_enabled: 0 + nameUi: Meta Hand Tracking Aim version: 0.0.1 - featureIdInternal: com.unity.openxr.feature.input.handinteraction - openxrExtensionStrings: XR_EXT_hand_interaction + featureIdInternal: com.unity.openxr.feature.input.metahandtrackingaim + openxrExtensionStrings: XR_FB_hand_tracking_aim company: Unity priority: 0 + targetOpenXRApiVersion: required: 0 ---- !u!114 &-165785353824369088 + customRuntimeLoaderName: +--- !u!114 &1460439861051510218 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -839,18 +1119,20 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2a24be4b5ebfe5f4d8ed1de9b25cb7aa, type: 3} - m_Name: HandCommonPosesInteraction Standalone + m_Script: {fileID: 11500000, guid: 0f6bfdbcb316ed242b30a8798c9eb853, type: 3} + m_Name: KHRSimpleControllerProfile Android m_EditorClassIdentifier: m_enabled: 0 - nameUi: Hand Interaction Poses + nameUi: Khronos Simple Controller Profile version: 0.0.1 - featureIdInternal: com.unity.openxr.feature.input.handinteractionposes - openxrExtensionStrings: XR_EXT_hand_interaction + featureIdInternal: com.unity.openxr.feature.input.khrsimpleprofile + openxrExtensionStrings: company: Unity priority: 0 + targetOpenXRApiVersion: required: 0 ---- !u!114 &11400000 + customRuntimeLoaderName: +--- !u!114 &1465162696132078854 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -859,16 +1141,47 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9f0ebc320a151d3408ea1e9fce54d40e, type: 3} - m_Name: OpenXR Package Settings + m_Script: {fileID: 11500000, guid: b5a1f07dc5afe854f9f12a4194aca3fb, type: 3} + m_Name: Metro m_EditorClassIdentifier: - Keys: 0100000004000000070000000e000000 - Values: - - {fileID: 2159669632228745121} - - {fileID: 1097380483697894343} - - {fileID: 1479897323088787677} - - {fileID: -4619825313993190921} ---- !u!114 &474827142986614695 + features: + - {fileID: -468654872820436234} + - {fileID: -1310172892294911860} + - {fileID: -8319177357708938816} + - {fileID: -2965066531462613033} + - {fileID: 7748758100988937420} + - {fileID: 2960459550882870430} + - {fileID: -6794257755403143708} + - {fileID: 6187458536967842535} + - {fileID: -2527810363365505607} + - {fileID: -8283577154714071237} + - {fileID: 6273364570239032833} + - {fileID: -1990190299391547169} + - {fileID: 9002463822651398326} + - {fileID: -7042059687803235483} + - {fileID: 8785654261743502636} + - {fileID: 2622006578924267534} + - {fileID: -6733472631637007722} + - {fileID: -1685409458817180080} + - {fileID: 4575689165844638740} + - {fileID: 6698335440458243644} + - {fileID: -2219742231848666541} + - {fileID: 3011703863067035089} + - {fileID: 4533605269789063124} + - {fileID: 4996612996642823790} + - {fileID: 6764344120280892631} + customLoaderName: + m_renderMode: 1 + m_latencyOptimization: 0 + m_autoColorSubmissionMode: 1 + m_colorSubmissionModes: + m_List: 00000000 + m_depthSubmissionMode: 0 + m_spacewarpMotionVectorTextureFormat: 0 + m_optimizeBufferDiscards: 0 + m_symmetricProjection: 0 + m_foveatedRenderingApi: 0 +--- !u!114 &1500523782327561539 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -877,18 +1190,20 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: b3cf79659a011bd419c7a2a30eb74e9a, type: 3} - m_Name: EyeGazeInteraction Android + m_Script: {fileID: 11500000, guid: 2a24be4b5ebfe5f4d8ed1de9b25cb7aa, type: 3} + m_Name: HandCommonPosesInteraction Standalone m_EditorClassIdentifier: m_enabled: 0 - nameUi: Eye Gaze Interaction Profile + nameUi: Hand Interaction Poses version: 0.0.1 - featureIdInternal: com.unity.openxr.feature.input.eyetracking - openxrExtensionStrings: XR_EXT_eye_gaze_interaction + featureIdInternal: com.unity.openxr.feature.input.handinteractionposes + openxrExtensionStrings: XR_EXT_hand_interaction company: Unity priority: 0 + targetOpenXRApiVersion: required: 0 ---- !u!114 &559627786289991748 + customRuntimeLoaderName: +--- !u!114 &1621992913488806095 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -897,41 +1212,20 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f647cc0545697264a9878224faada6d5, type: 3} - m_Name: MetaQuestFeature Android + m_Script: {fileID: 11500000, guid: 4e314dfef9af0904e80129bcc0a79361, type: 3} + m_Name: HandTracking Android m_EditorClassIdentifier: m_enabled: 1 - nameUi: Meta Quest Support - version: 1.0.0 - featureIdInternal: com.unity.openxr.feature.metaquest - openxrExtensionStrings: XR_OCULUS_android_initialize_loader + nameUi: Hand Tracking Subsystem + version: 0.0.1 + featureIdInternal: com.unity.openxr.feature.input.handtracking + openxrExtensionStrings: XR_EXT_hand_tracking company: Unity - priority: 0 + priority: -100 + targetOpenXRApiVersion: required: 0 - targetDevices: - - visibleName: Quest - manifestName: quest - enabled: 1 - - visibleName: Quest 2 - manifestName: quest2 - enabled: 1 - - visibleName: Quest Pro - manifestName: cambria - enabled: 1 - - visibleName: Quest 3 - manifestName: eureka - enabled: 1 - - visibleName: Quest 3S - manifestName: quest3s - enabled: 1 - forceRemoveInternetPermission: 0 - symmetricProjection: 0 - foveatedRenderingApi: 0 - systemSplashScreen: {fileID: 0} - optimizeBufferDiscards: 1 - lateLatchingMode: 0 - lateLatchingDebug: 0 ---- !u!114 &952451737673711327 + customRuntimeLoaderName: +--- !u!114 &1801456176265505245 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -940,31 +1234,42 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9c5b5af5107e35a43818d5411328bfc3, type: 3} - m_Name: DPadInteraction Standalone + m_Script: {fileID: 11500000, guid: 4e314dfef9af0904e80129bcc0a79361, type: 3} + m_Name: HandTracking Standalone + m_EditorClassIdentifier: + m_enabled: 1 + nameUi: Hand Tracking Subsystem + version: 0.0.1 + featureIdInternal: com.unity.openxr.feature.input.handtracking + openxrExtensionStrings: XR_EXT_hand_tracking + company: Unity + priority: -100 + targetOpenXRApiVersion: + required: 0 + customRuntimeLoaderName: +--- !u!114 &1865504128796090834 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2b7365b139f7aec43b23d26b7a48b5a6, type: 3} + m_Name: MetaQuestTouchPlusControllerProfile Standalone m_EditorClassIdentifier: m_enabled: 0 - nameUi: D-Pad Binding + nameUi: Meta Quest Touch Plus Controller Profile version: 0.0.1 - featureIdInternal: com.unity.openxr.feature.input.dpadinteraction - openxrExtensionStrings: XR_KHR_binding_modification XR_EXT_dpad_binding + featureIdInternal: com.unity.openxr.feature.input.metaquestplus + openxrExtensionStrings: XR_META_touch_controller_plus company: Unity priority: 0 + targetOpenXRApiVersion: required: 0 - forceThresholdLeft: 0.5 - forceThresholdReleaseLeft: 0.4 - centerRegionLeft: 0.5 - wedgeAngleLeft: 1.5707964 - isStickyLeft: 0 - forceThresholdRight: 0.5 - forceThresholdReleaseRight: 0.4 - centerRegionRight: 0.5 - wedgeAngleRight: 1.5707964 - isStickyRight: 0 - extensionStrings: - - XR_KHR_binding_modification - - XR_EXT_dpad_binding ---- !u!114 &1097380483697894343 + customRuntimeLoaderName: +--- !u!114 &2243745316666254909 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -973,19 +1278,26 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: b5a1f07dc5afe854f9f12a4194aca3fb, type: 3} - m_Name: iPhone + m_Script: {fileID: 11500000, guid: c79c911b38743a649b1c1eddb5097202, type: 3} + m_Name: HandTrackingFeaturePlugin Android m_EditorClassIdentifier: - features: - - {fileID: -8734983254605107581} - m_renderMode: 1 - m_autoColorSubmissionMode: 1 - m_colorSubmissionModes: - m_List: 00000000 - m_depthSubmissionMode: 0 - m_optimizeBufferDiscards: 0 - m_symmetricProjection: 0 ---- !u!114 &1479897323088787677 + m_enabled: 0 + nameUi: Hand Tracking + version: 1.11.2 + featureIdInternal: com.microsoft.openxr.feature.handtracking + openxrExtensionStrings: XR_EXT_hand_tracking XR_EXT_hand_joints_motion_range XR_EXT_hand_tracking_data_source + XR_MSFT_hand_tracking_mesh + company: Microsoft + priority: 0 + targetOpenXRApiVersion: + required: 0 + customRuntimeLoaderName: + leftHandTrackingOptions: + motionRange: 0 + rightHandTrackingOptions: + motionRange: 0 + questHandTrackingMode: 1 +--- !u!114 &2426265406813202181 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -994,38 +1306,20 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: b5a1f07dc5afe854f9f12a4194aca3fb, type: 3} - m_Name: Android + m_Script: {fileID: 11500000, guid: 3482401f887b8864183e401715462f46, type: 3} + m_Name: HPMixedRealityControllerProfile Standalone m_EditorClassIdentifier: - features: - - {fileID: -8522947761395393906} - - {fileID: 8748299632099357634} - - {fileID: -5832260525886948589} - - {fileID: 5321804971444361626} - - {fileID: -6082735451881085207} - - {fileID: -8123676160964616339} - - {fileID: 5800620048986908060} - - {fileID: 474827142986614695} - - {fileID: 5420324578598372024} - - {fileID: -4630134788987129440} - - {fileID: -6284616687731864893} - - {fileID: 559627786289991748} - - {fileID: 2700408812308480614} - - {fileID: 8477975974732598692} - - {fileID: 3197297709649474301} - - {fileID: -6326232607128738207} - - {fileID: 2396077685154012182} - - {fileID: 7949034004747903996} - - {fileID: -4085893827450681117} - - {fileID: -3540660573686832417} - m_renderMode: 1 - m_autoColorSubmissionMode: 1 - m_colorSubmissionModes: - m_List: 00000000 - m_depthSubmissionMode: 1 - m_optimizeBufferDiscards: 0 - m_symmetricProjection: 0 ---- !u!114 &2140832713855989735 + m_enabled: 0 + nameUi: HP Reverb G2 Controller Profile + version: 1.11.2 + featureIdInternal: com.microsoft.openxr.feature.interaction.hpmixedrealitycontroller + openxrExtensionStrings: XR_EXT_hp_mixed_reality_controller + company: Microsoft + priority: 0 + targetOpenXRApiVersion: + required: 0 + customRuntimeLoaderName: +--- !u!114 &2622006578924267534 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1035,7 +1329,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 3f8ec2975f18d5e479159feb34b4dc86, type: 3} - m_Name: MixedRealityFeaturePlugin Standalone + m_Name: MixedRealityFeaturePlugin Metro m_EditorClassIdentifier: m_enabled: 1 nameUi: Mixed Reality Features @@ -1048,57 +1342,13 @@ MonoBehaviour: XR_MSFT_scene_marker XR_MSFT_spatial_anchor_export_preview XR_MSFT_composition_layer_reprojection company: Microsoft priority: 0 + targetOpenXRApiVersion: required: 1 + customRuntimeLoaderName: disableFirstPersonObserver: 0 enablePoseUpdateOnBeforeRender: 0 validationRuleTarget: 0 ---- !u!114 &2159669632228745121 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: b5a1f07dc5afe854f9f12a4194aca3fb, type: 3} - m_Name: Standalone - m_EditorClassIdentifier: - features: - - {fileID: 952451737673711327} - - {fileID: -165785353824369088} - - {fileID: -500364265400634658} - - {fileID: -6521437262539290955} - - {fileID: -8369336400205322800} - - {fileID: -723969005034834773} - - {fileID: -854149207148407992} - - {fileID: -6240091031804019219} - - {fileID: 7857441528894569134} - - {fileID: 4294374462335302092} - - {fileID: -7104108163923222141} - - {fileID: -2659505044388052374} - - {fileID: 4938325070181230207} - - {fileID: -5297537421338403838} - - {fileID: 6102079508090334006} - - {fileID: 4835167900761102818} - - {fileID: -7321926629275167846} - - {fileID: 2140832713855989735} - - {fileID: -6291567202788476059} - - {fileID: 8498496275651976835} - - {fileID: 7978838414364747000} - - {fileID: 7239629573045135897} - - {fileID: -8594885159124533570} - - {fileID: -3267254719211769934} - - {fileID: -5212996281295595556} - - {fileID: -8136130855646488046} - m_renderMode: 1 - m_autoColorSubmissionMode: 1 - m_colorSubmissionModes: - m_List: 00000000 - m_depthSubmissionMode: 2 - m_optimizeBufferDiscards: 0 - m_symmetricProjection: 0 ---- !u!114 &2289279436018880081 +--- !u!114 &2835676197965704550 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1107,20 +1357,20 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 056125dd64c0ed540b40a4af74f7b495, type: 3} - m_Name: RuntimeDebuggerOpenXRFeature WSA + m_Script: {fileID: 11500000, guid: 0c8f1ce8139888c4ab621f6b3c8bb558, type: 3} + m_Name: MotionControllerFeaturePlugin Android m_EditorClassIdentifier: - m_enabled: 0 - nameUi: Runtime Debugger - version: 1 - featureIdInternal: com.unity.openxr.features.runtimedebugger - openxrExtensionStrings: - company: Unity + m_enabled: 1 + nameUi: Motion Controller Model + version: 1.11.2 + featureIdInternal: com.microsoft.openxr.feature.controller + openxrExtensionStrings: XR_MSFT_controller_model XR_FB_render_model + company: Microsoft priority: 0 + targetOpenXRApiVersion: required: 0 - cacheSize: 1048576 - perThreadCacheSize: 51200 ---- !u!114 &2345388348882096190 + customRuntimeLoaderName: +--- !u!114 &2960459550882870430 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1129,18 +1379,20 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 486b5e28864f9a94b979b9620ce5006d, type: 3} - m_Name: ConformanceAutomationFeature WSA + m_Script: {fileID: 11500000, guid: 5019471fb2174e5c852ecd4047163007, type: 3} + m_Name: HandInteractionProfile Metro m_EditorClassIdentifier: - m_enabled: 0 - nameUi: Conformance Automation + m_enabled: 1 + nameUi: Hand Interaction Profile version: 0.0.1 - featureIdInternal: com.unity.openxr.feature.conformance - openxrExtensionStrings: XR_EXT_conformance_automation + featureIdInternal: com.unity.openxr.feature.input.handinteraction + openxrExtensionStrings: XR_EXT_hand_interaction company: Unity priority: 0 + targetOpenXRApiVersion: required: 0 ---- !u!114 &2396077685154012182 + customRuntimeLoaderName: +--- !u!114 &3011703863067035089 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1149,20 +1401,20 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9ef793c31862a37448e907829482ef80, type: 3} - m_Name: OculusQuestFeature Android + m_Script: {fileID: 11500000, guid: 0d6ccd3d0ef0f1d458e69421dccbdae1, type: 3} + m_Name: ValveIndexControllerProfile Metro m_EditorClassIdentifier: m_enabled: 0 - nameUi: Oculus Quest Support - version: 1.0.0 - featureIdInternal: com.unity.openxr.feature.oculusquest - openxrExtensionStrings: XR_OCULUS_android_initialize_loader + nameUi: Valve Index Controller Profile + version: 0.0.1 + featureIdInternal: com.unity.openxr.feature.input.valveindex + openxrExtensionStrings: company: Unity priority: 0 + targetOpenXRApiVersion: required: 0 - targetQuest: 1 - targetQuest2: 1 ---- !u!114 &2700408812308480614 + customRuntimeLoaderName: +--- !u!114 &4108263696553698169 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1172,7 +1424,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: c4b862ee14fb479fbfe5fffe655d3ed3, type: 3} - m_Name: MetaQuestTouchProControllerProfile Android + m_Name: MetaQuestTouchProControllerProfile Standalone m_EditorClassIdentifier: m_enabled: 0 nameUi: Meta Quest Touch Pro Controller Profile @@ -1181,8 +1433,10 @@ MonoBehaviour: openxrExtensionStrings: XR_FB_touch_controller_pro company: Unity priority: 0 + targetOpenXRApiVersion: required: 0 ---- !u!114 &3134151582273165400 + customRuntimeLoaderName: +--- !u!114 &4334429337943452973 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1191,18 +1445,20 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0f6bfdbcb316ed242b30a8798c9eb853, type: 3} - m_Name: KHRSimpleControllerProfile WSA + m_Script: {fileID: 11500000, guid: feeef8d85de8db242bdda70cc7ff5acd, type: 3} + m_Name: OculusTouchControllerProfile Standalone m_EditorClassIdentifier: m_enabled: 0 - nameUi: Khronos Simple Controller Profile + nameUi: Oculus Touch Controller Profile version: 0.0.1 - featureIdInternal: com.unity.openxr.feature.input.khrsimpleprofile + featureIdInternal: com.unity.openxr.feature.input.oculustouch openxrExtensionStrings: company: Unity priority: 0 + targetOpenXRApiVersion: required: 0 ---- !u!114 &3197297709649474301 + customRuntimeLoaderName: +--- !u!114 &4340476533682327203 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1211,19 +1467,22 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7de993716e042c6499d0c18eed3a773c, type: 3} - m_Name: MockRuntime Android + m_Script: {fileID: 11500000, guid: 056125dd64c0ed540b40a4af74f7b495, type: 3} + m_Name: RuntimeDebuggerOpenXRFeature Android m_EditorClassIdentifier: m_enabled: 0 - nameUi: Mock Runtime - version: 0.0.2 - featureIdInternal: com.unity.openxr.feature.mockruntime - openxrExtensionStrings: XR_UNITY_null_gfx XR_UNITY_android_present + nameUi: Runtime Debugger + version: 1 + featureIdInternal: com.unity.openxr.features.runtimedebugger + openxrExtensionStrings: company: Unity priority: 0 + targetOpenXRApiVersion: required: 0 - ignoreValidationErrors: 0 ---- !u!114 &4227640669958400424 + customRuntimeLoaderName: + cacheSize: 1048576 + perThreadCacheSize: 51200 +--- !u!114 &4508051287823359615 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1232,18 +1491,21 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0c8f1ce8139888c4ab621f6b3c8bb558, type: 3} - m_Name: MotionControllerFeaturePlugin WSA + m_Script: {fileID: 11500000, guid: 7de993716e042c6499d0c18eed3a773c, type: 3} + m_Name: MockRuntime Android m_EditorClassIdentifier: - m_enabled: 1 - nameUi: Motion Controller Model - version: 1.11.2 - featureIdInternal: com.microsoft.openxr.feature.controller - openxrExtensionStrings: XR_MSFT_controller_model XR_FB_render_model - company: Microsoft + m_enabled: 0 + nameUi: Mock Runtime + version: 0.0.2 + featureIdInternal: com.unity.openxr.feature.mockruntime + openxrExtensionStrings: XR_UNITY_null_gfx XR_UNITY_android_present + company: Unity priority: 0 + targetOpenXRApiVersion: required: 0 ---- !u!114 &4294374462335302092 + customRuntimeLoaderName: + ignoreValidationErrors: 0 +--- !u!114 &4533605269789063124 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1252,24 +1514,20 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c79c911b38743a649b1c1eddb5097202, type: 3} - m_Name: HandTrackingFeaturePlugin Standalone + m_Script: {fileID: 11500000, guid: b213d3e3c7f3109449eb46a4c8ee42f0, type: 3} + m_Name: XrPerformanceSettingsFeature Metro m_EditorClassIdentifier: - m_enabled: 1 - nameUi: Hand Tracking - version: 1.11.2 - featureIdInternal: com.microsoft.openxr.feature.handtracking - openxrExtensionStrings: XR_EXT_hand_tracking XR_EXT_hand_joints_motion_range XR_EXT_hand_tracking_data_source - XR_MSFT_hand_tracking_mesh - company: Microsoft + m_enabled: 0 + nameUi: XR Performance Settings + version: 1.0.0 + featureIdInternal: com.unity.openxr.feature.extension.performance_settings + openxrExtensionStrings: XR_EXT_performance_settings + company: Unity priority: 0 + targetOpenXRApiVersion: required: 0 - leftHandTrackingOptions: - motionRange: 0 - rightHandTrackingOptions: - motionRange: 0 - questHandTrackingMode: 1 ---- !u!114 &4835167900761102818 + customRuntimeLoaderName: +--- !u!114 &4575689165844638740 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1278,18 +1536,20 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f928d0d73a35f294fbe357ca17aa3547, type: 3} - m_Name: MicrosoftHandInteraction Standalone + m_Script: {fileID: 11500000, guid: feeef8d85de8db242bdda70cc7ff5acd, type: 3} + m_Name: OculusTouchControllerProfile Metro m_EditorClassIdentifier: - m_enabled: 1 - nameUi: Microsoft Hand Interaction Profile + m_enabled: 0 + nameUi: Oculus Touch Controller Profile version: 0.0.1 - featureIdInternal: com.unity.openxr.feature.input.handtracking - openxrExtensionStrings: XR_MSFT_hand_interaction + featureIdInternal: com.unity.openxr.feature.input.oculustouch + openxrExtensionStrings: company: Unity priority: 0 + targetOpenXRApiVersion: required: 0 ---- !u!114 &4938325070181230207 + customRuntimeLoaderName: +--- !u!114 &4825760689371567295 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1298,18 +1558,20 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0f6bfdbcb316ed242b30a8798c9eb853, type: 3} - m_Name: KHRSimpleControllerProfile Standalone + m_Script: {fileID: 11500000, guid: 0d6ccd3d0ef0f1d458e69421dccbdae1, type: 3} + m_Name: ValveIndexControllerProfile Standalone m_EditorClassIdentifier: m_enabled: 0 - nameUi: Khronos Simple Controller Profile + nameUi: Valve Index Controller Profile version: 0.0.1 - featureIdInternal: com.unity.openxr.feature.input.khrsimpleprofile + featureIdInternal: com.unity.openxr.feature.input.valveindex openxrExtensionStrings: company: Unity priority: 0 + targetOpenXRApiVersion: required: 0 ---- !u!114 &5282128220662545123 + customRuntimeLoaderName: +--- !u!114 &4996612996642823790 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1318,18 +1580,20 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e5315f812f023cf4ebf26f7e5d2d70f2, type: 3} - m_Name: HPReverbG2ControllerProfile WSA + m_Script: {fileID: 11500000, guid: 4e314dfef9af0904e80129bcc0a79361, type: 3} + m_Name: HandTracking Metro m_EditorClassIdentifier: - m_enabled: 0 - nameUi: HP Reverb G2 Controller Profile + m_enabled: 1 + nameUi: Hand Tracking Subsystem version: 0.0.1 - featureIdInternal: com.unity.openxr.feature.input.hpreverb - openxrExtensionStrings: XR_EXT_hp_mixed_reality_controller + featureIdInternal: com.unity.openxr.feature.input.handtracking + openxrExtensionStrings: XR_EXT_hand_tracking company: Unity - priority: 0 + priority: -100 + targetOpenXRApiVersion: required: 0 ---- !u!114 &5321804971444361626 + customRuntimeLoaderName: +--- !u!114 &5076197482031073275 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1338,18 +1602,20 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2b7365b139f7aec43b23d26b7a48b5a6, type: 3} - m_Name: MetaQuestTouchPlusControllerProfile Android + m_Script: {fileID: 11500000, guid: 274c02963f889a64e90bc2e596e21d13, type: 3} + m_Name: HTCViveControllerProfile Standalone m_EditorClassIdentifier: m_enabled: 0 - nameUi: Meta Quest Touch Plus Controller Profile + nameUi: HTC Vive Controller Profile version: 0.0.1 - featureIdInternal: com.unity.openxr.feature.input.metaquestplus - openxrExtensionStrings: XR_META_touch_controller_plus + featureIdInternal: com.unity.openxr.feature.input.htcvive + openxrExtensionStrings: company: Unity priority: 0 + targetOpenXRApiVersion: required: 0 ---- !u!114 &5420324578598372024 + customRuntimeLoaderName: +--- !u!114 &5521749775559828029 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1359,9 +1625,9 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: c79c911b38743a649b1c1eddb5097202, type: 3} - m_Name: HandTrackingFeaturePlugin Android + m_Name: HandTrackingFeaturePlugin Standalone m_EditorClassIdentifier: - m_enabled: 1 + m_enabled: 0 nameUi: Hand Tracking version: 1.11.2 featureIdInternal: com.microsoft.openxr.feature.handtracking @@ -1369,13 +1635,15 @@ MonoBehaviour: XR_MSFT_hand_tracking_mesh company: Microsoft priority: 0 + targetOpenXRApiVersion: required: 0 + customRuntimeLoaderName: leftHandTrackingOptions: motionRange: 0 rightHandTrackingOptions: motionRange: 0 questHandTrackingMode: 1 ---- !u!114 &5800620048986908060 +--- !u!114 &6187458536967842535 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1384,18 +1652,20 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 486b5e28864f9a94b979b9620ce5006d, type: 3} - m_Name: ConformanceAutomationFeature Android + m_Script: {fileID: 11500000, guid: e5315f812f023cf4ebf26f7e5d2d70f2, type: 3} + m_Name: HPReverbG2ControllerProfile Metro m_EditorClassIdentifier: m_enabled: 0 - nameUi: Conformance Automation + nameUi: HP Reverb G2 Controller Profile version: 0.0.1 - featureIdInternal: com.unity.openxr.feature.conformance - openxrExtensionStrings: XR_EXT_conformance_automation + featureIdInternal: com.unity.openxr.feature.input.hpreverb + openxrExtensionStrings: XR_EXT_hp_mixed_reality_controller company: Unity priority: 0 + targetOpenXRApiVersion: required: 0 ---- !u!114 &6102079508090334006 + customRuntimeLoaderName: +--- !u!114 &6273364570239032833 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1404,18 +1674,20 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c4b862ee14fb479fbfe5fffe655d3ed3, type: 3} - m_Name: MetaQuestTouchProControllerProfile Standalone + m_Script: {fileID: 11500000, guid: 0f6bfdbcb316ed242b30a8798c9eb853, type: 3} + m_Name: KHRSimpleControllerProfile Metro m_EditorClassIdentifier: m_enabled: 0 - nameUi: Meta Quest Touch Pro Controller Profile + nameUi: Khronos Simple Controller Profile version: 0.0.1 - featureIdInternal: com.unity.openxr.feature.input.metaquestpro - openxrExtensionStrings: XR_FB_touch_controller_pro + featureIdInternal: com.unity.openxr.feature.input.khrsimpleprofile + openxrExtensionStrings: company: Unity priority: 0 + targetOpenXRApiVersion: required: 0 ---- !u!114 &6454520947755431774 + customRuntimeLoaderName: +--- !u!114 &6342154364724310848 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1424,18 +1696,20 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: feeef8d85de8db242bdda70cc7ff5acd, type: 3} - m_Name: OculusTouchControllerProfile WSA + m_Script: {fileID: 11500000, guid: 761fdd4502cb7a84e9ec7a2b24f33f37, type: 3} + m_Name: MicrosoftMotionControllerProfile Standalone m_EditorClassIdentifier: m_enabled: 0 - nameUi: Oculus Touch Controller Profile + nameUi: Microsoft Motion Controller Profile version: 0.0.1 - featureIdInternal: com.unity.openxr.feature.input.oculustouch + featureIdInternal: com.unity.openxr.feature.input.microsoftmotioncontroller openxrExtensionStrings: company: Unity priority: 0 + targetOpenXRApiVersion: required: 0 ---- !u!114 &7239629573045135897 + customRuntimeLoaderName: +--- !u!114 &6698335440458243644 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1444,20 +1718,20 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 056125dd64c0ed540b40a4af74f7b495, type: 3} - m_Name: RuntimeDebuggerOpenXRFeature Standalone + m_Script: {fileID: 11500000, guid: f028123e2efe1d443875bc7609b4a98b, type: 3} + m_Name: PalmPoseInteraction Metro m_EditorClassIdentifier: m_enabled: 0 - nameUi: Runtime Debugger - version: 1 - featureIdInternal: com.unity.openxr.features.runtimedebugger - openxrExtensionStrings: + nameUi: Palm Pose + version: 0.0.1 + featureIdInternal: com.unity.openxr.feature.input.palmpose + openxrExtensionStrings: XR_EXT_palm_pose company: Unity priority: 0 + targetOpenXRApiVersion: required: 0 - cacheSize: 1048576 - perThreadCacheSize: 51200 ---- !u!114 &7298005106529295474 + customRuntimeLoaderName: +--- !u!114 &6710627333171298302 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1466,38 +1740,25 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: b213d3e3c7f3109449eb46a4c8ee42f0, type: 3} - m_Name: XrPerformanceSettingsFeature WSA + m_Script: {fileID: 11500000, guid: 9f34c86d1a130cc45a438373e1e8a4fc, type: 3} + m_Name: PlayModeRemotingPlugin Standalone m_EditorClassIdentifier: m_enabled: 0 - nameUi: XR Performance Settings - version: 1.0.0 - featureIdInternal: com.unity.openxr.feature.extension.performance_settings - openxrExtensionStrings: XR_EXT_performance_settings - company: Unity - priority: 0 - required: 0 ---- !u!114 &7857441528894569134 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: b3cf79659a011bd419c7a2a30eb74e9a, type: 3} - m_Name: EyeGazeInteraction Standalone - m_EditorClassIdentifier: - m_enabled: 1 - nameUi: Eye Gaze Interaction Profile - version: 0.0.1 - featureIdInternal: com.unity.openxr.feature.input.eyetracking - openxrExtensionStrings: XR_EXT_eye_gaze_interaction - company: Unity - priority: 0 + nameUi: Holographic Remoting for Play Mode + version: 1.11.2 + featureIdInternal: com.microsoft.openxr.feature.playmoderemoting + openxrExtensionStrings: XR_MSFT_holographic_remoting XR_MSFT_holographic_remoting_speech + company: Microsoft + priority: -100 + targetOpenXRApiVersion: required: 0 ---- !u!114 &7949034004747903996 + customRuntimeLoaderName: + m_remoteHostName: + m_remoteHostPort: 8265 + m_maxBitrate: 20000 + m_videoCodec: 0 + m_enableAudio: 0 +--- !u!114 &6764344120280892631 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1506,18 +1767,20 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: feeef8d85de8db242bdda70cc7ff5acd, type: 3} - m_Name: OculusTouchControllerProfile Android + m_Script: {fileID: 11500000, guid: 2d2e2731103cdda44af77955a0b4814c, type: 3} + m_Name: AppRemotingPlugin Metro m_EditorClassIdentifier: - m_enabled: 1 - nameUi: Oculus Touch Controller Profile - version: 0.0.1 - featureIdInternal: com.unity.openxr.feature.input.oculustouch - openxrExtensionStrings: - company: Unity - priority: 0 + m_enabled: 0 + nameUi: Holographic Remoting remote app + version: 1.11.2 + featureIdInternal: com.microsoft.openxr.feature.appremoting + openxrExtensionStrings: XR_MSFT_holographic_remoting XR_MSFT_holographic_remoting_speech + company: Microsoft + priority: -100 + targetOpenXRApiVersion: required: 0 ---- !u!114 &7978838414364747000 + customRuntimeLoaderName: +--- !u!114 &7631871841315510880 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1526,18 +1789,20 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: feeef8d85de8db242bdda70cc7ff5acd, type: 3} - m_Name: OculusTouchControllerProfile Standalone + m_Script: {fileID: 11500000, guid: c4b862ee14fb479fbfe5fffe655d3ed3, type: 3} + m_Name: MetaQuestTouchProControllerProfile Android m_EditorClassIdentifier: m_enabled: 0 - nameUi: Oculus Touch Controller Profile + nameUi: Meta Quest Touch Pro Controller Profile version: 0.0.1 - featureIdInternal: com.unity.openxr.feature.input.oculustouch - openxrExtensionStrings: + featureIdInternal: com.unity.openxr.feature.input.metaquestpro + openxrExtensionStrings: XR_FB_touch_controller_pro company: Unity priority: 0 + targetOpenXRApiVersion: required: 0 ---- !u!114 &8164470763647245072 + customRuntimeLoaderName: +--- !u!114 &7747853251997987524 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1546,18 +1811,20 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0d6ccd3d0ef0f1d458e69421dccbdae1, type: 3} - m_Name: ValveIndexControllerProfile WSA + m_Script: {fileID: 11500000, guid: 5019471fb2174e5c852ecd4047163007, type: 3} + m_Name: HandInteractionProfile Android m_EditorClassIdentifier: - m_enabled: 0 - nameUi: Valve Index Controller Profile + m_enabled: 1 + nameUi: Hand Interaction Profile version: 0.0.1 - featureIdInternal: com.unity.openxr.feature.input.valveindex - openxrExtensionStrings: + featureIdInternal: com.unity.openxr.feature.input.handinteraction + openxrExtensionStrings: XR_EXT_hand_interaction company: Unity priority: 0 + targetOpenXRApiVersion: required: 0 ---- !u!114 &8255902311722671649 + customRuntimeLoaderName: +--- !u!114 &7748758100988937420 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1567,7 +1834,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 2a24be4b5ebfe5f4d8ed1de9b25cb7aa, type: 3} - m_Name: HandCommonPosesInteraction WSA + m_Name: HandCommonPosesInteraction Metro m_EditorClassIdentifier: m_enabled: 0 nameUi: Hand Interaction Poses @@ -1576,8 +1843,10 @@ MonoBehaviour: openxrExtensionStrings: XR_EXT_hand_interaction company: Unity priority: 0 + targetOpenXRApiVersion: required: 0 ---- !u!114 &8477975974732598692 + customRuntimeLoaderName: +--- !u!114 &8773911662759437579 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1586,38 +1855,20 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f928d0d73a35f294fbe357ca17aa3547, type: 3} - m_Name: MicrosoftHandInteraction Android + m_Script: {fileID: 11500000, guid: f028123e2efe1d443875bc7609b4a98b, type: 3} + m_Name: PalmPoseInteraction Android m_EditorClassIdentifier: m_enabled: 0 - nameUi: Microsoft Hand Interaction Profile + nameUi: Palm Pose version: 0.0.1 - featureIdInternal: com.unity.openxr.feature.input.handtracking - openxrExtensionStrings: XR_MSFT_hand_interaction + featureIdInternal: com.unity.openxr.feature.input.palmpose + openxrExtensionStrings: XR_EXT_palm_pose company: Unity priority: 0 + targetOpenXRApiVersion: required: 0 ---- !u!114 &8498496275651976835 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0c8f1ce8139888c4ab621f6b3c8bb558, type: 3} - m_Name: MotionControllerFeaturePlugin Standalone - m_EditorClassIdentifier: - m_enabled: 1 - nameUi: Motion Controller Model - version: 1.11.2 - featureIdInternal: com.microsoft.openxr.feature.controller - openxrExtensionStrings: XR_MSFT_controller_model XR_FB_render_model - company: Microsoft - priority: 0 - required: 0 ---- !u!114 &8748299632099357634 + customRuntimeLoaderName: +--- !u!114 &8785654261743502636 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1626,18 +1877,20 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2a24be4b5ebfe5f4d8ed1de9b25cb7aa, type: 3} - m_Name: HandCommonPosesInteraction Android + m_Script: {fileID: 11500000, guid: 761fdd4502cb7a84e9ec7a2b24f33f37, type: 3} + m_Name: MicrosoftMotionControllerProfile Metro m_EditorClassIdentifier: m_enabled: 0 - nameUi: Hand Interaction Poses + nameUi: Microsoft Motion Controller Profile version: 0.0.1 - featureIdInternal: com.unity.openxr.feature.input.handinteractionposes - openxrExtensionStrings: XR_EXT_hand_interaction + featureIdInternal: com.unity.openxr.feature.input.microsoftmotioncontroller + openxrExtensionStrings: company: Unity priority: 0 + targetOpenXRApiVersion: required: 0 ---- !u!114 &8809846650566260409 + customRuntimeLoaderName: +--- !u!114 &8871992131841203481 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1646,18 +1899,20 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3482401f887b8864183e401715462f46, type: 3} - m_Name: HPMixedRealityControllerProfile WSA + m_Script: {fileID: 11500000, guid: 2b7365b139f7aec43b23d26b7a48b5a6, type: 3} + m_Name: MetaQuestTouchPlusControllerProfile Android m_EditorClassIdentifier: m_enabled: 0 - nameUi: HP Reverb G2 Controller Profile - version: 1.11.2 - featureIdInternal: com.microsoft.openxr.feature.interaction.hpmixedrealitycontroller - openxrExtensionStrings: XR_EXT_hp_mixed_reality_controller - company: Microsoft + nameUi: Meta Quest Touch Plus Controller Profile + version: 0.0.1 + featureIdInternal: com.unity.openxr.feature.input.metaquestplus + openxrExtensionStrings: XR_META_touch_controller_plus + company: Unity priority: 0 + targetOpenXRApiVersion: required: 0 ---- !u!114 &8830336202024584476 + customRuntimeLoaderName: +--- !u!114 &9002463822651398326 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1666,14 +1921,16 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 274c02963f889a64e90bc2e596e21d13, type: 3} - m_Name: HTCViveControllerProfile WSA + m_Script: {fileID: 11500000, guid: c4b862ee14fb479fbfe5fffe655d3ed3, type: 3} + m_Name: MetaQuestTouchProControllerProfile Metro m_EditorClassIdentifier: m_enabled: 0 - nameUi: HTC Vive Controller Profile + nameUi: Meta Quest Touch Pro Controller Profile version: 0.0.1 - featureIdInternal: com.unity.openxr.feature.input.htcvive - openxrExtensionStrings: + featureIdInternal: com.unity.openxr.feature.input.metaquestpro + openxrExtensionStrings: XR_FB_touch_controller_pro company: Unity priority: 0 + targetOpenXRApiVersion: required: 0 + customRuntimeLoaderName: diff --git a/UnityProjects/MRTKDevTemplate/Assets/XR/UserSimulationSettings/Resources/XRSimulationPreferences.asset b/UnityProjects/MRTKDevTemplate/Assets/XR/UserSimulationSettings/Resources/XRSimulationPreferences.asset index bffc7c75a..a219d73d7 100644 --- a/UnityProjects/MRTKDevTemplate/Assets/XR/UserSimulationSettings/Resources/XRSimulationPreferences.asset +++ b/UnityProjects/MRTKDevTemplate/Assets/XR/UserSimulationSettings/Resources/XRSimulationPreferences.asset @@ -12,6 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: b2f528b98f844ed8b6b2d5fdf90b40e6, type: 3} m_Name: XRSimulationPreferences m_EditorClassIdentifier: + m_HasInputActionUpgrade: 1 m_EnvironmentPrefab: {fileID: 0} m_FallbackEnvironmentPrefab: {fileID: 7576867131100388943, guid: c7b92c392902f4043a03a64032c02fe1, type: 3} - m_EnableNavigation: 1 + m_UnlockInputActionReference: {fileID: -6503468053843192148, guid: 1dd796eaee8744b4aa41b3f8bf5df64f, type: 3} + m_MoveInputActionReference: {fileID: -8435123576461090514, guid: 1dd796eaee8744b4aa41b3f8bf5df64f, type: 3} + m_LookInputActionReference: {fileID: -2447619311606779944, guid: 1dd796eaee8744b4aa41b3f8bf5df64f, type: 3} + m_SprintInputActionReference: {fileID: -5750007214975788477, guid: 1dd796eaee8744b4aa41b3f8bf5df64f, type: 3} + m_LookSpeed: 1 + m_MoveSpeed: 1 + m_MoveSpeedModifier: 3 diff --git a/UnityProjects/MRTKDevTemplate/Packages/manifest.json b/UnityProjects/MRTKDevTemplate/Packages/manifest.json index a9dc2a66b..16cea28ea 100644 --- a/UnityProjects/MRTKDevTemplate/Packages/manifest.json +++ b/UnityProjects/MRTKDevTemplate/Packages/manifest.json @@ -5,25 +5,25 @@ "com.microsoft.mrtk.graphicstools.unity": "0.8.0", "com.microsoft.mrtk.tts.windows": "1.0.4", "com.microsoft.spatialaudio.spatializer.unity": "2.0.55", - "com.unity.asset-store-validation": "0.5.1", - "com.unity.cloud.gltfast": "6.10.1", - "com.unity.cloud.ktx": "3.4.5", - "com.unity.collab-proxy": "2.5.2", - "com.unity.ide.rider": "3.0.31", - "com.unity.ide.visualstudio": "2.0.22", - "com.unity.ide.vscode": "1.2.5", - "com.unity.inputsystem": "1.7.0", - "com.unity.mobile.android-logcat": "1.4.3", - "com.unity.performance.profile-analyzer": "1.2.2", - "com.unity.test-framework": "1.1.33", - "com.unity.textmeshpro": "3.0.6", - "com.unity.timeline": "1.6.5", - "com.unity.ugui": "1.0.0", - "com.unity.xr.arcore": "5.0.5", - "com.unity.xr.arfoundation": "5.0.5", - "com.unity.xr.interaction.toolkit": "2.6.3", - "com.unity.xr.management": "4.5.0", - "com.unity.xr.openxr": "1.13.0", + "com.unity.ai.navigation": "2.0.12", + "com.unity.cloud.gltfast": "6.14.1", + "com.unity.cloud.ktx": "3.6.3", + "com.unity.collab-proxy": "2.11.4", + "com.unity.ide.rider": "3.0.39", + "com.unity.ide.visualstudio": "2.0.27", + "com.unity.inputsystem": "1.17.0", + "com.unity.mobile.android-logcat": "1.4.7", + "com.unity.multiplayer.center": "1.0.0", + "com.unity.performance.profile-analyzer": "1.2.4", + "com.unity.test-framework": "1.6.0", + "com.unity.timeline": "1.8.12", + "com.unity.ugui": "2.0.0", + "com.unity.upm-publishing-tools": "0.1.2", + "com.unity.xr.arcore": "6.0.6", + "com.unity.xr.arfoundation": "6.0.6", + "com.unity.xr.interaction.toolkit": "3.0.10", + "com.unity.xr.management": "4.5.4", + "com.unity.xr.openxr": "1.16.1", "org.mixedrealitytoolkit.accessibility": "file:../../../org.mixedrealitytoolkit.accessibility", "org.mixedrealitytoolkit.audio": "file:../../../org.mixedrealitytoolkit.audio", "org.mixedrealitytoolkit.core": "file:../../../org.mixedrealitytoolkit.core", @@ -33,11 +33,13 @@ "org.mixedrealitytoolkit.input": "file:../../../org.mixedrealitytoolkit.input", "org.mixedrealitytoolkit.spatialmanipulation": "file:../../../org.mixedrealitytoolkit.spatialmanipulation", "org.mixedrealitytoolkit.standardassets": "file:../../../org.mixedrealitytoolkit.standardassets", + "org.mixedrealitytoolkit.theming": "file:../../../org.mixedrealitytoolkit.theming", "org.mixedrealitytoolkit.tools": "file:../../../org.mixedrealitytoolkit.tools", "org.mixedrealitytoolkit.uxcomponents": "file:../../../org.mixedrealitytoolkit.uxcomponents", "org.mixedrealitytoolkit.uxcomponents.noncanvas": "file:../../../org.mixedrealitytoolkit.uxcomponents.noncanvas", "org.mixedrealitytoolkit.uxcore": "file:../../../org.mixedrealitytoolkit.uxcore", "org.mixedrealitytoolkit.windowsspeech": "file:../../../org.mixedrealitytoolkit.windowsspeech", + "com.unity.modules.accessibility": "1.0.0", "com.unity.modules.ai": "1.0.0", "com.unity.modules.androidjni": "1.0.0", "com.unity.modules.animation": "1.0.0", diff --git a/UnityProjects/MRTKDevTemplate/Packages/packages-lock.json b/UnityProjects/MRTKDevTemplate/Packages/packages-lock.json index 6ea4aa243..ecd6f6950 100644 --- a/UnityProjects/MRTKDevTemplate/Packages/packages-lock.json +++ b/UnityProjects/MRTKDevTemplate/Packages/packages-lock.json @@ -40,17 +40,17 @@ "dependencies": {}, "url": "https://packages.unity.com" }, - "com.unity.asset-store-validation": { - "version": "0.5.1", + "com.unity.ai.navigation": { + "version": "2.0.12", "depth": 0, "source": "registry", "dependencies": { - "com.unity.nuget.newtonsoft-json": "2.0.2" + "com.unity.modules.ai": "1.0.0" }, "url": "https://packages.unity.com" }, "com.unity.burst": { - "version": "1.8.18", + "version": "1.8.27", "depth": 1, "source": "registry", "dependencies": { @@ -60,11 +60,11 @@ "url": "https://packages.unity.com" }, "com.unity.cloud.gltfast": { - "version": "6.10.1", + "version": "6.14.1", "depth": 0, "source": "registry", "dependencies": { - "com.unity.burst": "1.8.4", + "com.unity.burst": "1.8.24", "com.unity.collections": "1.2.4", "com.unity.mathematics": "1.2.6", "com.unity.modules.jsonserialize": "1.0.0", @@ -73,7 +73,7 @@ "url": "https://packages.unity.com" }, "com.unity.cloud.ktx": { - "version": "3.4.5", + "version": "3.6.3", "depth": 0, "source": "registry", "dependencies": { @@ -82,31 +82,40 @@ "url": "https://packages.unity.com" }, "com.unity.collab-proxy": { - "version": "2.5.2", + "version": "2.11.4", "depth": 0, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.collections": { - "version": "1.2.4", + "version": "2.6.2", "depth": 1, "source": "registry", "dependencies": { - "com.unity.burst": "1.6.6", - "com.unity.test-framework": "1.1.31" + "com.unity.burst": "1.8.23", + "com.unity.mathematics": "1.3.2", + "com.unity.test-framework": "1.4.6", + "com.unity.nuget.mono-cecil": "1.11.5", + "com.unity.test-framework.performance": "3.0.3" }, "url": "https://packages.unity.com" }, - "com.unity.ext.nunit": { - "version": "1.0.6", + "com.unity.editorcoroutines": { + "version": "1.0.0", "depth": 1, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, + "com.unity.ext.nunit": { + "version": "2.0.5", + "depth": 1, + "source": "builtin", + "dependencies": {} + }, "com.unity.ide.rider": { - "version": "3.0.31", + "version": "3.0.39", "depth": 0, "source": "registry", "dependencies": { @@ -115,23 +124,16 @@ "url": "https://packages.unity.com" }, "com.unity.ide.visualstudio": { - "version": "2.0.22", + "version": "2.0.27", "depth": 0, "source": "registry", "dependencies": { - "com.unity.test-framework": "1.1.9" + "com.unity.test-framework": "1.1.33" }, "url": "https://packages.unity.com" }, - "com.unity.ide.vscode": { - "version": "1.2.5", - "depth": 0, - "source": "registry", - "dependencies": {}, - "url": "https://packages.unity.com" - }, "com.unity.inputsystem": { - "version": "1.7.0", + "version": "1.17.0", "depth": 0, "source": "registry", "dependencies": { @@ -140,19 +142,34 @@ "url": "https://packages.unity.com" }, "com.unity.mathematics": { - "version": "1.2.6", + "version": "1.3.2", "depth": 1, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.mobile.android-logcat": { - "version": "1.4.3", + "version": "1.4.7", "depth": 0, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, + "com.unity.multiplayer.center": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.uielements": "1.0.0" + } + }, + "com.unity.nuget.mono-cecil": { + "version": "1.11.5", + "depth": 2, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, "com.unity.nuget.newtonsoft-json": { "version": "3.2.1", "depth": 1, @@ -161,34 +178,42 @@ "url": "https://packages.unity.com" }, "com.unity.performance.profile-analyzer": { - "version": "1.2.2", + "version": "1.2.4", "depth": 0, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.test-framework": { - "version": "1.1.33", + "version": "1.6.0", "depth": 0, - "source": "registry", + "source": "builtin", "dependencies": { - "com.unity.ext.nunit": "1.0.6", + "com.unity.ext.nunit": "2.0.3", "com.unity.modules.imgui": "1.0.0", "com.unity.modules.jsonserialize": "1.0.0" - }, - "url": "https://packages.unity.com" + } }, - "com.unity.textmeshpro": { - "version": "3.0.6", - "depth": 0, + "com.unity.test-framework.performance": { + "version": "3.2.0", + "depth": 2, "source": "registry", "dependencies": { - "com.unity.ugui": "1.0.0" + "com.unity.test-framework": "1.1.33", + "com.unity.modules.jsonserialize": "1.0.0" }, "url": "https://packages.unity.com" }, + "com.unity.textmeshpro": { + "version": "5.0.0", + "depth": 1, + "source": "builtin", + "dependencies": { + "com.unity.ugui": "2.0.0" + } + }, "com.unity.timeline": { - "version": "1.6.5", + "version": "1.8.12", "depth": 0, "source": "registry", "dependencies": { @@ -200,7 +225,7 @@ "url": "https://packages.unity.com" }, "com.unity.ugui": { - "version": "1.0.0", + "version": "2.0.0", "depth": 0, "source": "builtin", "dependencies": { @@ -208,30 +233,40 @@ "com.unity.modules.imgui": "1.0.0" } }, + "com.unity.upm-publishing-tools": { + "version": "0.1.2", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.nuget.newtonsoft-json": "3.2.1" + }, + "url": "https://packages.unity.com" + }, "com.unity.xr.arcore": { - "version": "5.0.5", + "version": "6.0.6", "depth": 0, "source": "registry", "dependencies": { - "com.unity.xr.core-utils": "2.1.0", - "com.unity.xr.management": "4.0.1", - "com.unity.xr.arfoundation": "5.0.5", + "com.unity.xr.core-utils": "2.2.2", + "com.unity.xr.management": "4.4.0", + "com.unity.xr.arfoundation": "6.0.6", "com.unity.modules.androidjni": "1.0.0", "com.unity.modules.unitywebrequest": "1.0.0" }, "url": "https://packages.unity.com" }, "com.unity.xr.arfoundation": { - "version": "5.0.5", + "version": "6.0.6", "depth": 0, "source": "registry", "dependencies": { - "com.unity.ugui": "1.0.0", + "com.unity.ugui": "2.0.0", "com.unity.modules.ui": "1.0.0", - "com.unity.inputsystem": "1.3.0", - "com.unity.mathematics": "1.2.5", - "com.unity.xr.core-utils": "2.1.0", - "com.unity.xr.management": "4.0.1", + "com.unity.inputsystem": "1.6.3", + "com.unity.mathematics": "1.2.6", + "com.unity.xr.core-utils": "2.3.0", + "com.unity.xr.management": "4.4.0", + "com.unity.editorcoroutines": "1.0.0", "com.unity.modules.particlesystem": "1.0.0", "com.unity.modules.unityanalytics": "1.0.0", "com.unity.modules.unitywebrequest": "1.0.0" @@ -239,7 +274,7 @@ "url": "https://packages.unity.com" }, "com.unity.xr.core-utils": { - "version": "2.3.0", + "version": "2.5.3", "depth": 1, "source": "registry", "dependencies": { @@ -248,7 +283,7 @@ "url": "https://packages.unity.com" }, "com.unity.xr.hands": { - "version": "1.4.0", + "version": "1.7.2", "depth": 1, "source": "registry", "dependencies": { @@ -261,23 +296,23 @@ "url": "https://packages.unity.com" }, "com.unity.xr.interaction.toolkit": { - "version": "2.6.3", + "version": "3.0.10", "depth": 0, "source": "registry", "dependencies": { "com.unity.ugui": "1.0.0", - "com.unity.inputsystem": "1.7.0", + "com.unity.modules.xr": "1.0.0", + "com.unity.inputsystem": "1.8.1", "com.unity.mathematics": "1.2.6", "com.unity.modules.audio": "1.0.0", "com.unity.modules.imgui": "1.0.0", "com.unity.xr.core-utils": "2.2.3", - "com.unity.modules.physics": "1.0.0", - "com.unity.xr.legacyinputhelpers": "2.1.10" + "com.unity.modules.physics": "1.0.0" }, "url": "https://packages.unity.com" }, "com.unity.xr.legacyinputhelpers": { - "version": "2.1.11", + "version": "2.1.12", "depth": 1, "source": "registry", "dependencies": { @@ -287,25 +322,26 @@ "url": "https://packages.unity.com" }, "com.unity.xr.management": { - "version": "4.5.0", + "version": "4.5.4", "depth": 0, "source": "registry", "dependencies": { - "com.unity.modules.vr": "1.0.0", "com.unity.modules.xr": "1.0.0", + "com.unity.xr.core-utils": "2.2.1", "com.unity.modules.subsystems": "1.0.0", - "com.unity.xr.legacyinputhelpers": "2.1.7" + "com.unity.xr.legacyinputhelpers": "2.1.11" }, "url": "https://packages.unity.com" }, "com.unity.xr.openxr": { - "version": "1.13.0", + "version": "1.16.1", "depth": 0, "source": "registry", "dependencies": { "com.unity.inputsystem": "1.6.3", - "com.unity.xr.core-utils": "2.1.1", + "com.unity.xr.core-utils": "2.3.0", "com.unity.xr.management": "4.4.0", + "com.unity.modules.androidjni": "1.0.0", "com.unity.xr.legacyinputhelpers": "2.1.2" }, "url": "https://packages.unity.com" @@ -333,7 +369,7 @@ "depth": 0, "source": "local", "dependencies": { - "com.unity.xr.interaction.toolkit": "2.3.0", + "com.unity.xr.interaction.toolkit": "3.0.4", "com.unity.xr.management": "4.2.1", "com.unity.xr.core-utils": "2.1.0" } @@ -374,9 +410,9 @@ "com.unity.inputsystem": "1.6.1", "com.unity.xr.arfoundation": "5.0.5", "com.unity.xr.core-utils": "2.1.0", - "com.unity.xr.hands": "1.3.0", - "com.unity.xr.interaction.toolkit": "2.3.0", - "org.mixedrealitytoolkit.core": "3.2.2" + "com.unity.xr.hands": "1.6.0", + "com.unity.xr.interaction.toolkit": "3.0.4", + "org.mixedrealitytoolkit.core": "4.0.0" } }, "org.mixedrealitytoolkit.spatialmanipulation": { @@ -384,10 +420,10 @@ "depth": 0, "source": "local", "dependencies": { - "org.mixedrealitytoolkit.core": "3.2.2", - "org.mixedrealitytoolkit.uxcore": "3.3.0", + "org.mixedrealitytoolkit.core": "4.0.0", + "org.mixedrealitytoolkit.uxcore": "4.0.0", "com.unity.inputsystem": "1.6.1", - "com.unity.xr.interaction.toolkit": "2.3.0" + "com.unity.xr.interaction.toolkit": "3.0.4" } }, "org.mixedrealitytoolkit.standardassets": { @@ -398,6 +434,17 @@ "com.microsoft.mrtk.graphicstools.unity": "0.8.0" } }, + "org.mixedrealitytoolkit.theming": { + "version": "file:../../../org.mixedrealitytoolkit.theming", + "depth": 0, + "source": "local", + "dependencies": { + "com.microsoft.mrtk.graphicstools.unity": "0.8.0", + "org.mixedrealitytoolkit.core": "4.0.0", + "org.mixedrealitytoolkit.uxcore": "4.0.0", + "com.unity.textmeshpro": "3.0.6" + } + }, "org.mixedrealitytoolkit.tools": { "version": "file:../../../org.mixedrealitytoolkit.tools", "depth": 0, @@ -412,10 +459,10 @@ "source": "local", "dependencies": { "com.microsoft.mrtk.graphicstools.unity": "0.8.0", - "org.mixedrealitytoolkit.uxcore": "3.3.0", - "org.mixedrealitytoolkit.spatialmanipulation": "3.4.0", + "org.mixedrealitytoolkit.uxcore": "4.0.0", + "org.mixedrealitytoolkit.spatialmanipulation": "4.0.0", "org.mixedrealitytoolkit.standardassets": "3.2.1", - "com.unity.xr.interaction.toolkit": "2.3.0" + "com.unity.xr.interaction.toolkit": "3.0.4" } }, "org.mixedrealitytoolkit.uxcomponents.noncanvas": { @@ -423,8 +470,8 @@ "depth": 0, "source": "local", "dependencies": { - "org.mixedrealitytoolkit.uxcore": "3.3.0", - "org.mixedrealitytoolkit.spatialmanipulation": "3.4.0", + "org.mixedrealitytoolkit.uxcore": "4.0.0", + "org.mixedrealitytoolkit.spatialmanipulation": "4.0.0", "org.mixedrealitytoolkit.standardassets": "3.2.1" } }, @@ -434,10 +481,10 @@ "source": "local", "dependencies": { "com.microsoft.mrtk.graphicstools.unity": "0.8.0", - "org.mixedrealitytoolkit.core": "3.3.0", + "org.mixedrealitytoolkit.core": "4.0.0", "com.unity.inputsystem": "1.6.1", "com.unity.textmeshpro": "3.0.6", - "com.unity.xr.interaction.toolkit": "2.3.0" + "com.unity.xr.interaction.toolkit": "3.0.4" } }, "org.mixedrealitytoolkit.windowsspeech": { @@ -449,6 +496,12 @@ "org.mixedrealitytoolkit.core": "3.2.2" } }, + "com.unity.modules.accessibility": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, "com.unity.modules.ai": { "version": "1.0.0", "depth": 0, @@ -496,6 +549,12 @@ "com.unity.modules.animation": "1.0.0" } }, + "com.unity.modules.hierarchycore": { + "version": "1.0.0", + "depth": 1, + "source": "builtin", + "dependencies": {} + }, "com.unity.modules.imageconversion": { "version": "1.0.0", "depth": 0, @@ -585,17 +644,7 @@ "com.unity.modules.ui": "1.0.0", "com.unity.modules.imgui": "1.0.0", "com.unity.modules.jsonserialize": "1.0.0", - "com.unity.modules.uielementsnative": "1.0.0" - } - }, - "com.unity.modules.uielementsnative": { - "version": "1.0.0", - "depth": 1, - "source": "builtin", - "dependencies": { - "com.unity.modules.ui": "1.0.0", - "com.unity.modules.imgui": "1.0.0", - "com.unity.modules.jsonserialize": "1.0.0" + "com.unity.modules.hierarchycore": "1.0.0" } }, "com.unity.modules.umbra": { diff --git a/UnityProjects/MRTKDevTemplate/ProjectSettings/EditorBuildSettings.asset b/UnityProjects/MRTKDevTemplate/ProjectSettings/EditorBuildSettings.asset index 8db1894b6..5c378f595 100644 --- a/UnityProjects/MRTKDevTemplate/ProjectSettings/EditorBuildSettings.asset +++ b/UnityProjects/MRTKDevTemplate/ProjectSettings/EditorBuildSettings.asset @@ -107,6 +107,9 @@ EditorBuildSettings: - enabled: 1 path: Assets/Scenes/Experimental/NonNativeKeyboard.unity guid: 4c87f445819343b4ba89b26fd8661dc4 + - enabled: 1 + path: Assets/Scenes/ObsoleteHandInteractionExamples.unity + guid: ef7e6dc699271434eb9b85e866eadc11 - enabled: 1 path: Assets/Scenes/OutlineExamples.unity guid: c53962871a3392542bd7c86d82c89533 @@ -161,3 +164,4 @@ EditorBuildSettings: com.unity.xr.arfoundation.simulation_settings: {fileID: 11400000, guid: 4ce0884cff002f24f83e8b0ceef94646, type: 2} com.unity.xr.management.loader_settings: {fileID: 11400000, guid: 90a3b98e6a849104285d1183acd66c0b, type: 2} com.unity.xr.openxr.settings4: {fileID: 11400000, guid: a03b04948b0cbde4498320e6e1bd5cd6, type: 2} + m_UseUCBPForAssetBundles: 0 diff --git a/UnityProjects/MRTKDevTemplate/ProjectSettings/MultiplayerManager.asset b/UnityProjects/MRTKDevTemplate/ProjectSettings/MultiplayerManager.asset new file mode 100644 index 000000000..2a936644e --- /dev/null +++ b/UnityProjects/MRTKDevTemplate/ProjectSettings/MultiplayerManager.asset @@ -0,0 +1,7 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!655991488 &1 +MultiplayerManager: + m_ObjectHideFlags: 0 + m_EnableMultiplayerRoles: 0 + m_StrippingTypes: {} diff --git a/UnityProjects/MRTKDevTemplate/ProjectSettings/ProjectSettings.asset b/UnityProjects/MRTKDevTemplate/ProjectSettings/ProjectSettings.asset index ffbf4295f..6a4d06d0d 100644 --- a/UnityProjects/MRTKDevTemplate/ProjectSettings/ProjectSettings.asset +++ b/UnityProjects/MRTKDevTemplate/ProjectSettings/ProjectSettings.asset @@ -3,7 +3,7 @@ --- !u!129 &1 PlayerSettings: m_ObjectHideFlags: 0 - serializedVersion: 24 + serializedVersion: 28 productGUID: 24fb2b4e687eaba479b315cd3440717a AndroidProfiler: 0 AndroidFilterTouchesWhenObscured: 0 @@ -48,14 +48,17 @@ PlayerSettings: defaultScreenHeightWeb: 600 m_StereoRenderingPath: 0 m_ActiveColorSpace: 1 + unsupportedMSAAFallback: 0 + m_SpriteBatchMaxVertexCount: 65535 + m_SpriteBatchVertexThreshold: 300 m_MTRendering: 1 mipStripping: 0 numberOfMipsStripped: 0 + numberOfMipsStrippedPerMipmapLimitGroup: {} m_StackTraceTypes: 010000000100000001000000010000000100000001000000 iosShowActivityIndicatorOnLoading: -1 androidShowActivityIndicatorOnLoading: -1 iosUseCustomAppBackgroundBehavior: 0 - iosAllowHTTPDownload: 1 allowedAutorotateToPortrait: 1 allowedAutorotateToPortraitUpsideDown: 1 allowedAutorotateToLandscapeRight: 1 @@ -67,24 +70,29 @@ PlayerSettings: androidStartInFullscreen: 1 androidRenderOutsideSafeArea: 1 androidUseSwappy: 1 + androidDisplayOptions: 1 androidBlitType: 0 - androidResizableWindow: 0 + androidResizeableActivity: 0 androidDefaultWindowWidth: 1920 androidDefaultWindowHeight: 1080 androidMinimumWindowWidth: 400 androidMinimumWindowHeight: 300 androidFullscreenMode: 1 + androidAutoRotationBehavior: 1 + androidPredictiveBackSupport: 1 + androidApplicationEntry: 2 defaultIsNativeResolution: 1 macRetinaSupport: 1 - runInBackground: 0 - captureSingleScreen: 0 + runInBackground: 1 muteOtherAudioSources: 0 Prepare IOS For Recording: 0 Force IOS Speakers When Recording: 0 + audioSpatialExperience: 0 deferSystemGesturesMode: 0 hideHomeButton: 0 submitAnalytics: 1 usePlayerLog: 1 + dedicatedServerOptimizations: 1 bakeCollisionMeshes: 0 forceSingleInstance: 0 useFlipModelSwapchain: 1 @@ -92,6 +100,7 @@ PlayerSettings: useMacAppStoreValidation: 0 macAppStoreCategory: public.app-category.games gpuSkinning: 1 + meshDeformation: 2 xboxPIXTextureCapture: 0 xboxEnableAvatar: 0 xboxEnableKinect: 0 @@ -119,22 +128,21 @@ PlayerSettings: switchNVNShaderPoolsGranularity: 33554432 switchNVNDefaultPoolsGranularity: 16777216 switchNVNOtherPoolsGranularity: 16777216 + switchGpuScratchPoolGranularity: 2097152 + switchAllowGpuScratchShrinking: 0 switchNVNMaxPublicTextureIDCount: 0 switchNVNMaxPublicSamplerIDCount: 0 - stadiaPresentMode: 0 - stadiaTargetFramerate: 0 + switchMaxWorkerMultiple: 8 + switchNVNGraphicsFirmwareMemory: 32 vulkanNumSwapchainBuffers: 3 vulkanEnableSetSRGBWrite: 0 vulkanEnablePreTransform: 0 vulkanEnableLateAcquireNextImage: 0 vulkanEnableCommandBufferRecycling: 1 - m_SupportedAspectRatios: - 4:3: 1 - 5:4: 1 - 16:10: 1 - 16:9: 1 - Others: 1 - bundleVersion: 3.0.0 + loadStoreDebugModeEnabled: 0 + visionOSBundleVersion: 1.0 + tvOSBundleVersion: 1.0 + bundleVersion: 4.0.0 preloadedAssets: - {fileID: 0} metroInputSource: 0 @@ -147,19 +155,22 @@ PlayerSettings: isWsaHolographicRemotingEnabled: 0 enableFrameTimingStats: 0 enableOpenGLProfilerGPURecorders: 1 + allowHDRDisplaySupport: 0 useHDRDisplay: 0 - D3DHDRBitDepth: 0 + hdrBitDepth: 0 m_ColorGamuts: 00000000 targetPixelDensity: 30 resolutionScalingMode: 0 resetResolutionOnWindowResize: 0 androidSupportedAspectRatio: 1 androidMaxAspectRatio: 2.1 + androidMinAspectRatio: 1 applicationIdentifier: Android: org.MixedRealityToolkit.MRTK3Sample Standalone: org.MixedRealityToolkit.MRTK3Sample buildNumber: Standalone: 0 + VisionOS: 0 iPhone: 0 tvOS: 0 overrideDefaultApplicationIdentifier: 1 @@ -174,15 +185,20 @@ PlayerSettings: ForceInternetPermission: 0 ForceSDCardPermission: 0 CreateWallpaper: 0 - APKExpansionFiles: 0 + androidSplitApplicationBinary: 0 keepLoadedShadersAlive: 0 StripUnusedMeshComponents: 1 + strictShaderVariantMatching: 0 VertexChannelCompressionMask: 4054 iPhoneSdkVersion: 988 - iOSTargetOSVersionString: 12.0 + iOSSimulatorArchitecture: 0 + iOSTargetOSVersionString: 13.0 tvOSSdkVersion: 0 + tvOSSimulatorArchitecture: 0 tvOSRequireExtendedGameController: 0 - tvOSTargetOSVersionString: 12.0 + tvOSTargetOSVersionString: 13.0 + VisionOSSdkVersion: 0 + VisionOSTargetOSVersionString: 1.0 uIPrerenderedIcon: 0 uIRequiresPersistentWiFi: 0 uIRequiresFullScreen: 1 @@ -207,7 +223,6 @@ PlayerSettings: rgba: 0 iOSLaunchScreenFillPct: 100 iOSLaunchScreenSize: 100 - iOSLaunchScreenCustomXibPath: iOSLaunchScreeniPadType: 0 iOSLaunchScreeniPadImage: {fileID: 0} iOSLaunchScreeniPadBackgroundColor: @@ -215,7 +230,6 @@ PlayerSettings: rgba: 0 iOSLaunchScreeniPadFillPct: 100 iOSLaunchScreeniPadSize: 100 - iOSLaunchScreeniPadCustomXibPath: iOSLaunchScreenCustomStoryboardPath: iOSLaunchScreeniPadCustomStoryboardPath: iOSDeviceRequirements: [] @@ -225,13 +239,16 @@ PlayerSettings: iOSMetalForceHardShadows: 0 metalEditorSupport: 1 metalAPIValidation: 1 + metalCompileShaderBinary: 0 iOSRenderExtraFrameOnPause: 0 iosCopyPluginsCodeInsteadOfSymlink: 0 appleDeveloperTeamID: iOSManualSigningProvisioningProfileID: tvOSManualSigningProvisioningProfileID: + VisionOSManualSigningProvisioningProfileID: iOSManualSigningProvisioningProfileType: 0 tvOSManualSigningProvisioningProfileType: 0 + VisionOSManualSigningProvisioningProfileType: 0 appleEnableAutomaticSigning: 0 iOSRequireARKit: 0 iOSAutomaticallyDetectAndAddCapabilities: 1 @@ -246,16 +263,21 @@ PlayerSettings: useCustomLauncherGradleManifest: 0 useCustomBaseGradleTemplate: 0 useCustomGradlePropertiesTemplate: 0 + useCustomGradleSettingsTemplate: 0 useCustomProguardFile: 0 AndroidTargetArchitectures: 2 - AndroidTargetDevices: 0 AndroidSplashScreenScale: 0 androidSplashScreen: {fileID: 0} AndroidKeystoreName: AndroidKeyaliasName: + AndroidEnableArmv9SecurityFeatures: 0 + AndroidEnableArm64MTE: 0 AndroidBuildApkPerCpuArchitecture: 0 AndroidTVCompatibility: 0 AndroidIsGame: 1 + androidAppCategory: 3 + useAndroidAppCategory: 1 + androidAppCategoryOther: AndroidEnableTango: 0 androidEnableBanner: 1 androidUseLowAccuracyLocation: 0 @@ -265,12 +287,12 @@ PlayerSettings: height: 180 banner: {fileID: 0} androidGamepadSupportLevel: 0 - chromeosInputEmulation: 1 - AndroidMinifyWithR8: 0 AndroidMinifyRelease: 0 AndroidMinifyDebug: 0 AndroidValidateAppBundleSize: 1 AndroidAppBundleSizeToValidate: 150 + AndroidReportGooglePlayAppDependencies: 1 + androidSymbolsSizeThreshold: 800 m_BuildTargetIcons: [] m_BuildTargetPlatformIcons: - m_BuildTarget: Android @@ -521,7 +543,7 @@ PlayerSettings: m_GraphicsJobMode: 0 m_BuildTargetGraphicsAPIs: - m_BuildTarget: AndroidPlayer - m_APIs: 0b000000 + m_APIs: 15000000 m_Automatic: 0 - m_BuildTarget: iOSSupport m_APIs: 10000000 @@ -532,6 +554,9 @@ PlayerSettings: - m_BuildTarget: WebGLSupport m_APIs: 0b000000 m_Automatic: 1 + - m_BuildTarget: WindowsStandaloneSupport + m_APIs: 02000000 + m_Automatic: 1 m_BuildTargetVRSettings: - m_BuildTarget: Standalone m_Enabled: 0 @@ -549,12 +574,18 @@ PlayerSettings: iPhone: 1 tvOS: 1 m_BuildTargetGroupLightmapEncodingQuality: [] + m_BuildTargetGroupHDRCubemapEncodingQuality: [] m_BuildTargetGroupLightmapSettings: [] + m_BuildTargetGroupLoadStoreDebugModeSettings: [] m_BuildTargetNormalMapEncoding: [] - m_BuildTargetDefaultTextureCompressionFormat: [] + m_BuildTargetDefaultTextureCompressionFormat: + - serializedVersion: 3 + m_BuildTarget: Android + m_Formats: 01000000 playModeTestRunnerEnabled: 0 runPlayModeTestAsEditModeTest: 0 actionOnDotNetUnhandledException: 1 + editorGfxJobOverride: 1 enableInternalProfiler: 0 logObjCUncaughtExceptions: 1 enableCrashReportAPI: 0 @@ -562,6 +593,7 @@ PlayerSettings: locationUsageDescription: microphoneUsageDescription: bluetoothUsageDescription: + macOSTargetOSVersion: 11.0 switchNMETAOverride: switchNetLibKey: switchSocketMemoryPoolSize: 6144 @@ -569,10 +601,11 @@ PlayerSettings: switchSocketConcurrencyLimit: 14 switchScreenResolutionBehavior: 2 switchUseCPUProfiler: 0 - switchUseGOLDLinker: 0 + switchEnableFileSystemTrace: 0 switchLTOSetting: 0 switchApplicationID: 0x01004b9000490000 switchNSODependencies: + switchCompilerFlags: switchTitleNames_0: switchTitleNames_1: switchTitleNames_2: @@ -698,13 +731,14 @@ PlayerSettings: switchSocketBufferEfficiency: 4 switchSocketInitializeEnabled: 1 switchNetworkInterfaceManagerInitializeEnabled: 1 - switchPlayerConnectionEnabled: 1 + switchDisableHTCSPlayerConnection: 0 switchUseNewStyleFilepaths: 0 switchUseLegacyFmodPriorities: 1 switchUseMicroSleepForYield: 1 switchEnableRamDiskSupport: 0 switchMicroSleepForYieldTime: 25 switchRamDiskSpaceSize: 12 + switchUpgradedPlayerSettingsToNMETA: 0 ps4NPAgeRating: 12 ps4NPTitleSecret: ps4NPTrophyPackPath: @@ -788,6 +822,7 @@ PlayerSettings: webGLMemorySize: 16 webGLExceptionSupport: 1 webGLNameFilesAsHashes: 0 + webGLShowDiagnostics: 0 webGLDataCaching: 1 webGLDebugSymbols: 0 webGLEmscriptenArgs: @@ -800,7 +835,18 @@ PlayerSettings: webGLLinkerTarget: 1 webGLThreadsSupport: 0 webGLDecompressionFallback: 0 + webGLInitialMemorySize: 32 + webGLMaximumMemorySize: 2048 + webGLMemoryGrowthMode: 2 + webGLMemoryLinearGrowthStep: 16 + webGLMemoryGeometricGrowthStep: 0.2 + webGLMemoryGeometricGrowthCap: 96 + webGLEnableWebGPU: 0 webGLPowerPreference: 2 + webGLWebAssemblyTable: 0 + webGLWebAssemblyBigInt: 0 + webGLCloseOnQuit: 0 + webWasm2023: 0 scriptingDefineSymbols: Android: USE_INPUT_SYSTEM_POSE_CONTROL Standalone: USE_INPUT_SYSTEM_POSE_CONTROL @@ -810,6 +856,8 @@ PlayerSettings: scriptingBackend: Android: 1 il2cppCompilerConfiguration: {} + il2cppCodeGeneration: {} + il2cppStacktraceInformation: {} managedStrippingLevel: Android: 1 EmbeddedLinux: 1 @@ -829,18 +877,16 @@ PlayerSettings: suppressCommonWarnings: 1 allowUnsafeCode: 0 useDeterministicCompilation: 1 - enableRoslynAnalyzers: 1 - selectedPlatform: 0 additionalIl2CppArgs: scriptingRuntimeVersion: 1 gcIncremental: 1 - assemblyVersionValidation: 1 gcWBarrierValidation: 0 apiCompatibilityLevelPerPlatform: {} + editorAssembliesCompatibilityLevel: 1 m_RenderingPath: 1 m_MobileRenderingPath: 1 metroPackageName: MRTK3Sample - metroPackageVersion: 3.0.0.0 + metroPackageVersion: 4.0.0.0 metroCertificatePath: Assets/WSATestCertificate.pfx metroCertificatePassword: metroCertificateSubject: Microsoft @@ -860,6 +906,7 @@ PlayerSettings: metroTileBackgroundColor: {r: 0.13333334, g: 0.17254902, b: 0.21568628, a: 0} metroSplashScreenBackgroundColor: {r: 0.12941177, g: 0.17254902, b: 0.21568628, a: 1} metroSplashScreenUseBackgroundColor: 0 + syncCapabilities: 0 platformCapabilities: WindowsStoreApps: GazeInput: True @@ -914,7 +961,14 @@ PlayerSettings: luminVersion: m_VersionCode: 1 m_VersionName: + hmiPlayerDataPath: + hmiForceSRGBBlit: 1 + embeddedLinuxEnableGamepadInput: 0 + hmiCpuConfiguration: + hmiLogStartupTiming: 0 + qnxGraphicConfPath: apiCompatibilityLevel: 6 + captureStartupLogs: {} activeInputHandler: 1 windowsGamepadBackendHint: 0 cloudProjectId: @@ -924,6 +978,9 @@ PlayerSettings: organizationId: cloudEnabled: 0 legacyClampBlendShapeWeights: 0 - playerDataPath: - forceSRGBBlit: 1 + hmiLoadingImage: {fileID: 0} + platformRequiresReadableAssets: 0 virtualTexturingSupportEnabled: 0 + insecureHttpOption: 0 + androidVulkanDenyFilterList: [] + androidVulkanAllowFilterList: [] diff --git a/UnityProjects/MRTKDevTemplate/ProjectSettings/ProjectVersion.txt b/UnityProjects/MRTKDevTemplate/ProjectSettings/ProjectVersion.txt index 1a62a673a..080074a7b 100644 --- a/UnityProjects/MRTKDevTemplate/ProjectSettings/ProjectVersion.txt +++ b/UnityProjects/MRTKDevTemplate/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2021.3.45f2 -m_EditorVersionWithRevision: 2021.3.45f2 (88f88f591b2e) +m_EditorVersion: 6000.0.66f2 +m_EditorVersionWithRevision: 6000.0.66f2 (b20bc5da3050) diff --git a/UnityProjects/MRTKDevTemplate/ProjectSettings/SceneTemplateSettings.json b/UnityProjects/MRTKDevTemplate/ProjectSettings/SceneTemplateSettings.json index 6f3e60fd8..6ed312ae2 100644 --- a/UnityProjects/MRTKDevTemplate/ProjectSettings/SceneTemplateSettings.json +++ b/UnityProjects/MRTKDevTemplate/ProjectSettings/SceneTemplateSettings.json @@ -4,164 +4,123 @@ { "userAdded": false, "type": "UnityEngine.AnimationClip", - "ignore": false, - "defaultInstantiationMode": 0, - "supportsModification": true + "defaultInstantiationMode": 0 }, { "userAdded": false, "type": "UnityEditor.Animations.AnimatorController", - "ignore": false, - "defaultInstantiationMode": 0, - "supportsModification": true + "defaultInstantiationMode": 0 }, { "userAdded": false, "type": "UnityEngine.AnimatorOverrideController", - "ignore": false, - "defaultInstantiationMode": 0, - "supportsModification": true + "defaultInstantiationMode": 0 }, { "userAdded": false, "type": "UnityEditor.Audio.AudioMixerController", - "ignore": false, - "defaultInstantiationMode": 0, - "supportsModification": true + "defaultInstantiationMode": 0 }, { "userAdded": false, "type": "UnityEngine.ComputeShader", - "ignore": true, - "defaultInstantiationMode": 1, - "supportsModification": true + "defaultInstantiationMode": 1 }, { "userAdded": false, "type": "UnityEngine.Cubemap", - "ignore": false, - "defaultInstantiationMode": 0, - "supportsModification": true + "defaultInstantiationMode": 0 }, { "userAdded": false, "type": "UnityEngine.GameObject", - "ignore": false, - "defaultInstantiationMode": 0, - "supportsModification": true + "defaultInstantiationMode": 0 }, { "userAdded": false, "type": "UnityEditor.LightingDataAsset", - "ignore": false, - "defaultInstantiationMode": 0, - "supportsModification": false + "defaultInstantiationMode": 0 }, { "userAdded": false, "type": "UnityEngine.LightingSettings", - "ignore": false, - "defaultInstantiationMode": 0, - "supportsModification": true + "defaultInstantiationMode": 0 }, { "userAdded": false, "type": "UnityEngine.Material", - "ignore": false, - "defaultInstantiationMode": 0, - "supportsModification": true + "defaultInstantiationMode": 0 }, { "userAdded": false, "type": "UnityEditor.MonoScript", - "ignore": true, - "defaultInstantiationMode": 1, - "supportsModification": true + "defaultInstantiationMode": 1 }, { "userAdded": false, "type": "UnityEngine.PhysicMaterial", - "ignore": false, - "defaultInstantiationMode": 0, - "supportsModification": true + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEngine.PhysicsMaterial", + "defaultInstantiationMode": 0 }, { "userAdded": false, "type": "UnityEngine.PhysicsMaterial2D", - "ignore": false, - "defaultInstantiationMode": 0, - "supportsModification": true + "defaultInstantiationMode": 0 }, { "userAdded": false, "type": "UnityEngine.Rendering.PostProcessing.PostProcessProfile", - "ignore": false, - "defaultInstantiationMode": 0, - "supportsModification": true + "defaultInstantiationMode": 0 }, { "userAdded": false, "type": "UnityEngine.Rendering.PostProcessing.PostProcessResources", - "ignore": false, - "defaultInstantiationMode": 0, - "supportsModification": true + "defaultInstantiationMode": 0 }, { "userAdded": false, "type": "UnityEngine.Rendering.VolumeProfile", - "ignore": false, - "defaultInstantiationMode": 0, - "supportsModification": true + "defaultInstantiationMode": 0 }, { "userAdded": false, "type": "UnityEditor.SceneAsset", - "ignore": false, - "defaultInstantiationMode": 0, - "supportsModification": false + "defaultInstantiationMode": 0 }, { "userAdded": false, "type": "UnityEngine.Shader", - "ignore": true, - "defaultInstantiationMode": 1, - "supportsModification": true + "defaultInstantiationMode": 1 }, { "userAdded": false, "type": "UnityEngine.ShaderVariantCollection", - "ignore": true, - "defaultInstantiationMode": 1, - "supportsModification": true + "defaultInstantiationMode": 1 }, { "userAdded": false, "type": "UnityEngine.Texture", - "ignore": false, - "defaultInstantiationMode": 0, - "supportsModification": true + "defaultInstantiationMode": 0 }, { "userAdded": false, "type": "UnityEngine.Texture2D", - "ignore": false, - "defaultInstantiationMode": 0, - "supportsModification": true + "defaultInstantiationMode": 0 }, { "userAdded": false, "type": "UnityEngine.Timeline.TimelineAsset", - "ignore": false, - "defaultInstantiationMode": 0, - "supportsModification": true + "defaultInstantiationMode": 0 } ], "defaultDependencyTypeInfo": { "userAdded": false, "type": "", - "ignore": false, - "defaultInstantiationMode": 1, - "supportsModification": true + "defaultInstantiationMode": 1 }, "newSceneOverride": 0 } \ No newline at end of file diff --git a/UnityProjects/MRTKDevTemplate/ProjectSettings/boot.config b/UnityProjects/MRTKDevTemplate/ProjectSettings/boot.config deleted file mode 100644 index e69de29bb..000000000 diff --git a/XRI2TOXRI3MIGRATIONGUIDE.md b/XRI2TOXRI3MIGRATIONGUIDE.md new file mode 100644 index 000000000..e1e18dd04 --- /dev/null +++ b/XRI2TOXRI3MIGRATIONGUIDE.md @@ -0,0 +1,86 @@ +# MRTK3 XRI2 to XRI3 migration guide + +## Introduction + +Thank you for choosing MRTK as your Mixed Reality framework. MRTK has been upgraded to follow XRI3 patterns and consume [Unity's XR Interaction Toolkit 3+](https://docs.unity3d.com/Packages/com.unity.xr.interaction.toolkit@3.0/manual/whats-new-3.0.html) package. The upgrade encompasses various changes from the previous MRTK version and we want to share our experience during the upgrade so that the community is aware of the changes that had to be implemented. We also want to provide an overall roadmap for others to do their own upgrades in their forks or propietary solutions and therefore we created this guide. We created this guide to empower you and your organization to achieve more in Mixed Reality solutions. + +## Original MRTK rig structure + +Previous to XRI3 upgrade the MRTK3 rig had a structure similar to the one shown in the next figure: + +![Original MRTK rig structure](Images/XRI2ToXRI3Guide/MRTK3XRI2RigStructure.png) + +The MRTK3 rig prefab is the root GameObject with the Camera Offset ([XROrigin](https://docs.unity3d.com/Packages/com.unity.xr.core-utils@2.0/api/Unity.XR.CoreUtils.XROrigin.html)) child that has the multiple controllers (LeftHand, RightHand, and Gaze) as children. Next is a screenshot of the now obsolete MRTK XR Rig. + +![Obsolete MRTK rig](Images/XRI2ToXRI3Guide/ObsoleteMRTKXRRig.png) + +All of the Input Actions were centralized in the [XRController](https://docs.unity3d.com/Packages/com.unity.inputsystem@1.8/api/UnityEngine.InputSystem.XR.XRController.html) component at the controller level, for example: + +![Original MRTK RightHand XRController](Images/XRI2ToXRI3Guide/ObsoleteMRTKRightHandXRController.png) + +The new, XRI3, MRTK rig + controllers have a slightly different structure which is shown next: + +![New MRTK rig structure](Images/XRI2ToXRI3Guide/MRTK3XRI3RigStructure.png) + +In essence, the main difference is that the [XRController](https://docs.unity3d.com/Packages/com.unity.inputsystem@1.8/api/UnityEngine.InputSystem.XR.XRController.html) component has been removed and replaced with a [Tracked Pose Driver](https://docs.unity3d.com/Packages/com.unity.inputsystem@1.8/api/UnityEngine.InputSystem.XR.TrackedPoseDriver.html) component which stores references to the Position, Rotation, and Tracking State actions (these can be and are the same as in the old structure). The other input actions (e.g. Select, Activate, UIPress, etc) are moved from the Controller to the Interactor. They are stored in fields already defined in the [Unity's XR Interaction Toolkit 3+](https://docs.unity3d.com/Packages/com.unity.xr.interaction.toolkit@3.0/manual/whats-new-3.0.html) package. + +The XRI3 migration consisted of a set of steps to remove deprecated components and reference the existing Input Actions in their new homes. We recommend that the first step is to move the Position, Rotation and Tracking State actions to their new home according to the new [Unity's XR Interaction Toolkit 3+](https://docs.unity3d.com/Packages/com.unity.xr.interaction.toolkit@3.0/manual/whats-new-3.0.html). + +## Step 1 - Move Position, Rotation and Tracking State actions + +Unity introduced a new [Tracked Pose Driver](https://docs.unity3d.com/Packages/com.unity.inputsystem@1.8/api/UnityEngine.InputSystem.XR.TrackedPoseDriver.html) component which is the new home for the Position, Rotation, and Tracking State input actions. Add such component (or a class derived from it) to your controller(s) and add references to the already existing Position, Rotation, and Tracking State actions that were referenced in the removed XRController, as shown the next figure: + +![Step 1](Images/XRI2ToXRI3Guide/XRI2ToXRI3Step1.png) + +## Step 2 - Implement your own Model functionality + +The next step would be to implement your own controller Model functionality if you use it at all. Unity kindly shared that they have no plans to implement a new home for the Model functionality of the [XRController](https://docs.unity3d.com/Packages/com.unity.inputsystem@1.8/api/UnityEngine.InputSystem.XR.XRController.html) because of its simplicity so we had to implement it. Fortunately, they are correct and their implementation is quite easy, we recommend you to check MRTK's HandModel MonoBehaviour for an example of its implementation. The next figure shows the new home for the [XRController](https://docs.unity3d.com/Packages/com.unity.inputsystem@1.8/api/UnityEngine.InputSystem.XR.XRController.html) Model functionality in the new MRTK Controller: + +![Step 2](Images/XRI2ToXRI3Guide/XRI2ToXRI3Step2.png) + +### Input Compatibility Mode + +As you make progress in upgrading your Controllers and Interactors to XRI3 it is a good idea to keep an eye on the deprecated XR Controller Configuration Input Compatibility Mode field. This mode controls whether the Interactor uses the new input readers or use the deprecated XR Controller component as per [Unity's changelog](https://docs.unity3d.com/Packages/com.unity.xr.interaction.toolkit@3.0/changelog/CHANGELOG.html#changed-3). It defaults to *Automatic*, however, **this behavior may show false-positive correct behaviors** if you have not removed the [XRController](https://docs.unity3d.com/Packages/com.unity.inputsystem@1.8/api/UnityEngine.InputSystem.XR.XRController.html) component from the Controller. + +The Input Compatibility Mode can be found via Inspector under the *(Deprecated) XR Controller Configuration* group as shown next: + +![Input Compatibility Mode](Images/XRI2ToXRI3Guide/InputCompatibilityMode.png) + +## Step 3 - Move the remaining [XRController](https://docs.unity3d.com/Packages/com.unity.inputsystem@1.8/api/UnityEngine.InputSystem.XR.XRController.html) input actions to their respective Interactors + +Once you have moved the device tracking input actions to the [Tracked Pose Driver](https://docs.unity3d.com/Packages/com.unity.inputsystem@1.8/api/UnityEngine.InputSystem.XR.TrackedPoseDriver.html) component and implemented your own Model functionality then you can move the remaining input actions from the original [XRController](https://docs.unity3d.com/Packages/com.unity.inputsystem@1.8/api/UnityEngine.InputSystem.XR.XRController.html) to the Interactors themselves. The following image highlights the new controller prefab interactors fields that we needed to update for the XRI3 migration. + +![Step 3](Images/XRI2ToXRI3Guide/XRI2ToXRI3Step3.png) + +### MRTK InputReaders + +As you may have noticed already MRTK controller prefabs now have a new child in which we group Input actions for pinch and UI interaction. These are shown in the next figure: + +![MRTK Input Readers](Images/XRI2ToXRI3Guide/MRTKInputReaders.png) + +We added this child + script as a workaround for devices without interaction profiles for hands, however, if your solution does not have a use-case without hands interactions profiles then you can safely map the MRTK's InputReaders' input actions directly in their corresponding Interactor fields. + +### TrackedPoseDriver and ModeManagedRoot references + +In addition to the InputReaders child you may have also noticed that MRTK interactors now have two new fields: [Tracked Pose Driver](https://docs.unity3d.com/Packages/com.unity.inputsystem@1.8/api/UnityEngine.InputSystem.XR.TrackedPoseDriver.html) and Mode Managed Root, as shown next: + +![TrackedPoseDriver and ModeManagedRoot](Images/XRI2ToXRI3Guide/TPDandMMR.png) + +These are just convenient fields to hold references to the parent controller [Tracked Pose Driver](https://docs.unity3d.com/Packages/com.unity.inputsystem@1.8/api/UnityEngine.InputSystem.XR.TrackedPoseDriver.html) component and GameObject. These are not mandatory for a successful XRI3 migration but they facilitate coding as well as writing Unity-tests. + +## Step 4 - Update scripts + +For the XRI3 migration we modified our scripts with two goals: + +* Adhere to the new XRI3 patterns. +* Provide backward compatibility. + +As you will notice in the code many of our changes query the Input Compatibility Mode field to differentiate between XRI2 functionality and XRI3 functionality. This is not mandatory for a successful XRI3 migration, however, we wanted to create a smooth transition for all of you and did our best to ensure backward compatibily as you migrate your forks or solutions. + +We encourage you to check the code in each script as well as the commit history to get a sense of the changes that were needed. + +## Step 5 - Update Unity-tests + +Last but not least, Unity-tests! We created several new Unity-tests to ensure the correct functionality of the new XRI3 MRTK rig as well as the old functionality. We encourage you to visit the code and commit history related to Unity-tests to get a sense of the changes. Note that the changes focus mostly on where and how the input actions are queried but the overall functionality test remains the same. + +Thank you for reading this guide, we hope it empowers you to achieve more. Please feel free to submit an issue if you have comments or questions. \ No newline at end of file diff --git a/docs/mrtk3-overview/getting-started/setting-up/setup-dev-env.md b/docs/mrtk3-overview/getting-started/setting-up/setup-dev-env.md index 4003479ba..1ce6b3c3d 100644 --- a/docs/mrtk3-overview/getting-started/setting-up/setup-dev-env.md +++ b/docs/mrtk3-overview/getting-started/setting-up/setup-dev-env.md @@ -10,7 +10,7 @@ Before setting up a Unity Project with MRTK3, make sure you have the following s | Software | Version | Notes | | --- | --- | --- | -| Unity | 2022.3 LTS or newer | Recommend using an LTS release
See [Additional tools](#additional-tools) below for recommended modules | +| Unity | 6.0 LTS or newer | Recommend using an LTS release
See [Additional tools](#additional-tools) below for recommended modules | ## Additional tools diff --git a/org.mixedrealitytoolkit.core/AssemblyInfo.cs b/org.mixedrealitytoolkit.core/AssemblyInfo.cs index d1d4b962f..b03153c93 100644 --- a/org.mixedrealitytoolkit.core/AssemblyInfo.cs +++ b/org.mixedrealitytoolkit.core/AssemblyInfo.cs @@ -13,4 +13,4 @@ // The AssemblyVersion attribute is checked-in and is recommended not to be changed often. // https://docs.microsoft.com/troubleshoot/visualstudio/general/assembly-version-assembly-file-version // AssemblyFileVersion and AssemblyInformationalVersion are added by pack-upm.ps1 to match the current MRTK build version. -[assembly: AssemblyVersion("3.0.0.0")] +[assembly: AssemblyVersion("4.0.0.0")] diff --git a/org.mixedrealitytoolkit.core/CHANGELOG.md b/org.mixedrealitytoolkit.core/CHANGELOG.md index 8e8c3c41d..e5fe1ca6c 100644 --- a/org.mixedrealitytoolkit.core/CHANGELOG.md +++ b/org.mixedrealitytoolkit.core/CHANGELOG.md @@ -4,25 +4,85 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/). ## Unreleased +### Added + +* Added new `editorDefault` field for debugging the various `DisplayType`s in-editor. [PR #1130](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1130) +* Added edit mode tests for `AssemblyExtensions`, `SystemType`, and `SerializableDictionary`. [PR #1122](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1122) + ### Changed -* Updated code style in `HandsSubsystemDescriptor`, `MRTKSubsystemDescriptor`, `DictationSubsystemDescriptor`, and `XRSubsystemHelpers`. [PR #1109](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1109) * Updated `PackageValidator` to only be valid if `UNITY_EDITOR` is true. [PR #1125](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1125) * `AssemblyExtensions.GetLoadableTypes` now throws `ArgumentNullException` when called on a null assembly instead of `NullReferenceException`. [PR #1122](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1122) * Updated `MRTKBaseInteractable` to follow MRTK style. [PR #1073](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1073) +## [4.0.0-pre.3] - 2026-05-20 + ### Added -* Added edit mode tests for `AssemblyExtensions`, `SystemType`, and `SerializableDictionary`. [PR #1122](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1122) +* Added `AllowGenericTypeDefinition` to `SystemType` to allow for generics. [PR #1119](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1119) + +### Changed + +* Updated the minimum editor version to 6000.0.66f2 [PR #1112](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1112) +* Updated code style in `HandsSubsystemDescriptor`, `MRTKSubsystemDescriptor`, `DictationSubsystemDescriptor`, and `XRSubsystemHelpers`. [PR #1109](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1109) +* Updated `ReserializeUtility` to remove unused prefab overrides. [PR #1126](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1126) ### Fixed * Fixed "The type `MixedReality.Toolkit.Core MixedReality.Toolkit.Experimental.BubbleChildHoverEvents/TrickleChildHoverEvents/BubbleChildSelectEvents/TrickleChildSelectEvents` is being serialized by `[SerializeReference]`, but is missing the `[Serializable]` attribute." on Unity 6.3. [PR #1107](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1107) -## Deprecated +### Deprecated * Deprecated `AdjustTrackingOrigin` on `CameraSettings`. This functionality has been deprecated by the XR Origin component. This property has never had an effect in MRTK3 and will be removed in a future release. [PR #1110](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1110) +### Removed + +* Removed input action focus handling from `MRTKLifecycleManager` and moved to the Input package. [PR #1057](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1057) + +## [4.0.0-pre.2] - 2025-12-05 + +### Added + +* Added input action focus handling to disable controller/hand tracked state when the application goes out of focus. [PR #1039](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1039) +* Added ToInteractorHandedness extension for XRNode. [PR #1042](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1042) + +### Changed + +* Updated the MRTK Default Profile to use the Unity XR Hands subsystem by default instead of the Microsoft OpenXR Plugin subsystem. [PR #973](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/973) +* Updated the minimum editor version to 2022.3.6f1 [PR #1003](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1003) + +### Removed + +* Removed ITrackedInteractor, as it was supporting an unused codepath and there are better ways to get this data (like querying the attach transform). [PR #1044](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1044) + +### Deprecated + +* Deprecated IHandedInteractor, as its info is now queryable directly from IXRInteractor's handedness property. [PR #1042](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1042) +* Deprecated FindObjectUtility, as it was a backwards-compatibility layer for pre-2021.3.18. Since our min version is now 2022.3, we can just call the API directly. [PR #1058](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1058) + +## [4.0.0-pre.1] - 2024-07-09 + +### Added + +* Added ITrackedInteractor to represent interactor with parent pose backed by a tracked input device. + +### Changed + +* Updated package com.unity.xr.interaction.toolkit to 3.0.4 +* Updated InteractorHandednessExtensions. + +### Removed + +* Removed obsolete HandednessExtensions::IsRight method. +* Removed obsolete HandednessExtensions::IsLeft method. +* Removed obsolete HandsUtils::GetSubsystem method. +* Removed obsolete PlayspaceUtilities.ReferenceTransform field. +* Removed obsolete XRSubsystemHelpers::GetAllRunningSubsystemsNonAlloc method. + +### Deprecated + +* ControllerLookup marked as Obsolete. + ## [3.3.0] - 2025-11-12 ### Changed diff --git a/org.mixedrealitytoolkit.core/Camera/CameraSettingsManager.cs b/org.mixedrealitytoolkit.core/Camera/CameraSettingsManager.cs index a4b0d5c90..24d650372 100644 --- a/org.mixedrealitytoolkit.core/Camera/CameraSettingsManager.cs +++ b/org.mixedrealitytoolkit.core/Camera/CameraSettingsManager.cs @@ -12,7 +12,10 @@ namespace MixedReality.Toolkit [AddComponentMenu("MRTK/Core/Camera Settings Manager")] public class CameraSettingsManager : MonoBehaviour { - [SerializeField] + [SerializeField, Tooltip("The default display type in the editor.")] + private DisplayType editorDefault = DisplayType.Transparent; + + [SerializeField, Tooltip("The settings to apply when the display is opaque (VR).")] private CameraSettings opaqueDisplay = new CameraSettings(DisplayType.Opaque); /// @@ -24,7 +27,7 @@ public CameraSettings OpaqueDisplay set => opaqueDisplay = value; } - [SerializeField] + [SerializeField, Tooltip("The settings to apply when the display is transparent (AR).")] private CameraSettings transparentDisplay = new CameraSettings(DisplayType.Transparent); /// @@ -81,7 +84,7 @@ private void UpdateCameraSettings(DisplayType type) { using (UpdateCameraSettingsPerfMarker.Auto()) { - UnityEngine.Camera mainCamera = Camera.main; + Camera mainCamera = Camera.main; switch (type) { @@ -133,7 +136,7 @@ private DisplayType GetDisplayType() { using (GetDisplayTypePerfMarker.Auto()) { - if (XRSubsystemHelpers.DisplaySubsystem == null) { return DisplayType.Unknown; } + if (XRSubsystemHelpers.DisplaySubsystem == null) { return Application.isEditor ? editorDefault : DisplayType.Unknown; } return XRSubsystemHelpers.DisplaySubsystem.displayOpaque ? DisplayType.Opaque : DisplayType.Transparent; } } diff --git a/org.mixedrealitytoolkit.core/Configuration/Default Profiles/MRTKProfile.asset b/org.mixedrealitytoolkit.core/Configuration/Default Profiles/MRTKProfile.asset index 17273cf9d..901c5ed82 100644 --- a/org.mixedrealitytoolkit.core/Configuration/Default Profiles/MRTKProfile.asset +++ b/org.mixedrealitytoolkit.core/Configuration/Default Profiles/MRTKProfile.asset @@ -14,18 +14,15 @@ MonoBehaviour: m_EditorClassIdentifier: isCustomProfile: 0 loadedSubsystems: - - reference: MixedReality.Toolkit.Speech.Windows.WindowsDictationSubsystem, - MixedReality.Toolkit.Speech.Windows + - reference: MixedReality.Toolkit.Speech.Windows.WindowsDictationSubsystem, MixedReality.Toolkit.Speech.Windows - reference: MixedReality.Toolkit.Speech.Windows.WindowsKeywordRecognitionSubsystem, MixedReality.Toolkit.Speech.Windows - reference: MixedReality.Toolkit.Speech.Windows.WindowsTextToSpeechSubsystem, MixedReality.Toolkit.Speech.Windows - - reference: MixedReality.Toolkit.Accessibility.MRTKAccessibilitySubsystem, - MixedReality.Toolkit.Accessibility - - reference: MixedReality.Toolkit.Input.OpenXRHandsSubsystem, MixedReality.Toolkit.Input + - reference: MixedReality.Toolkit.Accessibility.MRTKAccessibilitySubsystem, MixedReality.Toolkit.Accessibility - reference: MixedReality.Toolkit.Input.SyntheticHandsSubsystem, MixedReality.Toolkit.Input - - reference: MixedReality.Toolkit.Input.MRTKHandsAggregatorSubsystem, - MixedReality.Toolkit.Input + - reference: MixedReality.Toolkit.Input.MRTKHandsAggregatorSubsystem, MixedReality.Toolkit.Input + - reference: MixedReality.Toolkit.Input.UnityHandsSubsystem, MixedReality.Toolkit.Input subsystemConfigs: entries: - key: @@ -45,11 +42,8 @@ MonoBehaviour: MixedReality.Toolkit.Accessibility value: {fileID: 11400000, guid: 3aa94a99d7ce5e845a6a78409e004670, type: 2} - key: - reference: MixedReality.Toolkit.Input.SyntheticHandsSubsystem, - MixedReality.Toolkit.Input + reference: MixedReality.Toolkit.Input.SyntheticHandsSubsystem, MixedReality.Toolkit.Input value: {fileID: 11400000, guid: c45788af2ca823a4a904bf8762ff126d, type: 2} - key: - reference: MixedReality.Toolkit.Input.MRTKHandsAggregatorSubsystem, - MixedReality.Toolkit.Input + reference: MixedReality.Toolkit.Input.MRTKHandsAggregatorSubsystem, MixedReality.Toolkit.Input value: {fileID: 11400000, guid: b8da41358d218754494ea49599e7b0fb, type: 2} - k__BackingField: {fileID: 0} diff --git a/org.mixedrealitytoolkit.core/Editor/AssemblyInfo.cs b/org.mixedrealitytoolkit.core/Editor/AssemblyInfo.cs index 297f60330..3729031cb 100644 --- a/org.mixedrealitytoolkit.core/Editor/AssemblyInfo.cs +++ b/org.mixedrealitytoolkit.core/Editor/AssemblyInfo.cs @@ -12,4 +12,4 @@ // The AssemblyVersion attribute is checked-in and is recommended not to be changed often. // https://docs.microsoft.com/troubleshoot/visualstudio/general/assembly-version-assembly-file-version // AssemblyFileVersion and AssemblyInformationalVersion are added by pack-upm.ps1 to match the current MRTK build version. -[assembly: AssemblyVersion("3.0.0.0")] +[assembly: AssemblyVersion("4.0.0.0")] diff --git a/org.mixedrealitytoolkit.core/Editor/EditorProjectUtilities.cs b/org.mixedrealitytoolkit.core/Editor/EditorProjectUtilities.cs index fd2dcee85..98508b508 100644 --- a/org.mixedrealitytoolkit.core/Editor/EditorProjectUtilities.cs +++ b/org.mixedrealitytoolkit.core/Editor/EditorProjectUtilities.cs @@ -37,10 +37,10 @@ static EditorProjectUtilities() /// public static void CheckMinimumEditorVersion() { -#if !UNITY_2021_3_OR_NEWER +#if !UNITY_2022_3_OR_NEWER if (!EditorUtility.DisplayDialog( "Mixed Reality Toolkit", - "The Mixed Reality Toolkit requires Unity 2021.3 or newer.\n\nUsing an older version of Unity may result in compile-time errors or incorrect behavior.", + "The Mixed Reality Toolkit requires Unity 2022.3 or newer.\n\nUsing an older version of Unity may result in compile-time errors or incorrect behavior.", "Continue", "Close Editor")) { EditorApplication.Exit(0); diff --git a/org.mixedrealitytoolkit.core/Editor/Editors/BaseInteractableEditor.cs b/org.mixedrealitytoolkit.core/Editor/Editors/BaseInteractableEditor.cs index 4fa28a276..f88b9e4ca 100644 --- a/org.mixedrealitytoolkit.core/Editor/Editors/BaseInteractableEditor.cs +++ b/org.mixedrealitytoolkit.core/Editor/Editors/BaseInteractableEditor.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using UnityEditor; -using UnityEditor.XR.Interaction.Toolkit; +using UnityEditor.XR.Interaction.Toolkit.Interactables; using UnityEngine; namespace MixedReality.Toolkit.Editor diff --git a/org.mixedrealitytoolkit.core/Editor/MRTKPreserveSettings.cs b/org.mixedrealitytoolkit.core/Editor/MRTKPreserveSettings.cs index 3b100dc4a..9cf272729 100644 --- a/org.mixedrealitytoolkit.core/Editor/MRTKPreserveSettings.cs +++ b/org.mixedrealitytoolkit.core/Editor/MRTKPreserveSettings.cs @@ -74,10 +74,5 @@ string IUnityLinkerProcessor.GenerateAdditionalLinkXmlFile(BuildReport report, U } private static string FormatForXml(string value) => value.Replace('+', '/').Replace("&", "&").Replace("<", "<").Replace(">", ">"); - -#if !UNITY_2021_2_OR_NEWER - void IUnityLinkerProcessor.OnAfterRun(BuildReport report, UnityLinkerBuildPipelineData data) { } - void IUnityLinkerProcessor.OnBeforeRun(BuildReport report, UnityLinkerBuildPipelineData data) { } -#endif // !UNITY_2021_2_OR_NEWER } } diff --git a/org.mixedrealitytoolkit.core/Editor/PropertyDrawers/DrawIfPropertyDrawer.cs b/org.mixedrealitytoolkit.core/Editor/PropertyDrawers/DrawIfPropertyDrawer.cs index 2649c0b09..b6032a84e 100644 --- a/org.mixedrealitytoolkit.core/Editor/PropertyDrawers/DrawIfPropertyDrawer.cs +++ b/org.mixedrealitytoolkit.core/Editor/PropertyDrawers/DrawIfPropertyDrawer.cs @@ -30,12 +30,7 @@ public override void OnGUI(Rect position, SerializedProperty property, GUIConten /// public override float GetPropertyHeight(SerializedProperty property, GUIContent label) { - if (!ShouldShow(property)) - { - return 0f; - } - - return base.GetPropertyHeight(property, label); + return ShouldShow(property) ? base.GetPropertyHeight(property, label) : 0f; } private bool ShouldShow(SerializedProperty property) @@ -43,9 +38,7 @@ private bool ShouldShow(SerializedProperty property) DrawIfAttribute drawIf = attribute as DrawIfAttribute; if (drawIf == null) { return true; } - string path = drawIf.ComparedPropertyName; - - SerializedProperty propertyToCheck = property.serializedObject.FindProperty(path); + SerializedProperty propertyToCheck = property.serializedObject.FindProperty(drawIf.ComparedPropertyName); if (propertyToCheck == null) { Debug.LogError($"DrawIfAttribute couldn't find the SerializedProperty to compare against! (property name: {drawIf.ComparedPropertyName})"); diff --git a/org.mixedrealitytoolkit.core/Editor/Utilities/InspectorUIUtility.cs b/org.mixedrealitytoolkit.core/Editor/Utilities/InspectorUIUtility.cs index 26055d3c1..09bbc81da 100644 --- a/org.mixedrealitytoolkit.core/Editor/Utilities/InspectorUIUtility.cs +++ b/org.mixedrealitytoolkit.core/Editor/Utilities/InspectorUIUtility.cs @@ -357,10 +357,9 @@ public static bool RenderIndentedButton(GUIContent content, GUIStyle style, para /// if button clicked, if otherwise. public static bool RenderIndentedButton(Func renderButton) { - bool result = false; GUILayout.BeginHorizontal(); GUILayout.Space(EditorGUI.indentLevel * 15); - result = renderButton(); + bool result = renderButton(); GUILayout.EndHorizontal(); return result; } @@ -951,11 +950,7 @@ public static float AxisMoveHandle(Object target, Vector3 origin, Vector3 direct Handles.DrawDottedLine(origin, position, DottedLineScreenSpace); Handles.ArrowHandleCap(0, position, Quaternion.LookRotation(direction), handleSize * 2, EventType.Repaint); -#if UNITY_2022_1_OR_NEWER Vector3 newPosition = Handles.FreeMoveHandle(position, handleSize, Vector3.zero, Handles.CircleHandleCap); -#else - Vector3 newPosition = Handles.FreeMoveHandle(position, Quaternion.identity, handleSize, Vector3.zero, Handles.CircleHandleCap); -#endif if (recordUndo) { @@ -992,11 +987,7 @@ public static Vector3 CircleMoveHandle(Object target, Vector3 position, float xS handleSize = Mathf.Lerp(handleSize, HandleUtility.GetHandleSize(position) * handleSize, 0.75f); } -#if UNITY_2022_1_OR_NEWER Vector3 newPosition = Handles.FreeMoveHandle(position, handleSize, Vector3.zero, Handles.CircleHandleCap); -#else - Vector3 newPosition = Handles.FreeMoveHandle(position, Quaternion.identity, handleSize, Vector3.zero, Handles.CircleHandleCap); -#endif if (recordUndo && position != newPosition) { @@ -1032,11 +1023,7 @@ public static Vector3 SquareMoveHandle(Object target, Vector3 position, float xS } // Multiply square handle to match other types -#if UNITY_2022_1_OR_NEWER Vector3 newPosition = Handles.FreeMoveHandle(position, handleSize * 0.8f, Vector3.zero, Handles.RectangleHandleCap); -#else - Vector3 newPosition = Handles.FreeMoveHandle(position, Quaternion.identity, handleSize * 0.8f, Vector3.zero, Handles.RectangleHandleCap); -#endif if (recordUndo && position != newPosition) { @@ -1072,11 +1059,7 @@ public static Vector3 SphereMoveHandle(Object target, Vector3 position, float xS } // Multiply sphere handle size to match other types -#if UNITY_2022_1_OR_NEWER Vector3 newPosition = Handles.FreeMoveHandle(position, handleSize * 2, Vector3.zero, Handles.SphereHandleCap); -#else - Vector3 newPosition = Handles.FreeMoveHandle(position, Quaternion.identity, handleSize * 2, Vector3.zero, Handles.SphereHandleCap); -#endif if (recordUndo && position != newPosition) { @@ -1146,12 +1129,7 @@ public static Vector3 VectorHandle( // Draw a line from origin to origin + direction Handles.DrawLine(origin, handlePosition); - -#if UNITY_2022_1_OR_NEWER Vector3 newPosition = Handles.FreeMoveHandle(handlePosition, handleSize, Vector3.zero, Handles.DotHandleCap); -#else - Vector3 newPosition = Handles.FreeMoveHandle(handlePosition, Quaternion.identity, handleSize, Vector3.zero, Handles.DotHandleCap); -#endif if (recordUndo && handlePosition != newPosition) { diff --git a/org.mixedrealitytoolkit.core/Editor/Utilities/ReserializeAssetsUtility.cs b/org.mixedrealitytoolkit.core/Editor/Utilities/ReserializeAssetsUtility.cs index 327bb16f8..72c85bb42 100644 --- a/org.mixedrealitytoolkit.core/Editor/Utilities/ReserializeAssetsUtility.cs +++ b/org.mixedrealitytoolkit.core/Editor/Utilities/ReserializeAssetsUtility.cs @@ -49,16 +49,32 @@ public static void ReserializeSelection() { Object[] selectedAssets = Selection.GetFiltered(typeof(Object), SelectionMode.DeepAssets); - // Transform asset object to asset paths. + // Transform asset object to asset paths and GameObjects. List assetsPath = new List(); + List assetsGameObjects = new List(); foreach (Object asset in selectedAssets) { assetsPath.Add(AssetDatabase.GetAssetPath(asset)); + if (asset is GameObject rootGo) + { + Transform[] children = rootGo.GetComponentsInChildren(true); + foreach (Transform child in children) + { + if (PrefabUtility.IsAnyPrefabInstanceRoot(child.gameObject)) + { + assetsGameObjects.Add(child.gameObject); + } + } + } } string[] array = assetsPath.ToArray(); AssetDatabase.ForceReserializeAssets(array); - Debug.Log($"Reserialized {array.Length} assets."); + if (assetsGameObjects.Count > 0) + { + PrefabUtility.RemoveUnusedOverrides(assetsGameObjects.ToArray(), InteractionMode.UserAction); + } + Debug.Log($"Reserialized {array.Length} assets. ({assetsGameObjects.Count} prefab instances had unused overrides removed)"); } private static string[] GetAssets(string filter) diff --git a/org.mixedrealitytoolkit.core/Experimental/Interactables/InteractableEventRouter.cs b/org.mixedrealitytoolkit.core/Experimental/Interactables/InteractableEventRouter.cs index 6de66d2b2..4bb12a15c 100644 --- a/org.mixedrealitytoolkit.core/Experimental/Interactables/InteractableEventRouter.cs +++ b/org.mixedrealitytoolkit.core/Experimental/Interactables/InteractableEventRouter.cs @@ -5,7 +5,7 @@ using System.Collections.Generic; using UnityEngine; using UnityEngine.XR.Interaction.Toolkit; - +using UnityEngine.XR.Interaction.Toolkit.Interactables; namespace MixedReality.Toolkit.Experimental { diff --git a/org.mixedrealitytoolkit.core/Interactables/IScrollable.cs b/org.mixedrealitytoolkit.core/Interactables/IScrollable.cs index a044153cd..76d963685 100644 --- a/org.mixedrealitytoolkit.core/Interactables/IScrollable.cs +++ b/org.mixedrealitytoolkit.core/Interactables/IScrollable.cs @@ -2,7 +2,8 @@ // Licensed under the BSD 3-Clause using UnityEngine; -using UnityEngine.XR.Interaction.Toolkit; +using UnityEngine.XR.Interaction.Toolkit.Interactables; +using UnityEngine.XR.Interaction.Toolkit.Interactors; namespace MixedReality.Toolkit { diff --git a/org.mixedrealitytoolkit.core/Interactables/MRTKBaseInteractable.cs b/org.mixedrealitytoolkit.core/Interactables/MRTKBaseInteractable.cs index 73cacb613..c5e953598 100644 --- a/org.mixedrealitytoolkit.core/Interactables/MRTKBaseInteractable.cs +++ b/org.mixedrealitytoolkit.core/Interactables/MRTKBaseInteractable.cs @@ -6,6 +6,8 @@ using UnityEngine; using UnityEngine.Serialization; using UnityEngine.XR.Interaction.Toolkit; +using UnityEngine.XR.Interaction.Toolkit.Interactables; +using UnityEngine.XR.Interaction.Toolkit.Interactors; namespace MixedReality.Toolkit { diff --git a/org.mixedrealitytoolkit.core/Interactables/StatefulInteractable.cs b/org.mixedrealitytoolkit.core/Interactables/StatefulInteractable.cs index ab5bbdb7b..8019f5502 100644 --- a/org.mixedrealitytoolkit.core/Interactables/StatefulInteractable.cs +++ b/org.mixedrealitytoolkit.core/Interactables/StatefulInteractable.cs @@ -7,6 +7,8 @@ using UnityEngine.Events; using UnityEngine.Serialization; using UnityEngine.XR.Interaction.Toolkit; +using UnityEngine.XR.Interaction.Toolkit.Interactables; +using UnityEngine.XR.Interaction.Toolkit.Interactors; namespace MixedReality.Toolkit { diff --git a/org.mixedrealitytoolkit.core/Interactors/IGazeInteractor.cs b/org.mixedrealitytoolkit.core/Interactors/IGazeInteractor.cs index 2e27d2738..305e069ad 100644 --- a/org.mixedrealitytoolkit.core/Interactors/IGazeInteractor.cs +++ b/org.mixedrealitytoolkit.core/Interactors/IGazeInteractor.cs @@ -1,7 +1,7 @@ // Copyright (c) Mixed Reality Toolkit Contributors // Licensed under the BSD 3-Clause -using UnityEngine.XR.Interaction.Toolkit; +using UnityEngine.XR.Interaction.Toolkit.Interactors; namespace MixedReality.Toolkit { @@ -15,4 +15,4 @@ public interface IGazeInteractor : IXRInteractor { } -} \ No newline at end of file +} diff --git a/org.mixedrealitytoolkit.core/Interactors/IGrabInteractor.cs b/org.mixedrealitytoolkit.core/Interactors/IGrabInteractor.cs index e67de6083..80f141b54 100644 --- a/org.mixedrealitytoolkit.core/Interactors/IGrabInteractor.cs +++ b/org.mixedrealitytoolkit.core/Interactors/IGrabInteractor.cs @@ -1,7 +1,7 @@ // Copyright (c) Mixed Reality Toolkit Contributors // Licensed under the BSD 3-Clause -using UnityEngine.XR.Interaction.Toolkit; +using UnityEngine.XR.Interaction.Toolkit.Interactors; namespace MixedReality.Toolkit { @@ -15,4 +15,4 @@ public interface IGrabInteractor : IXRInteractor { } -} \ No newline at end of file +} diff --git a/org.mixedrealitytoolkit.core/Interactors/IHandedInteractor.cs b/org.mixedrealitytoolkit.core/Interactors/IHandedInteractor.cs index 3422c2788..a50317286 100644 --- a/org.mixedrealitytoolkit.core/Interactors/IHandedInteractor.cs +++ b/org.mixedrealitytoolkit.core/Interactors/IHandedInteractor.cs @@ -1,18 +1,21 @@ // Copyright (c) Mixed Reality Toolkit Contributors // Licensed under the BSD 3-Clause -using UnityEngine.XR.Interaction.Toolkit; +using System; +using UnityEngine.XR.Interaction.Toolkit.Interactors; namespace MixedReality.Toolkit { /// /// An interface that all interactors with the concept of handedness implement. /// + [Obsolete("Use handedness from IXRInteractor instead.")] public interface IHandedInteractor : IXRInteractor { /// /// Returns the Handedness of this interactor. /// + [Obsolete("Use handedness from IXRInteractor instead.")] public Handedness Handedness { get; } } } diff --git a/org.mixedrealitytoolkit.core/Interactors/IModeManagedInteractor.cs b/org.mixedrealitytoolkit.core/Interactors/IModeManagedInteractor.cs index 9820ff008..da6fb5d0a 100644 --- a/org.mixedrealitytoolkit.core/Interactors/IModeManagedInteractor.cs +++ b/org.mixedrealitytoolkit.core/Interactors/IModeManagedInteractor.cs @@ -1,8 +1,7 @@ // Copyright (c) Mixed Reality Toolkit Contributors // Licensed under the BSD 3-Clause -using System.Collections; -using System.Collections.Generic; +using System; using UnityEngine; namespace MixedReality.Toolkit @@ -17,6 +16,13 @@ public interface IModeManagedInteractor /// Returns the GameObject that this interactor belongs to. This GameObject is governed by the /// interaction mode manager and is assigned an interaction mode. This GameObject represents the 'controller' that this interactor belongs to. /// + [Obsolete("This function has been deprecated in version 4.0.0 and will be removed in the next major release. Use ModeManagedRoot instead.")] public GameObject GetModeManagedController(); + + /// + /// Returns the root management GameObject that interactor belongs to. This GameObject is governed by the + /// interaction mode manager and is assigned an interaction mode. + /// + public GameObject ModeManagedRoot { get; } } } diff --git a/org.mixedrealitytoolkit.core/Interactors/IPokeInteractor.cs b/org.mixedrealitytoolkit.core/Interactors/IPokeInteractor.cs index d485ec799..327c82ef8 100644 --- a/org.mixedrealitytoolkit.core/Interactors/IPokeInteractor.cs +++ b/org.mixedrealitytoolkit.core/Interactors/IPokeInteractor.cs @@ -2,7 +2,7 @@ // Licensed under the BSD 3-Clause using UnityEngine; -using UnityEngine.XR.Interaction.Toolkit; +using UnityEngine.XR.Interaction.Toolkit.Interactors; namespace MixedReality.Toolkit { diff --git a/org.mixedrealitytoolkit.core/Interactors/IProxyInteractor.cs b/org.mixedrealitytoolkit.core/Interactors/IProxyInteractor.cs index cb3011e6d..e23da9f4f 100644 --- a/org.mixedrealitytoolkit.core/Interactors/IProxyInteractor.cs +++ b/org.mixedrealitytoolkit.core/Interactors/IProxyInteractor.cs @@ -2,7 +2,8 @@ // Licensed under the BSD 3-Clause using UnityEngine; -using UnityEngine.XR.Interaction.Toolkit; +using UnityEngine.XR.Interaction.Toolkit.Interactors; +using UnityEngine.XR.Interaction.Toolkit.Interactables; namespace MixedReality.Toolkit { diff --git a/org.mixedrealitytoolkit.core/Interactors/IRayInteractor.cs b/org.mixedrealitytoolkit.core/Interactors/IRayInteractor.cs index 5beded005..fccb98e30 100644 --- a/org.mixedrealitytoolkit.core/Interactors/IRayInteractor.cs +++ b/org.mixedrealitytoolkit.core/Interactors/IRayInteractor.cs @@ -1,7 +1,7 @@ // Copyright (c) Mixed Reality Toolkit Contributors // Licensed under the BSD 3-Clause -using UnityEngine.XR.Interaction.Toolkit; +using UnityEngine.XR.Interaction.Toolkit.Interactors; namespace MixedReality.Toolkit { @@ -14,4 +14,4 @@ namespace MixedReality.Toolkit public interface IRayInteractor : IXRInteractor { } -} \ No newline at end of file +} diff --git a/org.mixedrealitytoolkit.core/Interactors/IReticleVisual.cs b/org.mixedrealitytoolkit.core/Interactors/IReticleVisual.cs index dfda23223..4aec7613e 100644 --- a/org.mixedrealitytoolkit.core/Interactors/IReticleVisual.cs +++ b/org.mixedrealitytoolkit.core/Interactors/IReticleVisual.cs @@ -2,7 +2,7 @@ // Licensed under the BSD 3-Clause using UnityEngine; -using UnityEngine.XR.Interaction.Toolkit; +using UnityEngine.XR.Interaction.Toolkit.Interactors; namespace MixedReality.Toolkit { diff --git a/org.mixedrealitytoolkit.core/Interactors/ISpeechInteractor.cs b/org.mixedrealitytoolkit.core/Interactors/ISpeechInteractor.cs index 5d069bf0f..5c2310d3c 100644 --- a/org.mixedrealitytoolkit.core/Interactors/ISpeechInteractor.cs +++ b/org.mixedrealitytoolkit.core/Interactors/ISpeechInteractor.cs @@ -1,7 +1,7 @@ // Copyright (c) Mixed Reality Toolkit Contributors // Licensed under the BSD 3-Clause -using UnityEngine.XR.Interaction.Toolkit; +using UnityEngine.XR.Interaction.Toolkit.Interactors; namespace MixedReality.Toolkit { @@ -12,4 +12,4 @@ public interface ISpeechInteractor : IXRInteractor { } -} \ No newline at end of file +} diff --git a/org.mixedrealitytoolkit.core/Interactors/IVariableSelectInteractor.cs b/org.mixedrealitytoolkit.core/Interactors/IVariableSelectInteractor.cs index a351556df..134ecaae7 100644 --- a/org.mixedrealitytoolkit.core/Interactors/IVariableSelectInteractor.cs +++ b/org.mixedrealitytoolkit.core/Interactors/IVariableSelectInteractor.cs @@ -1,7 +1,7 @@ // Copyright (c) Mixed Reality Toolkit Contributors // Licensed under the BSD 3-Clause -using UnityEngine.XR.Interaction.Toolkit; +using UnityEngine.XR.Interaction.Toolkit.Interactors; namespace MixedReality.Toolkit { @@ -21,4 +21,4 @@ public interface IVariableSelectInteractor : IXRSelectInteractor, IXRHoverIntera /// float SelectProgress { get; } } -} \ No newline at end of file +} diff --git a/org.mixedrealitytoolkit.core/MRTK.Core.asmdef b/org.mixedrealitytoolkit.core/MRTK.Core.asmdef index a37735c11..3e56815ef 100644 --- a/org.mixedrealitytoolkit.core/MRTK.Core.asmdef +++ b/org.mixedrealitytoolkit.core/MRTK.Core.asmdef @@ -4,7 +4,8 @@ "references": [ "Unity.XR.CoreUtils", "Unity.XR.Interaction.Toolkit", - "Unity.XR.Management" + "Unity.XR.Management", + "Unity.InputSystem" ], "includePlatforms": [], "excludePlatforms": [], @@ -13,12 +14,6 @@ "precompiledReferences": [], "autoReferenced": true, "defineConstraints": [], - "versionDefines": [ - { - "name": "Unity", - "expression": "2021.3.18", - "define": "UNITY_2021_3_18_OR_NEWER" - } - ], + "versionDefines": [], "noEngineReferences": false } \ No newline at end of file diff --git a/org.mixedrealitytoolkit.core/Subsystems/MRTKLifecycleManager.cs b/org.mixedrealitytoolkit.core/Subsystems/MRTKLifecycleManager.cs index 7c54bd5b7..5f1934445 100644 --- a/org.mixedrealitytoolkit.core/Subsystems/MRTKLifecycleManager.cs +++ b/org.mixedrealitytoolkit.core/Subsystems/MRTKLifecycleManager.cs @@ -23,7 +23,7 @@ public class MRTKLifecycleManager : /// /// The list of objects being managed by this class. /// - protected List ManagedSubsystems + protected List ManagedSubsystems { get => managedSubsystems; set => managedSubsystems = value; @@ -111,7 +111,7 @@ private void OnDisable() /// /// A Unity event function that is called when the script component has been enabled. - /// + /// private void OnEnable() { using (OnEnableProfilerMarker.Auto()) diff --git a/org.mixedrealitytoolkit.core/Tests/Editor/AssemblyInfo.cs b/org.mixedrealitytoolkit.core/Tests/Editor/AssemblyInfo.cs index d7b56325a..53ecbfa2e 100644 --- a/org.mixedrealitytoolkit.core/Tests/Editor/AssemblyInfo.cs +++ b/org.mixedrealitytoolkit.core/Tests/Editor/AssemblyInfo.cs @@ -9,4 +9,4 @@ // The AssemblyVersion attribute is checked-in and is recommended not to be changed often. // https://docs.microsoft.com/troubleshoot/visualstudio/general/assembly-version-assembly-file-version // AssemblyFileVersion and AssemblyInformationalVersion are added by pack-upm.ps1 to match the current MRTK build version. -[assembly: AssemblyVersion("3.0.0.0")] +[assembly: AssemblyVersion("4.0.0.0")] diff --git a/org.mixedrealitytoolkit.core/Tests/Runtime/AssemblyInfo.cs b/org.mixedrealitytoolkit.core/Tests/Runtime/AssemblyInfo.cs index 5fec164eb..e51194cff 100644 --- a/org.mixedrealitytoolkit.core/Tests/Runtime/AssemblyInfo.cs +++ b/org.mixedrealitytoolkit.core/Tests/Runtime/AssemblyInfo.cs @@ -9,4 +9,4 @@ // The AssemblyVersion attribute is checked-in and is recommended not to be changed often. // https://docs.microsoft.com/troubleshoot/visualstudio/general/assembly-version-assembly-file-version // AssemblyFileVersion and AssemblyInformationalVersion are added by pack-upm.ps1 to match the current MRTK build version. -[assembly: AssemblyVersion("3.0.0.0")] +[assembly: AssemblyVersion("4.0.0.0")] diff --git a/org.mixedrealitytoolkit.core/Tests/Runtime/InteractableEventRouterTests.cs b/org.mixedrealitytoolkit.core/Tests/Runtime/InteractableEventRouterTests.cs index b9d937b4d..be2b4ad72 100644 --- a/org.mixedrealitytoolkit.core/Tests/Runtime/InteractableEventRouterTests.cs +++ b/org.mixedrealitytoolkit.core/Tests/Runtime/InteractableEventRouterTests.cs @@ -11,6 +11,7 @@ using UnityEngine; using UnityEngine.TestTools; using UnityEngine.XR.Interaction.Toolkit; +using UnityEngine.XR.Interaction.Toolkit.Interactors; namespace MixedReality.Toolkit.UX.Runtime.Tests { @@ -47,7 +48,7 @@ private XRInteractionManager CachedInteractionManager { if (cachedInteractionManager == null) { - cachedInteractionManager = FindObjectUtility.FindAnyObjectByType(); + cachedInteractionManager = Object.FindAnyObjectByType(); } return cachedInteractionManager; } @@ -364,7 +365,6 @@ private void CreateTestObjectsWithEventRouter() level2 = new GameObject("level 2"); // Setup interactor - interactorObject.AddComponent(); interactor = interactorObject.AddComponent(); interactorObject.transform.SetParent(level0.transform, worldPositionStays: true); diff --git a/org.mixedrealitytoolkit.core/Tests/TestUtilities/AssemblyInfo.cs b/org.mixedrealitytoolkit.core/Tests/TestUtilities/AssemblyInfo.cs index d348366d0..b0cba2872 100644 --- a/org.mixedrealitytoolkit.core/Tests/TestUtilities/AssemblyInfo.cs +++ b/org.mixedrealitytoolkit.core/Tests/TestUtilities/AssemblyInfo.cs @@ -9,4 +9,4 @@ // The AssemblyVersion attribute is checked-in and is recommended not to be changed often. // https://docs.microsoft.com/troubleshoot/visualstudio/general/assembly-version-assembly-file-version // AssemblyFileVersion and AssemblyInformationalVersion are added by pack-upm.ps1 to match the current MRTK build version. -[assembly: AssemblyVersion("3.0.0.0")] +[assembly: AssemblyVersion("4.0.0.0")] diff --git a/org.mixedrealitytoolkit.core/Utilities/Attributes/ExtendsAttribute.cs b/org.mixedrealitytoolkit.core/Utilities/Attributes/ExtendsAttribute.cs index 619c65376..2a9149b06 100644 --- a/org.mixedrealitytoolkit.core/Utilities/Attributes/ExtendsAttribute.cs +++ b/org.mixedrealitytoolkit.core/Utilities/Attributes/ExtendsAttribute.cs @@ -30,8 +30,9 @@ public ExtendsAttribute(Type baseType, TypeGrouping grouping) : base(baseType, g public override bool IsConstraintSatisfied(Type type) { return base.IsConstraintSatisfied(type) && - BaseType.IsAssignableFrom(type) && + (BaseType.IsAssignableFrom(type) || + (AllowGenericTypeDefinition && type.BaseType != null && type.BaseType.IsGenericType && BaseType.Equals(type.BaseType.GetGenericTypeDefinition()))) && type != BaseType; } } -} \ No newline at end of file +} diff --git a/org.mixedrealitytoolkit.core/Utilities/Attributes/SystemTypeAttribute.cs b/org.mixedrealitytoolkit.core/Utilities/Attributes/SystemTypeAttribute.cs index 01290b2f0..1249b253d 100644 --- a/org.mixedrealitytoolkit.core/Utilities/Attributes/SystemTypeAttribute.cs +++ b/org.mixedrealitytoolkit.core/Utilities/Attributes/SystemTypeAttribute.cs @@ -23,6 +23,12 @@ public abstract class SystemTypeAttribute : PropertyAttribute /// public bool AllowAbstract { get; set; } = false; + /// + /// Gets or sets whether generic classes can be selected from drop-down. + /// Defaults to a value of unless explicitly specified. + /// + public bool AllowGenericTypeDefinition { get; set; } = false; + /// /// Initializes a new instance of the class. /// @@ -45,7 +51,7 @@ protected SystemTypeAttribute(Type type, TypeGrouping grouping = TypeGrouping.By /// public virtual bool IsConstraintSatisfied(Type type) { - return AllowAbstract || !type.IsAbstract; + return (AllowAbstract || !type.IsAbstract) && (AllowGenericTypeDefinition || !type.IsGenericTypeDefinition); } } -} \ No newline at end of file +} diff --git a/org.mixedrealitytoolkit.core/Utilities/ComponentCache.cs b/org.mixedrealitytoolkit.core/Utilities/ComponentCache.cs index b26466570..8c2a949eb 100644 --- a/org.mixedrealitytoolkit.core/Utilities/ComponentCache.cs +++ b/org.mixedrealitytoolkit.core/Utilities/ComponentCache.cs @@ -35,7 +35,7 @@ public static bool TryFindFirstActiveInstance(out T result) { if (cacheFirstInstance == null || !cacheFirstInstance.gameObject.activeInHierarchy) { - cacheFirstInstance = FindObjectUtility.FindFirstObjectByType(); + cacheFirstInstance = Object.FindFirstObjectByType(); } result = cacheFirstInstance; diff --git a/org.mixedrealitytoolkit.core/Utilities/ControllerLookup.cs b/org.mixedrealitytoolkit.core/Utilities/ControllerLookup.cs index d0eec21e0..d45d18c67 100644 --- a/org.mixedrealitytoolkit.core/Utilities/ControllerLookup.cs +++ b/org.mixedrealitytoolkit.core/Utilities/ControllerLookup.cs @@ -1,6 +1,7 @@ // Copyright (c) Mixed Reality Toolkit Contributors // Licensed under the BSD 3-Clause +using System; using UnityEngine; using UnityEngine.XR.Interaction.Toolkit; @@ -12,6 +13,7 @@ namespace MixedReality.Toolkit /// [DisallowMultipleComponent] [AddComponentMenu("MRTK/Core/Controller Lookup")] + [Obsolete("ControllerLookup has been deprecated in version 4.0.0. Please use MixedReality.Toolkit.Input.TrackedPoseDriverLookup instead.")] public class ControllerLookup : MonoBehaviour { // Gaze @@ -61,7 +63,7 @@ public XRBaseController RightHandController /// private void OnValidate() { - if (FindObjectUtility.FindObjectsByType(false, false).Length > 1) + if (FindObjectsByType(FindObjectsSortMode.None).Length > 1) { Debug.LogWarning("Found more than one instance of the ControllerLookup class in the hierarchy. There should only be one"); } diff --git a/org.mixedrealitytoolkit.core/Utilities/Extensions/HandednessExtensions.cs b/org.mixedrealitytoolkit.core/Utilities/Extensions/HandednessExtensions.cs index 4ab89cccd..b748e4b3c 100644 --- a/org.mixedrealitytoolkit.core/Utilities/Extensions/HandednessExtensions.cs +++ b/org.mixedrealitytoolkit.core/Utilities/Extensions/HandednessExtensions.cs @@ -1,8 +1,6 @@ // Copyright (c) Mixed Reality Toolkit Contributors // Licensed under the BSD 3-Clause -using System; -using UnityEngine; using UnityEngine.XR; namespace MixedReality.Toolkit @@ -19,57 +17,12 @@ public static class HandednessExtensions /// If Left, returns Right, if Right, returns Left otherwise returns None. /// Otherwise, returns None /// - public static Handedness GetOppositeHandedness(this Handedness current) + public static Handedness GetOppositeHandedness(this Handedness current) => current switch { - if (current == Handedness.Left) - { - return Handedness.Right; - } - else if (current == Handedness.Right) - { - return Handedness.Left; - } - else - { - return Handedness.None; - } - } - - /// - /// Checks whether or not the current value is . - /// - /// - /// if the value being checked is , otherwise . - /// - [Obsolete("Use flags instead (e.g. Handedness.Right | Handedness.Left)")] - public static bool IsRight(this Handedness current) - { - return current == Handedness.Right; - } - - /// - /// Checks whether or not the current value is . - /// - /// - /// if the value being checked is , otherwise . - /// - [Obsolete("Use flags instead (e.g. Handedness.Right | Handedness.Left)")] - public static bool IsLeft(this Handedness current) - { - return current == Handedness.Left; - } - - /// - /// Checks whether or not the current value is . - /// - /// - /// if the value being checked is , otherwise . - /// - [Obsolete("Use flags instead (e.g. Handedness.Right | Handedness.Left)")] - public static bool IsNone(this Handedness current) - { - return current == Handedness.None; - } + Handedness.Left => Handedness.Right, + Handedness.Right => Handedness.Left, + _ => Handedness.None + }; /// /// Checks whether or not the current value matches the specified value. @@ -91,11 +44,11 @@ public static bool IsMatch(this Handedness current, Handedness compare) /// /// representing the specified , or . /// - public static XRNode? ToXRNode(this Handedness hand) + public static XRNode? ToXRNode(this Handedness hand) => hand switch { - if (hand == Handedness.Left) { return XRNode.LeftHand; } - if (hand == Handedness.Right) { return XRNode.RightHand; } - return null; - } + Handedness.Left => XRNode.LeftHand, + Handedness.Right => XRNode.RightHand, + _ => null + }; } } diff --git a/org.mixedrealitytoolkit.core/Utilities/Extensions/InteractorHandednessExtensions.cs b/org.mixedrealitytoolkit.core/Utilities/Extensions/InteractorHandednessExtensions.cs new file mode 100644 index 000000000..033dc6a71 --- /dev/null +++ b/org.mixedrealitytoolkit.core/Utilities/Extensions/InteractorHandednessExtensions.cs @@ -0,0 +1,50 @@ +// Copyright (c) Mixed Reality Toolkit Contributors +// Licensed under the BSD 3-Clause + +using UnityEngine.XR; +using UnityEngine.XR.Interaction.Toolkit.Interactors; + +namespace MixedReality.Toolkit +{ + /// + /// Extension methods that make working with the enum easier. + /// + public static class InteractorHandednessExtensions + { + /// + /// Gets the representing the specified . If the + /// is other than InteractorHandedness.Left or InteractorHandedness.Right then it defaults to XRNode defaultValue parameter. + /// + /// The value for + /// which the is requested. + /// The default value to return if the is neither + /// InteractorHandedness.Left nor InteractorHandedness.Right. + /// + /// representing the specified . + /// + + /// + /// Gets the representing the specified . If the + /// + public static XRNode ToXRNode(this InteractorHandedness hand, XRNode defaultValue = XRNode.RightHand) => hand switch + { + InteractorHandedness.Left => XRNode.LeftHand, + InteractorHandedness.Right => XRNode.RightHand, + _ => defaultValue, + }; + + /// + /// Converts the to . If the + /// is other than or , then it defaults to . + /// + /// The value for + /// which the is requested. + /// representing the specified . + public static Handedness ToHandedness(this InteractorHandedness hand) => hand switch + { + InteractorHandedness.Left => Handedness.Left, + InteractorHandedness.Right => Handedness.Right, + _ => Handedness.None, + }; + } +} diff --git a/org.mixedrealitytoolkit.uxcore/LegacyDialog/DialogButtonHelpers.cs.meta b/org.mixedrealitytoolkit.core/Utilities/Extensions/InteractorHandednessExtensions.cs.meta similarity index 83% rename from org.mixedrealitytoolkit.uxcore/LegacyDialog/DialogButtonHelpers.cs.meta rename to org.mixedrealitytoolkit.core/Utilities/Extensions/InteractorHandednessExtensions.cs.meta index c3188dcec..e2bba04ea 100644 --- a/org.mixedrealitytoolkit.uxcore/LegacyDialog/DialogButtonHelpers.cs.meta +++ b/org.mixedrealitytoolkit.core/Utilities/Extensions/InteractorHandednessExtensions.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: a24cb20ae11e1224fa93496fd1e998f2 +guid: b5bd496b32e3e204c9a258c37deb53ea MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/org.mixedrealitytoolkit.core/Utilities/Extensions/XRNodeExtensions.cs b/org.mixedrealitytoolkit.core/Utilities/Extensions/XRNodeExtensions.cs index 3fdc272a6..c5ec303b4 100644 --- a/org.mixedrealitytoolkit.core/Utilities/Extensions/XRNodeExtensions.cs +++ b/org.mixedrealitytoolkit.core/Utilities/Extensions/XRNodeExtensions.cs @@ -2,6 +2,7 @@ // Licensed under the BSD 3-Clause using UnityEngine.XR; +using UnityEngine.XR.Interaction.Toolkit.Interactors; namespace MixedReality.Toolkit { @@ -21,20 +22,30 @@ public static class XRNodeExtensions /// This will return for XRNode values other than /// LeftHand or RightHand. /// - public static Handedness ToHandedness(this XRNode node) + public static Handedness ToHandedness(this XRNode node) => node switch { - switch (node) - { - case XRNode.LeftHand: - return Handedness.Left; + XRNode.LeftHand => Handedness.Left, + XRNode.RightHand => Handedness.Right, + _ => Handedness.None, + }; - case XRNode.RightHand: - return Handedness.Right; - - default: - return Handedness.None; - } - } + /// + /// Returns the of the specified XRNode. + /// + /// The XRNode for which the is requested. + /// + /// value representing the XRNode. + /// + /// + /// This will return for XRNode values other than + /// LeftHand or RightHand. + /// + public static InteractorHandedness ToInteractorHandedness(this XRNode node) => node switch + { + XRNode.LeftHand => InteractorHandedness.Left, + XRNode.RightHand => InteractorHandedness.Right, + _ => InteractorHandedness.None, + }; /// /// Determine if the specified XRNode represents a hand. @@ -72,4 +83,4 @@ public static bool IsRightHand(this XRNode node) return (node == XRNode.RightHand); } } -} \ No newline at end of file +} diff --git a/org.mixedrealitytoolkit.core/Utilities/FindObjectUtility.cs b/org.mixedrealitytoolkit.core/Utilities/FindObjectUtility.cs index 0a10e6b5b..204b60847 100644 --- a/org.mixedrealitytoolkit.core/Utilities/FindObjectUtility.cs +++ b/org.mixedrealitytoolkit.core/Utilities/FindObjectUtility.cs @@ -1,82 +1,54 @@ // Copyright (c) Mixed Reality Toolkit Contributors // Licensed under the BSD 3-Clause -using UnityEngine; using System; +using UnityEngine; namespace MixedReality.Toolkit { /// - /// A static utility used to avoid deprecated Find Object functions in favor of replacements introduced in Unity >= 2021.3.18. + /// A static utility used to avoid deprecated Find Object functions in favor of replacements introduced in Unity >= 2021.3.18. /// + [Obsolete("FindObjectUtility has been deprecated in version 4.0.0. Please use the corresponding UnityEngine.Object methods instead.")] public static class FindObjectUtility { - /// /// Returns the first object matching the specified type. /// - /// - /// If Unity >= 2021.3.18, calls FindFirstObjectByType. Otherwise calls FindObjectOfType. - /// /// If true, inactive objects will be included in the search. False by default. public static T FindFirstObjectByType(bool includeInactive = false) where T : Component { -#if UNITY_2021_3_18_OR_NEWER - return UnityEngine.Object.FindFirstObjectByType(includeInactive ? FindObjectsInactive.Include : FindObjectsInactive.Exclude); -#else - return UnityEngine.Object.FindObjectOfType(includeInactive); -#endif + return UnityEngine.Object.FindFirstObjectByType(includeInactive ? FindObjectsInactive.Include : FindObjectsInactive.Exclude); } /// - /// Returns an object matching the specified type. + /// Returns an object matching the specified type. /// - /// - /// If Unity >= 2021.3.18, calls FindAnyObjectByType. Otherwise calls FindObjectOfType. - /// /// If true, inactive objects will be included in the search. False by default. public static T FindAnyObjectByType(bool includeInactive = false) where T : Component { -#if UNITY_2021_3_18_OR_NEWER - return UnityEngine.Object.FindAnyObjectByType(includeInactive ? FindObjectsInactive.Include : FindObjectsInactive.Exclude); -#else - return UnityEngine.Object.FindObjectOfType(includeInactive); -#endif + return UnityEngine.Object.FindAnyObjectByType(includeInactive ? FindObjectsInactive.Include : FindObjectsInactive.Exclude); } /// /// Returns all objects matching the specified type. /// - /// - /// If Unity >= 2021.3.18, calls FindObjectsByType. Otherwise calls FindObjectsOfType. - /// /// If true, inactive objects will be included in the search. False by default. /// If false, results will not sorted by InstanceID. True by default. public static T[] FindObjectsByType(bool includeInactive = false, bool sort = true) where T : Component { -#if UNITY_2021_3_18_OR_NEWER - return UnityEngine.Object.FindObjectsByType(includeInactive ? FindObjectsInactive.Include : FindObjectsInactive.Exclude, sort ? FindObjectsSortMode.InstanceID : FindObjectsSortMode.None); -#else - return UnityEngine.Object.FindObjectsOfType(includeInactive); -#endif + return UnityEngine.Object.FindObjectsByType(includeInactive ? FindObjectsInactive.Include : FindObjectsInactive.Exclude, sort ? FindObjectsSortMode.InstanceID : FindObjectsSortMode.None); } /// /// Returns all objects matching the specified type. /// - /// - /// If Unity >= 2021.3.18, calls FindObjectsByType. Otherwise calls FindObjectsOfType. - /// /// If true, inactive objects will be included in the search. False by default. /// If false, results will not sorted by InstanceID. True by default. /// The type to search for. public static UnityEngine.Object[] FindObjectsByType(Type type, bool includeInactive = false, bool sort = true) { -#if UNITY_2021_3_18_OR_NEWER return UnityEngine.Object.FindObjectsByType(type, includeInactive ? FindObjectsInactive.Include : FindObjectsInactive.Exclude, sort ? FindObjectsSortMode.InstanceID : FindObjectsSortMode.None); -#else - return UnityEngine.Object.FindObjectsOfType(type, includeInactive); -#endif } } } diff --git a/org.mixedrealitytoolkit.core/Utilities/HandsUtils.cs b/org.mixedrealitytoolkit.core/Utilities/HandsUtils.cs index b6ba7a9d3..a847bf4d2 100644 --- a/org.mixedrealitytoolkit.core/Utilities/HandsUtils.cs +++ b/org.mixedrealitytoolkit.core/Utilities/HandsUtils.cs @@ -1,7 +1,6 @@ // Copyright (c) Mixed Reality Toolkit Contributors // Licensed under the BSD 3-Clause -using MixedReality.Toolkit.Subsystems; using System; using UnityEngine; using UnityEngine.XR; @@ -13,15 +12,6 @@ namespace MixedReality.Toolkit /// public static class HandsUtils { - /// - /// Get the first running instance. - /// - /// - /// The first running instance, or null. - /// - [Obsolete("Deprecated, please use XRSubsystemHelpers.HandsAggregator")] - public static IHandsAggregatorSubsystem GetSubsystem() => XRSubsystemHelpers.HandsAggregator; - internal static readonly HandFinger[] HandFingers = Enum.GetValues(typeof(HandFinger)) as HandFinger[]; internal static readonly InputDeviceCharacteristics LeftHandCharacteristics = diff --git a/org.mixedrealitytoolkit.core/Utilities/PlayspaceUtilities.cs b/org.mixedrealitytoolkit.core/Utilities/PlayspaceUtilities.cs index 088ec97c5..0f30b1cc8 100644 --- a/org.mixedrealitytoolkit.core/Utilities/PlayspaceUtilities.cs +++ b/org.mixedrealitytoolkit.core/Utilities/PlayspaceUtilities.cs @@ -35,15 +35,6 @@ public static XROrigin XROrigin } } - /// - /// Get the reference transform for the playspace. - /// - /// - /// This property is obsolete, instead use the transform on Unity's . - /// - [ObsoleteAttribute("For transforming poses into world space, use XROrigin.CameraFloorOffsetObject.transform.")] - public static Transform ReferenceTransform => XROrigin.CameraFloorOffsetObject.transform; - /// /// Transforms a from OpenXR scene-origin-space to Unity world-space. /// Uses the XROrigin's CameraFloorOffsetObject transform. diff --git a/org.mixedrealitytoolkit.core/Utilities/TrackedPoseDriverLookup.cs b/org.mixedrealitytoolkit.core/Utilities/TrackedPoseDriverLookup.cs new file mode 100644 index 000000000..d5c9cd0b7 --- /dev/null +++ b/org.mixedrealitytoolkit.core/Utilities/TrackedPoseDriverLookup.cs @@ -0,0 +1,69 @@ +// Copyright (c) Mixed Reality Toolkit Contributors +// Licensed under the BSD 3-Clause + +using UnityEngine; +using UnityEngine.InputSystem.XR; + +namespace MixedReality.Toolkit.Input +{ + /// + /// A basic convenience registry allowing easy reference to components. + /// + [DisallowMultipleComponent] + [AddComponentMenu("MRTK/Core/Tracked Pose Driver Lookup")] + public class TrackedPoseDriverLookup : MonoBehaviour + { + // Gaze + [SerializeField] + [Tooltip("The rig's gaze prefab Tracked Pose Driver.")] + private TrackedPoseDriver gazeTrackedPoseDriver = null; + + /// + /// The rig's gaze prefab Tracked Pose Driver. + /// + public TrackedPoseDriver GazeTrackedPoseDriver + { + get => gazeTrackedPoseDriver; + set => gazeTrackedPoseDriver = value; + } + + // Left Hand + [SerializeField] + [Tooltip("The rig's left hand prefab Tracked Pose Driver.")] + private TrackedPoseDriver leftHandTrackedPoseDriver = null; + + /// + /// The rig's left hand prefab Tracked Pose Driver. + /// + public TrackedPoseDriver LeftHandTrackedPoseDriver + { + get => leftHandTrackedPoseDriver; + set => leftHandTrackedPoseDriver = value; + } + + // Right Hand + [SerializeField] + [Tooltip("The rig's right hand prefab Tracked Pose Driver.")] + private TrackedPoseDriver rightHandTrackedPoseDriver = null; + + /// + /// The rig's right hand prefab Tracked Pose Driver. + /// + public TrackedPoseDriver RightHandTrackedPoseDriver + { + get => rightHandTrackedPoseDriver; + set => rightHandTrackedPoseDriver = value; + } + + /// + /// A Unity Editor only event function that is called when the script is loaded or a value changes in the Unity Inspector. + /// + private void OnValidate() + { + if (FindObjectsByType(FindObjectsSortMode.None).Length > 1) + { + Debug.LogWarning("Found more than one instance of the ControllerLookup class in the hierarchy. There should only be one"); + } + } + } +} diff --git a/org.mixedrealitytoolkit.uxcore/LegacyDialog/DialogButtonContext.cs.meta b/org.mixedrealitytoolkit.core/Utilities/TrackedPoseDriverLookup.cs.meta similarity index 83% rename from org.mixedrealitytoolkit.uxcore/LegacyDialog/DialogButtonContext.cs.meta rename to org.mixedrealitytoolkit.core/Utilities/TrackedPoseDriverLookup.cs.meta index e158d6380..458432104 100644 --- a/org.mixedrealitytoolkit.uxcore/LegacyDialog/DialogButtonContext.cs.meta +++ b/org.mixedrealitytoolkit.core/Utilities/TrackedPoseDriverLookup.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 8a6d9ebe3c1af15438db8166c5302b57 +guid: a0ae89c68801ae64cbbe496897c93b82 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/org.mixedrealitytoolkit.core/Utilities/XRSubsystemHelpers.cs b/org.mixedrealitytoolkit.core/Utilities/XRSubsystemHelpers.cs index f6eba1993..4a48827a2 100644 --- a/org.mixedrealitytoolkit.core/Utilities/XRSubsystemHelpers.cs +++ b/org.mixedrealitytoolkit.core/Utilities/XRSubsystemHelpers.cs @@ -48,17 +48,6 @@ public static T GetFirstRunningSubsystem() where T : ISubsystem return runningSubsystems.Count > 0 ? runningSubsystems[0] : default; } - /// - /// Get all running subsystems of type T. - /// - /// The list to fill with all running subsystems of the specified type. - [Obsolete("GetAllRunningSubsystems now internally caches for you; this separate NonAlloc method is no longer necessary.")] - public static void GetAllRunningSubsystemsNonAlloc(List runningSubsystems) where T : ISubsystem - { - SubsystemManager.GetSubsystems(runningSubsystems); - runningSubsystems.RemoveAll(subsystem => !subsystem.running); - } - /// /// Get all running subsystems of type T. Note, this is internally cached, so /// the list is only valid immediately after invocation. diff --git a/org.mixedrealitytoolkit.core/package.json b/org.mixedrealitytoolkit.core/package.json index a9de80c13..4cb20d897 100644 --- a/org.mixedrealitytoolkit.core/package.json +++ b/org.mixedrealitytoolkit.core/package.json @@ -1,6 +1,6 @@ { "name": "org.mixedrealitytoolkit.core", - "version": "3.3.1-development", + "version": "4.0.0-development.pre.4", "description": "A limited collection of common interfaces and utilities that most MRTK packages share. Most implementations of these interfaces are contained in other packages in the MRTK ecosystem.", "displayName": "MRTK Core Definitions", "msftFeatureCategory": "MRTK3", @@ -13,11 +13,11 @@ "bugs": { "url": "https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/issues" }, - "unity": "2021.3", - "unityRelease": "26f1", + "unity": "6000.0", + "unityRelease": "66f2", "documentationUrl": "https://www.mixedrealitytoolkit.org", "dependencies": { - "com.unity.xr.interaction.toolkit": "2.3.0", + "com.unity.xr.interaction.toolkit": "3.0.4", "com.unity.xr.management": "4.2.1", "com.unity.xr.core-utils": "2.1.0" } diff --git a/org.mixedrealitytoolkit.input/AssemblyInfo.cs b/org.mixedrealitytoolkit.input/AssemblyInfo.cs index c767d4cf3..326793460 100644 --- a/org.mixedrealitytoolkit.input/AssemblyInfo.cs +++ b/org.mixedrealitytoolkit.input/AssemblyInfo.cs @@ -13,4 +13,4 @@ // The AssemblyVersion attribute is checked-in and is recommended not to be changed often. // https://docs.microsoft.com/troubleshoot/visualstudio/general/assembly-version-assembly-file-version // AssemblyFileVersion and AssemblyInformationalVersion are added by pack-upm.ps1 to match the current MRTK build version. -[assembly: AssemblyVersion("3.0.0.0")] +[assembly: AssemblyVersion("4.0.0.0")] diff --git a/org.mixedrealitytoolkit.input/Assets/Input Actions/MRTK Default Input Actions.inputactions b/org.mixedrealitytoolkit.input/Assets/Input Actions/MRTK Default Input Actions.inputactions index d0db5d263..da62cbc36 100644 --- a/org.mixedrealitytoolkit.input/Assets/Input Actions/MRTK Default Input Actions.inputactions +++ b/org.mixedrealitytoolkit.input/Assets/Input Actions/MRTK Default Input Actions.inputactions @@ -75,7 +75,7 @@ "name": "Select", "type": "Button", "id": "33754c03-48ec-46ef-9bc6-22ed6bfdd8e8", - "expectedControlType": "Button", + "expectedControlType": "", "processors": "", "interactions": "", "initialStateCheck": true @@ -89,11 +89,29 @@ "interactions": "", "initialStateCheck": true }, + { + "name": "Grab", + "type": "Button", + "id": "c7d16510-84e2-45b3-a141-2c9af094c20e", + "expectedControlType": "", + "processors": "", + "interactions": "", + "initialStateCheck": true + }, + { + "name": "Grab Value", + "type": "Value", + "id": "a6760394-eb55-45c9-85a9-d8a6e72785cf", + "expectedControlType": "Axis", + "processors": "", + "interactions": "", + "initialStateCheck": true + }, { "name": "Activate", "type": "Button", "id": "0c0991c5-d329-4afc-8892-1076b440477c", - "expectedControlType": "Button", + "expectedControlType": "", "processors": "", "interactions": "", "initialStateCheck": false @@ -102,7 +120,7 @@ "name": "UI Press", "type": "Button", "id": "7e1eced7-c774-4fe5-be8f-d8711f646d9e", - "expectedControlType": "Button", + "expectedControlType": "", "processors": "", "interactions": "", "initialStateCheck": true @@ -205,7 +223,7 @@ "path": "{LeftHand}/triggerPressed", "interactions": "", "processors": "", - "groups": "Generic XR Controller", + "groups": ";Generic XR Controller", "action": "UI Press", "isComposite": false, "isPartOfComposite": false @@ -221,6 +239,17 @@ "isComposite": false, "isPartOfComposite": false }, + { + "name": "", + "id": "ca36da0f-8a15-4ed7-bc67-3c35b0cd0f87", + "path": "{LeftHand}/pointerActivated", + "interactions": "", + "processors": "", + "groups": ";Generic XR Controller", + "action": "UI Press", + "isComposite": false, + "isPartOfComposite": false + }, { "name": "", "id": "b8edee81-6779-4aa8-89cd-29b149a8f55e", @@ -282,29 +311,40 @@ "path": "{LeftHand}/triggerPressed", "interactions": "", "processors": "", - "groups": "Generic XR Controller", + "groups": ";Generic XR Controller", "action": "Select", "isComposite": false, "isPartOfComposite": false }, { "name": "", - "id": "5ac22ea5-6bed-4765-9f3f-1a5e962b6e94", - "path": "{LeftHand}/trigger", + "id": "9e1cc5d8-6da8-46b5-8c29-dff20eb8df72", + "path": "{LeftHand}/pointerActivated", "interactions": "", "processors": "", - "groups": "Generic XR Controller", + "groups": ";Generic XR Controller", "action": "Select", "isComposite": false, "isPartOfComposite": false }, { "name": "", - "id": "d5fdaaac-a11f-4e19-abce-8cfa105191fb", - "path": "{LeftHand}/squeezePressed", + "id": "0a429dfd-66df-4438-83f7-3bcb939baa21", + "path": "{LeftHand}/selectPressed", "interactions": "", "processors": "", - "groups": "Generic XR Controller", + "groups": ";Generic XR Controller", + "action": "Select", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "fa8828f8-df21-4ab4-bb72-62d4a0448bf0", + "path": "{LeftHand}/select", + "interactions": "", + "processors": "", + "groups": ";Generic XR Controller", "action": "Select", "isComposite": false, "isPartOfComposite": false @@ -315,7 +355,7 @@ "path": "{LeftHand}/triggerPressed", "interactions": "", "processors": "", - "groups": "Generic XR Controller", + "groups": ";Generic XR Controller", "action": "Activate", "isComposite": false, "isPartOfComposite": false @@ -498,33 +538,44 @@ }, { "name": "", - "id": "870ff66f-f058-4da3-8934-1cbb0a6e5e32", - "path": "{LeftHand}/trigger", + "id": "edd7e96d-d752-446b-aea5-250b155ba1de", + "path": "{LeftHand}/selectButton", "interactions": "", "processors": "", - "groups": "Generic XR Controller", + "groups": ";Generic XR Controller", "action": "UI Press", "isComposite": false, "isPartOfComposite": false }, { "name": "", - "id": "edd7e96d-d752-446b-aea5-250b155ba1de", - "path": "{LeftHand}/squeezePressed", + "id": "86c23b3e-32a5-4bf3-a1d7-0a22cf5c7c88", + "path": "{LeftHand}/trigger", "interactions": "", "processors": "", - "groups": "Generic XR Controller", - "action": "UI Press", + "groups": ";Generic XR Controller", + "action": "Select Value", "isComposite": false, "isPartOfComposite": false }, { "name": "", - "id": "86c23b3e-32a5-4bf3-a1d7-0a22cf5c7c88", - "path": "{LeftHand}/trigger", + "id": "4f4d3966-bfa3-4b07-95b6-731952f22ad6", + "path": "{LeftHand}/pointerActivateValue", "interactions": "", "processors": "", - "groups": "Generic XR Controller", + "groups": ";Generic XR Controller", + "action": "Select Value", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "47a1b661-5b1f-437d-b2ec-21d45256e698", + "path": "{LeftHand}/select", + "interactions": "", + "processors": "", + "groups": ";Generic XR Controller", "action": "Select Value", "isComposite": false, "isPartOfComposite": false @@ -550,6 +601,83 @@ "action": "Tracking State", "isComposite": false, "isPartOfComposite": false + }, + { + "name": "", + "id": "d5fdaaac-a11f-4e19-abce-8cfa105191fb", + "path": "{LeftHand}/squeezeClicked", + "interactions": "", + "processors": "", + "groups": ";Generic XR Controller", + "action": "Grab", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "a56bf4f5-ecf2-470b-a1a1-65aee1f02745", + "path": "{LeftHand}/pinchTouched", + "interactions": "", + "processors": "", + "groups": ";Generic XR Controller", + "action": "Grab", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "20f0afb8-5c15-4882-81ac-317319ba4a92", + "path": "{LeftHand}/select", + "interactions": "", + "processors": "", + "groups": ";Generic XR Controller", + "action": "Grab", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "b5267303-b82c-4790-a4d0-3068d904e908", + "path": "{LeftHand}/triggerButton", + "interactions": "", + "processors": "", + "groups": ";Generic XR Controller", + "action": "Grab", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "088cece3-47b8-4235-8748-ae126d30e43c", + "path": "{LeftHand}/squeeze", + "interactions": "", + "processors": "", + "groups": ";Generic XR Controller", + "action": "Grab Value", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "c3a3091b-479c-4682-84d9-42dbc87b1da6", + "path": "{LeftHand}/pinchValue", + "interactions": "", + "processors": "", + "groups": ";Generic XR Controller", + "action": "Grab Value", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "7ed61d5e-4df4-4e9b-98fb-67bf7f574362", + "path": "{LeftHand}/trigger", + "interactions": "", + "processors": "", + "groups": ";Generic XR Controller", + "action": "Grab Value", + "isComposite": false, + "isPartOfComposite": false } ] }, @@ -579,7 +707,7 @@ "name": "Select", "type": "Button", "id": "ac96c10b-c955-4a46-8e67-bf16bc069b53", - "expectedControlType": "Button", + "expectedControlType": "", "processors": "", "interactions": "", "initialStateCheck": true @@ -593,11 +721,29 @@ "interactions": "", "initialStateCheck": true }, + { + "name": "Grab", + "type": "Button", + "id": "9a726c4a-7102-472b-a889-7d5f0339259a", + "expectedControlType": "", + "processors": "", + "interactions": "", + "initialStateCheck": true + }, + { + "name": "Grab Value", + "type": "Value", + "id": "2e2922ec-157b-4a68-adba-26dedf3f6ef9", + "expectedControlType": "Axis", + "processors": "", + "interactions": "", + "initialStateCheck": true + }, { "name": "Activate", "type": "Button", "id": "41976d89-60de-4deb-bff9-16b4af96b290", - "expectedControlType": "Button", + "expectedControlType": "", "processors": "", "interactions": "", "initialStateCheck": false @@ -606,7 +752,7 @@ "name": "UI Press", "type": "Button", "id": "65174b45-c2ee-4f90-93bb-fb4084eaaab3", - "expectedControlType": "Button", + "expectedControlType": "", "processors": "", "interactions": "", "initialStateCheck": true @@ -709,7 +855,7 @@ "path": "{RightHand}/triggerPressed", "interactions": "", "processors": "", - "groups": "Generic XR Controller", + "groups": ";Generic XR Controller", "action": "Activate", "isComposite": false, "isPartOfComposite": false @@ -793,11 +939,11 @@ }, { "name": "", - "id": "f80623c7-da67-458c-8e7a-88f221dd3135", - "path": "{RightHand}/trigger", + "id": "7453fec3-e8b1-4d6e-b996-489a239a60f0", + "path": "{RightHand}/pointerActivated", "interactions": "", "processors": "", - "groups": "Generic XR Controller", + "groups": ";Generic XR Controller", "action": "UI Press", "isComposite": false, "isPartOfComposite": false @@ -805,7 +951,7 @@ { "name": "", "id": "bd8c8773-adc4-42fc-b7e9-13989b701b5e", - "path": "{RightHand}/squeezePressed", + "path": "{RightHand}/selectButton", "interactions": "", "processors": "", "groups": "Generic XR Controller", @@ -984,7 +1130,7 @@ "path": "{RightHand}/triggerPressed", "interactions": "", "processors": "", - "groups": "Generic XR Controller", + "groups": ";Generic XR Controller", "action": "Select", "isComposite": false, "isPartOfComposite": false @@ -992,21 +1138,32 @@ { "name": "", "id": "bfac43db-cf33-4047-8f11-8a83fa190307", - "path": "{RightHand}/trigger", + "path": "{RightHand}/pointerActivated", "interactions": "", "processors": "", - "groups": "Generic XR Controller", + "groups": ";Generic XR Controller", "action": "Select", "isComposite": false, "isPartOfComposite": false }, { "name": "", - "id": "ba2028ef-694c-4794-81d8-dded39d9f63c", - "path": "{RightHand}/squeezePressed", + "id": "c1acd281-b0c0-4c9a-abbc-51e0b1bfa598", + "path": "{RightHand}/selectPressed", "interactions": "", "processors": "", - "groups": "Generic XR Controller", + "groups": ";Generic XR Controller", + "action": "Select", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "5411f456-57b3-4c65-aed0-13eadd8bf27a", + "path": "{RightHand}/select", + "interactions": "", + "processors": "", + "groups": ";Generic XR Controller", "action": "Select", "isComposite": false, "isPartOfComposite": false @@ -1017,7 +1174,29 @@ "path": "{RightHand}/trigger", "interactions": "", "processors": "", - "groups": "Generic XR Controller", + "groups": ";Generic XR Controller", + "action": "Select Value", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "9f382697-c77a-4b17-a060-4b059b7dbc5d", + "path": "{RightHand}/pointerActivateValue", + "interactions": "", + "processors": "", + "groups": ";Generic XR Controller", + "action": "Select Value", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "baba96a2-4c77-43d8-980f-a30ff13161b0", + "path": "{RightHand}/select", + "interactions": "", + "processors": "", + "groups": ";Generic XR Controller", "action": "Select Value", "isComposite": false, "isPartOfComposite": false @@ -1043,6 +1222,83 @@ "action": "Tracking State", "isComposite": false, "isPartOfComposite": false + }, + { + "name": "", + "id": "ba2028ef-694c-4794-81d8-dded39d9f63c", + "path": "{RightHand}/squeezeClicked", + "interactions": "", + "processors": "", + "groups": ";Generic XR Controller", + "action": "Grab", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "db2bda4e-1489-488a-b3ae-c39bd831ab70", + "path": "{RightHand}/pinchTouched", + "interactions": "", + "processors": "", + "groups": ";Generic XR Controller", + "action": "Grab", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "d5766ef2-4a4c-40e1-810e-66493e4bd514", + "path": "{RightHand}/select", + "interactions": "", + "processors": "", + "groups": ";Generic XR Controller", + "action": "Grab", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "17b45c76-025e-4350-82b6-7f8411a38106", + "path": "{RightHand}/triggerButton", + "interactions": "", + "processors": "", + "groups": ";Generic XR Controller", + "action": "Grab", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "22582dee-b12b-46a7-92bf-f56cf7a4833a", + "path": "{RightHand}/squeeze", + "interactions": "", + "processors": "", + "groups": ";Generic XR Controller", + "action": "Grab Value", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "fe8eaadd-e088-4021-bc6f-848e427c19ce", + "path": "{RightHand}/pinchValue", + "interactions": "", + "processors": "", + "groups": ";Generic XR Controller", + "action": "Grab Value", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "3d5094c6-88ab-4ea4-8d99-0919fefacea8", + "path": "{RightHand}/trigger", + "interactions": "", + "processors": "", + "groups": "", + "action": "Grab Value", + "isComposite": false, + "isPartOfComposite": false } ] }, diff --git a/org.mixedrealitytoolkit.input/Assets/Prefabs/MRTK Gaze Controller.prefab b/org.mixedrealitytoolkit.input/Assets/Prefabs/MRTK Gaze Controller.prefab index 6e02b988e..70e418e94 100644 --- a/org.mixedrealitytoolkit.input/Assets/Prefabs/MRTK Gaze Controller.prefab +++ b/org.mixedrealitytoolkit.input/Assets/Prefabs/MRTK Gaze Controller.prefab @@ -25,13 +25,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1975450934932087381} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6853218870844938225} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &3021976565802998075 MonoBehaviour: @@ -46,11 +46,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_InteractionManager: {fileID: 0} - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 4294967295 + m_Handedness: 0 m_AttachTransform: {fileID: 0} m_KeepSelectedTargetValid: 1 m_DisableVisualsWhenBlockedInGroup: 1 @@ -70,22 +68,71 @@ MonoBehaviour: m_Calls: [] m_StartingHoverFilters: [] m_StartingSelectFilters: [] - m_OnHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectEntered: - m_PersistentCalls: - m_Calls: [] - m_OnSelectExited: - m_PersistentCalls: - m_Calls: [] + m_SelectInput: + m_InputSourceMode: 2 + m_InputActionPerformed: + m_Name: Select + m_Type: 1 + m_ExpectedControlType: + m_Id: 1e806714-b921-43ec-9bd8-ded28d1810fd + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_InputActionValue: + m_Name: Select Value + m_Type: 0 + m_ExpectedControlType: Axis + m_Id: cc7e11bf-9fb6-4a05-b288-4457098498f0 + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_InputActionReferencePerformed: {fileID: -6131295136447488360, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} + m_InputActionReferenceValue: {fileID: -294446728694031702, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} + m_ObjectReferenceObject: {fileID: 0} + m_ManualPerformed: 0 + m_ManualValue: 0 + m_ManualQueuePerformed: 0 + m_ManualQueueWasPerformedThisFrame: 0 + m_ManualQueueWasCompletedThisFrame: 0 + m_ManualQueueValue: 0 + m_ManualQueueTargetFrame: 0 + m_ActivateInput: + m_InputSourceMode: 2 + m_InputActionPerformed: + m_Name: Activate + m_Type: 1 + m_ExpectedControlType: + m_Id: 61191638-c12a-4ae9-9950-4f03863661a4 + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_InputActionValue: + m_Name: Activate Value + m_Type: 0 + m_ExpectedControlType: Axis + m_Id: 563e56f8-290f-4109-a09c-170c1648f69e + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_InputActionReferencePerformed: {fileID: -5982496924579745919, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} + m_InputActionReferenceValue: {fileID: -5982496924579745919, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} + m_ObjectReferenceObject: {fileID: 0} + m_ManualPerformed: 0 + m_ManualValue: 0 + m_ManualQueuePerformed: 0 + m_ManualQueueWasPerformedThisFrame: 0 + m_ManualQueueWasCompletedThisFrame: 0 + m_ManualQueueValue: 0 + m_ManualQueueTargetFrame: 0 m_SelectActionTrigger: 1 - m_HideControllerOnSelect: 0 m_AllowHoveredActivate: 0 m_TargetPriorityMode: 0 + m_HideControllerOnSelect: 0 + m_InputCompatibilityMode: 0 m_PlayAudioClipOnSelectEntered: 0 m_AudioClipForOnSelectEntered: {fileID: 0} m_PlayAudioClipOnSelectExited: 0 @@ -134,6 +181,7 @@ MonoBehaviour: m_SampleFrequency: 20 m_HitDetectionType: 1 m_SphereCastRadius: 0.05 + m_ConeCastAngle: 6 m_RaycastMask: serializedVersion: 2 m_Bits: 4294967295 @@ -145,12 +193,169 @@ MonoBehaviour: m_AutoDeselect: 0 m_TimeToAutoDeselect: 3 m_EnableUIInteraction: 0 - m_AllowAnchorControl: 0 + m_BlockInteractionsWithScreenSpaceUI: 0 + m_BlockUIOnInteractableSelection: 1 + m_ManipulateAttachTransform: 0 m_UseForceGrab: 0 m_RotateSpeed: 180 m_TranslateSpeed: 1 - m_AnchorRotateReferenceFrame: {fileID: 0} - m_AnchorRotationMode: 0 + m_RotateReferenceFrame: {fileID: 0} + m_RotateMode: 0 + m_UIHoverEntered: + m_PersistentCalls: + m_Calls: [] + m_UIHoverExited: + m_PersistentCalls: + m_Calls: [] + m_EnableARRaycasting: 0 + m_OccludeARHitsWith3DObjects: 0 + m_OccludeARHitsWith2DObjects: 0 + m_ScaleMode: 0 + m_UIPressInput: + m_InputSourceMode: 2 + m_InputActionPerformed: + m_Name: UI Press + m_Type: 1 + m_ExpectedControlType: + m_Id: 1d2a3229-2c15-46ec-8e94-f6957ec4cb2f + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_InputActionValue: + m_Name: UI Press Value + m_Type: 0 + m_ExpectedControlType: Axis + m_Id: dbf1c74f-ddaa-4873-b858-b65bf7b54520 + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_InputActionReferencePerformed: {fileID: 0} + m_InputActionReferenceValue: {fileID: 0} + m_ObjectReferenceObject: {fileID: 0} + m_ManualPerformed: 0 + m_ManualValue: 0 + m_ManualQueuePerformed: 0 + m_ManualQueueWasPerformedThisFrame: 0 + m_ManualQueueWasCompletedThisFrame: 0 + m_ManualQueueValue: 0 + m_ManualQueueTargetFrame: 0 + m_UIScrollInput: + m_InputSourceMode: 2 + m_InputAction: + m_Name: UI Scroll + m_Type: 0 + m_ExpectedControlType: Vector2 + m_Id: 3df3e6d7-e76f-45e3-a11e-1a053542a9e1 + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_InputActionReference: {fileID: 0} + m_ObjectReferenceObject: {fileID: 0} + m_ManualValue: {x: 0, y: 0} + m_TranslateManipulationInput: + m_InputSourceMode: 2 + m_InputAction: + m_Name: Translate Manipulation + m_Type: 0 + m_ExpectedControlType: Vector2 + m_Id: a8b70377-bac7-4816-a579-59a879aeb544 + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_InputActionReference: {fileID: 0} + m_ObjectReferenceObject: {fileID: 0} + m_ManualValue: {x: 0, y: 0} + m_RotateManipulationInput: + m_InputSourceMode: 2 + m_InputAction: + m_Name: Rotate Manipulation + m_Type: 0 + m_ExpectedControlType: Vector2 + m_Id: 7288736f-83c5-44fc-99a5-2a231e17ab5f + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_InputActionReference: {fileID: 0} + m_ObjectReferenceObject: {fileID: 0} + m_ManualValue: {x: 0, y: 0} + m_DirectionalManipulationInput: + m_InputSourceMode: 2 + m_InputAction: + m_Name: Directional Manipulation + m_Type: 0 + m_ExpectedControlType: Vector2 + m_Id: 18c1b8a3-77c2-417f-9c5b-4f9ff875241e + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_InputActionReference: {fileID: 0} + m_ObjectReferenceObject: {fileID: 0} + m_ManualValue: {x: 0, y: 0} + m_ScaleToggleInput: + m_InputSourceMode: 2 + m_InputActionPerformed: + m_Name: Scale Toggle + m_Type: 1 + m_ExpectedControlType: + m_Id: dee0c3ce-0b87-4a3e-b255-f2100b95155a + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_InputActionValue: + m_Name: Scale Toggle Value + m_Type: 0 + m_ExpectedControlType: Axis + m_Id: d79f819f-9fea-45c8-8628-4d1659d4a18e + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_InputActionReferencePerformed: {fileID: 0} + m_InputActionReferenceValue: {fileID: 0} + m_ObjectReferenceObject: {fileID: 0} + m_ManualPerformed: 0 + m_ManualValue: 0 + m_ManualQueuePerformed: 0 + m_ManualQueueWasPerformedThisFrame: 0 + m_ManualQueueWasCompletedThisFrame: 0 + m_ManualQueueValue: 0 + m_ManualQueueTargetFrame: 0 + m_ScaleOverTimeInput: + m_InputSourceMode: 2 + m_InputAction: + m_Name: Scale Over Time + m_Type: 0 + m_ExpectedControlType: Vector2 + m_Id: 4c94d113-9220-48c9-bb5b-28562207a25e + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_InputActionReference: {fileID: 0} + m_ObjectReferenceObject: {fileID: 0} + m_ManualValue: {x: 0, y: 0} + m_ScaleDistanceDeltaInput: + m_InputSourceMode: 0 + m_InputAction: + m_Name: Scale Distance Delta + m_Type: 0 + m_ExpectedControlType: Axis + m_Id: c0b0fa53-6d4f-457b-97b2-0aae633782a9 + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_InputActionReference: {fileID: 0} + m_ObjectReferenceObject: {fileID: 0} + m_ManualValue: 0 + modeManagedRoot: {fileID: 7470888221916766567} coneAngle: 10 minGazeDistance: 0.1 maxGazeDistance: 5 @@ -215,7 +420,8 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6853218870844938225} - - component: {fileID: 6383762985148977517} + - component: {fileID: 8560941944935669111} + - component: {fileID: 6688253335991363889} m_Layer: 0 m_Name: MRTK Gaze Controller m_TagString: Untagged @@ -230,6 +436,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7470888221916766567} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -237,9 +444,8 @@ Transform: m_Children: - {fileID: 599884710536146533} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &6383762985148977517 +--- !u!114 &8560941944935669111 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -248,182 +454,73 @@ MonoBehaviour: m_GameObject: {fileID: 7470888221916766567} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: b5ecb302c7ea48344b3a839df64a77a5, type: 3} + m_Script: {fileID: 11500000, guid: a248d282774a21744b8cf69201ce8279, type: 3} m_Name: m_EditorClassIdentifier: - m_UpdateTrackingType: 0 - m_EnableInputTracking: 1 - m_EnableInputActions: 1 - m_ModelPrefab: {fileID: 0} - m_ModelParent: {fileID: 0} - m_Model: {fileID: 0} - m_AnimateModel: 0 - m_ModelSelectTransition: - m_ModelDeSelectTransition: - m_PositionAction: + m_TrackingType: 0 + m_UpdateType: 0 + m_IgnoreTrackingState: 0 + m_PositionInput: m_UseReference: 1 m_Action: m_Name: Position m_Type: 0 - m_ExpectedControlType: - m_Id: a11daf2c-febf-4ea5-afe9-c21bed6bebe9 + m_ExpectedControlType: Vector3 + m_Id: 018c5866-891a-4538-8088-d84ea8625ab5 m_Processors: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 m_Reference: {fileID: -3802471318395789522, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} - m_RotationAction: + m_RotationInput: m_UseReference: 1 m_Action: m_Name: Rotation m_Type: 0 - m_ExpectedControlType: - m_Id: eaea1318-ea1f-4bd2-b48b-10fd58947d8d + m_ExpectedControlType: Quaternion + m_Id: 898f0be3-3319-4c01-b8f9-75c69367b9a5 m_Processors: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 m_Reference: {fileID: -7046323255087736399, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} - m_TrackingStateAction: + m_TrackingStateInput: m_UseReference: 1 m_Action: m_Name: Tracking State m_Type: 0 - m_ExpectedControlType: - m_Id: 3319b6e7-12b5-4837-b74d-60ab5ec07d59 + m_ExpectedControlType: Integer + m_Id: aa0f99ed-df88-4a44-89d8-7b5998b17937 m_Processors: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 m_Reference: {fileID: -6560867463018052362, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} - m_SelectAction: - m_UseReference: 0 - m_Action: - m_Name: Select - m_Type: 0 - m_ExpectedControlType: - m_Id: 10024e8c-255d-4073-a121-5542f80bc168 - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 0 - m_Reference: {fileID: 0} - m_SelectActionValue: - m_UseReference: 0 - m_Action: - m_Name: Select Action Value - m_Type: 0 - m_ExpectedControlType: - m_Id: 4c63a0cf-2a5f-48ca-a451-1ef0c0cf26fb - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 0 - m_Reference: {fileID: 0} - m_ActivateAction: - m_UseReference: 0 - m_Action: - m_Name: Activate - m_Type: 0 - m_ExpectedControlType: - m_Id: 881b42aa-b824-4843-87bf-bc236e9008da - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 0 - m_Reference: {fileID: 0} - m_ActivateActionValue: - m_UseReference: 0 - m_Action: - m_Name: Activate Action Value - m_Type: 0 - m_ExpectedControlType: - m_Id: 0ebe3d4a-cd81-4ef5-b2c6-65a352d76d85 - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 0 - m_Reference: {fileID: 0} - m_UIPressAction: - m_UseReference: 0 - m_Action: - m_Name: UI Press - m_Type: 0 - m_ExpectedControlType: - m_Id: fdd9436f-9d5f-4520-9218-ddba68887cde - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 0 - m_Reference: {fileID: 0} - m_UIPressActionValue: - m_UseReference: 0 - m_Action: - m_Name: UI Press Action Value - m_Type: 0 - m_ExpectedControlType: - m_Id: c72a535d-c2da-4cb3-98da-81626ee93196 - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 0 - m_Reference: {fileID: 0} - m_HapticDeviceAction: - m_UseReference: 0 - m_Action: - m_Name: Haptic Device - m_Type: 0 - m_ExpectedControlType: - m_Id: 011ee523-7eef-407d-bb5d-6a53b9e6b9ac - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 0 - m_Reference: {fileID: 0} - m_RotateAnchorAction: - m_UseReference: 0 - m_Action: - m_Name: Rotate Anchor - m_Type: 0 - m_ExpectedControlType: - m_Id: 6a4860ad-abd1-482b-8c9a-455c86786c08 - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 0 - m_Reference: {fileID: 0} - m_DirectionalAnchorRotationAction: - m_UseReference: 0 - m_Action: - m_Name: Directional Anchor Rotation - m_Type: 0 - m_ExpectedControlType: - m_Id: 4193cbb2-ece8-4ed4-8f86-9ff0d3ac5505 - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 0 - m_Reference: {fileID: 0} - m_TranslateAnchorAction: - m_UseReference: 0 - m_Action: - m_Name: Translate Anchor - m_Type: 0 - m_ExpectedControlType: - m_Id: 3402d39b-eb4f-4b9f-b338-637f02b1eff5 - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 0 - m_Reference: {fileID: 0} - m_ButtonPressPoint: 0.5 + m_PositionAction: + m_Name: + m_Type: 0 + m_ExpectedControlType: + m_Id: 4a2a6865-a425-4d15-bd02-a01109eef4c3 + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_RotationAction: + m_Name: + m_Type: 0 + m_ExpectedControlType: + m_Id: c0391b4c-94aa-46e5-a3f9-d582f9b301d0 + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 fallbackPositionAction: m_UseReference: 1 m_Action: m_Name: Fallback Position m_Type: 0 m_ExpectedControlType: - m_Id: 7f9b01c3-bf9d-45fc-95f8-35d381c29b65 + m_Id: f9cd3fc7-b0ca-46f9-b50d-ae278ebcd1e0 m_Processors: m_Interactions: m_SingletonActionBindings: [] @@ -435,7 +532,7 @@ MonoBehaviour: m_Name: Fallback Rotation m_Type: 0 m_ExpectedControlType: - m_Id: d2fb4a7d-b89b-49b1-aa21-52addc67fde9 + m_Id: 4ca1e267-7e43-4986-9358-a650789d6a61 m_Processors: m_Interactions: m_SingletonActionBindings: [] @@ -447,9 +544,25 @@ MonoBehaviour: m_Name: Fallback Tracking State m_Type: 0 m_ExpectedControlType: - m_Id: c03c5a83-1d35-43a6-a6f3-be7295e81e8a + m_Id: fb72b7ad-a169-48ba-a1ca-785ccf7b9a75 m_Processors: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 m_Reference: {fileID: 5232793463981167437, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} +--- !u!114 &6688253335991363889 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7470888221916766567} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 21ebbfc4ef86dda48b0ee21ef7842f90, type: 3} + m_Name: + m_EditorClassIdentifier: + permissions: + m_Items: + - Key: XR_EXT_eye_gaze_interaction + Value: android.permission.EYE_TRACKING_FINE diff --git a/org.mixedrealitytoolkit.input/Assets/Prefabs/MRTK Gaze Controller.prefab.meta b/org.mixedrealitytoolkit.input/Assets/Prefabs/MRTK Gaze Controller.prefab.meta index ffef8afae..b6ab8b51d 100644 --- a/org.mixedrealitytoolkit.input/Assets/Prefabs/MRTK Gaze Controller.prefab.meta +++ b/org.mixedrealitytoolkit.input/Assets/Prefabs/MRTK Gaze Controller.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 6f3af2a8508960843b36fb9d64de2bc2 +guid: d8a2a1f4b4f78754c86045f7a36fe424 PrefabImporter: externalObjects: {} userData: diff --git a/org.mixedrealitytoolkit.input/Assets/Prefabs/MRTK Interaction Manager.prefab b/org.mixedrealitytoolkit.input/Assets/Prefabs/MRTK Interaction Manager.prefab index 5638d8b5d..c9e07e514 100644 --- a/org.mixedrealitytoolkit.input/Assets/Prefabs/MRTK Interaction Manager.prefab +++ b/org.mixedrealitytoolkit.input/Assets/Prefabs/MRTK Interaction Manager.prefab @@ -10,8 +10,8 @@ GameObject: m_Component: - component: {fileID: 7821592117992173402} - component: {fileID: 7821592117992173380} - - component: {fileID: 6474832524069219057} - component: {fileID: 7601486046380051481} + - component: {fileID: 919676360596656614} m_Layer: 0 m_Name: MRTK Interaction Manager m_TagString: Untagged @@ -26,13 +26,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7821592117992173381} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &7821592117992173380 MonoBehaviour: @@ -81,7 +81,7 @@ MonoBehaviour: defaultMode: name: Far priority: 0 ---- !u!114 &6474832524069219057 +--- !u!114 &7601486046380051481 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -90,13 +90,12 @@ MonoBehaviour: m_GameObject: {fileID: 7821592117992173381} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3a7683d16dfabed47b17f1f2cbc4de1c, type: 3} + m_Script: {fileID: 11500000, guid: 83e4e6cca11330d4088d729ab4fc9d9f, type: 3} m_Name: m_EditorClassIdentifier: - gazeController: {fileID: 0} - leftHandController: {fileID: 0} - rightHandController: {fileID: 0} ---- !u!114 &7601486046380051481 + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] +--- !u!114 &919676360596656614 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -105,8 +104,9 @@ MonoBehaviour: m_GameObject: {fileID: 7821592117992173381} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 83e4e6cca11330d4088d729ab4fc9d9f, type: 3} + m_Script: {fileID: 11500000, guid: a0ae89c68801ae64cbbe496897c93b82, type: 3} m_Name: m_EditorClassIdentifier: - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] + gazeTrackedPoseDriver: {fileID: 0} + leftHandTrackedPoseDriver: {fileID: 0} + rightHandTrackedPoseDriver: {fileID: 0} diff --git a/org.mixedrealitytoolkit.input/Assets/Prefabs/MRTK Interaction Manager.prefab.meta b/org.mixedrealitytoolkit.input/Assets/Prefabs/MRTK Interaction Manager.prefab.meta index bf3fe3ec1..29b0e83f3 100644 --- a/org.mixedrealitytoolkit.input/Assets/Prefabs/MRTK Interaction Manager.prefab.meta +++ b/org.mixedrealitytoolkit.input/Assets/Prefabs/MRTK Interaction Manager.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 2d7353d30f9fe7e41bf30032876961a9 +guid: 02502921f64c38d48b14f1d6c2438b16 PrefabImporter: externalObjects: {} userData: diff --git a/org.mixedrealitytoolkit.input/Assets/Prefabs/MRTK LeftHand Controller.prefab b/org.mixedrealitytoolkit.input/Assets/Prefabs/MRTK LeftHand Controller.prefab index b535086c7..4169be06e 100644 --- a/org.mixedrealitytoolkit.input/Assets/Prefabs/MRTK LeftHand Controller.prefab +++ b/org.mixedrealitytoolkit.input/Assets/Prefabs/MRTK LeftHand Controller.prefab @@ -28,6 +28,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 33891623947274355} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -36,7 +37,6 @@ Transform: - {fileID: 1307666228887773622} - {fileID: 3988544559415115452} m_Father: {fileID: 1948193615953854875} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &2940030942784507886 MonoBehaviour: @@ -51,11 +51,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_InteractionManager: {fileID: 0} - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 4294967295 + m_Handedness: 1 m_AttachTransform: {fileID: 0} m_KeepSelectedTargetValid: 1 m_DisableVisualsWhenBlockedInGroup: 1 @@ -75,22 +73,71 @@ MonoBehaviour: m_Calls: [] m_StartingHoverFilters: [] m_StartingSelectFilters: [] - m_OnHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectEntered: - m_PersistentCalls: - m_Calls: [] - m_OnSelectExited: - m_PersistentCalls: - m_Calls: [] + m_SelectInput: + m_InputSourceMode: 3 + m_InputActionPerformed: + m_Name: Select + m_Type: 1 + m_ExpectedControlType: + m_Id: b9223f65-9276-4010-bff4-b336358caac1 + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_InputActionValue: + m_Name: Select Value + m_Type: 0 + m_ExpectedControlType: Axis + m_Id: 9d62c3ba-143e-4368-a7ee-18beb1d5d787 + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_InputActionReferencePerformed: {fileID: -6131295136447488360, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} + m_InputActionReferenceValue: {fileID: -294446728694031702, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} + m_ObjectReferenceObject: {fileID: 5536072158143193164} + m_ManualPerformed: 0 + m_ManualValue: 0 + m_ManualQueuePerformed: 0 + m_ManualQueueWasPerformedThisFrame: 0 + m_ManualQueueWasCompletedThisFrame: 0 + m_ManualQueueValue: 0 + m_ManualQueueTargetFrame: 0 + m_ActivateInput: + m_InputSourceMode: 2 + m_InputActionPerformed: + m_Name: Activate + m_Type: 1 + m_ExpectedControlType: + m_Id: 967e2eb7-235f-4731-a860-cd2fd34dfcbf + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_InputActionValue: + m_Name: Activate Value + m_Type: 0 + m_ExpectedControlType: Axis + m_Id: 11ace172-5671-421c-a716-1578c4aafaf7 + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_InputActionReferencePerformed: {fileID: -5982496924579745919, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} + m_InputActionReferenceValue: {fileID: -5982496924579745919, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} + m_ObjectReferenceObject: {fileID: 0} + m_ManualPerformed: 0 + m_ManualValue: 0 + m_ManualQueuePerformed: 0 + m_ManualQueueWasPerformedThisFrame: 0 + m_ManualQueueWasCompletedThisFrame: 0 + m_ManualQueueValue: 0 + m_ManualQueueTargetFrame: 0 m_SelectActionTrigger: 1 - m_HideControllerOnSelect: 0 m_AllowHoveredActivate: 0 m_TargetPriorityMode: 0 + m_HideControllerOnSelect: 0 + m_InputCompatibilityMode: 0 m_PlayAudioClipOnSelectEntered: 0 m_AudioClipForOnSelectEntered: {fileID: 0} m_PlayAudioClipOnSelectExited: 0 @@ -139,6 +186,7 @@ MonoBehaviour: m_SampleFrequency: 20 m_HitDetectionType: 0 m_SphereCastRadius: 0.1 + m_ConeCastAngle: 6 m_RaycastMask: serializedVersion: 2 m_Bits: 4294967295 @@ -150,12 +198,170 @@ MonoBehaviour: m_AutoDeselect: 0 m_TimeToAutoDeselect: 3 m_EnableUIInteraction: 1 - m_AllowAnchorControl: 0 + m_BlockInteractionsWithScreenSpaceUI: 0 + m_BlockUIOnInteractableSelection: 1 + m_ManipulateAttachTransform: 0 m_UseForceGrab: 0 m_RotateSpeed: 180 m_TranslateSpeed: 1 - m_AnchorRotateReferenceFrame: {fileID: 0} - m_AnchorRotationMode: 0 + m_RotateReferenceFrame: {fileID: 0} + m_RotateMode: 0 + m_UIHoverEntered: + m_PersistentCalls: + m_Calls: [] + m_UIHoverExited: + m_PersistentCalls: + m_Calls: [] + m_EnableARRaycasting: 0 + m_OccludeARHitsWith3DObjects: 0 + m_OccludeARHitsWith2DObjects: 0 + m_ScaleMode: 0 + m_UIPressInput: + m_InputSourceMode: 3 + m_InputActionPerformed: + m_Name: UI Press + m_Type: 1 + m_ExpectedControlType: + m_Id: ca9baf1d-a99a-499f-aea8-123943725579 + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_InputActionValue: + m_Name: UI Press Value + m_Type: 0 + m_ExpectedControlType: Axis + m_Id: c1801043-5696-459b-a651-99200f390ce6 + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_InputActionReferencePerformed: {fileID: -6395602842196007441, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} + m_InputActionReferenceValue: {fileID: -6395602842196007441, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} + m_ObjectReferenceObject: {fileID: 8876097134604027714} + m_ManualPerformed: 0 + m_ManualValue: 0 + m_ManualQueuePerformed: 0 + m_ManualQueueWasPerformedThisFrame: 0 + m_ManualQueueWasCompletedThisFrame: 0 + m_ManualQueueValue: 0 + m_ManualQueueTargetFrame: 0 + m_UIScrollInput: + m_InputSourceMode: 2 + m_InputAction: + m_Name: UI Scroll + m_Type: 0 + m_ExpectedControlType: Vector2 + m_Id: ca0b1ffe-2cc7-4f9a-9869-77e5e4ca68bb + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_InputActionReference: {fileID: 0} + m_ObjectReferenceObject: {fileID: 0} + m_ManualValue: {x: 0, y: 0} + m_TranslateManipulationInput: + m_InputSourceMode: 2 + m_InputAction: + m_Name: Translate Manipulation + m_Type: 0 + m_ExpectedControlType: Vector2 + m_Id: 16a3c955-b525-4bb3-a988-af800a84aa5f + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_InputActionReference: {fileID: 0} + m_ObjectReferenceObject: {fileID: 0} + m_ManualValue: {x: 0, y: 0} + m_RotateManipulationInput: + m_InputSourceMode: 2 + m_InputAction: + m_Name: Rotate Manipulation + m_Type: 0 + m_ExpectedControlType: Vector2 + m_Id: 57931bb1-be5f-4cd7-8252-8feef10091a5 + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_InputActionReference: {fileID: 0} + m_ObjectReferenceObject: {fileID: 0} + m_ManualValue: {x: 0, y: 0} + m_DirectionalManipulationInput: + m_InputSourceMode: 2 + m_InputAction: + m_Name: Directional Manipulation + m_Type: 0 + m_ExpectedControlType: Vector2 + m_Id: 6d60f53a-844e-48bd-a1c8-1bf957f3b9d8 + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_InputActionReference: {fileID: 0} + m_ObjectReferenceObject: {fileID: 0} + m_ManualValue: {x: 0, y: 0} + m_ScaleToggleInput: + m_InputSourceMode: 2 + m_InputActionPerformed: + m_Name: Scale Toggle + m_Type: 1 + m_ExpectedControlType: + m_Id: ac5e6d05-31ee-47bd-bfbd-cebd02f3f6d7 + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_InputActionValue: + m_Name: Scale Toggle Value + m_Type: 0 + m_ExpectedControlType: Axis + m_Id: d6313fc8-aada-485c-b9c7-8da4401c19d9 + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_InputActionReferencePerformed: {fileID: 0} + m_InputActionReferenceValue: {fileID: 0} + m_ObjectReferenceObject: {fileID: 0} + m_ManualPerformed: 0 + m_ManualValue: 0 + m_ManualQueuePerformed: 0 + m_ManualQueueWasPerformedThisFrame: 0 + m_ManualQueueWasCompletedThisFrame: 0 + m_ManualQueueValue: 0 + m_ManualQueueTargetFrame: 0 + m_ScaleOverTimeInput: + m_InputSourceMode: 2 + m_InputAction: + m_Name: Scale Over Time + m_Type: 0 + m_ExpectedControlType: Vector2 + m_Id: 225173d8-d096-4718-b971-eb8edd57acb8 + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_InputActionReference: {fileID: 0} + m_ObjectReferenceObject: {fileID: 0} + m_ManualValue: {x: 0, y: 0} + m_ScaleDistanceDeltaInput: + m_InputSourceMode: 0 + m_InputAction: + m_Name: Scale Distance Delta + m_Type: 0 + m_ExpectedControlType: Axis + m_Id: 6c492835-5adc-4290-b386-2b9c7836b0d4 + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_InputActionReference: {fileID: 0} + m_ObjectReferenceObject: {fileID: 0} + m_ManualValue: 0 + trackedPoseDriver: {fileID: 3281803018082669919} + modeManagedRoot: {fileID: 1948193615953854874} aimPoseSource: rid: 0 devicePoseSource: @@ -285,7 +491,7 @@ MonoBehaviour: modeOnSelect: name: FarRaySelect priority: 3 - controllers: + interactorGroups: - {fileID: 1948193615953854874} --- !u!114 &2105872328799679035 MonoBehaviour: @@ -356,6 +562,7 @@ MonoBehaviour: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 3 validColorGradient: @@ -385,6 +592,7 @@ MonoBehaviour: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 selectActiveColorGradient: @@ -414,6 +622,7 @@ MonoBehaviour: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 maxGradientLength: 0.3 @@ -474,14 +683,84 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 313520819636509231} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1948193616346090106} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &317859718934353354 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4926630461381577642} + - component: {fileID: 2393634401634928266} + m_Layer: 0 + m_Name: PinchInputReader + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4926630461381577642 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 317859718934353354} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2497193556380645624} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &2393634401634928266 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 317859718934353354} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 63844496262f1724ba77344d77fbf000, type: 3} + m_Name: + m_EditorClassIdentifier: + handNode: 4 + selectAction: + m_UseReference: 1 + m_Action: + m_Name: Select + m_Type: 1 + m_ExpectedControlType: + m_Id: ff1c01c3-260e-48d6-8691-2b8a494333a9 + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_Reference: {fileID: 4911936264890632658, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} + selectActionValue: + m_UseReference: 1 + m_Action: + m_Name: Select Value + m_Type: 0 + m_ExpectedControlType: Axis + m_Id: 98e439e1-c087-42a6-bf66-ebe8e973e5bf + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_Reference: {fileID: -4241056287068600476, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} + trackedPoseDriver: {fileID: 3281803018082669919} --- !u!1 &761938320343190485 GameObject: m_ObjectHideFlags: 0 @@ -508,6 +787,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 761938320343190485} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -515,7 +795,6 @@ Transform: m_Children: - {fileID: 1051247791254679178} m_Father: {fileID: 1948193615953854875} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &2572330550550829917 MonoBehaviour: @@ -530,11 +809,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_InteractionManager: {fileID: 0} - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 4294967295 + m_Handedness: 1 m_AttachTransform: {fileID: 1051247791254679178} m_KeepSelectedTargetValid: 1 m_DisableVisualsWhenBlockedInGroup: 1 @@ -554,22 +831,71 @@ MonoBehaviour: m_Calls: [] m_StartingHoverFilters: [] m_StartingSelectFilters: [] - m_OnHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectEntered: - m_PersistentCalls: - m_Calls: [] - m_OnSelectExited: - m_PersistentCalls: - m_Calls: [] + m_SelectInput: + m_InputSourceMode: 3 + m_InputActionPerformed: + m_Name: Select + m_Type: 1 + m_ExpectedControlType: + m_Id: 75214898-b781-4fea-a5a6-1769e4410c1d + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_InputActionValue: + m_Name: Select Value + m_Type: 0 + m_ExpectedControlType: Axis + m_Id: d798cea4-b85e-4ec1-b6af-4ffa41ccc8e7 + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_InputActionReferencePerformed: {fileID: -6131295136447488360, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} + m_InputActionReferenceValue: {fileID: -294446728694031702, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} + m_ObjectReferenceObject: {fileID: 2393634401634928266} + m_ManualPerformed: 0 + m_ManualValue: 0 + m_ManualQueuePerformed: 0 + m_ManualQueueWasPerformedThisFrame: 0 + m_ManualQueueWasCompletedThisFrame: 0 + m_ManualQueueValue: 0 + m_ManualQueueTargetFrame: 0 + m_ActivateInput: + m_InputSourceMode: 2 + m_InputActionPerformed: + m_Name: Activate + m_Type: 1 + m_ExpectedControlType: + m_Id: f27c304b-091d-4a41-aa1c-0ede3d408084 + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_InputActionValue: + m_Name: Activate Value + m_Type: 0 + m_ExpectedControlType: Axis + m_Id: e8756e6a-e310-4258-8b11-40506e6bafec + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_InputActionReferencePerformed: {fileID: -5982496924579745919, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} + m_InputActionReferenceValue: {fileID: -5982496924579745919, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} + m_ObjectReferenceObject: {fileID: 0} + m_ManualPerformed: 0 + m_ManualValue: 0 + m_ManualQueuePerformed: 0 + m_ManualQueueWasPerformedThisFrame: 0 + m_ManualQueueWasCompletedThisFrame: 0 + m_ManualQueueValue: 0 + m_ManualQueueTargetFrame: 0 m_SelectActionTrigger: 1 - m_HideControllerOnSelect: 0 m_AllowHoveredActivate: 0 m_TargetPriorityMode: 0 + m_HideControllerOnSelect: 0 + m_InputCompatibilityMode: 0 m_PlayAudioClipOnSelectEntered: 0 m_AudioClipForOnSelectEntered: {fileID: 0} m_PlayAudioClipOnSelectExited: 0 @@ -602,6 +928,13 @@ MonoBehaviour: m_HapticHoverCancelIntensity: 0 m_HapticHoverCancelDuration: 0 m_AllowHoverHapticsWhileSelecting: 1 + m_ImproveAccuracyWithSphereCollider: 0 + m_PhysicsLayerMask: + serializedVersion: 2 + m_Bits: 1 + m_PhysicsTriggerInteraction: 1 + trackedPoseDriver: {fileID: 3281803018082669919} + modeManagedRoot: {fileID: 1948193615953854874} pinchPoseSource: rid: 0 references: @@ -664,10 +997,21 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 761938320343190485} - serializedVersion: 2 + serializedVersion: 4 m_Mass: 1 m_Drag: 0 m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 m_UseGravity: 0 m_IsKinematic: 1 m_Interpolate: 0 @@ -694,7 +1038,7 @@ MonoBehaviour: modeOnSelect: name: GrabSelect priority: 5 - controllers: + interactorGroups: - {fileID: 1948193615953854874} --- !u!1 &1948193615953854874 GameObject: @@ -705,7 +1049,8 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1948193615953854875} - - component: {fileID: 6164080946324827545} + - component: {fileID: 3281803018082669919} + - component: {fileID: 3853158803892222464} m_Layer: 0 m_Name: MRTK LeftHand Controller m_TagString: Untagged @@ -720,6 +1065,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1948193615953854874} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -730,10 +1076,10 @@ Transform: - {fileID: 4332395624789801014} - {fileID: 4443155524692848376} - {fileID: 9148848192675160673} + - {fileID: 2497193556380645624} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &6164080946324827545 +--- !u!114 &3281803018082669919 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -742,176 +1088,112 @@ MonoBehaviour: m_GameObject: {fileID: 1948193615953854874} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 6533afcc1a3776848a226f74fce34856, type: 3} + m_Script: {fileID: 11500000, guid: 5af98ad782bb7df43838b825cd681336, type: 3} m_Name: m_EditorClassIdentifier: - m_UpdateTrackingType: 0 - m_EnableInputTracking: 1 - m_EnableInputActions: 1 - m_ModelPrefab: {fileID: 1768293572455847265, guid: 2b468cc4fe6d2b44ebc53b958b38b91a, type: 3} - m_ModelParent: {fileID: 0} - m_Model: {fileID: 0} - m_AnimateModel: 0 - m_ModelSelectTransition: - m_ModelDeSelectTransition: - m_PositionAction: + m_TrackingType: 0 + m_UpdateType: 0 + m_IgnoreTrackingState: 0 + m_PositionInput: m_UseReference: 1 m_Action: m_Name: Position m_Type: 0 - m_ExpectedControlType: - m_Id: 513ad2ba-090b-4580-b78c-5223d06c58b9 + m_ExpectedControlType: Vector3 + m_Id: 2ffafb7a-83b5-458e-9344-31822edabb07 m_Processors: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 m_Reference: {fileID: 5671224385460781980, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} - m_RotationAction: + m_RotationInput: m_UseReference: 1 m_Action: m_Name: Rotation m_Type: 0 - m_ExpectedControlType: - m_Id: 65b51994-5c1c-4624-9f51-b2d038b1e3aa + m_ExpectedControlType: Quaternion + m_Id: 6a54d6b2-6c9e-4212-8c6f-a3aa7064a85a m_Processors: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 m_Reference: {fileID: -4531104493956672492, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} - m_TrackingStateAction: + m_TrackingStateInput: m_UseReference: 1 m_Action: m_Name: Tracking State m_Type: 0 - m_ExpectedControlType: - m_Id: bf907d9d-734c-4787-805f-53320e5a09f9 + m_ExpectedControlType: Integer + m_Id: f1180364-649d-4893-87ef-4ccbb1fcd39b m_Processors: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 m_Reference: {fileID: -7613329581162844239, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} - m_SelectAction: - m_UseReference: 1 - m_Action: - m_Name: Select - m_Type: 0 - m_ExpectedControlType: - m_Id: 14bb08fd-330f-4983-885c-2ea8111b76ee - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 0 - m_Reference: {fileID: -6131295136447488360, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} - m_SelectActionValue: - m_UseReference: 1 - m_Action: - m_Name: Select Action Value - m_Type: 0 - m_ExpectedControlType: - m_Id: 12169980-9d44-4734-9f7c-8e4afa1e9758 - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 0 - m_Reference: {fileID: -294446728694031702, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} - m_ActivateAction: - m_UseReference: 1 - m_Action: - m_Name: Activate - m_Type: 0 - m_ExpectedControlType: - m_Id: ac85a030-3710-4665-bea9-62092abc602f - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 0 - m_Reference: {fileID: -5982496924579745919, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} - m_ActivateActionValue: - m_UseReference: 0 - m_Action: - m_Name: Activate Action Value - m_Type: 0 - m_ExpectedControlType: - m_Id: ff3bd004-e8ed-4aa9-bb8b-ae4c4fc724ba - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 0 - m_Reference: {fileID: 0} - m_UIPressAction: - m_UseReference: 1 - m_Action: - m_Name: UI Press - m_Type: 0 - m_ExpectedControlType: - m_Id: 06c1cd44-b783-41e5-90b4-55fa549c8f3e - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 0 - m_Reference: {fileID: -6395602842196007441, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} - m_UIPressActionValue: - m_UseReference: 0 - m_Action: - m_Name: UI Press Action Value - m_Type: 0 - m_ExpectedControlType: - m_Id: 2a2ab9f3-8d1a-43b3-a44b-29f50cc70e62 - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 0 - m_Reference: {fileID: 0} - m_HapticDeviceAction: - m_UseReference: 0 - m_Action: - m_Name: Haptic Device - m_Type: 0 - m_ExpectedControlType: - m_Id: d4977179-afcb-40aa-8cc7-4040c17172ce - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 0 - m_Reference: {fileID: 0} - m_RotateAnchorAction: - m_UseReference: 1 - m_Action: - m_Name: Rotate Anchor - m_Type: 0 - m_ExpectedControlType: - m_Id: fed765af-a56c-486f-858f-3795d5f8c934 - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 0 - m_Reference: {fileID: -7363382999065477798, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} - m_DirectionalAnchorRotationAction: - m_UseReference: 0 - m_Action: - m_Name: Directional Anchor Rotation + m_PositionAction: + m_Name: + m_Type: 0 + m_ExpectedControlType: + m_Id: c28ff882-6402-4713-8461-e09fa2f081a5 + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_RotationAction: + m_Name: + m_Type: 0 + m_ExpectedControlType: + m_Id: 896a2bca-bf2d-414e-95a7-b6a5d7b758c7 + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + handNode: 4 +--- !u!114 &3853158803892222464 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1948193615953854874} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0d08c61b7f6e43048af4ba00eb622cb0, type: 3} + m_Name: + m_EditorClassIdentifier: + modelPrefab: {fileID: 1768293572455847265, guid: 2b468cc4fe6d2b44ebc53b958b38b91a, type: 3} + modelParent: {fileID: 0} + model: {fileID: 0} + selectInput: + m_InputSourceMode: 3 + m_InputActionPerformed: + m_Name: m_Type: 0 m_ExpectedControlType: - m_Id: debc0bf7-c57b-4317-a05d-982f95726b56 + m_Id: 867e1f70-c3d1-4990-b976-117e838adc5d m_Processors: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 - m_Reference: {fileID: 0} - m_TranslateAnchorAction: - m_UseReference: 1 - m_Action: - m_Name: Translate Anchor + m_InputActionValue: + m_Name: m_Type: 0 m_ExpectedControlType: - m_Id: 33e04d29-24ab-4cfc-92cf-5bfbebe91331 + m_Id: f556ae41-4065-4e06-8810-95966a80b522 m_Processors: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 - m_Reference: {fileID: 7779212132400271959, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} - m_ButtonPressPoint: 0.5 - handNode: 4 + m_InputActionReferencePerformed: {fileID: 0} + m_InputActionReferenceValue: {fileID: 0} + m_ObjectReferenceObject: {fileID: 5536072158143193164} + m_ManualPerformed: 0 + m_ManualValue: 0 + m_ManualQueuePerformed: 0 + m_ManualQueueWasPerformedThisFrame: 0 + m_ManualQueueWasCompletedThisFrame: 0 + m_ManualQueueValue: 0 + m_ManualQueueTargetFrame: 0 --- !u!1 &1948193616346090105 GameObject: m_ObjectHideFlags: 0 @@ -937,6 +1219,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1948193616346090105} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -945,7 +1228,6 @@ Transform: - {fileID: 8443923956584964973} - {fileID: 4299642553587339576} m_Father: {fileID: 1948193615953854875} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1948193616346090107 MonoBehaviour: @@ -960,11 +1242,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_InteractionManager: {fileID: 0} - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 4294967295 + m_Handedness: 1 m_AttachTransform: {fileID: 8443923956584964973} m_KeepSelectedTargetValid: 0 m_DisableVisualsWhenBlockedInGroup: 1 @@ -984,22 +1264,71 @@ MonoBehaviour: m_Calls: [] m_StartingHoverFilters: [] m_StartingSelectFilters: [] - m_OnHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectEntered: - m_PersistentCalls: - m_Calls: [] - m_OnSelectExited: - m_PersistentCalls: - m_Calls: [] + m_SelectInput: + m_InputSourceMode: 3 + m_InputActionPerformed: + m_Name: Select + m_Type: 1 + m_ExpectedControlType: + m_Id: 17457f86-5ed8-4281-ac85-a12fe6ffde1b + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_InputActionValue: + m_Name: Select Value + m_Type: 0 + m_ExpectedControlType: Axis + m_Id: f224e436-56da-4b8b-b0b6-2ba494069cfa + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_InputActionReferencePerformed: {fileID: -6131295136447488360, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} + m_InputActionReferenceValue: {fileID: -294446728694031702, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} + m_ObjectReferenceObject: {fileID: 5536072158143193164} + m_ManualPerformed: 0 + m_ManualValue: 0 + m_ManualQueuePerformed: 0 + m_ManualQueueWasPerformedThisFrame: 0 + m_ManualQueueWasCompletedThisFrame: 0 + m_ManualQueueValue: 0 + m_ManualQueueTargetFrame: 0 + m_ActivateInput: + m_InputSourceMode: 2 + m_InputActionPerformed: + m_Name: Activate + m_Type: 1 + m_ExpectedControlType: + m_Id: abe8703d-7e52-498b-863c-eec92e429b70 + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_InputActionValue: + m_Name: Activate Value + m_Type: 0 + m_ExpectedControlType: Axis + m_Id: 83f89e1a-eef0-4a0d-bd46-8f92082d0a12 + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_InputActionReferencePerformed: {fileID: -5982496924579745919, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} + m_InputActionReferenceValue: {fileID: -5982496924579745919, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} + m_ObjectReferenceObject: {fileID: 0} + m_ManualPerformed: 0 + m_ManualValue: 0 + m_ManualQueuePerformed: 0 + m_ManualQueueWasPerformedThisFrame: 0 + m_ManualQueueWasCompletedThisFrame: 0 + m_ManualQueueValue: 0 + m_ManualQueueTargetFrame: 0 m_SelectActionTrigger: 1 - m_HideControllerOnSelect: 0 m_AllowHoveredActivate: 0 m_TargetPriorityMode: 0 + m_HideControllerOnSelect: 0 + m_InputCompatibilityMode: 0 m_PlayAudioClipOnSelectEntered: 0 m_AudioClipForOnSelectEntered: {fileID: 0} m_PlayAudioClipOnSelectExited: 0 @@ -1032,6 +1361,8 @@ MonoBehaviour: m_HapticHoverCancelIntensity: 0 m_HapticHoverCancelDuration: 0 m_AllowHoverHapticsWhileSelecting: 1 + trackedPoseDriver: {fileID: 3281803018082669919} + modeManagedRoot: {fileID: 1948193615953854874} pokePoseSource: rid: 0 references: @@ -1104,6 +1435,76 @@ MonoBehaviour: baseReticle: {fileID: 8086910922498750391} pokeInteractor: {fileID: 1948193616346090107} proximityLight: {fileID: 3552666654439622812} +--- !u!1 &2077625120998166826 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6709287148685916850} + - component: {fileID: 8876097134604027714} + m_Layer: 0 + m_Name: UISelectInputReader + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6709287148685916850 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2077625120998166826} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2497193556380645624} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &8876097134604027714 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2077625120998166826} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 63844496262f1724ba77344d77fbf000, type: 3} + m_Name: + m_EditorClassIdentifier: + handNode: 4 + selectAction: + m_UseReference: 1 + m_Action: + m_Name: Select + m_Type: 1 + m_ExpectedControlType: + m_Id: 274dbdee-86c5-4e13-9545-aad0747660ea + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_Reference: {fileID: -6395602842196007441, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} + selectActionValue: + m_UseReference: 1 + m_Action: + m_Name: Select Value + m_Type: 0 + m_ExpectedControlType: Axis + m_Id: 4187c111-e55d-45b5-ae00-ff97983a2cb5 + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_Reference: {fileID: -6395602842196007441, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} + trackedPoseDriver: {fileID: 3281803018082669919} --- !u!1 &4299642553989019656 GameObject: m_ObjectHideFlags: 0 @@ -1131,13 +1532,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4299642553989019656} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0.07} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1948193615953854875} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &8326700373702288692 MonoBehaviour: @@ -1155,7 +1556,7 @@ MonoBehaviour: modeOnDetection: name: Near priority: 2 - controllers: + interactorGroups: - {fileID: 1948193615953854874} nearInteractors: - {fileID: 1948193616346090107} @@ -1167,10 +1568,21 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4299642553989019656} - serializedVersion: 2 + serializedVersion: 4 m_Mass: 1 m_Drag: 0 m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 m_UseGravity: 0 m_IsKinematic: 1 m_Interpolate: 0 @@ -1184,9 +1596,17 @@ SphereCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4299642553989019656} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 1 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Radius: 0.1 m_Center: {x: 0, y: 0, z: 0} --- !u!114 &7678414244376504105 @@ -1204,9 +1624,6 @@ MonoBehaviour: jointPoseSource: hand: 1 joint: 10 - migratedSuccessfully: 1 - hand: 1 - joint: 10 --- !u!1 &5224294193116514423 GameObject: m_ObjectHideFlags: 0 @@ -1232,13 +1649,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5224294193116514423} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1948193615953854875} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &3419360757097544916 MonoBehaviour: @@ -1253,11 +1670,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_InteractionManager: {fileID: 0} - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 4294967295 + m_Handedness: 1 m_AttachTransform: {fileID: 0} m_KeepSelectedTargetValid: 1 m_DisableVisualsWhenBlockedInGroup: 1 @@ -1277,22 +1692,71 @@ MonoBehaviour: m_Calls: [] m_StartingHoverFilters: [] m_StartingSelectFilters: [] - m_OnHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectEntered: - m_PersistentCalls: - m_Calls: [] - m_OnSelectExited: - m_PersistentCalls: - m_Calls: [] + m_SelectInput: + m_InputSourceMode: 3 + m_InputActionPerformed: + m_Name: Select + m_Type: 1 + m_ExpectedControlType: + m_Id: ab816c3f-ae9d-44ab-93ed-0314f332a767 + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_InputActionValue: + m_Name: Select Value + m_Type: 0 + m_ExpectedControlType: Axis + m_Id: 28b7065f-89ac-47f8-8f39-774654829e5e + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_InputActionReferencePerformed: {fileID: -6131295136447488360, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} + m_InputActionReferenceValue: {fileID: -294446728694031702, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} + m_ObjectReferenceObject: {fileID: 5536072158143193164} + m_ManualPerformed: 0 + m_ManualValue: 0 + m_ManualQueuePerformed: 0 + m_ManualQueueWasPerformedThisFrame: 0 + m_ManualQueueWasCompletedThisFrame: 0 + m_ManualQueueValue: 0 + m_ManualQueueTargetFrame: 0 + m_ActivateInput: + m_InputSourceMode: 2 + m_InputActionPerformed: + m_Name: Activate + m_Type: 1 + m_ExpectedControlType: + m_Id: 944a6fdd-5053-4c62-af58-4d3417a750ed + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_InputActionValue: + m_Name: Activate Value + m_Type: 0 + m_ExpectedControlType: Axis + m_Id: 6da3f0cb-9e25-4357-bc01-4720fae8cb7f + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_InputActionReferencePerformed: {fileID: -5982496924579745919, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} + m_InputActionReferenceValue: {fileID: -5982496924579745919, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} + m_ObjectReferenceObject: {fileID: 0} + m_ManualPerformed: 0 + m_ManualValue: 0 + m_ManualQueuePerformed: 0 + m_ManualQueueWasPerformedThisFrame: 0 + m_ManualQueueWasCompletedThisFrame: 0 + m_ManualQueueValue: 0 + m_ManualQueueTargetFrame: 0 m_SelectActionTrigger: 1 - m_HideControllerOnSelect: 0 m_AllowHoveredActivate: 0 m_TargetPriorityMode: 0 + m_HideControllerOnSelect: 0 + m_InputCompatibilityMode: 0 m_PlayAudioClipOnSelectEntered: 0 m_AudioClipForOnSelectEntered: {fileID: 0} m_PlayAudioClipOnSelectExited: 0 @@ -1325,7 +1789,9 @@ MonoBehaviour: m_HapticHoverCancelIntensity: 0 m_HapticHoverCancelDuration: 0 m_AllowHoverHapticsWhileSelecting: 1 - handController: {fileID: 6164080946324827545} + trackedPoseDriver: {fileID: 3281803018082669919} + modeManagedRoot: {fileID: 1948193615953854874} + handController: {fileID: 0} devicePoseSource: rid: 0 pinchPoseSource: @@ -1464,8 +1930,78 @@ MonoBehaviour: modeOnSelect: name: GazeSelect priority: 4 - controllers: + interactorGroups: - {fileID: 1948193615953854874} +--- !u!1 &5292933843203249875 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1980541278490804707} + - component: {fileID: 5536072158143193164} + m_Layer: 0 + m_Name: SelectInputReader + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1980541278490804707 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5292933843203249875} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2497193556380645624} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &5536072158143193164 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5292933843203249875} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 63844496262f1724ba77344d77fbf000, type: 3} + m_Name: + m_EditorClassIdentifier: + handNode: 4 + selectAction: + m_UseReference: 1 + m_Action: + m_Name: Select + m_Type: 1 + m_ExpectedControlType: + m_Id: 274dbdee-86c5-4e13-9545-aad0747660ea + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_Reference: {fileID: -6131295136447488360, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} + selectActionValue: + m_UseReference: 1 + m_Action: + m_Name: Select Value + m_Type: 0 + m_ExpectedControlType: Axis + m_Id: 4187c111-e55d-45b5-ae00-ff97983a2cb5 + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_Reference: {fileID: -294446728694031702, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} + trackedPoseDriver: {fileID: 3281803018082669919} --- !u!1 &6406844254730761679 GameObject: m_ObjectHideFlags: 0 @@ -1490,13 +2026,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6406844254730761679} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4443155524692848376} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!135 &6800936895746535163 SphereCollider: @@ -1506,11 +2042,53 @@ SphereCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6406844254730761679} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 1 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Radius: 0.05 m_Center: {x: 0, y: 0, z: 0} +--- !u!1 &7842264648853585747 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2497193556380645624} + m_Layer: 0 + m_Name: InputReaders + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2497193556380645624 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7842264648853585747} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: -1.6, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1980541278490804707} + - {fileID: 4926630461381577642} + - {fileID: 6709287148685916850} + m_Father: {fileID: 1948193615953854875} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &8822000602352085715 GameObject: m_ObjectHideFlags: 0 @@ -1537,16 +2115,17 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8822000602352085715} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4332395624789801014} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!120 &5409732680908794997 LineRenderer: + serializedVersion: 2 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -1643,16 +2222,20 @@ LineRenderer: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 numCornerVertices: 8 numCapVertices: 8 alignment: 0 textureMode: 1 + textureScale: {x: 1, y: 1} shadowBias: 0 generateLightingData: 0 + m_MaskInteraction: 0 m_UseWorldSpace: 1 m_Loop: 0 + m_ApplyActiveColorSpace: 0 --- !u!114 &3681755664881842967 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1697,6 +2280,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4332395624789801014} m_Modifications: - target: {fileID: 916568500123441303, guid: fddee8b412d753e40a02681891de4a7b, type: 3} @@ -1768,6 +2352,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fddee8b412d753e40a02681891de4a7b, type: 3} --- !u!4 &3988544559415115452 stripped Transform: @@ -1789,6 +2376,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1948193616346090106} m_Modifications: - target: {fileID: 3867428799850922014, guid: fddee8b412d753e40a02681891de4a7b, type: 3} @@ -1856,6 +2444,12 @@ PrefabInstance: value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 9095796513279534737, guid: fddee8b412d753e40a02681891de4a7b, type: 3} + insertIndex: -1 + addedObject: {fileID: 943052423812839532} m_SourcePrefab: {fileID: 100100000, guid: fddee8b412d753e40a02681891de4a7b, type: 3} --- !u!1 &3552666654439622812 stripped GameObject: diff --git a/org.mixedrealitytoolkit.input/Assets/Prefabs/MRTK LeftHand Controller.prefab.meta b/org.mixedrealitytoolkit.input/Assets/Prefabs/MRTK LeftHand Controller.prefab.meta index 3b3c7ff1e..c399dbb7d 100644 --- a/org.mixedrealitytoolkit.input/Assets/Prefabs/MRTK LeftHand Controller.prefab.meta +++ b/org.mixedrealitytoolkit.input/Assets/Prefabs/MRTK LeftHand Controller.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: c89f12cb641c27e47b7b71af1d6518a5 +guid: 90f955d6c9d709448a0b1e29e1f9c046 PrefabImporter: externalObjects: {} userData: diff --git a/org.mixedrealitytoolkit.input/Assets/Prefabs/MRTK RightHand Controller.prefab b/org.mixedrealitytoolkit.input/Assets/Prefabs/MRTK RightHand Controller.prefab index 30c3caeca..42db12354 100644 --- a/org.mixedrealitytoolkit.input/Assets/Prefabs/MRTK RightHand Controller.prefab +++ b/org.mixedrealitytoolkit.input/Assets/Prefabs/MRTK RightHand Controller.prefab @@ -1,287 +1,315 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1001 &7898662983119667484 +--- !u!1001 &2100469275023299847 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 1948193615953854874, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} + - target: {fileID: 1948193615953854874, guid: 90f955d6c9d709448a0b1e29e1f9c046, type: 3} propertyPath: m_Name value: MRTK RightHand Controller objectReference: {fileID: 0} - - target: {fileID: 1948193615953854875, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} - propertyPath: m_RootOrder + - target: {fileID: 1948193615953854875, guid: 90f955d6c9d709448a0b1e29e1f9c046, type: 3} + propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 1948193615953854875, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} + - target: {fileID: 1948193615953854875, guid: 90f955d6c9d709448a0b1e29e1f9c046, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1948193615953854875, guid: 90f955d6c9d709448a0b1e29e1f9c046, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1948193615953854875, guid: 90f955d6c9d709448a0b1e29e1f9c046, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1948193615953854875, guid: 90f955d6c9d709448a0b1e29e1f9c046, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1948193615953854875, guid: 90f955d6c9d709448a0b1e29e1f9c046, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1948193615953854875, guid: 90f955d6c9d709448a0b1e29e1f9c046, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1948193615953854875, guid: 90f955d6c9d709448a0b1e29e1f9c046, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 1948193615953854875, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} + - target: {fileID: 1948193615953854875, guid: 90f955d6c9d709448a0b1e29e1f9c046, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 1948193615953854875, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} + - target: {fileID: 1948193615953854875, guid: 90f955d6c9d709448a0b1e29e1f9c046, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 1948193616346090107, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} - propertyPath: managedReferences[1].hand + - target: {fileID: 1948193616346090107, guid: 90f955d6c9d709448a0b1e29e1f9c046, type: 3} + propertyPath: m_Handedness value: 2 objectReference: {fileID: 0} - - target: {fileID: 1948193616346090107, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} - propertyPath: pokePoseSource.poseSourceList.Array.data[0].hand + - target: {fileID: 1948193616346090107, guid: 90f955d6c9d709448a0b1e29e1f9c046, type: 3} + propertyPath: managedReferences[1].hand value: 2 objectReference: {fileID: 0} - - target: {fileID: 1948193616346090107, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} + - target: {fileID: 1948193616346090107, guid: 90f955d6c9d709448a0b1e29e1f9c046, type: 3} + propertyPath: m_SelectInput.m_InputActionReferenceValue + value: + objectReference: {fileID: 2995356199736570127, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} + - target: {fileID: 1948193616346090107, guid: 90f955d6c9d709448a0b1e29e1f9c046, type: 3} + propertyPath: m_ActivateInput.m_InputActionReferenceValue + value: + objectReference: {fileID: 83097790271614945, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} + - target: {fileID: 1948193616346090107, guid: 90f955d6c9d709448a0b1e29e1f9c046, type: 3} + propertyPath: m_SelectInput.m_InputActionReferencePerformed + value: + objectReference: {fileID: 187161793506945269, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} + - target: {fileID: 1948193616346090107, guid: 90f955d6c9d709448a0b1e29e1f9c046, type: 3} + propertyPath: m_ActivateInput.m_InputActionReferencePerformed + value: + objectReference: {fileID: 83097790271614945, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} + - target: {fileID: 1948193616346090107, guid: 90f955d6c9d709448a0b1e29e1f9c046, type: 3} propertyPath: managedReferences[2].positionActionProperty.m_Reference value: objectReference: {fileID: -3326005586356538449, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} - - target: {fileID: 1948193616346090107, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} + - target: {fileID: 1948193616346090107, guid: 90f955d6c9d709448a0b1e29e1f9c046, type: 3} propertyPath: managedReferences[2].rotationActionProperty.m_Reference value: objectReference: {fileID: 5101698808175986029, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} - - target: {fileID: 1948193616346090107, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} + - target: {fileID: 1948193616346090107, guid: 90f955d6c9d709448a0b1e29e1f9c046, type: 3} propertyPath: managedReferences[2].trackingStateActionProperty.m_Reference value: objectReference: {fileID: 3239510804178183174, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} - - target: {fileID: 1948193616346090107, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} - propertyPath: pokePoseSource.poseSourceList.Array.data[1].positionActionProperty.m_Reference - value: - objectReference: {fileID: -3326005586356538449, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} - - target: {fileID: 1948193616346090107, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} - propertyPath: pokePoseSource.poseSourceList.Array.data[1].rotationActionProperty.m_Reference + - target: {fileID: 2393634401634928266, guid: 90f955d6c9d709448a0b1e29e1f9c046, type: 3} + propertyPath: handNode + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 2393634401634928266, guid: 90f955d6c9d709448a0b1e29e1f9c046, type: 3} + propertyPath: selectAction.m_Reference value: - objectReference: {fileID: 5101698808175986029, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} - - target: {fileID: 1948193616346090107, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} - propertyPath: pokePoseSource.poseSourceList.Array.data[1].trackingStateActionProperty.m_Reference + objectReference: {fileID: -7447404843880048209, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} + - target: {fileID: 2393634401634928266, guid: 90f955d6c9d709448a0b1e29e1f9c046, type: 3} + propertyPath: selectActionValue.m_Reference value: - objectReference: {fileID: 3239510804178183174, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} - - target: {fileID: 2572330550550829917, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} - propertyPath: managedReferences[1].hand + objectReference: {fileID: -5185190146762457406, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} + - target: {fileID: 2572330550550829917, guid: 90f955d6c9d709448a0b1e29e1f9c046, type: 3} + propertyPath: m_Handedness value: 2 objectReference: {fileID: 0} - - target: {fileID: 2572330550550829917, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} - propertyPath: pinchPoseSource.poseSourceList.Array.data[0].hand + - target: {fileID: 2572330550550829917, guid: 90f955d6c9d709448a0b1e29e1f9c046, type: 3} + propertyPath: managedReferences[1].hand value: 2 objectReference: {fileID: 0} - - target: {fileID: 2572330550550829917, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} - propertyPath: managedReferences[2].positionActionProperty.m_Reference + - target: {fileID: 2572330550550829917, guid: 90f955d6c9d709448a0b1e29e1f9c046, type: 3} + propertyPath: m_SelectInput.m_InputActionReferenceValue value: - objectReference: {fileID: -3326005586356538449, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} - - target: {fileID: 2572330550550829917, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} - propertyPath: managedReferences[2].rotationActionProperty.m_Reference + objectReference: {fileID: 2995356199736570127, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} + - target: {fileID: 2572330550550829917, guid: 90f955d6c9d709448a0b1e29e1f9c046, type: 3} + propertyPath: m_ActivateInput.m_InputActionReferenceValue value: - objectReference: {fileID: 5101698808175986029, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} - - target: {fileID: 2572330550550829917, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} - propertyPath: managedReferences[2].trackingStateActionProperty.m_Reference + objectReference: {fileID: 83097790271614945, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} + - target: {fileID: 2572330550550829917, guid: 90f955d6c9d709448a0b1e29e1f9c046, type: 3} + propertyPath: m_SelectInput.m_InputActionReferencePerformed value: - objectReference: {fileID: 3239510804178183174, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} - - target: {fileID: 2572330550550829917, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} - propertyPath: pinchPoseSource.poseSourceList.Array.data[1].positionActionProperty.m_Reference + objectReference: {fileID: 187161793506945269, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} + - target: {fileID: 2572330550550829917, guid: 90f955d6c9d709448a0b1e29e1f9c046, type: 3} + propertyPath: m_ActivateInput.m_InputActionReferencePerformed + value: + objectReference: {fileID: 83097790271614945, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} + - target: {fileID: 2572330550550829917, guid: 90f955d6c9d709448a0b1e29e1f9c046, type: 3} + propertyPath: managedReferences[2].positionActionProperty.m_Reference value: objectReference: {fileID: -3326005586356538449, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} - - target: {fileID: 2572330550550829917, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} - propertyPath: pinchPoseSource.poseSourceList.Array.data[1].rotationActionProperty.m_Reference + - target: {fileID: 2572330550550829917, guid: 90f955d6c9d709448a0b1e29e1f9c046, type: 3} + propertyPath: managedReferences[2].rotationActionProperty.m_Reference value: objectReference: {fileID: 5101698808175986029, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} - - target: {fileID: 2572330550550829917, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} - propertyPath: pinchPoseSource.poseSourceList.Array.data[1].trackingStateActionProperty.m_Reference + - target: {fileID: 2572330550550829917, guid: 90f955d6c9d709448a0b1e29e1f9c046, type: 3} + propertyPath: managedReferences[2].trackingStateActionProperty.m_Reference value: objectReference: {fileID: 3239510804178183174, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} - - target: {fileID: 2940030942784507886, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} - propertyPath: managedReferences[3].hand - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 2940030942784507886, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} - propertyPath: managedReferences[5].hand + - target: {fileID: 2940030942784507886, guid: 90f955d6c9d709448a0b1e29e1f9c046, type: 3} + propertyPath: m_Handedness value: 2 objectReference: {fileID: 0} - - target: {fileID: 2940030942784507886, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} - propertyPath: aimPoseSource.poseSourceList.Array.data[1].hand + - target: {fileID: 2940030942784507886, guid: 90f955d6c9d709448a0b1e29e1f9c046, type: 3} + propertyPath: managedReferences[3].hand value: 2 objectReference: {fileID: 0} - - target: {fileID: 2940030942784507886, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} - propertyPath: devicePoseSource.poseSourceList.Array.data[1].hand + - target: {fileID: 2940030942784507886, guid: 90f955d6c9d709448a0b1e29e1f9c046, type: 3} + propertyPath: managedReferences[5].hand value: 2 objectReference: {fileID: 0} - - target: {fileID: 2940030942784507886, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} + - target: {fileID: 2940030942784507886, guid: 90f955d6c9d709448a0b1e29e1f9c046, type: 3} + propertyPath: m_SelectInput.m_InputActionReferenceValue + value: + objectReference: {fileID: 2995356199736570127, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} + - target: {fileID: 2940030942784507886, guid: 90f955d6c9d709448a0b1e29e1f9c046, type: 3} + propertyPath: m_UIPressInput.m_InputActionReferenceValue + value: + objectReference: {fileID: 3279264004350380116, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} + - target: {fileID: 2940030942784507886, guid: 90f955d6c9d709448a0b1e29e1f9c046, type: 3} + propertyPath: m_ActivateInput.m_InputActionReferenceValue + value: + objectReference: {fileID: 83097790271614945, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} + - target: {fileID: 2940030942784507886, guid: 90f955d6c9d709448a0b1e29e1f9c046, type: 3} + propertyPath: m_SelectInput.m_InputActionReferencePerformed + value: + objectReference: {fileID: 187161793506945269, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} + - target: {fileID: 2940030942784507886, guid: 90f955d6c9d709448a0b1e29e1f9c046, type: 3} + propertyPath: m_UIPressInput.m_InputActionReferencePerformed + value: + objectReference: {fileID: 3279264004350380116, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} + - target: {fileID: 2940030942784507886, guid: 90f955d6c9d709448a0b1e29e1f9c046, type: 3} + propertyPath: m_ActivateInput.m_InputActionReferencePerformed + value: + objectReference: {fileID: 83097790271614945, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} + - target: {fileID: 2940030942784507886, guid: 90f955d6c9d709448a0b1e29e1f9c046, type: 3} propertyPath: managedReferences[2].positionActionProperty.m_Reference value: objectReference: {fileID: -3326005586356538449, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} - - target: {fileID: 2940030942784507886, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} + - target: {fileID: 2940030942784507886, guid: 90f955d6c9d709448a0b1e29e1f9c046, type: 3} propertyPath: managedReferences[2].rotationActionProperty.m_Reference value: objectReference: {fileID: 5101698808175986029, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} - - target: {fileID: 2940030942784507886, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} + - target: {fileID: 2940030942784507886, guid: 90f955d6c9d709448a0b1e29e1f9c046, type: 3} propertyPath: managedReferences[4].positionActionProperty.m_Reference value: objectReference: {fileID: -1813146318149588949, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} - - target: {fileID: 2940030942784507886, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} + - target: {fileID: 2940030942784507886, guid: 90f955d6c9d709448a0b1e29e1f9c046, type: 3} propertyPath: managedReferences[4].rotationActionProperty.m_Reference value: objectReference: {fileID: 5820880757197039143, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} - - target: {fileID: 2940030942784507886, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} + - target: {fileID: 2940030942784507886, guid: 90f955d6c9d709448a0b1e29e1f9c046, type: 3} propertyPath: managedReferences[2].trackingStateActionProperty.m_Reference value: objectReference: {fileID: 3239510804178183174, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} - - target: {fileID: 2940030942784507886, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} + - target: {fileID: 2940030942784507886, guid: 90f955d6c9d709448a0b1e29e1f9c046, type: 3} propertyPath: managedReferences[4].trackingStateActionProperty.m_Reference value: objectReference: {fileID: 3239510804178183174, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} - - target: {fileID: 2940030942784507886, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} - propertyPath: aimPoseSource.poseSourceList.Array.data[0].positionActionProperty.m_Reference - value: - objectReference: {fileID: -3326005586356538449, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} - - target: {fileID: 2940030942784507886, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} - propertyPath: aimPoseSource.poseSourceList.Array.data[0].rotationActionProperty.m_Reference - value: - objectReference: {fileID: 5101698808175986029, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} - - target: {fileID: 2940030942784507886, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} - propertyPath: devicePoseSource.poseSourceList.Array.data[0].positionActionProperty.m_Reference + - target: {fileID: 3281803018082669919, guid: 90f955d6c9d709448a0b1e29e1f9c046, type: 3} + propertyPath: handNode + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 3281803018082669919, guid: 90f955d6c9d709448a0b1e29e1f9c046, type: 3} + propertyPath: m_PositionInput.m_Reference value: objectReference: {fileID: -1813146318149588949, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} - - target: {fileID: 2940030942784507886, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} - propertyPath: devicePoseSource.poseSourceList.Array.data[0].rotationActionProperty.m_Reference + - target: {fileID: 3281803018082669919, guid: 90f955d6c9d709448a0b1e29e1f9c046, type: 3} + propertyPath: m_RotationInput.m_Reference value: objectReference: {fileID: 5820880757197039143, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} - - target: {fileID: 2940030942784507886, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} - propertyPath: aimPoseSource.poseSourceList.Array.data[0].trackingStateActionProperty.m_Reference + - target: {fileID: 3281803018082669919, guid: 90f955d6c9d709448a0b1e29e1f9c046, type: 3} + propertyPath: m_TrackingStateInput.m_Reference value: objectReference: {fileID: 3239510804178183174, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} - - target: {fileID: 2940030942784507886, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} - propertyPath: devicePoseSource.poseSourceList.Array.data[0].trackingStateActionProperty.m_Reference - value: - objectReference: {fileID: 3239510804178183174, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} - - target: {fileID: 3419360757097544916, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} - propertyPath: pinchPoseSource.hand + - target: {fileID: 3419360757097544916, guid: 90f955d6c9d709448a0b1e29e1f9c046, type: 3} + propertyPath: m_Handedness value: 2 objectReference: {fileID: 0} - - target: {fileID: 3419360757097544916, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} + - target: {fileID: 3419360757097544916, guid: 90f955d6c9d709448a0b1e29e1f9c046, type: 3} propertyPath: managedReferences[1].hand value: 2 objectReference: {fileID: 0} - - target: {fileID: 3419360757097544916, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} + - target: {fileID: 3419360757097544916, guid: 90f955d6c9d709448a0b1e29e1f9c046, type: 3} propertyPath: managedReferences[4].hand value: 2 objectReference: {fileID: 0} - - target: {fileID: 3419360757097544916, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} + - target: {fileID: 3419360757097544916, guid: 90f955d6c9d709448a0b1e29e1f9c046, type: 3} propertyPath: managedReferences[6].hand value: 2 objectReference: {fileID: 0} - - target: {fileID: 3419360757097544916, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} - propertyPath: aimPoseSource.poseSourceList.Array.data[1].hand - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 3419360757097544916, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} - propertyPath: devicePoseSource.poseSourceList.Array.data[1].hand - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 3419360757097544916, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} + - target: {fileID: 3419360757097544916, guid: 90f955d6c9d709448a0b1e29e1f9c046, type: 3} + propertyPath: m_SelectInput.m_InputActionReferenceValue + value: + objectReference: {fileID: 2995356199736570127, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} + - target: {fileID: 3419360757097544916, guid: 90f955d6c9d709448a0b1e29e1f9c046, type: 3} + propertyPath: m_ActivateInput.m_InputActionReferenceValue + value: + objectReference: {fileID: 83097790271614945, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} + - target: {fileID: 3419360757097544916, guid: 90f955d6c9d709448a0b1e29e1f9c046, type: 3} + propertyPath: m_SelectInput.m_InputActionReferencePerformed + value: + objectReference: {fileID: 187161793506945269, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} + - target: {fileID: 3419360757097544916, guid: 90f955d6c9d709448a0b1e29e1f9c046, type: 3} + propertyPath: m_ActivateInput.m_InputActionReferencePerformed + value: + objectReference: {fileID: 83097790271614945, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} + - target: {fileID: 3419360757097544916, guid: 90f955d6c9d709448a0b1e29e1f9c046, type: 3} propertyPath: managedReferences[3].positionActionProperty.m_Reference value: objectReference: {fileID: -1813146318149588949, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} - - target: {fileID: 3419360757097544916, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} + - target: {fileID: 3419360757097544916, guid: 90f955d6c9d709448a0b1e29e1f9c046, type: 3} propertyPath: managedReferences[3].rotationActionProperty.m_Reference value: objectReference: {fileID: 5820880757197039143, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} - - target: {fileID: 3419360757097544916, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} + - target: {fileID: 3419360757097544916, guid: 90f955d6c9d709448a0b1e29e1f9c046, type: 3} propertyPath: managedReferences[5].positionActionProperty.m_Reference value: objectReference: {fileID: -3326005586356538449, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} - - target: {fileID: 3419360757097544916, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} + - target: {fileID: 3419360757097544916, guid: 90f955d6c9d709448a0b1e29e1f9c046, type: 3} propertyPath: managedReferences[5].rotationActionProperty.m_Reference value: objectReference: {fileID: 5101698808175986029, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} - - target: {fileID: 3419360757097544916, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} + - target: {fileID: 3419360757097544916, guid: 90f955d6c9d709448a0b1e29e1f9c046, type: 3} propertyPath: managedReferences[3].trackingStateActionProperty.m_Reference value: objectReference: {fileID: 3239510804178183174, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} - - target: {fileID: 3419360757097544916, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} + - target: {fileID: 3419360757097544916, guid: 90f955d6c9d709448a0b1e29e1f9c046, type: 3} propertyPath: managedReferences[5].trackingStateActionProperty.m_Reference value: objectReference: {fileID: 3239510804178183174, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} - - target: {fileID: 3419360757097544916, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} - propertyPath: aimPoseSource.poseSourceList.Array.data[0].positionActionProperty.m_Reference - value: - objectReference: {fileID: -3326005586356538449, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} - - target: {fileID: 3419360757097544916, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} - propertyPath: aimPoseSource.poseSourceList.Array.data[0].rotationActionProperty.m_Reference - value: - objectReference: {fileID: 5101698808175986029, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} - - target: {fileID: 3419360757097544916, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} - propertyPath: devicePoseSource.poseSourceList.Array.data[0].positionActionProperty.m_Reference - value: - objectReference: {fileID: -1813146318149588949, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} - - target: {fileID: 3419360757097544916, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} - propertyPath: devicePoseSource.poseSourceList.Array.data[0].rotationActionProperty.m_Reference - value: - objectReference: {fileID: 5820880757197039143, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} - - target: {fileID: 3419360757097544916, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} - propertyPath: aimPoseSource.poseSourceList.Array.data[0].trackingStateActionProperty.m_Reference - value: - objectReference: {fileID: 3239510804178183174, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} - - target: {fileID: 3419360757097544916, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} - propertyPath: devicePoseSource.poseSourceList.Array.data[0].trackingStateActionProperty.m_Reference + - target: {fileID: 3853158803892222464, guid: 90f955d6c9d709448a0b1e29e1f9c046, type: 3} + propertyPath: modelPrefab value: - objectReference: {fileID: 3239510804178183174, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} - - target: {fileID: 6164080946324827545, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} + objectReference: {fileID: 3973969148631863464, guid: da93d751ddc0f64468dfc02f18d02d00, type: 3} + - target: {fileID: 5536072158143193164, guid: 90f955d6c9d709448a0b1e29e1f9c046, type: 3} propertyPath: handNode value: 5 objectReference: {fileID: 0} - - target: {fileID: 6164080946324827545, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} - propertyPath: m_ModelPrefab - value: - objectReference: {fileID: 3973969148631863464, guid: da93d751ddc0f64468dfc02f18d02d00, type: 3} - - target: {fileID: 6164080946324827545, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} - propertyPath: m_SelectAction.m_Reference + - target: {fileID: 5536072158143193164, guid: 90f955d6c9d709448a0b1e29e1f9c046, type: 3} + propertyPath: selectAction.m_Reference value: objectReference: {fileID: 187161793506945269, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} - - target: {fileID: 6164080946324827545, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} - propertyPath: m_UIPressAction.m_Reference - value: - objectReference: {fileID: 3279264004350380116, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} - - target: {fileID: 6164080946324827545, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} - propertyPath: m_ActivateAction.m_Reference - value: - objectReference: {fileID: 83097790271614945, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} - - target: {fileID: 6164080946324827545, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} - propertyPath: m_PositionAction.m_Reference - value: - objectReference: {fileID: -1813146318149588949, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} - - target: {fileID: 6164080946324827545, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} - propertyPath: m_RotationAction.m_Reference - value: - objectReference: {fileID: 5820880757197039143, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} - - target: {fileID: 6164080946324827545, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} - propertyPath: m_SelectActionValue.m_Reference + - target: {fileID: 5536072158143193164, guid: 90f955d6c9d709448a0b1e29e1f9c046, type: 3} + propertyPath: selectActionValue.m_Reference value: objectReference: {fileID: 2995356199736570127, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} - - target: {fileID: 6164080946324827545, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} - propertyPath: m_RotateAnchorAction.m_Reference - value: - objectReference: {fileID: -5913262927076077117, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} - - target: {fileID: 6164080946324827545, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} - propertyPath: m_TrackingStateAction.m_Reference - value: - objectReference: {fileID: 3239510804178183174, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} - - target: {fileID: 6164080946324827545, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} - propertyPath: m_TranslateAnchorAction.m_Reference - value: - objectReference: {fileID: 875253871413052681, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} - - target: {fileID: 6937621743165281871, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} + - target: {fileID: 6937621743165281871, guid: 90f955d6c9d709448a0b1e29e1f9c046, type: 3} propertyPath: settings.handedness value: 2 objectReference: {fileID: 0} - - target: {fileID: 7678414244376504105, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} + - target: {fileID: 7678414244376504105, guid: 90f955d6c9d709448a0b1e29e1f9c046, type: 3} propertyPath: jointPoseSource.hand value: 2 objectReference: {fileID: 0} - - target: {fileID: 7833497039863265739, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} + - target: {fileID: 7833497039863265739, guid: 90f955d6c9d709448a0b1e29e1f9c046, type: 3} propertyPath: settings.handedness value: 2 objectReference: {fileID: 0} + - target: {fileID: 8876097134604027714, guid: 90f955d6c9d709448a0b1e29e1f9c046, type: 3} + propertyPath: handNode + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 8876097134604027714, guid: 90f955d6c9d709448a0b1e29e1f9c046, type: 3} + propertyPath: selectAction.m_Reference + value: + objectReference: {fileID: 3279264004350380116, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} + - target: {fileID: 8876097134604027714, guid: 90f955d6c9d709448a0b1e29e1f9c046, type: 3} + propertyPath: selectActionValue.m_Reference + value: + objectReference: {fileID: 3279264004350380116, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 90f955d6c9d709448a0b1e29e1f9c046, type: 3} diff --git a/org.mixedrealitytoolkit.input/Assets/Prefabs/MRTK RightHand Controller.prefab.meta b/org.mixedrealitytoolkit.input/Assets/Prefabs/MRTK RightHand Controller.prefab.meta index cb3691fbb..265ecebf6 100644 --- a/org.mixedrealitytoolkit.input/Assets/Prefabs/MRTK RightHand Controller.prefab.meta +++ b/org.mixedrealitytoolkit.input/Assets/Prefabs/MRTK RightHand Controller.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 82333e6e543cb7e4dbd5b1d47aff3f58 +guid: 2e5b90c191b94004182e55a48f0ca427 PrefabImporter: externalObjects: {} userData: diff --git a/org.mixedrealitytoolkit.input/Assets/Prefabs/MRTK XR Rig.prefab b/org.mixedrealitytoolkit.input/Assets/Prefabs/MRTK XR Rig.prefab index 9edc69172..e3a8ad08e 100644 --- a/org.mixedrealitytoolkit.input/Assets/Prefabs/MRTK XR Rig.prefab +++ b/org.mixedrealitytoolkit.input/Assets/Prefabs/MRTK XR Rig.prefab @@ -14,6 +14,8 @@ GameObject: - component: {fileID: 2351505566771328560} - component: {fileID: 2351505566771328561} - component: {fileID: 404949538145338360} + - component: {fileID: 2036977346182542242} + - component: {fileID: 9155035745778857788} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -28,13 +30,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2351505566771328562} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2351505566903569412} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!20 &2351505566771328527 Camera: @@ -50,9 +52,17 @@ Camera: m_projectionMatrixMode: 1 m_GateFitMode: 2 m_FOVAxisMode: 0 + m_Iso: 200 + m_ShutterSpeed: 0.005 + m_Aperture: 16 + m_FocusDistance: 10 + m_FocalLength: 50 + m_BladeCount: 5 + m_Curvature: {x: 2, y: 11} + m_BarrelClipping: 0.25 + m_Anamorphism: 0 m_SensorSize: {x: 36, y: 24} m_LensShift: {x: 0, y: 0} - m_FocalLength: 50 m_NormalizedViewPortRect: serializedVersion: 2 x: 0 @@ -119,7 +129,7 @@ MonoBehaviour: m_UpdateType: 0 m_IgnoreTrackingState: 0 m_PositionInput: - m_UseReference: 0 + m_UseReference: 1 m_Action: m_Name: Main Camera - TPD - Position m_Type: 0 @@ -145,9 +155,9 @@ MonoBehaviour: m_Action: Main Camera - TPD - Position m_Flags: 0 m_Flags: 0 - m_Reference: {fileID: 0} + m_Reference: {fileID: 6617357981711541546, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} m_RotationInput: - m_UseReference: 0 + m_UseReference: 1 m_Action: m_Name: Main Camera - TPD - Rotation m_Type: 0 @@ -173,9 +183,9 @@ MonoBehaviour: m_Action: Main Camera - TPD - Rotation m_Flags: 0 m_Flags: 0 - m_Reference: {fileID: 0} + m_Reference: {fileID: 1272146141651074281, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} m_TrackingStateInput: - m_UseReference: 0 + m_UseReference: 1 m_Action: m_Name: Tracking State Input m_Type: 0 @@ -185,7 +195,7 @@ MonoBehaviour: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 - m_Reference: {fileID: 0} + m_Reference: {fileID: 5232793463981167437, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} m_PositionAction: m_Name: Main Camera - TPD - Position m_Type: 0 @@ -232,6 +242,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 80bee04b0b615324e81420c8aac0dc47, type: 3} m_Name: m_EditorClassIdentifier: + editorDefault: 1 opaqueDisplay: clearMode: 1 clearColor: {r: 0, g: 0, b: 0, a: 0} @@ -246,6 +257,38 @@ MonoBehaviour: farPlaneDistance: 50 adjustQualityLevel: 1 qualityLevel: 0 +--- !u!45 &2036977346182542242 +Skybox: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2351505566771328562} + m_Enabled: 1 + m_CustomSkybox: {fileID: 0} +--- !u!114 &9155035745778857788 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2351505566771328562} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 699100ca886480c4a94ced56b1ae0e94, type: 3} + m_Name: + m_EditorClassIdentifier: + themeDataSource: {fileID: 11400000, guid: 57993c46ea42acf4ca3067542443bc45, type: 2} + binders: + - rid: 8397413447246282960 + references: + version: 2 + RefIds: + - rid: 8397413447246282960 + type: {class: SkyboxMaterialBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 2036977346182542242} + k__BackingField: Skybox --- !u!1 &2351505566903569413 GameObject: m_ObjectHideFlags: 0 @@ -271,17 +314,17 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2351505566903569413} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 1.6, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 2351505566771328526} - - {fileID: 5727148871348114050} - - {fileID: 5870931076965904816} - - {fileID: 5628234118856470563} + - {fileID: 8193081038271214069} + - {fileID: 5769779419222680683} + - {fileID: 7294214612838230064} m_Father: {fileID: 2351505567455720332} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &3712792914886690938 MonoBehaviour: @@ -323,6 +366,7 @@ GameObject: - component: {fileID: 2351505567455720332} - component: {fileID: 4160709927669568829} - component: {fileID: 6400715630075217958} + - component: {fileID: 1798554929582623642} m_Layer: 0 m_Name: MRTK XR Rig m_TagString: Untagged @@ -337,17 +381,17 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2351505567455720334} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 5241231772802432718} - {fileID: 2351505566903569412} - {fileID: 7609097064974327368} + - {fileID: 1074856417076994631} - {fileID: 6448619845270702420} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &4160709927669568829 MonoBehaviour: @@ -375,6 +419,21 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1a107350295baaf4489642caa92f05de, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &1798554929582623642 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2351505567455720334} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 671b97df530b06e46893c4189b3ceab4, type: 3} + m_Name: + m_EditorClassIdentifier: + inputActionReferences: + - {fileID: -7613329581162844239, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} + - {fileID: 3239510804178183174, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} --- !u!1 &7735890427496681069 GameObject: m_ObjectHideFlags: 0 @@ -400,13 +459,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7735890427496681069} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2351505567455720332} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &8085333164323593313 MonoBehaviour: @@ -420,12 +479,10 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 215885e6942e29c4e9022fde2c8cd88c, type: 3} m_Name: m_EditorClassIdentifier: - m_InteractionManager: {fileID: 5569439093497552269} - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 + m_InteractionManager: {fileID: 800708247703322884} m_InteractionLayers: m_Bits: 4294967295 + m_Handedness: 0 m_AttachTransform: {fileID: 0} m_KeepSelectedTargetValid: 1 m_DisableVisualsWhenBlockedInGroup: 1 @@ -445,18 +502,6 @@ MonoBehaviour: m_Calls: [] m_StartingHoverFilters: [] m_StartingSelectFilters: [] - m_OnHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectEntered: - m_PersistentCalls: - m_Calls: [] - m_OnSelectExited: - m_PersistentCalls: - m_Calls: [] --- !u!114 &8386996556897629391 MonoBehaviour: m_ObjectHideFlags: 0 @@ -472,7 +517,7 @@ MonoBehaviour: flatScreenInteractionMode: name: FlatScreen priority: 6 - controllers: + interactorGroups: - {fileID: 7735890427496681069} --- !u!1 &8479077998186684813 GameObject: @@ -498,13 +543,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8479077998186684813} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2351505567455720332} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &7720573869748407015 MonoBehaviour: @@ -519,11 +564,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_InteractionManager: {fileID: 0} - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 4294967295 + m_Handedness: 0 m_AttachTransform: {fileID: 0} m_KeepSelectedTargetValid: 1 m_DisableVisualsWhenBlockedInGroup: 1 @@ -543,52 +586,84 @@ MonoBehaviour: m_Calls: [] m_StartingHoverFilters: [] m_StartingSelectFilters: [] - m_OnHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectEntered: - m_PersistentCalls: - m_Calls: [] - m_OnSelectExited: - m_PersistentCalls: - m_Calls: [] voiceCommandTriggerTime: 0.3 ---- !u!1001 &1224987191631620050 +--- !u!1001 &3361987198643840516 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2351505566903569412} m_Modifications: - - target: {fileID: 6853218870844938225, guid: 6f3af2a8508960843b36fb9d64de2bc2, type: 3} - propertyPath: m_RootOrder - value: 3 + - target: {fileID: 3021976565802998075, guid: d8a2a1f4b4f78754c86045f7a36fe424, type: 3} + propertyPath: m_SelectInput.m_InputActionReferenceValue + value: + objectReference: {fileID: 0} + - target: {fileID: 3021976565802998075, guid: d8a2a1f4b4f78754c86045f7a36fe424, type: 3} + propertyPath: m_ActivateInput.m_InputActionReferenceValue + value: + objectReference: {fileID: 0} + - target: {fileID: 3021976565802998075, guid: d8a2a1f4b4f78754c86045f7a36fe424, type: 3} + propertyPath: m_SelectInput.m_InputActionReferencePerformed + value: + objectReference: {fileID: 0} + - target: {fileID: 3021976565802998075, guid: d8a2a1f4b4f78754c86045f7a36fe424, type: 3} + propertyPath: m_ActivateInput.m_InputActionReferencePerformed + value: + objectReference: {fileID: 0} + - target: {fileID: 6853218870844938225, guid: d8a2a1f4b4f78754c86045f7a36fe424, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6853218870844938225, guid: d8a2a1f4b4f78754c86045f7a36fe424, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6853218870844938225, guid: d8a2a1f4b4f78754c86045f7a36fe424, type: 3} + propertyPath: m_LocalPosition.z + value: 0 objectReference: {fileID: 0} - - target: {fileID: 6853218870844938225, guid: 6f3af2a8508960843b36fb9d64de2bc2, type: 3} + - target: {fileID: 6853218870844938225, guid: d8a2a1f4b4f78754c86045f7a36fe424, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6853218870844938225, guid: d8a2a1f4b4f78754c86045f7a36fe424, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6853218870844938225, guid: d8a2a1f4b4f78754c86045f7a36fe424, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6853218870844938225, guid: d8a2a1f4b4f78754c86045f7a36fe424, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6853218870844938225, guid: d8a2a1f4b4f78754c86045f7a36fe424, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 6853218870844938225, guid: 6f3af2a8508960843b36fb9d64de2bc2, type: 3} + - target: {fileID: 6853218870844938225, guid: d8a2a1f4b4f78754c86045f7a36fe424, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 6853218870844938225, guid: 6f3af2a8508960843b36fb9d64de2bc2, type: 3} + - target: {fileID: 6853218870844938225, guid: d8a2a1f4b4f78754c86045f7a36fe424, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 7470888221916766567, guid: 6f3af2a8508960843b36fb9d64de2bc2, type: 3} + - target: {fileID: 7470888221916766567, guid: d8a2a1f4b4f78754c86045f7a36fe424, type: 3} propertyPath: m_Name value: MRTK Gaze Controller objectReference: {fileID: 0} m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 6f3af2a8508960843b36fb9d64de2bc2, type: 3} ---- !u!114 &4102833070697430761 stripped + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: d8a2a1f4b4f78754c86045f7a36fe424, type: 3} +--- !u!114 &529201713281613631 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 3021976565802998075, guid: 6f3af2a8508960843b36fb9d64de2bc2, type: 3} - m_PrefabInstance: {fileID: 1224987191631620050} + m_CorrespondingSourceObject: {fileID: 3021976565802998075, guid: d8a2a1f4b4f78754c86045f7a36fe424, type: 3} + m_PrefabInstance: {fileID: 3361987198643840516} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 @@ -596,174 +671,262 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1175590bcfccd6d44a4c8f9a15292536, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &5302893730759227071 stripped +--- !u!114 &6369988576007060339 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 6383762985148977517, guid: 6f3af2a8508960843b36fb9d64de2bc2, type: 3} - m_PrefabInstance: {fileID: 1224987191631620050} + m_CorrespondingSourceObject: {fileID: 8560941944935669111, guid: d8a2a1f4b4f78754c86045f7a36fe424, type: 3} + m_PrefabInstance: {fileID: 3361987198643840516} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: b5ecb302c7ea48344b3a839df64a77a5, type: 3} + m_Script: {fileID: 11500000, guid: a248d282774a21744b8cf69201ce8279, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!4 &5628234118856470563 stripped +--- !u!4 &8193081038271214069 stripped Transform: - m_CorrespondingSourceObject: {fileID: 6853218870844938225, guid: 6f3af2a8508960843b36fb9d64de2bc2, type: 3} - m_PrefabInstance: {fileID: 1224987191631620050} + m_CorrespondingSourceObject: {fileID: 6853218870844938225, guid: d8a2a1f4b4f78754c86045f7a36fe424, type: 3} + m_PrefabInstance: {fileID: 3361987198643840516} m_PrefabAsset: {fileID: 0} ---- !u!1001 &2609686519359345044 +--- !u!1001 &6214226033703350519 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 2351505567455720332} + serializedVersion: 3 + m_TransformParent: {fileID: 2351505566903569412} m_Modifications: - - target: {fileID: 6474832524069219057, guid: 2d7353d30f9fe7e41bf30032876961a9, type: 3} - propertyPath: gazeController - value: - objectReference: {fileID: 5302893730759227071} - - target: {fileID: 6474832524069219057, guid: 2d7353d30f9fe7e41bf30032876961a9, type: 3} - propertyPath: leftHandController - value: - objectReference: {fileID: 2304670408713330098} - - target: {fileID: 6474832524069219057, guid: 2d7353d30f9fe7e41bf30032876961a9, type: 3} - propertyPath: rightHandController - value: - objectReference: {fileID: 142007140022173312} - - target: {fileID: 7821592117992173381, guid: 2d7353d30f9fe7e41bf30032876961a9, type: 3} - propertyPath: m_Name - value: MRTK Interaction Manager + - target: {fileID: 445577537456690332, guid: 2e5b90c191b94004182e55a48f0ca427, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 445577537456690332, guid: 2e5b90c191b94004182e55a48f0ca427, type: 3} + propertyPath: m_LocalPosition.y + value: 0 objectReference: {fileID: 0} - - target: {fileID: 7821592117992173402, guid: 2d7353d30f9fe7e41bf30032876961a9, type: 3} - propertyPath: m_RootOrder + - target: {fileID: 445577537456690332, guid: 2e5b90c191b94004182e55a48f0ca427, type: 3} + propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 7821592117992173402, guid: 2d7353d30f9fe7e41bf30032876961a9, type: 3} + - target: {fileID: 445577537456690332, guid: 2e5b90c191b94004182e55a48f0ca427, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 445577537456690332, guid: 2e5b90c191b94004182e55a48f0ca427, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 445577537456690332, guid: 2e5b90c191b94004182e55a48f0ca427, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 445577537456690332, guid: 2e5b90c191b94004182e55a48f0ca427, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 445577537456690332, guid: 2e5b90c191b94004182e55a48f0ca427, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 7821592117992173402, guid: 2d7353d30f9fe7e41bf30032876961a9, type: 3} + - target: {fileID: 445577537456690332, guid: 2e5b90c191b94004182e55a48f0ca427, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 7821592117992173402, guid: 2d7353d30f9fe7e41bf30032876961a9, type: 3} + - target: {fileID: 445577537456690332, guid: 2e5b90c191b94004182e55a48f0ca427, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 445577537456690333, guid: 2e5b90c191b94004182e55a48f0ca427, type: 3} + propertyPath: m_Name + value: MRTK RightHand Controller + objectReference: {fileID: 0} + - target: {fileID: 3626065999944968659, guid: 2e5b90c191b94004182e55a48f0ca427, type: 3} + propertyPath: dependentInteractor + value: + objectReference: {fileID: 529201713281613631} m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 2d7353d30f9fe7e41bf30032876961a9, type: 3} ---- !u!4 &5241231772802432718 stripped + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2e5b90c191b94004182e55a48f0ca427, type: 3} +--- !u!4 &5769779419222680683 stripped Transform: - m_CorrespondingSourceObject: {fileID: 7821592117992173402, guid: 2d7353d30f9fe7e41bf30032876961a9, type: 3} - m_PrefabInstance: {fileID: 2609686519359345044} + m_CorrespondingSourceObject: {fileID: 445577537456690332, guid: 2e5b90c191b94004182e55a48f0ca427, type: 3} + m_PrefabInstance: {fileID: 6214226033703350519} m_PrefabAsset: {fileID: 0} ---- !u!114 &5569439093497552269 stripped +--- !u!114 &7390493297764135087 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 7601486046380051481, guid: 2d7353d30f9fe7e41bf30032876961a9, type: 3} - m_PrefabInstance: {fileID: 2609686519359345044} + m_CorrespondingSourceObject: {fileID: 3507481504517029976, guid: 2e5b90c191b94004182e55a48f0ca427, type: 3} + m_PrefabInstance: {fileID: 6214226033703350519} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 83e4e6cca11330d4088d729ab4fc9d9f, type: 3} + m_Script: {fileID: 11500000, guid: 5af98ad782bb7df43838b825cd681336, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1001 &4174278757018161669 +--- !u!1001 &7089027141941546269 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 2351505566903569412} + serializedVersion: 3 + m_TransformParent: {fileID: 2351505567455720332} m_Modifications: - - target: {fileID: 4821581000001043912, guid: 82333e6e543cb7e4dbd5b1d47aff3f58, type: 3} - propertyPath: dependentInteractor + - target: {fileID: 919676360596656614, guid: 02502921f64c38d48b14f1d6c2438b16, type: 3} + propertyPath: gazeTrackedPoseDriver + value: + objectReference: {fileID: 6369988576007060339} + - target: {fileID: 919676360596656614, guid: 02502921f64c38d48b14f1d6c2438b16, type: 3} + propertyPath: leftHandTrackedPoseDriver + value: + objectReference: {fileID: 6032659918864907508} + - target: {fileID: 919676360596656614, guid: 02502921f64c38d48b14f1d6c2438b16, type: 3} + propertyPath: rightHandTrackedPoseDriver value: - objectReference: {fileID: 4102833070697430761} - - target: {fileID: 8544718171901067398, guid: 82333e6e543cb7e4dbd5b1d47aff3f58, type: 3} + objectReference: {fileID: 7390493297764135087} + - target: {fileID: 7821592117992173381, guid: 02502921f64c38d48b14f1d6c2438b16, type: 3} propertyPath: m_Name - value: MRTK RightHand Controller + value: MRTK Interaction Manager + objectReference: {fileID: 0} + - target: {fileID: 7821592117992173402, guid: 02502921f64c38d48b14f1d6c2438b16, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7821592117992173402, guid: 02502921f64c38d48b14f1d6c2438b16, type: 3} + propertyPath: m_LocalPosition.y + value: 0 objectReference: {fileID: 0} - - target: {fileID: 8544718171901067399, guid: 82333e6e543cb7e4dbd5b1d47aff3f58, type: 3} - propertyPath: m_RootOrder + - target: {fileID: 7821592117992173402, guid: 02502921f64c38d48b14f1d6c2438b16, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7821592117992173402, guid: 02502921f64c38d48b14f1d6c2438b16, type: 3} + propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 8544718171901067399, guid: 82333e6e543cb7e4dbd5b1d47aff3f58, type: 3} + - target: {fileID: 7821592117992173402, guid: 02502921f64c38d48b14f1d6c2438b16, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7821592117992173402, guid: 02502921f64c38d48b14f1d6c2438b16, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7821592117992173402, guid: 02502921f64c38d48b14f1d6c2438b16, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7821592117992173402, guid: 02502921f64c38d48b14f1d6c2438b16, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 8544718171901067399, guid: 82333e6e543cb7e4dbd5b1d47aff3f58, type: 3} + - target: {fileID: 7821592117992173402, guid: 02502921f64c38d48b14f1d6c2438b16, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 8544718171901067399, guid: 82333e6e543cb7e4dbd5b1d47aff3f58, type: 3} + - target: {fileID: 7821592117992173402, guid: 02502921f64c38d48b14f1d6c2438b16, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 82333e6e543cb7e4dbd5b1d47aff3f58, type: 3} ---- !u!114 &142007140022173312 stripped + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 02502921f64c38d48b14f1d6c2438b16, type: 3} +--- !u!114 &800708247703322884 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 4041565961123392645, guid: 82333e6e543cb7e4dbd5b1d47aff3f58, type: 3} - m_PrefabInstance: {fileID: 4174278757018161669} + m_CorrespondingSourceObject: {fileID: 7601486046380051481, guid: 02502921f64c38d48b14f1d6c2438b16, type: 3} + m_PrefabInstance: {fileID: 7089027141941546269} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 6533afcc1a3776848a226f74fce34856, type: 3} + m_Script: {fileID: 11500000, guid: 83e4e6cca11330d4088d729ab4fc9d9f, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!4 &5727148871348114050 stripped +--- !u!4 &1074856417076994631 stripped Transform: - m_CorrespondingSourceObject: {fileID: 8544718171901067399, guid: 82333e6e543cb7e4dbd5b1d47aff3f58, type: 3} - m_PrefabInstance: {fileID: 4174278757018161669} + m_CorrespondingSourceObject: {fileID: 7821592117992173402, guid: 02502921f64c38d48b14f1d6c2438b16, type: 3} + m_PrefabInstance: {fileID: 7089027141941546269} m_PrefabAsset: {fileID: 0} ---- !u!1001 &5364037230396944427 +--- !u!1001 &9093645396457204139 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2351505566903569412} m_Modifications: - - target: {fileID: 1948193615953854874, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} + - target: {fileID: 1948193615953854874, guid: 90f955d6c9d709448a0b1e29e1f9c046, type: 3} propertyPath: m_Name value: MRTK LeftHand Controller objectReference: {fileID: 0} - - target: {fileID: 1948193615953854875, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} - propertyPath: m_RootOrder - value: 2 + - target: {fileID: 1948193615953854875, guid: 90f955d6c9d709448a0b1e29e1f9c046, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1948193615953854875, guid: 90f955d6c9d709448a0b1e29e1f9c046, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1948193615953854875, guid: 90f955d6c9d709448a0b1e29e1f9c046, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1948193615953854875, guid: 90f955d6c9d709448a0b1e29e1f9c046, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1948193615953854875, guid: 90f955d6c9d709448a0b1e29e1f9c046, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1948193615953854875, guid: 90f955d6c9d709448a0b1e29e1f9c046, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1948193615953854875, guid: 90f955d6c9d709448a0b1e29e1f9c046, type: 3} + propertyPath: m_LocalRotation.z + value: 0 objectReference: {fileID: 0} - - target: {fileID: 1948193615953854875, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} + - target: {fileID: 1948193615953854875, guid: 90f955d6c9d709448a0b1e29e1f9c046, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 1948193615953854875, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} + - target: {fileID: 1948193615953854875, guid: 90f955d6c9d709448a0b1e29e1f9c046, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 1948193615953854875, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} + - target: {fileID: 1948193615953854875, guid: 90f955d6c9d709448a0b1e29e1f9c046, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 3419360757097544916, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} + - target: {fileID: 1948193616346090107, guid: 90f955d6c9d709448a0b1e29e1f9c046, type: 3} + propertyPath: m_Handedness + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3419360757097544916, guid: 90f955d6c9d709448a0b1e29e1f9c046, type: 3} propertyPath: dependentInteractor value: - objectReference: {fileID: 4102833070697430761} + objectReference: {fileID: 529201713281613631} m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} ---- !u!114 &2304670408713330098 stripped + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 90f955d6c9d709448a0b1e29e1f9c046, type: 3} +--- !u!114 &6032659918864907508 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 6164080946324827545, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} - m_PrefabInstance: {fileID: 5364037230396944427} + m_CorrespondingSourceObject: {fileID: 3281803018082669919, guid: 90f955d6c9d709448a0b1e29e1f9c046, type: 3} + m_PrefabInstance: {fileID: 9093645396457204139} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 6533afcc1a3776848a226f74fce34856, type: 3} + m_Script: {fileID: 11500000, guid: 5af98ad782bb7df43838b825cd681336, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!4 &5870931076965904816 stripped +--- !u!4 &7294214612838230064 stripped Transform: - m_CorrespondingSourceObject: {fileID: 1948193615953854875, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} - m_PrefabInstance: {fileID: 5364037230396944427} + m_CorrespondingSourceObject: {fileID: 1948193615953854875, guid: 90f955d6c9d709448a0b1e29e1f9c046, type: 3} + m_PrefabInstance: {fileID: 9093645396457204139} m_PrefabAsset: {fileID: 0} diff --git a/org.mixedrealitytoolkit.input/Assets/Prefabs/MRTK XR Rig.prefab.meta b/org.mixedrealitytoolkit.input/Assets/Prefabs/MRTK XR Rig.prefab.meta index ac2567e85..b56192703 100644 --- a/org.mixedrealitytoolkit.input/Assets/Prefabs/MRTK XR Rig.prefab.meta +++ b/org.mixedrealitytoolkit.input/Assets/Prefabs/MRTK XR Rig.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 4d7e2f87fefe0ba468719b15288b46e7 +guid: acbf65a81ce2cf94f82a0809298acf70 PrefabImporter: externalObjects: {} userData: diff --git a/org.mixedrealitytoolkit.input/Assets/Prefabs/Obsolete MRTK Gaze Controller.prefab b/org.mixedrealitytoolkit.input/Assets/Prefabs/Obsolete MRTK Gaze Controller.prefab new file mode 100644 index 000000000..92fccd4a9 --- /dev/null +++ b/org.mixedrealitytoolkit.input/Assets/Prefabs/Obsolete MRTK Gaze Controller.prefab @@ -0,0 +1,455 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1975450934932087381 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 599884710536146533} + - component: {fileID: 3021976565802998075} + - component: {fileID: 6715372278736142266} + m_Layer: 0 + m_Name: GazeInteractor + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &599884710536146533 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1975450934932087381} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 6853218870844938225} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &3021976565802998075 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1975450934932087381} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1175590bcfccd6d44a4c8f9a15292536, type: 3} + m_Name: + m_EditorClassIdentifier: + m_InteractionManager: {fileID: 0} + m_InteractionLayerMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_InteractionLayers: + m_Bits: 4294967295 + m_AttachTransform: {fileID: 0} + m_KeepSelectedTargetValid: 1 + m_DisableVisualsWhenBlockedInGroup: 1 + m_StartingSelectedInteractable: {fileID: 0} + m_StartingTargetFilter: {fileID: 0} + m_HoverEntered: + m_PersistentCalls: + m_Calls: [] + m_HoverExited: + m_PersistentCalls: + m_Calls: [] + m_SelectEntered: + m_PersistentCalls: + m_Calls: [] + m_SelectExited: + m_PersistentCalls: + m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_OnHoverEntered: + m_PersistentCalls: + m_Calls: [] + m_OnHoverExited: + m_PersistentCalls: + m_Calls: [] + m_OnSelectEntered: + m_PersistentCalls: + m_Calls: [] + m_OnSelectExited: + m_PersistentCalls: + m_Calls: [] + m_SelectActionTrigger: 1 + m_HideControllerOnSelect: 0 + m_AllowHoveredActivate: 0 + m_TargetPriorityMode: 0 + m_PlayAudioClipOnSelectEntered: 0 + m_AudioClipForOnSelectEntered: {fileID: 0} + m_PlayAudioClipOnSelectExited: 0 + m_AudioClipForOnSelectExited: {fileID: 0} + m_PlayAudioClipOnSelectCanceled: 0 + m_AudioClipForOnSelectCanceled: {fileID: 0} + m_PlayAudioClipOnHoverEntered: 0 + m_AudioClipForOnHoverEntered: {fileID: 0} + m_PlayAudioClipOnHoverExited: 0 + m_AudioClipForOnHoverExited: {fileID: 0} + m_PlayAudioClipOnHoverCanceled: 0 + m_AudioClipForOnHoverCanceled: {fileID: 0} + m_AllowHoverAudioWhileSelecting: 1 + m_PlayHapticsOnSelectEntered: 0 + m_HapticSelectEnterIntensity: 0 + m_HapticSelectEnterDuration: 0 + m_PlayHapticsOnSelectExited: 0 + m_HapticSelectExitIntensity: 0 + m_HapticSelectExitDuration: 0 + m_PlayHapticsOnSelectCanceled: 0 + m_HapticSelectCancelIntensity: 0 + m_HapticSelectCancelDuration: 0 + m_PlayHapticsOnHoverEntered: 0 + m_HapticHoverEnterIntensity: 0 + m_HapticHoverEnterDuration: 0 + m_PlayHapticsOnHoverExited: 0 + m_HapticHoverExitIntensity: 0 + m_HapticHoverExitDuration: 0 + m_PlayHapticsOnHoverCanceled: 0 + m_HapticHoverCancelIntensity: 0 + m_HapticHoverCancelDuration: 0 + m_AllowHoverHapticsWhileSelecting: 1 + m_LineType: 0 + m_BlendVisualLinePoints: 1 + m_MaxRaycastDistance: 30 + m_RayOriginTransform: {fileID: 0} + m_ReferenceFrame: {fileID: 0} + m_Velocity: 16 + m_Acceleration: 9.8 + m_AdditionalGroundHeight: 0.1 + m_AdditionalFlightTime: 0.5 + m_EndPointDistance: 30 + m_EndPointHeight: -10 + m_ControlPointDistance: 10 + m_ControlPointHeight: 5 + m_SampleFrequency: 20 + m_HitDetectionType: 1 + m_SphereCastRadius: 0.05 + m_RaycastMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RaycastTriggerInteraction: 1 + m_RaycastSnapVolumeInteraction: 1 + m_HitClosestOnly: 0 + m_HoverToSelect: 0 + m_HoverTimeToSelect: 0.5 + m_AutoDeselect: 0 + m_TimeToAutoDeselect: 3 + m_EnableUIInteraction: 0 + m_AllowAnchorControl: 0 + m_UseForceGrab: 0 + m_RotateSpeed: 180 + m_TranslateSpeed: 1 + m_AnchorRotateReferenceFrame: {fileID: 0} + m_AnchorRotationMode: 0 + coneAngle: 10 + minGazeDistance: 0.1 + maxGazeDistance: 5 + distanceWeight: 1 + angleWeight: 1 + distanceToCenterWeight: 0.5 + angleToCenterWeight: 0 + precision: 0 + precisionCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: -1.4210528 + outSlope: -1.4210528 + tangentMode: 34 + weightedMode: 0 + inWeight: 0 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.47499996 + value: 0.325 + inSlope: -0.9090911 + outSlope: -0.9090911 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.43421045 + outWeight: 0.22131148 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: -0.6190476 + outSlope: -0.6190476 + tangentMode: 34 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + performAdditionalRaycast: 1 +--- !u!114 &6715372278736142266 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1975450934932087381} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0f02d25d06f71c0499cbce939bf50f46, type: 3} + m_Name: + m_EditorClassIdentifier: + dwellTriggerTime: 0.3 +--- !u!1 &7470888221916766567 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6853218870844938225} + - component: {fileID: 6383762985148977517} + m_Layer: 0 + m_Name: Obsolete MRTK Gaze Controller + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6853218870844938225 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7470888221916766567} + 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: 599884710536146533} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &6383762985148977517 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7470888221916766567} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b5ecb302c7ea48344b3a839df64a77a5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UpdateTrackingType: 0 + m_EnableInputTracking: 1 + m_EnableInputActions: 1 + m_ModelPrefab: {fileID: 0} + m_ModelParent: {fileID: 0} + m_Model: {fileID: 0} + m_AnimateModel: 0 + m_ModelSelectTransition: + m_ModelDeSelectTransition: + m_PositionAction: + m_UseReference: 1 + m_Action: + m_Name: Position + m_Type: 0 + m_ExpectedControlType: + m_Id: a11daf2c-febf-4ea5-afe9-c21bed6bebe9 + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_Reference: {fileID: -3802471318395789522, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} + m_RotationAction: + m_UseReference: 1 + m_Action: + m_Name: Rotation + m_Type: 0 + m_ExpectedControlType: + m_Id: eaea1318-ea1f-4bd2-b48b-10fd58947d8d + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_Reference: {fileID: -7046323255087736399, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} + m_TrackingStateAction: + m_UseReference: 1 + m_Action: + m_Name: Tracking State + m_Type: 0 + m_ExpectedControlType: + m_Id: 3319b6e7-12b5-4837-b74d-60ab5ec07d59 + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_Reference: {fileID: -6560867463018052362, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} + m_SelectAction: + m_UseReference: 0 + m_Action: + m_Name: Select + m_Type: 0 + m_ExpectedControlType: + m_Id: 10024e8c-255d-4073-a121-5542f80bc168 + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_Reference: {fileID: 0} + m_SelectActionValue: + m_UseReference: 0 + m_Action: + m_Name: Select Action Value + m_Type: 0 + m_ExpectedControlType: + m_Id: 4c63a0cf-2a5f-48ca-a451-1ef0c0cf26fb + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_Reference: {fileID: 0} + m_ActivateAction: + m_UseReference: 0 + m_Action: + m_Name: Activate + m_Type: 0 + m_ExpectedControlType: + m_Id: 881b42aa-b824-4843-87bf-bc236e9008da + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_Reference: {fileID: 0} + m_ActivateActionValue: + m_UseReference: 0 + m_Action: + m_Name: Activate Action Value + m_Type: 0 + m_ExpectedControlType: + m_Id: 0ebe3d4a-cd81-4ef5-b2c6-65a352d76d85 + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_Reference: {fileID: 0} + m_UIPressAction: + m_UseReference: 0 + m_Action: + m_Name: UI Press + m_Type: 0 + m_ExpectedControlType: + m_Id: fdd9436f-9d5f-4520-9218-ddba68887cde + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_Reference: {fileID: 0} + m_UIPressActionValue: + m_UseReference: 0 + m_Action: + m_Name: UI Press Action Value + m_Type: 0 + m_ExpectedControlType: + m_Id: c72a535d-c2da-4cb3-98da-81626ee93196 + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_Reference: {fileID: 0} + m_HapticDeviceAction: + m_UseReference: 0 + m_Action: + m_Name: Haptic Device + m_Type: 0 + m_ExpectedControlType: + m_Id: 011ee523-7eef-407d-bb5d-6a53b9e6b9ac + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_Reference: {fileID: 0} + m_RotateAnchorAction: + m_UseReference: 0 + m_Action: + m_Name: Rotate Anchor + m_Type: 0 + m_ExpectedControlType: + m_Id: 6a4860ad-abd1-482b-8c9a-455c86786c08 + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_Reference: {fileID: 0} + m_DirectionalAnchorRotationAction: + m_UseReference: 0 + m_Action: + m_Name: Directional Anchor Rotation + m_Type: 0 + m_ExpectedControlType: + m_Id: 4193cbb2-ece8-4ed4-8f86-9ff0d3ac5505 + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_Reference: {fileID: 0} + m_TranslateAnchorAction: + m_UseReference: 0 + m_Action: + m_Name: Translate Anchor + m_Type: 0 + m_ExpectedControlType: + m_Id: 3402d39b-eb4f-4b9f-b338-637f02b1eff5 + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_Reference: {fileID: 0} + m_ButtonPressPoint: 0.5 + fallbackPositionAction: + m_UseReference: 1 + m_Action: + m_Name: Fallback Position + m_Type: 0 + m_ExpectedControlType: + m_Id: 7f9b01c3-bf9d-45fc-95f8-35d381c29b65 + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_Reference: {fileID: 6617357981711541546, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} + fallbackRotationAction: + m_UseReference: 1 + m_Action: + m_Name: Fallback Rotation + m_Type: 0 + m_ExpectedControlType: + m_Id: d2fb4a7d-b89b-49b1-aa21-52addc67fde9 + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_Reference: {fileID: 1272146141651074281, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} + fallbackTrackingStateAction: + m_UseReference: 1 + m_Action: + m_Name: Fallback Tracking State + m_Type: 0 + m_ExpectedControlType: + m_Id: c03c5a83-1d35-43a6-a6f3-be7295e81e8a + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_Reference: {fileID: 5232793463981167437, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} diff --git a/org.mixedrealitytoolkit.input/Assets/Prefabs/Obsolete MRTK Gaze Controller.prefab.meta b/org.mixedrealitytoolkit.input/Assets/Prefabs/Obsolete MRTK Gaze Controller.prefab.meta new file mode 100644 index 000000000..ffef8afae --- /dev/null +++ b/org.mixedrealitytoolkit.input/Assets/Prefabs/Obsolete MRTK Gaze Controller.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 6f3af2a8508960843b36fb9d64de2bc2 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/org.mixedrealitytoolkit.input/Assets/Prefabs/Obsolete MRTK Interaction Manager.prefab b/org.mixedrealitytoolkit.input/Assets/Prefabs/Obsolete MRTK Interaction Manager.prefab new file mode 100644 index 000000000..b33e5b763 --- /dev/null +++ b/org.mixedrealitytoolkit.input/Assets/Prefabs/Obsolete MRTK Interaction Manager.prefab @@ -0,0 +1,112 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &7821592117992173381 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7821592117992173402} + - component: {fileID: 7821592117992173380} + - component: {fileID: 6474832524069219057} + - component: {fileID: 7601486046380051481} + m_Layer: 0 + m_Name: Obsolete MRTK Interaction Manager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7821592117992173402 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7821592117992173381} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &7821592117992173380 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7821592117992173381} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d3536f62630b2574398eeabe8558df62, type: 3} + m_Name: + m_EditorClassIdentifier: + controllerMapping: + entries: [] + prioritizedInteractionModes: + - modeName: Far + associatedTypes: + - reference: MixedReality.Toolkit.Input.GazeInteractor, MixedReality.Toolkit.Input + - reference: MixedReality.Toolkit.Input.FuzzyGazeInteractor, MixedReality.Toolkit.Input + - reference: MixedReality.Toolkit.Input.MRTKRayInteractor, MixedReality.Toolkit.Input + - reference: MixedReality.Toolkit.Input.GazePinchInteractor, MixedReality.Toolkit.Input + - modeName: FarRayHover + associatedTypes: + - reference: MixedReality.Toolkit.Input.MRTKRayInteractor, MixedReality.Toolkit.Input + - modeName: Near + associatedTypes: + - reference: MixedReality.Toolkit.Input.GazeInteractor, MixedReality.Toolkit.Input + - reference: MixedReality.Toolkit.Input.FuzzyGazeInteractor, MixedReality.Toolkit.Input + - reference: MixedReality.Toolkit.Input.GrabInteractor, MixedReality.Toolkit.Input + - reference: MixedReality.Toolkit.Input.PokeInteractor, MixedReality.Toolkit.Input + - modeName: FarRaySelect + associatedTypes: + - reference: MixedReality.Toolkit.Input.MRTKRayInteractor, MixedReality.Toolkit.Input + - modeName: GazeSelect + associatedTypes: + - reference: MixedReality.Toolkit.Input.GazeInteractor, MixedReality.Toolkit.Input + - reference: MixedReality.Toolkit.Input.FuzzyGazeInteractor, MixedReality.Toolkit.Input + - reference: MixedReality.Toolkit.Input.GazePinchInteractor, MixedReality.Toolkit.Input + - modeName: GrabSelect + associatedTypes: + - reference: MixedReality.Toolkit.Input.GrabInteractor, MixedReality.Toolkit.Input + - modeName: FlatScreen + associatedTypes: + - reference: MixedReality.Toolkit.UX.CanvasProxyInteractor, MixedReality.Toolkit.UXCore + defaultMode: + name: Far + priority: 0 +--- !u!114 &6474832524069219057 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7821592117992173381} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3a7683d16dfabed47b17f1f2cbc4de1c, type: 3} + m_Name: + m_EditorClassIdentifier: + gazeController: {fileID: 0} + leftHandController: {fileID: 0} + rightHandController: {fileID: 0} +--- !u!114 &7601486046380051481 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7821592117992173381} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 83e4e6cca11330d4088d729ab4fc9d9f, type: 3} + m_Name: + m_EditorClassIdentifier: + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] diff --git a/org.mixedrealitytoolkit.input/Assets/Prefabs/Obsolete MRTK Interaction Manager.prefab.meta b/org.mixedrealitytoolkit.input/Assets/Prefabs/Obsolete MRTK Interaction Manager.prefab.meta new file mode 100644 index 000000000..bf3fe3ec1 --- /dev/null +++ b/org.mixedrealitytoolkit.input/Assets/Prefabs/Obsolete MRTK Interaction Manager.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 2d7353d30f9fe7e41bf30032876961a9 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/org.mixedrealitytoolkit.input/Assets/Prefabs/Obsolete MRTK LeftHand Controller.prefab b/org.mixedrealitytoolkit.input/Assets/Prefabs/Obsolete MRTK LeftHand Controller.prefab new file mode 100644 index 000000000..93451bd91 --- /dev/null +++ b/org.mixedrealitytoolkit.input/Assets/Prefabs/Obsolete MRTK LeftHand Controller.prefab @@ -0,0 +1,2023 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &33891623947274355 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4332395624789801014} + - component: {fileID: 2940030942784507886} + - component: {fileID: 1180895169275043612} + - component: {fileID: 2105872328799679035} + - component: {fileID: 1360334431692699758} + - component: {fileID: 1011521807071173904} + m_Layer: 0 + m_Name: Far Ray + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4332395624789801014 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 33891623947274355} + 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: 1307666228887773622} + - {fileID: 3988544559415115452} + m_Father: {fileID: 1948193615953854875} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &2940030942784507886 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 33891623947274355} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e85416945309f8244a5715a2ec5c254f, type: 3} + m_Name: + m_EditorClassIdentifier: + m_InteractionManager: {fileID: 0} + m_InteractionLayerMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_InteractionLayers: + m_Bits: 4294967295 + m_AttachTransform: {fileID: 0} + m_KeepSelectedTargetValid: 1 + m_DisableVisualsWhenBlockedInGroup: 1 + m_StartingSelectedInteractable: {fileID: 0} + m_StartingTargetFilter: {fileID: 0} + m_HoverEntered: + m_PersistentCalls: + m_Calls: [] + m_HoverExited: + m_PersistentCalls: + m_Calls: [] + m_SelectEntered: + m_PersistentCalls: + m_Calls: [] + m_SelectExited: + m_PersistentCalls: + m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_OnHoverEntered: + m_PersistentCalls: + m_Calls: [] + m_OnHoverExited: + m_PersistentCalls: + m_Calls: [] + m_OnSelectEntered: + m_PersistentCalls: + m_Calls: [] + m_OnSelectExited: + m_PersistentCalls: + m_Calls: [] + m_SelectActionTrigger: 1 + m_HideControllerOnSelect: 0 + m_AllowHoveredActivate: 0 + m_TargetPriorityMode: 0 + m_PlayAudioClipOnSelectEntered: 0 + m_AudioClipForOnSelectEntered: {fileID: 0} + m_PlayAudioClipOnSelectExited: 0 + m_AudioClipForOnSelectExited: {fileID: 0} + m_PlayAudioClipOnSelectCanceled: 0 + m_AudioClipForOnSelectCanceled: {fileID: 0} + m_PlayAudioClipOnHoverEntered: 0 + m_AudioClipForOnHoverEntered: {fileID: 0} + m_PlayAudioClipOnHoverExited: 0 + m_AudioClipForOnHoverExited: {fileID: 0} + m_PlayAudioClipOnHoverCanceled: 0 + m_AudioClipForOnHoverCanceled: {fileID: 0} + m_AllowHoverAudioWhileSelecting: 1 + m_PlayHapticsOnSelectEntered: 0 + m_HapticSelectEnterIntensity: 0 + m_HapticSelectEnterDuration: 0 + m_PlayHapticsOnSelectExited: 0 + m_HapticSelectExitIntensity: 0 + m_HapticSelectExitDuration: 0 + m_PlayHapticsOnSelectCanceled: 0 + m_HapticSelectCancelIntensity: 0 + m_HapticSelectCancelDuration: 0 + m_PlayHapticsOnHoverEntered: 0 + m_HapticHoverEnterIntensity: 0 + m_HapticHoverEnterDuration: 0 + m_PlayHapticsOnHoverExited: 0 + m_HapticHoverExitIntensity: 0 + m_HapticHoverExitDuration: 0 + m_PlayHapticsOnHoverCanceled: 0 + m_HapticHoverCancelIntensity: 0 + m_HapticHoverCancelDuration: 0 + m_AllowHoverHapticsWhileSelecting: 1 + m_LineType: 0 + m_BlendVisualLinePoints: 1 + m_MaxRaycastDistance: 10 + m_RayOriginTransform: {fileID: 0} + m_ReferenceFrame: {fileID: 0} + m_Velocity: 16 + m_Acceleration: 9.8 + m_AdditionalGroundHeight: 0.1 + m_AdditionalFlightTime: 0.5 + m_EndPointDistance: 30 + m_EndPointHeight: -10 + m_ControlPointDistance: 10 + m_ControlPointHeight: 5 + m_SampleFrequency: 20 + m_HitDetectionType: 0 + m_SphereCastRadius: 0.1 + m_RaycastMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RaycastTriggerInteraction: 1 + m_RaycastSnapVolumeInteraction: 1 + m_HitClosestOnly: 1 + m_HoverToSelect: 0 + m_HoverTimeToSelect: 0.5 + m_AutoDeselect: 0 + m_TimeToAutoDeselect: 3 + m_EnableUIInteraction: 1 + m_AllowAnchorControl: 0 + m_UseForceGrab: 0 + m_RotateSpeed: 180 + m_TranslateSpeed: 1 + m_AnchorRotateReferenceFrame: {fileID: 0} + m_AnchorRotationMode: 0 + aimPoseSource: + rid: 0 + devicePoseSource: + rid: 1 + references: + version: 2 + RefIds: + - rid: 0 + type: {class: FallbackCompositePoseSource, ns: MixedReality.Toolkit.Input, asm: MixedReality.Toolkit.Input} + data: + poseSourceList: + - rid: 2 + - rid: 3 + poseSources: [] + - rid: 1 + type: {class: FallbackCompositePoseSource, ns: MixedReality.Toolkit.Input, asm: MixedReality.Toolkit.Input} + data: + poseSourceList: + - rid: 4 + - rid: 5 + poseSources: [] + - rid: 2 + type: {class: InputActionPoseSource, ns: MixedReality.Toolkit.Input, asm: MixedReality.Toolkit.Input} + data: + trackingStateActionProperty: + m_UseReference: 1 + m_Action: + m_Name: Tracking State Action Property + m_Type: 0 + m_ExpectedControlType: + m_Id: 5ee17213-f2bf-4f1e-932b-e1b8ba883ff2 + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_Reference: {fileID: -7613329581162844239, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} + positionActionProperty: + m_UseReference: 1 + m_Action: + m_Name: Position Action Property + m_Type: 0 + m_ExpectedControlType: + m_Id: a1850a99-0424-41aa-9337-1575f275c8de + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_Reference: {fileID: -2024308242397127297, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} + rotationActionProperty: + m_UseReference: 1 + m_Action: + m_Name: Rotation Action Property + m_Type: 0 + m_ExpectedControlType: + m_Id: bfd50135-aeb4-48a5-b8c7-7fc00efa1968 + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_Reference: {fileID: 8248158260566104461, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} + - rid: 3 + type: {class: PolyfillHandRayPoseSource, ns: MixedReality.Toolkit.Input, asm: MixedReality.Toolkit.Input} + data: + hand: 1 + - rid: 4 + type: {class: InputActionPoseSource, ns: MixedReality.Toolkit.Input, asm: MixedReality.Toolkit.Input} + data: + trackingStateActionProperty: + m_UseReference: 1 + m_Action: + m_Name: Tracking State Action Property + m_Type: 0 + m_ExpectedControlType: + m_Id: 93a2b8b5-15a2-4adf-addb-bbb5aab652d9 + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_Reference: {fileID: -7613329581162844239, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} + positionActionProperty: + m_UseReference: 1 + m_Action: + m_Name: Position Action Property + m_Type: 0 + m_ExpectedControlType: + m_Id: 621cb8fb-2c7d-4a1f-8f98-81cd05033f44 + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_Reference: {fileID: 5671224385460781980, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} + rotationActionProperty: + m_UseReference: 1 + m_Action: + m_Name: Rotation Action Property + m_Type: 0 + m_ExpectedControlType: + m_Id: 51d14811-8d5f-4e99-9599-dbedead350e5 + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_Reference: {fileID: -4531104493956672492, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} + - rid: 5 + type: {class: HandJointPoseSource, ns: MixedReality.Toolkit.Input, asm: MixedReality.Toolkit.Input} + data: + hand: 1 + joint: 0 +--- !u!114 &1180895169275043612 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 33891623947274355} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 61c320ab91be1e04e81076323f7b3021, type: 3} + m_Name: + m_EditorClassIdentifier: + interactor: {fileID: 2940030942784507886} + detectHover: 1 + modeOnHover: + name: FarRayHover + priority: 1 + detectSelect: 1 + modeOnSelect: + name: FarRaySelect + priority: 3 + controllers: + - {fileID: 1948193615953854874} +--- !u!114 &2105872328799679035 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 33891623947274355} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0f02d25d06f71c0499cbce939bf50f46, type: 3} + m_Name: + m_EditorClassIdentifier: + dwellTriggerTime: 0.3 +--- !u!114 &1360334431692699758 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 33891623947274355} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 70ec73306ca3ef44a95bbb45b96f0538, type: 3} + m_Name: + m_EditorClassIdentifier: + reticleRoot: {fileID: 3988544559415115452} + baseReticle: {fileID: 8992338914735331379} + rayInteractor: {fileID: 2940030942784507886} + proximityLight: {fileID: 4448665028262160152} + visibilitySettings: 0 +--- !u!114 &1011521807071173904 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 33891623947274355} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0b7b82b7c0a82d944a12da9283d254e4, type: 3} + m_Name: + m_EditorClassIdentifier: + noTargetColorGradient: + serializedVersion: 2 + key0: {r: 0.990566, g: 0.990566, b: 0.990566, a: 0} + key1: {r: 1, g: 1, b: 1, a: 0.5254902} + key2: {r: 0, g: 0, b: 0, a: 0} + key3: {r: 0, g: 0, b: 0, a: 1} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 1315 + atime1: 1592 + atime2: 12392 + atime3: 65535 + atime4: 63029 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_NumColorKeys: 2 + m_NumAlphaKeys: 3 + validColorGradient: + serializedVersion: 2 + key0: {r: 0.990566, g: 0.990566, b: 0.990566, a: 0} + key1: {r: 1, g: 1, b: 1, a: 1} + key2: {r: 0, g: 0, b: 0, a: 1} + key3: {r: 0, g: 0, b: 0, a: 1} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 19037 + atime1: 50051 + atime2: 52543 + atime3: 65535 + atime4: 63029 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_NumColorKeys: 2 + m_NumAlphaKeys: 2 + selectActiveColorGradient: + serializedVersion: 2 + key0: {r: 0.990566, g: 0.990566, b: 0.990566, a: 0} + key1: {r: 1, g: 1, b: 1, a: 1} + key2: {r: 0, g: 0, b: 0, a: 1} + key3: {r: 0, g: 0, b: 0, a: 1} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 19037 + atime1: 23883 + atime2: 65535 + atime3: 65535 + atime4: 63029 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_NumColorKeys: 2 + m_NumAlphaKeys: 2 + maxGradientLength: 0.3 + lineWidth: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + widthMultiplier: 0.0015 + startPointLerp: 0.267 + endPointLerp: 0.637 + rayInteractor: {fileID: 2940030942784507886} + lineRenderer: {fileID: 5409732680908794997} + lineDataProvider: {fileID: 3681755664881842967} + roundedEdges: 1 + roundedCaps: 1 + stopLineAtFirstRaycastHit: 1 + lineStepCount: 16 +--- !u!1 &313520819636509231 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8443923956584964973} + m_Layer: 0 + m_Name: AttachTransform + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8443923956584964973 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 313520819636509231} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1948193616346090106} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &761938320343190485 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4443155524692848376} + - component: {fileID: 2572330550550829917} + - component: {fileID: 5296314582960356879} + - component: {fileID: 686151079364968060} + m_Layer: 0 + m_Name: GrabInteractor + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4443155524692848376 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 761938320343190485} + 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: 1051247791254679178} + m_Father: {fileID: 1948193615953854875} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &2572330550550829917 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 761938320343190485} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 791c89e58d8ff384f8b341768a70fd77, type: 3} + m_Name: + m_EditorClassIdentifier: + m_InteractionManager: {fileID: 0} + m_InteractionLayerMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_InteractionLayers: + m_Bits: 4294967295 + m_AttachTransform: {fileID: 1051247791254679178} + m_KeepSelectedTargetValid: 1 + m_DisableVisualsWhenBlockedInGroup: 1 + m_StartingSelectedInteractable: {fileID: 0} + m_StartingTargetFilter: {fileID: 0} + m_HoverEntered: + m_PersistentCalls: + m_Calls: [] + m_HoverExited: + m_PersistentCalls: + m_Calls: [] + m_SelectEntered: + m_PersistentCalls: + m_Calls: [] + m_SelectExited: + m_PersistentCalls: + m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_OnHoverEntered: + m_PersistentCalls: + m_Calls: [] + m_OnHoverExited: + m_PersistentCalls: + m_Calls: [] + m_OnSelectEntered: + m_PersistentCalls: + m_Calls: [] + m_OnSelectExited: + m_PersistentCalls: + m_Calls: [] + m_SelectActionTrigger: 1 + m_HideControllerOnSelect: 0 + m_AllowHoveredActivate: 0 + m_TargetPriorityMode: 0 + m_PlayAudioClipOnSelectEntered: 0 + m_AudioClipForOnSelectEntered: {fileID: 0} + m_PlayAudioClipOnSelectExited: 0 + m_AudioClipForOnSelectExited: {fileID: 0} + m_PlayAudioClipOnSelectCanceled: 0 + m_AudioClipForOnSelectCanceled: {fileID: 0} + m_PlayAudioClipOnHoverEntered: 0 + m_AudioClipForOnHoverEntered: {fileID: 0} + m_PlayAudioClipOnHoverExited: 0 + m_AudioClipForOnHoverExited: {fileID: 0} + m_PlayAudioClipOnHoverCanceled: 0 + m_AudioClipForOnHoverCanceled: {fileID: 0} + m_AllowHoverAudioWhileSelecting: 1 + m_PlayHapticsOnSelectEntered: 0 + m_HapticSelectEnterIntensity: 0 + m_HapticSelectEnterDuration: 0 + m_PlayHapticsOnSelectExited: 0 + m_HapticSelectExitIntensity: 0 + m_HapticSelectExitDuration: 0 + m_PlayHapticsOnSelectCanceled: 0 + m_HapticSelectCancelIntensity: 0 + m_HapticSelectCancelDuration: 0 + m_PlayHapticsOnHoverEntered: 0 + m_HapticHoverEnterIntensity: 0 + m_HapticHoverEnterDuration: 0 + m_PlayHapticsOnHoverExited: 0 + m_HapticHoverExitIntensity: 0 + m_HapticHoverExitDuration: 0 + m_PlayHapticsOnHoverCanceled: 0 + m_HapticHoverCancelIntensity: 0 + m_HapticHoverCancelDuration: 0 + m_AllowHoverHapticsWhileSelecting: 1 + pinchPoseSource: + rid: 0 + references: + version: 2 + RefIds: + - rid: 0 + type: {class: FallbackCompositePoseSource, ns: MixedReality.Toolkit.Input, asm: MixedReality.Toolkit.Input} + data: + poseSourceList: + - rid: 1 + - rid: 2 + poseSources: [] + - rid: 1 + type: {class: PinchPoseSource, ns: MixedReality.Toolkit.Input, asm: MixedReality.Toolkit.Input} + data: + hand: 1 + - rid: 2 + type: {class: InputActionPoseSource, ns: MixedReality.Toolkit.Input, asm: MixedReality.Toolkit.Input} + data: + trackingStateActionProperty: + m_UseReference: 1 + m_Action: + m_Name: Tracking State Action Property + m_Type: 0 + m_ExpectedControlType: + m_Id: 431cd752-bb90-418f-81ab-9ccb25619703 + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_Reference: {fileID: -7613329581162844239, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} + positionActionProperty: + m_UseReference: 1 + m_Action: + m_Name: Position Action Property + m_Type: 0 + m_ExpectedControlType: + m_Id: 49e2037f-6b65-4c71-b43e-e60d8a28ea25 + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_Reference: {fileID: -2024308242397127297, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} + rotationActionProperty: + m_UseReference: 1 + m_Action: + m_Name: Rotation Action Property + m_Type: 0 + m_ExpectedControlType: + m_Id: 855e8d57-429e-4cdd-a756-0acafe9a3c73 + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_Reference: {fileID: 8248158260566104461, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} +--- !u!54 &5296314582960356879 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 761938320343190485} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 0 + m_IsKinematic: 1 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!114 &686151079364968060 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 761938320343190485} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 61c320ab91be1e04e81076323f7b3021, type: 3} + m_Name: + m_EditorClassIdentifier: + interactor: {fileID: 2572330550550829917} + detectHover: 0 + modeOnHover: + name: + priority: 0 + detectSelect: 1 + modeOnSelect: + name: GrabSelect + priority: 5 + controllers: + - {fileID: 1948193615953854874} +--- !u!1 &1948193615953854874 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1948193615953854875} + - component: {fileID: 6164080946324827545} + m_Layer: 0 + m_Name: Obsolete MRTK LeftHand Controller + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1948193615953854875 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1948193615953854874} + 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: 4299642553989019655} + - {fileID: 1948193616346090106} + - {fileID: 4332395624789801014} + - {fileID: 4443155524692848376} + - {fileID: 9148848192675160673} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &6164080946324827545 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1948193615953854874} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6533afcc1a3776848a226f74fce34856, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UpdateTrackingType: 0 + m_EnableInputTracking: 1 + m_EnableInputActions: 1 + m_ModelPrefab: {fileID: 1768293572455847265, guid: 2b468cc4fe6d2b44ebc53b958b38b91a, type: 3} + m_ModelParent: {fileID: 0} + m_Model: {fileID: 0} + m_AnimateModel: 0 + m_ModelSelectTransition: + m_ModelDeSelectTransition: + m_PositionAction: + m_UseReference: 1 + m_Action: + m_Name: Position + m_Type: 0 + m_ExpectedControlType: + m_Id: 513ad2ba-090b-4580-b78c-5223d06c58b9 + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_Reference: {fileID: 5671224385460781980, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} + m_RotationAction: + m_UseReference: 1 + m_Action: + m_Name: Rotation + m_Type: 0 + m_ExpectedControlType: + m_Id: 65b51994-5c1c-4624-9f51-b2d038b1e3aa + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_Reference: {fileID: -4531104493956672492, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} + m_TrackingStateAction: + m_UseReference: 1 + m_Action: + m_Name: Tracking State + m_Type: 0 + m_ExpectedControlType: + m_Id: bf907d9d-734c-4787-805f-53320e5a09f9 + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_Reference: {fileID: -7613329581162844239, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} + m_SelectAction: + m_UseReference: 1 + m_Action: + m_Name: Select + m_Type: 0 + m_ExpectedControlType: + m_Id: 14bb08fd-330f-4983-885c-2ea8111b76ee + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_Reference: {fileID: -6131295136447488360, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} + m_SelectActionValue: + m_UseReference: 1 + m_Action: + m_Name: Select Action Value + m_Type: 0 + m_ExpectedControlType: + m_Id: 12169980-9d44-4734-9f7c-8e4afa1e9758 + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_Reference: {fileID: -294446728694031702, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} + m_ActivateAction: + m_UseReference: 1 + m_Action: + m_Name: Activate + m_Type: 0 + m_ExpectedControlType: + m_Id: ac85a030-3710-4665-bea9-62092abc602f + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_Reference: {fileID: -5982496924579745919, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} + m_ActivateActionValue: + m_UseReference: 0 + m_Action: + m_Name: Activate Action Value + m_Type: 0 + m_ExpectedControlType: + m_Id: ff3bd004-e8ed-4aa9-bb8b-ae4c4fc724ba + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_Reference: {fileID: 0} + m_UIPressAction: + m_UseReference: 1 + m_Action: + m_Name: UI Press + m_Type: 0 + m_ExpectedControlType: + m_Id: 06c1cd44-b783-41e5-90b4-55fa549c8f3e + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_Reference: {fileID: -6395602842196007441, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} + m_UIPressActionValue: + m_UseReference: 0 + m_Action: + m_Name: UI Press Action Value + m_Type: 0 + m_ExpectedControlType: + m_Id: 2a2ab9f3-8d1a-43b3-a44b-29f50cc70e62 + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_Reference: {fileID: 0} + m_HapticDeviceAction: + m_UseReference: 0 + m_Action: + m_Name: Haptic Device + m_Type: 0 + m_ExpectedControlType: + m_Id: d4977179-afcb-40aa-8cc7-4040c17172ce + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_Reference: {fileID: 0} + m_RotateAnchorAction: + m_UseReference: 1 + m_Action: + m_Name: Rotate Anchor + m_Type: 0 + m_ExpectedControlType: + m_Id: fed765af-a56c-486f-858f-3795d5f8c934 + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_Reference: {fileID: -7363382999065477798, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} + m_DirectionalAnchorRotationAction: + m_UseReference: 0 + m_Action: + m_Name: Directional Anchor Rotation + m_Type: 0 + m_ExpectedControlType: + m_Id: debc0bf7-c57b-4317-a05d-982f95726b56 + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_Reference: {fileID: 0} + m_TranslateAnchorAction: + m_UseReference: 1 + m_Action: + m_Name: Translate Anchor + m_Type: 0 + m_ExpectedControlType: + m_Id: 33e04d29-24ab-4cfc-92cf-5bfbebe91331 + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_Reference: {fileID: 7779212132400271959, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} + m_ButtonPressPoint: 0.5 + handNode: 4 +--- !u!1 &1948193616346090105 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1948193616346090106} + - component: {fileID: 1948193616346090107} + - component: {fileID: 2149070630719831301} + m_Layer: 0 + m_Name: IndexTip PokeInteractor + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1948193616346090106 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1948193616346090105} + 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: 8443923956584964973} + - {fileID: 4299642553587339576} + m_Father: {fileID: 1948193615953854875} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1948193616346090107 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1948193616346090105} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 99aa5862f175caa4991960caf87f88aa, type: 3} + m_Name: + m_EditorClassIdentifier: + m_InteractionManager: {fileID: 0} + m_InteractionLayerMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_InteractionLayers: + m_Bits: 4294967295 + m_AttachTransform: {fileID: 8443923956584964973} + m_KeepSelectedTargetValid: 0 + m_DisableVisualsWhenBlockedInGroup: 1 + m_StartingSelectedInteractable: {fileID: 0} + m_StartingTargetFilter: {fileID: 0} + m_HoverEntered: + m_PersistentCalls: + m_Calls: [] + m_HoverExited: + m_PersistentCalls: + m_Calls: [] + m_SelectEntered: + m_PersistentCalls: + m_Calls: [] + m_SelectExited: + m_PersistentCalls: + m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_OnHoverEntered: + m_PersistentCalls: + m_Calls: [] + m_OnHoverExited: + m_PersistentCalls: + m_Calls: [] + m_OnSelectEntered: + m_PersistentCalls: + m_Calls: [] + m_OnSelectExited: + m_PersistentCalls: + m_Calls: [] + m_SelectActionTrigger: 1 + m_HideControllerOnSelect: 0 + m_AllowHoveredActivate: 0 + m_TargetPriorityMode: 0 + m_PlayAudioClipOnSelectEntered: 0 + m_AudioClipForOnSelectEntered: {fileID: 0} + m_PlayAudioClipOnSelectExited: 0 + m_AudioClipForOnSelectExited: {fileID: 0} + m_PlayAudioClipOnSelectCanceled: 0 + m_AudioClipForOnSelectCanceled: {fileID: 0} + m_PlayAudioClipOnHoverEntered: 0 + m_AudioClipForOnHoverEntered: {fileID: 0} + m_PlayAudioClipOnHoverExited: 0 + m_AudioClipForOnHoverExited: {fileID: 0} + m_PlayAudioClipOnHoverCanceled: 0 + m_AudioClipForOnHoverCanceled: {fileID: 0} + m_AllowHoverAudioWhileSelecting: 1 + m_PlayHapticsOnSelectEntered: 0 + m_HapticSelectEnterIntensity: 0 + m_HapticSelectEnterDuration: 0 + m_PlayHapticsOnSelectExited: 0 + m_HapticSelectExitIntensity: 0 + m_HapticSelectExitDuration: 0 + m_PlayHapticsOnSelectCanceled: 0 + m_HapticSelectCancelIntensity: 0 + m_HapticSelectCancelDuration: 0 + m_PlayHapticsOnHoverEntered: 0 + m_HapticHoverEnterIntensity: 0 + m_HapticHoverEnterDuration: 0 + m_PlayHapticsOnHoverExited: 0 + m_HapticHoverExitIntensity: 0 + m_HapticHoverExitDuration: 0 + m_PlayHapticsOnHoverCanceled: 0 + m_HapticHoverCancelIntensity: 0 + m_HapticHoverCancelDuration: 0 + m_AllowHoverHapticsWhileSelecting: 1 + pokePoseSource: + rid: 0 + references: + version: 2 + RefIds: + - rid: 0 + type: {class: FallbackCompositePoseSource, ns: MixedReality.Toolkit.Input, asm: MixedReality.Toolkit.Input} + data: + poseSourceList: + - rid: 1 + - rid: 2 + poseSources: [] + - rid: 1 + type: {class: HandJointPoseSource, ns: MixedReality.Toolkit.Input, asm: MixedReality.Toolkit.Input} + data: + hand: 1 + joint: 10 + - rid: 2 + type: {class: InputActionPoseSource, ns: MixedReality.Toolkit.Input, asm: MixedReality.Toolkit.Input} + data: + trackingStateActionProperty: + m_UseReference: 1 + m_Action: + m_Name: Tracking State Action Property + m_Type: 0 + m_ExpectedControlType: + m_Id: 75079f03-3a9a-4abe-b362-eeb4e32d2960 + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_Reference: {fileID: -7613329581162844239, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} + positionActionProperty: + m_UseReference: 1 + m_Action: + m_Name: Position Action Property + m_Type: 0 + m_ExpectedControlType: + m_Id: 31850730-8e81-433b-b673-e8b8211ce2b8 + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_Reference: {fileID: -2024308242397127297, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} + rotationActionProperty: + m_UseReference: 1 + m_Action: + m_Name: Rotation Action Property + m_Type: 0 + m_ExpectedControlType: + m_Id: 6b2b7030-a7a3-4004-8532-842eeae079c6 + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_Reference: {fileID: 8248158260566104461, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} +--- !u!114 &2149070630719831301 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1948193616346090105} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 518e5c0e6d2c664478d85d0ceae60c36, type: 3} + m_Name: + m_EditorClassIdentifier: + reticleRoot: {fileID: 0} + baseReticle: {fileID: 8086910922498750391} + pokeInteractor: {fileID: 1948193616346090107} + proximityLight: {fileID: 3552666654439622812} +--- !u!1 &4299642553989019656 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4299642553989019655} + - component: {fileID: 8326700373702288692} + - component: {fileID: 4299642553989019653} + - component: {fileID: 6450185055475174866} + - component: {fileID: 7678414244376504105} + m_Layer: 2 + m_Name: NearInteractionModeDetector + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4299642553989019655 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4299642553989019656} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0.07} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1948193615953854875} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &8326700373702288692 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4299642553989019656} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f34ba1bd80a7c3408576849ece8c425, type: 3} + m_Name: + m_EditorClassIdentifier: + interactionManager: {fileID: 0} + modeOnDetection: + name: Near + priority: 2 + controllers: + - {fileID: 1948193615953854874} + nearInteractors: + - {fileID: 1948193616346090107} + - {fileID: 2572330550550829917} +--- !u!54 &4299642553989019653 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4299642553989019656} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 0 + m_IsKinematic: 1 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!135 &6450185055475174866 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4299642553989019656} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Radius: 0.1 + m_Center: {x: 0, y: 0, z: 0} +--- !u!114 &7678414244376504105 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4299642553989019656} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fb2a8d0053b7d3e4d82d6169d852feff, type: 3} + m_Name: + m_EditorClassIdentifier: + jointPoseSource: + hand: 1 + joint: 10 + migratedSuccessfully: 1 + hand: 1 + joint: 10 +--- !u!1 &5224294193116514423 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9148848192675160673} + - component: {fileID: 3419360757097544916} + - component: {fileID: 6618093373316033540} + m_Layer: 0 + m_Name: GazePinchInteractor + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &9148848192675160673 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5224294193116514423} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1948193615953854875} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &3419360757097544916 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5224294193116514423} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 84f9ba44911727f4fb06a2c7e1e59fa6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_InteractionManager: {fileID: 0} + m_InteractionLayerMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_InteractionLayers: + m_Bits: 4294967295 + m_AttachTransform: {fileID: 0} + m_KeepSelectedTargetValid: 1 + m_DisableVisualsWhenBlockedInGroup: 1 + m_StartingSelectedInteractable: {fileID: 0} + m_StartingTargetFilter: {fileID: 0} + m_HoverEntered: + m_PersistentCalls: + m_Calls: [] + m_HoverExited: + m_PersistentCalls: + m_Calls: [] + m_SelectEntered: + m_PersistentCalls: + m_Calls: [] + m_SelectExited: + m_PersistentCalls: + m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_OnHoverEntered: + m_PersistentCalls: + m_Calls: [] + m_OnHoverExited: + m_PersistentCalls: + m_Calls: [] + m_OnSelectEntered: + m_PersistentCalls: + m_Calls: [] + m_OnSelectExited: + m_PersistentCalls: + m_Calls: [] + m_SelectActionTrigger: 1 + m_HideControllerOnSelect: 0 + m_AllowHoveredActivate: 0 + m_TargetPriorityMode: 0 + m_PlayAudioClipOnSelectEntered: 0 + m_AudioClipForOnSelectEntered: {fileID: 0} + m_PlayAudioClipOnSelectExited: 0 + m_AudioClipForOnSelectExited: {fileID: 0} + m_PlayAudioClipOnSelectCanceled: 0 + m_AudioClipForOnSelectCanceled: {fileID: 0} + m_PlayAudioClipOnHoverEntered: 0 + m_AudioClipForOnHoverEntered: {fileID: 0} + m_PlayAudioClipOnHoverExited: 0 + m_AudioClipForOnHoverExited: {fileID: 0} + m_PlayAudioClipOnHoverCanceled: 0 + m_AudioClipForOnHoverCanceled: {fileID: 0} + m_AllowHoverAudioWhileSelecting: 1 + m_PlayHapticsOnSelectEntered: 0 + m_HapticSelectEnterIntensity: 0 + m_HapticSelectEnterDuration: 0 + m_PlayHapticsOnSelectExited: 0 + m_HapticSelectExitIntensity: 0 + m_HapticSelectExitDuration: 0 + m_PlayHapticsOnSelectCanceled: 0 + m_HapticSelectCancelIntensity: 0 + m_HapticSelectCancelDuration: 0 + m_PlayHapticsOnHoverEntered: 0 + m_HapticHoverEnterIntensity: 0 + m_HapticHoverEnterDuration: 0 + m_PlayHapticsOnHoverExited: 0 + m_HapticHoverExitIntensity: 0 + m_HapticHoverExitDuration: 0 + m_PlayHapticsOnHoverCanceled: 0 + m_HapticHoverCancelIntensity: 0 + m_HapticHoverCancelDuration: 0 + m_AllowHoverHapticsWhileSelecting: 1 + handController: {fileID: 6164080946324827545} + devicePoseSource: + rid: 0 + pinchPoseSource: + rid: 1 + aimPoseSource: + rid: 2 + dependentInteractor: {fileID: 0} + stickyHoverThreshold: 0.5 + relaxationThreshold: 0.1 + references: + version: 2 + RefIds: + - rid: 0 + type: {class: FallbackCompositePoseSource, ns: MixedReality.Toolkit.Input, asm: MixedReality.Toolkit.Input} + data: + poseSourceList: + - rid: 3 + - rid: 4 + poseSources: [] + - rid: 1 + type: {class: PinchPoseSource, ns: MixedReality.Toolkit.Input, asm: MixedReality.Toolkit.Input} + data: + hand: 1 + - rid: 2 + type: {class: FallbackCompositePoseSource, ns: MixedReality.Toolkit.Input, asm: MixedReality.Toolkit.Input} + data: + poseSourceList: + - rid: 5 + - rid: 6 + poseSources: [] + - rid: 3 + type: {class: InputActionPoseSource, ns: MixedReality.Toolkit.Input, asm: MixedReality.Toolkit.Input} + data: + trackingStateActionProperty: + m_UseReference: 1 + m_Action: + m_Name: Tracking State Action Property + m_Type: 0 + m_ExpectedControlType: + m_Id: f870ae6c-df78-4182-a2e2-e70b286a570b + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_Reference: {fileID: -7613329581162844239, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} + positionActionProperty: + m_UseReference: 1 + m_Action: + m_Name: Position Action Property + m_Type: 0 + m_ExpectedControlType: + m_Id: 15532a33-c83e-41d1-84d0-95751a045a42 + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_Reference: {fileID: 5671224385460781980, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} + rotationActionProperty: + m_UseReference: 1 + m_Action: + m_Name: Rotation Action Property + m_Type: 0 + m_ExpectedControlType: + m_Id: 3922c7d9-9304-4c7d-8daf-2ccaf6eb1fef + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_Reference: {fileID: -4531104493956672492, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} + - rid: 4 + type: {class: HandJointPoseSource, ns: MixedReality.Toolkit.Input, asm: MixedReality.Toolkit.Input} + data: + hand: 1 + joint: 0 + - rid: 5 + type: {class: InputActionPoseSource, ns: MixedReality.Toolkit.Input, asm: MixedReality.Toolkit.Input} + data: + trackingStateActionProperty: + m_UseReference: 1 + m_Action: + m_Name: Tracking State Action Property + m_Type: 0 + m_ExpectedControlType: + m_Id: 7fd01eeb-b1cc-4182-9bba-a0e49a6ad85d + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_Reference: {fileID: -7613329581162844239, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} + positionActionProperty: + m_UseReference: 1 + m_Action: + m_Name: Position Action Property + m_Type: 0 + m_ExpectedControlType: + m_Id: 4097a54f-24f1-475b-8db8-0e6929a8384d + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_Reference: {fileID: -2024308242397127297, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} + rotationActionProperty: + m_UseReference: 1 + m_Action: + m_Name: Rotation Action Property + m_Type: 0 + m_ExpectedControlType: + m_Id: 16efb8f2-297f-4977-8ac7-f8fbb4d00646 + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_Reference: {fileID: 8248158260566104461, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} + - rid: 6 + type: {class: PolyfillHandRayPoseSource, ns: MixedReality.Toolkit.Input, asm: MixedReality.Toolkit.Input} + data: + hand: 1 +--- !u!114 &6618093373316033540 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5224294193116514423} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 61c320ab91be1e04e81076323f7b3021, type: 3} + m_Name: + m_EditorClassIdentifier: + interactor: {fileID: 3419360757097544916} + detectHover: 0 + modeOnHover: + name: + priority: 0 + detectSelect: 1 + modeOnSelect: + name: GazeSelect + priority: 4 + controllers: + - {fileID: 1948193615953854874} +--- !u!1 &6406844254730761679 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1051247791254679178} + - component: {fileID: 6800936895746535163} + m_Layer: 2 + m_Name: AttachTransform + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1051247791254679178 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6406844254730761679} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4443155524692848376} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!135 &6800936895746535163 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6406844254730761679} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Radius: 0.05 + m_Center: {x: 0, y: 0, z: 0} +--- !u!1 &8822000602352085715 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1307666228887773622} + - component: {fileID: 5409732680908794997} + - component: {fileID: 3681755664881842967} + - component: {fileID: 6598864090782150916} + m_Layer: 0 + m_Name: BendyRay + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1307666228887773622 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8822000602352085715} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4332395624789801014} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!120 &5409732680908794997 +LineRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8822000602352085715} + m_Enabled: 0 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 0 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 0 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: f00a9d40790cdc54aa52c7d81ad923f3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Positions: + - {x: 0, y: 0, z: 0} + - {x: 0, y: 0, z: 1} + m_Parameters: + serializedVersion: 3 + widthMultiplier: 0.0015 + widthCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + colorGradient: + serializedVersion: 2 + key0: {r: 1, g: 1, b: 1, a: 1} + key1: {r: 1, g: 1, b: 1, a: 1} + key2: {r: 0, g: 0, b: 0, a: 0} + key3: {r: 0, g: 0, b: 0, a: 0} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 0 + atime3: 0 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_NumColorKeys: 2 + m_NumAlphaKeys: 2 + numCornerVertices: 8 + numCapVertices: 8 + alignment: 0 + textureMode: 1 + shadowBias: 0 + generateLightingData: 0 + m_UseWorldSpace: 1 + m_Loop: 0 +--- !u!114 &3681755664881842967 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8822000602352085715} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8b3e34902948c18428b36f8c4ed4e153, type: 3} + m_Name: + m_EditorClassIdentifier: + lineStartClamp: 0.0001 + lineEndClamp: 0.9999 + customLineTransform: {fileID: 0} + controlPoints: + Point1: {x: 0, y: 0, z: 0} + Point2: {x: 0, y: 0, z: 0.33} + Point3: {x: 0, y: 0, z: 0.66} + Point4: {x: 0, y: 0, z: 1} + useLocalTangentPoints: 0 +--- !u!114 &6598864090782150916 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8822000602352085715} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8e0470c60d5b56e4ab4b9cb139d3fe89, type: 3} + m_Name: + m_EditorClassIdentifier: + bezier: {fileID: 3681755664881842967} + inertia: 15 + dampen: 6 + seekTargetStrength: 6.26 + p1Target: {x: 0, y: 0, z: 0.33} + p2Target: {x: 0, y: 0, z: 0.66} +--- !u!1001 &212221299525418658 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 4332395624789801014} + m_Modifications: + - target: {fileID: 916568500123441303, guid: fddee8b412d753e40a02681891de4a7b, type: 3} + propertyPath: rayInteractor + value: + objectReference: {fileID: 2940030942784507886} + - target: {fileID: 916568500123441303, guid: fddee8b412d753e40a02681891de4a7b, type: 3} + propertyPath: visibilitySettings + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3867428799850922014, guid: fddee8b412d753e40a02681891de4a7b, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3867428799850922014, guid: fddee8b412d753e40a02681891de4a7b, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3867428799850922014, guid: fddee8b412d753e40a02681891de4a7b, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3867428799850922014, guid: fddee8b412d753e40a02681891de4a7b, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3867428799850922014, guid: fddee8b412d753e40a02681891de4a7b, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3867428799850922014, guid: fddee8b412d753e40a02681891de4a7b, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3867428799850922014, guid: fddee8b412d753e40a02681891de4a7b, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3867428799850922014, guid: fddee8b412d753e40a02681891de4a7b, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3867428799850922014, guid: fddee8b412d753e40a02681891de4a7b, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3867428799850922014, guid: fddee8b412d753e40a02681891de4a7b, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3867428799850922014, guid: fddee8b412d753e40a02681891de4a7b, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3867428799850922015, guid: fddee8b412d753e40a02681891de4a7b, type: 3} + propertyPath: m_Name + value: RayReticle + objectReference: {fileID: 0} + - target: {fileID: 4561340893587511738, guid: fddee8b412d753e40a02681891de4a7b, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7113035467055917293, guid: fddee8b412d753e40a02681891de4a7b, type: 3} + propertyPath: settings.handedness + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 9095796513279534737, guid: fddee8b412d753e40a02681891de4a7b, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: fddee8b412d753e40a02681891de4a7b, type: 3} +--- !u!4 &3988544559415115452 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3867428799850922014, guid: fddee8b412d753e40a02681891de4a7b, type: 3} + m_PrefabInstance: {fileID: 212221299525418658} + m_PrefabAsset: {fileID: 0} +--- !u!1 &4448665028262160152 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 4561340893587511738, guid: fddee8b412d753e40a02681891de4a7b, type: 3} + m_PrefabInstance: {fileID: 212221299525418658} + m_PrefabAsset: {fileID: 0} +--- !u!1 &8992338914735331379 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 9095796513279534737, guid: fddee8b412d753e40a02681891de4a7b, type: 3} + m_PrefabInstance: {fileID: 212221299525418658} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &1009008764017234214 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1948193616346090106} + m_Modifications: + - target: {fileID: 3867428799850922014, guid: fddee8b412d753e40a02681891de4a7b, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3867428799850922014, guid: fddee8b412d753e40a02681891de4a7b, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3867428799850922014, guid: fddee8b412d753e40a02681891de4a7b, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3867428799850922014, guid: fddee8b412d753e40a02681891de4a7b, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3867428799850922014, guid: fddee8b412d753e40a02681891de4a7b, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3867428799850922014, guid: fddee8b412d753e40a02681891de4a7b, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3867428799850922014, guid: fddee8b412d753e40a02681891de4a7b, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3867428799850922014, guid: fddee8b412d753e40a02681891de4a7b, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3867428799850922014, guid: fddee8b412d753e40a02681891de4a7b, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3867428799850922014, guid: fddee8b412d753e40a02681891de4a7b, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3867428799850922014, guid: fddee8b412d753e40a02681891de4a7b, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3867428799850922015, guid: fddee8b412d753e40a02681891de4a7b, type: 3} + propertyPath: m_Name + value: PokeReticle + objectReference: {fileID: 0} + - target: {fileID: 7113035467055917293, guid: fddee8b412d753e40a02681891de4a7b, type: 3} + propertyPath: settings.handedness + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7949002557058872435, guid: fddee8b412d753e40a02681891de4a7b, type: 3} + propertyPath: fadeEnabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7949002557058872435, guid: fddee8b412d753e40a02681891de4a7b, type: 3} + propertyPath: displaySelectionProgress + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9095796513279534737, guid: fddee8b412d753e40a02681891de4a7b, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: fddee8b412d753e40a02681891de4a7b, type: 3} +--- !u!1 &3552666654439622812 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 4561340893587511738, guid: fddee8b412d753e40a02681891de4a7b, type: 3} + m_PrefabInstance: {fileID: 1009008764017234214} + m_PrefabAsset: {fileID: 0} +--- !u!4 &4299642553587339576 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3867428799850922014, guid: fddee8b412d753e40a02681891de4a7b, type: 3} + m_PrefabInstance: {fileID: 1009008764017234214} + m_PrefabAsset: {fileID: 0} +--- !u!1 &8086910922498750391 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 9095796513279534737, guid: fddee8b412d753e40a02681891de4a7b, type: 3} + m_PrefabInstance: {fileID: 1009008764017234214} + m_PrefabAsset: {fileID: 0} +--- !u!114 &943052423812839532 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8086910922498750391} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1a90bdb9b3d7ea8478174ba4ab311525, type: 3} + m_Name: + m_EditorClassIdentifier: + detector: {fileID: 8326700373702288692} + magnetRange: 0.1 + colliderThicknessCutoff: 0.04 + positionSmoothingCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -0.006248474 + inSlope: 8.3082905 + outSlope: 8.3082905 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0.13082331 + - serializedVersion: 3 + time: 0.29206347 + value: 1.0051913 + inSlope: 0.014071703 + outSlope: 0.014071703 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.08556712 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: -0.049552314 + outSlope: -0.049552314 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.1261298 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + positionMagnetismCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 3.2874727 + outSlope: 3.2874727 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0.0971252 + - serializedVersion: 3 + time: 0.7181672 + value: 0.9974749 + inSlope: 0.026487706 + outSlope: 0.026487706 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.4531506 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0.08532449 + outSlope: 0.08532449 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.22761437 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + rotationMagnetismCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.2545719 + value: 0.0022069365 + inSlope: 0.018979477 + outSlope: 0.018979477 + tangentMode: 0 + weightedMode: 2 + inWeight: 0.33333334 + outWeight: 0.78778994 + - serializedVersion: 3 + time: 0.7658175 + value: 1 + inSlope: 0.05842813 + outSlope: 0.05842813 + tangentMode: 0 + weightedMode: 0 + inWeight: 1 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + variableReticleCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 3.1450696 + outSlope: 3.1450696 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0.07148726 + - serializedVersion: 3 + time: 0.3361836 + value: 0.7357838 + inSlope: 0.011678002 + outSlope: 0.011678002 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.23232421 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0.041792747 + outSlope: 0.041792747 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.64424783 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + positionSmoothing: 0.05 + rotationSmoothing: 0.1 diff --git a/org.mixedrealitytoolkit.input/Assets/Prefabs/Obsolete MRTK LeftHand Controller.prefab.meta b/org.mixedrealitytoolkit.input/Assets/Prefabs/Obsolete MRTK LeftHand Controller.prefab.meta new file mode 100644 index 000000000..3b3c7ff1e --- /dev/null +++ b/org.mixedrealitytoolkit.input/Assets/Prefabs/Obsolete MRTK LeftHand Controller.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: c89f12cb641c27e47b7b71af1d6518a5 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/org.mixedrealitytoolkit.input/Assets/Prefabs/Obsolete MRTK RightHand Controller.prefab b/org.mixedrealitytoolkit.input/Assets/Prefabs/Obsolete MRTK RightHand Controller.prefab new file mode 100644 index 000000000..30c3caeca --- /dev/null +++ b/org.mixedrealitytoolkit.input/Assets/Prefabs/Obsolete MRTK RightHand Controller.prefab @@ -0,0 +1,287 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &7898662983119667484 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1948193615953854874, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} + propertyPath: m_Name + value: MRTK RightHand Controller + objectReference: {fileID: 0} + - target: {fileID: 1948193615953854875, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1948193615953854875, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1948193615953854875, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1948193615953854875, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1948193616346090107, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} + propertyPath: managedReferences[1].hand + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 1948193616346090107, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} + propertyPath: pokePoseSource.poseSourceList.Array.data[0].hand + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 1948193616346090107, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} + propertyPath: managedReferences[2].positionActionProperty.m_Reference + value: + objectReference: {fileID: -3326005586356538449, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} + - target: {fileID: 1948193616346090107, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} + propertyPath: managedReferences[2].rotationActionProperty.m_Reference + value: + objectReference: {fileID: 5101698808175986029, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} + - target: {fileID: 1948193616346090107, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} + propertyPath: managedReferences[2].trackingStateActionProperty.m_Reference + value: + objectReference: {fileID: 3239510804178183174, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} + - target: {fileID: 1948193616346090107, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} + propertyPath: pokePoseSource.poseSourceList.Array.data[1].positionActionProperty.m_Reference + value: + objectReference: {fileID: -3326005586356538449, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} + - target: {fileID: 1948193616346090107, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} + propertyPath: pokePoseSource.poseSourceList.Array.data[1].rotationActionProperty.m_Reference + value: + objectReference: {fileID: 5101698808175986029, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} + - target: {fileID: 1948193616346090107, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} + propertyPath: pokePoseSource.poseSourceList.Array.data[1].trackingStateActionProperty.m_Reference + value: + objectReference: {fileID: 3239510804178183174, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} + - target: {fileID: 2572330550550829917, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} + propertyPath: managedReferences[1].hand + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2572330550550829917, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} + propertyPath: pinchPoseSource.poseSourceList.Array.data[0].hand + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2572330550550829917, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} + propertyPath: managedReferences[2].positionActionProperty.m_Reference + value: + objectReference: {fileID: -3326005586356538449, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} + - target: {fileID: 2572330550550829917, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} + propertyPath: managedReferences[2].rotationActionProperty.m_Reference + value: + objectReference: {fileID: 5101698808175986029, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} + - target: {fileID: 2572330550550829917, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} + propertyPath: managedReferences[2].trackingStateActionProperty.m_Reference + value: + objectReference: {fileID: 3239510804178183174, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} + - target: {fileID: 2572330550550829917, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} + propertyPath: pinchPoseSource.poseSourceList.Array.data[1].positionActionProperty.m_Reference + value: + objectReference: {fileID: -3326005586356538449, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} + - target: {fileID: 2572330550550829917, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} + propertyPath: pinchPoseSource.poseSourceList.Array.data[1].rotationActionProperty.m_Reference + value: + objectReference: {fileID: 5101698808175986029, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} + - target: {fileID: 2572330550550829917, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} + propertyPath: pinchPoseSource.poseSourceList.Array.data[1].trackingStateActionProperty.m_Reference + value: + objectReference: {fileID: 3239510804178183174, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} + - target: {fileID: 2940030942784507886, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} + propertyPath: managedReferences[3].hand + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2940030942784507886, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} + propertyPath: managedReferences[5].hand + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2940030942784507886, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} + propertyPath: aimPoseSource.poseSourceList.Array.data[1].hand + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2940030942784507886, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} + propertyPath: devicePoseSource.poseSourceList.Array.data[1].hand + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2940030942784507886, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} + propertyPath: managedReferences[2].positionActionProperty.m_Reference + value: + objectReference: {fileID: -3326005586356538449, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} + - target: {fileID: 2940030942784507886, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} + propertyPath: managedReferences[2].rotationActionProperty.m_Reference + value: + objectReference: {fileID: 5101698808175986029, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} + - target: {fileID: 2940030942784507886, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} + propertyPath: managedReferences[4].positionActionProperty.m_Reference + value: + objectReference: {fileID: -1813146318149588949, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} + - target: {fileID: 2940030942784507886, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} + propertyPath: managedReferences[4].rotationActionProperty.m_Reference + value: + objectReference: {fileID: 5820880757197039143, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} + - target: {fileID: 2940030942784507886, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} + propertyPath: managedReferences[2].trackingStateActionProperty.m_Reference + value: + objectReference: {fileID: 3239510804178183174, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} + - target: {fileID: 2940030942784507886, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} + propertyPath: managedReferences[4].trackingStateActionProperty.m_Reference + value: + objectReference: {fileID: 3239510804178183174, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} + - target: {fileID: 2940030942784507886, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} + propertyPath: aimPoseSource.poseSourceList.Array.data[0].positionActionProperty.m_Reference + value: + objectReference: {fileID: -3326005586356538449, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} + - target: {fileID: 2940030942784507886, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} + propertyPath: aimPoseSource.poseSourceList.Array.data[0].rotationActionProperty.m_Reference + value: + objectReference: {fileID: 5101698808175986029, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} + - target: {fileID: 2940030942784507886, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} + propertyPath: devicePoseSource.poseSourceList.Array.data[0].positionActionProperty.m_Reference + value: + objectReference: {fileID: -1813146318149588949, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} + - target: {fileID: 2940030942784507886, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} + propertyPath: devicePoseSource.poseSourceList.Array.data[0].rotationActionProperty.m_Reference + value: + objectReference: {fileID: 5820880757197039143, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} + - target: {fileID: 2940030942784507886, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} + propertyPath: aimPoseSource.poseSourceList.Array.data[0].trackingStateActionProperty.m_Reference + value: + objectReference: {fileID: 3239510804178183174, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} + - target: {fileID: 2940030942784507886, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} + propertyPath: devicePoseSource.poseSourceList.Array.data[0].trackingStateActionProperty.m_Reference + value: + objectReference: {fileID: 3239510804178183174, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} + - target: {fileID: 3419360757097544916, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} + propertyPath: pinchPoseSource.hand + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3419360757097544916, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} + propertyPath: managedReferences[1].hand + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3419360757097544916, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} + propertyPath: managedReferences[4].hand + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3419360757097544916, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} + propertyPath: managedReferences[6].hand + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3419360757097544916, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} + propertyPath: aimPoseSource.poseSourceList.Array.data[1].hand + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3419360757097544916, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} + propertyPath: devicePoseSource.poseSourceList.Array.data[1].hand + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3419360757097544916, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} + propertyPath: managedReferences[3].positionActionProperty.m_Reference + value: + objectReference: {fileID: -1813146318149588949, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} + - target: {fileID: 3419360757097544916, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} + propertyPath: managedReferences[3].rotationActionProperty.m_Reference + value: + objectReference: {fileID: 5820880757197039143, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} + - target: {fileID: 3419360757097544916, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} + propertyPath: managedReferences[5].positionActionProperty.m_Reference + value: + objectReference: {fileID: -3326005586356538449, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} + - target: {fileID: 3419360757097544916, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} + propertyPath: managedReferences[5].rotationActionProperty.m_Reference + value: + objectReference: {fileID: 5101698808175986029, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} + - target: {fileID: 3419360757097544916, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} + propertyPath: managedReferences[3].trackingStateActionProperty.m_Reference + value: + objectReference: {fileID: 3239510804178183174, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} + - target: {fileID: 3419360757097544916, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} + propertyPath: managedReferences[5].trackingStateActionProperty.m_Reference + value: + objectReference: {fileID: 3239510804178183174, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} + - target: {fileID: 3419360757097544916, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} + propertyPath: aimPoseSource.poseSourceList.Array.data[0].positionActionProperty.m_Reference + value: + objectReference: {fileID: -3326005586356538449, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} + - target: {fileID: 3419360757097544916, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} + propertyPath: aimPoseSource.poseSourceList.Array.data[0].rotationActionProperty.m_Reference + value: + objectReference: {fileID: 5101698808175986029, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} + - target: {fileID: 3419360757097544916, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} + propertyPath: devicePoseSource.poseSourceList.Array.data[0].positionActionProperty.m_Reference + value: + objectReference: {fileID: -1813146318149588949, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} + - target: {fileID: 3419360757097544916, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} + propertyPath: devicePoseSource.poseSourceList.Array.data[0].rotationActionProperty.m_Reference + value: + objectReference: {fileID: 5820880757197039143, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} + - target: {fileID: 3419360757097544916, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} + propertyPath: aimPoseSource.poseSourceList.Array.data[0].trackingStateActionProperty.m_Reference + value: + objectReference: {fileID: 3239510804178183174, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} + - target: {fileID: 3419360757097544916, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} + propertyPath: devicePoseSource.poseSourceList.Array.data[0].trackingStateActionProperty.m_Reference + value: + objectReference: {fileID: 3239510804178183174, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} + - target: {fileID: 6164080946324827545, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} + propertyPath: handNode + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 6164080946324827545, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} + propertyPath: m_ModelPrefab + value: + objectReference: {fileID: 3973969148631863464, guid: da93d751ddc0f64468dfc02f18d02d00, type: 3} + - target: {fileID: 6164080946324827545, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} + propertyPath: m_SelectAction.m_Reference + value: + objectReference: {fileID: 187161793506945269, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} + - target: {fileID: 6164080946324827545, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} + propertyPath: m_UIPressAction.m_Reference + value: + objectReference: {fileID: 3279264004350380116, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} + - target: {fileID: 6164080946324827545, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} + propertyPath: m_ActivateAction.m_Reference + value: + objectReference: {fileID: 83097790271614945, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} + - target: {fileID: 6164080946324827545, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} + propertyPath: m_PositionAction.m_Reference + value: + objectReference: {fileID: -1813146318149588949, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} + - target: {fileID: 6164080946324827545, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} + propertyPath: m_RotationAction.m_Reference + value: + objectReference: {fileID: 5820880757197039143, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} + - target: {fileID: 6164080946324827545, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} + propertyPath: m_SelectActionValue.m_Reference + value: + objectReference: {fileID: 2995356199736570127, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} + - target: {fileID: 6164080946324827545, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} + propertyPath: m_RotateAnchorAction.m_Reference + value: + objectReference: {fileID: -5913262927076077117, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} + - target: {fileID: 6164080946324827545, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} + propertyPath: m_TrackingStateAction.m_Reference + value: + objectReference: {fileID: 3239510804178183174, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} + - target: {fileID: 6164080946324827545, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} + propertyPath: m_TranslateAnchorAction.m_Reference + value: + objectReference: {fileID: 875253871413052681, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} + - target: {fileID: 6937621743165281871, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} + propertyPath: settings.handedness + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 7678414244376504105, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} + propertyPath: jointPoseSource.hand + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 7833497039863265739, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} + propertyPath: settings.handedness + value: 2 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} diff --git a/org.mixedrealitytoolkit.input/Assets/Prefabs/Obsolete MRTK RightHand Controller.prefab.meta b/org.mixedrealitytoolkit.input/Assets/Prefabs/Obsolete MRTK RightHand Controller.prefab.meta new file mode 100644 index 000000000..cb3691fbb --- /dev/null +++ b/org.mixedrealitytoolkit.input/Assets/Prefabs/Obsolete MRTK RightHand Controller.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 82333e6e543cb7e4dbd5b1d47aff3f58 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/org.mixedrealitytoolkit.input/Assets/Prefabs/Obsolete MRTK XR Rig.prefab b/org.mixedrealitytoolkit.input/Assets/Prefabs/Obsolete MRTK XR Rig.prefab new file mode 100644 index 000000000..df5e2de88 --- /dev/null +++ b/org.mixedrealitytoolkit.input/Assets/Prefabs/Obsolete MRTK XR Rig.prefab @@ -0,0 +1,772 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &2351505566771328562 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2351505566771328526} + - component: {fileID: 2351505566771328527} + - component: {fileID: 5241374001388422442} + - component: {fileID: 2351505566771328560} + - component: {fileID: 2351505566771328561} + - component: {fileID: 404949538145338360} + m_Layer: 0 + m_Name: Main Camera + m_TagString: MainCamera + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2351505566771328526 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2351505566771328562} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2351505566903569412} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!20 &2351505566771328527 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2351505566771328562} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 2 + m_BackGroundColor: {r: 0, g: 0, b: 0, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_FocalLength: 50 + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.02 + far clip plane: 100 + field of view: 60 + orthographic: 0 + orthographic size: 5 + m_Depth: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!114 &5241374001388422442 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2351505566771328562} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 008eb9d9a265da14cb1470ac33e590d9, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EventMask: + serializedVersion: 2 + m_Bits: 4294967291 + m_MaxRayIntersections: 0 +--- !u!81 &2351505566771328560 +AudioListener: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2351505566771328562} + m_Enabled: 1 +--- !u!114 &2351505566771328561 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2351505566771328562} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c2fadf230d1919748a9aa21d40f74619, type: 3} + m_Name: + m_EditorClassIdentifier: + m_TrackingType: 0 + m_UpdateType: 0 + m_IgnoreTrackingState: 0 + m_PositionInput: + m_UseReference: 0 + m_Action: + m_Name: Main Camera - TPD - Position + m_Type: 0 + m_ExpectedControlType: Vector3 + m_Id: d4432d53-3129-4bc1-b40c-7e4a2dbbc601 + m_Processors: + m_Interactions: + m_SingletonActionBindings: + - m_Name: + m_Id: b3d20e57-4ea8-4a75-9dbb-836d9b88eec2 + m_Path: /centerEyePosition + m_Interactions: + m_Processors: + m_Groups: + m_Action: Main Camera - TPD - Position + m_Flags: 0 + - m_Name: + m_Id: aaafe9b2-5649-445a-84a9-7f378141e509 + m_Path: /devicePosition + m_Interactions: + m_Processors: + m_Groups: + m_Action: Main Camera - TPD - Position + m_Flags: 0 + m_Flags: 0 + m_Reference: {fileID: 0} + m_RotationInput: + m_UseReference: 0 + m_Action: + m_Name: Main Camera - TPD - Rotation + m_Type: 0 + m_ExpectedControlType: Quaternion + m_Id: 4185553d-a824-4a27-a0d2-abea3a5a840a + m_Processors: + m_Interactions: + m_SingletonActionBindings: + - m_Name: + m_Id: 742b8f60-8112-4b99-88ee-ab3556888117 + m_Path: /centerEyeRotation + m_Interactions: + m_Processors: + m_Groups: + m_Action: Main Camera - TPD - Rotation + m_Flags: 0 + - m_Name: + m_Id: 6afecc40-afb8-45e8-9eb3-f3342d3835cc + m_Path: /deviceRotation + m_Interactions: + m_Processors: + m_Groups: + m_Action: Main Camera - TPD - Rotation + m_Flags: 0 + m_Flags: 0 + m_Reference: {fileID: 0} + m_TrackingStateInput: + m_UseReference: 0 + m_Action: + m_Name: Tracking State Input + m_Type: 0 + m_ExpectedControlType: + m_Id: df35a240-9d4e-49c3-9324-a02895bb482c + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_Reference: {fileID: 0} + m_PositionAction: + m_Name: Main Camera - TPD - Position + m_Type: 0 + m_ExpectedControlType: Vector3 + m_Id: d4432d53-3129-4bc1-b40c-7e4a2dbbc601 + m_Processors: + m_Interactions: + m_SingletonActionBindings: + - m_Name: + m_Id: b3d20e57-4ea8-4a75-9dbb-836d9b88eec2 + m_Path: /centerEyePosition + m_Interactions: + m_Processors: + m_Groups: + m_Action: Main Camera - TPD - Position + m_Flags: 0 + m_Flags: 0 + m_RotationAction: + m_Name: Main Camera - TPD - Rotation + m_Type: 0 + m_ExpectedControlType: Quaternion + m_Id: 4185553d-a824-4a27-a0d2-abea3a5a840a + m_Processors: + m_Interactions: + m_SingletonActionBindings: + - m_Name: + m_Id: 742b8f60-8112-4b99-88ee-ab3556888117 + m_Path: /centerEyeRotation + m_Interactions: + m_Processors: + m_Groups: + m_Action: Main Camera - TPD - Rotation + m_Flags: 0 + m_Flags: 0 + m_HasMigratedActions: 1 +--- !u!114 &404949538145338360 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2351505566771328562} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 80bee04b0b615324e81420c8aac0dc47, type: 3} + m_Name: + m_EditorClassIdentifier: + opaqueDisplay: + clearMode: 1 + clearColor: {r: 0, g: 0, b: 0, a: 0} + nearPlaneDistance: 0.1 + farPlaneDistance: 1000 + adjustTrackingOrigin: 1 + adjustQualityLevel: 1 + qualityLevel: 5 + transparentDisplay: + clearMode: 2 + clearColor: {r: 0, g: 0, b: 0, a: 0} + nearPlaneDistance: 0.1 + farPlaneDistance: 50 + adjustTrackingOrigin: 1 + adjustQualityLevel: 1 + qualityLevel: 0 +--- !u!1 &2351505566903569413 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2351505566903569412} + - component: {fileID: 3712792914886690938} + - component: {fileID: 2813607766961918107} + m_Layer: 0 + m_Name: Camera Offset + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2351505566903569412 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2351505566903569413} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 1.6, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 2351505566771328526} + - {fileID: 5727148871348114050} + - {fileID: 5870931076965904816} + - {fileID: 5628234118856470563} + m_Father: {fileID: 2351505567455720332} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &3712792914886690938 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2351505566903569413} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e0cb9aa70a22847b5925ee5f067c10a9, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Camera: {fileID: 2351505566771328527} + m_OriginBaseGameObject: {fileID: 2351505567455720334} + m_CameraFloorOffsetObject: {fileID: 2351505566903569413} + m_RequestedTrackingOriginMode: 0 + m_CameraYOffset: 1.6 +--- !u!114 &2813607766961918107 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2351505566903569413} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c4d642881628ba842b14068a50038965, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &2351505567455720334 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2351505567455720332} + - component: {fileID: 4160709927669568829} + - component: {fileID: 6400715630075217958} + m_Layer: 0 + m_Name: Obsolete MRTK XR Rig + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2351505567455720332 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2351505567455720334} + 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: 5241231772802432718} + - {fileID: 2351505566903569412} + - {fileID: 7609097064974327368} + - {fileID: 6448619845270702420} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &4160709927669568829 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2351505567455720334} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 017c5e3933235514c9520e1dace2a4b2, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ActionAssets: + - {fileID: -944628639613478452, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} +--- !u!114 &6400715630075217958 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2351505567455720334} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1a107350295baaf4489642caa92f05de, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &7735890427496681069 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6448619845270702420} + - component: {fileID: 8085333164323593313} + - component: {fileID: 8386996556897629391} + m_Layer: 0 + m_Name: CanvasProxyInteractor + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6448619845270702420 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7735890427496681069} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2351505567455720332} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &8085333164323593313 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7735890427496681069} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 215885e6942e29c4e9022fde2c8cd88c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_InteractionManager: {fileID: 5569439093497552269} + m_InteractionLayerMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_InteractionLayers: + m_Bits: 4294967295 + m_AttachTransform: {fileID: 0} + m_KeepSelectedTargetValid: 1 + m_DisableVisualsWhenBlockedInGroup: 1 + m_StartingSelectedInteractable: {fileID: 0} + m_StartingTargetFilter: {fileID: 0} + m_HoverEntered: + m_PersistentCalls: + m_Calls: [] + m_HoverExited: + m_PersistentCalls: + m_Calls: [] + m_SelectEntered: + m_PersistentCalls: + m_Calls: [] + m_SelectExited: + m_PersistentCalls: + m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_OnHoverEntered: + m_PersistentCalls: + m_Calls: [] + m_OnHoverExited: + m_PersistentCalls: + m_Calls: [] + m_OnSelectEntered: + m_PersistentCalls: + m_Calls: [] + m_OnSelectExited: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &8386996556897629391 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7735890427496681069} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 45da53d665c373148a88bcc2dc96c9de, type: 3} + m_Name: + m_EditorClassIdentifier: + flatScreenInteractionMode: + name: FlatScreen + priority: 6 + controllers: + - {fileID: 7735890427496681069} +--- !u!1 &8479077998186684813 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7609097064974327368} + - component: {fileID: 7720573869748407015} + m_Layer: 0 + m_Name: MRTK Speech + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &7609097064974327368 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8479077998186684813} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2351505567455720332} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &7720573869748407015 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8479077998186684813} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b9b28fbe0dde38c48993d0bda344d7e5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_InteractionManager: {fileID: 0} + m_InteractionLayerMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_InteractionLayers: + m_Bits: 4294967295 + m_AttachTransform: {fileID: 0} + m_KeepSelectedTargetValid: 1 + m_DisableVisualsWhenBlockedInGroup: 1 + m_StartingSelectedInteractable: {fileID: 0} + m_StartingTargetFilter: {fileID: 0} + m_HoverEntered: + m_PersistentCalls: + m_Calls: [] + m_HoverExited: + m_PersistentCalls: + m_Calls: [] + m_SelectEntered: + m_PersistentCalls: + m_Calls: [] + m_SelectExited: + m_PersistentCalls: + m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_OnHoverEntered: + m_PersistentCalls: + m_Calls: [] + m_OnHoverExited: + m_PersistentCalls: + m_Calls: [] + m_OnSelectEntered: + m_PersistentCalls: + m_Calls: [] + m_OnSelectExited: + m_PersistentCalls: + m_Calls: [] + voiceCommandTriggerTime: 0.3 +--- !u!1001 &1224987191631620050 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 2351505566903569412} + m_Modifications: + - target: {fileID: 6853218870844938225, guid: 6f3af2a8508960843b36fb9d64de2bc2, type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 6853218870844938225, guid: 6f3af2a8508960843b36fb9d64de2bc2, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6853218870844938225, guid: 6f3af2a8508960843b36fb9d64de2bc2, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6853218870844938225, guid: 6f3af2a8508960843b36fb9d64de2bc2, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7470888221916766567, guid: 6f3af2a8508960843b36fb9d64de2bc2, type: 3} + propertyPath: m_Name + value: MRTK Gaze Controller + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 6f3af2a8508960843b36fb9d64de2bc2, type: 3} +--- !u!114 &4102833070697430761 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3021976565802998075, guid: 6f3af2a8508960843b36fb9d64de2bc2, type: 3} + m_PrefabInstance: {fileID: 1224987191631620050} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1175590bcfccd6d44a4c8f9a15292536, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &5302893730759227071 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 6383762985148977517, guid: 6f3af2a8508960843b36fb9d64de2bc2, type: 3} + m_PrefabInstance: {fileID: 1224987191631620050} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b5ecb302c7ea48344b3a839df64a77a5, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!4 &5628234118856470563 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6853218870844938225, guid: 6f3af2a8508960843b36fb9d64de2bc2, type: 3} + m_PrefabInstance: {fileID: 1224987191631620050} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &2609686519359345044 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 2351505567455720332} + m_Modifications: + - target: {fileID: 6474832524069219057, guid: 2d7353d30f9fe7e41bf30032876961a9, type: 3} + propertyPath: gazeController + value: + objectReference: {fileID: 5302893730759227071} + - target: {fileID: 6474832524069219057, guid: 2d7353d30f9fe7e41bf30032876961a9, type: 3} + propertyPath: leftHandController + value: + objectReference: {fileID: 2304670408713330098} + - target: {fileID: 6474832524069219057, guid: 2d7353d30f9fe7e41bf30032876961a9, type: 3} + propertyPath: rightHandController + value: + objectReference: {fileID: 142007140022173312} + - target: {fileID: 7821592117992173381, guid: 2d7353d30f9fe7e41bf30032876961a9, type: 3} + propertyPath: m_Name + value: MRTK Interaction Manager + objectReference: {fileID: 0} + - target: {fileID: 7821592117992173402, guid: 2d7353d30f9fe7e41bf30032876961a9, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7821592117992173402, guid: 2d7353d30f9fe7e41bf30032876961a9, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7821592117992173402, guid: 2d7353d30f9fe7e41bf30032876961a9, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7821592117992173402, guid: 2d7353d30f9fe7e41bf30032876961a9, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2d7353d30f9fe7e41bf30032876961a9, type: 3} +--- !u!4 &5241231772802432718 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7821592117992173402, guid: 2d7353d30f9fe7e41bf30032876961a9, type: 3} + m_PrefabInstance: {fileID: 2609686519359345044} + m_PrefabAsset: {fileID: 0} +--- !u!114 &5569439093497552269 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 7601486046380051481, guid: 2d7353d30f9fe7e41bf30032876961a9, type: 3} + m_PrefabInstance: {fileID: 2609686519359345044} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 83e4e6cca11330d4088d729ab4fc9d9f, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1001 &4174278757018161669 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 2351505566903569412} + m_Modifications: + - target: {fileID: 4821581000001043912, guid: 82333e6e543cb7e4dbd5b1d47aff3f58, type: 3} + propertyPath: dependentInteractor + value: + objectReference: {fileID: 4102833070697430761} + - target: {fileID: 8544718171901067398, guid: 82333e6e543cb7e4dbd5b1d47aff3f58, type: 3} + propertyPath: m_Name + value: MRTK RightHand Controller + objectReference: {fileID: 0} + - target: {fileID: 8544718171901067399, guid: 82333e6e543cb7e4dbd5b1d47aff3f58, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8544718171901067399, guid: 82333e6e543cb7e4dbd5b1d47aff3f58, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8544718171901067399, guid: 82333e6e543cb7e4dbd5b1d47aff3f58, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8544718171901067399, guid: 82333e6e543cb7e4dbd5b1d47aff3f58, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 82333e6e543cb7e4dbd5b1d47aff3f58, type: 3} +--- !u!114 &142007140022173312 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 4041565961123392645, guid: 82333e6e543cb7e4dbd5b1d47aff3f58, type: 3} + m_PrefabInstance: {fileID: 4174278757018161669} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6533afcc1a3776848a226f74fce34856, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!4 &5727148871348114050 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8544718171901067399, guid: 82333e6e543cb7e4dbd5b1d47aff3f58, type: 3} + m_PrefabInstance: {fileID: 4174278757018161669} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &5364037230396944427 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 2351505566903569412} + m_Modifications: + - target: {fileID: 1948193615953854874, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} + propertyPath: m_Name + value: MRTK LeftHand Controller + objectReference: {fileID: 0} + - target: {fileID: 1948193615953854875, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 1948193615953854875, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1948193615953854875, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1948193615953854875, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3419360757097544916, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} + propertyPath: dependentInteractor + value: + objectReference: {fileID: 4102833070697430761} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} +--- !u!114 &2304670408713330098 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 6164080946324827545, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} + m_PrefabInstance: {fileID: 5364037230396944427} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6533afcc1a3776848a226f74fce34856, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!4 &5870931076965904816 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1948193615953854875, guid: c89f12cb641c27e47b7b71af1d6518a5, type: 3} + m_PrefabInstance: {fileID: 5364037230396944427} + m_PrefabAsset: {fileID: 0} diff --git a/org.mixedrealitytoolkit.input/Assets/Prefabs/Obsolete MRTK XR Rig.prefab.meta b/org.mixedrealitytoolkit.input/Assets/Prefabs/Obsolete MRTK XR Rig.prefab.meta new file mode 100644 index 000000000..ac2567e85 --- /dev/null +++ b/org.mixedrealitytoolkit.input/Assets/Prefabs/Obsolete MRTK XR Rig.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 4d7e2f87fefe0ba468719b15288b46e7 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/org.mixedrealitytoolkit.input/CHANGELOG.md b/org.mixedrealitytoolkit.input/CHANGELOG.md index 7de0760fb..e5bd48943 100644 --- a/org.mixedrealitytoolkit.input/CHANGELOG.md +++ b/org.mixedrealitytoolkit.input/CHANGELOG.md @@ -4,15 +4,109 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/). ## Unreleased +### Fixed + +* Fix issue where `HandPoseDriver` could get into a state where it temporarily polyfilled, but then was unable to, and then got stuck in a "tracked" state. [PR #1088](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1088) +* Fixed "leaked managed shell" issue in `InteractionModeManager`. [PR #1096](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1096) +* Fixed `EyeCalibrationChecker` build issue on UWP when the Mixed Reality OpenXR Plugin wasn't installed. [PR #1106](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1106) + +### Added + +* Added `MRTKFocusFeature` to provide XrSession focus info to MRTK components. [PR #1057](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1057) +* Added input action focus handling to disable controller/hand tracked state when the XrSession goes out of focus. [PR #1057](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1057) +* Added support for XR_MSFT_hand_tracking_mesh and XR_ANDROID_hand_mesh on compatible runtimes. [PR #993](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/993) +* Added `Skybox` component to "MRTK XR Rig.prefab" for theming the skybox material. [PR #1130](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1130) + ### Changed +* Updated `InteractionDetector` to work across all `XRRayInteractor` and `NearFarInteractor` implementations, instead of just MRTK-specific `MRTKRayInteractor` implementations. [PR #1090](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1090) +* Updated the minimum editor version to 6000.0.66f2 [PR #1112](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1112) * Reserialized MRTK XR Rig prefab to remove stale serialized fields. [PR #1110](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1110) * Updated tests to follow existing MRTK test patterns. [PR #1073](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1073) +* Updated the namespace for `EyeCalibrationCheckerTests` to match this package's namespaces. [PR #1129](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1129) -### Fixed +### Deprecated -* Fixed "leaked managed shell" issue in `InteractionModeManager`. [PR #1096](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1096) -* Fixed `EyeCalibrationChecker` build issue on UWP when the Mixed Reality OpenXR Plugin wasn't installed. [PR #1106](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1106) +* Deprecated `HasUIHover` and `HasUISelection` from `MRTKRayInteractor` in favor of querying the underlying `TrackedDeviceModel` directly instead. [PR #1090](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1090) + +## [4.0.0-pre.2] - 2025-12-05 + +### Changed + +* Updated the minimum editor version to 2022.3.6f1 [PR #1003](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1003) +* Split out mappings for "airtap" and "grab", as well as mapping other bespoke interaction profile actions (like those provided by the Hand Interaction Profile). [PR #1040](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1040) + +### Deprecated + +* Deprecated `IHandedInteractor` across the interactor implementations, as its info is now queryable directly from `IXRInteractor`'s handedness property. [PR #1042](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1042) + +### Removed + +* Removed HandNode property and field from `HandModel`, as it was largely unused. [PR #1045](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1045) +* Removed `ITrackedInteractor` across the interactor implementations, as it was supporting an unused codepath and there are better ways to get this data (like querying the attach transform). [PR #1044](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1044). + +## [4.0.0-pre.1] - 2024-07-16 + +### Added + +* SpatialMouseInputTestsForControllerlessRig Unity-tests. +* BasicInputTestsForControllerlessRig Unity-tests. +* Ported BasicInputTests so that they also test the new controllerless prefabs. +* Ported FuzzyGazeInteractorTests so that they also test the new controllerless prefabs. +* MRTKRayInteractorVisualsTestsForControllerlessRig Unity-tests. +* InteractionModeManagerTestsForControllerlessRig Unity-tests. +* FuzzyGazeInteractorTestsForControllerlessRig Unity-tests. +* TrackedPoseDriverLookup as the XRI3+ equivalent of ControllerLookup. +* TrackedPoseDriverWithFallback as the XRI3+ equivalent of ActionBasedControllerWithFallbacks. +* Controllerless version of MRTK XR Rig prefab. +* Controllerless version of MRTK LeftHand Controller prefab. +* Controllerless version of MRTK RightHand Controller prefab. +* Controllerless version of MRTK Gaze Controller prefab. +* Controllerless version of MRTK Interaction Manager prefab. +* Added ModeManagerdRoot field to interactors to hold a reference to parent GameObject. + +### Changed + +* Updated package com.unity.xr.interaction.toolkit to 3.0.4 +* Updated BaseRuntimeInputTests logic to handle both deprecated XRController and new controllerless actions. +* Updated GazePinchInteractor logic to handle both deprecated XRController and new controllerless actions. +* Updated PokeInteractor logic to handle both deprecated XRController and new controllerless actions. +* Updated MRTKRayInteractor logic to handle both deprecated XRController and new controllerless actions. +* Updated FlatScreenModeDetector logic to handle both deprecated XRController and new controllerless actions. +* Updated ObjectManipulator so to not rely on obsolete XRI controllers. +* Moved the Gaze Interactor TrackedPoseDriver to parent GameObject so that all controller prefabs have the same structure. +* Moved HandModel script from Experimental\XRI3 to Controllers\ +* Renamed MRTK XR Rig prefab as Obsolete MRTK XR Rig. +* Renamed MRTK LeftHand Controller prefab as Obsolete MRTK LeftHand Controller. +* Renamed MRTK RightHand Controller prefab as Obsolete MRTK RightHand Controller. +* Renamed MRTK Gaze Controller prefab as Obsolete MRTK Gaze Controller. +* Renamed MRTK Interaction Manager prefab as Obsolete MRTK Interaction Manager. +* Added `ITrackedInteractor` to `GazePinchInteractor`, `HandJointInteractor`, `PokeInteractor`, and `MRTKRayInteractor`. [PR #822](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/822) +* Updated new controllerless rig to use HandPoseDrive and PinchInputReader to support devices without a Hand Interaction profile. + +### Deprecated + +* ActionBasedControllerWithFallbacks marked as Obsolete. +* ArticulatedHandController marked as Obsolete. + +### Removed + +* Removed obsolete ArticulatedHandController.HandsAggregatorSubsystem field. +* Removed obsolete MRTKRayInteractor.HandsAggregatorSubsystem field. +* Removed obsolete ControllerSimulationSettings.InputActionReference field. +* Removed obsolete SyntheticsHandsSubsystem::GetNeutralPose method. +* Removed obsolete SyntheticsHandsSubsystem::SetNeutralPose method. +* Removed obsolete SyntheticsHandsSubsystem::GetSelectionPose method. +* Removed obsolete SyntheticsHandsSubsystem::SetSelectionPose method. +* Removed obsolete SyntheticsHandsSubsystem::GetNeutralPose method. +* Removed obsolete SyntheticsHandsSubsystem::SetNeutralPose method. +* Removed obsolete FollowJoint.migratedSuccessfully field. +* Removed obsolete FollowJoint.hand field. +* Removed obsolete FollowJoint.Joint field. +* Removed obsolete FollowJoint::OnAfterDeserialize method. +* Removed obsolete HandBasedPoseSource.HandsAggregator field. +* Removed obsolete ControllerVisualizer.HandsAggregator field. +* Removed no longer needed Experimental\XRI3 folder ## [3.3.0] - 2025-11-12 diff --git a/org.mixedrealitytoolkit.input/Controllers/ActionBasedControllerWithFallbacks.cs b/org.mixedrealitytoolkit.input/Controllers/ActionBasedControllerWithFallbacks.cs index 324fc6c7e..e9207dcb2 100644 --- a/org.mixedrealitytoolkit.input/Controllers/ActionBasedControllerWithFallbacks.cs +++ b/org.mixedrealitytoolkit.input/Controllers/ActionBasedControllerWithFallbacks.cs @@ -1,6 +1,7 @@ // Copyright (c) Mixed Reality Toolkit Contributors // Licensed under the BSD 3-Clause +using System; using UnityEngine; using UnityEngine.InputSystem; using UnityEngine.XR; @@ -18,6 +19,7 @@ namespace MixedReality.Toolkit.Input /// state will have no position and no rotation data. In this case, the controller may want to fallback to head pose. /// [AddComponentMenu("MRTK/Input/XR Controller (Action-based with Fallbacks)")] + [Obsolete("ActionBasedControllerWithFallbacks has been deprecated in version 4.0.0. Please use MixedReality.Toolkit.Input.TrackedPoseDriverWithFallback")] public class ActionBasedControllerWithFallbacks : ActionBasedController { #region Fallback actions values diff --git a/org.mixedrealitytoolkit.input/Controllers/ArticulatedHandController.cs b/org.mixedrealitytoolkit.input/Controllers/ArticulatedHandController.cs index b7f9693ce..1aea3ac40 100644 --- a/org.mixedrealitytoolkit.input/Controllers/ArticulatedHandController.cs +++ b/org.mixedrealitytoolkit.input/Controllers/ArticulatedHandController.cs @@ -17,6 +17,7 @@ namespace MixedReality.Toolkit.Input /// This is able to support variable pinch select through the use of . /// [AddComponentMenu("MRTK/Input/XR Controller (Articulated Hand)")] + [Obsolete("ArticulatedHandController has been deprecated in version 4.0.0. Its functionality has been distributed into different components.")] public class ArticulatedHandController : ActionBasedController { #region Associated hand select values @@ -40,15 +41,6 @@ public class ArticulatedHandController : ActionBasedController #endregion Associated hand select values #region Properties - - /// - /// The currently loaded and running hands aggregator, if any. - /// - /// - /// This is deprecated, please use instead. - /// - [Obsolete("Deprecated, please use XRSubsystemHelpers.HandsAggregator instead.")] - protected HandsAggregatorSubsystem HandsAggregator => XRSubsystemHelpers.HandsAggregator as HandsAggregatorSubsystem; #endregion Properties @@ -145,7 +137,8 @@ protected override void UpdateTrackingInput(XRControllerState controllerState) // This could show up on runtimes where a controller is disconnected, hand tracking spins up, // but the interaction profile is not cleared. This is allowed, per-spec: "The runtime may // return the last-known interaction profile in the event that no controllers are active." - if ((!positionAction.action.HasAnyControls() || controllerState.inputTrackingState == InputTrackingState.None) + // Also check that the action was updated this frame by an active control, if is wasn't use polyfill pose. + if ((!positionAction.action.HasAnyControls() || controllerState.inputTrackingState == InputTrackingState.None || positionAction.action.activeControl == null) && TryGetPolyfillDevicePose(out Pose devicePose)) { controllerState.position = devicePose.position; diff --git a/org.mixedrealitytoolkit.input/Controllers/HandModel.cs b/org.mixedrealitytoolkit.input/Controllers/HandModel.cs new file mode 100644 index 000000000..e477191ac --- /dev/null +++ b/org.mixedrealitytoolkit.input/Controllers/HandModel.cs @@ -0,0 +1,126 @@ +// Copyright (c) Mixed Reality Toolkit Contributors +// Licensed under the BSD 3-Clause + +using UnityEngine; +using UnityEngine.XR.Interaction.Toolkit.Inputs.Readers; + +namespace MixedReality.Toolkit.Input +{ + /// + /// This component instantiates a model prefab for hand interactors. + /// + /// + /// This does not control the visibility of the instantiated models, the prefab is always created. + /// + public class HandModel : MonoBehaviour + { + #region Properties + + [SerializeField, Tooltip("The prefab of the MRTK Controller to show that will be automatically instantiated by this behavior.")] + private Transform modelPrefab; + + /// + /// The prefab of the model to show that will be automatically instantiated by this . + /// + public Transform ModelPrefab + { + get => modelPrefab; + set => modelPrefab = value; + } + + [SerializeField, Tooltip("The transform that is used as the parent for the model prefab when it is instantiated. Will be set to a new child GameObject if None.")] + private Transform modelParent; + + /// + /// The that is used as the parent for the model prefab when it is instantiated. Will be set to a new child if None. + /// + public Transform ModelParent => modelParent; + + [SerializeField, Tooltip("The instance of the controller model in the scene. This can be set to an existing object instead of using Model Prefab.")] + private Transform model; + + /// + /// The instance of the model in the scene. This can be set to an existing object instead of using Model Prefab. + /// + public Transform Model => model; + + #endregion Properties + + #region Associated hand select values + + [SerializeField, Tooltip("The XRInputButtonReader representing selection values to be used by the hand model prefab when implementing ISelectInputVisualizer.")] + private XRInputButtonReader selectInput; + + /// + /// The representing selection values to be used by + /// the hand model prefab when implementing . + /// + public XRInputButtonReader SelectInput => selectInput; + + #endregion Associated hand select values + + /// + /// See . + /// + protected virtual void Awake() + { + // Create empty container transform for the model if none specified. + // This is not strictly necessary to create since this GameObject could be used + // as the parent for the instantiated prefab, but doing so anyway for backwards compatibility. + if (modelParent == null) + { + modelParent = new GameObject($"[{gameObject.name}] Model Parent").transform; + modelParent.SetParent(transform, false); + modelParent.SetLocalPositionAndRotation(Vector3.zero, Quaternion.identity); + } + } + + /// + /// A Unity event function that is called on the frame when a script is enabled just before any of the update methods are called the first time. + /// + protected virtual void Start() + { + // Instantiate the model prefab if it is set + if (modelPrefab != null) + { + model = Instantiate(modelPrefab, modelParent); + + Debug.Assert(selectInput != null, $"The Select Input reader for {name} is not set and will not be used with the instantiated hand model."); + + // Set the select input reader for the model if it implements ISelectInputVisualizer + if (selectInput != null && model != null) + { + ISelectInputVisualizer[] selectInputVisualizers = model.GetComponentsInChildren(); + foreach (ISelectInputVisualizer selectInputVisualizer in selectInputVisualizers) + { + selectInputVisualizer.SelectInput = selectInput; + } + } + } + + MRTKFocusFeature.XrSessionFocused.SubscribeAndUpdate(OnXrSessionFocus); + } + + /// + /// See . + /// + private void OnDestroy() => MRTKFocusFeature.XrSessionFocused.Unsubscribe(OnXrSessionFocus); + + /// + /// Sent when the XrSession gains or loses focus. + /// + /// if the XrSession has focus, else . + private void OnXrSessionFocus(bool focus) + { + // We want to ensure we're focused for input visualization, as some runtimes continue reporting "tracked" while pose updates are paused. + // This is allowed, per-spec, as a "should": "Runtimes should make input actions inactive while the application is unfocused, + // and applications should react to an inactive input action by skipping rendering of that action's input avatar + // (depictions of hands or other tracked objects controlled by the user)." + + if (modelParent != null) + { + modelParent.gameObject.SetActive(focus); + } + } + } +} diff --git a/org.mixedrealitytoolkit.uxcore/LegacyDialog/Dialog.cs.meta b/org.mixedrealitytoolkit.input/Controllers/HandModel.cs.meta similarity index 83% rename from org.mixedrealitytoolkit.uxcore/LegacyDialog/Dialog.cs.meta rename to org.mixedrealitytoolkit.input/Controllers/HandModel.cs.meta index 31bd6800e..0c4a5d78d 100644 --- a/org.mixedrealitytoolkit.uxcore/LegacyDialog/Dialog.cs.meta +++ b/org.mixedrealitytoolkit.input/Controllers/HandModel.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 43d6f4507a0baf74e8be24ad4b8ed4d7 +guid: 0d08c61b7f6e43048af4ba00eb622cb0 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/org.mixedrealitytoolkit.input/Editor/AssemblyInfo.cs b/org.mixedrealitytoolkit.input/Editor/AssemblyInfo.cs index 2f4a0351d..0968cf711 100644 --- a/org.mixedrealitytoolkit.input/Editor/AssemblyInfo.cs +++ b/org.mixedrealitytoolkit.input/Editor/AssemblyInfo.cs @@ -9,4 +9,4 @@ // The AssemblyVersion attribute is checked-in and is recommended not to be changed often. // https://docs.microsoft.com/troubleshoot/visualstudio/general/assembly-version-assembly-file-version // AssemblyFileVersion and AssemblyInformationalVersion are added by pack-upm.ps1 to match the current MRTK build version. -[assembly: AssemblyVersion("3.0.0.0")] +[assembly: AssemblyVersion("4.0.0.0")] diff --git a/org.mixedrealitytoolkit.input/Editor/InputValidation.cs b/org.mixedrealitytoolkit.input/Editor/InputValidation.cs index c92e9ba48..ad7c3be9f 100644 --- a/org.mixedrealitytoolkit.input/Editor/InputValidation.cs +++ b/org.mixedrealitytoolkit.input/Editor/InputValidation.cs @@ -27,29 +27,40 @@ private static void AddInputValidationRule() { foreach (var buildTargetGroup in MRTKProjectValidation.BuildTargetGroups) { - MRTKProjectValidation.AddTargetDependentRules(new List() { GenerateSpeechInteractorRule(buildTargetGroup) }, buildTargetGroup); + MRTKProjectValidation.AddTargetDependentRules(new List() { + GenerateSpeechInteractorRule(buildTargetGroup) + }, buildTargetGroup); #if UNITY_OPENXR_PRESENT // Skip the standalone target as the hand subsystem rule for it is already present for all build targets if (buildTargetGroup != BuildTargetGroup.Standalone) { - MRTKProjectValidation.AddTargetDependentRules(new List() { GenerateUnityHandsRule(buildTargetGroup) }, buildTargetGroup); + MRTKProjectValidation.AddTargetDependentRules(new List() { + GenerateUnityHandsRule(buildTargetGroup), + GenerateMRTKFocusFeatureRule(buildTargetGroup) + }, buildTargetGroup); } #endif } - MRTKProjectValidation.AddTargetIndependentRules(new List() { GenerateSkinWeightsRule(), GenerateGLTFastRule(), + MRTKProjectValidation.AddTargetIndependentRules(new List() { + GenerateSkinWeightsRule(), + GenerateGLTFastRule(), #if UNITY_OPENXR_PRESENT GenerateUnityHandsRule(BuildTargetGroup.Standalone), #endif }); // Only generate the KTX rule for platforms related to Meta - MRTKProjectValidation.AddTargetDependentRules(new List() { GenerateKTXRule(), + MRTKProjectValidation.AddTargetDependentRules(new List() { + GenerateKTXRule(), #if UNITY_OPENXR_PRESENT GenerateAndroidHandsRule(), #endif }, BuildTargetGroup.Android); - MRTKProjectValidation.AddTargetDependentRules(new List() { GenerateKTXRule() }, BuildTargetGroup.Standalone); + + MRTKProjectValidation.AddTargetDependentRules(new List() { + GenerateKTXRule() + }, BuildTargetGroup.Standalone); } private static BuildValidationRule GenerateSpeechInteractorRule(BuildTargetGroup buildTargetGroup) @@ -57,11 +68,11 @@ private static BuildValidationRule GenerateSpeechInteractorRule(BuildTargetGroup return new BuildValidationRule() { IsRuleEnabled = () => (MRTKProjectValidation.GetLoadedSubsystemsForBuildTarget(buildTargetGroup)?.Any(s => typeof(KeywordRecognitionSubsystem).IsAssignableFrom(s.Type))).GetValueOrDefault() - && FindObjectUtility.FindFirstObjectByType(true), + && Object.FindFirstObjectByType(FindObjectsInactive.Include), Category = "MRTK3", Message = "The speech interactor needs to be active and enabled in the scene to allow for speech interactions with interactables (e.g. buttons).", - CheckPredicate = () => FindObjectUtility.FindFirstObjectByType(true).isActiveAndEnabled, - FixIt = () => EditorGUIUtility.PingObject(FindObjectUtility.FindFirstObjectByType(true)), + CheckPredicate = () => Object.FindFirstObjectByType(FindObjectsInactive.Include).isActiveAndEnabled, + FixIt = () => EditorGUIUtility.PingObject(Object.FindFirstObjectByType(FindObjectsInactive.Include)), FixItMessage = "Make sure the speech interactor component is enabled and in active in the hierarchy", FixItAutomatic = false, Error = false @@ -197,6 +208,43 @@ private static BuildValidationRule GenerateAndroidHandsRule() }; #pragma warning restore CS0618 // Type or member is obsolete } + + private static BuildValidationRule GenerateMRTKFocusFeatureRule(BuildTargetGroup buildTargetGroup) + { + return new BuildValidationRule() + { + Category = "MRTK3", + Message = $"For MRTK3 input to work correctly on OpenXR, enable {MRTKFocusFeature.FriendlyName} in the OpenXR Settings.", + CheckPredicate = () => + { + OpenXRSettings settings = OpenXRSettings.GetSettingsForBuildTargetGroup(buildTargetGroup); + if (settings == null) + { + return false; + } + + MRTKFocusFeature focusFeature = settings.GetFeature(); + return focusFeature != null && focusFeature.enabled; + }, + FixIt = () => + { + OpenXRSettings settings = OpenXRSettings.GetSettingsForBuildTargetGroup(buildTargetGroup); + if (settings == null) + { + return; + } + + MRTKFocusFeature focusFeature = settings.GetFeature(); + if (focusFeature != null) + { + focusFeature.enabled = true; + EditorUtility.SetDirty(settings); + } + }, + FixItMessage = $"Enable {nameof(MRTKFocusFeature)} in the OpenXR settings.", + Error = true + }; + } #endif } } diff --git a/org.mixedrealitytoolkit.input/Editor/Inspectors/InteractionDetectorEditor.cs b/org.mixedrealitytoolkit.input/Editor/Inspectors/InteractionDetectorEditor.cs index 7c4f7ee59..d3c01f09e 100644 --- a/org.mixedrealitytoolkit.input/Editor/Inspectors/InteractionDetectorEditor.cs +++ b/org.mixedrealitytoolkit.input/Editor/Inspectors/InteractionDetectorEditor.cs @@ -30,7 +30,7 @@ public class InteractionDetectorEditor : UnityEditor.Editor public void OnEnable() { interactor = serializedObject.FindProperty("interactor"); - controllers = serializedObject.FindProperty("controllers"); + controllers = serializedObject.FindProperty("interactorGroups"); detectHover = serializedObject.FindProperty("detectHover"); modeOnHover = serializedObject.FindProperty("modeOnHover"); detectSelect = serializedObject.FindProperty("detectSelect"); diff --git a/org.mixedrealitytoolkit.input/Editor/Inspectors/InteractionModeManagerEditor.cs b/org.mixedrealitytoolkit.input/Editor/Inspectors/InteractionModeManagerEditor.cs index a89737f80..4d8c1ac1e 100644 --- a/org.mixedrealitytoolkit.input/Editor/Inspectors/InteractionModeManagerEditor.cs +++ b/org.mixedrealitytoolkit.input/Editor/Inspectors/InteractionModeManagerEditor.cs @@ -28,13 +28,13 @@ public override void OnInspectorGUI() InteractionModeManager interactionModeManager = (InteractionModeManager)target; // Raise lots of errors if the interaction mode manager is configured incorrectly - var duplicateControllerMappings = GetDuplicateControllerMappings(); - if (duplicateControllerMappings.Count > 0) + var duplicateInteractorGroupMappings = GetDuplicateInteractorGroupMappings(); + if (duplicateInteractorGroupMappings.Count > 0) { - var duplicatedNameString = interactionModeManager.CompileDuplicatedNames(duplicateControllerMappings); + var duplicatedNameString = interactionModeManager.CompileDuplicatedNames(duplicateInteractorGroupMappings); - InspectorUIUtility.DrawError($"Duplicate controller mapping keys detected in the interaction mode manager on {interactionModeManager.gameObject.name}. " + - $"Please check the following controller mappings: {duplicatedNameString}"); + InspectorUIUtility.DrawError($"Duplicate interactor group mapping keys detected in the interaction mode manager on {interactionModeManager.gameObject.name}. " + + $"Please check the following interactor group mappings: {duplicatedNameString}"); GUI.color = InspectorUIUtility.ErrorColor; } @@ -57,7 +57,7 @@ public override void OnInspectorGUI() if (GUILayout.Button(InitControllers)) { Undo.RecordObject(target, InitControllers); - interactionModeManager.InitializeControllers(); + interactionModeManager.InitializeInteractorGroups(); PrefabUtility.RecordPrefabInstancePropertyModifications(target); } @@ -71,12 +71,12 @@ public override void OnInspectorGUI() serializedObject.ApplyModifiedProperties(); } - private HashSet GetDuplicateControllerMappings() + private HashSet GetDuplicateInteractorGroupMappings() { HashSet duplicatedNames = new HashSet(); - SerializedProperty controllerMapping = serializedObject.FindProperty("controllerMapping"); - SerializedProperty entries = controllerMapping?.FindPropertyRelative("entries"); + SerializedProperty interactorGroupMappings = serializedObject.FindProperty("interactorGroupMappings"); + SerializedProperty entries = interactorGroupMappings?.FindPropertyRelative("entries"); if (entries != null && entries.arraySize > 0) { diff --git a/org.mixedrealitytoolkit.input/Experimental/SpatialMouse/Interactor/SpatialMouseInteractor.cs b/org.mixedrealitytoolkit.input/Experimental/SpatialMouse/Interactor/SpatialMouseInteractor.cs index 4114b82ee..c2957f881 100644 --- a/org.mixedrealitytoolkit.input/Experimental/SpatialMouse/Interactor/SpatialMouseInteractor.cs +++ b/org.mixedrealitytoolkit.input/Experimental/SpatialMouse/Interactor/SpatialMouseInteractor.cs @@ -1,14 +1,13 @@ // Copyright (c) Mixed Reality Toolkit Contributors // Licensed under the BSD 3-Clause -using MixedReality.Toolkit.Subsystems; using System.Collections.Generic; -using Unity.Profiling; using UnityEngine; using UnityEngine.InputSystem; -using UnityEngine.XR.Interaction.Toolkit; + using UnityEngine.XR.Interaction.Toolkit.Inputs; -using UnityEngine.XR.Interaction.Toolkit.UI; +using UnityEngine.XR.Interaction.Toolkit.Interactables; +using UnityEngine.XR.Interaction.Toolkit.Interactors; namespace MixedReality.Toolkit.Input.Experimental { @@ -174,7 +173,7 @@ private void OnMouseScroll(InputAction.CallbackContext context) timeSinceLastMouseEvent = 0; } - #region XRBaseControllerInteractor + #region XRBaseInputInteractor /// public override bool CanHover(IXRHoverInteractable interactable) diff --git a/org.mixedrealitytoolkit.input/Experimental/SpatialMouse/MRTK Spatial Mouse Controller.prefab b/org.mixedrealitytoolkit.input/Experimental/SpatialMouse/MRTK Spatial Mouse Controller.prefab index 558601537..d25f93a3e 100644 --- a/org.mixedrealitytoolkit.input/Experimental/SpatialMouse/MRTK Spatial Mouse Controller.prefab +++ b/org.mixedrealitytoolkit.input/Experimental/SpatialMouse/MRTK Spatial Mouse Controller.prefab @@ -25,6 +25,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5491103498108965383} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -32,7 +33,6 @@ Transform: m_Children: - {fileID: 147216125} m_Father: {fileID: 5604401826787249420} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &4681310561030822292 MonoBehaviour: @@ -47,11 +47,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_InteractionManager: {fileID: 0} - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 4294967295 + m_Handedness: 0 m_AttachTransform: {fileID: 0} m_KeepSelectedTargetValid: 1 m_DisableVisualsWhenBlockedInGroup: 1 @@ -71,22 +69,71 @@ MonoBehaviour: m_Calls: [] m_StartingHoverFilters: [] m_StartingSelectFilters: [] - m_OnHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectEntered: - m_PersistentCalls: - m_Calls: [] - m_OnSelectExited: - m_PersistentCalls: - m_Calls: [] + m_SelectInput: + m_InputSourceMode: 2 + m_InputActionPerformed: + m_Name: Select + m_Type: 1 + m_ExpectedControlType: + m_Id: a889551b-813a-4d3c-89af-3a9770ddd1bb + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_InputActionValue: + m_Name: Select Value + m_Type: 0 + m_ExpectedControlType: Axis + m_Id: 82a55a84-3465-4f87-b077-b26adaee8799 + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_InputActionReferencePerformed: {fileID: 924797614382256527, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} + m_InputActionReferenceValue: {fileID: 924797614382256527, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} + m_ObjectReferenceObject: {fileID: 0} + m_ManualPerformed: 0 + m_ManualValue: 0 + m_ManualQueuePerformed: 0 + m_ManualQueueWasPerformedThisFrame: 0 + m_ManualQueueWasCompletedThisFrame: 0 + m_ManualQueueValue: 0 + m_ManualQueueTargetFrame: 0 + m_ActivateInput: + m_InputSourceMode: 2 + m_InputActionPerformed: + m_Name: Activate + m_Type: 1 + m_ExpectedControlType: + m_Id: 6ea1d00c-6fdf-4f4c-9d02-6443b653d657 + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_InputActionValue: + m_Name: Activate Value + m_Type: 0 + m_ExpectedControlType: Axis + m_Id: e275d3c8-1f59-44ba-b0b2-3fdf369c3d1f + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_InputActionReferencePerformed: {fileID: 0} + m_InputActionReferenceValue: {fileID: 0} + m_ObjectReferenceObject: {fileID: 0} + m_ManualPerformed: 0 + m_ManualValue: 0 + m_ManualQueuePerformed: 0 + m_ManualQueueWasPerformedThisFrame: 0 + m_ManualQueueWasCompletedThisFrame: 0 + m_ManualQueueValue: 0 + m_ManualQueueTargetFrame: 0 m_SelectActionTrigger: 1 - m_HideControllerOnSelect: 0 m_AllowHoveredActivate: 0 m_TargetPriorityMode: 0 + m_HideControllerOnSelect: 0 + m_InputCompatibilityMode: 0 m_PlayAudioClipOnSelectEntered: 0 m_AudioClipForOnSelectEntered: {fileID: 0} m_PlayAudioClipOnSelectExited: 0 @@ -135,6 +182,7 @@ MonoBehaviour: m_SampleFrequency: 20 m_HitDetectionType: 0 m_SphereCastRadius: 0.1 + m_ConeCastAngle: 6 m_RaycastMask: serializedVersion: 2 m_Bits: 4294967295 @@ -146,12 +194,167 @@ MonoBehaviour: m_AutoDeselect: 0 m_TimeToAutoDeselect: 3 m_EnableUIInteraction: 1 - m_AllowAnchorControl: 0 + m_BlockUIOnInteractableSelection: 1 + m_ManipulateAttachTransform: 0 m_UseForceGrab: 0 m_RotateSpeed: 180 m_TranslateSpeed: 1 - m_AnchorRotateReferenceFrame: {fileID: 0} - m_AnchorRotationMode: 0 + m_RotateReferenceFrame: {fileID: 0} + m_RotateMode: 0 + m_UIHoverEntered: + m_PersistentCalls: + m_Calls: [] + m_UIHoverExited: + m_PersistentCalls: + m_Calls: [] + m_EnableARRaycasting: 0 + m_OccludeARHitsWith3DObjects: 0 + m_OccludeARHitsWith2DObjects: 0 + m_ScaleMode: 0 + m_UIPressInput: + m_InputSourceMode: 2 + m_InputActionPerformed: + m_Name: UI Press + m_Type: 1 + m_ExpectedControlType: + m_Id: f6b2835f-e765-4452-b6e8-7a1488c7f4da + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_InputActionValue: + m_Name: UI Press Value + m_Type: 0 + m_ExpectedControlType: Axis + m_Id: f8a826f7-67d5-49aa-82b8-928da6d21215 + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_InputActionReferencePerformed: {fileID: 0} + m_InputActionReferenceValue: {fileID: 0} + m_ObjectReferenceObject: {fileID: 0} + m_ManualPerformed: 0 + m_ManualValue: 0 + m_ManualQueuePerformed: 0 + m_ManualQueueWasPerformedThisFrame: 0 + m_ManualQueueWasCompletedThisFrame: 0 + m_ManualQueueValue: 0 + m_ManualQueueTargetFrame: 0 + m_UIScrollInput: + m_InputSourceMode: 2 + m_InputAction: + m_Name: UI Scroll + m_Type: 0 + m_ExpectedControlType: Vector2 + m_Id: 1c90b32c-f11b-4b98-9528-da81660df12d + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_InputActionReference: {fileID: 0} + m_ObjectReferenceObject: {fileID: 0} + m_ManualValue: {x: 0, y: 0} + m_TranslateManipulationInput: + m_InputSourceMode: 2 + m_InputAction: + m_Name: Translate Manipulation + m_Type: 0 + m_ExpectedControlType: Vector2 + m_Id: f0d949f0-8301-4af4-95f4-6a03ab9cf2c5 + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_InputActionReference: {fileID: 0} + m_ObjectReferenceObject: {fileID: 0} + m_ManualValue: {x: 0, y: 0} + m_RotateManipulationInput: + m_InputSourceMode: 2 + m_InputAction: + m_Name: Rotate Manipulation + m_Type: 0 + m_ExpectedControlType: Vector2 + m_Id: 589ec8d8-8472-4f63-b555-a396f8f5fbf0 + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_InputActionReference: {fileID: 0} + m_ObjectReferenceObject: {fileID: 0} + m_ManualValue: {x: 0, y: 0} + m_DirectionalManipulationInput: + m_InputSourceMode: 2 + m_InputAction: + m_Name: Directional Manipulation + m_Type: 0 + m_ExpectedControlType: Vector2 + m_Id: dfbcb536-d3b1-4024-bfb7-763caf200184 + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_InputActionReference: {fileID: 0} + m_ObjectReferenceObject: {fileID: 0} + m_ManualValue: {x: 0, y: 0} + m_ScaleToggleInput: + m_InputSourceMode: 2 + m_InputActionPerformed: + m_Name: Scale Toggle + m_Type: 1 + m_ExpectedControlType: + m_Id: bf10debd-a9ea-4448-9609-71aa9fc7fa76 + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_InputActionValue: + m_Name: Scale Toggle Value + m_Type: 0 + m_ExpectedControlType: Axis + m_Id: ba35685e-7a7c-4054-85f1-8a4278f47063 + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_InputActionReferencePerformed: {fileID: 0} + m_InputActionReferenceValue: {fileID: 0} + m_ObjectReferenceObject: {fileID: 0} + m_ManualPerformed: 0 + m_ManualValue: 0 + m_ManualQueuePerformed: 0 + m_ManualQueueWasPerformedThisFrame: 0 + m_ManualQueueWasCompletedThisFrame: 0 + m_ManualQueueValue: 0 + m_ManualQueueTargetFrame: 0 + m_ScaleOverTimeInput: + m_InputSourceMode: 2 + m_InputAction: + m_Name: Scale Over Time + m_Type: 0 + m_ExpectedControlType: Vector2 + m_Id: a273e758-9492-4c21-91ab-c85abc1ca13e + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_InputActionReference: {fileID: 0} + m_ObjectReferenceObject: {fileID: 0} + m_ManualValue: {x: 0, y: 0} + m_ScaleDistanceDeltaInput: + m_InputSourceMode: 0 + m_InputAction: + m_Name: Scale Distance Delta + m_Type: 0 + m_ExpectedControlType: Axis + m_Id: 91350aff-2f89-4f65-9b1f-e14958d40703 + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_InputActionReference: {fileID: 0} + m_ObjectReferenceObject: {fileID: 0} + m_ManualValue: 0 mouseMoveAction: m_UseReference: 1 m_Action: @@ -192,6 +395,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: dd37d3de25ec0844d9ea7e898410084c, type: 3} m_Name: m_EditorClassIdentifier: + reticleRoot: {fileID: 0} baseReticle: {fileID: 1275538619} mouseInteractor: {fileID: 4681310561030822292} defaultDistance: 1 @@ -204,7 +408,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5604401826787249420} - - component: {fileID: 8777930775890352138} m_Layer: 0 m_Name: MRTK Spatial Mouse Controller m_TagString: Untagged @@ -219,6 +422,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6862721871616905633} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -226,191 +430,13 @@ Transform: m_Children: - {fileID: 176000564354740067} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &8777930775890352138 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6862721871616905633} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: caff514de9b15ad48ab85dcff5508221, type: 3} - m_Name: - m_EditorClassIdentifier: - m_UpdateTrackingType: 0 - m_EnableInputTracking: 1 - m_EnableInputActions: 1 - m_ModelPrefab: {fileID: 0} - m_ModelParent: {fileID: 0} - m_Model: {fileID: 0} - m_AnimateModel: 0 - m_ModelSelectTransition: - m_ModelDeSelectTransition: - m_PositionAction: - m_UseReference: 1 - m_Action: - m_Name: Position - m_Type: 0 - m_ExpectedControlType: - m_Id: b2869c6b-4abe-4d28-831f-f7355b6cf1d6 - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 0 - m_Reference: {fileID: -681459848031527356, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} - m_RotationAction: - m_UseReference: 0 - m_Action: - m_Name: Rotation - m_Type: 0 - m_ExpectedControlType: - m_Id: c0c2ca38-51a5-4cad-88d9-5dd7e8f700c3 - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 0 - m_Reference: {fileID: 0} - m_TrackingStateAction: - m_UseReference: 0 - m_Action: - m_Name: Tracking State - m_Type: 0 - m_ExpectedControlType: - m_Id: 3d829a82-a0fe-4f57-a08f-0d6158711dfc - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 0 - m_Reference: {fileID: 0} - m_SelectAction: - m_UseReference: 1 - m_Action: - m_Name: Select - m_Type: 0 - m_ExpectedControlType: - m_Id: 30760b30-3d1a-400f-bddf-3c769fb6edf8 - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 0 - m_Reference: {fileID: 924797614382256527, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} - m_SelectActionValue: - m_UseReference: 0 - m_Action: - m_Name: Select Action Value - m_Type: 0 - m_ExpectedControlType: - m_Id: 8a94463f-59e4-4a2d-831a-7c6dce33a3c5 - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 0 - m_Reference: {fileID: 0} - m_ActivateAction: - m_UseReference: 0 - m_Action: - m_Name: Activate - m_Type: 0 - m_ExpectedControlType: - m_Id: 07e2d5ee-4b12-4d38-b103-341575c3f589 - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 0 - m_Reference: {fileID: 0} - m_ActivateActionValue: - m_UseReference: 0 - m_Action: - m_Name: Activate Action Value - m_Type: 0 - m_ExpectedControlType: - m_Id: c62437cd-a54e-4e97-8f8e-1c40310e8c7f - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 0 - m_Reference: {fileID: 0} - m_UIPressAction: - m_UseReference: 0 - m_Action: - m_Name: UI Press - m_Type: 0 - m_ExpectedControlType: - m_Id: 3eeaabd6-a992-4a11-a86f-48defc36339b - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 0 - m_Reference: {fileID: 0} - m_UIPressActionValue: - m_UseReference: 0 - m_Action: - m_Name: UI Press Action Value - m_Type: 0 - m_ExpectedControlType: - m_Id: fae7bc04-c230-40e9-b0f5-27204e899a51 - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 0 - m_Reference: {fileID: 0} - m_HapticDeviceAction: - m_UseReference: 0 - m_Action: - m_Name: Haptic Device - m_Type: 0 - m_ExpectedControlType: - m_Id: 8862254d-b68b-4674-9dd9-2669de855063 - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 0 - m_Reference: {fileID: 0} - m_RotateAnchorAction: - m_UseReference: 0 - m_Action: - m_Name: Rotate Anchor - m_Type: 0 - m_ExpectedControlType: - m_Id: 8c236782-0d94-44e8-9aba-b47fa898375d - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 0 - m_Reference: {fileID: 0} - m_DirectionalAnchorRotationAction: - m_UseReference: 0 - m_Action: - m_Name: Directional Anchor Rotation - m_Type: 0 - m_ExpectedControlType: - m_Id: 5a183a71-e0e6-4e9a-bed8-6d10c30627f1 - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 0 - m_Reference: {fileID: 0} - m_TranslateAnchorAction: - m_UseReference: 0 - m_Action: - m_Name: Translate Anchor - m_Type: 0 - m_ExpectedControlType: - m_Id: 7349aff8-5149-4c6c-a7ce-4129f87e5af8 - m_Processors: - m_Interactions: - m_SingletonActionBindings: [] - m_Flags: 0 - m_Reference: {fileID: 0} - m_ButtonPressPoint: 0.5 --- !u!1001 &8113086299026845985 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 176000564354740067} m_Modifications: - target: {fileID: 8113086299156719580, guid: f7c9215713002d34a9107dd69004e749, type: 3} @@ -462,6 +488,9 @@ PrefabInstance: value: MouseCursor objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f7c9215713002d34a9107dd69004e749, type: 3} --- !u!4 &147216125 stripped Transform: diff --git a/org.mixedrealitytoolkit.input/Features.meta b/org.mixedrealitytoolkit.input/Features.meta new file mode 100644 index 000000000..7c4ed83ba --- /dev/null +++ b/org.mixedrealitytoolkit.input/Features.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8904458f727e8da428312ac577c1a981 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/org.mixedrealitytoolkit.input/Features/MRTKFocusFeature.cs b/org.mixedrealitytoolkit.input/Features/MRTKFocusFeature.cs new file mode 100644 index 000000000..29cd7da46 --- /dev/null +++ b/org.mixedrealitytoolkit.input/Features/MRTKFocusFeature.cs @@ -0,0 +1,59 @@ +// Copyright (c) Mixed Reality Toolkit Contributors +// Licensed under the BSD 3-Clause + +using Unity.XR.CoreUtils.Bindings.Variables; +using UnityEngine; +using UnityEngine.XR.OpenXR.Features; + +#if UNITY_EDITOR +using UnityEditor; +using UnityEditor.XR.OpenXR.Features; +#endif + +namespace MixedReality.Toolkit.Input +{ + /// + /// Provides focus data based on XrSession state. + /// +#if UNITY_EDITOR + [OpenXRFeature( + UiName = FriendlyName, + Desc = "Provides focus data based on XrSession state.", + Company = "Mixed Reality Toolkit Contributors", + Version = "4.0.0", + BuildTargetGroups = new[] { BuildTargetGroup.Standalone, BuildTargetGroup.WSA, BuildTargetGroup.Android }, + Category = FeatureCategory.Feature, + FeatureId = "org.mixedreality.toolkit.input.focus")] +#endif + public sealed class MRTKFocusFeature : OpenXRFeature + { + /// + /// The "friendly" name for this feature. + /// + public const string FriendlyName = "MRTK3 Session Focus"; + + /// + /// Whether the current XrSession has focus or not, stored as a bindable variable that can be subscribed to for value changes. + /// + /// Always in the editor. + public static IReadOnlyBindableVariable XrSessionFocused => xrSessionFocused; + private static readonly BindableVariable xrSessionFocused = new(Application.isEditor); + + /// + protected override void OnSessionStateChange(int oldState, int newState) + { + // If we've lost focus... + // XR_SESSION_STATE_FOCUSED = 5 + if (oldState == 5) + { + xrSessionFocused.Value = false; + } + // ...or if we've gained focus + // XR_SESSION_STATE_FOCUSED = 5 + else if (newState == 5) + { + xrSessionFocused.Value = true; + } + } + } +} diff --git a/org.mixedrealitytoolkit.input/Features/MRTKFocusFeature.cs.meta b/org.mixedrealitytoolkit.input/Features/MRTKFocusFeature.cs.meta new file mode 100644 index 000000000..d5b524e4c --- /dev/null +++ b/org.mixedrealitytoolkit.input/Features/MRTKFocusFeature.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 30587bb28b5390644ae70f801841a073 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/org.mixedrealitytoolkit.input/InteractionModes/FlatScreenModeDetector.cs b/org.mixedrealitytoolkit.input/InteractionModes/FlatScreenModeDetector.cs index 7d43418c4..8dbcf141b 100644 --- a/org.mixedrealitytoolkit.input/InteractionModes/FlatScreenModeDetector.cs +++ b/org.mixedrealitytoolkit.input/InteractionModes/FlatScreenModeDetector.cs @@ -1,8 +1,10 @@ // Copyright (c) Mixed Reality Toolkit Contributors // Licensed under the BSD 3-Clause +using System; using System.Collections.Generic; using UnityEngine; +using UnityEngine.Serialization; namespace MixedReality.Toolkit.Input { @@ -13,28 +15,55 @@ internal class FlatScreenModeDetector : MonoBehaviour, IInteractionModeDetector private InteractionMode flatScreenInteractionMode; [SerializeField] - [Tooltip("List of XR Base Controllers that this interaction mode detector has jurisdiction over. Interaction modes will be set on all specified controllers.")] - private List controllers; + [FormerlySerializedAs("controllers")] + [Tooltip("List of XR Base interactor groups that this interaction mode detector has jurisdiction over. Interaction modes will be set on all specified groups.")] + private List interactorGroups; public InteractionMode ModeOnDetection => flatScreenInteractionMode; + [Obsolete("This field has been deprecated in version 4.0.0. Please use MixedReality.Toolkit.Input.TrackedPoseDriverLookup instead.")] protected ControllerLookup controllerLookup = null; + protected TrackedPoseDriverLookup trackedPoseDriverLookup = null; + /// /// A Unity event function that is called when an enabled script instance is being loaded. /// protected void Awake() { +#pragma warning disable CS0618 // ControllerLookup is obsolete controllerLookup = ComponentCache.FindFirstActiveInstance(); +#pragma warning restore CS0618 // ControllerLookup is obsolete + + trackedPoseDriverLookup = ComponentCache.FindFirstActiveInstance(); } /// - public List GetControllers() => controllers; + [Obsolete("This function has been deprecated in version 4.0.0 and will be removed in a future version. Please use GetInteractorGroups instead.")] + public List GetControllers() => GetInteractorGroups(); + + /// + public List GetInteractorGroups() => interactorGroups; public bool IsModeDetected() { - // Flat screen mode is only active if the Left and Right Hand Controllers aren't being tracked - return !controllerLookup.LeftHandController.currentControllerState.inputTrackingState.HasPositionAndRotation() && !controllerLookup.RightHandController.currentControllerState.inputTrackingState.HasPositionAndRotation(); + // Flat screen mode is only active if the Left and Right Hands aren't being tracked +#pragma warning disable CS0618 // Type or member is obsolete + if (controllerLookup != null) + { + return !controllerLookup.LeftHandController.currentControllerState.inputTrackingState.HasPositionAndRotation() && !controllerLookup.RightHandController.currentControllerState.inputTrackingState.HasPositionAndRotation(); + } +#pragma warning restore CS0618 + else if (trackedPoseDriverLookup != null) + { + return !trackedPoseDriverLookup.LeftHandTrackedPoseDriver.GetInputTrackingState().HasPositionAndRotation() && + !trackedPoseDriverLookup.RightHandTrackedPoseDriver.GetInputTrackingState().HasPositionAndRotation(); + } + else + { + Debug.LogWarning("Neither controllerLookup nor trackedPoseDriverLookup are set, unable to detect mode."); + return false; + } } } } diff --git a/org.mixedrealitytoolkit.input/InteractionModes/IInteractionModeDetector.cs b/org.mixedrealitytoolkit.input/InteractionModes/IInteractionModeDetector.cs index 28cce81a4..defe70c64 100644 --- a/org.mixedrealitytoolkit.input/InteractionModes/IInteractionModeDetector.cs +++ b/org.mixedrealitytoolkit.input/InteractionModes/IInteractionModeDetector.cs @@ -1,10 +1,9 @@ // Copyright (c) Mixed Reality Toolkit Contributors // Licensed under the BSD 3-Clause +using System; using System.Collections.Generic; using UnityEngine; -using UnityEngine.XR.Interaction.Toolkit; - namespace MixedReality.Toolkit.Input { @@ -31,6 +30,13 @@ public interface IInteractionModeDetector /// Get a list of the instances which represent the controllers that this interaction mode detector has jurisdiction over. /// /// The list of the instances which represent the controllers that this interaction mode detector has jurisdiction over. + [Obsolete("This function has been deprecated in version 4.0.0 and will be removed in a future version. Please use GetInteractorGroups instead.")] List GetControllers(); + + /// + /// Get a list of the instances which represent the interactor groups that this interaction mode detector has jurisdiction over. + /// + /// The list of the instances which represent the interactor groups that this interaction mode detector has jurisdiction over. + List GetInteractorGroups(); } } diff --git a/org.mixedrealitytoolkit.input/InteractionModes/InteractionDetector.cs b/org.mixedrealitytoolkit.input/InteractionModes/InteractionDetector.cs index 34e94e609..dbabf6b7f 100644 --- a/org.mixedrealitytoolkit.input/InteractionModes/InteractionDetector.cs +++ b/org.mixedrealitytoolkit.input/InteractionModes/InteractionDetector.cs @@ -1,10 +1,12 @@ // Copyright (c) Mixed Reality Toolkit Contributors // Licensed under the BSD 3-Clause +using System; using System.Collections.Generic; using UnityEngine; using UnityEngine.Serialization; -using UnityEngine.XR.Interaction.Toolkit; +using UnityEngine.XR.Interaction.Toolkit.Interactors; +using UnityEngine.XR.Interaction.Toolkit.UI; namespace MixedReality.Toolkit.Input { @@ -84,42 +86,33 @@ public InteractionMode ModeOnSelect } /// - public InteractionMode ModeOnDetection => GetDetectedMode(); - - /// - /// Determines which mode should be set. - /// - /// The detected mode. - private InteractionMode GetDetectedMode() - { - if (interactor.hasSelection) - { - return modeOnSelect; - } - else - { - return modeOnHover; - } - - } + public InteractionMode ModeOnDetection => interactor.hasSelection ? modeOnSelect : modeOnHover; [SerializeField] [FormerlySerializedAs("Controllers")] - [Tooltip("List of GameObjects which represent the 'controllers' that this interaction mode detector has jurisdiction over. Interaction modes will be set on all specified controllers.")] - private List controllers; + [FormerlySerializedAs("controllers")] + [Tooltip("List of GameObjects which represent the interactor groups that this interaction mode detector has jurisdiction over. Interaction modes will be set on all specified groups.")] + private List interactorGroups; /// - public List GetControllers() => controllers; + [Obsolete("This function has been deprecated in version 4.0.0 and will be removed in a future version. Please use GetInteractorGroups instead.")] + public List GetControllers() => GetInteractorGroups(); + + /// + public List GetInteractorGroups() => interactorGroups; /// public bool IsModeDetected() { bool isDetected = (interactor.hasHover && detectHover) || (interactor.hasSelection && detectSelect); - // Remove if/when XRI sets hasHover/Selection when their ray interactor is hovering/selecting legacy UI. - if (interactor is MRTKRayInteractor rayInteractor) + if (interactor is XRRayInteractor rayInteractor) + { + isDetected |= rayInteractor.TryGetUIModel(out TrackedDeviceModel model) && model.currentRaycast.isValid && (detectHover || (model.select && detectSelect)); + } + else if (interactor is NearFarInteractor nearFarInteractor) { - isDetected |= (rayInteractor.HasUIHover && detectHover) || (rayInteractor.HasUISelection && detectSelect); + isDetected |= nearFarInteractor.TryGetUIModel(out TrackedDeviceModel model) && model.currentRaycast.isValid && (detectHover || (model.select && detectSelect)); } return isDetected; diff --git a/org.mixedrealitytoolkit.input/InteractionModes/InteractionModeDefinition.cs b/org.mixedrealitytoolkit.input/InteractionModes/InteractionModeDefinition.cs index eeede9f8a..7f2e9aaf5 100644 --- a/org.mixedrealitytoolkit.input/InteractionModes/InteractionModeDefinition.cs +++ b/org.mixedrealitytoolkit.input/InteractionModes/InteractionModeDefinition.cs @@ -5,7 +5,7 @@ using System.Collections.Generic; using System.Linq; using UnityEngine; -using UnityEngine.XR.Interaction.Toolkit; +using UnityEngine.XR.Interaction.Toolkit.Interactors; namespace MixedReality.Toolkit.Input { diff --git a/org.mixedrealitytoolkit.input/InteractionModes/InteractionModeManager.cs b/org.mixedrealitytoolkit.input/InteractionModes/InteractionModeManager.cs index 13381d3db..be1684de1 100644 --- a/org.mixedrealitytoolkit.input/InteractionModes/InteractionModeManager.cs +++ b/org.mixedrealitytoolkit.input/InteractionModes/InteractionModeManager.cs @@ -6,15 +6,17 @@ using System.Linq; using Unity.Profiling; using UnityEngine; +using UnityEngine.Assertions; +using UnityEngine.Serialization; using UnityEngine.XR.Interaction.Toolkit; +using UnityEngine.XR.Interaction.Toolkit.Interactors; namespace MixedReality.Toolkit.Input { /// - /// Used to manage interactors and ensure that each several interactors for a 'controller' aren't clashing and firing at the same time + /// Used to manage interactors and ensure that each several interactors for an interactor group aren't clashing and firing at the same time. /// [AddComponentMenu("MRTK/Input/Interaction Mode Manager")] - [RequireComponent(typeof(ControllerLookup))] public class InteractionModeManager : MonoBehaviour { /// @@ -68,18 +70,46 @@ public static InteractionModeManager Instance /// /// Editor only function for initializing the Interaction Mode Manager with the existing XR controllers in the scene /// + [Obsolete("This method has been deprecated in version 4.0.0. Please use InitializeInteractorGroups instead.")] public void InitializeControllers() { - controllerMapping.Clear(); - foreach (XRBaseController xrController in FindObjectUtility.FindObjectsByType()) + foreach (XRBaseController xrController in FindObjectsByType(FindObjectsSortMode.InstanceID)) { - if (!controllerMapping.ContainsKey(xrController.gameObject)) + if (!interactorGroupMappings.ContainsKey(xrController.gameObject)) { - controllerMapping.Add(xrController.gameObject, new ManagedInteractorStatus()); + interactorGroupMappings.Add(xrController.gameObject, new ManagedInteractorStatus()); } } } + /// + /// Editor only function for initializing the Interaction Mode Manager with the existing interactors in the scene. + /// + /// + /// This will group interactors according to the game object returned by . If the interactor does + /// not implement or if is null the interactor + /// will not automatically be tracked by this component. + /// + public void InitializeInteractorGroups() + { + interactorGroupMappings.Clear(); + + foreach (XRBaseInteractor xrInteractor in FindObjectsByType(FindObjectsSortMode.InstanceID)) + { + if (xrInteractor is IModeManagedInteractor modeManagedInteractor && + modeManagedInteractor.ModeManagedRoot != null) + { + interactorGroupMappings.TryAdd(modeManagedInteractor.ModeManagedRoot, new ManagedInteractorStatus()); + } + } + + // For backwards compatibility, we will continue to support the obsolete "controller" types, and group based on "controller" parents. + // Once XRI removes "controller" types, we can remove this block of code. +#pragma warning disable CS0618 // InitializeControllers is obsolete + InitializeControllers(); +#pragma warning restore CS0618 // InitializeControllers is obsolete + } + /// /// Expands this object's property with base and sub types associated with /// the current value stored in the property. @@ -127,7 +157,7 @@ public void InitializeInteractionModeDetectors() // PERFORMANCE FIXME: This is not great for performance. Find better way to register detectors? // We would query interactors and then add all interactors that happen to be a detector, but // detectors may not necessarily be interactors. - foreach (IInteractionModeDetector detector in FindObjectUtility.FindObjectsByType().OfType()) + foreach (IInteractionModeDetector detector in FindObjectsByType(FindObjectsSortMode.InstanceID).OfType()) { interactionModeDectectors.Add(detector); } @@ -139,17 +169,21 @@ public void InitializeInteractionModeDetectors() private List interactionModeDectectors = new List(); /// - /// The MRTK Interaction Mode Manager will only mediate controller interactors and interactors which are designated as managed + /// Mapping of the root game objects to the set of interactors that will be managed as a group. /// + /// + /// The MRTK Interaction Mode Manager will only mediate interactors which are designated as managed. + /// [SerializeField] - [Tooltip("The MRTK Interaction Mode Manager will only mediate controller interactors and interactors which are designated as managed")] - private SerializableDictionary controllerMapping = new SerializableDictionary(); + [FormerlySerializedAs("controllerMapping")] + [Tooltip("Mapping of the root game objects to the set of interactors that will be managed as a group. The MRTK Interaction Mode Manager will only mediate interactors which are designated as managed")] + private SerializableDictionary interactorGroupMappings = new SerializableDictionary(); /// /// Private collection kept in lock-step with interactorMapping. Used to keep track of all registered interactors. /// Interactors are only registered once, when they are created. They are also unregistered once, when their reference becomes null. /// - private HashSet registeredControllerInteractors = new HashSet(); + private HashSet registeredInteractors = new HashSet(); [SerializeField] [Tooltip("Describes the order of priority that interactor types have over each other.")] @@ -203,31 +237,26 @@ internal protected XRInteractionManager InteractionManager /// An XRBaseInteractor which needs to be managed based on interaction modes public void RegisterInteractor(XRBaseInteractor interactor) { - // Only register controllers which are governed by some kind of interaction mode + // Only register interactor groups which are governed by some kind of interaction mode if (!IsInteractorValid(interactor)) { return; } - GameObject controllerObject = null; - if (interactor is XRBaseControllerInteractor controllerInteractor) - { - controllerObject = controllerInteractor.xrController.gameObject; - } - if (interactor is IModeManagedInteractor modeManagedInteractor) - { - controllerObject = modeManagedInteractor.GetModeManagedController(); - } + GameObject interactorGroupObject = FindInteractorGroupObject(interactor); + + Assert.IsNotNull(interactorGroupObject, $"Interactor {interactor.name} ({interactor.GetType().Name}) is not managed by any interactor group. " + Environment.NewLine + + $"Please ensure that the interactor implements IModeManagedInteractor, has a ModeManagedRoot field, and that ModeManagedRoot is set to the parent GameObject."); - if (!controllerMapping.ContainsKey(controllerObject)) + if (!interactorGroupMappings.ContainsKey(interactorGroupObject)) { - controllerMapping.Add(controllerObject, new ManagedInteractorStatus()); + interactorGroupMappings.Add(interactorGroupObject, new ManagedInteractorStatus()); } - if (!registeredControllerInteractors.Contains(interactor)) + if (!registeredInteractors.Contains(interactor)) { - controllerMapping[controllerObject].Interactors.Add(interactor); - registeredControllerInteractors.Add(interactor); + interactorGroupMappings[interactorGroupObject].Interactors.Add(interactor); + registeredInteractors.Add(interactor); } } @@ -241,26 +270,18 @@ public void RegisterInteractor(XRBaseInteractor interactor) /// This function should not be called by the object. If it were, this class /// would receive an unregister event every time an interactor was disabled. This function should /// only be called when an interactor is removed scene completely; for example, - /// when a controller is destroyed. + /// when a interactor group's game object is destroyed. /// /// The to be unregistered. public void UnregisterInteractor(XRBaseInteractor interactor) { - GameObject controllerObject = null; - if (interactor is XRBaseControllerInteractor controllerInteractor) - { - controllerObject = controllerInteractor.xrController.gameObject; - } - if (interactor is IModeManagedInteractor modeManagedInteractor) - { - controllerObject = modeManagedInteractor.GetModeManagedController(); - } + GameObject interactorGroupObject = FindInteractorGroupObject(interactor); - if (controllerMapping.TryGetValue(controllerObject, out ManagedInteractorStatus controllerInteractorStatus)) + if (interactorGroupMappings.TryGetValue(interactorGroupObject, out ManagedInteractorStatus managedInteractorStatus)) { - controllerInteractorStatus.Interactors.Remove(interactor); + managedInteractorStatus.Interactors.Remove(interactor); } - registeredControllerInteractors.Remove(interactor); + registeredInteractors.Remove(interactor); } /// @@ -275,7 +296,7 @@ private void Awake() // because we are going to be in charge of deregistering interactors when // their mode is not active. We manually call our own deregistration function // when an interactor will be permanently removed from play, such as when - // the controller is destroyed. + // the interactor group's game object is destroyed. InteractionManager.interactorRegistered += OnInteractorRegistered; List interactors = new List(); @@ -284,9 +305,9 @@ private void Awake() // Fire a registration event for all pre-existing interactors. foreach (IXRInteractor interactor in interactors) { - if (interactor is XRBaseInteractor controllerInteractor) + if (interactor is XRBaseInteractor baseInteractor) { - RegisterInteractor(controllerInteractor); + RegisterInteractor(baseInteractor); } } } @@ -385,9 +406,9 @@ internal string CompileDuplicatedNames(HashSet duplicatedNames) /// private void OnInteractorRegistered(InteractorRegisteredEventArgs args) { - if (args.interactorObject is XRBaseInteractor controllerInteractor) + if (args.interactorObject is XRBaseInteractor interactor) { - RegisterInteractor(controllerInteractor); + RegisterInteractor(interactor); } } @@ -397,15 +418,15 @@ private void OnInteractorRegistered(InteractorRegisteredEventArgs args) private List destroyedInteractors = new List(); /// - /// Caches controllers which have been destroyed but not yet unregistered from the interactor mediator + /// Caches interactor groups which have been destroyed but not yet unregistered from the interactor mediator /// - private List destroyedControllers = new List(); + private List destroyedGroups = new List(); /// - /// Marks controllers that have been modified by a detector, so other detectors + /// Marks interactor groups that have been modified by a detector, so other detectors /// don't overwrite their changes. /// - private HashSet modifiedControllersThisFrame = new HashSet(); + private HashSet modifiedGroupsThisFrame = new HashSet(); private static readonly ProfilerMarker UpdatePerfMarker = new ProfilerMarker("[MRTK] InteractionModeManager.Update"); @@ -417,51 +438,56 @@ private void Update() { using (UpdatePerfMarker.Auto()) { - modifiedControllersThisFrame.Clear(); + modifiedGroupsThisFrame.Clear(); - // Updating the status of all controllers based on their interaction mode + // Updating the status of all interactor groups based on their interaction mode foreach (IInteractionModeDetector detector in interactionModeDectectors) { - List controllers = detector.GetControllers(); + List groups = detector.GetInteractorGroups(); + +#pragma warning disable CS0618 // GetControllers is obsolete + // For backwards compatibility, we will continue to support the obsolete "GetControllers()" function. + groups ??= detector.GetControllers(); +#pragma warning restore CS0618 // GetControllers is obsolete - foreach (GameObject controller in controllers) + foreach (GameObject group in groups) { if (detector.IsModeDetected()) { - SetInteractionMode(controller, detector.ModeOnDetection); + SetInteractionMode(group, detector.ModeOnDetection); - // Mark this controller as modified this frame. - modifiedControllersThisFrame.Add(controller); + // Mark this group as modified this frame. + modifiedGroupsThisFrame.Add(group); } // Reset mode, if and only if none of the other detectors // have not modified it this frame. - else if (!modifiedControllersThisFrame.Contains(controller)) + else if (!modifiedGroupsThisFrame.Contains(group)) { - ResetToDefaultMode(controller); + ResetToDefaultMode(group); } } } - destroyedControllers.Clear(); + destroyedGroups.Clear(); destroyedInteractors.Clear(); - foreach (GameObject controller in controllerMapping.Keys) + foreach (GameObject groupObject in interactorGroupMappings.Keys) { - // If the controller has be destroyed, be sure to mark it and its interactors for unregistration - if (controller == null) + // If the group object has be destroyed, be sure to mark it and its interactors for unregistration + if (groupObject == null) { - destroyedControllers.Add(controller); - foreach (XRBaseInteractor interactor in controllerMapping[controller].Interactors) + destroyedGroups.Add(groupObject); + foreach (XRBaseInteractor interactor in interactorGroupMappings[groupObject].Interactors) { destroyedInteractors.Add(interactor); } continue; } - // mediating all of the interactors to ensure the correct ones are active for their controller's given interaction mode - InteractionModeDefinition controllerCurrentMode = prioritizedInteractionModes[controllerMapping[controller].CurrentMode.Priority]; + // mediating all of the interactors to ensure the correct ones are active for their interactor group's given interaction mode + InteractionModeDefinition groupCurrentMode = prioritizedInteractionModes[interactorGroupMappings[groupObject].CurrentMode.Priority]; - foreach (XRBaseInteractor interactor in controllerMapping[controller].Interactors) + foreach (XRBaseInteractor interactor in interactorGroupMappings[groupObject].Interactors) { // If the interactor has be destroyed, be sure to mark it for unregistration if (interactor == null) @@ -470,13 +496,13 @@ private void Update() continue; } - interactor.enabled = IsInteractorValidForMode(controllerCurrentMode, interactor); + interactor.enabled = IsInteractorValidForMode(groupCurrentMode, interactor); } } - foreach (GameObject controller in destroyedControllers) + foreach (GameObject groupObject in destroyedGroups) { - controllerMapping.Remove(controller); + interactorGroupMappings.Remove(groupObject); } foreach (XRBaseInteractor interactor in destroyedInteractors) @@ -487,27 +513,27 @@ private void Update() } /// - /// Sets the interaction mode for the target InteractionModeController. + /// Sets the interaction mode for the target group object. /// - /// The controller we need to toggle the mode of - /// The interaction mode that is currently being applied to this controller. - public void SetInteractionMode(GameObject controller, InteractionMode interactionMode) + /// The group object we need to toggle the mode of + /// The interaction mode that is currently being applied to this interactor group. + public void SetInteractionMode(GameObject groupObject, InteractionMode interactionMode) { - if (controllerMapping.TryGetValue(controller, out ManagedInteractorStatus controllerInteractorStatus)) + if (interactorGroupMappings.TryGetValue(groupObject, out ManagedInteractorStatus managedInteractorStatus)) { - controllerInteractorStatus.CurrentMode = controllerInteractorStatus.CurrentMode.Priority > interactionMode.Priority ? controllerInteractorStatus.CurrentMode : interactionMode; + managedInteractorStatus.CurrentMode = managedInteractorStatus.CurrentMode.Priority > interactionMode.Priority ? managedInteractorStatus.CurrentMode : interactionMode; } } /// - /// Resets the controller's interaction mode to the default mode specified on the interaction mode manager + /// Resets the group's interaction mode to the default mode specified on the interaction mode manager /// - /// The controller we intend to reset to the default mode - public void ResetToDefaultMode(GameObject controller) + /// The group we intend to reset to the default mode + public void ResetToDefaultMode(GameObject groupObject) { - if (controllerMapping.TryGetValue(controller, out ManagedInteractorStatus controllerInteractorStatus)) + if (interactorGroupMappings.TryGetValue(groupObject, out ManagedInteractorStatus managedInteractorStatus)) { - controllerInteractorStatus.CurrentMode = defaultMode; + managedInteractorStatus.CurrentMode = defaultMode; } } @@ -532,5 +558,37 @@ private bool IsInteractorValid(XRBaseInteractor interactor) } return false; } + + /// + /// Query the interactor for the interactor group that it should be managed under. + /// + private GameObject FindInteractorGroupObject(XRBaseInteractor interactor) + { + GameObject interactorGroupObject = null; + + // For backwards compatibility, we will continue to support the obsolete "controller-based" interactors, + // and group based on "controller" parents. +#pragma warning disable CS0618 // xrController is obsolete + if (interactor is XRBaseInputInteractor controllerInteractor && + controllerInteractor.xrController != null) + { + interactorGroupObject = controllerInteractor.xrController.gameObject; + } +#pragma warning restore CS0618 // xrController is obsolete + else if (interactor is IModeManagedInteractor modeManagedInteractor) + { + interactorGroupObject = modeManagedInteractor.ModeManagedRoot; + + // For backwards compatibility, we will continue to support the obsolete "GetModeManagedController()" function. + if (interactorGroupObject == null) + { +#pragma warning disable CS0618 // GetModeManagedController is obsolete + interactorGroupObject = modeManagedInteractor.GetModeManagedController(); +#pragma warning restore CS0618 // GetModeManagedController is obsolete + } + } + + return interactorGroupObject; + } } } diff --git a/org.mixedrealitytoolkit.input/InteractionModes/NearInteractionModeDetector.cs b/org.mixedrealitytoolkit.input/InteractionModes/NearInteractionModeDetector.cs index 49edaeebf..d5068be91 100644 --- a/org.mixedrealitytoolkit.input/InteractionModes/NearInteractionModeDetector.cs +++ b/org.mixedrealitytoolkit.input/InteractionModes/NearInteractionModeDetector.cs @@ -3,7 +3,8 @@ using System.Collections.Generic; using UnityEngine; -using UnityEngine.XR.Interaction.Toolkit; +using UnityEngine.XR.Interaction.Toolkit.Interactors; +using UnityEngine.XR.Interaction.Toolkit.Interactables; namespace MixedReality.Toolkit.Input { diff --git a/org.mixedrealitytoolkit.input/InteractionModes/ProximityDetector.cs b/org.mixedrealitytoolkit.input/InteractionModes/ProximityDetector.cs index 08376ad1f..c7870d1a7 100644 --- a/org.mixedrealitytoolkit.input/InteractionModes/ProximityDetector.cs +++ b/org.mixedrealitytoolkit.input/InteractionModes/ProximityDetector.cs @@ -1,6 +1,7 @@ // Copyright (c) Mixed Reality Toolkit Contributors // Licensed under the BSD 3-Clause +using System; using System.Collections.Generic; using UnityEngine; using UnityEngine.Serialization; @@ -35,11 +36,16 @@ public class ProximityDetector : MonoBehaviour, IInteractionModeDetector [SerializeField] [FormerlySerializedAs("associatedControllers")] - [Tooltip("List of GameObjects which represent the 'controllers' that this interaction mode detector has jurisdiction over. Interaction modes will be set on all specified controllers.")] - private List controllers; + [FormerlySerializedAs("controllers")] + [Tooltip("List of GameObjects which represent the interactor groups that this interaction mode detector has jurisdiction over. Interaction modes will be set on all specified groups.")] + private List interactorGroups; - /// - public List GetControllers() => controllers; + /// + [Obsolete("This function has been deprecated in version 4.0.0 and will be removed in a future version. Please use GetInteractorGroups instead.")] + public List GetControllers() => GetInteractorGroups(); + + /// + public List GetInteractorGroups() => interactorGroups; // Visualizing the proximity zone private SphereCollider detectionZone; diff --git a/org.mixedrealitytoolkit.input/Interactors/Gaze/FuzzyGazeInteractor.cs b/org.mixedrealitytoolkit.input/Interactors/Gaze/FuzzyGazeInteractor.cs index 6de4eef62..62ee3dceb 100644 --- a/org.mixedrealitytoolkit.input/Interactors/Gaze/FuzzyGazeInteractor.cs +++ b/org.mixedrealitytoolkit.input/Interactors/Gaze/FuzzyGazeInteractor.cs @@ -6,6 +6,7 @@ using Unity.Profiling; using UnityEngine; using UnityEngine.XR.Interaction.Toolkit; +using UnityEngine.XR.Interaction.Toolkit.Interactables; namespace MixedReality.Toolkit.Input { @@ -248,12 +249,12 @@ private void UpdateRaycastHits(int targetPrecision, float castRadius) if (castRadius > 0.0f) { - raycastHitCounts[targetPrecision] = UnityEngine.Physics.SphereCastNonAlloc(effectiveRayOrigin.position, castRadius, effectiveRayOrigin.forward, + raycastHitCounts[targetPrecision] = Physics.SphereCastNonAlloc(effectiveRayOrigin.position, castRadius, effectiveRayOrigin.forward, AllRaycastHits[targetPrecision], maxRaycastDistance, raycastMask, raycastTriggerInteraction); } else { - raycastHitCounts[targetPrecision] = UnityEngine.Physics.RaycastNonAlloc(effectiveRayOrigin.position, effectiveRayOrigin.forward, + raycastHitCounts[targetPrecision] = Physics.RaycastNonAlloc(effectiveRayOrigin.position, effectiveRayOrigin.forward, AllRaycastHits[targetPrecision], maxRaycastDistance, raycastMask, raycastTriggerInteraction); } } diff --git a/org.mixedrealitytoolkit.input/Interactors/Gaze/GazeInteractor.cs b/org.mixedrealitytoolkit.input/Interactors/Gaze/GazeInteractor.cs index b1eeea77d..0c93ed70f 100644 --- a/org.mixedrealitytoolkit.input/Interactors/Gaze/GazeInteractor.cs +++ b/org.mixedrealitytoolkit.input/Interactors/Gaze/GazeInteractor.cs @@ -1,8 +1,9 @@ // Copyright (c) Mixed Reality Toolkit Contributors // Licensed under the BSD 3-Clause +using System; using UnityEngine; -using UnityEngine.XR.Interaction.Toolkit; +using UnityEngine.XR.Interaction.Toolkit.Interactors; namespace MixedReality.Toolkit.Input { @@ -10,7 +11,35 @@ namespace MixedReality.Toolkit.Input /// An XRRayInteractor that enables eye gaze for focus and interaction. /// [AddComponentMenu("MRTK/Input/Gaze Interactor")] - public class GazeInteractor : XRRayInteractor, IGazeInteractor + public class GazeInteractor : + XRRayInteractor, + IGazeInteractor, + IModeManagedInteractor { + [SerializeField] + [Tooltip("The root management GameObject that interactor belongs to.")] + private GameObject modeManagedRoot = null; + + /// + /// Returns the GameObject that this interactor belongs to. This GameObject is governed by the + /// interaction mode manager and is assigned an interaction mode. This GameObject represents the group that this interactor belongs to. + /// + /// + /// This will default to the GameObject that this attached to a parent . + /// + public GameObject ModeManagedRoot + { + get => modeManagedRoot; + set => modeManagedRoot = value; + } + + /// + [Obsolete("This function has been deprecated in version 4.0.0 and will be removed in the next major release. Use ModeManagedRoot instead.")] + public GameObject GetModeManagedController() + { + // Legacy controller-based interactors should return null, so the legacy controller-based logic in the + // interaction mode manager is used instead. + return forceDeprecatedInput ? null : ModeManagedRoot; + } } } diff --git a/org.mixedrealitytoolkit.input/Interactors/GazePinch/GazePinchInteractor.cs b/org.mixedrealitytoolkit.input/Interactors/GazePinch/GazePinchInteractor.cs index 43d54392a..e4c3f3a2d 100644 --- a/org.mixedrealitytoolkit.input/Interactors/GazePinch/GazePinchInteractor.cs +++ b/org.mixedrealitytoolkit.input/Interactors/GazePinch/GazePinchInteractor.cs @@ -1,9 +1,14 @@ // Copyright (c) Mixed Reality Toolkit Contributors // Licensed under the BSD 3-Clause +using System; using System.Collections.Generic; using UnityEngine; +using UnityEngine.InputSystem.XR; +using UnityEngine.XR; using UnityEngine.XR.Interaction.Toolkit; +using UnityEngine.XR.Interaction.Toolkit.Interactables; +using UnityEngine.XR.Interaction.Toolkit.Interactors; namespace MixedReality.Toolkit.Input { @@ -14,24 +19,58 @@ namespace MixedReality.Toolkit.Input /// [AddComponentMenu("MRTK/Input/Gaze Pinch Interactor")] public class GazePinchInteractor : - XRBaseControllerInteractor, + XRBaseInputInteractor, IGazePinchInteractor, + IModeManagedInteractor, +#pragma warning disable CS0618 // Type or member is obsolete IHandedInteractor +#pragma warning restore CS0618 // Type or member is obsolete { #region GazePinchInteractor + [SerializeField, Tooltip("Holds a reference to the TrackedPoseDriver associated with this interactor, if it exists.")] + private TrackedPoseDriver trackedPoseDriver = null; + + /// + /// Holds a reference to the associated with this interactor, if it exists. + /// + internal TrackedPoseDriver TrackedPoseDriver => trackedPoseDriver; + + [SerializeField] + [Tooltip("The root management GameObject that interactor belongs to.")] + private GameObject modeManagedRoot = null; + + /// + /// Returns the GameObject that this interactor belongs to. This GameObject is governed by the + /// interaction mode manager and is assigned an interaction mode. This GameObject represents the group that this interactor belongs to. + /// + /// + /// This will default to the GameObject that this attached to a parent . + /// + public GameObject ModeManagedRoot + { + get => modeManagedRoot; + set => modeManagedRoot = value; + } + [Header("Gaze Pinch interactor settings")] [SerializeField] [Tooltip("The hand controller used to get the selection progress values")] + [Obsolete("This field has been deprecated in version 4.0.0. Please use this.TrackedPoseDriver instead.")] private ArticulatedHandController handController; + /// + /// Indicates whether the pinch interactor has completed the pinch gesture. + /// + private bool pinchReady = false; + /// /// Is the hand ready to select? Typically, this /// represents whether the hand is in a pinching pose, /// within the FOV set by the aggregator config. /// - protected bool PinchReady => handController.PinchSelectReady; + protected bool PinchReady => pinchReady; /// /// The world-space pose of the hand pinching point. @@ -60,22 +99,22 @@ public class GazePinchInteractor : [SerializeReference] [InterfaceSelector(true)] - [Tooltip("The pose source representing the pose this interactor uses for aiming and positioning. Follows the 'pointer pose'")] + [Tooltip("The pose source representing the pose this interactor uses for aiming and positioning. Follows the 'pointer pose'.")] private IPoseSource aimPoseSource; /// - /// The pose source representing the ray this interactor uses for aiming and positioning. + /// The pose source representing the pose this interactor uses for aiming and positioning. Follows the 'pointer pose'. /// protected IPoseSource AimPoseSource { get => aimPoseSource; set => aimPoseSource = value; } [SerializeField] - [Tooltip("The interactor we're using to query potential gaze pinch targets")] - private XRBaseControllerInteractor dependentInteractor; + [Tooltip("The interactor we're using to query potential gaze pinch targets.")] + private XRBaseInputInteractor dependentInteractor; /// - /// The pose source representing the ray this interactor uses for aiming and positioning. + /// The interactor we're using to query potential gaze pinch targets. /// - protected XRBaseControllerInteractor DependentInteractor { get => dependentInteractor; set => dependentInteractor = value; } + protected internal XRBaseInputInteractor DependentInteractor { get => dependentInteractor; set => dependentInteractor = value; } [SerializeField] [Range(0, 1)] @@ -126,29 +165,101 @@ public float RelaxationThreshold private Vector3 interactorLocalAttachPoint; /// - /// Used to check if the parent controller is tracked or not + /// Used to check if the parent controller is tracked or not. /// Hopefully this becomes part of the base Unity XRI API. /// - private bool IsTracked => xrController.currentControllerState.inputTrackingState.HasPositionAndRotation(); + private bool IsTracked + { + get + { +#pragma warning disable CS0618 + if (forceDeprecatedInput) + { + return xrController.currentControllerState.inputTrackingState.HasPositionAndRotation(); + } +#pragma warning restore CS0618 + else + { + if (TrackedPoseDriver == null) // If the interactor does not have a TrackedPoseDriver associated to it then it is not tracked + { + return false; + } + + // If this interactor has a TrackedPoseDriver then use it to check if this interactor is tracked + return TrackedPoseDriver.GetInputTrackingState().HasPositionAndRotation(); + } + } + } #endregion GazePinchInteractor #region IHandedInteractor /// - Handedness IHandedInteractor.Handedness => handController.HandNode.ToHandedness(); + [Obsolete("Use handedness from IXRInteractor instead.")] + Handedness IHandedInteractor.Handedness + { + get + { + if (forceDeprecatedInput) + { + return handController.HandNode.ToHandedness(); + } + + return handedness.ToHandedness(); + } + } #endregion IHandedInteractor #region IVariableSelectInteractor /// - public float SelectProgress => handController.selectInteractionState.value; + public float SelectProgress + { + get + { +#pragma warning disable CS0618 // Type or member is obsolete + if (forceDeprecatedInput) + { + return handController.selectInteractionState.value; + } +#pragma warning restore CS0618 // Type or member is obsolete + else if (selectInput != null) + { + return selectInput.ReadValue(); + } + else + { + Debug.LogWarning($"Unable to determine SelectProgress of {name} because there is no Select Input Configuration set for this interactor."); + } + return 0.0f; + } + } #endregion IVariableSelectInteractor #region MonoBehaviour + /// + protected override void Start() + { + base.Start(); + + // Try to get the TrackedPoseDriver component from the parent if it hasn't been set yet + if (trackedPoseDriver == null) + { + trackedPoseDriver = GetComponentInParent(); + } + + // If mode managed root is not defined, default to the tracked pose driver's game object + if (modeManagedRoot == null && trackedPoseDriver != null) + { + modeManagedRoot = trackedPoseDriver.gameObject; + } + } + + /// private void OnDrawGizmosSelected() { if (Application.isPlaying) @@ -163,7 +274,7 @@ private void OnDrawGizmosSelected() #region XRBaseInteractor - /// + /// /// /// This indirect interactor harvests the valid targets from the associated /// , allowing for gaze-targeting or other @@ -203,16 +314,18 @@ public override void ProcessInteractor(XRInteractionUpdateOrder.UpdatePhase upda transform.SetPositionAndRotation(aimPose.position, aimPose.rotation); } ComputeAttachTransform(hasSelection ? interactablesSelected[0] : null); + + UpdatePinchState(); } } /// /// Given the specified interactable, this computes and applies the relevant - /// position and rotation to the attach transform. + /// position and rotation to the attach transform. /// /// - /// If there is currently an active selection, the attach transform is computed - /// as an offset from selected object, where the offset vector is a function of + /// If there is currently an active selection, the attach transform is computed + /// as an offset from selected object, where the offset vector is a function of /// the centroid between all currently participating /// objects. This models ray-like manipulations, but with virtual attach offsets /// from object, modeled from the relationship between each participating hand. @@ -226,8 +339,7 @@ private void ComputeAttachTransform(IXRSelectInteractable interactable) if (!AimPoseSource.TryGetPose(out Pose aimPose)) { return; } // Separate vars for fused position/rotation setting. - Quaternion rotationToApply = attachTransform.rotation; - Vector3 positionToApply = attachTransform.position; + attachTransform.GetPositionAndRotation(out Vector3 positionToApply, out Quaternion rotationToApply); // Compute the ratio from the current hand-body distance to the distance // we recorded on selection. Used to linearly scale the attach transform's @@ -366,7 +478,7 @@ private void ResetManipulationLogic(IXRSelectInteractable interactable) interactorLocalAttachPoint = Quaternion.Inverse(noRollRay) * (virtualAttachTransform - aimPose.position); // Record the distance from the controller to the body of the user, to use as reference for subsequent - // distance measurements. + // distance measurements. bodyDistanceOnSelect = PoseUtilities.GetDistanceToBody(aimPose); } @@ -442,5 +554,56 @@ protected override void OnSelectExited(SelectExitEventArgs args) } #endregion XRBaseInteractor + + #region IModeManagedInteractor + + /// + [Obsolete("This function has been deprecated in version 4.0.0 and will be removed in the next major release. Use ModeManagedRoot instead.")] + public GameObject GetModeManagedController() + { + // Legacy controller-based interactors should return null, so the legacy controller-based logic in the + // interaction mode manager is used instead. + return forceDeprecatedInput ? null : ModeManagedRoot; + } + + #endregion IModeManagedInteractor + + #region Private Methods + + /// + /// Updates the pinch state of the GazePinchInteractor. + /// If handedness is not set then it defaults to right hand. + /// If the pinch data is not available for the set hand then the other hand is tried. + /// + private void UpdatePinchState() + { + if (logicalSelectState == null) + { + Debug.LogWarning("GazePinchInteractor is missing logicalSelectState, pinch state won't update."); + return; + } + + if (XRSubsystemHelpers.HandsAggregator == null) + { + Debug.LogWarning("XRSubsystemHelpers.HandsAggregator is null, pinch state won't update."); + return; + } + + var xrNode = handedness.ToXRNode(); + bool gotPinchData = XRSubsystemHelpers.HandsAggregator.TryGetPinchProgress(xrNode, + out bool isPinchReady, out bool isPinching, out float pinchAmount); + if (!gotPinchData) // Try the other hand if the set hand does not have pinch data. + { + gotPinchData = XRSubsystemHelpers.HandsAggregator.TryGetPinchProgress(xrNode == XRNode.LeftHand ? XRNode.RightHand : XRNode.LeftHand, + out isPinchReady, out isPinching, out pinchAmount); + } + + if (gotPinchData) + { + pinchReady = isPinchReady; + } + } + + #endregion Private Methods } } diff --git a/org.mixedrealitytoolkit.input/Interactors/HandJointInteractor.cs b/org.mixedrealitytoolkit.input/Interactors/HandJointInteractor.cs index 88cb83789..b00630872 100644 --- a/org.mixedrealitytoolkit.input/Interactors/HandJointInteractor.cs +++ b/org.mixedrealitytoolkit.input/Interactors/HandJointInteractor.cs @@ -1,9 +1,12 @@ // Copyright (c) Mixed Reality Toolkit Contributors // Licensed under the BSD 3-Clause +using System; using Unity.Profiling; using UnityEngine; +using UnityEngine.InputSystem.XR; using UnityEngine.XR.Interaction.Toolkit; +using UnityEngine.XR.Interaction.Toolkit.Interactors; namespace MixedReality.Toolkit.Input { @@ -15,8 +18,35 @@ namespace MixedReality.Toolkit.Input /// public abstract class HandJointInteractor : XRDirectInteractor, + IModeManagedInteractor, +#pragma warning disable CS0618 // Type or member is obsolete IHandedInteractor +#pragma warning restore CS0618 // Type or member is obsolete { + #region Serialized Fields + + [SerializeField, Tooltip("Holds a reference to the TrackedPoseDriver associated with this interactor, if it exists.")] + private TrackedPoseDriver trackedPoseDriver = null; + + [SerializeField] + [Tooltip("The root management GameObject that interactor belongs to.")] + private GameObject modeManagedRoot = null; + + /// + /// Returns the GameObject that this interactor belongs to. This GameObject is governed by the + /// interaction mode manager and is assigned an interaction mode. This GameObject represents the group that this interactor belongs to. + /// + /// + /// This will default to the GameObject that this attached to a parent . + /// + public GameObject ModeManagedRoot + { + get => modeManagedRoot; + set => modeManagedRoot = value; + } + + #endregion Serialized Fields + #region HandJointInteractor /// @@ -30,37 +60,68 @@ public abstract class HandJointInteractor : #region IHandedInteractor - /// - Handedness IHandedInteractor.Handedness => (xrController is ArticulatedHandController handController) ? handController.HandNode.ToHandedness() : Handedness.None; + /// + [Obsolete("Use handedness from IXRInteractor instead.")] + Handedness IHandedInteractor.Handedness + { + get + { + if (forceDeprecatedInput && + xrController is ArticulatedHandController handController) + { + return handController.HandNode.ToHandedness(); + } + + return handedness.ToHandedness(); + } + } #endregion IHandedInteractor #region XRBaseInteractor /// - /// Used to keep track of whether the controller has an interaction point. + /// Used to keep track of whether the `TrackedPoseDriver` or controller (if using deprecated XRI) has an interaction point. /// private bool interactionPointTracked; - /// - /// Indicates whether this Interactor is in a state where it could hover. - /// + /// public override bool isHoverActive { - // Only be available for hovering if the controller is tracked or we have joint data. - get => base.isHoverActive && (xrController.currentControllerState.inputTrackingState.HasPositionAndRotation() || interactionPointTracked); + // Only be available for hovering if the `TrackedPoseDriver` or controller (if using deprecated XRI) pose driver is tracked or we have joint data. + get + { + bool result = base.isHoverActive; + +#pragma warning disable CS0618 // xrController is obsolete + if (forceDeprecatedInput) + { + result &= (xrController.currentControllerState.inputTrackingState.HasPositionAndRotation() || interactionPointTracked); + } +#pragma warning restore CS0618 // xrController is obsolete + else if (trackedPoseDriver != null) + { + result &= (trackedPoseDriver.GetInputTrackingState().HasPositionAndRotation() || interactionPointTracked); + } + else + { + result &= interactionPointTracked; + } + + return result; + } } #endregion XRBaseInteractor - #region XRBaseControllerInteractor + #region XRBaseInputInteractor private static readonly ProfilerMarker ProcessInteractorPerfMarker = new ProfilerMarker("[MRTK] HandJointInteractor.ProcessInteractor"); /// - /// Unity's XRInteractionManager - /// or containing IXRInteractionGroup + /// Unity's XRInteractionManager + /// or containing IXRInteractionGroup /// calls this method to update the Interactor before interaction events occur. See Unity's documentation for more information. /// /// The update phase this is called during. @@ -85,9 +146,8 @@ public override void ProcessInteractor(XRInteractionUpdateOrder.UpdatePhase upda } else { - // If we don't have a joint pose, reset to whatever our parent XRController's pose is. - transform.localPosition = Vector3.zero; - transform.localRotation = Quaternion.identity; + // If we don't have a joint pose, reset to whatever our parent `TrackedPoseDriver` pose is. + transform.SetLocalPositionAndRotation(Vector3.zero, Quaternion.identity); } // Ensure that the attachTransform tightly follows the interactor's transform @@ -96,6 +156,41 @@ public override void ProcessInteractor(XRInteractionUpdateOrder.UpdatePhase upda } } - #endregion XRBaseControllerInteractor + #endregion XRBaseInputInteractor + + #region IModeManagedInteractor + + /// + [Obsolete("This function has been deprecated in version 4.0.0 and will be removed in the next major release. Use ModeManagedRoot instead.")] + public GameObject GetModeManagedController() + { + // Legacy controller-based interactors should return null, so the legacy controller-based logic in the + // interaction mode manager is used instead. + return forceDeprecatedInput ? null : ModeManagedRoot; + } + + #endregion IModeManagedInteractor + + #region Unity Event Functions + + /// + protected override void Start() + { + base.Start(); + + // Try to get the TrackedPoseDriver component from the parent if it hasn't been set yet + if (trackedPoseDriver == null) + { + trackedPoseDriver = GetComponentInParent(); + } + + // If mode managed root is not defined, default to the tracked pose driver's game object + if (modeManagedRoot == null && trackedPoseDriver != null) + { + modeManagedRoot = trackedPoseDriver.gameObject; + } + } + + #endregion Unity Event Functions } } diff --git a/org.mixedrealitytoolkit.input/Interactors/InteractorDwellManager.cs b/org.mixedrealitytoolkit.input/Interactors/InteractorDwellManager.cs index 7c07d3c15..6923d9985 100644 --- a/org.mixedrealitytoolkit.input/Interactors/InteractorDwellManager.cs +++ b/org.mixedrealitytoolkit.input/Interactors/InteractorDwellManager.cs @@ -4,6 +4,8 @@ using System.Collections.Generic; using UnityEngine; using UnityEngine.XR.Interaction.Toolkit; +using UnityEngine.XR.Interaction.Toolkit.Interactables; +using UnityEngine.XR.Interaction.Toolkit.Interactors; namespace MixedReality.Toolkit.Input { diff --git a/org.mixedrealitytoolkit.input/Interactors/InteractorVisuals/BaseReticleVisual.cs b/org.mixedrealitytoolkit.input/Interactors/InteractorVisuals/BaseReticleVisual.cs index 8d34416b7..10959b410 100644 --- a/org.mixedrealitytoolkit.input/Interactors/InteractorVisuals/BaseReticleVisual.cs +++ b/org.mixedrealitytoolkit.input/Interactors/InteractorVisuals/BaseReticleVisual.cs @@ -1,9 +1,8 @@ // Copyright (c) Mixed Reality Toolkit Contributors // Licensed under the BSD 3-Clause -using System; using UnityEngine; -using UnityEngine.XR.Interaction.Toolkit; +using UnityEngine.XR.Interaction.Toolkit.Interactors.Visuals; namespace MixedReality.Toolkit.Input { diff --git a/org.mixedrealitytoolkit.input/Interactors/InteractorVisuals/MRTKLineVisual.cs b/org.mixedrealitytoolkit.input/Interactors/InteractorVisuals/MRTKLineVisual.cs index 83cac156b..652e6aa70 100644 --- a/org.mixedrealitytoolkit.input/Interactors/InteractorVisuals/MRTKLineVisual.cs +++ b/org.mixedrealitytoolkit.input/Interactors/InteractorVisuals/MRTKLineVisual.cs @@ -5,6 +5,7 @@ using UnityEngine; using UnityEngine.Rendering; using UnityEngine.XR.Interaction.Toolkit; +using UnityEngine.XR.Interaction.Toolkit.Interactors; using static MixedReality.Toolkit.Input.XRRayInteractorExtensions; namespace MixedReality.Toolkit.Input diff --git a/org.mixedrealitytoolkit.input/Interactors/InteractorVisuals/MRTKRayReticleVisual.cs b/org.mixedrealitytoolkit.input/Interactors/InteractorVisuals/MRTKRayReticleVisual.cs index 83f09a153..af83a5159 100644 --- a/org.mixedrealitytoolkit.input/Interactors/InteractorVisuals/MRTKRayReticleVisual.cs +++ b/org.mixedrealitytoolkit.input/Interactors/InteractorVisuals/MRTKRayReticleVisual.cs @@ -4,6 +4,7 @@ using Unity.Profiling; using UnityEngine; using UnityEngine.XR.Interaction.Toolkit; +using UnityEngine.XR.Interaction.Toolkit.Interactors; using static MixedReality.Toolkit.Input.XRRayInteractorExtensions; namespace MixedReality.Toolkit.Input diff --git a/org.mixedrealitytoolkit.input/Interactors/InteractorVisuals/RingReticle.cs b/org.mixedrealitytoolkit.input/Interactors/InteractorVisuals/RingReticle.cs index c3c3968fc..82ca06a51 100644 --- a/org.mixedrealitytoolkit.input/Interactors/InteractorVisuals/RingReticle.cs +++ b/org.mixedrealitytoolkit.input/Interactors/InteractorVisuals/RingReticle.cs @@ -2,7 +2,7 @@ // Licensed under the BSD 3-Clause using UnityEngine; -using UnityEngine.XR.Interaction.Toolkit; +using UnityEngine.XR.Interaction.Toolkit.Interactors; namespace MixedReality.Toolkit.Input { diff --git a/org.mixedrealitytoolkit.input/Interactors/Poke/PokeInteractor.cs b/org.mixedrealitytoolkit.input/Interactors/Poke/PokeInteractor.cs index 7d19bd018..1aace6efe 100644 --- a/org.mixedrealitytoolkit.input/Interactors/Poke/PokeInteractor.cs +++ b/org.mixedrealitytoolkit.input/Interactors/Poke/PokeInteractor.cs @@ -1,10 +1,15 @@ // Copyright (c) Mixed Reality Toolkit Contributors // Licensed under the BSD 3-Clause +using System; using System.Collections.Generic; using Unity.Profiling; using UnityEngine; +using UnityEngine.InputSystem.XR; +using UnityEngine.XR; using UnityEngine.XR.Interaction.Toolkit; +using UnityEngine.XR.Interaction.Toolkit.Interactables; +using UnityEngine.XR.Interaction.Toolkit.Interactors; using PokePath = MixedReality.Toolkit.IPokeInteractor.PokePath; namespace MixedReality.Toolkit.Input @@ -14,12 +19,40 @@ namespace MixedReality.Toolkit.Input /// [AddComponentMenu("MRTK/Input/Poke Interactor")] public class PokeInteractor : - XRBaseControllerInteractor, + XRBaseInputInteractor, IPokeInteractor, + IModeManagedInteractor, +#pragma warning disable CS0618 // Type or member is obsolete IHandedInteractor +#pragma warning restore CS0618 // Type or member is obsolete { #region PokeInteractor + [SerializeField, Tooltip("Holds a reference to the TrackedPoseDriver associated with this interactor, if it exists.")] + private TrackedPoseDriver trackedPoseDriver = null; + + /// + /// Holds a reference to the associated with this interactor, if it exists. + /// + internal TrackedPoseDriver TrackedPoseDriver => trackedPoseDriver; + + [SerializeField] + [Tooltip("The root management GameObject that interactor belongs to.")] + private GameObject modeManagedRoot = null; + + /// + /// Returns the GameObject that this interactor belongs to. This GameObject is governed by the + /// interaction mode manager and is assigned an interaction mode. This GameObject represents the group that this interactor belongs to. + /// + /// + /// This will default to the GameObject that this attached to a parent . + /// + public GameObject ModeManagedRoot + { + get => modeManagedRoot; + set => modeManagedRoot = value; + } + [SerializeReference] [InterfaceSelector(true)] [Tooltip("The pose source representing the poke pose")] @@ -47,8 +80,18 @@ protected virtual bool TryGetPokePose(out Pose pose) protected virtual bool TryGetPokeRadius(out float radius) { HandJointPose jointPose = default; - if (xrController is ArticulatedHandController handController - && (XRSubsystemHelpers.HandsAggregator?.TryGetNearInteractionPoint(handController.HandNode, out jointPose) ?? false)) + +#pragma warning disable CS0618 // Type or member is obsolete + if (forceDeprecatedInput && + xrController is ArticulatedHandController handController && + (XRSubsystemHelpers.HandsAggregator?.TryGetNearInteractionPoint(handController.HandNode, out jointPose) ?? false)) + { + radius = jointPose.Radius; + return true; + } +#pragma warning restore CS0618 // Type or member is obsolete + else if (handedness != InteractorHandedness.None && + (XRSubsystemHelpers.HandsAggregator?.TryGetNearInteractionPoint(handedness.ToXRNode(), out jointPose) ?? false)) { radius = jointPose.Radius; return true; @@ -63,7 +106,20 @@ protected virtual bool TryGetPokeRadius(out float radius) #region IHandedInteractor /// - Handedness IHandedInteractor.Handedness => (xrController is ArticulatedHandController handController) ? handController.HandNode.ToHandedness() : Handedness.None; + [Obsolete("Use handedness from IXRInteractor instead.")] + Handedness IHandedInteractor.Handedness + { + get + { + if (forceDeprecatedInput && + xrController is ArticulatedHandController handController) + { + return handController.HandNode.ToHandedness(); + } + + return handedness.ToHandedness(); + } + } #endregion IHandedInteractor @@ -87,6 +143,24 @@ protected virtual bool TryGetPokeRadius(out float radius) #region MonoBehaviour + /// + protected override void Start() + { + base.Start(); + + // Try to get the component from the parent if it hasn't been set yet + if (trackedPoseDriver == null) + { + trackedPoseDriver = GetComponentInParent(); + } + + // If mode managed root is not defined, default to the tracked pose driver's game object + if (modeManagedRoot == null && trackedPoseDriver != null) + { + modeManagedRoot = trackedPoseDriver.gameObject; + } + } + /// /// A Unity event function that is called when an enabled script instance is being loaded. /// @@ -126,7 +200,22 @@ public override void GetValidTargets(List targets) public override bool isHoverActive { // Only be available for hovering if the joint or controller is tracked. - get => base.isHoverActive && (xrController.currentControllerState.inputTrackingState.HasPositionAndRotation() || pokePointTracked); + get + { +#pragma warning disable CS0618 // Type or member is obsolete + if (forceDeprecatedInput) + { + return base.isHoverActive && (xrController.currentControllerState.inputTrackingState.HasPositionAndRotation() || pokePointTracked); + } +#pragma warning restore CS0618 // Type or member is obsolete + // If the interactor does not have a TrackedPoseDriver component then we cannot determine if it is hover active + else if (trackedPoseDriver == null) + { + return false; + } + + return base.isHoverActive && (trackedPoseDriver.GetInputTrackingState().HasPositionAndRotation() || pokePointTracked); + } } /// @@ -222,5 +311,18 @@ public override void ProcessInteractor(XRInteractionUpdateOrder.UpdatePhase upda } #endregion XRBaseInteractor + + #region IModeManagedInteractor + + /// + [Obsolete("This function has been deprecated in version 4.0.0 and will be removed in the next major release. Use ModeManagedRoot instead.")] + public GameObject GetModeManagedController() + { + // Legacy controller-based interactors should return null, so the legacy controller-based logic in the + // interaction mode manager is used instead. + return forceDeprecatedInput ? null : ModeManagedRoot; + } + + #endregion IModeManagedInteractor } } diff --git a/org.mixedrealitytoolkit.input/Interactors/Ray/MRTKRayInteractor.cs b/org.mixedrealitytoolkit.input/Interactors/Ray/MRTKRayInteractor.cs index 92ce1b099..d237b1043 100644 --- a/org.mixedrealitytoolkit.input/Interactors/Ray/MRTKRayInteractor.cs +++ b/org.mixedrealitytoolkit.input/Interactors/Ray/MRTKRayInteractor.cs @@ -3,54 +3,99 @@ using System; using System.Collections.Generic; -using MixedReality.Toolkit.Subsystems; using Unity.Profiling; using UnityEngine; +using UnityEngine.InputSystem.XR; using UnityEngine.XR.Interaction.Toolkit; +using UnityEngine.XR.Interaction.Toolkit.Interactables; +using UnityEngine.XR.Interaction.Toolkit.Interactors; using UnityEngine.XR.Interaction.Toolkit.UI; namespace MixedReality.Toolkit.Input { /// - /// A wrapper for the XRRayInteractor which stores extra information for MRTK management/services + /// A wrapper for the which stores extra information for MRTK management/services /// [AddComponentMenu("MRTK/Input/MRTK Ray Interactor")] // This execution order ensures that the MRTKRayInteractor runs its update function right after the - // XRController. We do this because the MRTKRayInteractor needs to set its own pose after the parent controller transform, + // . We do this because the needs to set its own pose after the parent controller transform, // but before any physics raycast calls are made to determine selection. The earliest a physics call can be made is within - // the UIInputModule, which has an update order much higher than XRControllers. + // the UIInputModule, which has an update order much higher than s. // TODO: Examine the update order of other interactors in the future with respect to when their physics calls happen, // or create a system to keep ensure interactor poses aren't ever implicitly set via parenting. [DefaultExecutionOrder(XRInteractionUpdateOrder.k_Controllers + 1)] public class MRTKRayInteractor : XRRayInteractor, IRayInteractor, - IHandedInteractor, - IVariableSelectInteractor + IVariableSelectInteractor, + IModeManagedInteractor, +#pragma warning disable CS0618 // Type or member is obsolete + IHandedInteractor +#pragma warning restore CS0618 // Type or member is obsolete { #region MRTKRayInteractor + [SerializeField, Tooltip("Holds a reference to the TrackedPoseDriver associated with this interactor, if it exists.")] + private TrackedPoseDriver trackedPoseDriver = null; + + /// + /// Holds a reference to the associated with this interactor, if it exists. + /// + internal TrackedPoseDriver TrackedPoseDriver => trackedPoseDriver; + + [SerializeField] + [Tooltip("The root management GameObject that interactor belongs to.")] + private GameObject modeManagedRoot = null; + + /// + /// Returns the GameObject that this interactor belongs to. This GameObject is governed by the + /// interaction mode manager and is assigned an interaction mode. This GameObject represents the group that this interactor belongs to. + /// + /// + /// This will default to the GameObject that this attached to a parent . + /// + public GameObject ModeManagedRoot + { + get => modeManagedRoot; + set => modeManagedRoot = value; + } + /// /// Is this ray currently hovering a UnityUI/Canvas element? /// + [Obsolete("This property has been deprecated in version 4.0.0. Call " + nameof(TryGetUIModel) + " and use " + nameof(TrackedDeviceModel.currentRaycast.isValid) + " instead.")] public bool HasUIHover => TryGetUIModel(out TrackedDeviceModel model) && model.currentRaycast.isValid; /// /// Is this ray currently selecting a UnityUI/Canvas element? /// - public bool HasUISelection => HasUIHover && isUISelectActive; + [Obsolete("This property has been deprecated in version 4.0.0. Call " + nameof(TryGetUIModel) + " and use " + nameof(TrackedDeviceModel.select) + " instead.")] + public bool HasUISelection => TryGetUIModel(out TrackedDeviceModel model) && model.select; /// /// Used to check if the parent controller is tracked or not /// Hopefully this becomes part of the base Unity XRI API. /// - private bool IsTracked => xrController.currentControllerState.inputTrackingState.HasPositionAndRotation(); + private bool IsTracked + { + get + { +#pragma warning disable CS0618 // Type or member is obsolete + if (forceDeprecatedInput) // If no XRController is associated with this interactor then try to get the TrackedPoseDriver component instead + { + // If the XRController has already been set then use it to check if the controller is tracked + return xrController.currentControllerState.inputTrackingState.HasPositionAndRotation(); + } +#pragma warning restore CS0618 + else if (trackedPoseDriver == null) // If the interactor does not have a TrackedPoseDriver component then it is not tracked + { + return false; + } - /// - /// Cached reference to hands aggregator for efficient per-frame use. - /// - [Obsolete("Deprecated, please use XRSubsystemHelpers.HandsAggregator instead.")] - protected HandsAggregatorSubsystem HandsAggregator => XRSubsystemHelpers.HandsAggregator as HandsAggregatorSubsystem; + // If this interactor has a TrackedPoseDriver then use it to check if this interactor is tracked + return trackedPoseDriver.GetInputTrackingState().HasPositionAndRotation(); + } + } /// /// How unselected the interactor must be to initiate a new hover or selection on a new target. @@ -77,14 +122,46 @@ public class MRTKRayInteractor : #region IHandedInteractor - Handedness IHandedInteractor.Handedness => (xrController is ArticulatedHandController handController) ? handController.HandNode.ToHandedness() : Handedness.None; + /// + [Obsolete("Use handedness from IXRInteractor instead.")] + Handedness IHandedInteractor.Handedness + { + get + { + if (forceDeprecatedInput && + xrController is ArticulatedHandController handController) + { + return handController.HandNode.ToHandedness(); + } + + return handedness.ToHandedness(); + } + } #endregion IHandedInteractor #region IVariableSelectInteractor /// - public float SelectProgress => xrController.selectInteractionState.value; + public float SelectProgress + { + get + { +#pragma warning disable CS0618 // Type or member is obsolete + if (forceDeprecatedInput) + { + return xrController.selectInteractionState.value; + } +#pragma warning restore CS0618 + else if (selectInput != null) + { + return selectInput.ReadValue(); + } + + Debug.LogWarning($"Unable to determine SelectProgress of {name} because there is no Select Input Configuration set for this interactor."); + return 0; + } + } #endregion IVariableSelectInteractor @@ -155,13 +232,21 @@ public override bool isHoverActive bool hoverActive = base.isHoverActive; if (hoverActive) { - if (xrController is ArticulatedHandController handController) + bool isPalmFacingAway = false; + +#pragma warning disable CS0618 // Type or member is obsolete + if (forceDeprecatedInput && + xrController is ArticulatedHandController handController && + (XRSubsystemHelpers.HandsAggregator?.TryGetPalmFacingAway(handController.HandNode, out isPalmFacingAway) ?? true)) + { + hoverActive &= isPalmFacingAway; + } +#pragma warning restore CS0618 + // Attempt palm facing away check if the interactor is associated with a hand. + else if (handedness != InteractorHandedness.None && + (XRSubsystemHelpers.HandsAggregator?.TryGetPalmFacingAway(handedness.ToXRNode(), out isPalmFacingAway) ?? true)) { - bool isPalmFacingAway = false; - if (XRSubsystemHelpers.HandsAggregator?.TryGetPalmFacingAway(handController.HandNode, out isPalmFacingAway) ?? true) - { - hoverActive &= isPalmFacingAway; - } + hoverActive &= isPalmFacingAway; } } @@ -228,10 +313,43 @@ protected override void OnSelectEntering(SelectEnterEventArgs args) #endregion XRBaseInteractor + #region IModeManagedInteractor + + /// + [Obsolete("This function has been deprecated in version 4.0.0 and will be removed in the next major release. Use ModeManagedRoot instead.")] + public GameObject GetModeManagedController() + { + // Legacy controller-based interactors should return null, so the legacy controller-based logic in the + // interaction mode manager is used instead. + return forceDeprecatedInput ? null : ModeManagedRoot; + } + + #endregion IModeManagedInteractor + + #region Unity Event Functions + + /// + protected override void Start() + { + base.Start(); + + // Try to get the TrackedPoseDriver component from the parent if it hasn't been set yet + if (trackedPoseDriver == null) + { + trackedPoseDriver = GetComponentInParent(); + } + + // If mode managed root is not defined, default to the tracked pose driver's game object + if (modeManagedRoot == null && trackedPoseDriver != null) + { + modeManagedRoot = trackedPoseDriver.gameObject; + } + } + /// /// A Unity event function that is called every frame, if this object is enabled. /// - private void Update() + protected virtual void Update() { // Use Pose Sources to calculate the interactor's pose and the attach transform's position // We have to make sure the ray interactor is oriented appropriately before calling @@ -252,6 +370,14 @@ private void Update() { attachTransform.rotation = devicePose.rotation; } + + // If mode managed root is not defined, default to the tracked pose driver's game object + if (modeManagedRoot == null && trackedPoseDriver != null) + { + modeManagedRoot = trackedPoseDriver.gameObject; + } } + + #endregion Unity Event Functions } } diff --git a/org.mixedrealitytoolkit.input/Interactors/Speech/SpeechInteractor.cs b/org.mixedrealitytoolkit.input/Interactors/Speech/SpeechInteractor.cs index c19fe9a99..4c46dee10 100644 --- a/org.mixedrealitytoolkit.input/Interactors/Speech/SpeechInteractor.cs +++ b/org.mixedrealitytoolkit.input/Interactors/Speech/SpeechInteractor.cs @@ -5,6 +5,8 @@ using Unity.Profiling; using UnityEngine; using UnityEngine.XR.Interaction.Toolkit; +using UnityEngine.XR.Interaction.Toolkit.Interactables; +using UnityEngine.XR.Interaction.Toolkit.Interactors; namespace MixedReality.Toolkit.Input { diff --git a/org.mixedrealitytoolkit.input/Interactors/XRRayInteractorExtensions.cs b/org.mixedrealitytoolkit.input/Interactors/XRRayInteractorExtensions.cs index 591785e84..c9ed7488b 100644 --- a/org.mixedrealitytoolkit.input/Interactors/XRRayInteractorExtensions.cs +++ b/org.mixedrealitytoolkit.input/Interactors/XRRayInteractorExtensions.cs @@ -2,7 +2,8 @@ // Licensed under the BSD 3-Clause using UnityEngine; -using UnityEngine.XR.Interaction.Toolkit; +using UnityEngine.XR.Interaction.Toolkit.Interactables; +using UnityEngine.XR.Interaction.Toolkit.Interactors; namespace MixedReality.Toolkit.Input { diff --git a/org.mixedrealitytoolkit.input/Readers.meta b/org.mixedrealitytoolkit.input/Readers.meta new file mode 100644 index 000000000..0571f469e --- /dev/null +++ b/org.mixedrealitytoolkit.input/Readers.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 34b52045d9935f8489649d1f5230f811 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/org.mixedrealitytoolkit.input/Readers/PinchInputReader.cs b/org.mixedrealitytoolkit.input/Readers/PinchInputReader.cs new file mode 100644 index 000000000..32e638973 --- /dev/null +++ b/org.mixedrealitytoolkit.input/Readers/PinchInputReader.cs @@ -0,0 +1,299 @@ +// Copyright (c) Mixed Reality Toolkit Contributors +// Licensed under the BSD 3-Clause + +using Unity.Profiling; +using UnityEngine; +using UnityEngine.InputSystem; +using UnityEngine.InputSystem.XR; +using UnityEngine.XR; +using UnityEngine.XR.Interaction.Toolkit; +using UnityEngine.XR.Interaction.Toolkit.Inputs; +using UnityEngine.XR.Interaction.Toolkit.Inputs.Readers; + +namespace MixedReality.Toolkit.Input +{ + /// + /// A class that reads pinch selection input and values from . If no action is set or if an action is not bound to a control, + /// the selection state will be driven by the subsystem's pinch amount. + /// + /// + /// When using this class, ensure that the is available and enabled. + /// This is a workaround for device's without interaction profiles for hands. Once universal hand interaction profiles are available, + /// this class will be removed. + /// + [DefaultExecutionOrder(XRInteractionUpdateOrder.k_XRInputDeviceButtonReader)] + public class PinchInputReader : MonoBehaviour, IXRInputButtonReader + { + /// + /// The state of the pinch input reader when is not set or not bound to a control. + /// + private struct FallbackState + { + public bool hasPinchData; + public bool isPerformed; + public bool wasPerformedThisFrame; + public bool wasCompletedThisFrame; + public float value; + } + + #region Serialized Fields + + [SerializeField, Tooltip("The XRNode associated with this Hand Controller. Expected to be XRNode.LeftHand or XRNode.RightHand.")] + private XRNode handNode; + + /// + /// The XRNode associated with this Hand Controller. + /// + /// Expected to be XRNode.LeftHand or XRNode.RightHand. + public XRNode HandNode => handNode; + + [SerializeField, Tooltip("The Input System action to use for selecting an Interactable. If not defined or if a controller is not attached to this property, the selection will be driven by the IHandsAggregatorSubsystem subsystem's pinch amount.")] + private InputActionProperty selectAction = new InputActionProperty(new InputAction("Select", type: InputActionType.Button)); + + /// + /// The Input System action to use for selecting an Interactable. If not defined or if a controller is not attached + /// to the action property, the selection will be driven by the + /// subsystem's pinch amount. + /// + /// + /// Must be an action with a button-like interaction where phase equals performed when pressed. + /// Typically a Control or a Value type action with a Press or Sector interaction. + /// + /// + public InputActionProperty SelectAction + { + get => selectAction; + set => SetInputActionProperty(ref selectAction, value); + } + + [SerializeField, Tooltip("The Input System action to read values for selecting an Interactable. If not defined or if a controller is not attached to this property, the selection value will be driven by the IHandsAggregatorSubsystem subsystem's pinch amount.")] + private InputActionProperty selectActionValue = new InputActionProperty(new InputAction("Select Value", expectedControlType: "Axis")); + + /// + /// The Input System action to read values for selecting an Interactable. If not defined or if a controller is not attached + /// to the action property, the selection will be driven by the + /// subsystem's pinch amount. + /// + /// + /// Must be an Control or Control. + /// Optional, Unity uses when not set. + /// + /// + /// + public InputActionProperty SelectActionValue + { + get => selectActionValue; + set => SetInputActionProperty(ref selectActionValue, value); + } + + [SerializeField, Tooltip("The tracked pose driver used to determine if the select actions should be utilized or if selection should fallback to join positions from XRSubsystemHelpers.HandsAggregator.")] + private TrackedPoseDriver trackedPoseDriver = null; + + /// + /// The used to determine if the select actions should be utilized or if selection + /// should fallback to join positions from XRSubsystemHelpers.HandsAggregator. + /// + public TrackedPoseDriver TrackedPoseDriver + { + get => trackedPoseDriver; + set => trackedPoseDriver = value; + } + + #endregion Serialized Fields + + #region Private Fields + + private FallbackState m_fallbackState; + private bool m_isTrackingStatePolyfilled = false; + private bool m_isSelectPolyfilled = false; + private bool m_isSelectValuePolyfilled = false; + + private static readonly ProfilerMarker UpdatePinchSelectionPerfMarker = + new ProfilerMarker("[MRTK] PinchInputReader.UpdatePinchSelection"); + + #endregion Private Fields + + #region Unity Event Functions + + /// + /// A Unity function event that is triggered when this behaviour is enabled. + /// + protected virtual void OnEnable() + { + selectAction.EnableDirectAction(); + selectActionValue.EnableDirectAction(); + + // reset fallback state + m_fallbackState = default; + } + + /// + /// A Unity function event that is triggered when this behaviour is disabled. + /// + protected virtual void OnDisable() + { + selectAction.DisableDirectAction(); + selectActionValue.DisableDirectAction(); + } + + /// + /// A Unity event function that is called every frame, if this object is enabled. + /// + protected virtual void Update() + { + m_isTrackingStatePolyfilled = trackedPoseDriver.GetIsPolyfillDevicePose(); + m_isSelectPolyfilled = !selectAction.action.HasAnyControls(); + m_isSelectValuePolyfilled = !selectActionValue.action.HasAnyControls(); + + // Workaround for missing select actions on devices without interaction profiles + // for hands, such as Quest. Should be removed once we have universal + // hand interaction profile(s) across vendors. + if (m_isTrackingStatePolyfilled || m_isSelectPolyfilled || m_isSelectValuePolyfilled) + { + UpdatePinchSelection(); + } + } + + #endregion Unity Event Functions + + #region IXRInputButtonReader + + /// + public bool ReadIsPerformed() + { + if (!m_isSelectPolyfilled && !m_isTrackingStatePolyfilled) + { + InputAction action = selectAction.action; + InputActionPhase phase = action.phase; + return phase == InputActionPhase.Performed || (phase != InputActionPhase.Disabled && action.WasPerformedThisFrame()); + } + else + { + return m_fallbackState.isPerformed; + } + } + + /// + public bool ReadWasPerformedThisFrame() + { + if (!m_isSelectPolyfilled && !m_isTrackingStatePolyfilled) + { + return selectAction.action.WasPerformedThisFrame(); + } + else + { + return m_fallbackState.wasPerformedThisFrame; + } + } + + /// + public bool ReadWasCompletedThisFrame() + { + if (!m_isSelectPolyfilled && !m_isTrackingStatePolyfilled) + { + return selectAction.action.WasCompletedThisFrame(); + } + else + { + return m_fallbackState.wasCompletedThisFrame; + } + } + + /// + public float ReadValue() + { + if (!m_isSelectValuePolyfilled && !m_isTrackingStatePolyfilled) + { + return selectActionValue.action.ReadValue(); + } + else + { + return m_fallbackState.value; + } + } + + /// + public bool TryReadValue(out float value) + { + if (!m_isSelectValuePolyfilled && !m_isTrackingStatePolyfilled) + { + InputAction action = selectActionValue.action; + value = action.ReadValue(); + return action.IsInProgress(); + } + else + { + value = m_fallbackState.value; + return m_fallbackState.hasPinchData; + } + } + + #endregion IXRInputButtonReader + + #region Private Functions + + /// + /// Workaround for missing select actions on devices without interaction profiles for hands, such as Varjo and Quest. + /// + /// + /// This class should be removed once we have universal hand interaction profile(s) across vendors. + /// + private void UpdatePinchSelection() + { + using (UpdatePinchSelectionPerfMarker.Auto()) + { + // If we still don't have an aggregator, then don't update selects. + if (XRSubsystemHelpers.HandsAggregator == null) + { + return; + } + + // If we got pinch data, write it into our select interaction state. + if (XRSubsystemHelpers.HandsAggregator.TryGetPinchProgress( + handNode, + out _, + out _, + out float pinchAmount)) + { + // Workaround for missing select actions on devices without interaction profiles + // for hands, such as Varjo and Quest. Should be removed once we have universal + // hand interaction profile(s) across vendors. + + // Debounce the polyfill pinch action value. + bool isPinched = pinchAmount >= (m_fallbackState.isPerformed ? 0.9f : 1.0f); + + m_fallbackState.wasPerformedThisFrame = isPinched && !m_fallbackState.isPerformed; + m_fallbackState.wasCompletedThisFrame = !isPinched && m_fallbackState.isPerformed; + m_fallbackState.isPerformed = isPinched; + m_fallbackState.value = pinchAmount; + m_fallbackState.hasPinchData = true; + } + else + { + // If we didn't get pinch data, reset the fallback state. + m_fallbackState = default; + } + } + } + + /// + /// Apply and enable the new action property if the application is running and this component is enabled. + /// + private void SetInputActionProperty(ref InputActionProperty property, InputActionProperty value) + { + if (Application.isPlaying) + { + property.DisableDirectAction(); + } + + property = value; + + if (Application.isPlaying && isActiveAndEnabled) + { + property.EnableDirectAction(); + } + } + + #endregion Private Functions + } +} diff --git a/org.mixedrealitytoolkit.input/Readers/PinchInputReader.cs.meta b/org.mixedrealitytoolkit.input/Readers/PinchInputReader.cs.meta new file mode 100644 index 000000000..79e372377 --- /dev/null +++ b/org.mixedrealitytoolkit.input/Readers/PinchInputReader.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 63844496262f1724ba77344d77fbf000 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/org.mixedrealitytoolkit.input/Simulation/Devices/ControllerSimulationSettings.cs b/org.mixedrealitytoolkit.input/Simulation/Devices/ControllerSimulationSettings.cs index 54859900d..fa85b2f00 100644 --- a/org.mixedrealitytoolkit.input/Simulation/Devices/ControllerSimulationSettings.cs +++ b/org.mixedrealitytoolkit.input/Simulation/Devices/ControllerSimulationSettings.cs @@ -52,15 +52,6 @@ public ControllerAnchorPoint AnchorPoint [Tooltip("The input action used to toggle between using the default or Secondary Handshape settings.")] private InputActionReference toggleSecondaryHandshapes; - /// - /// The input action used to toggle between using the default or Secondary Handshape settings. - /// - /// - /// This property is deprecated, use instead. - /// - [Obsolete("This property is deprecated, use ToggleSecondaryHandshapes instead.")] - public InputActionReference ChangeNeutralPose => ToggleSecondaryHandshapes; - /// /// The input action used to toggle between using the default or Secondary Handshape settings. /// diff --git a/org.mixedrealitytoolkit.input/Subsystems/Hands/HandsProvider.cs b/org.mixedrealitytoolkit.input/Subsystems/Hands/HandsProvider.cs index 019443042..c3e35c2b1 100644 --- a/org.mixedrealitytoolkit.input/Subsystems/Hands/HandsProvider.cs +++ b/org.mixedrealitytoolkit.input/Subsystems/Hands/HandsProvider.cs @@ -60,6 +60,13 @@ private void ResetHands() public override bool TryGetEntireHand(XRNode handNode, out IReadOnlyList jointPoses) { Debug.Assert(handNode == XRNode.LeftHand || handNode == XRNode.RightHand, "Non-hand XRNode used in TryGetEntireHand query."); + + if (!MRTKFocusFeature.XrSessionFocused.Value) + { + jointPoses = Array.Empty(); + return false; + } + return hands[handNode].TryGetEntireHand(out jointPoses); } @@ -67,6 +74,13 @@ public override bool TryGetEntireHand(XRNode handNode, out IReadOnlyList - /// Requests the neutral pose for the specified hand. - /// - /// The hand for which the neutral pose is being requested. - /// - /// Identifier representing the hand pose. - /// - [Obsolete("Please use the GetNeutralHandshape(handNode) instead.")] - public HandshapeId GetNeutralPose(XRNode handNode) => GetNeutralHandshape(handNode); - - /// - /// Sets the neutral pose for the specified hand. - /// - /// The hand for which the neutral pose is being set. - /// The desired hand pose. - [Obsolete("Please use the SetNeutralHandshape(handNode, handshapeId) instead.")] - public void SetNeutralPose(XRNode handNode, HandshapeId poseId) => SetNeutralHandshape(handNode, poseId); - - /// - /// Requests the selection pose for the specified hand. - /// - /// The hand for which the selection pose is being requested. - /// - /// Identifier representing the hand pose. - /// - [Obsolete("Please use the GetSelectionHandshape(handNode) instead.")] - public HandshapeId GetSelectionPose(XRNode handNode) => GetSelectionHandshape(handNode); - - /// - /// Sets the selection pose for the specified hand. - /// - /// The hand for which the selection pose is being set. - /// The desired hand pose. - [Obsolete("Please use the SetSelectionHandshape(handNode, handshapeId) instead.")] - public void SetSelectionPose(XRNode handNode, HandshapeId poseId) => SetSelectionHandshape(handNode, poseId); - /// /// Requests the neutral hand shape for the specified hand. /// @@ -459,42 +423,6 @@ private void ResetHands() hands[XRNode.RightHand].Reset(); } - /// - /// Requests the neutral pose for the specified hand. - /// - /// The hand for which the neutral pose is being requested. - /// - /// Identifier representing the hand pose. - /// - [Obsolete("Please use the GetNeutralHandshape(handNode) instead.")] - public HandshapeId GetNeutralPose(XRNode handNode) => GetNeutralHandshape(handNode); - - /// - /// Sets the neutral pose for the specified hand. - /// - /// The hand for which the neutral pose is being set. - /// The desired hand pose. - [Obsolete("Please use the SetNeutralHandshape(handNode, handshapeId) instead.")] - public void SetNeutralPose(XRNode handNode, HandshapeId poseId) => SetNeutralHandshape(handNode, poseId); - - /// - /// Requests the selection pose for the specified hand. - /// - /// The hand for which the selection pose is being requested. - /// - /// Identifier representing the hand pose. - /// - [Obsolete("Please use the GetSelectionHandshape(handNode) instead.")] - public HandshapeId GetSelectionPose(XRNode handNode) => GetSelectionHandshape(handNode); - - /// - /// Sets the selection pose for the specified hand. - /// - /// The hand for which the selection pose is being set. - /// The desired hand pose. - [Obsolete("Please use the SetSelectionHandshape(handNode, handshapeId) instead.")] - public void SetSelectionPose(XRNode handNode, HandshapeId poseId) => SetSelectionHandshape(handNode, poseId); - /// /// Requests the neutral handshape for the specified hand. /// diff --git a/org.mixedrealitytoolkit.input/Tests/Editor/AssemblyInfo.cs b/org.mixedrealitytoolkit.input/Tests/Editor/AssemblyInfo.cs index 93c74598c..f8bef51cf 100644 --- a/org.mixedrealitytoolkit.input/Tests/Editor/AssemblyInfo.cs +++ b/org.mixedrealitytoolkit.input/Tests/Editor/AssemblyInfo.cs @@ -9,4 +9,4 @@ // The AssemblyVersion attribute is checked-in and is recommended not to be changed often. // https://docs.microsoft.com/troubleshoot/visualstudio/general/assembly-version-assembly-file-version // AssemblyFileVersion and AssemblyInformationalVersion are added by pack-upm.ps1 to match the current MRTK build version. -[assembly: AssemblyVersion("3.0.0.0")] +[assembly: AssemblyVersion("4.0.0.0")] diff --git a/org.mixedrealitytoolkit.input/Tests/Runtime/AssemblyInfo.cs b/org.mixedrealitytoolkit.input/Tests/Runtime/AssemblyInfo.cs index 258d85863..02f217925 100644 --- a/org.mixedrealitytoolkit.input/Tests/Runtime/AssemblyInfo.cs +++ b/org.mixedrealitytoolkit.input/Tests/Runtime/AssemblyInfo.cs @@ -9,4 +9,4 @@ // The AssemblyVersion attribute is checked-in and is recommended not to be changed often. // https://docs.microsoft.com/troubleshoot/visualstudio/general/assembly-version-assembly-file-version // AssemblyFileVersion and AssemblyInformationalVersion are added by pack-upm.ps1 to match the current MRTK build version. -[assembly: AssemblyVersion("3.0.0.0")] +[assembly: AssemblyVersion("4.0.0.0")] diff --git a/org.mixedrealitytoolkit.input/Tests/Runtime/BasicInputTests.cs b/org.mixedrealitytoolkit.input/Tests/Runtime/BasicInputTests.cs index 8d23a6b03..038c7cebf 100644 --- a/org.mixedrealitytoolkit.input/Tests/Runtime/BasicInputTests.cs +++ b/org.mixedrealitytoolkit.input/Tests/Runtime/BasicInputTests.cs @@ -8,12 +8,17 @@ using MixedReality.Toolkit.Input.Simulation; using MixedReality.Toolkit.Subsystems; using NUnit.Framework; +using System; using System.Collections; +using System.Linq; +using System.Reflection; using UnityEngine; using UnityEngine.InputSystem; using UnityEngine.TestTools; using UnityEngine.XR; using UnityEngine.XR.Interaction.Toolkit; +using UnityEngine.XR.Interaction.Toolkit.Interactables; +using UnityEngine.XR.Interaction.Toolkit.Interactors; using HandshapeId = MixedReality.Toolkit.Input.HandshapeTypes.HandshapeId; namespace MixedReality.Toolkit.Input.Tests @@ -23,6 +28,12 @@ namespace MixedReality.Toolkit.Input.Tests /// public class BasicInputTests : BaseRuntimeInputTests { + /// + /// Override of the rig version to use for these tests. These tests validate that the old rig remain functional. + /// The will validate the new rig. + /// + protected override InputTestUtilities.RigVersion RigVersion => InputTestUtilities.RigVersion.Version1; + /// /// Ensure the simulated input devices are registered and present. /// @@ -40,6 +51,7 @@ public IEnumerator InputDeviceSmokeTest() /// /// Ensure the simulated input devices bind to the controllers on the rig. /// +#pragma warning disable CS0618 // Adding this pragma because all the encompassed tests depend on deprecated ActionBasedController [UnityTest] public IEnumerator InputBindingSmokeTest() { @@ -90,6 +102,7 @@ public IEnumerator HandMovingSmokeTest() yield return null; } +#pragma warning restore CS0618 // Adding this pragma because all the encompassed tests depend on deprecated ActionBasedController /// /// Test that anchoring the test hands on the grab point actually results in the grab interactor @@ -410,6 +423,7 @@ public IEnumerator ToggleHydrationTest() /// break XRDirectInteractor. Repro test for ADO#1582/1581. /// [UnityTest] +#pragma warning disable CS0618 // Adding this pragma because all the encompassed tests depend on deprecated XRBaseController public IEnumerator InteractableDisabledDuringInteraction() { var cube = GameObject.CreatePrimitive(PrimitiveType.Cube); @@ -596,11 +610,46 @@ public IEnumerator UntrackedControllerNearInteractions() yield return null; } +#pragma warning restore CS0618 // Adding this pragma because all the encompassed tests depend on deprecated XRBaseController + + /// + /// Test the HandModel script has the required fields. + /// + [UnityTest] + public IEnumerator HandModelHasRequiredFieldsAndAccessors() + { + FieldInfo[] fieldInfos; + PropertyInfo[] accessorsInfos; + Type HandModel = typeof(HandModel); + + fieldInfos = HandModel.GetFields(BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.Public); + accessorsInfos = HandModel.GetProperties(BindingFlags.Instance | BindingFlags.Public); + + var modelPrefabFieldInfo = fieldInfos.Where(fieldInfo => fieldInfo.Name.Equals("modelPrefab")).ToArray(); + Assert.AreEqual(1, modelPrefabFieldInfo.Length, "HandModel is missing the 'modelPrefab' field"); + + var modelParentFieldInfo = fieldInfos.Where(fieldInfo => fieldInfo.Name.Equals("modelParent")).ToArray(); + Assert.AreEqual(1, modelParentFieldInfo.Length, "HandModel is missing the 'modelParent' field"); + + var modelFieldInfo = fieldInfos.Where(fieldInfo => fieldInfo.Name.Equals("model")).ToArray(); + Assert.AreEqual(1, modelFieldInfo.Length, "HandModel is missing the 'model' field"); + + var modelPrefabAccessorInfo = accessorsInfos.Where(accessorInfo => accessorInfo.Name.Equals("ModelPrefab")).ToArray(); + Assert.AreEqual(1, modelPrefabAccessorInfo.Length, "HandModel is missing the 'ModelPrefab' accessor"); + + var modelParentAccessorInfo = accessorsInfos.Where(accessorInfo => accessorInfo.Name.Equals("ModelParent")).ToArray(); + Assert.AreEqual(1, modelParentAccessorInfo.Length, "HandModel is missing the 'ModelParent' accessor"); + + var modelAccessorInfo = accessorsInfos.Where(accessorInfo => accessorInfo.Name.Equals("Model")).ToArray(); + Assert.AreEqual(1, modelAccessorInfo.Length, "HandModel is missing the 'Model' accessor"); + + yield return null; + } - // Returns true iff any of the ProximityDetectors in the scene are currently triggered. - private bool AnyProximityDetectorsTriggered() + // Returns true if and only if any of the ProximityDetectors in the scene are currently triggered. + public static bool AnyProximityDetectorsTriggered() { - ProximityDetector[] detectors = FindObjectUtility.FindObjectsByType(); + ProximityDetector[] detectors = UnityEngine.Object.FindObjectsByType(FindObjectsSortMode.InstanceID); foreach (var detector in detectors) { if (detector.IsModeDetected()) diff --git a/org.mixedrealitytoolkit.input/Tests/Runtime/BasicInputTestsForControllerlessRig.cs b/org.mixedrealitytoolkit.input/Tests/Runtime/BasicInputTestsForControllerlessRig.cs new file mode 100644 index 000000000..2ceafb466 --- /dev/null +++ b/org.mixedrealitytoolkit.input/Tests/Runtime/BasicInputTestsForControllerlessRig.cs @@ -0,0 +1,977 @@ +// Copyright (c) Mixed Reality Toolkit Contributors +// Licensed under the BSD 3-Clause + +// Disable "missing XML comment" warning for tests. While nice to have, this documentation is not required. +#pragma warning disable CS1591 + +using MixedReality.Toolkit.Core.Tests; +using NUnit.Framework; +using System.Collections; +using UnityEngine; +using UnityEngine.InputSystem; +using UnityEngine.InputSystem.XR; +using UnityEngine.TestTools; +using UnityEngine.XR.Interaction.Toolkit; +using MixedReality.Toolkit.Input.Simulation; +using UnityEngine.XR.Interaction.Toolkit.Interactables; + +using HandshapeId = MixedReality.Toolkit.Input.HandshapeTypes.HandshapeId; +using System; +using System.Linq; +using System.Reflection; +using System.Collections.Generic; +using UnityEngine.XR; +using Unity.XR.CoreUtils; +using UnityEngine.XR.Interaction.Toolkit.Interactors; +using MixedReality.Toolkit.Subsystems; + +namespace MixedReality.Toolkit.Input.Tests +{ + /// + /// Basic tests for verifying user input and basic interactions for the XRI3+ controllerless MRTK rig. + /// + /// + /// This tests are equivalent to those in but they test with the new MRTK Rig that was + /// created for the XRI3 migration. Eventually, this will replace the original when + /// the deprecated pre-XRI3 rig is removed in its entirety from MRTK3. + /// Note: This class contains only the tests that are specific to the XRI3+ rig. Tests that are common to both rigs are in the + /// original . Once the XRI3 migration is completed by removing all the pre-XRI3 + /// prefabs then those tests can be moved to this class. + /// + public class BasicInputTestsForControllerlessRig : BaseRuntimeInputTests + { + public const string MRTKSpeechName = "MRTK Speech"; + private const string MRTKInteractionManagerName = "MRTK Interaction Manager"; + private const string CameraOffsetName = "Camera Offset"; + private const string CanvasProxyInteractorName = "CanvasProxyInteractor"; + private const string MainCameraName = "Main Camera"; + private const string MRTKRightHandControllerName = "MRTK RightHand Controller"; + private const string MRTKLeftHandConrollerName = "MRTK LeftHand Controller"; + private const string MRTKGazeControllerName = "MRTK Gaze Controller"; + private const string GazeInteractorName = "GazeInteractor"; + private const string MRTKLeftHandDevicePositionName = "MRTK LeftHand/DevicePosition"; + private const string MRTKLeftHandDeviceRotationName = "MRTK LeftHand/DeviceRotation"; + private const string MRTKLeftHandTrackingStateName = "MRTK LeftHand/Tracking State"; + private const string MRTKRightHandDevicePositionName = "MRTK RightHand/DevicePosition"; + private const string MRTKRightHandDeviceRotationName = "MRTK RightHand/DeviceRotation"; + private const string MRTKRightHandTrackingStateName = "MRTK RightHand/Tracking State"; + private const string MRTKGazePositionName = "MRTK Gaze/Position"; + private const string MRTKGazeRotationName = "MRTK Gaze/Rotation"; + private const string MRTKGazeTrackingStateName = "MRTK Gaze/Tracking State"; + private const string MRTKGazeHeadGazePositionName = "MRTK Gaze/Head Gaze Position"; + private const string MRTKGazeHeadGazeRotationName = "MRTK Gaze/Head Gaze Rotation"; + private const string MRTKGazeHeadGazeTrackingStateName = "MRTK Gaze/Head Gaze Tracking State"; + private const string OpenXRLeftHandCloneName = "openxr_left_hand(Clone)"; + private const string OpenXRLeftHandName = "openxr_left_hand"; + private const string OpenXRRightHandCloneName = "openxr_right_hand(Clone)"; + private const string OpenXRRightHandName = "openxr_right_hand"; + private const string IndexTipPokeInteractorName = "IndexTip PokeInteractor"; + private const string FarRayName = "Far Ray"; + private const string GrabInteractorName = "GrabInteractor"; + private const string GazePinchInteractorName = "GazePinchInteractor"; + private const string MRTKLeftHandSelectValueName = "MRTK LeftHand/Select Value"; + private const string MRTKLeftHandSelectName = "MRTK LeftHand/Select"; + private const string MRTKLeftHandActivateName = "MRTK LeftHand/Activate"; + private const string MRTKLeftHandUIPressName = "MRTK LeftHand/UI Press"; + private const string MRTKRightHandSelectValueName = "MRTK RightHand/Select Value"; + private const string MRTKRightHandSelectName = "MRTK RightHand/Select"; + private const string MRTKRightHandActivateName = "MRTK RightHand/Activate"; + private const string MRTKRightHandUIPressName = "MRTK RightHand/UI Press"; + private HashSet deprecatedXRControllerInputActions = new() { "Is Tracked", "Activate Action Value", "UI Press Action Value", + "UI Scroll", "Haptic Device", "Directional Anchor Rotation", + "Scale Toggle", "Scale Delta", "Select", "Select Action Value", + "Activate", "Activate Action Value", "UI Press", "Rotate Anchor", + "Directional Anchor Rotation", "Translate Anchor", "Scale Toggle" }; + + /// + /// Ensure the simulated input devices bind to the hands and gaze on the rig. + /// + /// + /// This test is the XRI3+ equivalent of + /// + [UnityTest] + public IEnumerator InputBindingSmoketest() + { + var TrackedPoseDrivers = new[] { + CachedTrackedPoseDriverLookup.LeftHandTrackedPoseDriver, + CachedTrackedPoseDriverLookup.RightHandTrackedPoseDriver, + CachedTrackedPoseDriverLookup.GazeTrackedPoseDriver + }; + + foreach (var trackedPoseDriver in TrackedPoseDrivers) + { + Assert.That(trackedPoseDriver, Is.Not.Null); + Assert.That(trackedPoseDriver, Is.AssignableTo(typeof(TrackedPoseDriver))); + + TrackedPoseDriver actionBasedController = trackedPoseDriver; + Assert.That(actionBasedController.positionAction.controls, Has.Count.GreaterThanOrEqualTo(1)); + } + + yield return null; + } + + /// + /// Ensure the simulated input device actually makes the rig's hands move/actuate. + /// + /// + /// This test is the XRI3+ equivalent of + /// + [UnityTest] + public IEnumerator HandMovingSmoketest() + { + var trackedPoseDriver = CachedTrackedPoseDriverLookup.RightHandTrackedPoseDriver; + + var testHand = new TestHand(Handedness.Right); + InputTestUtilities.SetHandAnchorPoint(Handedness.Right, ControllerAnchorPoint.Device); + + yield return testHand.Show(Vector3.forward); + yield return RuntimeTestUtilities.WaitForUpdates(); + + Assert.That(trackedPoseDriver.transform.position.x, Is.EqualTo(0.0f).Within(0.05f)); + + yield return testHand.Move(Vector3.right * 0.5f, 60); + yield return RuntimeTestUtilities.WaitForUpdates(); + Debug.Log("Input system update mode: " + InputSystem.settings.updateMode); + + Assert.That(trackedPoseDriver.positionAction.controls, Has.Count.GreaterThanOrEqualTo(1)); + Assert.That(trackedPoseDriver.positionAction.activeControl, Is.Not.Null); + Assert.That(trackedPoseDriver.positionAction.ReadValue().x, Is.EqualTo(0.5f).Within(0.01f)); + + Assert.That(trackedPoseDriver.transform.position.x, Is.EqualTo(0.5f).Within(0.05f)); + + yield return null; + } + + /// + /// Tests whether disabling an interactable mid-interaction will + /// break XRDirectInteractor. Repro test for ADO#1582/1581. + /// + /// + /// This test is the XRI3+ equivalent of + /// + [UnityTest] + public IEnumerator InteractableDisabledDuringInteraction() + { + var cube = GameObject.CreatePrimitive(PrimitiveType.Cube); + cube.transform.position = InputTestUtilities.InFrontOfUser(new Vector3(1.0f, 0.1f, 1.0f)); + cube.transform.localScale = Vector3.one * 0.1f; + cube.AddComponent(); + + // Otherwise, poke will conflict with grab. + cube.GetComponent().selectMode = InteractableSelectMode.Multiple; + + var rightHand = new TestHand(Handedness.Right); + + yield return rightHand.Show(InputTestUtilities.InFrontOfUser()); + + yield return RuntimeTestUtilities.WaitForUpdates(); + yield return rightHand.MoveTo(cube.transform.position); + yield return RuntimeTestUtilities.WaitForUpdates(); + yield return rightHand.SetHandshape(HandshapeId.Pinch); + yield return RuntimeTestUtilities.WaitForUpdates(); + + Assert.IsTrue(cube.GetComponent().IsGrabSelected, + "StatefulInteractable did not get GrabSelected."); + + cube.SetActive(false); + + yield return rightHand.SetHandshape(HandshapeId.Open); + yield return RuntimeTestUtilities.WaitForUpdates(); + + Assert.IsFalse(cube.GetComponent().IsGrabSelected, + "StatefulInteractable did not get un-GrabSelected."); + + yield return rightHand.MoveTo(Vector3.zero); + yield return RuntimeTestUtilities.WaitForUpdates(); + + cube.SetActive(true); + yield return RuntimeTestUtilities.WaitForUpdates(); + + Assert.IsFalse(BasicInputTests.AnyProximityDetectorsTriggered(), + "ProximityInteractor was still hovering after re-enabling faraway object."); + + TrackedPoseDriver rightHandTrackedPoseDriver = CachedTrackedPoseDriverLookup.RightHandTrackedPoseDriver; + Assert.IsTrue(rightHandTrackedPoseDriver != null, "No TrackedPoseDriver found for right hand."); + + Assert.IsTrue(rightHandTrackedPoseDriver.GetComponentInChildren().enabled, "Ray didn't reactivate"); + Assert.IsTrue(rightHandTrackedPoseDriver.GetComponentInChildren().enabled, "GazePinch didn't reactivate"); + Assert.IsFalse(rightHandTrackedPoseDriver.GetComponentInChildren().enabled, "Poke didn't deactivate"); + Assert.IsFalse(rightHandTrackedPoseDriver.GetComponentInChildren().enabled, "Grab didn't deactivate"); + + yield return null; + } + + /// + /// Tests whether spawning an interactable on top of a hand will cause problems with the proximity detector. + /// + /// + /// This test is the XRI3+ equivalent of + /// + [UnityTest] + public IEnumerator SpawnInteractableOnHand() + { + // Spawn our hand. + var rightHand = new TestHand(Handedness.Right); + yield return rightHand.Show(InputTestUtilities.InFrontOfUser()); + yield return RuntimeTestUtilities.WaitForUpdates(); + + // Prox detector should start out un-triggered. + Assert.IsFalse(BasicInputTests.AnyProximityDetectorsTriggered(), "Prox detector started out triggered, when it shouldn't be (no cube yet!)"); + + // Rays should start enabled + TrackedPoseDriver rightHandTrackedPoseDriver = CachedTrackedPoseDriverLookup.RightHandTrackedPoseDriver; + Assert.IsTrue(rightHandTrackedPoseDriver != null, "No TrackedPoseDriver found for right hand."); + + Assert.IsTrue(rightHandTrackedPoseDriver.GetComponentInChildren().enabled, "Ray didn't start active"); + Assert.IsTrue(rightHandTrackedPoseDriver.GetComponentInChildren().enabled, "GazePinch didn't start active"); + Assert.IsFalse(rightHandTrackedPoseDriver.GetComponentInChildren().enabled, "Poke started active, when it shouldn't"); + Assert.IsFalse(rightHandTrackedPoseDriver.GetComponentInChildren().enabled, "Grab started active, when it shouldn't"); + + var cube = GameObject.CreatePrimitive(PrimitiveType.Cube); + cube.transform.position = InputTestUtilities.InFrontOfUser(); + cube.transform.localScale = Vector3.one * 0.1f; + cube.AddComponent(); + yield return RuntimeTestUtilities.WaitForUpdates(); + + Assert.IsTrue(BasicInputTests.AnyProximityDetectorsTriggered(), "Prox detector should see it!"); + + Assert.IsFalse(rightHandTrackedPoseDriver.GetComponentInChildren().enabled, "Ray didn't disable on proximity"); + Assert.IsFalse(rightHandTrackedPoseDriver.GetComponentInChildren().enabled, "GazePinch disable on proximity"); + Assert.IsTrue(rightHandTrackedPoseDriver.GetComponentInChildren().enabled, "Poke didn't activate on proximity"); + Assert.IsTrue(rightHandTrackedPoseDriver.GetComponentInChildren().enabled, "Grab didn't activate on proximity"); + + // Move hand far away. + yield return rightHand.MoveTo(new Vector3(2, 2, 2)); + yield return RuntimeTestUtilities.WaitForUpdates(frameCount:240); + + Assert.IsFalse(BasicInputTests.AnyProximityDetectorsTriggered(), "Prox detectors should no longer be triggered."); + + Assert.IsTrue(rightHandTrackedPoseDriver.GetComponentInChildren().enabled, "Ray didn't reactivate"); + Assert.IsTrue(rightHandTrackedPoseDriver.GetComponentInChildren().enabled, "GazePinch didn't reactivate"); + Assert.IsFalse(rightHandTrackedPoseDriver.GetComponentInChildren().enabled, "Poke didn't deactivate"); + Assert.IsFalse(rightHandTrackedPoseDriver.GetComponentInChildren().enabled, "Grab didn't deactivate"); + + yield return null; + } + + /// + /// Tests that tracked hands initiate new interactions correctly and interactable IsGrabSelected property updates correctly. + /// + /// + /// This test was originally meant to be the XRI3+ equivalent of , + /// however, the class inherits from XRSimulatedController for which there is no XRI3 equivalent and despite + /// simulating tracking disabling the interactions are still initiated because the interactors use the new + /// component. Therefore, since there is no way to simulate tracking loss in XRI3 (at least at the moment + /// of this writing) then this test was repurposed to test interactions with normally tracked hands. + /// Note: Next is a list of this of things tried to simulate loss of tracking with XRI3+ controllerless hands: disabling the + /// component, destroying the component, setting + /// , setting to a new + /// (it is not nullable). Unfortunately none worked for simulating tracking loss. Therefore this + /// replacement test was repurposed to test tracked hands and ensure it initiates new interactions properly and that the interactable + /// IsGrabSelected property is updated properly. + /// + [UnityTest] + public IEnumerator TrackedHandNearInteractions() + { + var cube = GameObject.CreatePrimitive(PrimitiveType.Cube); + cube.transform.position = InputTestUtilities.InFrontOfUser(new Vector3(1.0f, 0.1f, 1.0f)); + cube.transform.localScale = Vector3.one * 0.1f; + cube.AddComponent(); + + // Otherwise, poke will conflict with grab. + cube.GetComponent().selectMode = InteractableSelectMode.Multiple; + + var rightHand = new TestHand(Handedness.Right); + yield return RuntimeTestUtilities.WaitForUpdates(); + yield return rightHand.Show(InputTestUtilities.InFrontOfUser()); + yield return RuntimeTestUtilities.WaitForUpdates(); + // First ensure that the interactor can interact with a cube normally + yield return rightHand.MoveTo(cube.transform.position); + yield return RuntimeTestUtilities.WaitForUpdates(); + yield return rightHand.SetHandshape(HandshapeId.Pinch); + yield return RuntimeTestUtilities.WaitForUpdates(); + + Assert.IsTrue(cube.GetComponent().IsGrabSelected, + "StatefulInteractable is no longer GrabSelected."); + + // Make sure state is maintained even if the hand gameobject moves + yield return rightHand.Move(Vector3.left); + yield return RuntimeTestUtilities.WaitForUpdates(); + Assert.IsTrue(cube.GetComponent().IsGrabSelected, + "StatefulInteractable is no longer GrabSelected."); + + yield return rightHand.SetHandshape(HandshapeId.Open); + yield return RuntimeTestUtilities.WaitForUpdates(); + + Assert.IsFalse(cube.GetComponent().IsGrabSelected, + "StatefulInteractable did not get un-GrabSelected."); + + // Check that the hand cannot interact with any new interactables + var newCube = GameObject.CreatePrimitive(PrimitiveType.Cube); + newCube.transform.position = InputTestUtilities.InFrontOfUser(new Vector3(-3.0f, 0.1f, 1.0f)); + newCube.transform.localScale = Vector3.one * 0.1f; + newCube.AddComponent(); + + // Otherwise, poke will conflict with grab. + newCube.GetComponent().selectMode = InteractableSelectMode.Multiple; + + yield return rightHand.MoveTo(newCube.transform.position); + yield return RuntimeTestUtilities.WaitForUpdates(); + yield return rightHand.SetHandshape(HandshapeId.Pinch); + yield return RuntimeTestUtilities.WaitForUpdates(); + + Assert.IsTrue(newCube.GetComponent().IsGrabSelected, + "The interactor grabbed the new cube"); + + yield return rightHand.SetHandshape(HandshapeId.Open); + yield return RuntimeTestUtilities.WaitForUpdates(); + + // Finish + yield return RuntimeTestUtilities.WaitForUpdates(); + yield return rightHand.MoveTo(Vector3.zero); + yield return RuntimeTestUtilities.WaitForUpdates(); + + yield return rightHand.Show(); + yield return RuntimeTestUtilities.WaitForUpdates(); + + Assert.IsFalse(BasicInputTests.AnyProximityDetectorsTriggered(), + "ProximityInteractor was still hovering after re-enabling faraway object."); + + TrackedPoseDriver rightHandTrackedPoseDriver = CachedTrackedPoseDriverLookup.RightHandTrackedPoseDriver; + Assert.IsTrue(rightHandTrackedPoseDriver != null, "No TrackedPoseDriver found for right hand."); + + Assert.IsTrue(rightHandTrackedPoseDriver.GetComponentInChildren().enabled, "Ray didn't reactivate"); + Assert.IsTrue(rightHandTrackedPoseDriver.GetComponentInChildren().enabled, "GazePinch didn't reactivate"); + Assert.IsFalse(rightHandTrackedPoseDriver.GetComponentInChildren().enabled, "Poke didn't deactivate"); + Assert.IsFalse(rightHandTrackedPoseDriver.GetComponentInChildren().enabled, "Grab didn't deactivate"); + + yield return null; + } + + /// + /// Checks that the Controllerless rig has the right components and that both pre-XRI3+ and XRI3+ input actions are properly referenced. + /// The goal of this test is to prevent breaks when the Controllerless rig prefabs or its associated scripts are modified and prefabs are + /// not updated properly. This test also ensures that the Controllerless rig is shipped in the intended configuration. + /// + /// + /// This is an XRI3+ exclusive test. + /// + [UnityTest] + public IEnumerator ControllerlessRigSmokeTest() + { + // Check the Controllerless rig has the correct children. + var controllerLessRig = InputTestUtilities.RigReference; + List rigChildren = new List(); + controllerLessRig.GetChildGameObjects(rigChildren); + + Assert.AreEqual(4, rigChildren.Count); + Assert.AreEqual(1, rigChildren.Where(c => c.name.Equals(MRTKInteractionManagerName)).Count()); + Assert.AreEqual(1, rigChildren.Where(c => c.name.Equals(CameraOffsetName)).Count()); + Assert.AreEqual(1, rigChildren.Where(c => c.name.Equals(MRTKSpeechName)).Count()); + Assert.AreEqual(1, rigChildren.Where(c => c.name.Equals(CanvasProxyInteractorName)).Count()); + + // Check the rig's CameraOffset has the correct children + var cameraOffset = rigChildren.Where(c => c.name.Equals(CameraOffsetName)).First(); + List cameraOffsetChildren = new List(); + cameraOffset.GetChildGameObjects(cameraOffsetChildren); + + Assert.AreEqual(5, cameraOffsetChildren.Count); + Assert.AreEqual(1, cameraOffsetChildren.Where(c => c.name.Equals(MainCameraName)).Count()); + Assert.AreEqual(1, cameraOffsetChildren.Where(c => c.name.Equals(MRTKRightHandControllerName)).Count()); + Assert.AreEqual(1, cameraOffsetChildren.Where(c => c.name.Equals(MRTKLeftHandConrollerName)).Count()); + Assert.AreEqual(1, cameraOffsetChildren.Where(c => c.name.Equals(MRTKGazeControllerName)).Count()); + + // Check the main camera has its TrackedPoseDriver component + var mainCamera = cameraOffsetChildren.Where(c => c.name.Equals(MainCameraName)); + Assert.AreEqual(1, mainCamera.First().GetComponents().Length); + + GameObject leftHandGameObject = null; + GameObject rightHandGameObject = null; + GameObject gazeGameObject = null; + GameObject gazeInteractorGameObject = null; + + // Check all controllers have an empty XRController Component + var cameraOffsetControllers = cameraOffsetChildren.Where(c => c.name.Equals(MRTKRightHandControllerName) || + c.name.Equals(MRTKLeftHandConrollerName) || + c.name.Equals(MRTKGazeControllerName)); + foreach (GameObject controller in cameraOffsetControllers) + { + // Check the controller does not have an XRController component +#pragma warning disable CS0618 // ActionBasedController is obsolete + var xrControllers = controller.GetComponents(); +#pragma warning restore CS0618 // ActionBasedController is obsolete + Assert.AreEqual(0, xrControllers.Length); + + // Hold a reference to the controllers for later easier testing + if (controller.name.Equals(MRTKLeftHandConrollerName)) + { + leftHandGameObject = controller; + } + else if (controller.name.Equals(MRTKRightHandControllerName)) + { + rightHandGameObject = controller; + } + else if (controller.name.Equals(MRTKGazeControllerName)) + { + gazeGameObject = controller; + List gazeGameObjectChildren = new List(); + gazeGameObject.GetChildGameObjects(gazeGameObjectChildren); + + // Check the gaze GameObject has one and only one FuzzyGazeInteractor + var gazeInteractors = gazeGameObjectChildren.Where(c => c.name.Equals(GazeInteractorName)).ToArray(); + Assert.AreEqual(1, gazeInteractors.Length); + gazeInteractorGameObject = gazeInteractors[0]; + } + else + { + Assert.Fail($"Controller '{controller.name}' is neither '{MRTKLeftHandConrollerName}', '{MRTKRightHandControllerName}', nor '{MRTKGazeControllerName}'"); + } + } + + // Check that LeftHand and RightHand have their TrackedPoseDriver component and they are properly set + var leftHandTrackedPoseDrivers = leftHandGameObject.GetComponents(); + Assert.AreEqual(1, leftHandTrackedPoseDrivers.Length); + TrackedPoseDriver leftHandTrackedPoseDriver = leftHandTrackedPoseDrivers[0]; + Assert.AreEqual(TrackedPoseDriver.TrackingType.RotationAndPosition, leftHandTrackedPoseDriver.trackingType); + Assert.AreEqual(TrackedPoseDriver.UpdateType.UpdateAndBeforeRender, leftHandTrackedPoseDriver.updateType); + Assert.IsTrue(leftHandTrackedPoseDriver.positionInput.reference.name.Equals(MRTKLeftHandDevicePositionName)); + Assert.IsTrue(leftHandTrackedPoseDriver.rotationInput.reference.name.Equals(MRTKLeftHandDeviceRotationName)); + Assert.IsTrue(leftHandTrackedPoseDriver.trackingStateInput.reference.name.Equals(MRTKLeftHandTrackingStateName)); + + var rightHandTrackedPoseDrivers = rightHandGameObject.GetComponents(); + Assert.AreEqual(1, rightHandTrackedPoseDrivers.Length); + TrackedPoseDriver rightHandTrackedPoseDriver = rightHandTrackedPoseDrivers[0]; + Assert.AreEqual(TrackedPoseDriver.TrackingType.RotationAndPosition, rightHandTrackedPoseDriver.trackingType); + Assert.AreEqual(TrackedPoseDriver.UpdateType.UpdateAndBeforeRender, rightHandTrackedPoseDriver.updateType); + Assert.IsTrue(rightHandTrackedPoseDriver.positionInput.reference.name.Equals(MRTKRightHandDevicePositionName)); + Assert.IsTrue(rightHandTrackedPoseDriver.rotationInput.reference.name.Equals(MRTKRightHandDeviceRotationName)); + Assert.IsTrue(rightHandTrackedPoseDriver.trackingStateInput.reference.name.Equals(MRTKRightHandTrackingStateName)); + + // Check that the GazeController has its TrackedPoseDriverWithFallback component and that it is properly set + var gazeControllerTrackedPoseDriversWithFallback = gazeGameObject.GetComponents(); + Assert.AreEqual(1, gazeControllerTrackedPoseDriversWithFallback.Length); + TrackedPoseDriverWithFallback gazeInteractorTrackedPoseDriverWithFallback = gazeControllerTrackedPoseDriversWithFallback[0]; + Assert.AreEqual(TrackedPoseDriver.TrackingType.RotationAndPosition, gazeInteractorTrackedPoseDriverWithFallback.trackingType); + Assert.AreEqual(TrackedPoseDriver.UpdateType.UpdateAndBeforeRender, gazeInteractorTrackedPoseDriverWithFallback.updateType); + Assert.IsTrue(gazeInteractorTrackedPoseDriverWithFallback.positionInput.reference.name.Equals(MRTKGazePositionName)); + Assert.IsTrue(gazeInteractorTrackedPoseDriverWithFallback.rotationInput.reference.name.Equals(MRTKGazeRotationName)); + Assert.IsTrue(gazeInteractorTrackedPoseDriverWithFallback.trackingStateInput.reference.name.Equals(MRTKGazeTrackingStateName)); + Assert.IsTrue(gazeInteractorTrackedPoseDriverWithFallback.FallbackPositionAction.reference.name.Equals(MRTKGazeHeadGazePositionName)); + Assert.IsTrue(gazeInteractorTrackedPoseDriverWithFallback.FallbackRotationAction.reference.name.Equals(MRTKGazeHeadGazeRotationName)); + Assert.IsTrue(gazeInteractorTrackedPoseDriverWithFallback.FallbackTrackingStateAction.reference.name.Equals(MRTKGazeHeadGazeTrackingStateName)); + + // Check LeftHand and RightHand have HandModel component and it is properly set + var leftHandHandModels = leftHandGameObject.GetComponents(); + Assert.AreEqual(1, leftHandHandModels.Length); + HandModel leftHandHandModel = leftHandHandModels[0]; + Assert.IsTrue(leftHandHandModel.Model.name.Equals(OpenXRLeftHandCloneName)); + Assert.AreEqual(leftHandHandModel.ModelParent.transform.parent, leftHandGameObject.transform); + Assert.IsTrue(leftHandHandModel.ModelPrefab.name.Equals(OpenXRLeftHandName)); + + var rigtHandHandModels = rightHandGameObject.GetComponents(); + Assert.AreEqual(1, rigtHandHandModels.Length); + HandModel rightHandHandModel = rigtHandHandModels[0]; + Assert.IsTrue(rightHandHandModel.Model.name.Equals(OpenXRRightHandCloneName)); + Assert.AreEqual(rightHandHandModel.ModelParent.transform.parent, rightHandHandModel.transform); + Assert.IsTrue(rightHandHandModel.ModelPrefab.name.Equals(OpenXRRightHandName)); + + // Now check the interactors + + // Check the Fuzzy Gaze Interactor has correct input configuration + Assert.AreEqual(InteractorHandedness.None, gazeInteractorGameObject.GetComponent().handedness); + Assert.IsNull(gazeInteractorGameObject.GetComponent().selectInput.inputActionReferenceValue); + Assert.IsNull(gazeInteractorGameObject.GetComponent().selectInput.inputActionReferencePerformed); + Assert.IsNull(gazeInteractorGameObject.GetComponent().activateInput.inputActionReferenceValue); + Assert.IsNull(gazeInteractorGameObject.GetComponent().activateInput.inputActionReferencePerformed); + + // Check that the leftHand has one and only one of each type of interactors + List leftHandChildren = new List(); + leftHandGameObject.GetChildGameObjects(leftHandChildren); + + var leftHandPokeInteractors = leftHandChildren.Where(c => c.name.Equals(IndexTipPokeInteractorName)).ToArray(); + var leftHandFarRays = leftHandChildren.Where(c => c.name.Equals(FarRayName)).ToArray(); + var leftHandGrabInteractors = leftHandChildren.Where(c => c.name.Equals(GrabInteractorName)).ToArray(); + var leftHandGazePinchInteractors = leftHandChildren.Where(c => c.name.Equals(GazePinchInteractorName)).ToArray(); + + Assert.AreEqual(1, leftHandPokeInteractors.Length); + Assert.AreEqual(1, leftHandFarRays.Length); + Assert.AreEqual(1, leftHandGrabInteractors.Length); + Assert.AreEqual(1, leftHandGazePinchInteractors.Length); + + // Check that the leftHand has one and only one of each type of interactors + List rightHandChildren = new List(); + rightHandGameObject.GetChildGameObjects(rightHandChildren); + + var rightHandPokeInteractors = rightHandChildren.Where(c => c.name.Equals(IndexTipPokeInteractorName)).ToArray(); + var rightHandFarRays = rightHandChildren.Where(c => c.name.Equals(FarRayName)).ToArray(); + var rightHandGrabInteractors = rightHandChildren.Where(c => c.name.Equals(GrabInteractorName)).ToArray(); + var rightHandGazePinchInteractors = rightHandChildren.Where(c => c.name.Equals(GazePinchInteractorName)).ToArray(); + + Assert.AreEqual(1, rightHandPokeInteractors.Length); + Assert.AreEqual(1, rightHandFarRays.Length); + Assert.AreEqual(1, rightHandGrabInteractors.Length); + Assert.AreEqual(1, rightHandGazePinchInteractors.Length); + + // Check leftHand*Interactors + // Check that leftHandPokeInteractor has correct input configuration + GameObject leftHandPokeInteractor = leftHandPokeInteractors[0]; + Assert.AreEqual(InteractorHandedness.Left, leftHandPokeInteractor.GetComponent().handedness); + Assert.IsTrue(leftHandPokeInteractor.GetComponent().selectInput.inputActionReferenceValue.name.Equals(MRTKLeftHandSelectValueName)); + Assert.IsTrue(leftHandPokeInteractor.GetComponent().selectInput.inputActionReferencePerformed.name.Equals(MRTKLeftHandSelectName)); + Assert.IsTrue(leftHandPokeInteractor.GetComponent().activateInput.inputActionReferenceValue.name.Equals(MRTKLeftHandActivateName)); + Assert.IsTrue(leftHandPokeInteractor.GetComponent().activateInput.inputActionReferencePerformed.name.Equals(MRTKLeftHandActivateName)); + Assert.AreSame(leftHandPokeInteractor.GetComponent().TrackedPoseDriver, leftHandTrackedPoseDriver); + + // Check that the leftHandMRTKRayInteractor has correct input configuration + GameObject leftHandFarRay = leftHandFarRays[0]; + Assert.AreEqual(InteractorHandedness.Left, leftHandFarRay.GetComponent().handedness); + Assert.IsTrue(leftHandFarRay.GetComponent().selectInput.inputActionReferenceValue.name.Equals(MRTKLeftHandSelectValueName)); + Assert.IsTrue(leftHandFarRay.GetComponent().selectInput.inputActionReferencePerformed.name.Equals(MRTKLeftHandSelectName)); + Assert.IsTrue(leftHandFarRay.GetComponent().activateInput.inputActionReferenceValue.name.Equals(MRTKLeftHandActivateName)); + Assert.IsTrue(leftHandFarRay.GetComponent().activateInput.inputActionReferencePerformed.name.Equals(MRTKLeftHandActivateName)); + Assert.AreSame(leftHandFarRay.GetComponent().TrackedPoseDriver, leftHandTrackedPoseDriver); + Assert.IsTrue(leftHandFarRay.GetComponent().uiPressInput.inputActionReferenceValue.name.Equals(MRTKLeftHandUIPressName)); + Assert.IsTrue(leftHandFarRay.GetComponent().uiPressInput.inputActionReferencePerformed.name.Equals(MRTKLeftHandUIPressName)); + Assert.IsTrue(leftHandFarRay.GetComponent().enableUIInteraction); + + // Check that leftHandGrabInteractor has correct input configuration + GameObject leftHandGrabInteractor = leftHandGrabInteractors[0]; + Assert.AreEqual(InteractorHandedness.Left, leftHandGrabInteractor.GetComponent().handedness); + Assert.IsTrue(leftHandGrabInteractor.GetComponent().selectInput.inputActionReferenceValue.name.Equals(MRTKLeftHandSelectValueName)); + Assert.IsTrue(leftHandGrabInteractor.GetComponent().selectInput.inputActionReferencePerformed.name.Equals(MRTKLeftHandSelectName)); + Assert.IsTrue(leftHandGrabInteractor.GetComponent().activateInput.inputActionReferenceValue.name.Equals(MRTKLeftHandActivateName)); + Assert.IsTrue(leftHandGrabInteractor.GetComponent().activateInput.inputActionReferencePerformed.name.Equals(MRTKLeftHandActivateName)); + + // Check that the leftHandMRTKRayInteractor has correct input configuration + GameObject leftHandGazePinchInteractor = leftHandGazePinchInteractors[0]; + Assert.AreEqual(InteractorHandedness.Left, leftHandGazePinchInteractor.GetComponent().handedness); + Assert.IsTrue(leftHandGazePinchInteractor.GetComponent().selectInput.inputActionReferenceValue.name.Equals(MRTKLeftHandSelectValueName)); + Assert.IsTrue(leftHandGazePinchInteractor.GetComponent().selectInput.inputActionReferencePerformed.name.Equals(MRTKLeftHandSelectName)); + Assert.IsTrue(leftHandGazePinchInteractor.GetComponent().activateInput.inputActionReferenceValue.name.Equals(MRTKLeftHandActivateName)); + Assert.IsTrue(leftHandGazePinchInteractor.GetComponent().activateInput.inputActionReferencePerformed.name.Equals(MRTKLeftHandActivateName)); + Assert.AreSame(leftHandGazePinchInteractor.GetComponent().TrackedPoseDriver, leftHandTrackedPoseDriver); + Assert.AreSame(leftHandGazePinchInteractor.GetComponent().DependentInteractor, gazeInteractorGameObject.GetComponent()); + + // Check rightHand*Interactors + // Check that leftHandPokeInteractor has correct input configuration + GameObject leftandGazePincInteractor = rightHandPokeInteractors[0]; + Assert.AreEqual(InteractorHandedness.Right, leftandGazePincInteractor.GetComponent().handedness); + Assert.IsTrue(leftandGazePincInteractor.GetComponent().selectInput.inputActionReferenceValue.name.Equals(MRTKRightHandSelectValueName)); + Assert.IsTrue(leftandGazePincInteractor.GetComponent().selectInput.inputActionReferencePerformed.name.Equals(MRTKRightHandSelectName)); + Assert.IsTrue(leftandGazePincInteractor.GetComponent().activateInput.inputActionReferenceValue.name.Equals(MRTKRightHandActivateName)); + Assert.IsTrue(leftandGazePincInteractor.GetComponent().activateInput.inputActionReferencePerformed.name.Equals(MRTKRightHandActivateName)); + Assert.AreSame(leftandGazePincInteractor.GetComponent().TrackedPoseDriver, rightHandTrackedPoseDriver); + + // Check that the leftHandMRTKRayInteractor has correct input configuration + GameObject rigtHandFarRay = rightHandFarRays[0]; + Assert.AreEqual(InteractorHandedness.Right, rigtHandFarRay.GetComponent().handedness); + Assert.IsTrue(rigtHandFarRay.GetComponent().selectInput.inputActionReferenceValue.name.Equals(MRTKRightHandSelectValueName)); + Assert.IsTrue(rigtHandFarRay.GetComponent().selectInput.inputActionReferencePerformed.name.Equals(MRTKRightHandSelectName)); + Assert.IsTrue(rigtHandFarRay.GetComponent().activateInput.inputActionReferenceValue.name.Equals(MRTKRightHandActivateName)); + Assert.IsTrue(rigtHandFarRay.GetComponent().activateInput.inputActionReferencePerformed.name.Equals(MRTKRightHandActivateName)); + Assert.AreSame(rigtHandFarRay.GetComponent().TrackedPoseDriver, rightHandTrackedPoseDriver); + Assert.IsTrue(rigtHandFarRay.GetComponent().uiPressInput.inputActionReferenceValue.name.Equals(MRTKRightHandUIPressName)); + Assert.IsTrue(rigtHandFarRay.GetComponent().uiPressInput.inputActionReferencePerformed.name.Equals(MRTKRightHandUIPressName)); + Assert.IsTrue(rigtHandFarRay.GetComponent().enableUIInteraction); + + // Check that rightHandGrabInteractor has correct input configuration + GameObject rightHandGrabInteractor = rightHandGrabInteractors[0]; + Assert.AreEqual(InteractorHandedness.Right, rightHandGrabInteractor.GetComponent().handedness); + Assert.IsTrue(rightHandGrabInteractor.GetComponent().selectInput.inputActionReferenceValue.name.Equals(MRTKRightHandSelectValueName)); + Assert.IsTrue(rightHandGrabInteractor.GetComponent().selectInput.inputActionReferencePerformed.name.Equals(MRTKRightHandSelectName)); + Assert.IsTrue(rightHandGrabInteractor.GetComponent().activateInput.inputActionReferenceValue.name.Equals(MRTKRightHandActivateName)); + Assert.IsTrue(rightHandGrabInteractor.GetComponent().activateInput.inputActionReferencePerformed.name.Equals(MRTKRightHandActivateName)); + + // Check that the rightHandMRTKRayInteractor has correct input configuration + GameObject rightHandGazePinchInteractor = rightHandGazePinchInteractors[0]; + Assert.AreEqual(InteractorHandedness.Right, rightHandGazePinchInteractor.GetComponent().handedness); + Assert.IsTrue(rightHandGazePinchInteractor.GetComponent().selectInput.inputActionReferenceValue.name.Equals(MRTKRightHandSelectValueName)); + Assert.IsTrue(rightHandGazePinchInteractor.GetComponent().selectInput.inputActionReferencePerformed.name.Equals(MRTKRightHandSelectName)); + Assert.IsTrue(rightHandGazePinchInteractor.GetComponent().activateInput.inputActionReferenceValue.name.Equals(MRTKRightHandActivateName)); + Assert.IsTrue(rightHandGazePinchInteractor.GetComponent().activateInput.inputActionReferencePerformed.name.Equals(MRTKRightHandActivateName)); + Assert.AreSame(rightHandGazePinchInteractor.GetComponent().TrackedPoseDriver, rightHandTrackedPoseDriver); + Assert.AreSame(rightHandGazePinchInteractor.GetComponent().DependentInteractor, gazeInteractorGameObject.GetComponent()); + + yield return null; + } + + /// + /// Ensure the simulated input devices are registered and present. + /// + /// + /// This test is the same as , it is repeated here so that the same functionality is tested against + /// the new controllerless prefabs. + /// + [UnityTest] + public IEnumerator InputDeviceSmoketest() + { + foreach (var device in InputSystem.devices) + { + Debug.Log(device); + } + Assert.That(InputSystem.devices, Has.Exactly(2).TypeOf()); + yield return null; + } + + /// + /// Test that anchoring the test hands on the grab point actually results in the grab interactor + /// being located where we want it to be. + /// + /// + /// This test is the same as , it is repeated here so that the same functionality is tested against + /// the new controllerless prefabs. + /// + [UnityTest] + public IEnumerator GrabAnchorTest() + { + GameObject cube = GameObject.CreatePrimitive(PrimitiveType.Cube); + var interactable = cube.AddComponent(); + + Vector3 cubePos = InputTestUtilities.InFrontOfUser(); + cube.transform.position = cubePos; + cube.transform.localScale = Vector3.one * 1.0f; + + var testHand = new TestHand(Handedness.Right); + InputTestUtilities.SetHandAnchorPoint(Handedness.Right, ControllerAnchorPoint.Grab); + + yield return testHand.Show(Vector3.zero); + yield return RuntimeTestUtilities.WaitForUpdates(); + yield return testHand.MoveTo(cubePos); + yield return RuntimeTestUtilities.WaitForUpdates(); + + var hands = XRSubsystemHelpers.GetFirstRunningSubsystem(); + + bool gotJoint = hands.TryGetPinchingPoint(XRNode.RightHand, out HandJointPose jointPose); + + Assert.IsTrue(interactable.IsGrabHovered, "Interactable wasn't grab hovered!"); + + Assert.IsTrue((interactable.HoveringGrabInteractors[0] as GrabInteractor).enabled, "Interactor wasn't enabled"); + + TestUtilities.AssertAboutEqual(interactable.HoveringGrabInteractors[0].GetAttachTransform(interactable).position, + cubePos, "Grab interactor's attachTransform wasn't where we wanted it to go!", 0.001f); + } + + /// + /// Very basic test of StatefulInteractable's poke hovering, grab selecting, + /// and toggling mechanics. Does not test rays or gaze interactions. + /// + /// + /// This test is the same as , it is repeated here so that the same functionality is tested against + /// the new controllerless prefabs. + /// + [UnityTest] + public IEnumerator StatefulInteractableSmoketest() + { + GameObject cube = GameObject.CreatePrimitive(PrimitiveType.Cube); + cube.AddComponent(); + cube.transform.position = InputTestUtilities.InFrontOfUser(new Vector3(0.2f, 0.2f, 0.5f)); + cube.transform.localScale = Vector3.one * 0.1f; + + // For this test, we won't use poke selection. + cube.GetComponent().DisableInteractorType(typeof(PokeInteractor)); + + GameObject cube2 = GameObject.CreatePrimitive(PrimitiveType.Cube); + cube2.AddComponent(); + cube2.transform.position = InputTestUtilities.InFrontOfUser(new Vector3(-0.2f, -0.2f, 0.5f)); + cube2.transform.localScale = Vector3.one * 0.1f; + + // For this test, we won't use poke selection. + cube2.GetComponent().DisableInteractorType(typeof(PokeInteractor)); + + var rightHand = new TestHand(Handedness.Right); + + yield return rightHand.Show(InputTestUtilities.InFrontOfUser(0.5f)); + + yield return RuntimeTestUtilities.WaitForUpdates(); + + bool shouldTestToggle = false; + + StatefulInteractable firstCubeInteractable = cube.GetComponent(); + StatefulInteractable secondCubeInteractable = cube2.GetComponent(); + + for (int i = 0; i < 5; i++) + { + // Flip this back and forth to test both toggleability and un-toggleability + shouldTestToggle = !shouldTestToggle; + + yield return rightHand.RotateTo(Quaternion.Euler(0, 45, 0)); + yield return RuntimeTestUtilities.WaitForUpdates(); + + // Test the first cube. + firstCubeInteractable.ForceSetToggled(false); + firstCubeInteractable.ToggleMode = shouldTestToggle ? StatefulInteractable.ToggleType.Toggle : StatefulInteractable.ToggleType.Button; + firstCubeInteractable.TriggerOnRelease = (i % 2) == 0; + + Assert.IsFalse(firstCubeInteractable.IsGrabHovered, + "StatefulInteractable was already hovered."); + + yield return rightHand.MoveTo(cube.transform.position); + yield return RuntimeTestUtilities.WaitForUpdates(); + Assert.IsTrue(firstCubeInteractable.IsGrabHovered, + "StatefulInteractable did not get hovered."); + + yield return rightHand.SetHandshape(HandshapeId.Pinch); + yield return RuntimeTestUtilities.WaitForUpdates(); + Assert.IsTrue(firstCubeInteractable.IsGrabSelected, + "StatefulInteractable did not get GrabSelected."); + + if (shouldTestToggle) + { + if (secondCubeInteractable.TriggerOnRelease) + { + Assert.IsFalse(secondCubeInteractable.IsToggled, "StatefulInteractable toggled on press, when it was set to be toggled on release."); + } + else + { + Assert.IsFalse(secondCubeInteractable.IsToggled, "StatefulInteractable didn't toggled on press, when it was set to be toggled on press."); + } + } + + yield return rightHand.SetHandshape(HandshapeId.Open); + yield return RuntimeTestUtilities.WaitForUpdates(); + Assert.IsFalse(firstCubeInteractable.IsGrabSelected, + "StatefulInteractable did not get un-GrabSelected."); + + if (shouldTestToggle) + { + Assert.IsTrue(firstCubeInteractable.IsToggled, "StatefulInteractable did not get toggled."); + } + else + { + Assert.IsFalse(firstCubeInteractable.IsToggled, "StatefulInteractable shouldn't have been toggled, but it was."); + } + + // Test the second cube. + secondCubeInteractable.ForceSetToggled(false); + secondCubeInteractable.ToggleMode = shouldTestToggle ? StatefulInteractable.ToggleType.Toggle : StatefulInteractable.ToggleType.Button; + secondCubeInteractable.TriggerOnRelease = (i % 2) == 0; + + yield return rightHand.MoveTo(InputTestUtilities.InFrontOfUser(0.5f)); + yield return RuntimeTestUtilities.WaitForUpdates(); + yield return rightHand.RotateTo(Quaternion.Euler(0, -45, 0)); + yield return RuntimeTestUtilities.WaitForUpdates(); + + Assert.IsFalse(secondCubeInteractable.IsGrabHovered, + "StatefulInteractable was already hovered."); + + yield return rightHand.MoveTo(secondCubeInteractable.transform.position); + yield return RuntimeTestUtilities.WaitForUpdates(); + Assert.IsTrue(secondCubeInteractable.IsGrabHovered, + "StatefulInteractable did not get hovered."); + + yield return rightHand.SetHandshape(HandshapeId.Pinch); + yield return RuntimeTestUtilities.WaitForUpdates(); + Assert.IsTrue(secondCubeInteractable.IsGrabSelected, + "StatefulInteractable did not get GrabSelected."); + + if (shouldTestToggle) + { + if (secondCubeInteractable.TriggerOnRelease) + { + Assert.IsFalse(secondCubeInteractable.IsToggled, "StatefulInteractable toggled on press, when it was set to be toggled on release."); + } + else + { + Assert.IsFalse(secondCubeInteractable.IsToggled, "StatefulInteractable didn't toggled on press, when it was set to be toggled on press."); + } + } + + yield return rightHand.SetHandshape(HandshapeId.Open); + yield return RuntimeTestUtilities.WaitForUpdates(); + Assert.IsFalse(secondCubeInteractable.IsGrabSelected, + "StatefulInteractable did not get un-GrabSelected."); + + if (shouldTestToggle) + { + Assert.IsTrue(secondCubeInteractable.IsToggled, "StatefulInteractable did not get toggled."); + } + else + { + Assert.IsFalse(secondCubeInteractable.IsToggled, "StatefulInteractable shouldn't have been toggled, but it was."); + } + + yield return rightHand.MoveTo(InputTestUtilities.InFrontOfUser(0.5f)); + yield return RuntimeTestUtilities.WaitForUpdates(); + } + + yield return null; + } + + /// + /// Simple smoketest to ensure basic gaze-pinch selection functionality. + /// + /// + /// This test is the same as , it is repeated here so that the same functionality is tested against + /// the new controllerless prefabs. + /// + [UnityTest] + public IEnumerator GazePinchSmokeTest() + { + GameObject cube = GameObject.CreatePrimitive(PrimitiveType.Cube); + StatefulInteractable interactable = cube.AddComponent(); + cube.transform.position = InputTestUtilities.InFrontOfUser(); + cube.transform.localScale = Vector3.one * 0.1f; + + yield return RuntimeTestUtilities.WaitForUpdates(); + + Assert.IsTrue(interactable.isHovered); + Assert.IsTrue(interactable.IsGazeHovered); + Assert.IsFalse(interactable.IsGazePinchHovered); + + var rightHand = new TestHand(Handedness.Right); + yield return rightHand.Show(InputTestUtilities.InFrontOfUser() + new Vector3(0.2f, 0, 0f)); + + yield return RuntimeTestUtilities.WaitForUpdates(); + + Assert.IsTrue(interactable.isHovered); + Assert.IsTrue(interactable.IsGazePinchHovered); + + yield return rightHand.SetHandshape(HandshapeId.Pinch); + yield return RuntimeTestUtilities.WaitForUpdates(); + + Assert.IsTrue(interactable.isSelected); + Assert.IsTrue(interactable.IsGazePinchSelected); + + yield return rightHand.SetHandshape(HandshapeId.Open); + yield return RuntimeTestUtilities.WaitForUpdates(); + + Assert.IsFalse(interactable.isSelected); + Assert.IsFalse(interactable.IsGazePinchSelected); + Assert.IsTrue(interactable.isHovered); + Assert.IsTrue(interactable.IsGazePinchHovered); + } + + /// + /// A dummy interactor used to test basic selection/toggle logic. + /// + private class TestInteractor : XRBaseInteractor { } + + /// + /// Test that the correct toggle state should be readable after receiving an OnClicked event. + /// + /// + /// This test is the same as , it is repeated here so that the same functionality is tested against + /// the new controllerless prefabs. + /// + [UnityTest] + public IEnumerator TestToggleEventOrdering() + { + var gameObject = new GameObject(); + var interactable = gameObject.AddComponent(); + var interactor = gameObject.AddComponent(); + + bool receivedOnClicked = false; + bool expectedToggleState = false; + + interactable.OnClicked.AddListener(() => + { + receivedOnClicked = true; + Assert.IsTrue(interactable.IsToggled == expectedToggleState, "Toggle state had an unexpected value"); + }); + + interactor.StartManualInteraction(interactable as IXRSelectInteractable); + yield return null; + interactor.EndManualInteraction(); + yield return null; + + Assert.IsTrue(receivedOnClicked, "Didn't receive click event"); + receivedOnClicked = false; + + interactable.ToggleMode = StatefulInteractable.ToggleType.Toggle; + expectedToggleState = true; + + interactor.StartManualInteraction(interactable as IXRSelectInteractable); + yield return null; + interactor.EndManualInteraction(); + yield return null; + + Assert.IsTrue(receivedOnClicked, "Didn't receive click event"); + receivedOnClicked = false; + expectedToggleState = false; + + interactor.StartManualInteraction(interactable as IXRSelectInteractable); + yield return null; + interactor.EndManualInteraction(); + yield return null; + + Assert.IsTrue(receivedOnClicked, "Didn't receive click event"); + } + + /// + /// Test whether toggle state can be hydrated without firing events. + /// + /// + /// This test is the same as , it is repeated here so that the same functionality is tested against + /// the new controllerless prefabs. + /// + [UnityTest] + public IEnumerator ToggleHydrationTest() + { + GameObject cube = GameObject.CreatePrimitive(PrimitiveType.Cube); + var interactable = cube.AddComponent(); + + bool didFireEvent = false; + + interactable.IsToggled.OnEntered.AddListener((_) => didFireEvent = true); + interactable.IsToggled.OnExited.AddListener((_) => didFireEvent = true); + interactable.ForceSetToggled(true); + + Assert.IsTrue(interactable.IsToggled, "Interactable didn't get toggled."); + Assert.IsTrue(didFireEvent, "ForceSetToggled(true) should have fired the event."); + + didFireEvent = false; + interactable.ForceSetToggled(false); + + Assert.IsFalse(interactable.IsToggled, "Interactable didn't get detoggled."); + Assert.IsTrue(didFireEvent, "ForceSetToggled(false) should have fired the event."); + + didFireEvent = false; + interactable.ForceSetToggled(true, fireEvents: false); + + Assert.IsTrue(interactable.IsToggled, "Interactable didn't get toggled."); + Assert.IsFalse(didFireEvent, "ForceSetToggled(true, fireEvents:false) should NOT have fired the event."); + + interactable.ForceSetToggled(false, fireEvents: false); + + Assert.IsFalse(interactable.IsToggled, "Interactable didn't get detoggled."); + Assert.IsFalse(didFireEvent, "ForceSetToggled(false, fireEvents:false) should NOT have fired the event."); + + yield return null; + } + + /// + /// Test the HandModel script has the required fields. + /// + [UnityTest] + public IEnumerator HandModelHasRequiredFieldsAndAccessors() + { + FieldInfo[] fieldInfos; + PropertyInfo[] accessorsInfos; + Type HandModel = typeof(HandModel); + + fieldInfos = HandModel.GetFields(BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.Public); + accessorsInfos = HandModel.GetProperties(BindingFlags.Instance | BindingFlags.Public); + + var modelPrefabFieldInfo = fieldInfos.Where(fieldInfo => fieldInfo.Name.Equals("modelPrefab")).ToArray(); + Assert.AreEqual(1, modelPrefabFieldInfo.Length, "HandModel is missing the 'modelPrefab' field"); + + var modelParentFieldInfo = fieldInfos.Where(fieldInfo => fieldInfo.Name.Equals("modelParent")).ToArray(); + Assert.AreEqual(1, modelParentFieldInfo.Length, "HandModel is missing the 'modelParent' field"); + + var modelFieldInfo = fieldInfos.Where(fieldInfo => fieldInfo.Name.Equals("model")).ToArray(); + Assert.AreEqual(1, modelFieldInfo.Length, "HandModel is missing the 'model' field"); + + var modelPrefabAccessorInfo = accessorsInfos.Where(accessorInfo => accessorInfo.Name.Equals("ModelPrefab")).ToArray(); + Assert.AreEqual(1, modelPrefabAccessorInfo.Length, "HandModel is missing the 'ModelPrefab' accessor"); + + var modelParentAccessorInfo = accessorsInfos.Where(accessorInfo => accessorInfo.Name.Equals("ModelParent")).ToArray(); + Assert.AreEqual(1, modelParentAccessorInfo.Length, "HandModel is missing the 'ModelParent' accessor"); + + var modelAccessorInfo = accessorsInfos.Where(accessorInfo => accessorInfo.Name.Equals("Model")).ToArray(); + Assert.AreEqual(1, modelAccessorInfo.Length, "HandModel is missing the 'Model' accessor"); + + yield return null; + } + } +} +#pragma warning restore CS1591 diff --git a/org.mixedrealitytoolkit.input/Tests/Runtime/BasicInputTestsForControllerlessRig.cs.meta b/org.mixedrealitytoolkit.input/Tests/Runtime/BasicInputTestsForControllerlessRig.cs.meta new file mode 100644 index 000000000..a7547c741 --- /dev/null +++ b/org.mixedrealitytoolkit.input/Tests/Runtime/BasicInputTestsForControllerlessRig.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: f0de2fc9177a15843bfb330da4a613da +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/org.mixedrealitytoolkit.input/Tests/Runtime/EyeCalibrationCheckerTests.cs b/org.mixedrealitytoolkit.input/Tests/Runtime/EyeCalibrationCheckerTests.cs index 0d358eac0..4e27ca10e 100644 --- a/org.mixedrealitytoolkit.input/Tests/Runtime/EyeCalibrationCheckerTests.cs +++ b/org.mixedrealitytoolkit.input/Tests/Runtime/EyeCalibrationCheckerTests.cs @@ -4,21 +4,15 @@ // Disable "missing XML comment" warning for tests. While nice to have, this documentation is not required. #pragma warning disable CS1591 -using MixedReality.Toolkit.Core.Tests; -using MixedReality.Toolkit.Input.Tests; -using MixedReality.Toolkit.Input; using NUnit.Framework; using System.Collections; -using System.Threading.Tasks; -using UnityEditor; using UnityEngine; using UnityEngine.TestTools; -using UnityEngine.UI; -namespace MixedReality.Toolkit.UX.Runtime.Tests +namespace MixedReality.Toolkit.Input.Tests { /// - /// Tests for the EyeCalibrationChecker. + /// Tests for the EyeCalibrationChecker. /// public class EyeCalibrationCheckerTests : BaseRuntimeInputTests { @@ -72,4 +66,4 @@ private void NoEyeCalibration() } } } -#pragma warning restore CS1591 \ No newline at end of file +#pragma warning restore CS1591 diff --git a/org.mixedrealitytoolkit.input/Tests/Runtime/FuzzyGazeInteractorTests.cs b/org.mixedrealitytoolkit.input/Tests/Runtime/FuzzyGazeInteractorTests.cs index 668797995..12f7df6c4 100644 --- a/org.mixedrealitytoolkit.input/Tests/Runtime/FuzzyGazeInteractorTests.cs +++ b/org.mixedrealitytoolkit.input/Tests/Runtime/FuzzyGazeInteractorTests.cs @@ -17,6 +17,12 @@ namespace MixedReality.Toolkit.Input.Tests /// public class FuzzyGazeInteractorTests : BaseRuntimeInputTests { + /// + /// Override of the rig version to use for these tests. These tests validate that the old rig remain functional. + /// The will validate the new rig. + /// + protected override InputTestUtilities.RigVersion RigVersion => InputTestUtilities.RigVersion.Version1; + /// /// Basic test of FuzzyGazeInteractor. Confirm a FuzzyGazeInteractor is active in the scene, and then /// make sure Interactable can be hovered even when not on the direct raycast from the interactor. @@ -25,7 +31,7 @@ public class FuzzyGazeInteractorTests : BaseRuntimeInputTests public IEnumerator BasicFuzzyGazeTest() { // Confirm a FuzzyGazeInteractor is active in the scene - FuzzyGazeInteractor fuzzyGazeInteractor = FindObjectUtility.FindAnyObjectByType(); + FuzzyGazeInteractor fuzzyGazeInteractor = Object.FindAnyObjectByType(); Assert.IsNotNull(fuzzyGazeInteractor, "There is no active FuzzyGazeInteractor found in the scene."); // Instantiate two foreground cubes and one background cube for testing @@ -101,7 +107,7 @@ public IEnumerator BasicFuzzyGazeTest() public IEnumerator FuzzyGazePrecisionTest() { // Confirm a FuzzyGazeInteractor is active in the scene and configure it for the test - FuzzyGazeInteractor fuzzyGazeInteractor = FindObjectUtility.FindFirstObjectByType(); + FuzzyGazeInteractor fuzzyGazeInteractor = Object.FindFirstObjectByType(); Assert.IsNotNull(fuzzyGazeInteractor, "There is no active FuzzyGazeInteractor found in the scene."); fuzzyGazeInteractor.precision = 0; fuzzyGazeInteractor.performAdditionalRaycast = false; @@ -159,10 +165,10 @@ public IEnumerator FuzzyGazePrecisionTest() public IEnumerator GazeFallbackWhenEyeGazeLosesTrackingTest() { // Confirm a FuzzyGazeInteractor is active in the scene - FuzzyGazeInteractor fuzzyGazeInteractor = FindObjectUtility.FindFirstObjectByType(); + FuzzyGazeInteractor fuzzyGazeInteractor = Object.FindFirstObjectByType(); Assert.IsNotNull(fuzzyGazeInteractor, "There is no active FuzzyGazeInteractor found in the scene."); - // Instantiate two foregound cubes and one background cube for testing + // Instantiate two foreground cubes and one background cube for testing GameObject cube1 = GameObject.CreatePrimitive(PrimitiveType.Cube); cube1.GetComponent().material.color = Color.red; cube1.AddComponent(); @@ -228,10 +234,10 @@ public IEnumerator GazeFallbackWhenEyeGazeLosesTrackingTest() public IEnumerator GazeFallbackWhenEyeGazeIsDisabledTest() { // Confirm a FuzzyGazeInteractor is active in the scene - FuzzyGazeInteractor fuzzyGazeInteractor = FindObjectUtility.FindFirstObjectByType(); + FuzzyGazeInteractor fuzzyGazeInteractor = Object.FindFirstObjectByType(); Assert.IsNotNull(fuzzyGazeInteractor, "There is no active FuzzyGazeInteractor found in the scene."); - // Instantiate two foregound cubes and one background cube for testing + // Instantiate two foreground cubes and one background cube for testing GameObject cube1 = GameObject.CreatePrimitive(PrimitiveType.Cube); cube1.GetComponent().material.color = Color.red; cube1.AddComponent(); diff --git a/org.mixedrealitytoolkit.input/Tests/Runtime/FuzzyGazeInteractorTestsForControllerlessRig.cs b/org.mixedrealitytoolkit.input/Tests/Runtime/FuzzyGazeInteractorTestsForControllerlessRig.cs new file mode 100644 index 000000000..3a1a3de03 --- /dev/null +++ b/org.mixedrealitytoolkit.input/Tests/Runtime/FuzzyGazeInteractorTestsForControllerlessRig.cs @@ -0,0 +1,382 @@ +// Copyright (c) Mixed Reality Toolkit Contributors +// Licensed under the BSD 3-Clause + +// Disable "missing XML comment" warning for tests. While nice to have, this documentation is not required. +#pragma warning disable CS1591 + +using MixedReality.Toolkit.Core.Tests; +using NUnit.Framework; +using System.Collections; +using UnityEngine; +using UnityEngine.InputSystem.XR; +using UnityEngine.TestTools; + +namespace MixedReality.Toolkit.Input.Tests +{ + /// + /// Tests for verifying the behavior of FuzzyGazeInteractor for the XRI3+ controllerless MRTK rig. + /// + /// + /// These tests are equivalent to those in but they test with the new MRTK Rig that was + /// created for the XRI3 migration. Eventually, this will replace the original when + /// the deprecated pre-XRI3 rig is removed in its entirety from MRTK3. + /// Note: This class contains only the tests that are specific to the XRI3+ rig. Tests that are common to both rigs are in the + /// original . Once the XRI3 migration is completed by removing all the pre-XRI3 + /// prefabs then those tests can be moved to this class. + /// + public class FuzzyGazeInteractorTestsForControllerlessRig : BaseRuntimeInputTests + { + /// + /// Test that eye-gaze works as expected. + /// + /// + /// This test was meant to be the XRI3+ equivalent of , however, since our + /// cannot simulate the loss of tracking for XRI3+ because it still uses controllers + /// (as of the moment of this writing) then this test was repurposed to test that eye-gazing works for XRI3+ as expected without simulating + /// eye-gaze tracking loss. + /// + [UnityTest] + public IEnumerator EyeGazeWorksAsExpectedTest() + { + // Confirm a FuzzyGazeInteractor is active in the scene + FuzzyGazeInteractor fuzzyGazeInteractor = Object.FindFirstObjectByType(); + Assert.IsNotNull(fuzzyGazeInteractor, "There is no active FuzzyGazeInteractor found in the scene."); + + // Instantiate two foreground cubes and one background cube for testing + GameObject cube1 = GameObject.CreatePrimitive(PrimitiveType.Cube); + cube1.GetComponent().material.color = Color.red; + cube1.AddComponent(); + cube1.transform.position = InputTestUtilities.InFrontOfUser(new Vector3(0.07f, 0.2f, 1)); + cube1.transform.localScale = Vector3.one * 0.1f; + + GameObject cube2 = GameObject.CreatePrimitive(PrimitiveType.Cube); + cube2.GetComponent().material.color = Color.blue; + cube2.AddComponent(); + cube2.transform.position = InputTestUtilities.InFrontOfUser(new Vector3(-0.05f, 0.2f, 1)); + cube2.transform.localScale = Vector3.one * 0.1f; + + GameObject backgroundCube = GameObject.CreatePrimitive(PrimitiveType.Cube); + backgroundCube.AddComponent(); + backgroundCube.transform.position = InputTestUtilities.InFrontOfUser(1.6f); + backgroundCube.transform.localScale = Vector3.one; + + yield return RuntimeTestUtilities.WaitForUpdates(); + + // No foreground cube should be hovered at their starting positions + Assert.IsFalse(cube1.GetComponent().IsGazeHovered, + "Cube 1'sStatefulInteractable was already hovered."); + Assert.IsFalse(cube2.GetComponent().IsGazeHovered, + "Cube 2's StatefulInteractable was already hovered."); + Assert.IsTrue(backgroundCube.GetComponent().IsGazeHovered, + "Background's StatefulInteractable was not hovered by FuzzyGazeInteractor."); + + // Ensure eyes gaze has tracking + InputTestUtilities.IsEyeGazeTracking = true; + + // Point camera (HMD) at cube 1 + yield return InputTestUtilities.RotateCameraToTarget(cube1.transform.position); + + // Point eyes at cube 2 + yield return InputTestUtilities.RotateEyesToTarget(cube2.transform.position); + + // The eyes gaze should have focused cube 2 + Assert.IsFalse(cube1.GetComponent().IsGazeHovered, + "Cube 1's StatefulInteractable was hovered, perhaps by head gaze. Expected eye gaze to hover different object."); + + Assert.IsTrue(cube2.GetComponent().IsGazeHovered, + "Cube 2's StatefulInteractable should have been hovered by eye gaze."); + + Assert.IsFalse(backgroundCube.GetComponent().IsGazeHovered, + "Background's StatefulInteractable was unexpectedly hovered."); + } + + /// + /// Basic test of FuzzyGazeInteractor. Confirm a FuzzyGazeInteractor is active in the scene, and then + /// make sure Interactable can be hovered even when not on the direct raycast from the interactor. + /// + /// + /// This test is the same as , it is repeated here so that the same functionality is tested against + /// the new controllerless prefabs. + /// + [UnityTest] + public IEnumerator BasicFuzzyGazeTest() + { + // Confirm a FuzzyGazeInteractor is active in the scene + FuzzyGazeInteractor fuzzyGazeInteractor = Object.FindAnyObjectByType(); + Assert.IsNotNull(fuzzyGazeInteractor, "There is no active FuzzyGazeInteractor found in the scene."); + + // Instantiate two foreground cubes and one background cube for testing + GameObject cube1 = GameObject.CreatePrimitive(PrimitiveType.Cube); + cube1.AddComponent(); + cube1.transform.position = InputTestUtilities.InFrontOfUser(new Vector3(0.07f, 0.2f, 1)); + cube1.transform.localScale = Vector3.one * 0.1f; + + GameObject cube2 = GameObject.CreatePrimitive(PrimitiveType.Cube); + cube2.AddComponent(); + cube2.transform.position = InputTestUtilities.InFrontOfUser(new Vector3(-0.05f, 0.2f, 1)); + cube2.transform.localScale = Vector3.one * 0.1f; + + GameObject backgroundCube = GameObject.CreatePrimitive(PrimitiveType.Cube); + backgroundCube.AddComponent(); + backgroundCube.transform.position = InputTestUtilities.InFrontOfUser(1.6f); + backgroundCube.transform.localScale = Vector3.one; + + yield return RuntimeTestUtilities.WaitForUpdates(); + + // No foreground cube should be hovered at their birth positions + Assert.IsFalse(cube1.GetComponent().IsGazeHovered, + "StatefulInteractable was already hovered."); + Assert.IsFalse(cube2.GetComponent().IsGazeHovered, + "StatefulInteractable was already hovered."); + Assert.IsTrue(backgroundCube.GetComponent().IsGazeHovered, + "StatefulInteractable was not hovered by FuzzyGazeInteractor."); + + // Move the cubes to bring them to the center on the y-axis + cube1.transform.position = InputTestUtilities.InFrontOfUser(new Vector3(0.07f, 0, 1)); + cube2.transform.position = InputTestUtilities.InFrontOfUser(new Vector3(-0.05f, 0, 1)); + + yield return RuntimeTestUtilities.WaitForUpdates(); + + // Cube 2 should now be hovered + Assert.IsFalse(cube1.GetComponent().IsGazeHovered, + "StatefulInteractable was already hovered."); + Assert.IsTrue(cube2.GetComponent().IsGazeHovered, + "StatefulInteractable was not hovered by FuzzyGazeInteractor."); + Assert.IsFalse(backgroundCube.GetComponent().IsGazeHovered, + "StatefulInteractable was already hovered."); + + // Move cube 2 back to its birth position + cube2.transform.position = InputTestUtilities.InFrontOfUser(new Vector3(-0.05f, 0.2f, 1)); + yield return RuntimeTestUtilities.WaitForUpdates(); + + // Background cube should now be hovered + Assert.IsFalse(cube1.GetComponent().IsGazeHovered, + "StatefulInteractable was already hovered."); + Assert.IsFalse(cube2.GetComponent().IsGazeHovered, + "StatefulInteractable was already hovered."); + Assert.IsTrue(backgroundCube.GetComponent().IsGazeHovered, + "StatefulInteractable was not hovered by FuzzyGazeInteractor."); + + // Move background cube further back + backgroundCube.transform.position = InputTestUtilities.InFrontOfUser(4f); + yield return RuntimeTestUtilities.WaitForUpdates(); + + // Cube 1 should now be hovered + Assert.IsTrue(cube1.GetComponent().IsGazeHovered, + "StatefulInteractable was not hovered by FuzzyGazeInteractor."); + Assert.IsFalse(cube2.GetComponent().IsGazeHovered, + "StatefulInteractable was already hovered."); + Assert.IsFalse(backgroundCube.GetComponent().IsGazeHovered, + "StatefulInteractable was already hovered."); + } + + /// + /// Test the behavior of FuzzyGazeInteractor with different levels of precision and + /// with performAdditionalRaycast on and off. + /// + /// + /// This test is the same as , it is repeated here so that the same functionality is tested against + /// the new controllerless prefabs. + /// + [UnityTest] + public IEnumerator FuzzyGazePrecisionTest() + { + // Confirm a FuzzyGazeInteractor is active in the scene and configure it for the test + FuzzyGazeInteractor fuzzyGazeInteractor = Object.FindFirstObjectByType(); + Assert.IsNotNull(fuzzyGazeInteractor, "There is no active FuzzyGazeInteractor found in the scene."); + fuzzyGazeInteractor.precision = 0; + fuzzyGazeInteractor.performAdditionalRaycast = false; + + yield return RuntimeTestUtilities.WaitForUpdates(); + // Instantiate one foreground cubes and one background cube for testing + GameObject foregroundCube = GameObject.CreatePrimitive(PrimitiveType.Cube); + foregroundCube.AddComponent(); + foregroundCube.transform.position = InputTestUtilities.InFrontOfUser(new Vector3(0.241f, 0, 2)); + foregroundCube.transform.localScale = new Vector3(0.4f, 0.1f, 0.2f); + + yield return RuntimeTestUtilities.WaitForUpdates(); + GameObject backgroundCube = GameObject.CreatePrimitive(PrimitiveType.Cube); + backgroundCube.AddComponent(); + backgroundCube.transform.position = InputTestUtilities.InFrontOfUser(new Vector3(-0.4f, 0, 2.4f)); + backgroundCube.transform.localScale = new Vector3(1.4f, 1.4f, 0.2f); + backgroundCube.transform.localEulerAngles = new Vector3(0, -58, 0); + + yield return RuntimeTestUtilities.WaitForUpdates(); + + // Foreground cube should be hovered + Assert.IsTrue(foregroundCube.GetComponent().IsGazeHovered, + "StatefulInteractable was not hovered by FuzzyGazeInteractor."); + Assert.IsFalse(backgroundCube.GetComponent().IsGazeHovered, + "StatefulInteractable was already hovered."); + + // Increase the precision of the interactor + fuzzyGazeInteractor.precision = FuzzyGazeInteractor.MaxPrecision; + + yield return RuntimeTestUtilities.WaitForUpdates(); + + // Background cube should now be hovered + Assert.IsFalse(foregroundCube.GetComponent().IsGazeHovered, + "StatefulInteractable was already hovered."); + Assert.IsTrue(backgroundCube.GetComponent().IsGazeHovered, + "StatefulInteractable was not hovered by FuzzyGazeInteractor."); + + // Restore the precision to 0 but enable performAdditionalRaycast + fuzzyGazeInteractor.precision = 0; + fuzzyGazeInteractor.performAdditionalRaycast = true; + + yield return RuntimeTestUtilities.WaitForUpdates(); + + // Background cube should still be hovered + Assert.IsFalse(foregroundCube.GetComponent().IsGazeHovered, + "StatefulInteractable was already hovered."); + Assert.IsTrue(backgroundCube.GetComponent().IsGazeHovered, + "StatefulInteractable was not hovered by FuzzyGazeInteractor."); + } + + /// + /// Test that gaze fallbacks to HMD pose, if eye gaze loses tracking. + /// + /// + /// This test is the same as , it is repeated here so that the same functionality is tested against + /// the new controllerless prefabs. + /// + [UnityTest] + public IEnumerator GazeFallbackWhenEyeGazeLosesTrackingTest() + { + // Confirm a FuzzyGazeInteractor is active in the scene + FuzzyGazeInteractor fuzzyGazeInteractor = Object.FindFirstObjectByType(); + Assert.IsNotNull(fuzzyGazeInteractor, "There is no active FuzzyGazeInteractor found in the scene."); + + // Instantiate two foreground cubes and one background cube for testing + GameObject cube1 = GameObject.CreatePrimitive(PrimitiveType.Cube); + cube1.GetComponent().material.color = Color.red; + cube1.AddComponent(); + cube1.transform.position = InputTestUtilities.InFrontOfUser(new Vector3(0.07f, 0.2f, 1)); + cube1.transform.localScale = Vector3.one * 0.1f; + + GameObject cube2 = GameObject.CreatePrimitive(PrimitiveType.Cube); + cube2.GetComponent().material.color = Color.blue; + cube2.AddComponent(); + cube2.transform.position = InputTestUtilities.InFrontOfUser(new Vector3(-0.05f, 0.2f, 1)); + cube2.transform.localScale = Vector3.one * 0.1f; + + GameObject backgroundCube = GameObject.CreatePrimitive(PrimitiveType.Cube); + backgroundCube.AddComponent(); + backgroundCube.transform.position = InputTestUtilities.InFrontOfUser(1.6f); + backgroundCube.transform.localScale = Vector3.one; + + yield return RuntimeTestUtilities.WaitForUpdates(); + + // No foreground cube should be hovered at their starting positions + Assert.IsFalse(cube1.GetComponent().IsGazeHovered, + "Cube 1'sStatefulInteractable was already hovered."); + Assert.IsFalse(cube2.GetComponent().IsGazeHovered, + "Cube 2's StatefulInteractable was already hovered."); + Assert.IsTrue(backgroundCube.GetComponent().IsGazeHovered, + "Background's StatefulInteractable was not hovered by FuzzyGazeInteractor."); + + // Ensure eyes gaze has tracking + InputTestUtilities.IsEyeGazeTracking = true; + + // Point camera (HMD) at cube 1 + yield return InputTestUtilities.RotateCameraToTarget(cube1.transform.position); + + // Point eyes at cube 2 + yield return InputTestUtilities.RotateEyesToTarget(cube2.transform.position); + + // The eyes gaze should have focused cube 2 + Assert.IsFalse(cube1.GetComponent().IsGazeHovered, + "Cube 1's StatefulInteractable was hovered, perhaps by head gaze. Expected eye gaze to hover different object."); + Assert.IsTrue(cube2.GetComponent().IsGazeHovered, + "Cube 2's StatefulInteractable should have been hovered by eye gaze."); + Assert.IsFalse(backgroundCube.GetComponent().IsGazeHovered, + "Background's StatefulInteractable was unexpectedly hovered."); + + // Force eye gaze to lose tracking + InputTestUtilities.IsEyeGazeTracking = false; + yield return RuntimeTestUtilities.WaitForUpdates(); + + // The head gaze should have focused cube 1 + Assert.IsTrue(cube1.GetComponent().IsGazeHovered, + "Cube 1's StatefulInteractable should have been hovered by head gaze."); + Assert.IsFalse(cube2.GetComponent().IsGazeHovered, + "Cube 2's StatefulInteractable should have been hovered by eye gaze."); + Assert.IsFalse(backgroundCube.GetComponent().IsGazeHovered, + "Background's StatefulInteractable was unexpectedly hovered."); + } + + + /// + /// Test that gaze fallbacks to HMD pose, if eye gaze is disabled. + /// + /// + /// This test is the same as , it is repeated here so that the same functionality is tested against + /// the new controllerless prefabs. + /// + [UnityTest] + public IEnumerator GazeFallbackWhenEyeGazeIsDisabledTest() + { + // Confirm a FuzzyGazeInteractor is active in the scene + FuzzyGazeInteractor fuzzyGazeInteractor = Object.FindFirstObjectByType(); + Assert.IsNotNull(fuzzyGazeInteractor, "There is no active FuzzyGazeInteractor found in the scene."); + + // Instantiate two foreground cubes and one background cube for testing + GameObject cube1 = GameObject.CreatePrimitive(PrimitiveType.Cube); + cube1.GetComponent().material.color = Color.red; + cube1.AddComponent(); + cube1.transform.position = InputTestUtilities.InFrontOfUser(new Vector3(0.07f, 0.2f, 1)); + cube1.transform.localScale = Vector3.one * 0.1f; + + GameObject cube2 = GameObject.CreatePrimitive(PrimitiveType.Cube); + cube2.GetComponent().material.color = Color.blue; + cube2.AddComponent(); + cube2.transform.position = InputTestUtilities.InFrontOfUser(new Vector3(-0.05f, 0.2f, 1)); + cube2.transform.localScale = Vector3.one * 0.1f; + + GameObject backgroundCube = GameObject.CreatePrimitive(PrimitiveType.Cube); + backgroundCube.AddComponent(); + backgroundCube.transform.position = InputTestUtilities.InFrontOfUser(1.6f); + backgroundCube.transform.localScale = Vector3.one; + + yield return RuntimeTestUtilities.WaitForUpdates(); + + // No foreground cube should be hovered at their starting positions + Assert.IsFalse(cube1.GetComponent().IsGazeHovered, + "Cube 1'sStatefulInteractable was already hovered."); + Assert.IsFalse(cube2.GetComponent().IsGazeHovered, + "Cube 2's StatefulInteractable was already hovered."); + Assert.IsTrue(backgroundCube.GetComponent().IsGazeHovered, + "Background's StatefulInteractable was not hovered by FuzzyGazeInteractor."); + + // Ensure eyes are enabled + InputTestUtilities.IsEyeGazeTracking = true; + + // Point camera (HMD) at cube 1 + yield return InputTestUtilities.RotateCameraToTarget(cube1.transform.position); + + // Point eyes at cube 2 + yield return InputTestUtilities.RotateEyesToTarget(cube2.transform.position); + + // The eyes gaze should have focused cube 2 + Assert.IsFalse(cube1.GetComponent().IsGazeHovered, + "Cube 1's StatefulInteractable was hovered, perhaps by head gaze. Expected eye gaze to hover different object."); + Assert.IsTrue(cube2.GetComponent().IsGazeHovered, + "Cube 2's StatefulInteractable should have been hovered by eye gaze."); + Assert.IsFalse(backgroundCube.GetComponent().IsGazeHovered, + "Background's StatefulInteractable was unexpectedly hovered."); + + // Disable eye gaze device + yield return InputTestUtilities.DisableEyeGazeDevice(); + yield return RuntimeTestUtilities.WaitForUpdates(); + + // The head gaze should have focused cube 1 + Assert.IsTrue(cube1.GetComponent().IsGazeHovered, + "Cube 1's StatefulInteractable should have been hovered by head gaze."); + Assert.IsFalse(cube2.GetComponent().IsGazeHovered, + "Cube 2's StatefulInteractable was hovered, perhaps by eye gaze. Expected head gaze to hover different object."); + Assert.IsFalse(backgroundCube.GetComponent().IsGazeHovered, + "Background's StatefulInteractable was unexpectedly hovered."); + } + } +} +#pragma warning restore CS1591 diff --git a/org.mixedrealitytoolkit.input/Tests/Runtime/FuzzyGazeInteractorTestsForControllerlessRig.cs.meta b/org.mixedrealitytoolkit.input/Tests/Runtime/FuzzyGazeInteractorTestsForControllerlessRig.cs.meta new file mode 100644 index 000000000..63be4786c --- /dev/null +++ b/org.mixedrealitytoolkit.input/Tests/Runtime/FuzzyGazeInteractorTestsForControllerlessRig.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 4ad3b2424c1258641a6dc4d032d70014 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/org.mixedrealitytoolkit.input/Tests/Runtime/InteractionModeManagerTests.cs b/org.mixedrealitytoolkit.input/Tests/Runtime/InteractionModeManagerTests.cs index 83725205f..2eed33ade 100644 --- a/org.mixedrealitytoolkit.input/Tests/Runtime/InteractionModeManagerTests.cs +++ b/org.mixedrealitytoolkit.input/Tests/Runtime/InteractionModeManagerTests.cs @@ -4,23 +4,31 @@ // Disable "missing XML comment" warning for tests. While nice to have, this documentation is not required. #pragma warning disable CS1591 -using System.Collections; -using System.Collections.Generic; -using System.Linq; using MixedReality.Toolkit.Core.Tests; using MixedReality.Toolkit.Input.Simulation; using NUnit.Framework; +using System; +using System.Collections; +using System.Collections.Generic; using UnityEngine; using UnityEngine.TestTools; using UnityEngine.XR.Interaction.Toolkit; +using UnityEngine.XR.Interaction.Toolkit.Interactors; namespace MixedReality.Toolkit.Input.Tests { /// /// Tests to ensure the proper behavior of the interaction mode manager. /// + [Obsolete("This has been replaced by InteractionModeManagerTestsForControllerlessRig.")] public class InteractionModeManagerTests : BaseRuntimeInputTests { + /// + /// Override of the rig version to use for these tests. These tests validate that the old rig remain functional. + /// The will validate the new rig. + /// + protected override InputTestUtilities.RigVersion RigVersion => InputTestUtilities.RigVersion.Version1; + /// /// Tests that the proximity detector detects when to change the controllers interaction mode and properly toggles the associated interactors. /// Also checks that the proximity detector doesn't trigger hovers on other objects @@ -49,7 +57,7 @@ public IEnumerator ProximityDetectorTest() Assert.IsFalse(cube.GetComponent().isHovered, "Interactable was hovered when it shouldn't have been. Was the radius of any of the interactors changed, or is a proximity detector firing hovers?"); - Assert.IsTrue(AnyProximityDetectorsTriggered(), + Assert.IsTrue(InteractionModeManagerTestsForControllerlessRig.AnyProximityDetectorsTriggered(), "The proximity detector should have detected the cube. Was the detector's radius changed, or is it broken?"); InteractionMode currentMode = rightHandController.GetComponentInChildren().ModeOnDetection; @@ -59,7 +67,7 @@ public IEnumerator ProximityDetectorTest() } /// - /// Tests the basic Interaction detector. The controller should enter one mode during hover, another during select, and fall back to the default mode during neither + /// Tests the basic Interaction detector. The controller should enter one mode during hover, another during select, and fall back to the default mode during neither. /// [UnityTest] public IEnumerator InteractionDetectorTest() @@ -80,28 +88,43 @@ public IEnumerator InteractionDetectorTest() yield return rightHand.AimAt(cube.transform.position); yield return RuntimeTestUtilities.WaitForUpdates(); - InteractionMode currentMode = rightHandController.GetComponentInChildren().GetComponent().ModeOnHover; - Assert.AreEqual(currentMode, rightHandController.GetComponentInChildren().GetComponent().ModeOnDetection); - ValidateInteractionModeActive(rightHandController, currentMode); + if (!rightHandController.GetComponentInChildren().TryGetComponent(out InteractionDetector interactionDetector)) + { + Assert.Fail("No interaction detector found on right hand ray interactor. Is the component missing?"); + } + + InteractionMode expectedMode = interactionDetector.ModeOnHover; + Assert.AreEqual(expectedMode, interactionDetector.ModeOnDetection); + ValidateInteractionModeActive(rightHandController, expectedMode); + // Select the cube and check that we're in the correct mode yield return rightHand.SetHandshape(HandshapeTypes.HandshapeId.Grab); yield return RuntimeTestUtilities.WaitForUpdates(); - currentMode = rightHandController.GetComponentInChildren().GetComponent().ModeOnSelect; - Assert.AreEqual(currentMode, rightHandController.GetComponentInChildren().GetComponent().ModeOnDetection); - ValidateInteractionModeActive(rightHandController, currentMode); + expectedMode = interactionDetector.ModeOnSelect; + Assert.AreEqual(expectedMode, interactionDetector.ModeOnDetection); + ValidateInteractionModeActive(rightHandController, expectedMode); - // move the hand far away and validate that we are in the default mode + // Release the selection and move the hand far away and validate that we are in the default mode yield return rightHand.SetHandshape(HandshapeTypes.HandshapeId.Open); yield return RuntimeTestUtilities.WaitForUpdates(); - yield return rightHand.MoveTo(cube.transform.position + new Vector3(3.0f,0,0)); + yield return rightHand.MoveTo(cube.transform.position + new Vector3(3.0f, 0, 0)); yield return RuntimeTestUtilities.WaitForUpdates(); + expectedMode = InteractionModeManager.Instance.DefaultMode; + ValidateInteractionModeActive(rightHandController, expectedMode); - currentMode = InteractionModeManager.Instance.DefaultMode; - ValidateInteractionModeActive(rightHandController, currentMode); + // Put the hand into a grab state and validate that we are in the default mode, since we're not selecting an object + yield return rightHand.SetHandshape(HandshapeTypes.HandshapeId.Grab); + yield return RuntimeTestUtilities.WaitForUpdates(); + ValidateInteractionModeActive(rightHandController, expectedMode); + + // Release the grab state and validate that we are in the default mode + yield return rightHand.SetHandshape(HandshapeTypes.HandshapeId.Open); + yield return RuntimeTestUtilities.WaitForUpdates(); + ValidateInteractionModeActive(rightHandController, expectedMode); } /// - /// Tests that mode mediation works properly. + /// Tests that mode mediation works properly. /// /// /// The interaction mode with the higher priority should be the valid one which affects the controller. @@ -127,12 +150,17 @@ public IEnumerator ModeMediationTest() InputTestUtilities.SetHandAnchorPoint(Handedness.Right, ControllerAnchorPoint.Grab); yield return RuntimeTestUtilities.WaitForUpdates(); + if (!rightHandController.GetComponentInChildren().TryGetComponent(out InteractionDetector rayInteractionDetector)) + { + Assert.Fail("No interaction detector found on right hand ray interactor. Is the component missing?"); + } + // Moving the hand to a position where its far ray is hovering over the cube yield return rightHand.AimAt(cube.transform.position); yield return RuntimeTestUtilities.WaitForUpdates(); - InteractionMode farRayMode = rightHandController.GetComponentInChildren().GetComponent().ModeOnHover; + InteractionMode farRayMode = rayInteractionDetector.ModeOnHover; yield return RuntimeTestUtilities.WaitForUpdates(); - Assert.AreEqual(farRayMode, rightHandController.GetComponentInChildren().GetComponent().ModeOnDetection); + Assert.AreEqual(farRayMode, rayInteractionDetector.ModeOnDetection); ValidateInteractionModeActive(rightHandController, farRayMode); // Now move the hand in range for the proximity detector @@ -150,8 +178,13 @@ public IEnumerator ModeMediationTest() yield return rightHand.SetHandshape(HandshapeTypes.HandshapeId.Grab); yield return RuntimeTestUtilities.WaitForUpdates(); - InteractionMode grabMode = rightHandController.GetComponentInChildren().GetComponent().ModeOnSelect; - Assert.AreEqual(grabMode, rightHandController.GetComponentInChildren().GetComponent().ModeOnDetection); + if (!rightHandController.GetComponentInChildren().TryGetComponent(out InteractionDetector grabInteractionDetector)) + { + Assert.Fail("No interaction detector found on right hand grab interactor. Is the component missing?"); + } + + InteractionMode grabMode = grabInteractionDetector.ModeOnSelect; + Assert.AreEqual(grabMode, grabInteractionDetector.ModeOnDetection); yield return RuntimeTestUtilities.WaitForUpdates(); ValidateInteractionModeActive(rightHandController, grabMode); Assert.IsTrue(grabMode.Priority > nearMode.Priority); @@ -167,7 +200,7 @@ public IEnumerator ModeMediationTest() // Moving the hand to a position where its far ray is hovering over the cube yield return rightHand.MoveTo(cube.transform.position + new Vector3(0.02f, -0.1f, -0.8f)); - yield return RuntimeTestUtilities.WaitForUpdates(frameCount:120); + yield return RuntimeTestUtilities.WaitForUpdates(frameCount: 120); ValidateInteractionModeActive(rightHandController, farRayMode); } @@ -181,33 +214,21 @@ private void ValidateInteractionModeActive(XRBaseController controller, Interact { // We construct the list of managed interactor types manually because we don't want to expose the internal controller mapping implementation to even internal use, since // we don't want any other class to be able to modify those collections without going through the Mode Manager or its in-editor inspector. - HashSet managedInteractorTypes = new HashSet(InteractionModeManager.Instance.PrioritizedInteractionModes.SelectMany(x => x.AssociatedTypes)); - HashSet activeInteractorTypes = InteractionModeManager.Instance.PrioritizedInteractionModes.Find(x => x.ModeName == currentMode.Name).AssociatedTypes; - - // Ensure the prox detector has actually had the desired effect of enabling/disabling interactors. - foreach (System.Type interactorType in managedInteractorTypes) + HashSet managedInteractorTypes = new HashSet(); + foreach (InteractionModeDefinition interactionMode in InteractionModeManager.Instance.PrioritizedInteractionModes) { - XRBaseInteractor interactor = controller.GetComponentInChildren(interactorType) as XRBaseControllerInteractor; - if (interactor != null) - { - Assert.AreEqual(activeInteractorTypes.Contains(interactorType), interactor.enabled); - } + managedInteractorTypes.UnionWith(interactionMode.AssociatedTypes); } - } + HashSet activeInteractorTypes = InteractionModeManager.Instance.PrioritizedInteractionModes.Find(x => x.ModeName == currentMode.Name).AssociatedTypes; - // Returns true iff any of the ProximityDetectors in the scene are currently triggered. - private bool AnyProximityDetectorsTriggered() - { - ProximityDetector[] detectors = FindObjectUtility.FindObjectsByType(); - foreach (var detector in detectors) + // Ensure the prox detector has actually had the desired effect of enabling/disabling interactors. + foreach (Type interactorType in managedInteractorTypes) { - if (detector.IsModeDetected()) + if (controller.GetComponentInChildren(interactorType) is XRBaseInputInteractor interactor && interactor != null) { - return true; + Assert.AreEqual(activeInteractorTypes.Contains(interactorType), interactor.enabled); } } - - return false; } } } diff --git a/org.mixedrealitytoolkit.input/Tests/Runtime/InteractionModeManagerTestsForControllerlessRig.cs b/org.mixedrealitytoolkit.input/Tests/Runtime/InteractionModeManagerTestsForControllerlessRig.cs new file mode 100644 index 000000000..164917c09 --- /dev/null +++ b/org.mixedrealitytoolkit.input/Tests/Runtime/InteractionModeManagerTestsForControllerlessRig.cs @@ -0,0 +1,254 @@ +// Copyright (c) Mixed Reality Toolkit Contributors +// Licensed under the BSD 3-Clause + +// Disable "missing XML comment" warning for tests. While nice to have, this documentation is not required. +#pragma warning disable CS1591 + +using MixedReality.Toolkit.Core.Tests; +using MixedReality.Toolkit.Input.Simulation; +using NUnit.Framework; +using System.Collections; +using System.Collections.Generic; +using System.Linq; +using UnityEngine; +using UnityEngine.InputSystem.XR; +using UnityEngine.TestTools; +using UnityEngine.XR.Interaction.Toolkit; +using UnityEngine.XR.Interaction.Toolkit.Interactables; +using UnityEngine.XR.Interaction.Toolkit.Interactors; + +namespace MixedReality.Toolkit.Input.Tests +{ + /// + /// Tests to ensure the proper behavior of the interaction mode manager. + /// + /// + /// This tests are equivalent to those in but they test with the new MRTK Rig that was + /// created for the XRI3 migration. Eventually, this will replace the original when + /// the deprecated pre-XRI3 rig is removed in its entirety from MRTK3. + /// Note: This class contains only the tests that are specific to the XRI3+ rig. Tests that are common to both rigs are in the + /// original . Once the XRI3 migration is completed by removing all the pre-XRI3 + /// prefabs then those tests can be moved to this class. + /// + public class InteractionModeManagerTestsForControllerlessRig : BaseRuntimeInputTests + { + /// + /// Tests that the proximity detector detects when to change the hand's interaction mode and properly toggles the associated interactors. + /// Also checks that the proximity detector doesn't trigger hovers on other objects + /// + /// + /// This test is the XRI3+ equivalent of + /// + [UnityTest] + public IEnumerator ProximityDetectorTest() + { + var cube = GameObject.CreatePrimitive(PrimitiveType.Cube); + cube.transform.position = new Vector3(1.0f, 0.1f, 1.0f); + cube.transform.localScale = Vector3.one * 0.1f; + cube.AddComponent(); + + var rightHand = new TestHand(Handedness.Right); + yield return rightHand.Show(new Vector3(0, 0, 0.5f)); + yield return RuntimeTestUtilities.WaitForUpdates(); + + TrackedPoseDriver rightHandTrackedPoseDriver = CachedTrackedPoseDriverLookup.RightHandTrackedPoseDriver; + Assert.IsTrue(rightHandTrackedPoseDriver != null, "Right hand TrackedPoseDriver was not found."); + + // Magic number is tuned for a prox detector on the index tip with + // a radius (collider) of 0.12. This is so that the prox detector should + // overlap with the cube, but none of the interactors will. + yield return rightHand.MoveTo(cube.transform.position + Vector3.back * 0.12f); + yield return RuntimeTestUtilities.WaitForUpdates(); + + Assert.IsFalse(cube.GetComponent().isHovered, + "Interactable was hovered when it shouldn't have been. Was the radius of any of the interactors changed, or is a proximity detector firing hovers?"); + + Assert.IsTrue(AnyProximityDetectorsTriggered(), + "The proximity detector should have detected the cube. Was the detector's radius changed, or is it broken?"); + + InteractionMode currentMode = rightHandTrackedPoseDriver.transform.parent.GetComponentInChildren().ModeOnDetection; + ValidateInteractionModeActive(rightHandTrackedPoseDriver, currentMode); + + yield return null; + } + + /// + /// Tests the basic Interaction detector. The hand should enter one mode during hover, another during select, and fall back to the default mode during neither + /// + /// + /// This test is the XRI3+ equivalent of . + /// + [UnityTest] + public IEnumerator InteractionDetectorTest() + { + var cube = GameObject.CreatePrimitive(PrimitiveType.Cube); + cube.transform.position = InputTestUtilities.InFrontOfUser(1.5f); + cube.transform.localScale = Vector3.one * 0.2f; + cube.AddComponent(); + + var rightHand = new TestHand(Handedness.Right); + yield return rightHand.Show(InputTestUtilities.InFrontOfUser()); + yield return RuntimeTestUtilities.WaitForUpdates(); + + TrackedPoseDriver rightHandTrackedPoseDriver = CachedTrackedPoseDriverLookup.RightHandTrackedPoseDriver; + Assert.IsTrue(rightHandTrackedPoseDriver != null, "No tracked pose driver found for right hand."); + + // Moving the hand to a position where it's far ray is hovering over the cube + yield return rightHand.AimAt(cube.transform.position); + yield return RuntimeTestUtilities.WaitForUpdates(); + + InteractionDetector interactionDetector = rightHandTrackedPoseDriver.transform.parent.GetComponentInChildren().GetComponent(); + + InteractionMode expectedMode = interactionDetector.ModeOnHover; + Assert.AreEqual(expectedMode, interactionDetector.ModeOnDetection); + ValidateInteractionModeActive(rightHandTrackedPoseDriver, expectedMode); + + // Select the cube and check that we're in the correct mode + yield return rightHand.SetHandshape(HandshapeTypes.HandshapeId.Grab); + yield return RuntimeTestUtilities.WaitForUpdates(); + expectedMode = interactionDetector.ModeOnSelect; + Assert.AreEqual(expectedMode, interactionDetector.ModeOnDetection); + ValidateInteractionModeActive(rightHandTrackedPoseDriver, expectedMode); + + // Release the selection and move the hand far away and validate that we are in the default mode + yield return rightHand.SetHandshape(HandshapeTypes.HandshapeId.Open); + yield return RuntimeTestUtilities.WaitForUpdates(); + yield return rightHand.MoveTo(cube.transform.position + new Vector3(3.0f, 0, 0)); + yield return RuntimeTestUtilities.WaitForUpdates(); + expectedMode = InteractionModeManager.Instance.DefaultMode; + ValidateInteractionModeActive(rightHandTrackedPoseDriver, expectedMode); + + // Put the hand into a grab state and validate that we are in the default mode, since we're not selecting an object + yield return rightHand.SetHandshape(HandshapeTypes.HandshapeId.Grab); + yield return RuntimeTestUtilities.WaitForUpdates(); + ValidateInteractionModeActive(rightHandTrackedPoseDriver, expectedMode); + + // Release the grab state and validate that we are in the default mode + yield return rightHand.SetHandshape(HandshapeTypes.HandshapeId.Open); + yield return RuntimeTestUtilities.WaitForUpdates(); + ValidateInteractionModeActive(rightHandTrackedPoseDriver, expectedMode); + } + + /// + /// Tests that mode mediation works properly. + /// + /// + /// The interaction mode with the higher priority should be the valid one which affects the hand. + /// This test operates on the basic assumption that the priority order is FarRayHover < Near < GrabSelect. + /// This test is the XRI3+ equivalent of . + /// + [UnityTest] + public IEnumerator ModeMediationTest() + { + var cube = GameObject.CreatePrimitive(PrimitiveType.Cube); + cube.transform.position = InputTestUtilities.InFrontOfUser(1.5f); + cube.transform.localScale = Vector3.one * 0.2f; + cube.AddComponent(); + yield return RuntimeTestUtilities.WaitForUpdates(); + + // Otherwise, poke will conflict with grab. + cube.GetComponent().selectMode = InteractableSelectMode.Multiple; + + var rightHand = new TestHand(Handedness.Right); + yield return rightHand.Show(InputTestUtilities.InFrontOfUser()); + yield return RuntimeTestUtilities.WaitForUpdates(); + + TrackedPoseDriver rightHandTrackedPoseDriver = CachedTrackedPoseDriverLookup.RightHandTrackedPoseDriver; + Assert.IsTrue(rightHandTrackedPoseDriver != null, "Right hand TrackedPoseDriver was not found."); + + // Grab stabilization == ray stabilization + InputTestUtilities.SetHandAnchorPoint(Handedness.Right, ControllerAnchorPoint.Device); + yield return RuntimeTestUtilities.WaitForUpdates(); + + // Moving the hand to a position where it's far ray is hovering over the cube + yield return rightHand.AimAt(cube.transform.position); + yield return RuntimeTestUtilities.WaitForUpdates(); + + InteractionDetector rightHandInteractionDetector = rightHandTrackedPoseDriver.transform.parent.GetComponentInChildren().GetComponent(); + + InteractionMode farRayMode = rightHandInteractionDetector.ModeOnHover; + yield return RuntimeTestUtilities.WaitForUpdates(); + Assert.AreEqual(farRayMode, rightHandInteractionDetector.ModeOnDetection); + ValidateInteractionModeActive(rightHandTrackedPoseDriver, farRayMode); + + // Now move the hand in range for the proximity detector + yield return rightHand.MoveTo(cube.transform.position - Vector3.forward * 0.09f); + yield return RuntimeTestUtilities.WaitForUpdates(); + + InteractionMode nearMode = rightHandTrackedPoseDriver.transform.parent.GetComponentInChildren().ModeOnDetection; + yield return RuntimeTestUtilities.WaitForUpdates(); + ValidateInteractionModeActive(rightHandTrackedPoseDriver, nearMode); + Assert.IsTrue(nearMode.Priority > farRayMode.Priority); + + // Finally move in for a grab + yield return rightHand.MoveTo(cube.transform.position); + yield return RuntimeTestUtilities.WaitForUpdates(); + yield return rightHand.SetHandshape(HandshapeTypes.HandshapeId.Grab); + yield return RuntimeTestUtilities.WaitForUpdates(); + + rightHandInteractionDetector = rightHandTrackedPoseDriver.transform.parent.GetComponentInChildren().GetComponent(); + InteractionMode grabMode = rightHandInteractionDetector.ModeOnSelect; + Assert.AreEqual(grabMode, rightHandInteractionDetector.ModeOnDetection); + yield return RuntimeTestUtilities.WaitForUpdates(); + ValidateInteractionModeActive(rightHandTrackedPoseDriver, grabMode); + Assert.IsTrue(grabMode.Priority > nearMode.Priority); + + // Run it all in reverse and make sure the interaction stack is in order + // Now move the hand in range for the proximity detector + yield return rightHand.SetHandshape(HandshapeTypes.HandshapeId.Open); + yield return RuntimeTestUtilities.WaitForUpdates(); + yield return rightHand.MoveTo(cube.transform.position - Vector3.forward * 0.09f); + yield return RuntimeTestUtilities.WaitForUpdates(); + + ValidateInteractionModeActive(rightHandTrackedPoseDriver, nearMode); + + // Moving the hand to a position where it's far ray is hovering over the cube + yield return rightHand.MoveTo(cube.transform.position + new Vector3(0.02f, -0.1f, -0.8f)); + yield return RuntimeTestUtilities.WaitForUpdates(frameCount:120); + + ValidateInteractionModeActive(rightHandTrackedPoseDriver, farRayMode); + } + + /// + /// Validates that an interaction mode is active for the specified hand + /// + /// + /// This method is the XRI3+ equivalent of + /// + /// The hand we are checking + /// The interaction mode we expect to be active for the hand + private void ValidateInteractionModeActive(TrackedPoseDriver handTrackedPoseDriver, InteractionMode currentMode) + { + // We construct the list of managed interactor types manually because we don't want to expose the internal mapping implementation to even internal use, since + // we don't want any other class to be able to modify those collections without going through the Mode Manager or its in-editor inspector. + HashSet managedInteractorTypes = new HashSet(InteractionModeManager.Instance.PrioritizedInteractionModes.SelectMany(x => x.AssociatedTypes)); + HashSet activeInteractorTypes = InteractionModeManager.Instance.PrioritizedInteractionModes.Find(x => x.ModeName == currentMode.Name).AssociatedTypes; + + // Ensure the prox detector has actually had the desired effect of enabling/disabling interactors. + foreach (System.Type interactorType in managedInteractorTypes) + { + XRBaseInteractor interactor = handTrackedPoseDriver.GetComponentInChildren(interactorType) as XRBaseInputInteractor; + if (interactor != null) + { + Assert.AreEqual(activeInteractorTypes.Contains(interactorType), interactor.enabled); + } + } + } + + // Returns true if and only if any of the ProximityDetectors in the scene are currently triggered. + internal static bool AnyProximityDetectorsTriggered() + { + ProximityDetector[] detectors = Object.FindObjectsByType(FindObjectsSortMode.InstanceID); + foreach (var detector in detectors) + { + if (detector.IsModeDetected()) + { + return true; + } + } + + return false; + } + } +} +#pragma warning restore CS1591 diff --git a/org.mixedrealitytoolkit.input/Tests/Runtime/InteractionModeManagerTestsForControllerlessRig.cs.meta b/org.mixedrealitytoolkit.input/Tests/Runtime/InteractionModeManagerTestsForControllerlessRig.cs.meta new file mode 100644 index 000000000..d87003909 --- /dev/null +++ b/org.mixedrealitytoolkit.input/Tests/Runtime/InteractionModeManagerTestsForControllerlessRig.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 060ea3864582a6d408fba31dd42f7be1 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/org.mixedrealitytoolkit.input/Tests/Runtime/MRTKRayInteractorVisualsTests.cs b/org.mixedrealitytoolkit.input/Tests/Runtime/MRTKRayInteractorVisualsTests.cs index 90838f766..a0dcd1d3c 100644 --- a/org.mixedrealitytoolkit.input/Tests/Runtime/MRTKRayInteractorVisualsTests.cs +++ b/org.mixedrealitytoolkit.input/Tests/Runtime/MRTKRayInteractorVisualsTests.cs @@ -17,6 +17,12 @@ namespace MixedReality.Toolkit.Input.Tests /// public class MRTKRayInteractorVisualsTests : BaseRuntimeInputTests { + /// + /// Override of the rig version to use for these tests. These tests validate that the old rig remain functional. + /// The will validate the new rig. + /// + protected override InputTestUtilities.RigVersion RigVersion => InputTestUtilities.RigVersion.Version1; + /// /// Ensure that far ray interactor visuals are set active/inactive appropriately. /// @@ -97,4 +103,4 @@ public IEnumerator ReticleAndLineVisualActiveTest() } } } -#pragma warning restore CS1591 \ No newline at end of file +#pragma warning restore CS1591 diff --git a/org.mixedrealitytoolkit.input/Tests/Runtime/MRTKRayInteractorVisualsTestsForControllerlessRig.cs b/org.mixedrealitytoolkit.input/Tests/Runtime/MRTKRayInteractorVisualsTestsForControllerlessRig.cs new file mode 100644 index 000000000..12ad41464 --- /dev/null +++ b/org.mixedrealitytoolkit.input/Tests/Runtime/MRTKRayInteractorVisualsTestsForControllerlessRig.cs @@ -0,0 +1,111 @@ +// Copyright (c) Mixed Reality Toolkit Contributors +// Licensed under the BSD 3-Clause + +// Disable "missing XML comment" warning for tests. While nice to have, this documentation is not required. +#pragma warning disable CS1591 + +using MixedReality.Toolkit.Core.Tests; +using NUnit.Framework; +using System.Collections; +using UnityEngine; +using UnityEngine.TestTools; + +namespace MixedReality.Toolkit.Input.Tests +{ + /// + /// Tests for verifying the behavior of visuals related to the MRTKRayInteractor for the XRI3+ controllerless MRTK rig. + /// + /// + /// These tests are equivalent to those in but they test with the new MRTK Rig that was + /// created for the XRI3 migration. Eventually, this will replace the original when + /// the deprecated pre-XRI3 rig is removed in its entirety from MRTK3. + /// Note: This class contains only the tests that are specific to the XRI3+ rig. Tests that are common to both rigs are in the + /// original . Once the XRI3 migration is completed by removing all the pre-XRI3 + /// prefabs then those tests can be moved to this class. + /// + public class MRTKRayInteractorVisualsTestsForControllerlessRig : BaseRuntimeInputTests + { + /// + /// Ensure that far ray interactor visuals are set active/inactive appropriately. + /// + /// + /// This test is the XRI3+ equivalent of + /// + [UnityTest] + public IEnumerator ReticleAndLineVisualActiveTest() + { + // Because many of our visual scripts rely on OnBeforeRender, exit early if this test + // is being run in batchmode (which does not render) + if (Application.isBatchMode) + { + Debug.Log("Skipping test ReticleAndLineVisualActiveTest, as it does not work in batch mode settings"); + yield break; + } + + // Disable gaze interactions for this unit test; + InputTestUtilities.DisableGazeInteractor(); + + // set up cube with manipulation handler + var testObject = GameObject.CreatePrimitive(PrimitiveType.Cube); + testObject.transform.localScale = Vector3.one * 0.2f; + Vector3 initialObjectPosition = InputTestUtilities.InFrontOfUser(1f); + testObject.transform.position = initialObjectPosition; + testObject.AddComponent(); + + TestHand hand = new TestHand(Handedness.Right); + yield return hand.Show(Vector3.zero); + yield return RuntimeTestUtilities.WaitForUpdates(); + + // Check that our components are enabled + var lineVisual = CachedTrackedPoseDriverLookup.RightHandTrackedPoseDriver.GetComponentInChildren(); + var reticleVisual = CachedTrackedPoseDriverLookup.RightHandTrackedPoseDriver.GetComponentInChildren(); + Assert.IsTrue(lineVisual.enabled); + Assert.IsTrue(reticleVisual.enabled); + yield return RuntimeTestUtilities.WaitForUpdates(); + + // Check that the ray is active and the reticle is not + Assert.IsTrue(lineVisual.GetComponentInChildren().enabled); + Assert.IsFalse(reticleVisual.Reticle.activeSelf); + + Vector3 hoverPosition = InputTestUtilities.InFrontOfUser(0.6f); + Quaternion hoverRotation = Quaternion.identity; + + yield return hand.MoveTo(hoverPosition); + yield return RuntimeTestUtilities.WaitForUpdates(); + yield return hand.RotateTo(hoverRotation); + yield return RuntimeTestUtilities.WaitForUpdates(); + + // Check that both are active + Assert.IsTrue(lineVisual.GetComponentInChildren().enabled); + Assert.IsTrue(reticleVisual.Reticle.activeSelf); + + // disable the components and check that all visuals are disabled + lineVisual.enabled = false; + reticleVisual.enabled = false; + yield return RuntimeTestUtilities.WaitForUpdates(); + + // Check that both are disabled + Assert.IsFalse(lineVisual.GetComponentInChildren().enabled); + Assert.IsFalse(reticleVisual.Reticle.activeSelf); + + // Make sure they are still disabled after moving the hand back to the inital position + yield return hand.MoveTo(Vector3.zero); + yield return RuntimeTestUtilities.WaitForUpdates(); + yield return hand.RotateTo(Quaternion.identity); + yield return RuntimeTestUtilities.WaitForUpdates(); + + // Check that both are disabled + Assert.IsFalse(lineVisual.GetComponentInChildren().enabled); + Assert.IsFalse(reticleVisual.Reticle.activeSelf); + + // Make sure we are back in the correct visibility state after reactivating the visuals + lineVisual.enabled = true; + reticleVisual.enabled = true; + yield return RuntimeTestUtilities.WaitForUpdates(); + + Assert.IsTrue(lineVisual.GetComponentInChildren().enabled); + Assert.IsFalse(reticleVisual.Reticle.activeSelf); + } + } +} +#pragma warning restore CS1591 diff --git a/org.mixedrealitytoolkit.input/Tests/Runtime/MRTKRayInteractorVisualsTestsForControllerlessRig.cs.meta b/org.mixedrealitytoolkit.input/Tests/Runtime/MRTKRayInteractorVisualsTestsForControllerlessRig.cs.meta new file mode 100644 index 000000000..5ea5a048b --- /dev/null +++ b/org.mixedrealitytoolkit.input/Tests/Runtime/MRTKRayInteractorVisualsTestsForControllerlessRig.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: d78069a0eea3e7f409807184b5f0f021 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/org.mixedrealitytoolkit.input/Tests/Runtime/SpatialMouseInputTests.cs b/org.mixedrealitytoolkit.input/Tests/Runtime/SpatialMouseInputTests.cs index 7a6f88fbb..1f8268ab5 100644 --- a/org.mixedrealitytoolkit.input/Tests/Runtime/SpatialMouseInputTests.cs +++ b/org.mixedrealitytoolkit.input/Tests/Runtime/SpatialMouseInputTests.cs @@ -28,6 +28,12 @@ namespace MixedReality.Toolkit.Input.Tests /// public class SpatialMouseInputTests : BaseRuntimeInputTests { + /// + /// Override of the rig version to use for these tests. These tests validate that the old rig remain functional. + /// The will validate the new rig. + /// + protected override InputTestUtilities.RigVersion RigVersion => InputTestUtilities.RigVersion.Version1; + private const string SpatialMouseControllerPrefabGuid = "dc525621b8522034e867ed2799129315"; private static readonly string SpatialMouseControllerPrefabPath = AssetDatabase.GUIDToAssetPath(SpatialMouseControllerPrefabGuid); @@ -84,7 +90,6 @@ public IEnumerator SpatialMouseInteractorSmokeTest() { ((ButtonControl)mouse["press"]).WriteValueIntoEvent(1f, eventPtr); InputSystem.QueueEvent(eventPtr); - InputSystem.Update(); } yield return RuntimeTestUtilities.WaitForUpdates(); @@ -101,7 +106,6 @@ public IEnumerator SpatialMouseInteractorSmokeTest() { ((ButtonControl)mouse["press"]).WriteValueIntoEvent(0f, eventPtr); InputSystem.QueueEvent(eventPtr); - InputSystem.Update(); } yield return RuntimeTestUtilities.WaitForUpdates(); @@ -154,4 +158,4 @@ public override IEnumerator TearDown() } } } -#pragma warning restore CS1591 \ No newline at end of file +#pragma warning restore CS1591 diff --git a/org.mixedrealitytoolkit.input/Tests/Runtime/SpatialMouseInputTestsForControllerlessRig.cs b/org.mixedrealitytoolkit.input/Tests/Runtime/SpatialMouseInputTestsForControllerlessRig.cs new file mode 100644 index 000000000..89e90efc8 --- /dev/null +++ b/org.mixedrealitytoolkit.input/Tests/Runtime/SpatialMouseInputTestsForControllerlessRig.cs @@ -0,0 +1,96 @@ +// Copyright (c) Mixed Reality Toolkit Contributors +// Licensed under the BSD 3-Clause + +// Disable "missing XML comment" warning for tests. While nice to have, this documentation is not required. +#pragma warning disable CS1591 + +using System.Collections; +using UnityEngine; +using UnityEngine.TestTools; +using System.Collections.Generic; + +using Unity.XR.CoreUtils; +using NUnit.Framework; +using UnityEngine.XR.Interaction.Toolkit; +using MixedReality.Toolkit.Input.Experimental; + + +#if UNITY_EDITOR +using UnityEditor; +#endif + +namespace MixedReality.Toolkit.Input.Tests +{ + /// + /// Basic tests for controllerless SpatialMouseInput. + /// + /// + /// This is an XRI3+ exclusive test. + /// + public class SpatialMouseInputTestsForControllerlessRig : BaseRuntimeInputTests + { + private const string SpatialMouseControllerPrefabGuid = "dc525621b8522034e867ed2799129315"; + private static readonly string SpatialMouseControllerPrefabPath = AssetDatabase.GUIDToAssetPath(SpatialMouseControllerPrefabGuid); + + private static GameObject spatialMouseGameObject; + + private const string CameraOffsetName = "Camera Offset"; + private const string SpatialMouseInteractorName = "SpatialMouseInteractor"; + private const string MouseMoveName = "MouseMove"; + private const string MouseScroll = "MouseScroll"; + + [UnitySetUp] + public override IEnumerator Setup() + { + yield return base.Setup(); + var spatialMouseController = InstantiateSpatialMouseController(); + List rigChildren = new List(); + InputTestUtilities.RigReference.GetChildGameObjects(rigChildren); + var cameraOffset = rigChildren.Find(go => go.name.Equals(CameraOffsetName)); + spatialMouseController.transform.parent = cameraOffset.transform; + yield return null; + } + + /// + /// Verify that the SpatialMouseInteractor has the proper XRI3+ configurations. + /// + /// + /// This is an XRI3+ exclusive test. + /// + [UnityTest] + public IEnumerator SpatialMouseInteractorControllerlessSmokeTest() + { +#pragma warning disable CS0618 // Type or member is obsolete + Assert.IsNull(spatialMouseGameObject.GetComponent()); +#pragma warning restore CS0618 // Type or member is obsolete + + // Check the SpatialMouseController has the SpatialMouseInteractor + List spatialMouseChildren = new List(); + spatialMouseGameObject.GetChildGameObjects(spatialMouseChildren); + var spatialMouseInteractorGameObject = spatialMouseChildren.Find(go => go.name.Equals(SpatialMouseInteractorName)); + var spatialMouseInteractor = spatialMouseInteractorGameObject.GetComponent(); + Assert.IsNotNull(spatialMouseInteractor); + + // Check XRI3+ input action configuration is correct + Assert.IsNotNull(spatialMouseInteractor.mouseMoveAction); + Assert.IsNotNull(spatialMouseInteractor.mouseScrollAction); + Assert.IsNotNull(spatialMouseInteractor.mouseMoveAction.reference); + Assert.IsNotNull(spatialMouseInteractor.mouseScrollAction.reference); + Assert.IsTrue(spatialMouseInteractor.mouseMoveAction.reference.action.name.Equals(MouseMoveName)); + Assert.IsTrue(spatialMouseInteractor.mouseScrollAction.reference.action.name.Equals(MouseScroll)); + + yield return null; + } + + /// + /// Creates and returns the Spatial Mouse Controller. + /// + public static GameObject InstantiateSpatialMouseController() + { + Object prefab = AssetDatabase.LoadAssetAtPath(SpatialMouseControllerPrefabPath, typeof(Object)); + spatialMouseGameObject = Object.Instantiate(prefab) as GameObject; + return spatialMouseGameObject; + } + } +} +#pragma warning restore CS1591 diff --git a/org.mixedrealitytoolkit.input/Tests/Runtime/SpatialMouseInputTestsForControllerlessRig.cs.meta b/org.mixedrealitytoolkit.input/Tests/Runtime/SpatialMouseInputTestsForControllerlessRig.cs.meta new file mode 100644 index 000000000..6da6cc9bf --- /dev/null +++ b/org.mixedrealitytoolkit.input/Tests/Runtime/SpatialMouseInputTestsForControllerlessRig.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 80ce01da1be91f0469217e81133b4628 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/org.mixedrealitytoolkit.input/Tests/Runtime/Utilities/BaseRuntimeInputTests.cs b/org.mixedrealitytoolkit.input/Tests/Runtime/Utilities/BaseRuntimeInputTests.cs index a7e8af74f..8c61a26e1 100644 --- a/org.mixedrealitytoolkit.input/Tests/Runtime/Utilities/BaseRuntimeInputTests.cs +++ b/org.mixedrealitytoolkit.input/Tests/Runtime/Utilities/BaseRuntimeInputTests.cs @@ -6,11 +6,12 @@ using MixedReality.Toolkit.Core.Tests; using System.Collections; +using UnityEngine; using UnityEngine.InputSystem; using UnityEngine.XR.Interaction.Toolkit; -using UnityEngine.XR.Interaction.Toolkit.Inputs.Interactions; using UnityEngine.XR.Interaction.Toolkit.Inputs.Composites; -using UnityEngine; +using UnityEngine.XR.Interaction.Toolkit.Inputs.Interactions; +using static MixedReality.Toolkit.Input.Tests.InputTestUtilities; namespace MixedReality.Toolkit.Input.Tests { @@ -21,6 +22,7 @@ namespace MixedReality.Toolkit.Input.Tests /// public abstract class BaseRuntimeInputTests : BaseRuntimeTests { + // Isolates/sandboxes the input system state for each test instance. private InputTestFixture input = new InputTestFixture(); @@ -36,12 +38,39 @@ protected XRInteractionManager CachedInteractionManager { if (cachedInteractionManager == null) { - cachedInteractionManager = FindObjectUtility.FindAnyObjectByType(); + cachedInteractionManager = Object.FindAnyObjectByType(); } return cachedInteractionManager; } } + private TrackedPoseDriverLookup cachedTrackedPoseDriverLookup; + + /// + /// A cached reference to the on the XRI3+ rig. + /// Cleared during at the end of each test. + /// + protected TrackedPoseDriverLookup CachedTrackedPoseDriverLookup + { + get + { + if (cachedTrackedPoseDriverLookup == null && CachedInteractionManager == null) + { + Debug.LogError("Unable to get a reference to Rig's TrackedPoseDriverLookup because CachedInteractionManager is null."); + return null; + } + cachedTrackedPoseDriverLookup = CachedInteractionManager.gameObject.GetComponent(); + + return cachedTrackedPoseDriverLookup; + } + } + + /// + /// Get the version of the input rig to use with these tests + /// + protected virtual RigVersion RigVersion { get; } = RigVersion.Default; + +#pragma warning disable CS0618 // Type or member is obsolete private ControllerLookup cachedLookup = null; /// @@ -63,24 +92,35 @@ protected ControllerLookup CachedLookup return cachedLookup; } } +#pragma warning restore CS0618 // Type or member is obsolete public override IEnumerator Setup() { yield return base.Setup(); + InputSystemSetup(); + XRISetup(); + + InputTestUtilities.InstantiateRig(RigVersion); + InputTestUtilities.SetupSimulation(0.0f); + + // Wait for simulation HMD to update camera poses + yield return RuntimeTestUtilities.WaitForUpdates(); + } + + private void InputSystemSetup() + { input.Setup(); + InputSystem.onAfterUpdate += OnAfterUpdate; + } - // XRI needs these... ugh + private void XRISetup() + { + // XRI needs these InputSystem.RegisterInteraction(); InputSystem.RegisterBindingComposite(); InputSystem.RegisterBindingComposite(); InputSystem.RegisterBindingComposite(); - - InputTestUtilities.InstantiateRig(); - InputTestUtilities.SetupSimulation(0.0f); - - // Wait for simulation HMD to update camera poses - yield return RuntimeTestUtilities.WaitForUpdates(); } public override IEnumerator TearDown() @@ -90,11 +130,21 @@ public override IEnumerator TearDown() InputTestUtilities.TeardownSimulation(); cachedInteractionManager = null; cachedLookup = null; + cachedTrackedPoseDriverLookup = null; input.TearDown(); + InputSystem.onAfterUpdate -= OnAfterUpdate; yield return base.TearDown(); } + + /// + /// Update the simulation immediately after the input system has updated. For more details see . + /// + private void OnAfterUpdate() + { + InputTestUtilities.UpdateSimulation(); + } } } #pragma warning restore CS1591 diff --git a/org.mixedrealitytoolkit.input/Tests/Runtime/Utilities/InputTestUtilities.cs b/org.mixedrealitytoolkit.input/Tests/Runtime/Utilities/InputTestUtilities.cs index 5ce3c9f8c..3865a0487 100644 --- a/org.mixedrealitytoolkit.input/Tests/Runtime/Utilities/InputTestUtilities.cs +++ b/org.mixedrealitytoolkit.input/Tests/Runtime/Utilities/InputTestUtilities.cs @@ -5,10 +5,14 @@ #pragma warning disable CS1591 using MixedReality.Toolkit.Input.Simulation; +using System; using System.Collections; +using System.Collections.Concurrent; using UnityEngine; using UnityEngine.InputSystem; +using Object = UnityEngine.Object; + #if UNITY_EDITOR using UnityEditor; #endif @@ -22,6 +26,9 @@ public static class InputTestUtilities private const string MRTKRigPrefabGuid = "4d7e2f87fefe0ba468719b15288b46e7"; private static readonly string MRTKRigPrefabPath = AssetDatabase.GUIDToAssetPath(MRTKRigPrefabGuid); + private const string MRTKControllerlessRigPrefabGuid = "acbf65a81ce2cf94f82a0809298acf70"; + private static readonly string MRTKControllerlessRigPrefabPath = AssetDatabase.GUIDToAssetPath(MRTKControllerlessRigPrefabGuid); + private static GameObject rigReference; private static bool isEyeGazeTracking = true; @@ -37,6 +44,13 @@ public static class InputTestUtilities /// private const int ControllerMoveStepsSlow = 60; + /// + /// The currently requested hand updates. Only the oldest hand update will be processed. + /// Once a hand update is completed, it will be removed from the queue, and the next + /// hand update will be processed. + /// + private static ConcurrentQueue HandUpdates = new ConcurrentQueue(); + /// /// If true, the controller movement test steps will take a longer number of frames. This is especially /// useful for seeing motion in play mode tests (where the default smaller number of frames tends @@ -44,7 +58,7 @@ public static class InputTestUtilities /// to ensure that tests will run quickly in general, and can be set to true manually in specific /// test cases using the example below. /// - /// + /// /// /// [UnityTest] /// public IEnumerator YourTestCase() @@ -83,6 +97,11 @@ public static bool IsEyeGazeTracking } } + /// + /// Holds a reference to the rig used by Unity-tests + /// + public static GameObject RigReference => rigReference; + /// /// A sentinel value used by controller test utilities to indicate that the default number of move /// steps should be used or not. @@ -111,10 +130,13 @@ public static bool IsEyeGazeTracking /// /// Creates and returns the MRTK rig. /// - public static GameObject InstantiateRig() + public static GameObject InstantiateRig(RigVersion version) { - Object rigPrefab = AssetDatabase.LoadAssetAtPath(MRTKRigPrefabPath, typeof(Object)); + Debug.Assert(rigReference == null, "RigReference should be null before creating a new rig."); + + Object rigPrefab = AssetDatabase.LoadAssetAtPath(version == RigVersion.Version1 ? MRTKRigPrefabPath : MRTKControllerlessRigPrefabPath, typeof(Object)); rigReference = Object.Instantiate(rigPrefab) as GameObject; + return rigReference; } @@ -188,7 +210,8 @@ public static void TeardownRig() { if (Application.isPlaying) { - UnityEngine.Object.Destroy(rigReference); + Object.Destroy(rigReference); + rigReference = null; } } @@ -197,7 +220,7 @@ public static void TeardownRig() /// /// /// This will create two object, a - /// object, and the associated objects. + /// object, and the associated objects. /// /// /// Optional value for ray smoothing halflife, handy for suppressing smoothing during automated tests. @@ -232,6 +255,20 @@ public static void SetupSimulation(float rayHalfLife = 0.01f) InitializeCameraToOriginAndForward(); } + /// + /// Invoked to tick the update of hands. Calling this is required to process hand updates and move the hands to their new positions. + /// + public static void UpdateSimulation() + { + if (HandUpdates.TryPeek(out HandUpdate handUpdate)) + { + if (handUpdate.Update()) + { + HandUpdates.TryDequeue(out _); + } + } + } + /// /// Disposes of simulated input devices. /// @@ -262,7 +299,7 @@ public static IEnumerator SetHandTrackingState(Handedness handedness, bool isTra /// /// /// - /// This moves the hand from to , rotates the hand from + /// This moves the hand from to , rotates the hand from /// to , and smooths the handshape /// based on the provided over the number of steps provided by . /// @@ -278,44 +315,24 @@ public static IEnumerator UpdateHand( int numSteps = ControllerMoveStepsSentinelValue) { Debug.Assert(handedness == Handedness.Right || handedness == Handedness.Left, "handedness must be either right or left"); - bool isPinching = handshapeId == HandshapeId.Grab || handshapeId == HandshapeId.Pinch || handshapeId == HandshapeId.PinchSteadyWrist; - - numSteps = CalculateNumSteps(numSteps); - - SimulatedController controller = handedness == Handedness.Right ? rightController : leftController; - ControllerControls controls = handedness == Handedness.Right ? rightControls : leftControls; - ControllerAnchorPoint anchorPoint = handedness == Handedness.Right ? rightControllerSettings.AnchorPoint : leftControllerSettings.AnchorPoint; - - float startPinch = controls.TriggerAxis; - - for (int i = 1; i <= numSteps; i++) + var handUpdate = new HandUpdate(new HandUpdateRequest() { - float t = i / (float)numSteps; + totalSteps = CalculateNumSteps(numSteps), - Pose handPose = new Pose( - Vector3.Lerp(startPosition, endPosition, t), - Quaternion.Lerp(startRotation, endRotation, t) - ); - float pinchAmount = Mathf.Lerp(startPinch, isPinching ? 1 : 0, t); + startPosition = startPosition, + endPosition = endPosition, + startRotation = startRotation, + endRotation = endRotation, - controls.TriggerButton = pinchAmount >= InputSystem.settings.defaultButtonPressPoint; - controls.TriggerAxis = pinchAmount; - switch (anchorPoint) - { - // We always pass in useRayVector = false during unit tests, because we always want the pointerPosition - // to match the devicePosition so that we can aim the "hand" wherever we'd like. Otherwise, we'd - // be using the generated hand-joint-based ray vector which is unreliable to aim from automated tests. - case ControllerAnchorPoint.Device: - controller.UpdateAbsolute(handPose, controls, ControllerRotationMode.UserControl, false); - break; - case ControllerAnchorPoint.IndexFinger: - controller.UpdateAbsoluteWithPokeAnchor(handPose, controls, ControllerRotationMode.UserControl, false); - break; - case ControllerAnchorPoint.Grab: - controller.UpdateAbsoluteWithGrabAnchor(handPose, controls, ControllerRotationMode.UserControl, false); - break; - } + handShape = handshapeId, + controller = handedness == Handedness.Right ? rightController : leftController, + controls = handedness == Handedness.Right ? rightControls : leftControls, + anchorPoint = handedness == Handedness.Right ? rightControllerSettings.AnchorPoint : leftControllerSettings.AnchorPoint + }); + HandUpdates.Enqueue(handUpdate); + while (!handUpdate.IsCompleted) + { yield return null; } } @@ -393,7 +410,7 @@ public static IEnumerator RotateHand( /// /// /// - /// This rotates the hand to , and smooths the handshape based on the provided + /// This rotates the hand to , and smooths the handshape based on the provided /// over the number of steps provided by . /// /// @@ -637,7 +654,7 @@ public static int CalculateNumSteps(int numSteps) /// public static void DisableGazeInteractor() { - FindObjectUtility.FindAnyObjectByType().gameObject.SetActive(false); + Object.FindAnyObjectByType().gameObject.SetActive(false); } /// @@ -648,7 +665,7 @@ public static void DisableGazeInteractor() /// public static void EnableGazeInteractor() { - FindObjectUtility.FindAnyObjectByType().gameObject.SetActive(true); + Object.FindAnyObjectByType().gameObject.SetActive(true); } /// @@ -673,6 +690,168 @@ public static IEnumerator EnableEyeGazeDevice() } yield return null; } + + /// + /// The version of the MRTK rig to create for the tests. + /// + public enum RigVersion + { + /// + /// Use the latest rig for the test. + /// + Default = 0, + + /// + /// Force the use of the legacy rig for the test. This legacy rig uses deprecated XRI controller components. + /// + Version1 = 1, + + /// + /// Force the use of a rig that does not use the deprecated XRI controller components, but still utilizes + /// all the custom MRTK interactors. + /// + Version2 = 2, + } + + /// + /// Represents the state of a hand update request. + /// + internal struct HandUpdateRequest + { + /// + /// The total number of steps for this update to take. + /// + public int totalSteps; + + /// + /// The starting position of the hand. + /// + public Vector3 startPosition; + + /// + /// The ending position of the hand. The hand will be at this position once the update completes. + /// + public Vector3 endPosition; + + /// + /// The starting rotation of the hand. + /// + public Quaternion startRotation; + + /// + /// The ending rotation of the hand. The hand will be at this rotation once the update completes. + /// + public Quaternion endRotation; + + /// + /// The shape of the hand. If the shape is , , or + /// , the hand is considered to be pinching. + /// + public HandshapeId handShape; + + /// + /// The simulated controller that represents the hand. This is the controller that will be updated, moved, + /// and rotated. + /// + public SimulatedController controller; + + /// + /// The controller controls belonging to the hand that will be updated. The pinching amount will be applied to this. + /// + public ControllerControls controls; + + /// + /// The position of the controller's anchor point. + /// + public ControllerAnchorPoint anchorPoint; + } + + /// + /// The update progress of the hand controllers. + /// + /// + /// This allows updates to be executed at a particular time within the update loop. For example, the caller + /// may want hand's updates to tick immediately after the input system has performed its updates. This can + /// be important since the input system is particular on when and input action is "performed this frame". + /// Updates to the hand controller can result in a selection action to be trigger. In order for an action to + /// work, the update times of an input action's + /// need to match exactly with the frame counter the action was actually updated in, see + /// `InputSystem.LowLevel.InputUpdate.s_UpdateStepCount`. This counter, `InputUpdate.s_UpdateStepCount`, is + /// updated during and before is + /// updated. This means that the hand controller updates need to happen during + /// so that is able see a proper update of the hand controller's selection. + /// + internal class HandUpdate + { + private int currentStep = 1; + private HandUpdateRequest request; + private bool firstUpdate = true; + private float startingPinchAmount = 0.0f; + private bool isPinching = false; + + public HandUpdate(HandUpdateRequest request) + { + if (request.controls == null || request.controller == null) + { + throw new ArgumentNullException("Invalid argument used when creating a new HandUpdate object."); + } + this.request = request; + } + + /// + /// Get if the hand update is completed. This is true when the hand has reached its final position and rotation. + /// + public bool IsCompleted => currentStep > request.totalSteps; + + /// + /// Update the hand controller based on the given update state. Returns true if the hand update was completed. + /// + public bool Update() + { + if (IsCompleted) + { + return true; + } + + if (firstUpdate) + { + firstUpdate = false; + startingPinchAmount = request.controls.TriggerAxis; + isPinching = request.handShape == HandshapeId.Grab || + request.handShape == HandshapeId.Pinch || + request.handShape == HandshapeId.PinchSteadyWrist; + } + + float t = currentStep / (float)request.totalSteps; + + Pose handPose = new Pose( + Vector3.Lerp(request.startPosition, request.endPosition, t), + Quaternion.Lerp(request.startRotation, request.endRotation, t) + ); + float pinchAmount = Mathf.Lerp(startingPinchAmount, isPinching ? 1 : 0, t); + + request.controls.TriggerButton = pinchAmount >= InputSystem.settings.defaultButtonPressPoint; + request.controls.TriggerAxis = pinchAmount; + switch (request.anchorPoint) + { + // We always pass in useRayVector = false during unit tests, because we always want the pointerPosition + // to match the devicePosition so that we can aim the "hand" wherever we'd like. Otherwise, we'd + // be using the generated hand-joint-based ray vector which is unreliable to aim from automated tests. + case ControllerAnchorPoint.Device: + request.controller.UpdateAbsolute(handPose, request.controls, ControllerRotationMode.UserControl, false); + break; + case ControllerAnchorPoint.IndexFinger: + request.controller.UpdateAbsoluteWithPokeAnchor(handPose, request.controls, ControllerRotationMode.UserControl, false); + break; + case ControllerAnchorPoint.Grab: + request.controller.UpdateAbsoluteWithGrabAnchor(handPose, request.controls, ControllerRotationMode.UserControl, false); + break; + } + + currentStep++; + return IsCompleted; + } + } } } #pragma warning restore CS1591 diff --git a/org.mixedrealitytoolkit.input/Tracking/HandPoseDriver.cs b/org.mixedrealitytoolkit.input/Tracking/HandPoseDriver.cs new file mode 100644 index 000000000..537522a51 --- /dev/null +++ b/org.mixedrealitytoolkit.input/Tracking/HandPoseDriver.cs @@ -0,0 +1,289 @@ +// Copyright (c) Mixed Reality Toolkit Contributors +// Licensed under the BSD 3-Clause + +using UnityEngine; +using UnityEngine.InputSystem; +using UnityEngine.InputSystem.XR; +using UnityEngine.XR; + +namespace MixedReality.Toolkit.Input +{ + /// + /// This allows for a hand pose driver to be used with hand tracking devices that do not have an interaction profile. + /// + /// + /// This should be removed once there are universal hand interaction profile(s) across vendors. + /// + public class HandPoseDriver : TrackedPoseDriver + { + private static readonly Quaternion rightPalmOffset = Quaternion.Inverse( + new Quaternion( + Mathf.Sqrt(0.125f), + Mathf.Sqrt(0.125f), + -Mathf.Sqrt(1.5f) / 2.0f, + Mathf.Sqrt(1.5f) / 2.0f)); + + private static readonly Quaternion leftPalmOffset = Quaternion.Inverse( + new Quaternion( + Mathf.Sqrt(0.125f), + -Mathf.Sqrt(0.125f), + Mathf.Sqrt(1.5f) / 2.0f, + Mathf.Sqrt(1.5f) / 2.0f)); + + private bool m_firstUpdate = true; + private InputAction m_boundTrackingAction = null; + private InputTrackingState m_trackingState = InputTrackingState.None; + private const InputTrackingState m_polyfillTrackingState = InputTrackingState.Position | InputTrackingState.Rotation; + + /// + /// Expose the tracking state for the hand pose driver, to allow to query it. + /// + /// + /// Avoid exposing this publicly as this is a workaround solution to support hand tracking on devices without interaction profiles. + /// + internal InputTrackingState CachedTrackingState => IsPolyfillDevicePose ? m_polyfillTrackingState : m_trackingState; + + /// + /// Get if the last pose set was from a polyfill device pose. That is, if the last pose originated from the . + /// + internal bool IsPolyfillDevicePose { get; private set; } + + #region Serialized Fields + + [Header("Hand Pose Driver Settings")] + + [SerializeField, Tooltip("The XRNode associated with this Hand Controller. Expected to be XRNode.LeftHand or XRNode.RightHand.")] + private XRNode handNode; + + /// + /// The XRNode associated with this Hand Controller. + /// + /// Expected to be XRNode.LeftHand or XRNode.RightHand. + public XRNode HandNode => handNode; + + #endregion Serialized Fields + + #region TrackedPoseDriver Overrides + + /// + protected override void PerformUpdate() + { + base.PerformUpdate(); + + if (m_firstUpdate || + m_boundTrackingAction != trackingStateInput.action) + { + OnFirstUpdate(); + m_firstUpdate = false; + } + + // In case the pose input actions are not provided or not bound to a control, we will try to query the + // `HandsAggregator` subsystem for the device's pose. This logic and class should be removed once we + // have universal hand interaction profile(s) across vendors. + // + // Note, for this workaround we need to consider the fact that the positon and rotation can be bound + // to a control, but the control may not be active even if the tracking state is valid. So we need to + // check if there's an active control before using the position and rotation values. If there's no active + // this means the action was not updated this frame and we should use the polyfill pose. + + bool missingPositionController = + (trackingType == TrackingType.RotationAndPosition || trackingType == TrackingType.PositionOnly) && + (positionInput.action == null || !positionInput.action.HasAnyControls() || positionInput.action.activeControl == null); + + bool missingRotationController = + (trackingType == TrackingType.RotationAndPosition || trackingType == TrackingType.RotationOnly) && + (rotationInput.action == null || !rotationInput.action.HasAnyControls() || rotationInput.action.activeControl == null); + + // We will also check the tracking state here to account for a bound action but untracked interaction profile. + if ((missingPositionController || missingRotationController || IsTrackingNone()) && + TryGetPolyfillDevicePose(out Pose devicePose)) + { + IsPolyfillDevicePose = true; + ForceSetLocalTransform(devicePose.position, devicePose.rotation); + } + else + { + IsPolyfillDevicePose = false; + } + } + + #endregion TrackedPoseDriver Overrides + + #region Private Functions + + /// + /// Check the tracking state here to account for a bound but untracked interaction profile. + /// This could show up on runtimes where a controller is disconnected, hand tracking spins up, + /// but the interaction profile is not cleared. This is allowed, per-spec: "The runtime may + /// return the last-known interaction profile in the event that no controllers are active." + /// + private bool IsTrackingNone() + { + return m_trackingState == InputTrackingState.None; + } + + /// + /// Workaround for missing device pose on devices without interaction profiles + /// for hands, such as Varjo and Quest. Should be removed once we have universal + /// hand interaction profile(s) across vendors. + /// + private bool TryGetPolyfillDevicePose(out Pose devicePose) + { + bool poseRetrieved = false; + + // palmPose retrieved in global space. + if (XRSubsystemHelpers.HandsAggregator != null && + XRSubsystemHelpers.HandsAggregator.TryGetJoint(TrackedHandJoint.Palm, HandNode, out HandJointPose palmPose)) + { + // XRControllers work in OpenXR scene-origin-space, so we need to transform + // our global palm pose back into scene-origin-space. + devicePose = PlayspaceUtilities.InverseTransformPose(palmPose.Pose); + + Handedness handedness = HandNode.ToHandedness(); + switch (handedness) + { + case Handedness.Left: + devicePose.rotation *= leftPalmOffset; + poseRetrieved = true; + break; + case Handedness.Right: + devicePose.rotation *= rightPalmOffset; + poseRetrieved = true; + break; + default: + Debug.LogError("No polyfill available for device with handedness " + handedness); + devicePose = Pose.identity; + poseRetrieved = false; + break; + }; + } + else + { + devicePose = Pose.identity; + } + + return poseRetrieved; + } + + /// + /// Sets the transform that is being driven by the . This will only set requested values, but regardless of tracking state. + /// + /// The new local position to possibly set. + /// The new local rotation to possibly set. + protected virtual void ForceSetLocalTransform(Vector3 newPosition, Quaternion newRotation) + { + if (trackingType == TrackingType.RotationAndPosition) + { + transform.SetLocalPositionAndRotation(newPosition, newRotation); + return; + } + + if (trackingType == TrackingType.RotationAndPosition || + trackingType == TrackingType.RotationOnly) + { + transform.localRotation = newRotation; + } + + if (trackingType == TrackingType.RotationAndPosition || + trackingType == TrackingType.PositionOnly) + { + transform.localPosition = newPosition; + } + } + + /// + /// The base class hasn't made OnEnable virtual, so we need to bind to tracking state updates + /// in the first update. If base ever makes OnEnable virtual, we can move binding to OnEnabled. + /// + private void OnFirstUpdate() + { + UnbindTrackingState(); + BindTrackingState(); + ForceTrackingStateUpdate(); + } + + /// + /// The base class has not made OnDisable virtual, so we need to check for disablement in + /// tracking state callbacks. If base ever make OnDisable virtual, we can unbind in OnDisable instead. + /// + private bool HandleDisablement() + { + // If backing native object has been destroyed (this == null) or component is + // disabled, we should unbind the tracking state updates. + if (this == null || !isActiveAndEnabled || !Application.isPlaying) + { + UnbindTrackingState(); + return true; + } + else + { + return false; + } + } + + /// + /// Force an update of the tracking state from the Input Action Reference. + /// + private void ForceTrackingStateUpdate() + { + // Note, that the logic in this class is meant to reproduce the same logic as the base. The base + // `TrackedPoseDriver` also sets the tracking state in a similar manner. Please see + // `TrackedPoseDriver::ReadTrackingState`. Replicating this logic in a subclass is not ideal, but it is + // necessary since the base class does not expose the tracking state logic. + m_trackingState = this.GetInputTrackingStateNoCache(); + } + + /// + /// Listen for tracking state changes and update the tracking state. + /// + private void BindTrackingState() + { + if (m_boundTrackingAction != null) + { + return; + } + + m_boundTrackingAction = trackingStateInput.action; + if (m_boundTrackingAction == null) + { + return; + } + + m_boundTrackingAction.performed += OnTrackingStateInputPerformed; + m_boundTrackingAction.canceled += OnTrackingStateInputCanceled; + } + + /// + /// Stop listening for tracking state changes. + /// + private void UnbindTrackingState() + { + if (m_boundTrackingAction == null) + { + return; + } + + m_boundTrackingAction.performed -= OnTrackingStateInputPerformed; + m_boundTrackingAction.canceled -= OnTrackingStateInputCanceled; + m_boundTrackingAction = null; + } + + private void OnTrackingStateInputPerformed(InputAction.CallbackContext context) + { + if (!HandleDisablement()) + { + m_trackingState = (InputTrackingState)context.ReadValue(); + } + } + + private void OnTrackingStateInputCanceled(InputAction.CallbackContext context) + { + if (!HandleDisablement()) + { + m_trackingState = InputTrackingState.None; + } + } + + #endregion Private Functions + } +} diff --git a/org.mixedrealitytoolkit.input/Tracking/HandPoseDriver.cs.meta b/org.mixedrealitytoolkit.input/Tracking/HandPoseDriver.cs.meta new file mode 100644 index 000000000..61eadab39 --- /dev/null +++ b/org.mixedrealitytoolkit.input/Tracking/HandPoseDriver.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 5af98ad782bb7df43838b825cd681336 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/org.mixedrealitytoolkit.input/Tracking/TrackedPoseDriverExtensions.cs b/org.mixedrealitytoolkit.input/Tracking/TrackedPoseDriverExtensions.cs new file mode 100644 index 000000000..3660ee55e --- /dev/null +++ b/org.mixedrealitytoolkit.input/Tracking/TrackedPoseDriverExtensions.cs @@ -0,0 +1,125 @@ +// Copyright (c) Mixed Reality Toolkit Contributors +// Licensed under the BSD 3-Clause + +using UnityEngine.InputSystem; +using UnityEngine.InputSystem.XR; +using UnityEngine.XR; + +namespace MixedReality.Toolkit.Input +{ + /// + /// Extensions for Unity's + /// + public static class TrackedPoseDriverExtensions + { + /// + /// Gets the tracking state of the . If the tracking state is not available, returns false. + /// + public static bool TryGetTrackingState(this TrackedPoseDriver driver, out InputTrackingState state) + { + state = InputTrackingState.None; + var trackingStateAction = driver.trackingStateInput.action; + if (trackingStateAction == null || trackingStateAction.bindings.Count == 0) + { + return false; + } + + if (!trackingStateAction.enabled) + { + return false; + } + + if (!trackingStateAction.HasAnyControls()) + { + return false; + } + + state = (InputTrackingState)trackingStateAction.ReadValue(); + return true; + } + + /// + /// Gets the tracking state of the . + /// + /// + /// If the has no tracking state action or the action has no bindings, it will return ` | + /// `. If the action is disabled, it will return ``. If the action has controls, it will return the value of the action. + /// + public static InputTrackingState GetInputTrackingState(this TrackedPoseDriver driver) + { + // If the driver is a HandPoseDriver, return the cached value, instead of hitting the overhead of querying the action. + if (driver is HandPoseDriver handPoseDriver) + { + return handPoseDriver.CachedTrackingState; + } + + return GetInputTrackingStateNoCache(driver); + } + + /// + /// Get if the last pose set was from a polyfill device pose. + /// + /// + /// Returns if the last pose originated from the . + /// + public static bool GetIsPolyfillDevicePose(this TrackedPoseDriver driver) + { + // If the driver is a HandPoseDriver, return the cached value, instead of hitting the overhead of querying the action. + if (driver is HandPoseDriver handPoseDriver) + { + return handPoseDriver.IsPolyfillDevicePose; + } + + return false; + } + + /// + /// Gets the tracking state of the , avoid reading value for internal caches. + /// + /// + /// If the has no tracking state action or the action has no bindings, it will return ` | + /// `. If the action is disabled, it will return ``. If the action has controls, it will return the value of the action. + /// + internal static InputTrackingState GetInputTrackingStateNoCache(this TrackedPoseDriver driver) + { + return GetInputTrackingState(driver.trackingStateInput); + } + + /// + /// Get the input tracking state of the . + /// + /// + /// If the has no tracking state action or the action has no bindings, it will return ` | + /// `. If the action is disabled, it will return ``. If the action has controls, it will return the value of the action. + /// + public static InputTrackingState GetInputTrackingState(this InputActionProperty trackingStateInput) + { + // Note, that the logic in this class is meant to reproduce the same logic as the base. The base + // `TrackedPoseDriver` also sets the tracking state in a similar manner. Please see + // `TrackedPoseDriver::ReadTrackingState`. Replicating this logic in a subclass is not ideal, but it is + // necessary since the base class does not expose its tracking status field. + + var trackingStateAction = trackingStateInput.action; + if (trackingStateAction == null || trackingStateAction.bindings.Count == 0) + { + // Treat an Input Action Reference with no reference the same as + // an enabled Input Action with no authored bindings, and allow driving the Transform pose. + return InputTrackingState.Position | InputTrackingState.Rotation; + } + + if (!trackingStateAction.enabled) + { + // Treat a disabled action as the default None value for the ReadValue call + return InputTrackingState.None; + } + + InputTrackingState result = InputTrackingState.None; + if (trackingStateAction.controls.Count > 0) + { + result = (InputTrackingState)trackingStateAction.ReadValue(); + } + + return result; + } + } +} diff --git a/org.mixedrealitytoolkit.input/Tracking/TrackedPoseDriverExtensions.cs.meta b/org.mixedrealitytoolkit.input/Tracking/TrackedPoseDriverExtensions.cs.meta new file mode 100644 index 000000000..c2d41d299 --- /dev/null +++ b/org.mixedrealitytoolkit.input/Tracking/TrackedPoseDriverExtensions.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 620ff90d95f38224ab928a98ba946918 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/org.mixedrealitytoolkit.input/Tracking/TrackedPoseDriverWithFallback.cs b/org.mixedrealitytoolkit.input/Tracking/TrackedPoseDriverWithFallback.cs new file mode 100644 index 000000000..69e50f311 --- /dev/null +++ b/org.mixedrealitytoolkit.input/Tracking/TrackedPoseDriverWithFallback.cs @@ -0,0 +1,152 @@ +// Copyright (c) Mixed Reality Toolkit Contributors +// Licensed under the BSD 3-Clause + +using UnityEngine; +using UnityEngine.InputSystem; +using UnityEngine.InputSystem.XR; +using UnityEngine.XR; + +namespace MixedReality.Toolkit.Input +{ + /// + /// A specilized version of Unity's that will fallback to other Input System actions for + /// position, rotation, and tracking input actions when 's default input actions cannot + /// provide data. + /// + /// + /// This is useful when the has multiple active devices backing it, and some devices are not being + /// tracked. For example, HoloLens 2 eye gaze might be active but not calibrated, in which case eye gaze tracking + /// state will have no position and no rotation data. In this case, the may want to fallback to head pose. + /// + [DisallowMultipleComponent] + [AddComponentMenu("MRTK/Input/Tracked Pose Driver (with Fallbacks)")] + public class TrackedPoseDriverWithFallback : TrackedPoseDriver + { + #region Fallback actions values + + [SerializeField, Tooltip("The fallback Input System action to use for Position Tracking for this GameObject when the default position input action has no data. Must be a Vector3Control Control.")] + private InputActionProperty fallbackPositionAction; + + /// + /// The fallback Input System action to use for Position Tracking for this GameObject when the default position + /// input action has no data. Must be a Vector3Control Control. + /// + public InputActionProperty FallbackPositionAction => fallbackPositionAction; + + [SerializeField, Tooltip("The fallback Input System action to use for Rotation Tracking for this GameObject when the default rotation input action has no data. Must be a Vector3Control Control.")] + private InputActionProperty fallbackRotationAction; + + /// + /// The fallback Input System action to use for Rotation Tracking for this GameObject when the default rotation + /// input action has no data. Must be a Vector3Control Control. + /// + public InputActionProperty FallbackRotationAction => fallbackRotationAction; + + [SerializeField, Tooltip("The fallback Input System action to get the Tracking State for this GameObject when the default track status action has no data. If not specified, this will fallback to the device's tracking state that drives the position or rotation action. Must be a IntegerControl Control.")] + private InputActionProperty fallbackTrackingStateAction; + + /// + /// The fallback Input System action to get the Tracking State for this GameObject when the default track status + /// action has no data. If not specified, this will fallback to the device's tracking state that drives the position + /// or rotation action. Must be a IntegerControl Control. + /// + public InputActionProperty FallbackTrackingStateAction => fallbackTrackingStateAction; + + #endregion Fallback action values + + #region TrackedPoseDriver Overrides + /// + protected override void PerformUpdate() + { + base.PerformUpdate(); + + if (trackingStateInput.action == null) + { + Debug.LogWarning("TrackedPoseDriverWithFallback.trackingStateInput.action is null, no fallback will be used."); + return; + } + + var hasPositionFallbackAction = fallbackPositionAction != null; + var hasRotationFallbackAction = fallbackRotationAction != null; + + // If default InputTrackingState does not have position and rotation data, + // use fallback if it exists + InputTrackingState inputTrackingState = trackingStateInput.GetInputTrackingState(); + + bool defaultPostionAvailable = + inputTrackingState.HasFlag(InputTrackingState.Position); + + bool defaultRotationAvailable = + inputTrackingState.HasFlag(InputTrackingState.Rotation); + bool defaultPostitionAndRotationDataAvailable = + defaultPostionAvailable && + defaultRotationAvailable; + + // Only allow fallbacks to be used if the default tracking state has no data + InputTrackingState fallbackInputTrackingState = InputTrackingState.None; + if (FallbackTrackingStateAction.action != null && + !defaultPostitionAndRotationDataAvailable) + { + fallbackInputTrackingState = FallbackTrackingStateAction.GetInputTrackingState(); + } + + InputTrackingState fallbackDataUsed = InputTrackingState.None; + Vector3 position = transform.localPosition; + Quaternion rotation = transform.localRotation; + + // If no position data then use the data from the fallback action if it exists + if (!defaultPostionAvailable && + hasPositionFallbackAction && + fallbackInputTrackingState.HasFlag(InputTrackingState.Position)) + { + fallbackDataUsed |= InputTrackingState.Position; + position = fallbackPositionAction.action.ReadValue(); + } + + // If no rotation data then use the data from the fallback action if it exists + if (!defaultRotationAvailable && + hasRotationFallbackAction && + fallbackInputTrackingState.HasFlag(InputTrackingState.Rotation)) + { + fallbackDataUsed |= InputTrackingState.Rotation; + rotation = fallbackRotationAction.action.ReadValue(); + } + + // If either position, rotation, or both data were obtained from fallback actions, + // set the local transform from the fallback actions. + if (fallbackDataUsed != InputTrackingState.None) + { + SetLocalTransformFromFallback(position, rotation, fallbackDataUsed); + } + } + #endregion TrackedPoseDriver Overrides + + #region Private Methods + private void SetLocalTransformFromFallback(Vector3 newPosition, Quaternion newRotation, InputTrackingState currentFallbackTrackingState) + { + var positionValid = ignoreTrackingState || (currentFallbackTrackingState & InputTrackingState.Position) != 0; + var rotationValid = ignoreTrackingState || (currentFallbackTrackingState & InputTrackingState.Rotation) != 0; + + if (trackingType == TrackingType.RotationAndPosition && rotationValid && positionValid) + { + transform.SetLocalPositionAndRotation(newPosition, newRotation); + return; + } + + if (rotationValid && + (trackingType == TrackingType.RotationAndPosition || + trackingType == TrackingType.RotationOnly)) + { + transform.localRotation = newRotation; + } + + if (positionValid && + (trackingType == TrackingType.RotationAndPosition || + trackingType == TrackingType.PositionOnly)) + { + transform.localPosition = newPosition; + } + } + #endregion Private Methods + } +} diff --git a/org.mixedrealitytoolkit.input/Tracking/TrackedPoseDriverWithFallback.cs.meta b/org.mixedrealitytoolkit.input/Tracking/TrackedPoseDriverWithFallback.cs.meta new file mode 100644 index 000000000..085802fb1 --- /dev/null +++ b/org.mixedrealitytoolkit.input/Tracking/TrackedPoseDriverWithFallback.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: a248d282774a21744b8cf69201ce8279 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/org.mixedrealitytoolkit.input/Utilities/AndroidPermissionUtilities.cs b/org.mixedrealitytoolkit.input/Utilities/AndroidPermissionUtilities.cs new file mode 100644 index 000000000..85d9d8729 --- /dev/null +++ b/org.mixedrealitytoolkit.input/Utilities/AndroidPermissionUtilities.cs @@ -0,0 +1,62 @@ +// Copyright (c) Mixed Reality Toolkit Contributors +// Licensed under the BSD 3-Clause + +using UnityEngine; + +#if UNITY_ANDROID && UNITY_OPENXR_PRESENT && !UNITY_EDITOR +using System.Collections.Generic; +using UnityEngine.Android; +using UnityEngine.XR.OpenXR; +#endif + +namespace MixedReality.Toolkit.Input +{ + internal sealed class AndroidPermissionUtilities : MonoBehaviour + { + [SerializeField, Tooltip("A key (OpenXR extension name) value (Android permission string) pairing to request at runtime if the extension is supported and enabled.")] + private Unity.XR.CoreUtils.Collections.SerializableDictionary permissions; + +#if UNITY_ANDROID && UNITY_OPENXR_PRESENT && !UNITY_EDITOR + private void Start() + { + List neededPermissions = new(permissions.Count); + + for (int i = 0; i < permissions.Count; i++) + { + string extensionName = permissions.SerializedItems[i].Key; + string permissionName = permissions.SerializedItems[i].Value; + if (!string.IsNullOrWhiteSpace(extensionName) && + !string.IsNullOrWhiteSpace(permissionName) && + OpenXRRuntime.IsExtensionEnabled(extensionName) && + !Permission.HasUserAuthorizedPermission(permissionName)) + { + neededPermissions.Add(permissionName); + } + } + + if (neededPermissions.Count > 0) + { + PermissionCallbacks callbacks = new(); + callbacks.PermissionDenied += OnPermissionDenied; + callbacks.PermissionGranted += OnPermissionGranted; + Permission.RequestUserPermissions(neededPermissions.ToArray(), callbacks); + Debug.Log($"MRTK is requesting the following permissions for {gameObject.name}: {string.Join(", ", neededPermissions)}."); + } + else + { + Debug.Log($"All permissions for {gameObject.name} already granted for MRTK."); + } + } + + void OnPermissionDenied(string permission) + { + Debug.Log($"{permission} denied or not needed on this runtime ({OpenXRRuntime.name}). MRTK may not work as expected."); + } + + void OnPermissionGranted(string permission) + { + Debug.Log($"{permission} newly granted for MRTK."); + } +#endif + } +} diff --git a/org.mixedrealitytoolkit.input/Utilities/AndroidPermissionUtilities.cs.meta b/org.mixedrealitytoolkit.input/Utilities/AndroidPermissionUtilities.cs.meta new file mode 100644 index 000000000..2f73817de --- /dev/null +++ b/org.mixedrealitytoolkit.input/Utilities/AndroidPermissionUtilities.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 21ebbfc4ef86dda48b0ee21ef7842f90 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/org.mixedrealitytoolkit.input/Utilities/FollowJoint.cs b/org.mixedrealitytoolkit.input/Utilities/FollowJoint.cs index 07375bb36..90f91d0f0 100644 --- a/org.mixedrealitytoolkit.input/Utilities/FollowJoint.cs +++ b/org.mixedrealitytoolkit.input/Utilities/FollowJoint.cs @@ -15,7 +15,7 @@ namespace MixedReality.Toolkit.Input /// not depend on XRI. /// [AddComponentMenu("MRTK/Input/Follow Joint")] - internal class FollowJoint : MonoBehaviour, ISerializationCallbackReceiver + internal class FollowJoint : MonoBehaviour { [SerializeField] [Tooltip("The pose source representing the hand joint this interactor tracks")] @@ -26,54 +26,6 @@ internal class FollowJoint : MonoBehaviour, ISerializationCallbackReceiver /// protected HandJointPoseSource JointPoseSource { get => jointPoseSource; set => jointPoseSource = value; } - // A temporary variable used to migrate instances of FollowJoint to use the jointPoseSource class as the source of truth - // rather than its own separately serialized values. - // TODO: Remove this after some time to ensure users have successfully migrated. - [SerializeField, HideInInspector] - private bool migratedSuccessfully = false; - - [SerializeField] - [HideInInspector] - private Handedness hand; - - /// - /// The hand on which to track the joint. - /// - [Obsolete("Please change the Hand value on the jointPoseSource instead")] - protected Handedness Hand { get => JointPoseSource.Hand; set => JointPoseSource.Hand = value; } - - [SerializeField] - [HideInInspector] - private TrackedHandJoint joint; - - /// - /// The specific joint to track. - /// - [Obsolete("Please change the Joint value on the jointPoseSource instead")] - protected TrackedHandJoint Joint { get => JointPoseSource.Joint; set => JointPoseSource.Joint = value; } - - #region ISerializationCallbackReceiver - - void ISerializationCallbackReceiver.OnBeforeSerialize() { } - - /// - /// Using ISerializationCallbackReceiver to ensure that instances of FollowJoint are migrated to the new HandJointPoseSource - /// Doesn't work perfectly due to complications with prefab variants :( - /// - /// TODO: Remove this after some time to ensure users have successfully migrated. - /// - void ISerializationCallbackReceiver.OnAfterDeserialize() - { - if (!migratedSuccessfully) - { - JointPoseSource.Hand = hand; - JointPoseSource.Joint = joint; - migratedSuccessfully = true; - } - } - - #endregion ISerializationCallbackReceiver - /// /// A Unity event function that is called every frame, if this object is enabled. /// diff --git a/org.mixedrealitytoolkit.input/Utilities/HandDataContainer.cs b/org.mixedrealitytoolkit.input/Utilities/HandDataContainer.cs index c2348fac1..3eabb10ac 100644 --- a/org.mixedrealitytoolkit.input/Utilities/HandDataContainer.cs +++ b/org.mixedrealitytoolkit.input/Utilities/HandDataContainer.cs @@ -22,7 +22,7 @@ public abstract class HandDataContainer public bool AlreadyFullQueried { get; protected set; } /// - /// Will be if the the hand joint query as successful. + /// Will be if the hand joint query was successful. /// public bool FullQueryValid { get; protected set; } @@ -41,7 +41,7 @@ public HandDataContainer(XRNode handNode) } /// - /// Reset the hand data query status + /// Reset the hand data query status. /// public void Reset() { @@ -49,16 +49,15 @@ public void Reset() FullQueryValid = false; } - - /// - /// Implemented in derived classes. This method gets all of the joint poses for the hand. + /// + /// Implemented in derived classes. This method gets all of the joint poses for the hand. /// /// The returned list of HandJointPoses /// if the query was successful, otherwise . public abstract bool TryGetEntireHand(out IReadOnlyList joints); - /// - /// Implemented in derived classes. This method gets the specified joint pose. + /// + /// Implemented in derived classes. This method gets the specified joint pose. /// /// The TrackedHandJoint to retrieve the post for. /// The returned HandJointPose. diff --git a/org.mixedrealitytoolkit.input/Utilities/InputActionExtensions.cs b/org.mixedrealitytoolkit.input/Utilities/InputActionExtensions.cs index 4b03d2d86..2f4c2979c 100644 --- a/org.mixedrealitytoolkit.input/Utilities/InputActionExtensions.cs +++ b/org.mixedrealitytoolkit.input/Utilities/InputActionExtensions.cs @@ -13,6 +13,11 @@ public static class InputActionExtensions /// /// Checks if any active controls match this InputAction's bindings. /// + /// + /// We need to consider the fact that the action can be bound to a control, but the control may not be active even + /// if the tracking state is valid. So we need to check if there's an active control before using the action. + /// If there is no active control, MRTK will need to provide a fallback or known failure state. + /// /// if is non-null and there are any number of controls matching its bindings. public static bool HasAnyControls(this InputAction action) { diff --git a/org.mixedrealitytoolkit.input/Utilities/InputTrackingStateExtensions.cs b/org.mixedrealitytoolkit.input/Utilities/InputTrackingStateExtensions.cs index 142664d7e..c39398830 100644 --- a/org.mixedrealitytoolkit.input/Utilities/InputTrackingStateExtensions.cs +++ b/org.mixedrealitytoolkit.input/Utilities/InputTrackingStateExtensions.cs @@ -11,7 +11,7 @@ namespace MixedReality.Toolkit.Input public static class InputTrackingStateExtensions { /// - /// Returns true iff the state is at least both positionally and rotationally tracked. + /// Returns true if and only if the state is at least both positionally and rotationally tracked. /// public static bool HasPositionAndRotation(this InputTrackingState state) { diff --git a/org.mixedrealitytoolkit.input/Utilities/MRTKInputFocusManager.cs b/org.mixedrealitytoolkit.input/Utilities/MRTKInputFocusManager.cs new file mode 100644 index 000000000..73c62d229 --- /dev/null +++ b/org.mixedrealitytoolkit.input/Utilities/MRTKInputFocusManager.cs @@ -0,0 +1,51 @@ +// Copyright (c) Mixed Reality Toolkit Contributors +// Licensed under the BSD 3-Clause + +using UnityEngine; +using UnityEngine.InputSystem; + +namespace MixedReality.Toolkit.Input +{ + /// + /// Manages input based on XrSession focus. + /// + public sealed class MRTKInputFocusManager : MonoBehaviour + { + [SerializeField, Tooltip("A set of input actions to enable/disable according to the app's focus state.")] + private InputActionReference[] inputActionReferences; + + private void OnEnable() + { + MRTKFocusFeature.XrSessionFocused.SubscribeAndUpdate(OnXrSessionFocus); + } + + private void OnDisable() + { + MRTKFocusFeature.XrSessionFocused.Unsubscribe(OnXrSessionFocus); + } + + /// + /// Sent when the XrSession gains or loses focus. + /// + /// if the XrSession has focus, else . + private void OnXrSessionFocus(bool focus) + { + // We want to ensure we're focused for input visualization, as some runtimes continue reporting "tracked" while pose updates are paused. + // This is allowed, per-spec, as a "should": "Runtimes should make input actions inactive while the application is unfocused, + // and applications should react to an inactive input action by skipping rendering of that action's input avatar + // (depictions of hands or other tracked objects controlled by the user)." + + foreach (InputActionReference reference in inputActionReferences) + { + if (focus) + { + reference.action.Enable(); + } + else + { + reference.action.Disable(); + } + } + } + } +} diff --git a/org.mixedrealitytoolkit.input/Utilities/MRTKInputFocusManager.cs.meta b/org.mixedrealitytoolkit.input/Utilities/MRTKInputFocusManager.cs.meta new file mode 100644 index 000000000..ec4c2079a --- /dev/null +++ b/org.mixedrealitytoolkit.input/Utilities/MRTKInputFocusManager.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 671b97df530b06e46893c4189b3ceab4 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/org.mixedrealitytoolkit.input/Utilities/PoseSource/FallbackCompositePoseSource.cs b/org.mixedrealitytoolkit.input/Utilities/PoseSource/FallbackCompositePoseSource.cs index 3b5092c74..b9be6aaaf 100644 --- a/org.mixedrealitytoolkit.input/Utilities/PoseSource/FallbackCompositePoseSource.cs +++ b/org.mixedrealitytoolkit.input/Utilities/PoseSource/FallbackCompositePoseSource.cs @@ -11,18 +11,13 @@ namespace MixedReality.Toolkit.Input /// which successfully returns a pose. /// [Serializable] - public class FallbackCompositePoseSource : IPoseSource, ISerializationCallbackReceiver + public class FallbackCompositePoseSource : IPoseSource { [SerializeReference] [InterfaceSelector] [Tooltip("An ordered list of pose sources to query.")] private IPoseSource[] poseSourceList; - [SerializeField] - [Tooltip("An ordered list of pose sources to query.")] - [Obsolete, HideInInspector] - private PoseSourceWrapper[] poseSources; - /// /// An ordered list of pose sources to query. /// @@ -46,33 +41,5 @@ public bool TryGetPose(out Pose pose) pose = Pose.identity; return false; } - - [Obsolete] - void ISerializationCallbackReceiver.OnAfterDeserialize() - { - if (poseSources != null && poseSources.Length > 0) - { - poseSourceList = new IPoseSource[poseSources.Length]; - - for (int i = 0; i < poseSources.Length; i++) - { - PoseSourceWrapper poseSource = poseSources[i]; - poseSourceList[i] = poseSource.source; - } - - poseSources = null; - } - } - - void ISerializationCallbackReceiver.OnBeforeSerialize() { } - - [Serializable, Obsolete] - private struct PoseSourceWrapper - { - [SerializeReference] - [InterfaceSelector] - [Tooltip("The pose source we are trying to get the pose of")] - public IPoseSource source; - } } } diff --git a/org.mixedrealitytoolkit.input/Utilities/PoseSource/HandBasedPoseSource.cs b/org.mixedrealitytoolkit.input/Utilities/PoseSource/HandBasedPoseSource.cs index e5aeae5e3..7282881f9 100644 --- a/org.mixedrealitytoolkit.input/Utilities/PoseSource/HandBasedPoseSource.cs +++ b/org.mixedrealitytoolkit.input/Utilities/PoseSource/HandBasedPoseSource.cs @@ -12,12 +12,6 @@ namespace MixedReality.Toolkit.Input /// public abstract class HandBasedPoseSource : IPoseSource { - /// - /// Cached reference to hands aggregator for efficient per-frame use. - /// - [Obsolete("Deprecated, please use XRSubsystemHelpers.HandsAggregator instead.")] - protected HandsAggregatorSubsystem HandsAggregator => XRSubsystemHelpers.HandsAggregator as HandsAggregatorSubsystem; - [SerializeField] [Tooltip("The hand on which to track the joint.")] private Handedness hand; diff --git a/org.mixedrealitytoolkit.input/Utilities/PoseSource/InputActionPoseSource.cs b/org.mixedrealitytoolkit.input/Utilities/PoseSource/InputActionPoseSource.cs index d2fe1d83b..7e2577e37 100644 --- a/org.mixedrealitytoolkit.input/Utilities/PoseSource/InputActionPoseSource.cs +++ b/org.mixedrealitytoolkit.input/Utilities/PoseSource/InputActionPoseSource.cs @@ -35,10 +35,13 @@ public bool TryGetPose(out Pose pose) InputAction positionAction = positionActionProperty.action; InputAction rotationAction = rotationActionProperty.action; - if (trackingStateAction.HasAnyControls() - && positionAction.HasAnyControls() - && rotationAction.HasAnyControls() - && ((InputTrackingState)trackingStateAction.ReadValue() & (InputTrackingState.Position | InputTrackingState.Rotation)) != 0) + // We need to consider the fact that the positon and rotation can be bound + // to a control, but the control may not be active even if the tracking state is valid. So we need to + // check if there's an active control before using the position and rotation values. + if (trackingStateAction.HasAnyControls() && + (positionAction.HasAnyControls() && positionAction.activeControl != null) && + (rotationAction.HasAnyControls() && rotationAction.activeControl != null) && + ((InputTrackingState)trackingStateAction.ReadValue() & (InputTrackingState.Position | InputTrackingState.Rotation)) != 0) { // Transform the pose into worldspace, as input actions are returned // in floor-offset-relative coordinates. diff --git a/org.mixedrealitytoolkit.input/Visualizers/ControllerVisualizer/ControllerVisualizer.cs b/org.mixedrealitytoolkit.input/Visualizers/ControllerVisualizer/ControllerVisualizer.cs index 60eb42138..4ab036c36 100644 --- a/org.mixedrealitytoolkit.input/Visualizers/ControllerVisualizer/ControllerVisualizer.cs +++ b/org.mixedrealitytoolkit.input/Visualizers/ControllerVisualizer/ControllerVisualizer.cs @@ -2,7 +2,6 @@ // Licensed under the BSD 3-Clause using MixedReality.Toolkit.Input.Simulation; -using MixedReality.Toolkit.Subsystems; using System; using System.Threading.Tasks; using UnityEngine; @@ -42,12 +41,6 @@ public class ControllerVisualizer : MonoBehaviour // A GameObject representing the fallback controller model. private GameObject fallbackGameObject; - /// - /// Cached reference to hands aggregator for efficient per-frame use. - /// - [Obsolete("Deprecated, please use XRSubsystemHelpers.HandsAggregator instead.")] - protected HandsAggregatorSubsystem HandsAggregator => XRSubsystemHelpers.HandsAggregator as HandsAggregatorSubsystem; - [SerializeField] [Tooltip("The input action we key into to determine whether this controller is tracked or not")] private InputActionProperty controllerDetectedAction; diff --git a/org.mixedrealitytoolkit.input/Visualizers/HandMeshVisualizer.cs b/org.mixedrealitytoolkit.input/Visualizers/HandMeshVisualizer.cs new file mode 100644 index 000000000..cf1eae3c4 --- /dev/null +++ b/org.mixedrealitytoolkit.input/Visualizers/HandMeshVisualizer.cs @@ -0,0 +1,232 @@ +// Copyright (c) Mixed Reality Toolkit Contributors +// Licensed under the BSD 3-Clause + +using System; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.XR; +using UnityEngine.XR.Interaction.Toolkit; +using UnityEngine.XR.Interaction.Toolkit.Inputs.Readers; + +namespace MixedReality.Toolkit.Input +{ + public abstract class HandMeshVisualizer : MonoBehaviour, ISelectInputVisualizer + { + [SerializeField] + [Tooltip("The XRNode on which this hand is located.")] + private XRNode handNode = XRNode.LeftHand; + + /// The XRNode on which this hand is located. + public XRNode HandNode { get => handNode; set => handNode = value; } + + [SerializeField] + [Tooltip("When true, this visualizer will render rigged hands even on XR devices " + + "with transparent displays or with passthrough enabled. When false, the rigged hands will only render " + + "on devices with opaque displays. This behavior uses XRDisplaySubsystem.displayOpaque.")] + private bool showHandsOnTransparentDisplays; + + /// + /// When true, this visualizer will render rigged hands even on XR devices with transparent displays or with passthrough enabled. + /// When false, the rigged hands will only render on devices with opaque displays. + /// + /// + /// This behavior uses . + /// Usually, it's recommended not to show hand visualization on transparent displays as it can + /// distract from the user's real hands, and cause a "double image" effect that can be disconcerting. + /// + public bool ShowHandsOnTransparentDisplays + { + get => showHandsOnTransparentDisplays; + set => showHandsOnTransparentDisplays = value; + } + + [SerializeField] + [Tooltip("Name of the shader property used to drive pinch-amount-based visual effects. " + + "Generally, maps to something like a glow or an outline color!")] + private string pinchAmountMaterialProperty = "_PinchAmount"; + + [SerializeField] + [Tooltip("The input reader used when pinch selecting an interactable.")] + private XRInputButtonReader selectInput = new XRInputButtonReader("Select"); + + #region ISelectInputVisualizer implementation + + /// + /// Input reader used when pinch selecting an interactable. + /// + public XRInputButtonReader SelectInput + { + get => selectInput; + set => SetInputProperty(ref selectInput, value); + } + + #endregion ISelectInputVisualizer implementation + + // The property block used to modify the pinch amount property on the material + private MaterialPropertyBlock propertyBlock = null; + + // Scratch list for checking for the presence of display subsystems. + private readonly List displaySubsystems = new List(); + + // The XRController that is used to determine the pinch strength (i.e., select value!) + [Obsolete("This field has been deprecated in version 4.0.0 and will be removed in a future version. Use the SelectInput property instead.")] + private XRBaseController controller; + + /// + /// The list of button input readers used by this interactor. This interactor will automatically enable or disable direct actions + /// if that mode is used during and . + /// + /// + /// + private readonly List buttonReaders = new List(); + + /// + /// Whether this visualizer currently has a loaded and visible hand mesh or not. + /// + protected internal bool IsRendering => HandRenderer != null && HandRenderer.enabled; + + /// + /// The renderer for this visualizer, to use to visualize the pinch amount. + /// + protected abstract Renderer HandRenderer { get; } + + /// + /// A Unity event function that is called when an enabled script instance is being loaded. + /// + protected virtual void Awake() + { + propertyBlock = new MaterialPropertyBlock(); + buttonReaders.Add(selectInput); + } + + /// + /// A Unity event function that is called when the script component has been enabled. + /// + protected virtual void OnEnable() + { + buttonReaders.ForEach(reader => reader?.EnableDirectActionIfModeUsed()); + + // Ensure hand is not visible until we can update position first time. + HandRenderer.enabled = false; + + Debug.Assert(handNode == XRNode.LeftHand || handNode == XRNode.RightHand, + $"HandVisualizer has an invalid XRNode ({handNode})!"); + } + + /// + /// A Unity event function that is called when the script component has been disabled. + /// + protected virtual void OnDisable() + { + buttonReaders.ForEach(reader => reader?.DisableDirectActionIfModeUsed()); + + // Disable the rigged hand renderer when this component is disabled + HandRenderer.enabled = false; + } + + /// + /// Helper method for setting an input property. + /// + /// The to the field. + /// The new value being set. + /// + /// If the application is playing, this method will also enable or disable directly embedded input actions + /// serialized by the input if that mode is used. It will also add or remove the input from the list of button inputs + /// to automatically manage enabling and disabling direct actions with this behavior. + /// + /// + protected void SetInputProperty(ref XRInputButtonReader property, XRInputButtonReader value) + { + if (value == null) + { + Debug.LogError("Setting XRInputButtonReader property to null is disallowed and has therefore been ignored."); + return; + } + + if (Application.isPlaying && property != null) + { + buttonReaders?.Remove(property); + property.DisableDirectActionIfModeUsed(); + } + + property = value; + + if (Application.isPlaying) + { + buttonReaders?.Add(property); + if (isActiveAndEnabled) + { + property.EnableDirectActionIfModeUsed(); + } + } + } + + protected virtual bool ShouldRenderHand() + { + if (displaySubsystems.Count == 0) + { + SubsystemManager.GetSubsystems(displaySubsystems); + } + + // Are we running on an XR display and it happens to be transparent? + // Probably shouldn't be showing rigged hands! (Users can + // specify showHandsOnTransparentDisplays if they disagree.) + if (displaySubsystems.Count > 0 && + displaySubsystems[0].running && + !displaySubsystems[0].displayOpaque && + !showHandsOnTransparentDisplays) + { + return false; + } + + // All checks out! + return true; + } + + protected virtual void UpdateHandMaterial() + { + if (HandRenderer == null) + { + return; + } + + // Update the hand material + float pinchAmount = TryGetSelectionValue(out float selectionValue) ? Mathf.Pow(selectionValue, 2.0f) : 0; + HandRenderer.GetPropertyBlock(propertyBlock); + propertyBlock.SetFloat(pinchAmountMaterialProperty, pinchAmount); + HandRenderer.SetPropertyBlock(propertyBlock); + } + + /// + /// Try to obtain the tracked devices selection value from the provided input reader. + /// + /// + /// For backwards compatibility, this method will also attempt to get the selection amount from a + /// legacy XRI controller if the input reader is not set. + /// + private bool TryGetSelectionValue(out float value) + { + if (selectInput != null && selectInput.TryReadValue(out value)) + { + return true; + } + + bool success = false; + value = 0.0f; + +#pragma warning disable CS0618 // XRBaseController is obsolete + if (controller == null) + { + controller = GetComponentInParent(); + } + if (controller != null) + { + value = controller.selectInteractionState.value; + success = true; + } +#pragma warning restore CS0618 // XRBaseController is obsolete + + return success; + } + } +} diff --git a/org.mixedrealitytoolkit.input/Visualizers/HandMeshVisualizer.cs.meta b/org.mixedrealitytoolkit.input/Visualizers/HandMeshVisualizer.cs.meta new file mode 100644 index 000000000..5efd406a4 --- /dev/null +++ b/org.mixedrealitytoolkit.input/Visualizers/HandMeshVisualizer.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 3a383c22545b8774b8e5891adaccecf4 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/org.mixedrealitytoolkit.input/Visualizers/ISelectInputVisualizer.cs b/org.mixedrealitytoolkit.input/Visualizers/ISelectInputVisualizer.cs new file mode 100644 index 000000000..c7c73e0c5 --- /dev/null +++ b/org.mixedrealitytoolkit.input/Visualizers/ISelectInputVisualizer.cs @@ -0,0 +1,23 @@ +// Copyright (c) Mixed Reality Toolkit Contributors +// Licensed under the BSD 3-Clause + +using UnityEngine.XR.Interaction.Toolkit.Inputs.Readers; + +namespace MixedReality.Toolkit.Input +{ + /// + /// Defines an interface for providing an input reader for selection values + /// in order to be incorporated by a visualizer. + /// + public interface ISelectInputVisualizer + { + /// + /// Input reader for select input to be used in visualization. + /// + public XRInputButtonReader SelectInput + { + get; + set; + } + } +} diff --git a/org.mixedrealitytoolkit.input/Visualizers/ISelectInputVisualizer.cs.meta b/org.mixedrealitytoolkit.input/Visualizers/ISelectInputVisualizer.cs.meta new file mode 100644 index 000000000..d1dcf8722 --- /dev/null +++ b/org.mixedrealitytoolkit.input/Visualizers/ISelectInputVisualizer.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 3a1da92457b03784a82bd6362a328124 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/org.mixedrealitytoolkit.input/Visualizers/PlatformHandVisualizer.meta b/org.mixedrealitytoolkit.input/Visualizers/PlatformHandVisualizer.meta new file mode 100644 index 000000000..cfb1734fe --- /dev/null +++ b/org.mixedrealitytoolkit.input/Visualizers/PlatformHandVisualizer.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 503070eeec7bc98479b1459387014145 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/org.mixedrealitytoolkit.input/Visualizers/PlatformHandVisualizer/PlatformHandMeshVisualizer.cs b/org.mixedrealitytoolkit.input/Visualizers/PlatformHandVisualizer/PlatformHandMeshVisualizer.cs new file mode 100644 index 000000000..14d6ed1da --- /dev/null +++ b/org.mixedrealitytoolkit.input/Visualizers/PlatformHandVisualizer/PlatformHandMeshVisualizer.cs @@ -0,0 +1,265 @@ +// Copyright (c) Mixed Reality Toolkit Contributors +// Licensed under the BSD 3-Clause + +using System.Collections.Generic; +using Unity.XR.CoreUtils; +using UnityEngine; +using UnityEngine.SubsystemsImplementation.Extensions; +using UnityEngine.XR; +using UnityEngine.XR.Hands; +using UnityEngine.XR.Hands.Meshing; +using UnityEngine.XR.Hands.OpenXR; + +#if MROPENXR_PRESENT && (UNITY_STANDALONE_WIN || UNITY_WSA || UNITY_ANDROID) +using Microsoft.MixedReality.OpenXR; +#endif + +namespace MixedReality.Toolkit.Input +{ + [AddComponentMenu("MRTK/Input/Visualizers/Platform Hand Mesh Visualizer")] + public class PlatformHandMeshVisualizer : HandMeshVisualizer + { + [SerializeField] + private MeshFilter meshFilter; + + [SerializeField] + private MeshRenderer handRenderer; + + [SerializeField, Range(0, 1)] + private float fadeDistance = 0.025f; + + /// + protected override Renderer HandRenderer => handRenderer; + +#if MROPENXR_PRESENT && (UNITY_STANDALONE_WIN || UNITY_WSA || UNITY_ANDROID) + private HandMeshTracker handMeshTracker; + private Mesh neutralPoseMesh; + private bool initializedUVs = false; +#endif + + // Share these among all instances to only query once per frame + private static int lastUpdatedFrame = -1; + private static XRHandSubsystem handSubsystem = null; + private static XRHandMeshDataQueryResult result; + private XRHandSubsystem.UpdateSuccessFlags updateSuccessFlags; + + // The property block used to modify the wrist position property on the material + private MaterialPropertyBlock propertyBlock = null; + + /// + protected override void OnEnable() + { + base.OnEnable(); + + handRenderer.enabled = false; + + // Use propertyBlock as an indicator that this is our first time through OnEnable + if (propertyBlock == null) + { + propertyBlock = new MaterialPropertyBlock(); + + updateSuccessFlags = HandNode == XRNode.LeftHand ? + XRHandSubsystem.UpdateSuccessFlags.LeftHandJoints | XRHandSubsystem.UpdateSuccessFlags.LeftHandRootPose : + XRHandSubsystem.UpdateSuccessFlags.RightHandJoints | XRHandSubsystem.UpdateSuccessFlags.RightHandRootPose; + + // Since the hand mesh is likely to change every frame, we + // "optimize mesh for frequent updates" by marking it dynamic + meshFilter.mesh.MarkDynamic(); + } + + // If we already found our subsystem, just return + if (handSubsystem != null && handSubsystem.running) { return; } + + List subsystems = XRSubsystemHelpers.GetAllSubsystems(); + foreach (XRHandSubsystem subsystem in subsystems) + { + if (subsystem.GetProvider() is OpenXRHandProvider provider && provider.handMeshDataSupplier != null) + { + Debug.Log($"Using {provider.handMeshDataSupplier.GetType()} for hand visualization."); + handSubsystem = subsystem; + return; + } + } + +#if MROPENXR_PRESENT && (UNITY_STANDALONE_WIN || UNITY_WSA || UNITY_ANDROID) + if (UnityEngine.XR.OpenXR.OpenXRRuntime.IsExtensionEnabled("XR_MSFT_hand_tracking_mesh")) + { + Debug.Log($"Using XR_MSFT_hand_tracking_mesh for {HandNode} visualization."); + handMeshTracker = HandNode == XRNode.LeftHand ? HandMeshTracker.Left : HandMeshTracker.Right; + + if (neutralPoseMesh == null) + { + neutralPoseMesh = new Mesh(); + } + + return; + } +#endif + + Debug.Log($"No active hand mesh extension was found for {HandNode} visualization."); + enabled = false; + } + + protected void Update() + { + if (!ShouldRenderHand()) + { + // Hide the hand and abort if we shouldn't be + // showing the hand, for whatever reason. + // (Missing joint data, no subsystem, additive + // display, etc!) + handRenderer.enabled = false; + return; + } + + if (handSubsystem != null && handSubsystem.running && (handSubsystem.updateSuccessFlags & updateSuccessFlags) != 0) + { + XRHandMeshDataQueryParams queryParams = new() + { + allocator = Unity.Collections.Allocator.Temp, + }; + + // Sometimes, the mesh retrieval will fail, but that doesn't mean we aren't being tracked + // So, reuse the last mesh until the subsystem tells us we're untracked + if (lastUpdatedFrame != Time.frameCount && !handSubsystem.TryGetMeshData(out result, ref queryParams)) + { + return; + } + + lastUpdatedFrame = Time.frameCount; + XRHandMeshData handMeshData = HandNode == XRNode.LeftHand ? result.leftHand : result.rightHand; + handRenderer.enabled = true; + Mesh mesh = meshFilter.mesh; + + if (handMeshData.positions.Length > 0 && handMeshData.indices.Length > 0) + { + mesh.SetVertices(handMeshData.positions); + Unity.Collections.NativeArray indices = handMeshData.indices; + // This API appears to return CCW triangles, but Unity expects CW triangles + for (int i = 0; i < indices.Length; i += 3) + { + (indices[i + 1], indices[i + 2]) = (indices[i + 2], indices[i + 1]); + } + mesh.SetIndices(indices, MeshTopology.Triangles, 0); + mesh.RecalculateBounds(); + } + + if (handMeshData.uvs.IsCreated && handMeshData.uvs.Length == mesh.vertexCount) + { + mesh.SetUVs(0, handMeshData.uvs); + } + else + { + mesh.uv = null; + } + + if (handMeshData.normals.IsCreated && handMeshData.normals.Length == mesh.vertexCount) + { + mesh.SetNormals(handMeshData.normals); + } + else + { + mesh.RecalculateNormals(); + } + + if (handMeshData.TryGetRootPose(out Pose rootPose)) + { + transform.SetWorldPose(PlayspaceUtilities.TransformPose(rootPose)); + } + UpdateHandMaterial(); + return; + } + +#if MROPENXR_PRESENT && (UNITY_STANDALONE_WIN || UNITY_WSA || UNITY_ANDROID) + if (handMeshTracker != null + && handMeshTracker.TryGetHandMesh(FrameTime.OnUpdate, meshFilter.mesh) + && handMeshTracker.TryLocateHandMesh(FrameTime.OnUpdate, out Pose pose)) + { + // On some runtimes, the mesh is moved in its local space instead of world space, + // while its world space location is unchanged. In this case, we want to ensure the + // bounds follow the hand around by manually recalculating them. + meshFilter.mesh.RecalculateBounds(); + + handRenderer.enabled = true; + + if (!initializedUVs && handMeshTracker.TryGetHandMesh(FrameTime.OnUpdate, neutralPoseMesh, HandPoseType.ReferenceOpenPalm)) + { + meshFilter.mesh.uv = InitializeUVs(neutralPoseMesh.vertices); + initializedUVs = true; + } + + transform.SetWorldPose(PlayspaceUtilities.TransformPose(pose)); + UpdateHandMaterial(); + return; + } +#endif + + // Hide the hand if we weren't able to obtain a valid mesh + handRenderer.enabled = false; + } + + protected override bool ShouldRenderHand() + { + // If we're missing anything, don't render the hand. + return meshFilter != null && handRenderer != null && base.ShouldRenderHand(); + } + + protected override void UpdateHandMaterial() + { + base.UpdateHandMaterial(); + + if ((XRSubsystemHelpers.HandsAggregator?.TryGetJoint(TrackedHandJoint.Wrist, HandNode, out HandJointPose wristPose) ?? false) + && XRSubsystemHelpers.HandsAggregator.TryGetJoint(TrackedHandJoint.LittleMetacarpal, HandNode, out HandJointPose littleMetaPose) + && XRSubsystemHelpers.HandsAggregator.TryGetJoint(TrackedHandJoint.ThumbMetacarpal, HandNode, out HandJointPose thumbMetaPose)) + { + HandRenderer.GetPropertyBlock(propertyBlock); + float radius = Vector3.Distance(littleMetaPose.Position, thumbMetaPose.Position); + propertyBlock.SetVector("_FadeSphereCenter", wristPose.Position - (radius * 0.5f * wristPose.Forward)); + propertyBlock.SetFloat("_FadeSphereRadius", radius); + propertyBlock.SetFloat("_FadeDistance", fadeDistance); + HandRenderer.SetPropertyBlock(propertyBlock); + } + } + +#if MROPENXR_PRESENT && (UNITY_STANDALONE_WIN || UNITY_WSA || UNITY_ANDROID) + private static Vector2[] InitializeUVs(Vector3[] neutralPoseVertices) + { + if (neutralPoseVertices?.Length == 0) + { + Debug.LogError("Loaded 0 vertices for neutralPoseVertices"); + return System.Array.Empty(); + } + + float minY = neutralPoseVertices[0].y; + float maxY = minY; + + for (int ix = 1; ix < neutralPoseVertices.Length; ix++) + { + Vector3 p = neutralPoseVertices[ix]; + + if (p.y < minY) + { + minY = p.y; + } + else if (p.y > maxY) + { + maxY = p.y; + } + } + + float scale = 1.0f / (maxY - minY); + + Vector2[] uvs = new Vector2[neutralPoseVertices.Length]; + + for (int ix = 0; ix < neutralPoseVertices.Length; ix++) + { + Vector3 p = neutralPoseVertices[ix]; + + uvs[ix] = new Vector2(p.x * scale + 0.5f, (p.y - minY) * scale); + } + + return uvs; + } +#endif + } +} diff --git a/org.mixedrealitytoolkit.input/Visualizers/PlatformHandVisualizer/PlatformHandMeshVisualizer.cs.meta b/org.mixedrealitytoolkit.input/Visualizers/PlatformHandVisualizer/PlatformHandMeshVisualizer.cs.meta new file mode 100644 index 000000000..5f1d749f5 --- /dev/null +++ b/org.mixedrealitytoolkit.input/Visualizers/PlatformHandVisualizer/PlatformHandMeshVisualizer.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: f42ee07c35d33c44989eee5953f625d2 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/org.mixedrealitytoolkit.input/Visualizers/Prefabs.meta b/org.mixedrealitytoolkit.input/Visualizers/Prefabs.meta new file mode 100644 index 000000000..8fe79ca76 --- /dev/null +++ b/org.mixedrealitytoolkit.input/Visualizers/Prefabs.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: db472eec1a7c5c34a874ee394c08966f +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/org.mixedrealitytoolkit.input/Visualizers/RiggedHandVisualizer/openxr_left_hand.prefab b/org.mixedrealitytoolkit.input/Visualizers/Prefabs/openxr_left_hand.prefab similarity index 91% rename from org.mixedrealitytoolkit.input/Visualizers/RiggedHandVisualizer/openxr_left_hand.prefab rename to org.mixedrealitytoolkit.input/Visualizers/Prefabs/openxr_left_hand.prefab index 37c3a06e3..2219e6279 100644 --- a/org.mixedrealitytoolkit.input/Visualizers/RiggedHandVisualizer/openxr_left_hand.prefab +++ b/org.mixedrealitytoolkit.input/Visualizers/Prefabs/openxr_left_hand.prefab @@ -5,6 +5,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: -7366846053233975685, guid: da93d751ddc0f64468dfc02f18d02d00, type: 3} @@ -47,6 +48,10 @@ PrefabInstance: propertyPath: m_controllerDetectedAction.m_Name value: Controller Detected objectReference: {fileID: 0} + - target: {fileID: -7366846053233975685, guid: da93d751ddc0f64468dfc02f18d02d00, type: 3} + propertyPath: controllerDetectedAction.m_Reference + value: + objectReference: {fileID: -7613329581162844239, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} - target: {fileID: -7366846053233975685, guid: da93d751ddc0f64468dfc02f18d02d00, type: 3} propertyPath: controllerDetectedAction.m_Action.m_Id value: 4204bd93-73df-4026-97f6-48cc7932da0b @@ -99,6 +104,18 @@ PrefabInstance: propertyPath: controllerDetectedAction.m_Action.m_SingletonActionBindings.Array.data[0].m_Action value: Controller Detected objectReference: {fileID: 0} + - target: {fileID: 1493009138236857671, guid: da93d751ddc0f64468dfc02f18d02d00, type: 3} + propertyPath: m_LocalScale.x + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 1800205545854781715, guid: da93d751ddc0f64468dfc02f18d02d00, type: 3} + propertyPath: handNode + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 2263138549649042646, guid: da93d751ddc0f64468dfc02f18d02d00, type: 3} + propertyPath: handNode + value: 4 + objectReference: {fileID: 0} - target: {fileID: 3507431783398283103, guid: da93d751ddc0f64468dfc02f18d02d00, type: 3} propertyPath: handNode value: 4 @@ -111,10 +128,6 @@ PrefabInstance: propertyPath: m_RootOrder value: 0 objectReference: {fileID: 0} - - target: {fileID: 3973969148631863464, guid: da93d751ddc0f64468dfc02f18d02d00, type: 3} - propertyPath: m_LocalScale.x - value: -1 - objectReference: {fileID: 0} - target: {fileID: 3973969148631863464, guid: da93d751ddc0f64468dfc02f18d02d00, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -160,4 +173,7 @@ PrefabInstance: value: openxr_left_hand objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: da93d751ddc0f64468dfc02f18d02d00, type: 3} diff --git a/org.mixedrealitytoolkit.input/Visualizers/RiggedHandVisualizer/openxr_left_hand.prefab.meta b/org.mixedrealitytoolkit.input/Visualizers/Prefabs/openxr_left_hand.prefab.meta similarity index 100% rename from org.mixedrealitytoolkit.input/Visualizers/RiggedHandVisualizer/openxr_left_hand.prefab.meta rename to org.mixedrealitytoolkit.input/Visualizers/Prefabs/openxr_left_hand.prefab.meta diff --git a/org.mixedrealitytoolkit.input/Visualizers/RiggedHandVisualizer/openxr_right_hand.prefab b/org.mixedrealitytoolkit.input/Visualizers/Prefabs/openxr_right_hand.prefab similarity index 83% rename from org.mixedrealitytoolkit.input/Visualizers/RiggedHandVisualizer/openxr_right_hand.prefab rename to org.mixedrealitytoolkit.input/Visualizers/Prefabs/openxr_right_hand.prefab index b5dbb75e4..f9a9b68b3 100644 --- a/org.mixedrealitytoolkit.input/Visualizers/RiggedHandVisualizer/openxr_right_hand.prefab +++ b/org.mixedrealitytoolkit.input/Visualizers/Prefabs/openxr_right_hand.prefab @@ -23,6 +23,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 16087387050962746} + serializedVersion: 2 m_LocalRotation: {x: -0.04134135, y: 0.020228544, z: 0.07561951, w: 0.996074} m_LocalPosition: {x: 3.0267983e-11, y: 0, z: 0.0004089724} m_LocalScale: {x: 1, y: 0.99999994, z: 0.9999998} @@ -30,7 +31,6 @@ Transform: m_Children: - {fileID: 7427278357790150308} m_Father: {fileID: 5458823143432554036} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &264115022450059308 GameObject: @@ -55,6 +55,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 264115022450059308} + serializedVersion: 2 m_LocalRotation: {x: -0.09019473, y: -0.112213634, z: -0.082327574, w: 0.98615175} m_LocalPosition: {x: 1.6298145e-11, y: 1.3969838e-11, z: 0.00039010096} m_LocalScale: {x: 0.99999994, y: 1, z: 1} @@ -62,7 +63,6 @@ Transform: m_Children: - {fileID: 9006935288519073739} m_Father: {fileID: 498931685021915093} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &488343164757858754 GameObject: @@ -87,6 +87,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 488343164757858754} + serializedVersion: 2 m_LocalRotation: {x: 0.018171376, y: -0.07332422, z: 0.0016571282, w: 0.99714124} m_LocalPosition: {x: -1.2751115e-11, y: 4.4383342e-12, z: 0.00068246824} m_LocalScale: {x: 0.99999994, y: 0.9999999, z: 0.99999994} @@ -94,7 +95,6 @@ Transform: m_Children: - {fileID: 6541163434380589232} m_Father: {fileID: 1077227819275269935} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &550855178322120980 GameObject: @@ -119,6 +119,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 550855178322120980} + serializedVersion: 2 m_LocalRotation: {x: -0.051032774, y: 0.020922784, z: 0.0021605818, w: 0.9984755} m_LocalPosition: {x: -1.8189894e-12, y: -1.4888427e-11, z: 0.00045456158} m_LocalScale: {x: 1, y: 1, z: 0.9999999} @@ -126,7 +127,6 @@ Transform: m_Children: - {fileID: 1828752077698417225} m_Father: {fileID: 8089865949473389596} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &723288405160749330 GameObject: @@ -151,6 +151,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 723288405160749330} + serializedVersion: 2 m_LocalRotation: {x: -0.018254701, y: 0.00089057756, z: 0.0014708434, w: 0.9998319} m_LocalPosition: {x: -5.784386e-12, y: -1.1641532e-12, z: 0.00027976793} m_LocalScale: {x: 0.99999994, y: 0.9999999, z: 0.9999998} @@ -158,7 +159,6 @@ Transform: m_Children: - {fileID: 5817228883765955420} m_Father: {fileID: 8748218160129236693} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &762971720275621074 GameObject: @@ -183,6 +183,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 762971720275621074} + serializedVersion: 2 m_LocalRotation: {x: 0.009341898, y: -0.25212786, z: 0.0016238193, w: 0.9676475} m_LocalPosition: {x: -0, y: 0, z: 0} m_LocalScale: {x: 0.99999994, y: 1, z: 0.99999964} @@ -190,7 +191,6 @@ Transform: m_Children: - {fileID: 6793337788569349462} m_Father: {fileID: 5446693289115484214} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1143263375470404621 GameObject: @@ -215,13 +215,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1143263375470404621} + serializedVersion: 2 m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0, y: 0, z: 0.00013116258} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3640015180784389109} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1449011787537462570 GameObject: @@ -246,6 +246,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1449011787537462570} + serializedVersion: 2 m_LocalRotation: {x: -0.008052746, y: 0.048775665, z: -0.006817606, w: 0.998754} m_LocalPosition: {x: -2.9685907e-11, y: 6.6938807e-12, z: 0.0007289571} m_LocalScale: {x: 1, y: 0.9999999, z: 0.99999994} @@ -253,7 +254,6 @@ Transform: m_Children: - {fileID: 5921367078976266107} m_Father: {fileID: 6793337788569349462} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2928499560571120432 GameObject: @@ -278,6 +278,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2928499560571120432} + serializedVersion: 2 m_LocalRotation: {x: -0.02028584, y: 0.3819591, z: 0.004533123, w: 0.9239455} m_LocalPosition: {x: -0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1.0000001, z: 1.0000001} @@ -285,7 +286,6 @@ Transform: m_Children: - {fileID: 5334553598884166511} m_Father: {fileID: 5446693289115484214} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &3184605578150545217 GameObject: @@ -310,6 +310,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3184605578150545217} + serializedVersion: 2 m_LocalRotation: {x: -0.016732441, y: -0.41903344, z: 0.6049222, w: 0.67690486} m_LocalPosition: {x: -0, y: 0, z: 0} m_LocalScale: {x: 0.9999999, y: 0.99999976, z: 0.99999964} @@ -317,7 +318,6 @@ Transform: m_Children: - {fileID: 5458823143432554036} m_Father: {fileID: 5446693289115484214} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &3331529553617436422 GameObject: @@ -342,6 +342,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3331529553617436422} + serializedVersion: 2 m_LocalRotation: {x: 0.049683567, y: -0.0682403, z: 0.005375236, w: 0.99641657} m_LocalPosition: {x: -2.6921044e-12, y: -1.0913936e-13, z: 0.00026415734} m_LocalScale: {x: 1, y: 1, z: 0.99999994} @@ -349,7 +350,6 @@ Transform: m_Children: - {fileID: 6402884463806494666} m_Father: {fileID: 6356967279678601896} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &3914579612821526105 GameObject: @@ -374,6 +374,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3914579612821526105} + serializedVersion: 2 m_LocalRotation: {x: -0.03612786, y: 0.013062499, z: -0.0013056236, w: 0.99926096} m_LocalPosition: {x: 2.52974e-11, y: 3.3469403e-12, z: 0.00018895004} m_LocalScale: {x: 1.0000001, y: 0.9999999, z: 0.99999994} @@ -381,7 +382,6 @@ Transform: m_Children: - {fileID: 3661087396984794893} m_Father: {fileID: 4528600584950922117} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &3957823326167938785 GameObject: @@ -407,13 +407,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3957823326167938785} - m_LocalRotation: {x: 0.000000021855694, y: 0, z: -0, w: 1} - m_LocalPosition: {x: -0, y: 0, z: 0} + serializedVersion: 2 + m_LocalRotation: {x: 0.000000021855694, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 100, y: 100, z: 100} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 3973969148631863464} - m_RootOrder: 0 + m_Father: {fileID: 1493009138236857671} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!137 &5709336421934327412 SkinnedMeshRenderer: @@ -517,13 +517,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4042160540912683627} + serializedVersion: 2 m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0, y: 0, z: 0.00015126375} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5817228883765955420} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &4122089786851792721 GameObject: @@ -548,6 +548,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4122089786851792721} + serializedVersion: 2 m_LocalRotation: {x: -0.04099412, y: -0.012571383, z: 0.00082643394, w: 0.99908} m_LocalPosition: {x: -7.858469e-12, y: -4.574758e-12, z: 0.0002651471} m_LocalScale: {x: 0.99999994, y: 0.9999999, z: 1} @@ -555,7 +556,6 @@ Transform: m_Children: - {fileID: 9017335721188770727} m_Father: {fileID: 6541163434380589232} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &4354293980546992658 GameObject: @@ -566,7 +566,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3973969148631863464} - - component: {fileID: 3507431783398283103} - component: {fileID: -7366846053233975685} m_Layer: 0 m_Name: openxr_right_hand @@ -582,33 +581,16 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4354293980546992658} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 5499070473167639758} - - {fileID: 5446693289115484214} + - {fileID: 7460324237988116690} + - {fileID: 1493009138236857671} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &3507431783398283103 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4354293980546992658} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4a4cc0663b372fd4795c4e6d942500fb, type: 3} - m_Name: - m_EditorClassIdentifier: - handNode: 5 - showHandsOnTransparentDisplays: 0 - wrist: {fileID: 5446693289115484214} - handRenderer: {fileID: 5709336421934327412} - pinchAmountMaterialProperty: _PinchAmount --- !u!114 &-7366846053233975685 MonoBehaviour: m_ObjectHideFlags: 0 @@ -624,7 +606,7 @@ MonoBehaviour: handNode: 5 fallbackControllerModel: {fileID: 3339478339056654981, guid: 3bd614f14cda63940b56faf0518b55f3, type: 3} controllerDetectedAction: - m_UseReference: 0 + m_UseReference: 1 m_Action: m_Name: Controller Detected m_Type: 0 @@ -642,7 +624,7 @@ MonoBehaviour: m_Action: Controller Detected m_Flags: 0 m_Flags: 0 - m_Reference: {fileID: 0} + m_Reference: {fileID: 3239510804178183174, guid: 18c412191cdc9274897f101c7fd5316f, type: 3} --- !u!1 &4657295888579565740 GameObject: m_ObjectHideFlags: 0 @@ -666,6 +648,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4657295888579565740} + serializedVersion: 2 m_LocalRotation: {x: -0.012391907, y: -0.07663214, z: 0.01388792, w: 0.9968857} m_LocalPosition: {x: 1.4151737e-11, y: -1.16415315e-11, z: 0.0006916037} m_LocalScale: {x: 1, y: 1, z: 1} @@ -673,7 +656,6 @@ Transform: m_Children: - {fileID: 4528600584950922117} m_Father: {fileID: 5334553598884166511} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &5237677254925488276 GameObject: @@ -698,6 +680,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5237677254925488276} + serializedVersion: 2 m_LocalRotation: {x: -0.02189448, y: 0.011967821, z: 0.000007822243, w: 0.9996887} m_LocalPosition: {x: 4.5656634e-12, y: -2.2937456e-11, z: 0.00041979662} m_LocalScale: {x: 0.99999994, y: 1, z: 1} @@ -705,8 +688,141 @@ Transform: m_Children: - {fileID: 6273793641032179826} m_Father: {fileID: 2464973069511612448} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &5460435942034699144 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7460324237988116690} + - component: {fileID: 3936565761691908697} + - component: {fileID: 769216864695519206} + - component: {fileID: 2263138549649042646} + m_Layer: 0 + m_Name: PlatformHandMesh + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7460324237988116690 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5460435942034699144} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3973969148631863464} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &3936565761691908697 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5460435942034699144} + m_Mesh: {fileID: 0} +--- !u!23 &769216864695519206 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5460435942034699144} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 4c63e230f530e6c4e8be8b25846c0989, type: 2} + - {fileID: 2100000, guid: 5138877b31bc96046b8d186cd276d724, type: 2} + - {fileID: 2100000, guid: d2ac3579866c33749b7ac30d8393d4e2, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!114 &2263138549649042646 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5460435942034699144} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f42ee07c35d33c44989eee5953f625d2, type: 3} + m_Name: + m_EditorClassIdentifier: + handNode: 5 + showHandsOnTransparentDisplays: 0 + pinchAmountMaterialProperty: _PinchAmount + selectInput: + m_InputSourceMode: 2 + m_InputActionPerformed: + m_Name: Select + m_Type: 1 + m_ExpectedControlType: + m_Id: 5a174afe-679f-4e85-a45a-988046773313 + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_InputActionValue: + m_Name: Select Value + m_Type: 0 + m_ExpectedControlType: Axis + m_Id: 8594ff63-7803-4c60-a5c8-62dc67ba5c1a + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_InputActionReferencePerformed: {fileID: 0} + m_InputActionReferenceValue: {fileID: 0} + m_ObjectReferenceObject: {fileID: 0} + m_ManualPerformed: 0 + m_ManualValue: 0 + m_ManualQueuePerformed: 0 + m_ManualQueueWasPerformedThisFrame: 0 + m_ManualQueueWasCompletedThisFrame: 0 + m_ManualQueueValue: 0 + m_ManualQueueTargetFrame: 0 + meshFilter: {fileID: 3936565761691908697} + handRenderer: {fileID: 769216864695519206} + fadeDistance: 0.025 --- !u!1 &5839269735351241340 GameObject: m_ObjectHideFlags: 0 @@ -730,8 +846,9 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5839269735351241340} - m_LocalRotation: {x: 0.000000021855694, y: 0, z: -0, w: 1} - m_LocalPosition: {x: -0, y: 0, z: 0} + serializedVersion: 2 + m_LocalRotation: {x: 0.000000021855694, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 100, y: 100, z: 100} m_ConstrainProportionsScale: 0 m_Children: @@ -740,8 +857,7 @@ Transform: - {fileID: 3103993496388122979} - {fileID: 6356967279678601896} - {fileID: 4523630147034299841} - m_Father: {fileID: 3973969148631863464} - m_RootOrder: 1 + m_Father: {fileID: 1493009138236857671} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &6303298619132591738 GameObject: @@ -766,6 +882,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6303298619132591738} + serializedVersion: 2 m_LocalRotation: {x: 0.041502926, y: 0.1045213, z: -0.014521739, w: 0.9935502} m_LocalPosition: {x: -1.1641532e-12, y: 9.3132255e-12, z: 0.00037181645} m_LocalScale: {x: 1, y: 0.99999994, z: 0.9999998} @@ -773,8 +890,89 @@ Transform: m_Children: - {fileID: 498931685021915093} m_Father: {fileID: 1529682561352593866} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &6309398931433067091 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1493009138236857671} + - component: {fileID: 1800205545854781715} + m_Layer: 0 + m_Name: RiggedHandMesh + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1493009138236857671 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6309398931433067091} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 5499070473167639758} + - {fileID: 5446693289115484214} + m_Father: {fileID: 3973969148631863464} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1800205545854781715 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6309398931433067091} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4a4cc0663b372fd4795c4e6d942500fb, type: 3} + m_Name: + m_EditorClassIdentifier: + handNode: 5 + showHandsOnTransparentDisplays: 0 + pinchAmountMaterialProperty: _PinchAmount + selectInput: + m_InputSourceMode: 2 + m_InputActionPerformed: + m_Name: Select + m_Type: 1 + m_ExpectedControlType: + m_Id: 455696a2-5c34-4e97-838a-bc2b6ac85675 + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_InputActionValue: + m_Name: Select Value + m_Type: 0 + m_ExpectedControlType: Axis + m_Id: de553aeb-f229-4e9f-af88-39757e695f7d + m_Processors: + m_Interactions: + m_SingletonActionBindings: [] + m_Flags: 0 + m_InputActionReferencePerformed: {fileID: 0} + m_InputActionReferenceValue: {fileID: 0} + m_ObjectReferenceObject: {fileID: 0} + m_ManualPerformed: 0 + m_ManualValue: 0 + m_ManualQueuePerformed: 0 + m_ManualQueueWasPerformedThisFrame: 0 + m_ManualQueueWasCompletedThisFrame: 0 + m_ManualQueueValue: 0 + m_ManualQueueTargetFrame: 0 + wrist: {fileID: 5446693289115484214} + handRenderer: {fileID: 5709336421934327412} + primaryMeshVisualizer: {fileID: 2263138549649042646} --- !u!1 &6561479249547925302 GameObject: m_ObjectHideFlags: 0 @@ -798,13 +996,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6561479249547925302} + serializedVersion: 2 m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0, y: 0, z: 0.00015497528} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6273793641032179826} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &6594130182080127020 GameObject: @@ -829,6 +1027,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6594130182080127020} + serializedVersion: 2 m_LocalRotation: {x: 0.0032687124, y: 0.0924356, z: -0.00006233817, w: 0.99571335} m_LocalPosition: {x: -2.0396662e-12, y: -4.206413e-14, z: 0.0002682099} m_LocalScale: {x: 1, y: 1, z: 1} @@ -836,7 +1035,6 @@ Transform: m_Children: - {fileID: 8089865949473389596} m_Father: {fileID: 3103993496388122979} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &6832599985986192355 GameObject: @@ -861,13 +1059,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6832599985986192355} + serializedVersion: 2 m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0, y: 0, z: 0.00017717812} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1828752077698417225} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &6963568092490684223 GameObject: @@ -892,6 +1090,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6963568092490684223} + serializedVersion: 2 m_LocalRotation: {x: 0.00078201893, y: -0.08185144, z: 0.000027665115, w: 0.99664426} m_LocalPosition: {x: -0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 0.9999999} @@ -899,7 +1098,6 @@ Transform: m_Children: - {fileID: 3556776435536246939} m_Father: {fileID: 5446693289115484214} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &7416932990957639745 GameObject: @@ -924,6 +1122,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7416932990957639745} + serializedVersion: 2 m_LocalRotation: {x: 0.06741448, y: -0.024361538, z: -0.0017286513, w: 0.9974261} m_LocalPosition: {x: -1.0143708e-12, y: 2.046363e-14, z: 0.00072257634} m_LocalScale: {x: 0.99999994, y: 1, z: 0.99999994} @@ -931,7 +1130,6 @@ Transform: m_Children: - {fileID: 7322559479628339466} m_Father: {fileID: 3556776435536246939} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &7446434647064107278 GameObject: @@ -956,6 +1154,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7446434647064107278} + serializedVersion: 2 m_LocalRotation: {x: 0.004451058, y: -0.005708242, z: -0.000026027026, w: 0.99997383} m_LocalPosition: {x: -6.175469e-12, y: 2.6648193e-12, z: 0.00027607955} m_LocalScale: {x: 1, y: 1, z: 1} @@ -963,7 +1162,6 @@ Transform: m_Children: - {fileID: 2700898927078924524} m_Father: {fileID: 7322559479628339466} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &7522984908696370401 GameObject: @@ -988,6 +1186,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7522984908696370401} + serializedVersion: 2 m_LocalRotation: {x: -0.04126447, y: 0.042427324, z: 0.00036548893, w: 0.99824697} m_LocalPosition: {x: 1.2982326e-11, y: 9.363248e-12, z: 0.00024728195} m_LocalScale: {x: 1, y: 0.9999999, z: 0.9999999} @@ -995,7 +1194,6 @@ Transform: m_Children: - {fileID: 8610246813914124521} m_Father: {fileID: 5921367078976266107} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &7630331428036862893 GameObject: @@ -1020,13 +1218,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7630331428036862893} + serializedVersion: 2 m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0, y: 0, z: 0.0002066094} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7427278357790150308} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &7764930180859818638 GameObject: @@ -1051,6 +1249,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7764930180859818638} + serializedVersion: 2 m_LocalRotation: {x: 0.115323275, y: -0.2855898, z: 0.024722293, w: 0.9510667} m_LocalPosition: {x: 1.117769e-11, y: 0, z: 0.00028927124} m_LocalScale: {x: 0.99999994, y: 0.99999994, z: 0.99999994} @@ -1058,7 +1257,6 @@ Transform: m_Children: - {fileID: 8748218160129236693} m_Father: {fileID: 4523630147034299841} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &7922940236267228883 GameObject: @@ -1083,6 +1281,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7922940236267228883} + serializedVersion: 2 m_LocalRotation: {x: 0.036102794, y: 0.18826051, z: -0.0076552806, w: 0.9814255} m_LocalPosition: {x: 0.000009, y: -0.000002, z: 0.000321} m_LocalScale: {x: 1, y: 0.99999994, z: 1} @@ -1090,7 +1289,6 @@ Transform: m_Children: - {fileID: 2464973069511612448} m_Father: {fileID: 872140809330182763} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &7960153440799608892 GameObject: @@ -1115,6 +1313,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7960153440799608892} + serializedVersion: 2 m_LocalRotation: {x: -0.009721841, y: 0.13904916, z: 0.0008851419, w: 0.99023736} m_LocalPosition: {x: -0, y: 0, z: 0} m_LocalScale: {x: 1, y: 0.99999994, z: 0.9999997} @@ -1122,7 +1321,6 @@ Transform: m_Children: - {fileID: 1077227819275269935} m_Father: {fileID: 5446693289115484214} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &8261617224528375871 GameObject: @@ -1147,6 +1345,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8261617224528375871} + serializedVersion: 2 m_LocalRotation: {x: -0.0051415353, y: 0.005024616, z: 0.0022183317, w: 0.9999717} m_LocalPosition: {x: -2.0008884e-12, y: -7.639755e-12, z: 0.0004286098} m_LocalScale: {x: 1, y: 1, z: 1} @@ -1154,5 +1353,4 @@ Transform: m_Children: - {fileID: 3640015180784389109} m_Father: {fileID: 6402884463806494666} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/org.mixedrealitytoolkit.input/Visualizers/RiggedHandVisualizer/openxr_right_hand.prefab.meta b/org.mixedrealitytoolkit.input/Visualizers/Prefabs/openxr_right_hand.prefab.meta similarity index 100% rename from org.mixedrealitytoolkit.input/Visualizers/RiggedHandVisualizer/openxr_right_hand.prefab.meta rename to org.mixedrealitytoolkit.input/Visualizers/Prefabs/openxr_right_hand.prefab.meta diff --git a/org.mixedrealitytoolkit.input/Visualizers/RiggedHandVisualizer/RiggedHand-InvertedShell.mat b/org.mixedrealitytoolkit.input/Visualizers/RiggedHandVisualizer/RiggedHand-InvertedShell.mat index 83dab5e11..b61238583 100644 --- a/org.mixedrealitytoolkit.input/Visualizers/RiggedHandVisualizer/RiggedHand-InvertedShell.mat +++ b/org.mixedrealitytoolkit.input/Visualizers/RiggedHandVisualizer/RiggedHand-InvertedShell.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: RiggedHand-InvertedShell m_Shader: {fileID: 4800000, guid: 1e78bf4fa2e9ae0459a4b1836f7a74b5, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -17,6 +19,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -30,6 +33,8 @@ Material: - _Displacement_: 0 - _Enable_: 1 - _Exponent_: 2.16 + - _FadeDistance: 0.025 + - _FadeSphereRadius: 0.05 - _Fade_In_End_: 0 - _Fade_In_Start_: 0 - _HandThickness: 0 @@ -39,7 +44,7 @@ Material: - _Metallic: 0 - _OutlineExponent: 1 - _OutlineSmoothing: 0.05 - - _OutlineThickness: 0.00001337 + - _OutlineThickness: 0.0012 - _OutlineThreshold: 0.474 - _PinchAmount: 0 - _Radius_: 0.09 @@ -47,6 +52,7 @@ Material: m_Colors: - _Center_: {r: 0.5, g: 0.5, b: 0, a: 0} - _Color_: {r: 1, g: 1, b: 1, a: 1} + - _FadeSphereCenter: {r: 0, g: 0, b: 0, a: 1} - _HandColor: {r: 0.14150941, g: 0.14150941, b: 0.14150941, a: 0.7137255} - _OutlineColor: {r: 1, g: 1, b: 1, a: 0.03529412} - _OutlineColorPinching: {r: 1, g: 1, b: 1, a: 1} diff --git a/org.mixedrealitytoolkit.input/Visualizers/RiggedHandVisualizer/RiggedHand-Main.mat b/org.mixedrealitytoolkit.input/Visualizers/RiggedHandVisualizer/RiggedHand-Main.mat index 60925901f..933443742 100644 --- a/org.mixedrealitytoolkit.input/Visualizers/RiggedHandVisualizer/RiggedHand-Main.mat +++ b/org.mixedrealitytoolkit.input/Visualizers/RiggedHandVisualizer/RiggedHand-Main.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: RiggedHand-Main m_Shader: {fileID: 4800000, guid: 618b0da8e4e6bb2459a1cc27acf0dd57, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -17,6 +19,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -30,6 +33,8 @@ Material: - _Displacement_: 0 - _Enable_: 1 - _Exponent_: 2.16 + - _FadeDistance: 0.025 + - _FadeSphereRadius: 0.05 - _Fade_In_End_: 0 - _Fade_In_Start_: 0 - _HandThickness: 0 @@ -47,6 +52,7 @@ Material: m_Colors: - _Center_: {r: 0.5, g: 0.5, b: 0, a: 0} - _Color_: {r: 1, g: 1, b: 1, a: 1} + - _FadeSphereCenter: {r: 0, g: 0, b: 0, a: 1} - _HandColor: {r: 0.01886791, g: 0.01886791, b: 0.01886791, a: 0.8} - _OutlineColor: {r: 1, g: 1, b: 1, a: 0.2901961} - _OutlineColorPinching: {r: 1, g: 1, b: 1, a: 1} diff --git a/org.mixedrealitytoolkit.input/Visualizers/RiggedHandVisualizer/RiggedHandMeshVisualizer.cs b/org.mixedrealitytoolkit.input/Visualizers/RiggedHandVisualizer/RiggedHandMeshVisualizer.cs index 6eb52d6b8..4b039cb50 100644 --- a/org.mixedrealitytoolkit.input/Visualizers/RiggedHandVisualizer/RiggedHandMeshVisualizer.cs +++ b/org.mixedrealitytoolkit.input/Visualizers/RiggedHandVisualizer/RiggedHandMeshVisualizer.cs @@ -6,7 +6,6 @@ using System.Collections.Generic; using UnityEngine; using UnityEngine.XR; -using UnityEngine.XR.Interaction.Toolkit; namespace MixedReality.Toolkit.Input { @@ -20,33 +19,8 @@ namespace MixedReality.Toolkit.Input /// can be more distracting than it's worth. However, for opaque platforms, this is a great solution. /// [AddComponentMenu("MRTK/Input/Visualizers/Rigged Hand Mesh Visualizer")] - public class RiggedHandMeshVisualizer : MonoBehaviour + public class RiggedHandMeshVisualizer : HandMeshVisualizer { - [SerializeField] - [Tooltip("The XRNode on which this hand is located.")] - private XRNode handNode = XRNode.LeftHand; - - /// The XRNode on which this hand is located. - public XRNode HandNode { get => handNode; set => handNode = value; } - - [SerializeField] - [Tooltip("When true, this visualizer will render rigged hands even on XR devices " + - "with transparent displays. When false, the rigged hands will only render " + - "on devices with opaque displays.")] - private bool showHandsOnTransparentDisplays; - - /// - /// When true, this visualizer will render rigged hands even on XR devices with transparent displays. - /// When false, the rigged hands will only render on devices with opaque displays. - /// Usually, it's recommended not to show hand visualization on transparent displays as it can - /// distract from the user's real hands, and cause a "double image" effect that can be disconcerting. - /// - public bool ShowHandsOnTransparentDisplays - { - get => showHandsOnTransparentDisplays; - set => showHandsOnTransparentDisplays = value; - } - [SerializeField] [Tooltip("The transform of the wrist joint.")] private Transform wrist; @@ -56,26 +30,19 @@ public bool ShowHandsOnTransparentDisplays private SkinnedMeshRenderer handRenderer = null; [SerializeField] - [Tooltip("Name of the shader property used to drive pinch-amount-based visual effects. " + - "Generally, maps to something like a glow or an outline color!")] - private string pinchAmountMaterialProperty = "_PinchAmount"; + [Tooltip("The primary visualizer. Rigged hand will not render if the primary is rendering.")] + private HandMeshVisualizer primaryMeshVisualizer = null; + + /// + protected override Renderer HandRenderer => handRenderer; // Automatically calculated over time, based on the accumulated error // between the user's actual joint locations and the armature's bones/joints. private float handScale = 1.0f; - // The property block used to modify the pinch amount property on the material - private MaterialPropertyBlock propertyBlock = null; - - // Caching local references + // Caching local references private HandsAggregatorSubsystem handsSubsystem; - // Scratch list for checking for the presence of display subsystems. - private List displaySubsystems = new List(); - - // The XRController that is used to determine the pinch strength (i.e., select value!) - private XRBaseController controller; - // The actual, physical, rigged joints that drive the skinned mesh. // Otherwise referred to as "armature". Must be in OpenXR order. private readonly Transform[] riggedVisualJointsArray = new Transform[(int)TrackedHandJoint.TotalJoints]; @@ -87,9 +54,9 @@ public bool ShowHandsOnTransparentDisplays /// /// A Unity event function that is called when an enabled script instance is being loaded. /// - protected virtual void Awake() + protected override void Awake() { - propertyBlock = new MaterialPropertyBlock(); + base.Awake(); if (handRenderer == null) { @@ -131,16 +98,10 @@ protected virtual void Awake() } } - /// - /// A Unity event function that is called when the script component has been enabled. - /// - protected void OnEnable() + /// + protected override void OnEnable() { - // Ensure hand is not visible until we can update position first time. - handRenderer.enabled = false; - - Debug.Assert(handNode == XRNode.LeftHand || handNode == XRNode.RightHand, - $"HandVisualizer has an invalid XRNode ({handNode})!"); + base.OnEnable(); handsSubsystem = XRSubsystemHelpers.GetFirstRunningSubsystem(); @@ -150,15 +111,6 @@ protected void OnEnable() } } - /// - /// A Unity event function that is called when the script component has been disabled. - /// - protected void OnDisable() - { - // Disable the rigged hand renderer when this component is disabled - handRenderer.enabled = false; - } - /// /// Coroutine to wait until subsystem becomes available. /// @@ -171,11 +123,11 @@ private IEnumerator EnableWhenSubsystemAvailable() /// /// A Unity event function that is called every frame, if this object is enabled. /// - private void Update() + protected void Update() { // Query all joints in the hand. if (!ShouldRenderHand() || - !handsSubsystem.TryGetEntireHand(handNode, out IReadOnlyList joints)) + !handsSubsystem.TryGetEntireHand(HandNode, out IReadOnlyList joints)) { // Hide the hand and abort if we shouldn't be // showing the hand, for whatever reason. @@ -260,7 +212,7 @@ private void Update() // Apply. handScale += -error * errorGainFactor; handScale = Mathf.Clamp(handScale, minScale, maxScale); - transform.localScale = new Vector3(handNode == XRNode.LeftHand ? -handScale : handScale, handScale, handScale); + transform.localScale = new Vector3(HandNode == XRNode.LeftHand ? -handScale : handScale, handScale, handScale); // Update the hand material based on selectedness value UpdateHandMaterial(); @@ -276,48 +228,15 @@ private float JointError(Vector3 armatureJointPosition, Vector3 userJointPositio return Vector3.Dot((armatureJointPosition - userJointPosition), fingerVector); } - private bool ShouldRenderHand() + protected override bool ShouldRenderHand() { // If we're missing anything, don't render the hand. - if (handsSubsystem == null || wrist == null || handRenderer == null) - { - return false; - } - - if (displaySubsystems.Count == 0) - { - SubsystemManager.GetSubsystems(displaySubsystems); - } - - // Are we running on an XR display and it happens to be transparent? - // Probably shouldn't be showing rigged hands! (Users can - // specify showHandsOnTransparentDisplays if they disagree.) - if (displaySubsystems.Count > 0 && - displaySubsystems[0].running && - !displaySubsystems[0].displayOpaque && - !showHandsOnTransparentDisplays) - { - return false; - } - - // All checks out! - return true; - } - - private void UpdateHandMaterial() - { - if (controller == null) - { - controller = GetComponentInParent(); - } - - if (controller == null || handRenderer == null) { return; } - - // Update the hand material - float pinchAmount = Mathf.Pow(controller.selectInteractionState.value, 2.0f); - handRenderer.GetPropertyBlock(propertyBlock); - propertyBlock.SetFloat(pinchAmountMaterialProperty, pinchAmount); - handRenderer.SetPropertyBlock(propertyBlock); + // Also don't render if the preferred visualizer is rendering. + return handsSubsystem != null + && wrist != null + && handRenderer != null + && (primaryMeshVisualizer == null || !primaryMeshVisualizer.IsRendering) + && base.ShouldRenderHand(); } } } diff --git a/org.mixedrealitytoolkit.input/Visualizers/RiggedHandVisualizer/TransparentOutlinedHand-InvertedShell.shader b/org.mixedrealitytoolkit.input/Visualizers/RiggedHandVisualizer/TransparentOutlinedHand-InvertedShell.shader index 2e80117a6..4ccc98705 100644 --- a/org.mixedrealitytoolkit.input/Visualizers/RiggedHandVisualizer/TransparentOutlinedHand-InvertedShell.shader +++ b/org.mixedrealitytoolkit.input/Visualizers/RiggedHandVisualizer/TransparentOutlinedHand-InvertedShell.shader @@ -13,9 +13,12 @@ Shader "Mixed Reality Toolkit/Transparent Outlined Hand (Inverted Shell)" { Properties { _OutlineColor ("Outline Color", Color) = (1,1,1,1) _OutlineColorPinching ("Outline Color (Pinching)", Color) = (1,1,1,1) - _OutlineThickness ("_OutlineThickness", Range(0.0,0.00003)) = 0.000012 - _HandThickness ("_HandThickness", Range(-0.0001,0.0001)) = 0.0 + _OutlineThickness ("Outline Thickness", Range(0.0,0.003)) = 0.0012 + _HandThickness ("Hand Thickness", Range(-0.01,0.01)) = 0.0 [PerRendererData]_PinchAmount ("Pinch Amount", Float) = 0 + [PerRendererData]_FadeSphereCenter ("Fade Sphere Center", Vector) = (0,0,0,1) + [PerRendererData]_FadeSphereRadius ("Fade Sphere Radius", Range(0,1)) = 0.05 + [PerRendererData]_FadeDistance ("Fade Distance", Range(0,1)) = 0.025 } SubShader { @@ -48,6 +51,7 @@ Shader "Mixed Reality Toolkit/Transparent Outlined Hand (Inverted Shell)" { float4 vertex : POSITION; float4 color : COLOR; float3 normal : NORMAL; + float3 worldPos : TEXCOORD1; UNITY_VERTEX_OUTPUT_STEREO }; @@ -61,16 +65,21 @@ Shader "Mixed Reality Toolkit/Transparent Outlined Hand (Inverted Shell)" { UNITY_INITIALIZE_OUTPUT(v2f, o); UNITY_INITIALIZE_VERTEX_OUTPUT_STEREO(o); + float4 objectPos = v.vertex + normalize(v.normal) * (_HandThickness + _OutlineThickness); o.normal = UnityObjectToWorldNormal(v.normal); - o.vertex = UnityObjectToClipPos(v.vertex + v.normal * (_HandThickness + _OutlineThickness)); + o.vertex = UnityObjectToClipPos(objectPos); o.color = v.color; - + o.worldPos = mul(unity_ObjectToWorld, objectPos).xyz; + return o; } uniform float4 _OutlineColor; uniform float4 _OutlineColorPinching; uniform float _PinchAmount; + uniform float4 _FadeSphereCenter; + uniform float _FadeSphereRadius; + uniform float _FadeDistance; fixed4 frag(v2f i) : SV_Target { @@ -81,7 +90,9 @@ Shader "Mixed Reality Toolkit/Transparent Outlined Hand (Inverted Shell)" { // Fade the entire result based on the red channel. This is used to fade the hand // out by the wrist, so the abrupt edge of the hand model is not visible. - return float4(blendedOutlineColor.r, blendedOutlineColor.g, blendedOutlineColor.b, blendedOutlineColor.a * i.color.r); + return float4(blendedOutlineColor.r, blendedOutlineColor.g, blendedOutlineColor.b, + blendedOutlineColor.a * + ((_FadeSphereCenter.w * i.color.r) + ((1 - _FadeSphereCenter.w) * smoothstep(_FadeSphereRadius, _FadeSphereRadius + _FadeDistance, distance(i.worldPos, _FadeSphereCenter))))); } ENDCG diff --git a/org.mixedrealitytoolkit.input/Visualizers/RiggedHandVisualizer/TransparentOutlinedHand-Main.shader b/org.mixedrealitytoolkit.input/Visualizers/RiggedHandVisualizer/TransparentOutlinedHand-Main.shader index 401bcd452..f50ccd33b 100644 --- a/org.mixedrealitytoolkit.input/Visualizers/RiggedHandVisualizer/TransparentOutlinedHand-Main.shader +++ b/org.mixedrealitytoolkit.input/Visualizers/RiggedHandVisualizer/TransparentOutlinedHand-Main.shader @@ -12,9 +12,12 @@ Shader "Mixed Reality Toolkit/Transparent Outlined Hand (Main)" { Properties { _HandColor ("Hand Color", Color) = (1,1,1,1) - _HandThickness ("_HandThickness", Range(-0.0001,0.0001)) = 0.0 + _HandThickness ("Hand Thickness", Range(-0.01,0.01)) = 0.0 _IlluminationExponent ("Illumination Exponent", Range(0,10)) = 1 _IlluminationAmount ("Illumination Amount", Range(0,10)) = 1 + [PerRendererData]_FadeSphereCenter ("Fade Sphere Center", Vector) = (0,0,0,1) + [PerRendererData]_FadeSphereRadius ("Fade Sphere Radius", Range(0,1)) = 0.05 + [PerRendererData]_FadeDistance ("Fade Distance", Range(0,1)) = 0.025 } SubShader { @@ -46,6 +49,7 @@ Shader "Mixed Reality Toolkit/Transparent Outlined Hand (Main)" { float4 color : COLOR; float3 normal : NORMAL; float3 viewDir: TEXCOORD1; + float3 worldPos : TEXCOORD2; UNITY_VERTEX_OUTPUT_STEREO }; @@ -58,9 +62,11 @@ Shader "Mixed Reality Toolkit/Transparent Outlined Hand (Main)" { UNITY_INITIALIZE_OUTPUT(v2f, o); UNITY_INITIALIZE_VERTEX_OUTPUT_STEREO(o); + float4 objectPos = v.vertex + normalize(v.normal) * _HandThickness; o.normal = UnityObjectToWorldNormal(v.normal); - o.vertex = UnityObjectToClipPos(v.vertex + v.normal * _HandThickness); + o.vertex = UnityObjectToClipPos(objectPos); o.color = v.color; + o.worldPos = mul(unity_ObjectToWorld, objectPos).xyz; // Distance-invariant view pos. Create "normalized view point" // offset from object origin, then construct a new view vector @@ -76,6 +82,9 @@ Shader "Mixed Reality Toolkit/Transparent Outlined Hand (Main)" { uniform float _IlluminationAmount; uniform float _IlluminationExponent; uniform float4 _HandColor; + uniform float4 _FadeSphereCenter; + uniform float _FadeSphereRadius; + uniform float _FadeDistance; fixed4 frag(v2f i) : SV_Target { @@ -84,7 +93,8 @@ Shader "Mixed Reality Toolkit/Transparent Outlined Hand (Main)" { // Blend base color with the illumination/spotlight. float4 hand = _HandColor + pow(spotlight, _IlluminationExponent) * _IlluminationAmount; - return hand * float4(1,1,1,i.color.r); + return hand * float4(1,1,1, + ((_FadeSphereCenter.w * i.color.r) + ((1 - _FadeSphereCenter.w) * smoothstep(_FadeSphereRadius, _FadeSphereRadius + _FadeDistance, distance(i.worldPos, _FadeSphereCenter))))); } ENDCG diff --git a/org.mixedrealitytoolkit.input/Visualizers/RiggedHandVisualizer/TransparentOutlinedHand-PrepassZ.shader b/org.mixedrealitytoolkit.input/Visualizers/RiggedHandVisualizer/TransparentOutlinedHand-PrepassZ.shader index a32b1ef18..db0065d1b 100644 --- a/org.mixedrealitytoolkit.input/Visualizers/RiggedHandVisualizer/TransparentOutlinedHand-PrepassZ.shader +++ b/org.mixedrealitytoolkit.input/Visualizers/RiggedHandVisualizer/TransparentOutlinedHand-PrepassZ.shader @@ -50,7 +50,7 @@ Shader "Mixed Reality Toolkit/Transparent Outlined Hand (PrepassZ)" { UNITY_INITIALIZE_VERTEX_OUTPUT_STEREO(o); // Inflate/deflate hand based on thickness. - o.vertex = UnityObjectToClipPos(v.vertex + v.normal * _HandThickness); + o.vertex = UnityObjectToClipPos(v.vertex + normalize(v.normal) * _HandThickness); return o; } diff --git a/org.mixedrealitytoolkit.input/package.json b/org.mixedrealitytoolkit.input/package.json index 1356bd752..b9d3b602a 100644 --- a/org.mixedrealitytoolkit.input/package.json +++ b/org.mixedrealitytoolkit.input/package.json @@ -1,6 +1,6 @@ { "name": "org.mixedrealitytoolkit.input", - "version": "3.3.1-development", + "version": "4.0.0-development.pre.3", "description": "This package extends the XR Interaction Toolkit with custom interactors and controllers, hand-joint aggregation, and simulation subsystems. It seamlessly integrates with the Unity Input System.", "displayName": "MRTK Input", "msftFeatureCategory": "MRTK3", @@ -13,16 +13,16 @@ "bugs": { "url": "https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/issues" }, - "unity": "2021.3", - "unityRelease": "26f1", + "unity": "6000.0", + "unityRelease": "66f2", "documentationUrl": "https://www.mixedrealitytoolkit.org", "dependencies": { "com.microsoft.mrtk.graphicstools.unity": "0.8.0", "com.unity.inputsystem": "1.6.1", "com.unity.xr.arfoundation": "5.0.5", "com.unity.xr.core-utils": "2.1.0", - "com.unity.xr.hands": "1.3.0", - "com.unity.xr.interaction.toolkit": "2.3.0", - "org.mixedrealitytoolkit.core": "3.2.2" + "com.unity.xr.hands": "1.6.0", + "com.unity.xr.interaction.toolkit": "3.0.4", + "org.mixedrealitytoolkit.core": "4.0.0" } } \ No newline at end of file diff --git a/org.mixedrealitytoolkit.spatialmanipulation/AssemblyInfo.cs b/org.mixedrealitytoolkit.spatialmanipulation/AssemblyInfo.cs index 2f44fc24e..dce8f310d 100644 --- a/org.mixedrealitytoolkit.spatialmanipulation/AssemblyInfo.cs +++ b/org.mixedrealitytoolkit.spatialmanipulation/AssemblyInfo.cs @@ -13,4 +13,4 @@ // The AssemblyVersion attribute is checked-in and is recommended not to be changed often. // https://docs.microsoft.com/troubleshoot/visualstudio/general/assembly-version-assembly-file-version // AssemblyFileVersion and AssemblyInformationalVersion are added by pack-upm.ps1 to match the current MRTK build version. -[assembly: AssemblyVersion("3.0.0.0")] +[assembly: AssemblyVersion("4.0.0.0")] diff --git a/org.mixedrealitytoolkit.spatialmanipulation/BoundsControl/BoundsControl.cs b/org.mixedrealitytoolkit.spatialmanipulation/BoundsControl/BoundsControl.cs index da15216c8..a2592ae0a 100644 --- a/org.mixedrealitytoolkit.spatialmanipulation/BoundsControl/BoundsControl.cs +++ b/org.mixedrealitytoolkit.spatialmanipulation/BoundsControl/BoundsControl.cs @@ -710,7 +710,7 @@ public void RecomputeBounds() private bool ComputeBounds(bool isSecondPass = false) { // currentBounds are local to Target. - // needsBoundsRecompute will be set to true iff we find a UGUI autolayout. + // needsBoundsRecompute will be set to true if and only if we find a UGUI autolayout. // Use the bounds override if we have one. Transform searchStart = (overrideBounds && boundsOverride != null) ? boundsOverride : Target; diff --git a/org.mixedrealitytoolkit.spatialmanipulation/BoundsControl/BoundsControlMoveLogic.cs b/org.mixedrealitytoolkit.spatialmanipulation/BoundsControl/BoundsControlMoveLogic.cs index 6f39fbb31..3757c7173 100644 --- a/org.mixedrealitytoolkit.spatialmanipulation/BoundsControl/BoundsControlMoveLogic.cs +++ b/org.mixedrealitytoolkit.spatialmanipulation/BoundsControl/BoundsControlMoveLogic.cs @@ -3,7 +3,8 @@ using System.Collections.Generic; using UnityEngine; -using UnityEngine.XR.Interaction.Toolkit; +using UnityEngine.XR.Interaction.Toolkit.Interactables; +using UnityEngine.XR.Interaction.Toolkit.Interactors; namespace MixedReality.Toolkit.SpatialManipulation { diff --git a/org.mixedrealitytoolkit.spatialmanipulation/BoundsControl/BoundsControlRotateLogic.cs b/org.mixedrealitytoolkit.spatialmanipulation/BoundsControl/BoundsControlRotateLogic.cs index eb3b3a7ee..1acffd906 100644 --- a/org.mixedrealitytoolkit.spatialmanipulation/BoundsControl/BoundsControlRotateLogic.cs +++ b/org.mixedrealitytoolkit.spatialmanipulation/BoundsControl/BoundsControlRotateLogic.cs @@ -3,7 +3,8 @@ using System.Collections.Generic; using UnityEngine; -using UnityEngine.XR.Interaction.Toolkit; +using UnityEngine.XR.Interaction.Toolkit.Interactables; +using UnityEngine.XR.Interaction.Toolkit.Interactors; namespace MixedReality.Toolkit.SpatialManipulation { diff --git a/org.mixedrealitytoolkit.spatialmanipulation/BoundsControl/BoundsControlScaleLogic.cs b/org.mixedrealitytoolkit.spatialmanipulation/BoundsControl/BoundsControlScaleLogic.cs index 36e53615c..5336ddf15 100644 --- a/org.mixedrealitytoolkit.spatialmanipulation/BoundsControl/BoundsControlScaleLogic.cs +++ b/org.mixedrealitytoolkit.spatialmanipulation/BoundsControl/BoundsControlScaleLogic.cs @@ -3,7 +3,8 @@ using System.Collections.Generic; using UnityEngine; -using UnityEngine.XR.Interaction.Toolkit; +using UnityEngine.XR.Interaction.Toolkit.Interactables; +using UnityEngine.XR.Interaction.Toolkit.Interactors; namespace MixedReality.Toolkit.SpatialManipulation { diff --git a/org.mixedrealitytoolkit.spatialmanipulation/BoundsControl/BoundsHandleInteractable.cs b/org.mixedrealitytoolkit.spatialmanipulation/BoundsControl/BoundsHandleInteractable.cs index a40709694..ca77701c1 100644 --- a/org.mixedrealitytoolkit.spatialmanipulation/BoundsControl/BoundsHandleInteractable.cs +++ b/org.mixedrealitytoolkit.spatialmanipulation/BoundsControl/BoundsHandleInteractable.cs @@ -71,7 +71,7 @@ public BoundsControl BoundsControlRoot /// /// Should the handle maintain its global size, even as the object changes size? /// - [Obsolete("Use ScaleMaintainType instead.")] + [Obsolete("This property has been deprecated in version 3.4.0. Use ScaleMaintainType instead.")] public bool MaintainGlobalSize { get => scaleMaintainType == ScaleMaintainType.GlobalSize; @@ -242,23 +242,6 @@ protected virtual void UpdateLocalScale() ); - /// - /// Occludes the handle so it is not initially visible when it should start disabled. - /// - [Obsolete("Force hiding is no longer supported. Use IsOccluded instead.")] - public void HideOnStartup() - { - if (handleRenderer != null) - { - handleRenderer.enabled = false; - } - if (colliders.Count > 0 && colliders[0] != null) - { - colliders[0].enabled = false; - } - wasOccludedLastFrame = true; - } - /// /// Sets to true, and forces handling of occlusion immediately. /// @@ -293,4 +276,4 @@ protected override void OnSelectExited(SelectExitEventArgs args) BoundsControlRoot.OnHandleSelectExited(this, args); } } -} \ No newline at end of file +} diff --git a/org.mixedrealitytoolkit.spatialmanipulation/BoundsControl/Visuals/SpatialManipulationReticle.cs b/org.mixedrealitytoolkit.spatialmanipulation/BoundsControl/Visuals/SpatialManipulationReticle.cs index f250c2907..d5c91a720 100644 --- a/org.mixedrealitytoolkit.spatialmanipulation/BoundsControl/Visuals/SpatialManipulationReticle.cs +++ b/org.mixedrealitytoolkit.spatialmanipulation/BoundsControl/Visuals/SpatialManipulationReticle.cs @@ -4,7 +4,8 @@ using System; using System.Collections.Generic; using UnityEngine; -using UnityEngine.XR.Interaction.Toolkit; +using UnityEngine.XR.Interaction.Toolkit.Interactables; +using UnityEngine.XR.Interaction.Toolkit.Interactors; namespace MixedReality.Toolkit.SpatialManipulation { diff --git a/org.mixedrealitytoolkit.spatialmanipulation/CHANGELOG.md b/org.mixedrealitytoolkit.spatialmanipulation/CHANGELOG.md index 4ff1c061c..4e0f340f2 100644 --- a/org.mixedrealitytoolkit.spatialmanipulation/CHANGELOG.md +++ b/org.mixedrealitytoolkit.spatialmanipulation/CHANGELOG.md @@ -4,13 +4,35 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/). ## Unreleased +### Changed + +* Updated the minimum editor version to 6000.0.66f2 [PR #1112](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1112) +* Updated tests to follow existing MRTK test patterns. [PR #1073](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1073) + ### Fixed * Fixed "leaked managed shell" issue in `BoundsCalculator`. [PR #1096](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1096) +## [4.0.0-pre.2] - 2025-12-05 + ### Changed -* Updated tests to follow existing MRTK test patterns. [PR #1073](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1073) +* Updated ObjectManipulator and ObjectManipulatorTests to be compatible with renamed rigidbody properties in Unity 6. +* Updated the minimum editor version to 2022.3.6f1 [PR #1003](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1003) + +## [4.0.0-pre.1] - 2024-07-09 + +### Added + +* SolverTapToPlaceTestsForControllerlessRig Unity-tests. +* Ported SolverTapToPlaceTests so that they also test the new controllerless prefabs. +* Updated TapToPlace logic to handle both deprecated XRController and new controllerless actions. +* Updated HandConstraintPalmUp logic to handle both deprecated XRController and new controllerless actions. +* Updated Solver logic to handle both deprecated XRController and new controllerless actions. + +### Changed + +* Updated package com.unity.xr.interaction.toolkit to 3.0.4 ## [3.4.0] - 2025-11-12 @@ -53,4 +75,4 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/). ### Fixed -* Fixed support for UPM package publishing in the Unity Asset Store. [PR #519](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/519) +* Fixed support for UPM package publishing in the Unity Asset Store. [PR #519](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/519) \ No newline at end of file diff --git a/org.mixedrealitytoolkit.spatialmanipulation/Constraints/ConstraintManager.cs b/org.mixedrealitytoolkit.spatialmanipulation/Constraints/ConstraintManager.cs index 09c1a103b..604ab239e 100644 --- a/org.mixedrealitytoolkit.spatialmanipulation/Constraints/ConstraintManager.cs +++ b/org.mixedrealitytoolkit.spatialmanipulation/Constraints/ConstraintManager.cs @@ -131,15 +131,6 @@ public void OnManipulationStarted(MixedRealityTransform worldPose) } } - /// - /// This function is obsolete. - /// - /// - /// Use instead for first-time initialization, and for subsequent manipulation. - /// - [Obsolete("Use Setup instead for first-time initialization, and OnManipulationStarted for subsequent manipulation.")] - public void Initialize(MixedRealityTransform worldPose) { } - /// /// Re-sort list of constraints. Triggered by constraints /// when their execution order is modified at runtime. diff --git a/org.mixedrealitytoolkit.spatialmanipulation/Editor/AssemblyInfo.cs b/org.mixedrealitytoolkit.spatialmanipulation/Editor/AssemblyInfo.cs index 042f3d37c..b999ed1b4 100644 --- a/org.mixedrealitytoolkit.spatialmanipulation/Editor/AssemblyInfo.cs +++ b/org.mixedrealitytoolkit.spatialmanipulation/Editor/AssemblyInfo.cs @@ -9,4 +9,4 @@ // The AssemblyVersion attribute is checked-in and is recommended not to be changed often. // https://docs.microsoft.com/troubleshoot/visualstudio/general/assembly-version-assembly-file-version // AssemblyFileVersion and AssemblyInformationalVersion are added by pack-upm.ps1 to match the current MRTK build version. -[assembly: AssemblyVersion("3.0.0.0")] +[assembly: AssemblyVersion("4.0.0.0")] diff --git a/org.mixedrealitytoolkit.spatialmanipulation/Editor/ObjectManipulator/ObjectManipulatorEditor.cs b/org.mixedrealitytoolkit.spatialmanipulation/Editor/ObjectManipulator/ObjectManipulatorEditor.cs index e0bf28976..946eb5971 100644 --- a/org.mixedrealitytoolkit.spatialmanipulation/Editor/ObjectManipulator/ObjectManipulatorEditor.cs +++ b/org.mixedrealitytoolkit.spatialmanipulation/Editor/ObjectManipulator/ObjectManipulatorEditor.cs @@ -4,7 +4,7 @@ using MixedReality.Toolkit.Editor; using UnityEditor; using UnityEngine; -using UnityEngine.XR.Interaction.Toolkit; +using UnityEngine.XR.Interaction.Toolkit.Interactables; namespace MixedReality.Toolkit.SpatialManipulation.Editor { diff --git a/org.mixedrealitytoolkit.spatialmanipulation/ObjectManipulator/MoveLogics/ManipulationLogic.cs b/org.mixedrealitytoolkit.spatialmanipulation/ObjectManipulator/MoveLogics/ManipulationLogic.cs index bfc1a4c36..5e0c545e6 100644 --- a/org.mixedrealitytoolkit.spatialmanipulation/ObjectManipulator/MoveLogics/ManipulationLogic.cs +++ b/org.mixedrealitytoolkit.spatialmanipulation/ObjectManipulator/MoveLogics/ManipulationLogic.cs @@ -3,7 +3,8 @@ using System.Collections.Generic; using UnityEngine; -using UnityEngine.XR.Interaction.Toolkit; +using UnityEngine.XR.Interaction.Toolkit.Interactables; +using UnityEngine.XR.Interaction.Toolkit.Interactors; namespace MixedReality.Toolkit.SpatialManipulation { diff --git a/org.mixedrealitytoolkit.spatialmanipulation/ObjectManipulator/MoveLogics/RotateLogic.cs b/org.mixedrealitytoolkit.spatialmanipulation/ObjectManipulator/MoveLogics/RotateLogic.cs index ab1acd6db..cb6988a81 100644 --- a/org.mixedrealitytoolkit.spatialmanipulation/ObjectManipulator/MoveLogics/RotateLogic.cs +++ b/org.mixedrealitytoolkit.spatialmanipulation/ObjectManipulator/MoveLogics/RotateLogic.cs @@ -3,7 +3,8 @@ using System.Collections.Generic; using UnityEngine; -using UnityEngine.XR.Interaction.Toolkit; +using UnityEngine.XR.Interaction.Toolkit.Interactables; +using UnityEngine.XR.Interaction.Toolkit.Interactors; namespace MixedReality.Toolkit.SpatialManipulation { diff --git a/org.mixedrealitytoolkit.spatialmanipulation/ObjectManipulator/MoveLogics/ScaleLogic.cs b/org.mixedrealitytoolkit.spatialmanipulation/ObjectManipulator/MoveLogics/ScaleLogic.cs index e9dbf906f..6daec8f2b 100644 --- a/org.mixedrealitytoolkit.spatialmanipulation/ObjectManipulator/MoveLogics/ScaleLogic.cs +++ b/org.mixedrealitytoolkit.spatialmanipulation/ObjectManipulator/MoveLogics/ScaleLogic.cs @@ -3,7 +3,8 @@ using System.Collections.Generic; using UnityEngine; -using UnityEngine.XR.Interaction.Toolkit; +using UnityEngine.XR.Interaction.Toolkit.Interactables; +using UnityEngine.XR.Interaction.Toolkit.Interactors; namespace MixedReality.Toolkit.SpatialManipulation { @@ -22,6 +23,9 @@ public class ScaleLogic : ManipulationLogic private Vector3 startAttachTransformScale; private float startHandDistanceMeters; + // Meaningful minimum squared distance of scaling handles to calculate scale. + private const float scaleDistanceSquaredEpsilon = .0001f; + /// public override void Setup(List interactors, IXRSelectInteractable interactable, MixedRealityTransform currentTarget) { @@ -79,6 +83,17 @@ private float GetScaleBetweenInteractors(List interactors, // Defer square root until end for performance. var distance = Vector3.SqrMagnitude(interactors[i].transform.position - interactors[j].transform.position); + + // Prefer to use the interactor positions directly above for scaling stability, but + // fallback to attach transforms if the interactor positions appear identical. + if (distance < Mathf.Epsilon) + { + distance = Vector3.SqrMagnitude(interactors[i].GetAttachTransform(interactable).position - + interactors[j].GetAttachTransform(interactable).position); + } + // Ensure distance is a meaningful magnitude for scaling. + distance = Mathf.Max(distance, scaleDistanceSquaredEpsilon); + if (distance < result) { result = distance; diff --git a/org.mixedrealitytoolkit.spatialmanipulation/ObjectManipulator/MoveLogics/UnifiedMoveLogic.cs b/org.mixedrealitytoolkit.spatialmanipulation/ObjectManipulator/MoveLogics/UnifiedMoveLogic.cs index 20bb47637..36347fa43 100644 --- a/org.mixedrealitytoolkit.spatialmanipulation/ObjectManipulator/MoveLogics/UnifiedMoveLogic.cs +++ b/org.mixedrealitytoolkit.spatialmanipulation/ObjectManipulator/MoveLogics/UnifiedMoveLogic.cs @@ -3,7 +3,8 @@ using System.Collections.Generic; using UnityEngine; -using UnityEngine.XR.Interaction.Toolkit; +using UnityEngine.XR.Interaction.Toolkit.Interactables; +using UnityEngine.XR.Interaction.Toolkit.Interactors; namespace MixedReality.Toolkit.SpatialManipulation { @@ -77,4 +78,4 @@ private Vector3 GetAttachCentroid(List interactors, IXRSele return sumPos / Mathf.Max(1, count); } } -} \ No newline at end of file +} diff --git a/org.mixedrealitytoolkit.spatialmanipulation/ObjectManipulator/ObjectManipulator.cs b/org.mixedrealitytoolkit.spatialmanipulation/ObjectManipulator/ObjectManipulator.cs index 72493e963..b3aea8e05 100644 --- a/org.mixedrealitytoolkit.spatialmanipulation/ObjectManipulator/ObjectManipulator.cs +++ b/org.mixedrealitytoolkit.spatialmanipulation/ObjectManipulator/ObjectManipulator.cs @@ -5,26 +5,27 @@ using System.Collections.Generic; using Unity.Profiling; using UnityEngine; -using UnityEngine.InputSystem; using UnityEngine.Serialization; using UnityEngine.XR.Interaction.Toolkit; +using UnityEngine.XR.Interaction.Toolkit.Interactables; +using UnityEngine.XR.Interaction.Toolkit.Interactors; namespace MixedReality.Toolkit.SpatialManipulation { /// - /// This class allows for the move, rotate, and scale manipulation + /// This class allows for the move, rotate, and scale manipulation /// of an object by any interactor with a valid transform. /// /// /// Multi-handed interactions and physics-enabled objects are supported. - /// + /// /// The class works with both rigidbody and non-rigidbody objects, /// and allows for throwing and catching interactions. Any interactor /// with an attach transform can interact with and manipulate - /// an . - /// - /// This is a drop-in replacement for the built-in Unity's , - /// that allows for flexible multi-handed interactions. Note, the + /// an . + /// + /// This is a drop-in replacement for the built-in Unity's , + /// that allows for flexible multi-handed interactions. Note, the /// class doesn't track controller velocity, so for precise fast-paced /// throwing interactions that only need one hand, may /// give better results. @@ -37,17 +38,17 @@ public class ObjectManipulator : StatefulInteractable /// /// Describes what pivot the manipulated object will rotate about when - /// a controller or hand is rotated. + /// a controller or hand is rotated. /// /// /// This is not a description of any limits or additional rotation logic. - /// + /// /// If no other factors, such as constraints, are involved, rotating a controller or hand by an - /// amount should rotate the object by that same amount. - /// + /// amount should rotate the object by that same amount. + /// /// A possible future value is `RotateAboutUserDefinedPoint`, this would indicate the user could specify /// a pivot that the object is to rotate around. - /// + /// /// An example of a value that should not be found here is `MaintainRotationToUser`, /// as this would restrict rotation of the object when a controller or hand is rotated. /// @@ -57,7 +58,7 @@ public enum RotateAnchorType /// Rotation will occur around the center of the object. /// RotateAboutObjectCenter = 0, - + /// /// Rotation will occur at the point the control or hand grabbed the object. /// @@ -65,7 +66,7 @@ public enum RotateAnchorType }; /// - /// This enumeration describing the type of behavior to apply when a + /// This enumeration describing the type of behavior to apply when a /// is released by a controller. /// [System.Flags] @@ -113,11 +114,11 @@ public Transform HostTransform { if (interactorsSelecting.Count != 0) { - Debug.LogWarning("Changing the host transform while the object is being manipulated is not yet supported. " + + Debug.LogWarning("Changing the host transform while the object is being manipulated is not yet supported. " + "Check interactorsSelecting.Count before changing the host transform."); return; } - if (hostTransform != value ) + if (hostTransform != value) { hostTransform = value; @@ -127,7 +128,7 @@ public Transform HostTransform { constraintsManager.Setup(new MixedRealityTransform(HostTransform)); } - + // Reacquire reference to the rigidbody. rigidBody = HostTransform.GetComponent(); } @@ -472,8 +473,8 @@ public struct LogicType /// /// /// Setting this field at runtime can be expensive (reflection) and interrupt pr break - /// currently occurring manipulations. So use this with caution. - /// + /// currently occurring manipulations. So use this with caution. + /// /// This is best used at startup or when instantiating ObjectManipulators from code. /// public LogicType ManipulationLogicTypes @@ -631,9 +632,9 @@ protected override void Awake() } #endregion - + /// - /// Invoked on , , and to apply required + /// Invoked on , , and to apply required /// settings to this instance. /// protected virtual void ApplyRequiredSettings() @@ -685,7 +686,7 @@ public override bool IsSelectableBy(IXRSelectInteractor interactor) } // When the player is carrying a Rigidbody, the physics damping of interaction should act within the moving frame of reference of the player. - // The reference frame logic allows compensating for that + // The reference frame logic allows compensating for that private Transform referenceFrameTransform = null; private bool referenceFrameHasLastPos = false; private Vector3 referenceFrameLastPos; @@ -760,7 +761,7 @@ protected override void OnSelectExited(SelectExitEventArgs args) { if (interactorsSelecting.Count == 0) { - ReleaseRigidBody(rigidBody.velocity, rigidBody.angularVelocity); + ReleaseRigidBody(rigidBody.linearVelocity, rigidBody.angularVelocity); } else { @@ -785,7 +786,7 @@ public override void ProcessInteractable(XRInteractionUpdateOrder.UpdatePhase up { base.ProcessInteractable(updatePhase); - if(!isSelected) + if (!isSelected) { return; } @@ -908,7 +909,7 @@ private void ApplyForcesToRigidbody() // when player is moving, we need to anticipate where the targetTransform is going to be one time step from now distance -= referenceFrameVelocity * Time.fixedDeltaTime; - var velocity = rigidBody.velocity; + var velocity = rigidBody.linearVelocity; var acceleration = omega * omega * -distance; // acceleration caused by spring force @@ -937,7 +938,7 @@ private void ApplyForcesToRigidbody() velocity += referenceFrameVelocity; // change back to global frame of reference - rigidBody.velocity = velocity; + rigidBody.linearVelocity = velocity; if (applyTorque) { @@ -1035,7 +1036,7 @@ private void ReleaseRigidBody(Vector3 velocity, Vector3 angularVelocity) { if (releaseBehavior.IsMaskSet(ReleaseBehaviorType.KeepVelocity)) { - rigidBody.velocity = velocity; + rigidBody.linearVelocity = velocity; } if (releaseBehavior.IsMaskSet(ReleaseBehaviorType.KeepAngularVelocity)) @@ -1045,31 +1046,6 @@ private void ReleaseRigidBody(Vector3 velocity, Vector3 angularVelocity) } } } - - // TODO, may want to move this - // into an extension method on the controller, or into some utility box. - /// - /// Gets the absolute device (grip) rotation associated with the specified interactor. - /// Used to query actual grabbing rotation, vs a ray rotation. - /// - private bool TryGetGripRotation(IXRSelectInteractor interactor, out Quaternion rotation) - { - // We need to query the raw device rotation from the interactor; however, - // the controller may have its rotation bound to the pointerRotation, which is unsuitable - // for modeling rotations with far rays. Therefore, we cast down to the base TrackedDevice, - // and query the device rotation directly. If any of this can't be casted, we return the - // interactor's attachTransform's rotation. - if (interactor is XRBaseControllerInteractor controllerInteractor && - controllerInteractor.xrController is ActionBasedController abController && - abController.rotationAction.action?.activeControl?.device is TrackedDevice device) - { - rotation = device.deviceRotation.ReadValue(); - return true; - } - - rotation = interactor.GetAttachTransform(this).rotation; - return true; - } } /// diff --git a/org.mixedrealitytoolkit.spatialmanipulation/Solvers/HandConstraintPalmUp.cs b/org.mixedrealitytoolkit.spatialmanipulation/Solvers/HandConstraintPalmUp.cs index 6923a0ac2..c0f2d07cf 100644 --- a/org.mixedrealitytoolkit.spatialmanipulation/Solvers/HandConstraintPalmUp.cs +++ b/org.mixedrealitytoolkit.spatialmanipulation/Solvers/HandConstraintPalmUp.cs @@ -4,6 +4,7 @@ using System.Collections; using Unity.Profiling; using UnityEngine; +using UnityEngine.InputSystem.XR; using UnityEngine.Serialization; using UnityEngine.XR; @@ -274,21 +275,48 @@ private bool IsUserGazeMeetingThresholdRequirements(XRNode hand) Ray? gazeRay = null; bool usedEyeGaze = false; - if (ControllerLookup != null && - ControllerLookup.GazeController != null && - (ControllerLookup.GazeController.currentControllerState.inputTrackingState & - (InputTrackingState.Position | InputTrackingState.Rotation)) > 0) + #pragma warning disable CS0618 // Type or member is obsolete + if (ControllerLookup != null) { - gazeRay = new Ray( - ControllerLookup.GazeController.transform.position, - ControllerLookup.GazeController.transform.forward); - usedEyeGaze = true; + if (ControllerLookup.GazeController != null && + (ControllerLookup.GazeController.currentControllerState.inputTrackingState & + (InputTrackingState.Position | InputTrackingState.Rotation)) > 0) + { + gazeRay = new Ray( + ControllerLookup.GazeController.transform.position, + ControllerLookup.GazeController.transform.forward); + usedEyeGaze = true; + } + else + { + gazeRay = new Ray( + Camera.main.transform.position, + Camera.main.transform.forward); + } + } + #pragma warning restore CS0618 + else if (TrackedPoseDriverLookup != null) + { + InputTrackingState gazeTrackingStateInput = GetGazeInputTrackingState(TrackedPoseDriverLookup.GazeTrackedPoseDriver); + if (gazeTrackingStateInput.HasFlag(InputTrackingState.Position) && + gazeTrackingStateInput.HasFlag(InputTrackingState.Rotation)) + { + gazeRay = new Ray( + TrackedPoseDriverLookup.GazeTrackedPoseDriver.transform.position, + TrackedPoseDriverLookup.GazeTrackedPoseDriver.transform.forward); + usedEyeGaze = true; + } + else + { + gazeRay = new Ray( + Camera.main.transform.position, + Camera.main.transform.forward); + } } else { - gazeRay = new Ray( - Camera.main.transform.position, - Camera.main.transform.forward); + Debug.LogWarning("Neither ControllerLookup nor TrackedPoseDriverLookup are set, unable to determine whether user gaze meets threashold requirements or not."); + return false; } if (gazeRay.HasValue) @@ -326,6 +354,47 @@ public void StartWorldLockReattachCheckCoroutine() private static readonly ProfilerMarker TryGenerateHandPlaneAndActivationPointPerfMarker = new ProfilerMarker("[MRTK] HandConstraintPalmUp.TryGenerateHandPlaneAndActivationPoint"); + /// + /// Get the input tracking state for the given gaze pose gazePoseDriver. + /// + private InputTrackingState GetGazeInputTrackingState(TrackedPoseDriver gazePoseDriver) + { + // Special case for when the gazePoseDriver is null, we return None so caller can fallback to head pose. + if (gazePoseDriver == null) + { + return InputTrackingState.None; + } + + // Note, that the logic in this class is meant to reproduce the same logic as the base. The base + // `TrackedPoseDriver` also sets the tracking state in a similar manner. Please see + // `TrackedPoseDriver::ReadTrackingState`. Replicating this logic is not ideal, but it is + // necessary since the class does not expose its tracking status logic. Note this + // code also exists in the MRTK3 input package in `TrackedPoseDriverExtensions::GetGazeInputTrackingState`, + // but to avoid pulling in the `input` package, we've replicated the logic here. + + var trackingStateAction = gazePoseDriver.trackingStateInput.action; + if (trackingStateAction == null || trackingStateAction.bindings.Count == 0) + { + // Treat an Input Action Reference with no reference the same as + // an enabled Input Action with no authored bindings, and allow driving the Transform pose. + return InputTrackingState.Position | InputTrackingState.Rotation; + } + + if (!trackingStateAction.enabled) + { + // Treat a disabled action as the default None value for the ReadValue call + return InputTrackingState.None; + } + + InputTrackingState result = InputTrackingState.None; + if (trackingStateAction.controls.Count > 0) + { + result = (InputTrackingState)trackingStateAction.ReadValue(); + } + + return result; + } + /// /// This function attempts to generate a hand plane based on the wrist, index knuckle and pinky /// knuckle joints present in the hand. On a success, it then calls GenerateActivationPoint to diff --git a/org.mixedrealitytoolkit.spatialmanipulation/Solvers/Solver.cs b/org.mixedrealitytoolkit.spatialmanipulation/Solvers/Solver.cs index 03f76abf2..930ef9a1d 100644 --- a/org.mixedrealitytoolkit.spatialmanipulation/Solvers/Solver.cs +++ b/org.mixedrealitytoolkit.spatialmanipulation/Solvers/Solver.cs @@ -1,6 +1,8 @@ // Copyright (c) Mixed Reality Toolkit Contributors // Licensed under the BSD 3-Clause +using MixedReality.Toolkit.Input; +using System; using UnityEngine; using UnityEngine.Serialization; @@ -15,13 +17,22 @@ namespace MixedReality.Toolkit.SpatialManipulation [HelpURL("https://docs.microsoft.com/windows/mixed-reality/mrtk-unity/features/ux-building-blocks/solvers/solver")] public abstract class Solver : MonoBehaviour { + [Obsolete("This field has been deprecated in version 4.0.0. Please use MixedReality.Toolkit.Input.TrackedPoseDriverLookup instead.")] private static ControllerLookup controllerLookup; /// /// Get the ControllerLookup that will be used all application objects. /// + [Obsolete("This property has been deprecated in version 4.0.0. Please use MixedReality.Toolkit.Input.TrackedPoseDriverLookup instead.")] protected static ControllerLookup ControllerLookup => controllerLookup; + private static TrackedPoseDriverLookup trackedPoseDriverLookup; + + /// + /// Get the TrackedPoseDriverLookup that will be used by all application objects. + /// + protected static TrackedPoseDriverLookup TrackedPoseDriverLookup => trackedPoseDriverLookup; + [SerializeField] [Tooltip("If true, the position and orientation will be calculated, but not applied, for other components to use")] private bool updateLinkedTransform = false; @@ -261,10 +272,19 @@ protected virtual void Start() { // Find the controller lookup class in the hierarchy. Solvers that require access to the // left, right or gaze controllers will use the references stored in this class. + #pragma warning disable CS0618 // Type or member is obsolete if (controllerLookup == null) { controllerLookup = ComponentCache.FindFirstActiveInstance(); } + + // Find the controller lookup class in the hierarchy. Solvers that require access to the + // left, right or gaze TrackedPoseDriver will use the references stored in this class. + if (controllerLookup == null && trackedPoseDriverLookup == null) + { + trackedPoseDriverLookup = ComponentCache.FindFirstActiveInstance(); + } + #pragma warning restore CS0618 } #endregion MonoBehaviour Implementation diff --git a/org.mixedrealitytoolkit.spatialmanipulation/Solvers/SolverHandler.cs b/org.mixedrealitytoolkit.spatialmanipulation/Solvers/SolverHandler.cs index 93696bbd0..ccac6b5b1 100644 --- a/org.mixedrealitytoolkit.spatialmanipulation/Solvers/SolverHandler.cs +++ b/org.mixedrealitytoolkit.spatialmanipulation/Solvers/SolverHandler.cs @@ -7,7 +7,7 @@ using UnityEngine; using UnityEngine.Serialization; using UnityEngine.XR; -using UnityEngine.XR.Interaction.Toolkit; +using UnityEngine.XR.Interaction.Toolkit.Interactors; namespace MixedReality.Toolkit.SpatialManipulation { diff --git a/org.mixedrealitytoolkit.spatialmanipulation/Solvers/TapToPlace.cs b/org.mixedrealitytoolkit.spatialmanipulation/Solvers/TapToPlace.cs index fb1a97d66..268273133 100644 --- a/org.mixedrealitytoolkit.spatialmanipulation/Solvers/TapToPlace.cs +++ b/org.mixedrealitytoolkit.spatialmanipulation/Solvers/TapToPlace.cs @@ -7,6 +7,8 @@ using UnityEngine.Events; using UnityEngine.InputSystem; using UnityEngine.XR.Interaction.Toolkit; +using UnityEngine.XR.Interaction.Toolkit.Inputs.Readers; +using UnityEngine.XR.Interaction.Toolkit.Interactors; using UnityPhysics = UnityEngine.Physics; namespace MixedReality.Toolkit.SpatialManipulation @@ -268,9 +270,12 @@ protected RaycastHit CurrentHit // Used to obtain list of known interactors private XRInteractionManager interactionManager; - // Used to cache a known set of interactor + // Used to cache a known set of interactors private List interactorsCache; + // Used to cache a known set of input interactor select button readers, and used to query their performed actions. + private List interactorSelectButtonReaders; + #region MonoBehaviour Implementation /// @@ -427,10 +432,15 @@ public override void SolverUpdate() { using (SolverUpdatePerfMarker.Auto()) { + // Stop placement if a select action is performed this frame + if (InteractorSelectPerformedThisFrame()) + { + StopPlacement(); + } // Make sure the Transform target is not null, added for the case where auto start is true // and the tracked target type is the controller ray, if the hand is not in the frame we cannot // calculate the position of the object - if (SolverHandler.TransformTarget != null) + else if (SolverHandler.TransformTarget != null) { PerformRaycast(); SetPosition(); @@ -528,6 +538,27 @@ protected virtual void SetRotation() } } + /// + /// Get if an interactor's select button was performed this frame. + /// + private bool InteractorSelectPerformedThisFrame() + { + if (interactorSelectButtonReaders == null || interactorSelectButtonReaders.Count == 0) + { + return false; + } + + foreach (XRInputButtonReader reader in interactorSelectButtonReaders) + { + if (reader.ReadWasPerformedThisFrame()) + { + return true; + } + } + + return false; + } + /// /// Registers the input action which performs placement. /// @@ -550,19 +581,36 @@ private void RegisterPlacementAction() interactorsCache = new List(); } + if (interactorSelectButtonReaders == null) + { + interactorSelectButtonReaders = new List(); + } + // Try registering for the controller's "action" so object selection isn't required for placement. // If no controller, then fallback to using object selections for placement. interactionManager.GetRegisteredInteractors(interactorsCache); foreach (IXRInteractor interactor in interactorsCache) { - if (interactor is XRBaseControllerInteractor controllerInteractor && +#pragma warning disable CS0618 // ActionBasedController and XRBaseInputInteractor.forceDeprecatedInput are obsolete + if (interactor is XRBaseInputInteractor controllerInteractor && + controllerInteractor.forceDeprecatedInput && controllerInteractor.xrController is ActionBasedController actionController) { actionController.selectAction.action.performed += StopPlacementViaPerformedAction; } - else if (interactor is IXRSelectInteractor selectInteractor) +#pragma warning restore CS0618 // ActionBasedController and XRBaseInputInteractor.forceDeprecatedInput are obsolete + else { - selectInteractor.selectEntered.AddListener(StopPlacementViaSelect); + if (interactor is XRBaseInputInteractor inputInteractor && + inputInteractor.selectInput != null) + { + interactorSelectButtonReaders.Add(inputInteractor.selectInput); + } + + if (interactor is IXRSelectInteractor selectInteractor) + { + selectInteractor.selectEntered.AddListener(StopPlacementViaSelect); + } } } } @@ -576,17 +624,21 @@ private void UnregisterPlacementAction() { foreach (IXRInteractor interactor in interactorsCache) { - if (interactor is XRBaseControllerInteractor controllerInteractor && +#pragma warning disable CS0618 // ActionBasedController and XRBaseInputInteractor.forceDeprecatedInput are obsolete + if (interactor is XRBaseInputInteractor controllerInteractor && + controllerInteractor.forceDeprecatedInput && controllerInteractor.xrController is ActionBasedController actionController) { actionController.selectAction.action.performed -= StopPlacementViaPerformedAction; } +#pragma warning restore CS0618 // ActionBasedController and XRBaseInputInteractor.forceDeprecatedInput are obsolete else if (interactor is IXRSelectInteractor selectInteractor) { selectInteractor.selectEntered.RemoveListener(StopPlacementViaSelect); } } interactorsCache.Clear(); + interactorSelectButtonReaders.Clear(); } } diff --git a/org.mixedrealitytoolkit.spatialmanipulation/Tests/Editor/AssemblyInfo.cs b/org.mixedrealitytoolkit.spatialmanipulation/Tests/Editor/AssemblyInfo.cs index 0e2724547..096ed0fd9 100644 --- a/org.mixedrealitytoolkit.spatialmanipulation/Tests/Editor/AssemblyInfo.cs +++ b/org.mixedrealitytoolkit.spatialmanipulation/Tests/Editor/AssemblyInfo.cs @@ -9,4 +9,4 @@ // The AssemblyVersion attribute is checked-in and is recommended not to be changed often. // https://docs.microsoft.com/troubleshoot/visualstudio/general/assembly-version-assembly-file-version // AssemblyFileVersion and AssemblyInformationalVersion are added by pack-upm.ps1 to match the current MRTK build version. -[assembly: AssemblyVersion("3.0.0.0")] +[assembly: AssemblyVersion("4.0.0.0")] diff --git a/org.mixedrealitytoolkit.spatialmanipulation/Tests/Runtime/AssemblyInfo.cs b/org.mixedrealitytoolkit.spatialmanipulation/Tests/Runtime/AssemblyInfo.cs index b9d8c37c6..ef6667bbf 100644 --- a/org.mixedrealitytoolkit.spatialmanipulation/Tests/Runtime/AssemblyInfo.cs +++ b/org.mixedrealitytoolkit.spatialmanipulation/Tests/Runtime/AssemblyInfo.cs @@ -9,4 +9,4 @@ // The AssemblyVersion attribute is checked-in and is recommended not to be changed often. // https://docs.microsoft.com/troubleshoot/visualstudio/general/assembly-version-assembly-file-version // AssemblyFileVersion and AssemblyInformationalVersion are added by pack-upm.ps1 to match the current MRTK build version. -[assembly: AssemblyVersion("3.0.0.0")] +[assembly: AssemblyVersion("4.0.0.0")] diff --git a/org.mixedrealitytoolkit.spatialmanipulation/Tests/Runtime/BoundsControlTests.cs b/org.mixedrealitytoolkit.spatialmanipulation/Tests/Runtime/BoundsControlTests.cs index 854e50c0c..f08d80feb 100644 --- a/org.mixedrealitytoolkit.spatialmanipulation/Tests/Runtime/BoundsControlTests.cs +++ b/org.mixedrealitytoolkit.spatialmanipulation/Tests/Runtime/BoundsControlTests.cs @@ -21,6 +21,11 @@ namespace MixedReality.Toolkit.SpatialManipulation.Runtime.Tests /// public class BoundsControlTests : BaseRuntimeInputTests { + /// + /// Temporary override of the rig version to use for these tests. Once the test are fixed to work with new MRTK3 rig, this should be removed. + /// + protected override InputTestUtilities.RigVersion RigVersion => InputTestUtilities.RigVersion.Version1; + private static readonly string BoundsVisuals3DOcclusionPath = AssetDatabase.GUIDToAssetPath("7b542306e34a62f4c9a822fcb19b7d99"); private static readonly string BoundsVisualsTraditionalPath = AssetDatabase.GUIDToAssetPath("ecbf05ce2121a744cb893e82377ba3cd"); @@ -299,7 +304,7 @@ public IEnumerator TestNoHandlesToggleWhenMovingWithObjectManipulator([ValueSour Assert.IsFalse(objectManipulator.IsGrabSelected, "ObjectManipulator should have been released!"); Assert.IsFalse(bc.HandlesActive, "Handles should not have been toggled."); - TestUtilities.AssertAboutEqual(bc.transform.position, initialObjectPosition, $"Object should be placed generally in the same position! Actual position: {bc.transform.position:F5}, should be {initialObjectPosition}", 0.00001f); + TestUtilities.AssertAboutEqual(bc.transform.position, initialObjectPosition, $"Object should be placed generally in the same position! Actual position: {bc.transform.position:F5}, should be {initialObjectPosition}", 0.01f); Object.Destroy(bc.gameObject); // Wait for a frame to give Unity a change to actually destroy the object @@ -374,7 +379,7 @@ private IEnumerator HoverCursorRotation(string handleName, Vector3 expectedRotat yield return RuntimeTestUtilities.WaitForUpdates(); Assert.IsTrue(handle.isHovered, $"Handle should be hovered for {handleName}."); - SpatialManipulationReticle[] reticles = FindObjectUtility.FindObjectsByType(); + SpatialManipulationReticle[] reticles = Object.FindObjectsByType(FindObjectsSortMode.InstanceID); Assert.AreEqual(reticles.Length, 1, "Cursor should appear."); GameObject cursor = reticles[0].gameObject; Assert.IsTrue(ApproximatelyEquals(cursor.transform.eulerAngles, expectedRotation), $"Cursor should be rotated for {handleName}. Expected euler angles: {expectedRotation}. Actual: {cursor.transform.eulerAngles}"); @@ -386,7 +391,7 @@ private IEnumerator HoverCursorRotation(string handleName, Vector3 expectedRotat Assert.IsTrue(handle.isSelected, $"Handle should be selected for {handleName}."); Assert.IsTrue(handle.isHovered, $"Handle should be hovered for {handleName}."); - reticles = FindObjectUtility.FindObjectsByType(); + reticles = Object.FindObjectsByType(FindObjectsSortMode.InstanceID); Assert.AreEqual(reticles.Length, 1, $"Cursor should stay during select for {handleName}."); cursor = reticles[0].gameObject; Assert.IsTrue(ApproximatelyEquals(cursor.transform.eulerAngles, expectedRotation), $"Cursor should be rotated for {handleName}."); @@ -398,7 +403,7 @@ private IEnumerator HoverCursorRotation(string handleName, Vector3 expectedRotat Assert.IsTrue(handle.isSelected, $"Handle should be selected for {handleName}."); Assert.IsTrue(handle.isHovered, $"Handle should be hovered for {handleName}."); - reticles = FindObjectUtility.FindObjectsByType(); + reticles = Object.FindObjectsByType(FindObjectsSortMode.InstanceID); Assert.AreEqual(reticles.Length, 1, $"Cursor should stay during move for {handleName}."); cursor = reticles[0].gameObject; Assert.IsTrue(ApproximatelyEquals(cursor.transform.eulerAngles, expectedRotation), $"Cursor should be rotated for {handleName}."); diff --git a/org.mixedrealitytoolkit.spatialmanipulation/Tests/Runtime/MRTK.SpatialManipulation.RuntimeTests.asmdef b/org.mixedrealitytoolkit.spatialmanipulation/Tests/Runtime/MRTK.SpatialManipulation.RuntimeTests.asmdef index 62ed8574e..26ba2c516 100644 --- a/org.mixedrealitytoolkit.spatialmanipulation/Tests/Runtime/MRTK.SpatialManipulation.RuntimeTests.asmdef +++ b/org.mixedrealitytoolkit.spatialmanipulation/Tests/Runtime/MRTK.SpatialManipulation.RuntimeTests.asmdef @@ -9,7 +9,8 @@ "MixedReality.Toolkit.SpatialManipulation", "UnityEditor.TestRunner", "UnityEngine.TestRunner", - "Unity.XR.Interaction.Toolkit" + "Unity.XR.Interaction.Toolkit", + "Unity.InputSystem" ], "includePlatforms": [], "excludePlatforms": [], diff --git a/org.mixedrealitytoolkit.spatialmanipulation/Tests/Runtime/ObjectManipulatorTests.cs b/org.mixedrealitytoolkit.spatialmanipulation/Tests/Runtime/ObjectManipulatorTests.cs index 9a0ee83cd..9ef49ac43 100644 --- a/org.mixedrealitytoolkit.spatialmanipulation/Tests/Runtime/ObjectManipulatorTests.cs +++ b/org.mixedrealitytoolkit.spatialmanipulation/Tests/Runtime/ObjectManipulatorTests.cs @@ -14,9 +14,11 @@ using System.Collections.Generic; using UnityEngine; using UnityEngine.TestTools; -using UnityEngine.XR.Interaction.Toolkit; +using UnityEngine.XR.Interaction.Toolkit.Interactables; +using UnityEngine.XR.Interaction.Toolkit.Interactors; + using HandshapeId = MixedReality.Toolkit.Input.HandshapeTypes.HandshapeId; -using MovementType = UnityEngine.XR.Interaction.Toolkit.XRBaseInteractable.MovementType; +using MovementType = UnityEngine.XR.Interaction.Toolkit.Interactables.XRBaseInteractable.MovementType; namespace MixedReality.Toolkit.SpatialManipulation.Runtime.Tests { @@ -987,7 +989,7 @@ public IEnumerator ObjectManipulatorRigidbodyCollision() yield return hand.Move(Vector3.forward * 3f); yield return RuntimeTestUtilities.WaitForFixedUpdates(); - Assert.AreNotEqual(Vector3.zero, backgroundRigidbody.velocity); + Assert.AreNotEqual(Vector3.zero, backgroundRigidbody.linearVelocity); Assert.AreEqual(1, collisionListener.CollisionCount); } @@ -1184,7 +1186,7 @@ private void OnCollisionEnter(Collision collision) /************** To be added in the future ***************** /// /// Test validates throw behavior on manipulation handler. Box with disabled gravity should travel a - /// certain distance when being released from grab during hand movement. Specifically for near interactions, + /// certain distance when being released from grab during hand movement. Specifically for near interactions, /// where we expect the thrown object to match the controllers velocities. /// [UnityTest] @@ -1241,7 +1243,7 @@ public IEnumerator ObjectManipulatorNearThrow() /// /// Test validates throw behavior on manipulation handler. Box with disabled gravity should travel a - /// certain distance when being released from grab during hand movement. Specifically for far interactions, + /// certain distance when being released from grab during hand movement. Specifically for far interactions, /// where we expect the thrown object to maintain it's velocities after being thrown /// [UnityTest] diff --git a/org.mixedrealitytoolkit.spatialmanipulation/Tests/Runtime/SolverHandlerTests.cs b/org.mixedrealitytoolkit.spatialmanipulation/Tests/Runtime/SolverHandlerTests.cs index aebd28faa..5e8bba3b5 100644 --- a/org.mixedrealitytoolkit.spatialmanipulation/Tests/Runtime/SolverHandlerTests.cs +++ b/org.mixedrealitytoolkit.spatialmanipulation/Tests/Runtime/SolverHandlerTests.cs @@ -20,10 +20,17 @@ namespace MixedReality.Toolkit.SpatialManipulation.Runtime.Tests /// public class SolverHandlerTests : BaseRuntimeInputTests { + /// + /// Override of the rig version to use for these tests. These tests validate that the old rig remain functional. + /// The will validate the new rig. + /// + protected override InputTestUtilities.RigVersion RigVersion => InputTestUtilities.RigVersion.Version1; + /// /// This checks if the SolverHandler correctly switches to the active hand when tracking /// two interactors /// +#pragma warning disable CS0618 // Adding this pragma because all the encompassed tests depend on deprecated ControllerLookup [UnityTest] public IEnumerator SolverHandlerInteractorSwitchesToActiveHand() { @@ -37,7 +44,7 @@ public IEnumerator SolverHandlerInteractorSwitchesToActiveHand() // Set it to track interactors solverHandler.TrackedHandedness = Handedness.Both; solverHandler.TrackedTargetType = TrackedObjectType.Interactor; - var lookup = FindObjectUtility.FindAnyObjectByType(); + var lookup = Object.FindAnyObjectByType(); var leftInteractor = lookup.LeftHandController.GetComponentInChildren(); var rightInteractor = lookup.RightHandController.GetComponentInChildren(); solverHandler.LeftInteractor = leftInteractor; @@ -95,7 +102,7 @@ public IEnumerator SolverHandlerInteractorSwitchesToActiveHandWithEverythingValu // Set it to track interactors solverHandler.TrackedHandedness = (Handedness)(-1); solverHandler.TrackedTargetType = TrackedObjectType.Interactor; - var lookup = FindObjectUtility.FindAnyObjectByType(); + var lookup = Object.FindAnyObjectByType(); var leftInteractor = lookup.LeftHandController.GetComponentInChildren(); var rightInteractor = lookup.RightHandController.GetComponentInChildren(); solverHandler.LeftInteractor = leftInteractor; @@ -150,7 +157,7 @@ public IEnumerator SolverHandlerInteractorLeftHandOnly() // Set it to track interactors solverHandler.TrackedHandedness = Handedness.Left; solverHandler.TrackedTargetType = TrackedObjectType.Interactor; - var lookup = FindObjectUtility.FindAnyObjectByType(); + var lookup = Object.FindAnyObjectByType(); var leftInteractor = lookup.LeftHandController.GetComponentInChildren(); var rightInteractor = lookup.RightHandController.GetComponentInChildren(); solverHandler.LeftInteractor = leftInteractor; @@ -205,7 +212,7 @@ public IEnumerator SolverHandlerInteractorRightHandOnly() // Set it to track interactors solverHandler.TrackedHandedness = Handedness.Right; solverHandler.TrackedTargetType = TrackedObjectType.Interactor; - var lookup = FindObjectUtility.FindAnyObjectByType(); + var lookup = Object.FindAnyObjectByType(); var leftInteractor = lookup.LeftHandController.GetComponentInChildren(); var rightInteractor = lookup.RightHandController.GetComponentInChildren(); solverHandler.LeftInteractor = leftInteractor; @@ -261,7 +268,7 @@ public IEnumerator SolverHandlerInteractorPreferredHandedness() yield return RuntimeTestUtilities.WaitForUpdates(); // Set it to track interactors solverHandler.TrackedTargetType = TrackedObjectType.Interactor; - var lookup = FindObjectUtility.FindAnyObjectByType(); + var lookup = Object.FindAnyObjectByType(); var leftInteractor = lookup.LeftHandController.GetComponentInChildren(); var rightInteractor = lookup.RightHandController.GetComponentInChildren(); solverHandler.LeftInteractor = leftInteractor; @@ -302,7 +309,7 @@ public IEnumerator SolverHandlerInteractorTracksInitialActiveHand() // Set it to track interactors solverHandler.TrackedTargetType = TrackedObjectType.Interactor; - var lookup = FindObjectUtility.FindAnyObjectByType(); + var lookup = Object.FindAnyObjectByType(); var leftInteractor = lookup.LeftHandController.GetComponentInChildren(); var rightInteractor = lookup.RightHandController.GetComponentInChildren(); solverHandler.LeftInteractor = leftInteractor; @@ -344,7 +351,7 @@ public IEnumerator SolverHandlerInteractorMovesWithHand() // Set it to track interactors solverHandler.TrackedTargetType = TrackedObjectType.Interactor; - var lookup = FindObjectUtility.FindAnyObjectByType(); + var lookup = Object.FindAnyObjectByType(); var leftInteractor = lookup.LeftHandController.GetComponentInChildren(); var rightInteractor = lookup.RightHandController.GetComponentInChildren(); solverHandler.LeftInteractor = leftInteractor; @@ -369,6 +376,7 @@ public IEnumerator SolverHandlerInteractorMovesWithHand() // Check that the SolverHandler keeps tracking the right hand Assert.IsTrue(solverHandler.TransformTarget.position == solverHandler.RightInteractor.transform.position, $"Solver Handler did not follow hand"); } +#pragma warning restore CS0618 // Adding this pragma because all the encompassed tests depend on deprecated ControllerLookup /// /// This checks if the SolverHandler moves with head when tracking the head diff --git a/org.mixedrealitytoolkit.spatialmanipulation/Tests/Runtime/SolverHandlerTestsForControllerlessRig.cs b/org.mixedrealitytoolkit.spatialmanipulation/Tests/Runtime/SolverHandlerTestsForControllerlessRig.cs new file mode 100644 index 000000000..f4e730c24 --- /dev/null +++ b/org.mixedrealitytoolkit.spatialmanipulation/Tests/Runtime/SolverHandlerTestsForControllerlessRig.cs @@ -0,0 +1,724 @@ +// Copyright (c) Mixed Reality Toolkit Contributors +// Licensed under the BSD 3-Clause + +// Disable "missing XML comment" warning for tests. While nice to have, this documentation is not required. +#pragma warning disable CS1591 + +using MixedReality.Toolkit.Core.Tests; +using MixedReality.Toolkit.Input; +using MixedReality.Toolkit.Input.Tests; +using NUnit.Framework; +using System.Collections; +using UnityEngine; +using UnityEngine.TestTools; +using UnityEngine.XR; + +namespace MixedReality.Toolkit.SpatialManipulation.Runtime.Tests +{ + /// + /// Tests for SolverHandler for the XRI3+ controllerles MRTK rig. + /// + /// + /// These tests are equivalent to those in but they test with the new MRTK Rig that was + /// created for the XRI3 migration. Eventually, this will replace the original when + /// the deprecated pre-XRI3 rig is removed in its entirety from MRTK3. + /// Note: This class contains only the tests that are specific to the XRI3+ rig. Tests that are common to both rigs are in the + /// original . Once the XRI3 migration is completed by removing all the pre-XRI3 + /// prefabs then those tests can be moved to this class. + /// + public class SolverHandlerTestsForControllerlessRig : BaseRuntimeInputTests + { + /// + /// This checks if the SolverHandler can be configured to only track left hand only + /// + /// + /// This test is the XRI3+ version of + /// + [UnityTest] + public IEnumerator SolverHandlerInteractorLeftHandOnly() + { + // Disable gaze interactions for this unit test; + InputTestUtilities.DisableGazeInteractor(); + + // Set up GameObject with a SolverHandler + var testObject = GameObject.CreatePrimitive(PrimitiveType.Cube); + var solverHandler = testObject.AddComponent(); + + // Set it to track interactors + solverHandler.TrackedHandedness = Handedness.Left; + solverHandler.TrackedTargetType = TrackedObjectType.Interactor; + var lookup = Object.FindAnyObjectByType(); + var leftInteractor = lookup.LeftHandTrackedPoseDriver.GetComponentInChildren(); + var rightInteractor = lookup.RightHandTrackedPoseDriver.GetComponentInChildren(); + solverHandler.LeftInteractor = leftInteractor; + solverHandler.RightInteractor = rightInteractor; + + yield return RuntimeTestUtilities.WaitForUpdates(); + + TestHand rightHand = new TestHand(Handedness.Right); + TestHand leftHand = new TestHand(Handedness.Left); + var initialHandPosition = InputTestUtilities.InFrontOfUser(0.5f); + + yield return rightHand.Show(initialHandPosition); + yield return RuntimeTestUtilities.WaitForUpdates(); + + // Check if SolverHandler did not start with target on right hand + Assert.IsTrue(solverHandler.TransformTarget.position != solverHandler.RightInteractor.transform.position, $"Solver Handler started tracking incorrect hand"); + + // Hide the right hand and make the left hand active at a new position + yield return rightHand.Hide(); + yield return RuntimeTestUtilities.WaitForUpdates(); + var secondHandPosition = new Vector3(-0.05f, -0.05f, 1f); + yield return leftHand.Show(secondHandPosition); + yield return RuntimeTestUtilities.WaitForUpdates(); + + // Check if the SolverHandler moves the target to the left hand + Assert.IsTrue(solverHandler.TransformTarget.position == solverHandler.LeftInteractor.transform.position, $"Solver Handler did not start to track correct hand"); + + // Repeat the test, but hide the left hand this time + yield return leftHand.Hide(); + yield return RuntimeTestUtilities.WaitForUpdates(); + Vector3 finalPosition = InputTestUtilities.InFrontOfUser(new Vector3(0.05f, 0.05f, 0.5f)); + yield return rightHand.Show(finalPosition); + yield return RuntimeTestUtilities.WaitForUpdates(); + + // Check if the SolverHandler did not moves the target to the right hand + Assert.IsTrue(solverHandler.TransformTarget.position != solverHandler.RightInteractor.transform.position, $"Solver Handler switched to incorrect hand"); + } + + /// + /// This checks if the SolverHandler moves with the active hand when tracking two interactors + /// + /// + /// This test is the XRI3+ version of + /// + [UnityTest] + public IEnumerator SolverHandlerInteractorMovesWithHand() + { + // Disable gaze interactions for this unit test; + InputTestUtilities.DisableGazeInteractor(); + + // Set up GameObject with a SolverHandler + var testObject = GameObject.CreatePrimitive(PrimitiveType.Cube); + var solverHandler = testObject.AddComponent(); + + // Set it to track interactors + solverHandler.TrackedTargetType = TrackedObjectType.Interactor; + var lookup = Object.FindAnyObjectByType(); + var leftInteractor = lookup.LeftHandTrackedPoseDriver.GetComponentInChildren(); + var rightInteractor = lookup.RightHandTrackedPoseDriver.GetComponentInChildren(); + solverHandler.LeftInteractor = leftInteractor; + solverHandler.RightInteractor = rightInteractor; + + yield return new WaitForFixedUpdate(); + yield return null; + + TestHand rightHand = new TestHand(Handedness.Right); + var initialHandPos = new Vector3(-0.05f, -0.05f, 1f); + + yield return rightHand.Show(initialHandPos); + yield return RuntimeTestUtilities.WaitForUpdates(); + + // Check if SolverHandler starts with target on right hand + Assert.IsTrue(solverHandler.TransformTarget.position == solverHandler.RightInteractor.transform.position, $"Solver Handler started tracking incorrect hand"); + + var finalHandPos = new Vector3(0.05f, 0.05f, 1f); + yield return rightHand.MoveTo(finalHandPos); + yield return RuntimeTestUtilities.WaitForUpdates(); + + // Check that the SolverHandler keeps tracking the right hand + Assert.IsTrue(solverHandler.TransformTarget.position == solverHandler.RightInteractor.transform.position, $"Solver Handler did not follow hand"); + } + + /// + /// This checks if the SolverHandler starts tracking the preferred hand if both hands are view when tracking + /// two interactors + /// + /// + /// This test is the XRI3+ version of + /// + [UnityTest] + public IEnumerator SolverHandlerInteractorPreferredHandedness() + { + // Disable gaze interactions for this unit test; + InputTestUtilities.DisableGazeInteractor(); + + // Set up GameObject with a SolverHandler + var testObject = GameObject.CreatePrimitive(PrimitiveType.Cube); + var solverHandler = testObject.AddComponent(); + + yield return RuntimeTestUtilities.WaitForUpdates(); + // Set it to track interactors + solverHandler.TrackedTargetType = TrackedObjectType.Interactor; + var lookup = Object.FindAnyObjectByType(); + var leftInteractor = lookup.LeftHandTrackedPoseDriver.GetComponentInChildren(); + var rightInteractor = lookup.RightHandTrackedPoseDriver.GetComponentInChildren(); + solverHandler.LeftInteractor = leftInteractor; + solverHandler.RightInteractor = rightInteractor; + + // Set preferred tracked handedness to right + solverHandler.PreferredTrackedHandedness = Handedness.Right; + + yield return RuntimeTestUtilities.WaitForUpdates(); + + TestHand rightHand = new TestHand(Handedness.Right); + TestHand leftHand = new TestHand(Handedness.Left); + var rightHandPos = new Vector3(-0.05f, -0.05f, 1f); + var leftHandPos = new Vector3(0.05f, 0.05f, 1f); + + yield return rightHand.Show(rightHandPos); + yield return RuntimeTestUtilities.WaitForUpdates(); + yield return leftHand.Show(leftHandPos); + yield return RuntimeTestUtilities.WaitForUpdates(); + + // Check if SolverHandler tracks preferred hand if both are visible + Assert.IsTrue(solverHandler.TransformTarget.position == solverHandler.RightInteractor.transform.position, $"Solver Handler not tracking preferred hand"); + } + + /// + /// This checks if the SolverHandler can be configured to only track right hand only + /// + /// + /// This test is the XRI3+ version of + /// + [UnityTest] + public IEnumerator SolverHandlerInteractorRightHandOnly() + { + // Disable gaze interactions for this unit test; + InputTestUtilities.DisableGazeInteractor(); + + // Set up GameObject with a SolverHandler + var testObject = GameObject.CreatePrimitive(PrimitiveType.Cube); + var solverHandler = testObject.AddComponent(); + + // Set it to track interactors + solverHandler.TrackedHandedness = Handedness.Right; + solverHandler.TrackedTargetType = TrackedObjectType.Interactor; + var lookup = Object.FindAnyObjectByType(); + var leftInteractor = lookup.LeftHandTrackedPoseDriver.GetComponentInChildren(); + var rightInteractor = lookup.RightHandTrackedPoseDriver.GetComponentInChildren(); + solverHandler.LeftInteractor = leftInteractor; + solverHandler.RightInteractor = rightInteractor; + + yield return RuntimeTestUtilities.WaitForUpdates(); + + TestHand rightHand = new TestHand(Handedness.Right); + TestHand leftHand = new TestHand(Handedness.Left); + var initialHandPosition = InputTestUtilities.InFrontOfUser(0.5f); + + yield return leftHand.Show(initialHandPosition); + yield return RuntimeTestUtilities.WaitForUpdates(); + + // Check if SolverHandler did not start with target on left hand + Assert.IsTrue(solverHandler.TransformTarget.position != solverHandler.LeftInteractor.transform.position, $"Solver Handler started tracking incorrect hand"); + + // Hide the left hand and make the right hand active at a new position + yield return leftHand.Hide(); + yield return RuntimeTestUtilities.WaitForUpdates(); + var secondHandPosition = new Vector3(-0.05f, -0.05f, 1f); + yield return rightHand.Show(secondHandPosition); + yield return RuntimeTestUtilities.WaitForUpdates(); + + // Check if the SolverHandler moves the target to the right hand + Assert.IsTrue(solverHandler.TransformTarget.position == solverHandler.RightInteractor.transform.position, $"Solver Handler did not start to track correct hand"); + + // Repeat the test, but hide the right hand this time + yield return rightHand.Hide(); + yield return RuntimeTestUtilities.WaitForUpdates(); + Vector3 finalPosition = InputTestUtilities.InFrontOfUser(new Vector3(0.05f, 0.05f, 0.5f)); + yield return leftHand.Show(finalPosition); + yield return RuntimeTestUtilities.WaitForUpdates(); + + // Check if the SolverHandler did not moves the target to the left hand + Assert.IsTrue(solverHandler.TransformTarget.position != solverHandler.LeftInteractor.transform.position, $"Solver Handler switched to incorrect hand"); + } + + /// + /// This checks if the SolverHandler correctly switches to the active hand when tracking + /// two interactors + /// + /// + /// This test is the XRI3+ version of + /// + [UnityTest] + public IEnumerator SolverHandlerInteractorSwitchesToActiveHand() + { + // Disable gaze interactions for this unit test; + InputTestUtilities.DisableGazeInteractor(); + + // Set up GameObject with a SolverHandler + var testObject = GameObject.CreatePrimitive(PrimitiveType.Cube); + var solverHandler = testObject.AddComponent(); + + // Set it to track interactors + solverHandler.TrackedHandedness = Handedness.Both; + solverHandler.TrackedTargetType = TrackedObjectType.Interactor; + var lookup = Object.FindAnyObjectByType(); + var leftInteractor = lookup.LeftHandTrackedPoseDriver.GetComponentInChildren(); + var rightInteractor = lookup.RightHandTrackedPoseDriver.GetComponentInChildren(); + solverHandler.LeftInteractor = leftInteractor; + solverHandler.RightInteractor = rightInteractor; + + yield return RuntimeTestUtilities.WaitForUpdates(); + + TestHand rightHand = new TestHand(Handedness.Right); + TestHand leftHand = new TestHand(Handedness.Left); + var initialHandPosition = InputTestUtilities.InFrontOfUser(0.5f); + + yield return rightHand.Show(initialHandPosition); + yield return RuntimeTestUtilities.WaitForUpdates(); + + // Check if SolverHandler starts with target on right hand + Assert.IsTrue(solverHandler.TransformTarget.position == solverHandler.RightInteractor.transform.position, $"Solver Handler started tracking incorrect hand"); + + // Hide the right hand and make the left hand active at a new position + yield return rightHand.Hide(); + yield return RuntimeTestUtilities.WaitForUpdates(); + var secondHandPosition = new Vector3(-0.05f, -0.05f, 1f); + yield return leftHand.Show(secondHandPosition); + yield return RuntimeTestUtilities.WaitForUpdates(); + + // Check if the SolverHandler moves the target to the left hand + Assert.IsTrue(solverHandler.TransformTarget.position == solverHandler.LeftInteractor.transform.position, $"Solver Handler did not switch to active hand"); + + // Repeat the test, but hide the left hand this time + yield return leftHand.Hide(); + yield return RuntimeTestUtilities.WaitForUpdates(); + Vector3 finalPosition = InputTestUtilities.InFrontOfUser(new Vector3(0.05f, 0.05f, 0.5f)); + yield return rightHand.Show(finalPosition); + yield return RuntimeTestUtilities.WaitForUpdates(); + + // Check if the SolverHandler moves the target back to the right hand + Assert.IsTrue(solverHandler.TransformTarget.position == solverHandler.RightInteractor.transform.position, $"Solver Handler did not switch to final hand"); + } + + /// + /// This checks if the SolverHandler correctly switches to the active hand when tracking + /// two interactors, when the serialized `TrackedHandedness` value to set to Unity's + /// Everything value, with is -1 or 0xFFFFFFFF. Everything can be set via Unity's + /// inspector window. + /// + /// + /// This test is the XRI3+ version of + /// + [UnityTest] + public IEnumerator SolverHandlerInteractorSwitchesToActiveHandWithEverythingValue() + { + // Disable gaze interactions for this unit test; + InputTestUtilities.DisableGazeInteractor(); + + // Set up GameObject with a SolverHandler + var testObject = GameObject.CreatePrimitive(PrimitiveType.Cube); + var solverHandler = testObject.AddComponent(); + + // Set it to track interactors + solverHandler.TrackedHandedness = (Handedness)(-1); + solverHandler.TrackedTargetType = TrackedObjectType.Interactor; + var lookup = Object.FindAnyObjectByType(); + var leftInteractor = lookup.LeftHandTrackedPoseDriver.GetComponentInChildren(); + var rightInteractor = lookup.RightHandTrackedPoseDriver.GetComponentInChildren(); + solverHandler.LeftInteractor = leftInteractor; + solverHandler.RightInteractor = rightInteractor; + + yield return RuntimeTestUtilities.WaitForUpdates(); + + TestHand rightHand = new TestHand(Handedness.Right); + TestHand leftHand = new TestHand(Handedness.Left); + var initialHandPosition = InputTestUtilities.InFrontOfUser(0.5f); + + yield return rightHand.Show(initialHandPosition); + yield return RuntimeTestUtilities.WaitForUpdates(); + + // Check if SolverHandler starts with target on right hand + Assert.IsTrue(solverHandler.TransformTarget.position == solverHandler.RightInteractor.transform.position, $"Solver Handler started tracking incorrect hand"); + + // Hide the right hand and make the left hand active at a new position + yield return rightHand.Hide(); + yield return RuntimeTestUtilities.WaitForUpdates(); + var secondHandPosition = new Vector3(-0.05f, -0.05f, 1f); + yield return leftHand.Show(secondHandPosition); + yield return RuntimeTestUtilities.WaitForUpdates(); + + // Check if the SolverHandler moves the target to the left hand + Assert.IsTrue(solverHandler.TransformTarget.position == solverHandler.LeftInteractor.transform.position, $"Solver Handler did not switch to active hand"); + + // Repeat the test, but hide the left hand this time + yield return leftHand.Hide(); + yield return RuntimeTestUtilities.WaitForUpdates(); + Vector3 finalPosition = InputTestUtilities.InFrontOfUser(new Vector3(0.05f, 0.05f, 0.5f)); + yield return rightHand.Show(finalPosition); + yield return RuntimeTestUtilities.WaitForUpdates(); + + // Check if the SolverHandler moves the target back to the right hand + Assert.IsTrue(solverHandler.TransformTarget.position == solverHandler.RightInteractor.transform.position, $"Solver Handler did not switch to final hand"); + } + + /// + /// This checks if the SolverHandler keeps tracking the current active hand if another one comes + /// in view when tracking two interactors + /// + /// + /// This test is the XRI3+ version of + /// + [UnityTest] + public IEnumerator SolverHandlerInteractorTracksInitialActiveHand() + { + // Disable gaze interactions for this unit test; + InputTestUtilities.DisableGazeInteractor(); + + // Set up GameObject with a SolverHandler + var testObject = GameObject.CreatePrimitive(PrimitiveType.Cube); + var solverHandler = testObject.AddComponent(); + + // Set it to track interactors + solverHandler.TrackedTargetType = TrackedObjectType.Interactor; + var lookup = Object.FindAnyObjectByType(); + var leftInteractor = lookup.LeftHandTrackedPoseDriver.GetComponentInChildren(); + var rightInteractor = lookup.RightHandTrackedPoseDriver.GetComponentInChildren(); + solverHandler.LeftInteractor = leftInteractor; + solverHandler.RightInteractor = rightInteractor; + + yield return new WaitForFixedUpdate(); + yield return null; + + TestHand rightHand = new TestHand(Handedness.Right); + TestHand leftHand = new TestHand(Handedness.Left); + var rightHandPos = new Vector3(-0.05f, -0.05f, 1f); + var leftHandPos = new Vector3(0.05f, 0.05f, 1f); + + yield return rightHand.Show(rightHandPos); + yield return RuntimeTestUtilities.WaitForUpdates(); + + // Check if SolverHandler starts with target on right hand + Assert.IsTrue(solverHandler.TransformTarget.position == solverHandler.RightInteractor.transform.position, $"Solver Handler started tracking incorrect hand"); + + yield return leftHand.Show(leftHandPos); + yield return RuntimeTestUtilities.WaitForUpdates(); + + // Check that the SolverHandler keeps tracking the right hand + Assert.IsTrue(solverHandler.TransformTarget.position == solverHandler.RightInteractor.transform.position, $"Solver Handler switched to wrong active hand"); + } + + /// + /// This checks if the SolverHandler moves with head when tracking the head + /// + /// + /// This test is the same as , it is repeated here so that the same functionality is tested against + /// the new controllerless prefabs. + /// + [UnityTest] + public IEnumerator SolverHandlerHeadMovesWithHead() + { + // Disable gaze interactions for this unit test; + InputTestUtilities.DisableGazeInteractor(); + + // Set up GameObject with a SolverHandler + var testObject = GameObject.CreatePrimitive(PrimitiveType.Cube); + var solverHandler = testObject.AddComponent(); + + // Set it to track head + solverHandler.TrackedTargetType = TrackedObjectType.Head; + + yield return new WaitForFixedUpdate(); + yield return null; + + Camera.main.transform.position = new Vector3(0.1f, 0.1f, 0.1f); + yield return RuntimeTestUtilities.WaitForUpdates(); + + // Check if SolverHandler starts at camera pose + Assert.IsTrue(solverHandler.TransformTarget.position == Camera.main.transform.position, $"Solver Handler not tracking head"); + + Camera.main.transform.position = new Vector3(1f, 1f, 1f); + yield return RuntimeTestUtilities.WaitForUpdates(); + + // Check if SolverHandler starts at camera pose + Assert.IsTrue(solverHandler.TransformTarget.position == Camera.main.transform.position, $"Solver Handler not moving with head"); + } + + /// + /// This checks if the SolverHandler correctly applies additional offset and rotation + /// + /// + /// This test is the same as , it is repeated here so that the same functionality is tested against + /// the new controllerless prefabs. + /// + [UnityTest] + public IEnumerator SolverHandlerAppliesOffset() + { + // Disable gaze interactions for this unit test; + InputTestUtilities.DisableGazeInteractor(); + + // Set up GameObject with a SolverHandler + var testObject = GameObject.CreatePrimitive(PrimitiveType.Cube); + var solverHandler = testObject.AddComponent(); + + // Set it to track head + solverHandler.TrackedTargetType = TrackedObjectType.Head; + + // Apply additional offsets + solverHandler.AdditionalOffset = Vector3.one; + solverHandler.AdditionalRotation = new Vector3(30f, 30f, 30f); + + yield return new WaitForFixedUpdate(); + yield return null; + + Camera.main.transform.position = new Vector3(0.1f, 0.1f, 0.1f); + yield return RuntimeTestUtilities.WaitForUpdates(); + + // Check if SolverHandler is at expected position and rotation + Vector3 expectedPos = Camera.main.transform.position + solverHandler.AdditionalOffset; + Quaternion expectedDir = Camera.main.transform.rotation * Quaternion.Euler(30f, 30f, 30f); + Assert.IsTrue(solverHandler.TransformTarget.position == expectedPos, $"Solver Handler not applying additional offset"); + Assert.IsTrue(solverHandler.TransformTarget.rotation == expectedDir, $"Solver Handler not applying additional rotation"); + } + + /// + /// This checks if the SolverHandler correctly switches to the active hand joint when tracking + /// two hands + /// + /// + /// This test is the same as , it is repeated here so that the same functionality is tested against + /// the new controllerless prefabs. + /// + [UnityTest] + public IEnumerator SolverHandlerHandJointSwitchesToActiveHand() + { + // Disable gaze interactions for this unit test; + InputTestUtilities.DisableGazeInteractor(); + + // Set up GameObject with a SolverHandler + var testObject = GameObject.CreatePrimitive(PrimitiveType.Cube); + var solverHandler = testObject.AddComponent(); + var joint = TrackedHandJoint.Palm; + + // Set it to track interactors + solverHandler.TrackedHandedness = Handedness.Both; + solverHandler.TrackedTargetType = TrackedObjectType.HandJoint; + solverHandler.TrackedHandJoint = joint; + + yield return RuntimeTestUtilities.WaitForUpdates(); + + TestHand rightHand = new TestHand(Handedness.Right); + TestHand leftHand = new TestHand(Handedness.Left); + XRNode rightHandNode = Handedness.Right.ToXRNode().Value; + XRNode leftHandNode = Handedness.Left.ToXRNode().Value; + var initialHandPosition = InputTestUtilities.InFrontOfUser(0.5f); + + yield return rightHand.Show(initialHandPosition); + yield return RuntimeTestUtilities.WaitForUpdates(); + + // Check if SolverHandler starts with target on right hand joint + XRSubsystemHelpers.HandsAggregator.TryGetJoint(joint, rightHandNode, out HandJointPose jointPose); + Assert.IsTrue(solverHandler.TransformTarget.position == jointPose.Position, $"Solver Handler started tracking incorrect hand joint"); + + // Hide the right hand and make the left hand active at a new position + yield return rightHand.Hide(); + yield return RuntimeTestUtilities.WaitForUpdates(); + var secondHandPosition = new Vector3(-0.05f, -0.05f, 1f); + yield return leftHand.Show(secondHandPosition); + yield return RuntimeTestUtilities.WaitForUpdates(); + + // Check if the SolverHandler moves the target to the left hand joint + XRSubsystemHelpers.HandsAggregator.TryGetJoint(joint, leftHandNode, out jointPose); + Assert.IsTrue(solverHandler.TransformTarget.position == jointPose.Position, $"Solver Handler did not switch to active hand joint"); + + // Repeat the test, but hide the left hand this time + yield return leftHand.Hide(); + yield return RuntimeTestUtilities.WaitForUpdates(); + Vector3 finalPosition = InputTestUtilities.InFrontOfUser(new Vector3(0.05f, 0.05f, 0.5f)); + yield return rightHand.Show(finalPosition); + yield return RuntimeTestUtilities.WaitForUpdates(); + + // Check if the SolverHandler moves the target back to the right hand joint + XRSubsystemHelpers.HandsAggregator.TryGetJoint(joint, rightHandNode, out jointPose); + Assert.IsTrue(solverHandler.TransformTarget.position == jointPose.Position, $"Solver Handler did not switch to final hand joint"); + } + + /// + /// This checks if the SolverHandler correctly switches to the active hand joint when tracking + /// two hands, when the serialized `TrackedHandedness` value to set to Unity's + /// Everything value, with is -1 or 0xFFFFFFFF. Everything can be set via Unity's + /// inspector window. + /// + /// + /// This test is the same as , it is repeated here so that the same functionality is tested against + /// the new controllerless prefabs. + /// + [UnityTest] + public IEnumerator SolverHandlerHandJointSwitchesToActiveHandWithEverythingValue() + { + // Disable gaze interactions for this unit test; + InputTestUtilities.DisableGazeInteractor(); + + // Set up GameObject with a SolverHandler + var testObject = GameObject.CreatePrimitive(PrimitiveType.Cube); + var solverHandler = testObject.AddComponent(); + var joint = TrackedHandJoint.Palm; + + // Set it to track interactors + solverHandler.TrackedHandedness = Handedness.Both; + solverHandler.TrackedTargetType = TrackedObjectType.HandJoint; + solverHandler.TrackedHandJoint = joint; + + yield return RuntimeTestUtilities.WaitForUpdates(); + + TestHand rightHand = new TestHand(Handedness.Right); + TestHand leftHand = new TestHand(Handedness.Left); + XRNode rightHandNode = Handedness.Right.ToXRNode().Value; + XRNode leftHandNode = Handedness.Left.ToXRNode().Value; + var initialHandPosition = InputTestUtilities.InFrontOfUser(0.5f); + + yield return rightHand.Show(initialHandPosition); + yield return RuntimeTestUtilities.WaitForUpdates(); + + // Check if SolverHandler starts with target on right hand joint + XRSubsystemHelpers.HandsAggregator.TryGetJoint(joint, rightHandNode, out HandJointPose jointPose); + Assert.IsTrue(solverHandler.TransformTarget.position == jointPose.Position, $"Solver Handler started tracking incorrect hand joint"); + + // Hide the right hand and make the left hand active at a new position + yield return rightHand.Hide(); + yield return RuntimeTestUtilities.WaitForUpdates(); + var secondHandPosition = new Vector3(-0.05f, -0.05f, 1f); + yield return leftHand.Show(secondHandPosition); + yield return RuntimeTestUtilities.WaitForUpdates(); + + // Check if the SolverHandler moves the target to the left hand joint + XRSubsystemHelpers.HandsAggregator.TryGetJoint(joint, leftHandNode, out jointPose); + Assert.IsTrue(solverHandler.TransformTarget.position == jointPose.Position, $"Solver Handler did not switch to active hand joint"); + + // Repeat the test, but hide the left hand this time + yield return leftHand.Hide(); + yield return RuntimeTestUtilities.WaitForUpdates(); + Vector3 finalPosition = InputTestUtilities.InFrontOfUser(new Vector3(0.05f, 0.05f, 0.5f)); + yield return rightHand.Show(finalPosition); + yield return RuntimeTestUtilities.WaitForUpdates(); + + // Check if the SolverHandler moves the target back to the right hand joint + XRSubsystemHelpers.HandsAggregator.TryGetJoint(joint, rightHandNode, out jointPose); + Assert.IsTrue(solverHandler.TransformTarget.position == jointPose.Position, $"Solver Handler did not switch to final hand joint"); + } + + /// + /// This checks if the SolverHandler can be configured to only track left hand joint only + /// + /// + /// This test is the same as , it is repeated here so that the same functionality is tested against + /// the new controllerless prefabs. + /// + [UnityTest] + public IEnumerator SolverHandlerHandJointLeftHandOnly() + { + // Disable gaze interactions for this unit test; + InputTestUtilities.DisableGazeInteractor(); + + // Set up GameObject with a SolverHandler + var testObject = GameObject.CreatePrimitive(PrimitiveType.Cube); + var solverHandler = testObject.AddComponent(); + var joint = TrackedHandJoint.Palm; + + // Set it to track interactors + solverHandler.TrackedHandedness = Handedness.Left; + solverHandler.TrackedTargetType = TrackedObjectType.HandJoint; + solverHandler.TrackedHandJoint = joint; + + yield return RuntimeTestUtilities.WaitForUpdates(); + + TestHand rightHand = new TestHand(Handedness.Right); + TestHand leftHand = new TestHand(Handedness.Left); + XRNode rightHandNode = Handedness.Right.ToXRNode().Value; + XRNode leftHandNode = Handedness.Left.ToXRNode().Value; + var initialHandPosition = InputTestUtilities.InFrontOfUser(0.5f); + + yield return rightHand.Show(initialHandPosition); + yield return RuntimeTestUtilities.WaitForUpdates(); + + // Check if SolverHandler did not start with target on right hand joint + XRSubsystemHelpers.HandsAggregator.TryGetJoint(joint, rightHandNode, out HandJointPose jointPose); + Assert.IsTrue(solverHandler.TransformTarget.position != jointPose.Position, $"Solver Handler started tracking incorrect hand joint"); + + // Hide the right hand and make the left hand active at a new position + yield return rightHand.Hide(); + yield return RuntimeTestUtilities.WaitForUpdates(); + var secondHandPosition = new Vector3(-0.05f, -0.05f, 1f); + yield return leftHand.Show(secondHandPosition); + yield return RuntimeTestUtilities.WaitForUpdates(); + + // Check if the SolverHandler moves the target to the left hand joint + XRSubsystemHelpers.HandsAggregator.TryGetJoint(joint, leftHandNode, out jointPose); + Assert.IsTrue(solverHandler.TransformTarget.position == jointPose.Position, $"Solver Handler did not start to track correct hand joint"); + + // Repeat the test, but hide the left hand this time + yield return leftHand.Hide(); + yield return RuntimeTestUtilities.WaitForUpdates(); + Vector3 finalPosition = InputTestUtilities.InFrontOfUser(new Vector3(0.05f, 0.05f, 0.5f)); + yield return rightHand.Show(finalPosition); + yield return RuntimeTestUtilities.WaitForUpdates(); + + // Check if the SolverHandler did not moves the target to the right hand joint + XRSubsystemHelpers.HandsAggregator.TryGetJoint(joint, rightHandNode, out jointPose); + Assert.IsTrue(solverHandler.TransformTarget.position != jointPose.Position, $"Solver Handler switched to incorrect hand joint"); + } + + /// + /// This checks if the SolverHandler can be configured to only track right hand only + /// + /// + /// This test is the same as , it is repeated here so that the same functionality is tested against + /// the new controllerless prefabs. + /// + [UnityTest] + public IEnumerator SolverHandlerHandJointRightHandOnly() + { + // Disable gaze interactions for this unit test; + InputTestUtilities.DisableGazeInteractor(); + + // Set up GameObject with a SolverHandler + var testObject = GameObject.CreatePrimitive(PrimitiveType.Cube); + var solverHandler = testObject.AddComponent(); + var joint = TrackedHandJoint.Palm; + + // Set it to track interactors + solverHandler.TrackedHandedness = Handedness.Right; + solverHandler.TrackedTargetType = TrackedObjectType.HandJoint; + solverHandler.TrackedHandJoint = joint; + + yield return RuntimeTestUtilities.WaitForUpdates(); + + TestHand rightHand = new TestHand(Handedness.Right); + TestHand leftHand = new TestHand(Handedness.Left); + XRNode rightHandNode = Handedness.Right.ToXRNode().Value; + XRNode leftHandNode = Handedness.Left.ToXRNode().Value; + var initialHandPosition = InputTestUtilities.InFrontOfUser(0.5f); + + yield return leftHand.Show(initialHandPosition); + yield return RuntimeTestUtilities.WaitForUpdates(); + + // Check if SolverHandler did not start with target on left hand joint + XRSubsystemHelpers.HandsAggregator.TryGetJoint(joint, leftHandNode, out HandJointPose jointPose); + Assert.IsTrue(solverHandler.TransformTarget.position != jointPose.Position, $"Solver Handler started tracking incorrect hand joint"); + + // Hide the left hand and make the right hand active at a new position + yield return leftHand.Hide(); + yield return RuntimeTestUtilities.WaitForUpdates(); + var secondHandPosition = new Vector3(-0.05f, -0.05f, 1f); + yield return rightHand.Show(secondHandPosition); + yield return RuntimeTestUtilities.WaitForUpdates(); + + // Check if the SolverHandler moves the target to the right hand joint + XRSubsystemHelpers.HandsAggregator.TryGetJoint(joint, rightHandNode, out jointPose); + Assert.IsTrue(solverHandler.TransformTarget.position == jointPose.Position, $"Solver Handler did not start to track correct hand joint"); + + // Repeat the test, but hide the right hand this time + yield return rightHand.Hide(); + yield return RuntimeTestUtilities.WaitForUpdates(); + Vector3 finalPosition = InputTestUtilities.InFrontOfUser(new Vector3(0.05f, 0.05f, 0.5f)); + yield return leftHand.Show(finalPosition); + yield return RuntimeTestUtilities.WaitForUpdates(); + + // Check if the SolverHandler did not moves the target to the left hand joint + XRSubsystemHelpers.HandsAggregator.TryGetJoint(joint, leftHandNode, out jointPose); + Assert.IsTrue(solverHandler.TransformTarget.position != jointPose.Position, $"Solver Handler switched to incorrect hand joint"); + } + } +} +#pragma warning restore CS1591 diff --git a/org.mixedrealitytoolkit.spatialmanipulation/Tests/Runtime/SolverHandlerTestsForControllerlessRig.cs.meta b/org.mixedrealitytoolkit.spatialmanipulation/Tests/Runtime/SolverHandlerTestsForControllerlessRig.cs.meta new file mode 100644 index 000000000..cfe132a65 --- /dev/null +++ b/org.mixedrealitytoolkit.spatialmanipulation/Tests/Runtime/SolverHandlerTestsForControllerlessRig.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 7416644d108314f4a82595aa2ac1241d +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/org.mixedrealitytoolkit.spatialmanipulation/Tests/Runtime/SolverTapToPlaceTests.cs b/org.mixedrealitytoolkit.spatialmanipulation/Tests/Runtime/SolverTapToPlaceTests.cs index 34060ec1b..c07637dbb 100644 --- a/org.mixedrealitytoolkit.spatialmanipulation/Tests/Runtime/SolverTapToPlaceTests.cs +++ b/org.mixedrealitytoolkit.spatialmanipulation/Tests/Runtime/SolverTapToPlaceTests.cs @@ -4,13 +4,13 @@ // Disable "missing XML comment" warning for tests. While nice to have, this documentation is not required. #pragma warning disable CS1591 +using MixedReality.Toolkit.Core.Tests; +using MixedReality.Toolkit.Input; +using MixedReality.Toolkit.Input.Tests; using NUnit.Framework; +using System.Collections; using UnityEngine; using UnityEngine.TestTools; -using MixedReality.Toolkit.Input; -using System.Collections; -using MixedReality.Toolkit.Input.Tests; -using MixedReality.Toolkit.Core.Tests; namespace MixedReality.Toolkit.SpatialManipulation.Runtime.Tests { @@ -19,10 +19,17 @@ namespace MixedReality.Toolkit.SpatialManipulation.Runtime.Tests /// public class SolverTapToPlaceTests : BaseRuntimeInputTests { + /// + /// Override of the rig version to use for these tests. These tests validate that the old rig remain functional. + /// The will validate the new rig. + /// + protected override InputTestUtilities.RigVersion RigVersion => InputTestUtilities.RigVersion.Version1; + /// /// Verify TapToPlace can move an object to the end of the right hand ray. /// [UnityTest] +#pragma warning disable CS0618 // Adding this pragma because all the encompassed tests depend on deprecated ControllerLookup public IEnumerator TapToPlaceFollowsRightHandRay() { // Disable gaze interactions for this unit test; @@ -39,7 +46,7 @@ public IEnumerator TapToPlaceFollowsRightHandRay() // Set it to track interactors solverHandler.TrackedHandedness = Handedness.Both; solverHandler.TrackedTargetType = TrackedObjectType.Interactor; - var lookup = FindObjectUtility.FindAnyObjectByType(); + var lookup = Object.FindAnyObjectByType(); var leftInteractor = lookup.LeftHandController.GetComponentInChildren(); var rightInteractor = lookup.RightHandController.GetComponentInChildren(); solverHandler.LeftInteractor = leftInteractor; @@ -122,7 +129,7 @@ public IEnumerator TapToPlaceFollowsLeftHandRay() // Set it to track interactors solverHandler.TrackedHandedness = Handedness.Both; solverHandler.TrackedTargetType = TrackedObjectType.Interactor; - var lookup = FindObjectUtility.FindAnyObjectByType(); + var lookup = Object.FindAnyObjectByType(); var leftInteractor = lookup.LeftHandController.GetComponentInChildren(); var rightInteractor = lookup.RightHandController.GetComponentInChildren(); solverHandler.LeftInteractor = leftInteractor; @@ -205,7 +212,7 @@ public IEnumerator TapToPlaceIsBeingPlacedBeforeStart() // Set it to track interactors solverHandler.TrackedHandedness = Handedness.Both; solverHandler.TrackedTargetType = TrackedObjectType.Interactor; - var lookup = FindObjectUtility.FindAnyObjectByType(); + var lookup = Object.FindAnyObjectByType(); var leftInteractor = lookup.LeftHandController.GetComponentInChildren(); var rightInteractor = lookup.RightHandController.GetComponentInChildren(); solverHandler.LeftInteractor = leftInteractor; diff --git a/org.mixedrealitytoolkit.spatialmanipulation/Tests/Runtime/SolverTapToPlaceTestsForControllerlessRig.cs b/org.mixedrealitytoolkit.spatialmanipulation/Tests/Runtime/SolverTapToPlaceTestsForControllerlessRig.cs new file mode 100644 index 000000000..ac7cde601 --- /dev/null +++ b/org.mixedrealitytoolkit.spatialmanipulation/Tests/Runtime/SolverTapToPlaceTestsForControllerlessRig.cs @@ -0,0 +1,203 @@ +// Copyright (c) Mixed Reality Toolkit Contributors +// Licensed under the BSD 3-Clause + +// Disable "missing XML comment" warning for tests. While nice to have, this documentation is not required. +#pragma warning disable CS1591 + +using MixedReality.Toolkit.Core.Tests; +using MixedReality.Toolkit.Input; +using MixedReality.Toolkit.Input.Tests; +using NUnit.Framework; +using System.Collections; +using UnityEngine; +using UnityEngine.TestTools; + +namespace MixedReality.Toolkit.SpatialManipulation.Runtime.Tests +{ + /// + /// Tests for TapToPlace solver for the XRI3+ controllerless MRTK rig. + /// + /// + /// These tests are equivalent to those in but they test with the new MRTK Rig that was + /// created for the XRI3 migration. Eventually, this will replace the original when + /// the deprecated pre-XRI3 rig is removed in its entirety from MRTK3. + /// Note: This class contains only the tests that are specific to the XRI3+ rig. Tests that are common to both rigs are in the + /// original . Once the XRI3 migration is completed by removing all the pre-XRI3 + /// prefabs then those tests can be moved to this class. + /// + public class SolverTapToPlaceTestsForControllerlessRig : BaseRuntimeInputTests + { + /// + /// Verify TapToPlace can move an object to the end of the right hand ray. + /// + /// + /// This test is the XRI3+ equivalent of + /// + [UnityTest] + public IEnumerator TapToPlaceFollowsRightHandRay() + { + // Disable gaze interactions for this unit test; + InputTestUtilities.DisableGazeInteractor(); + + // Set up GameObject with a SolverHandler + var testObject = GameObject.CreatePrimitive(PrimitiveType.Cube); + var solverHandler = testObject.AddComponent(); + var solver = testObject.AddComponent(); + + // Disable smoothing so moving happens instantly. This makes testing positions easier. + solver.Smoothing = false; + + // Set it to track interactors + solverHandler.TrackedHandedness = Handedness.Both; + solverHandler.TrackedTargetType = TrackedObjectType.Interactor; + var lookup = Object.FindAnyObjectByType(); + var leftInteractor = lookup.LeftHandTrackedPoseDriver.GetComponentInChildren(); + var rightInteractor = lookup.RightHandTrackedPoseDriver.GetComponentInChildren(); + solverHandler.LeftInteractor = leftInteractor; + solverHandler.RightInteractor = rightInteractor; + + yield return RuntimeTestUtilities.WaitForUpdates(); + + TestHand rightHand = new TestHand(Handedness.Right); + TestHand leftHand = new TestHand(Handedness.Left); + var rightHandPosition = InputTestUtilities.InFrontOfUser(new Vector3(0.05f, -0.05f, 1f)); + var leftHandPosition = InputTestUtilities.InFrontOfUser(new Vector3(-0.05f, -0.05f, 1f)); + + testObject.transform.position = InputTestUtilities.InFrontOfUser(3.0f); + + yield return rightHand.Show(rightHandPosition); + yield return RuntimeTestUtilities.WaitForUpdates(); + yield return rightHand.AimAt(testObject.transform.position); + yield return RuntimeTestUtilities.WaitForUpdates(); + + yield return leftHand.Show(leftHandPosition); + yield return RuntimeTestUtilities.WaitForUpdates(); + yield return leftHand.AimAt(testObject.transform.position); + yield return RuntimeTestUtilities.WaitForUpdates(); + + // Check if TapToPlace starts without being in "placement" mode. + Assert.IsFalse(solver.IsBeingPlaced, "TapToPlace should have starting without being in placement mode."); + + // Start placement and move hand. + solver.StartPlacement(); + yield return RuntimeTestUtilities.WaitForUpdates(); + + // Check if TapToPlace started. + Assert.IsTrue(solver.IsBeingPlaced, "TapToPlace should have started."); + var testObjectStartPosition = testObject.transform.position; + + // Aim hand and move object. + yield return rightHand.AimAt(InputTestUtilities.InFrontOfUser(new Vector3(0.05f, 0.1f, 2.0f))); + yield return RuntimeTestUtilities.WaitForUpdates(); + + // Verify shape moved to placement + var testObjectPlacementPosition = testObject.transform.position; + Assert.AreNotEqual(testObjectStartPosition, testObjectPlacementPosition, $"Game object did not move"); + + // Wait for solvers double click prevention timeout + yield return new WaitForSeconds(0.5f + 0.1f); + + // Clicking with opposite hand should stop movement + yield return leftHand.Click(); + yield return RuntimeTestUtilities.WaitForUpdates(); + + // Check if TapToPlace stopped with pinch. + Assert.IsFalse(solver.IsBeingPlaced, "TapToPlace should have stopped with left hand pinch."); + + // Aim hand + yield return rightHand.AimAt(InputTestUtilities.InFrontOfUser(new Vector3(-0.05f, -0.1f, 2.0f))); + yield return RuntimeTestUtilities.WaitForUpdates(); + + // Verify shape did not moved + var testObjectFinalPosition = testObject.transform.position; + Assert.AreEqual(testObjectPlacementPosition, testObjectFinalPosition, $"Game object should not have moved."); + } + + /// + /// Verify TapToPlace can move an object to the end of the left hand ray. + /// + /// + /// This test is the XRI3+ equivalent of + /// + [UnityTest] + public IEnumerator TapToPlaceFollowsLeftHandRay() + { + // Disable gaze interactions for this unit test; + InputTestUtilities.DisableGazeInteractor(); + + // Set up GameObject with a SolverHandler + var testObject = GameObject.CreatePrimitive(PrimitiveType.Cube); + var solverHandler = testObject.AddComponent(); + var solver = testObject.AddComponent(); + + // Disable smoothing so moving happens instantly. This makes testing positions easier. + solver.Smoothing = false; + + // Set it to track interactors + solverHandler.TrackedHandedness = Handedness.Both; + solverHandler.TrackedTargetType = TrackedObjectType.Interactor; + var lookup = Object.FindAnyObjectByType(); + var leftInteractor = lookup.LeftHandTrackedPoseDriver.GetComponentInChildren(); + var rightInteractor = lookup.RightHandTrackedPoseDriver.GetComponentInChildren(); + solverHandler.LeftInteractor = leftInteractor; + solverHandler.RightInteractor = rightInteractor; + + yield return RuntimeTestUtilities.WaitForUpdates(); + + TestHand rightHand = new TestHand(Handedness.Right); + TestHand leftHand = new TestHand(Handedness.Left); + var rightHandPosition = InputTestUtilities.InFrontOfUser(new Vector3(0.05f, -0.05f, 1f)); + var leftHandPosition = InputTestUtilities.InFrontOfUser(new Vector3(-0.05f, -0.05f, 1f)); + + testObject.transform.position = InputTestUtilities.InFrontOfUser(3.0f); + + yield return leftHand.Show(leftHandPosition); + yield return RuntimeTestUtilities.WaitForUpdates(); + yield return leftHand.AimAt(testObject.transform.position); + yield return RuntimeTestUtilities.WaitForUpdates(); + + yield return rightHand.Show(rightHandPosition); + yield return RuntimeTestUtilities.WaitForUpdates(); + yield return rightHand.AimAt(testObject.transform.position); + yield return RuntimeTestUtilities.WaitForUpdates(); + + // Check if TapToPlace starts without being in "placement" mode. + Assert.IsFalse(solver.IsBeingPlaced, "TapToPlace should have starting without being in placement mode."); + + // Start placement and move hand. + solver.StartPlacement(); + yield return RuntimeTestUtilities.WaitForUpdates(); + + // Check if TapToPlace started. + Assert.IsTrue(solver.IsBeingPlaced, "TapToPlace should have started."); + var testObjectStartPosition = testObject.transform.position; + + // Aim hand and move object. + yield return leftHand.AimAt(InputTestUtilities.InFrontOfUser(new Vector3(-0.05f, 0.1f, 2.0f))); + yield return RuntimeTestUtilities.WaitForUpdates(); + + // Verify shape moved to placement + var testObjectPlacementPosition = testObject.transform.position; + Assert.AreNotEqual(testObjectStartPosition, testObjectPlacementPosition, $"Game object did not move"); + + // Wait for solvers double click prevention timeout + yield return new WaitForSeconds(0.5f + 0.1f); + + // Clicking with opposite hand should stop movement + yield return rightHand.Click(); + yield return RuntimeTestUtilities.WaitForUpdates(); + + // Check if TapToPlace stopped with pinch. + Assert.IsFalse(solver.IsBeingPlaced, "TapToPlace should have stopped with left hand pinch."); + + // Aim hand + yield return leftHand.AimAt(InputTestUtilities.InFrontOfUser(new Vector3(0.05f, -0.1f, 2.0f))); + yield return RuntimeTestUtilities.WaitForUpdates(); + + // Verify shape did not moved + var testObjectFinalPosition = testObject.transform.position; + Assert.AreEqual(testObjectPlacementPosition, testObjectFinalPosition, $"Game object should not have moved."); + } + } +} +#pragma warning restore CS1591 diff --git a/org.mixedrealitytoolkit.spatialmanipulation/Tests/Runtime/SolverTapToPlaceTestsForControllerlessRig.cs.meta b/org.mixedrealitytoolkit.spatialmanipulation/Tests/Runtime/SolverTapToPlaceTestsForControllerlessRig.cs.meta new file mode 100644 index 000000000..c97b3f49f --- /dev/null +++ b/org.mixedrealitytoolkit.spatialmanipulation/Tests/Runtime/SolverTapToPlaceTestsForControllerlessRig.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 3522e9470dd3df54db6bf1b40c49b77a +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/org.mixedrealitytoolkit.spatialmanipulation/package.json b/org.mixedrealitytoolkit.spatialmanipulation/package.json index 754bbceda..18eea07b5 100644 --- a/org.mixedrealitytoolkit.spatialmanipulation/package.json +++ b/org.mixedrealitytoolkit.spatialmanipulation/package.json @@ -1,6 +1,6 @@ { "name": "org.mixedrealitytoolkit.spatialmanipulation", - "version": "3.4.0-development", + "version": "4.0.0-development.pre.3", "description": "Spatial manipulation features, including ObjectManipulator, BoundsControl, and the Solvers/Constraints systems.", "displayName": "MRTK Spatial Manipulation", "msftFeatureCategory": "MRTK3", @@ -13,19 +13,19 @@ "bugs": { "url": "https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/issues" }, - "unity": "2021.3", - "unityRelease": "26f1", + "unity": "6000.0", + "unityRelease": "66f2", "documentationUrl": "https://www.mixedrealitytoolkit.org", "dependencies": { - "org.mixedrealitytoolkit.core": "3.2.2", - "org.mixedrealitytoolkit.uxcore": "3.3.0", + "org.mixedrealitytoolkit.core": "4.0.0", + "org.mixedrealitytoolkit.uxcore": "4.0.0", "com.unity.inputsystem": "1.6.1", - "com.unity.xr.interaction.toolkit": "2.3.0" + "com.unity.xr.interaction.toolkit": "3.0.4" }, "msftOptionalPackages": { - "org.mixedrealitytoolkit.input": "3.0.0" + "org.mixedrealitytoolkit.input": "4.0.0" }, "msftTestPackages": { - "org.mixedrealitytoolkit.input": "3.0.0" + "org.mixedrealitytoolkit.input": "4.0.0" } } diff --git a/org.mixedrealitytoolkit.standardassets/CHANGELOG.md b/org.mixedrealitytoolkit.standardassets/CHANGELOG.md index 7c7e8b9bf..c1607aa34 100644 --- a/org.mixedrealitytoolkit.standardassets/CHANGELOG.md +++ b/org.mixedrealitytoolkit.standardassets/CHANGELOG.md @@ -2,6 +2,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/). +## [3.3.0-pre.1] - 2026-05-20 + +### Changed + +* Updated icon names in MRTK_FluentIconSet.asset and Selawik-Semibold-MRTKIcons.asset to be more descriptive. [PR #1077](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1077) & [PR #1119](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1119) + ## [3.2.1] - 2025-11-12 ### Fixed diff --git a/org.mixedrealitytoolkit.standardassets/Fonts/Selawik-Semibold-MRTKIcons.asset b/org.mixedrealitytoolkit.standardassets/Fonts/Selawik-Semibold-MRTKIcons.asset index 843ea507b..2d1d96dd7 100644 --- a/org.mixedrealitytoolkit.standardassets/Fonts/Selawik-Semibold-MRTKIcons.asset +++ b/org.mixedrealitytoolkit.standardassets/Fonts/Selawik-Semibold-MRTKIcons.asset @@ -14,289 +14,290 @@ MonoBehaviour: m_EditorClassIdentifier: glyphIconsByName: entries: - - key: Icon 137 - value: 63518 - - key: Icon 136 - value: 63357 - - key: Icon 135 - value: 63323 - - key: Icon 134 - value: 63252 - - key: Icon 133 - value: 63248 - - key: Icon 132 - value: 63146 - - key: Icon 131 - value: 63130 - - key: Icon 130 - value: 63120 - - key: Icon 129 - value: 63104 - - key: Icon 128 - value: 63074 - - key: Icon 127 - value: 63033 - - key: Icon 126 - value: 63022 - - key: Icon 125 - value: 63019 - - key: Icon 124 - value: 62991 - - key: Icon 123 - value: 62984 - - key: Icon 122 - value: 62982 - - key: Icon 121 - value: 62980 - - key: Icon 120 - value: 62978 - - key: Icon 119 - value: 62950 - - key: Icon 118 - value: 62945 - - key: Icon 117 - value: 62910 - - key: Icon 116 - value: 62893 - - key: Icon 115 - value: 62889 - - key: Icon 114 - value: 62858 - - key: Icon 113 - value: 62856 - - key: Icon 112 - value: 62831 - - key: Icon 111 - value: 62828 - - key: Icon 110 - value: 62822 - - key: Icon 109 - value: 62817 - - key: Icon 108 - value: 62815 - - key: Icon 107 - value: 62810 - - key: Icon 106 - value: 62807 - - key: Icon 105 - value: 62785 - - key: Icon 104 - value: 62727 - - key: Icon 103 - value: 62713 - - key: Icon 102 - value: 62700 - - key: Icon 101 - value: 62693 - - key: Icon 100 - value: 62679 - - key: Icon 99 - value: 62649 - - key: Icon 98 - value: 62632 - - key: Icon 97 - value: 62628 - - key: Icon 96 - value: 62624 - - key: Icon 95 - value: 62601 - - key: Icon 94 - value: 62593 - - key: Icon 93 - value: 62591 - - key: Icon 92 - value: 62586 - - key: Icon 91 - value: 62578 - - key: Icon 90 - value: 62555 - - key: Icon 89 - value: 62489 - - key: Icon 88 - value: 62476 - - key: Icon 87 - value: 62450 - - key: Icon 86 - value: 62433 - - key: Icon 85 - value: 62430 - - key: Icon 84 - value: 62427 - - key: Icon 83 - value: 62343 - - key: Icon 82 - value: 62329 - - key: Icon 81 - value: 62326 - - key: Icon 80 - value: 62318 - - key: Icon 79 - value: 62314 - - key: Icon 78 - value: 62303 - - key: Icon 77 - value: 62298 - - key: Icon 76 - value: 62285 - - key: Icon 75 - value: 62277 - - key: Icon 74 - value: 62274 - - key: Icon 73 - value: 62269 - - key: Icon 72 - value: 62267 - - key: Icon 71 - value: 62240 - - key: Icon 70 - value: 62233 - - key: Icon 69 - value: 62229 - - key: Icon 68 - value: 62208 - - key: Icon 67 - value: 62198 - - key: Icon 66 - value: 62194 - - key: Icon 65 - value: 62181 - - key: Icon 64 - value: 62178 - - key: Icon 63 - value: 62174 - - key: Icon 62 - value: 62166 - - key: Icon 61 - value: 62135 - - key: Icon 60 - value: 62129 - - key: Icon 59 - value: 62123 - - key: Icon 58 - value: 62116 - - key: Icon 57 - value: 62101 - - key: Icon 56 - value: 62087 - - key: Icon 55 - value: 62061 - - key: Icon 54 - value: 62059 - - key: Icon 53 - value: 62037 - - key: Icon 52 - value: 62024 - - key: Icon 51 - value: 61972 - - key: Icon 50 - value: 61967 - - key: Icon 49 - value: 61942 - - key: Icon 48 - value: 61923 - - key: Icon 47 - value: 61919 - - key: Icon 46 - value: 61877 - - key: Icon 45 - value: 61866 - - key: Icon 44 - value: 61852 - - key: Icon 43 - value: 61835 - - key: Icon 42 - value: 61826 - - key: Icon 41 - value: 61810 - - key: Icon 40 - value: 61801 - - key: Icon 39 - value: 61788 - - key: Icon 38 - value: 61769 - - key: Icon 37 - value: 61760 - - key: Icon 36 - value: 61758 - - key: Icon 35 - value: 61752 - - key: Icon 34 - value: 61733 - - key: Icon 33 - value: 61731 - - key: Icon 32 - value: 61721 - - key: Icon 31 - value: 61717 - - key: Icon 30 - value: 61709 - - key: Icon 29 - value: 61706 - - key: Icon 28 - value: 60390 - - key: Icon 27 - value: 60235 - - key: Icon 26 - value: 60227 - - key: Icon 25 - value: 59977 - - key: Icon 24 - value: 59846 - - key: Icon 23 - value: 59532 - - key: Icon 22 - value: 59531 - - key: Icon 21 - value: 59529 - - key: Icon 20 - value: 59527 - - key: Icon 19 - value: 59526 - - key: Icon 18 - value: 59525 - - key: Icon 17 - value: 59524 - - key: Icon 16 - value: 59523 - - key: Icon 15 - value: 59522 - - key: Icon 14 - value: 59521 - - key: Icon 13 - value: 59519 - - key: Icon 12 - value: 59518 - - key: Icon 11 - value: 59517 - - key: Icon 10 - value: 59512 - - key: Icon 9 - value: 59511 - - key: Icon 8 - value: 59508 - - key: Icon 7 - value: 59476 - - key: Icon 6 - value: 59461 - - key: Icon 2 + - key: Grid View + value: 59407 + - key: Show Chart value: 59416 - - key: Icon 3 + - key: Cached value: 59440 - - key: Icon 4 + - key: Brightness value: 59456 - - key: Icon 1 - value: 59407 - - key: Icon 5 + - key: Calendar value: 59460 - - key: Icon 138 + - key: Call + value: 59461 + - key: Clipboard + value: 59476 + - key: Erase + value: 59508 + - key: Visibility On + value: 59511 + - key: Visibility Off + value: 59512 + - key: Apps + value: 59517 + - key: Pan + value: 59518 + - key: Hand Left + value: 59519 + - key: Add Location + value: 59521 + - key: Remove Location + value: 59522 + - key: Location Off + value: 59523 + - key: Lock + value: 59524 + - key: Unlock + value: 59525 + - key: Write Mail + value: 59526 + - key: Mic + value: 59527 + - key: More Horizontal + value: 59529 + - key: Music + value: 59531 + - key: Music Mute + value: 59532 + - key: Circle + value: 59846 + - key: Save As + value: 59977 + - key: Sound + value: 60227 + - key: Mute + value: 60235 + - key: Add Tab + value: 60390 + - key: Add + value: 61706 + - key: Add Circle + value: 61709 + - key: Notifications + value: 61717 + - key: Notifications Off + value: 61721 + - key: Uniform Grid + value: 61731 + - key: Mobile + value: 61733 + - key: List + value: 61752 + - key: Refresh + value: 61758 + - key: Reset + value: 61760 + - key: Arrow Down + value: 61769 + - key: Arrow Left + value: 61788 + - key: Move + value: 61801 + - key: Repeat + value: 61810 + - key: Arrow Right + value: 61826 + - key: Swap Vert + value: 61835 + - key: Arrow Up + value: 61852 + - key: Attach + value: 61866 + - key: Tab + value: 61877 + - key: Bluetooth + value: 61919 + - key: Layout Grid + value: 61923 + - key: Bookmark + value: 61942 + - key: Vertical List + value: 61967 + - key: Horizontal List + value: 61972 + - key: Call End + value: 62024 + - key: Camera + value: 62037 + - key: Shopping Cart + value: 62059 + - key: Cast + value: 62061 + - key: Messenger + value: 62087 + - key: Check + value: 62101 + - key: Chevron Down + value: 62116 + - key: Chevron Left + value: 62123 + - key: Chevron Right + value: 62129 + - key: Chevron Up + value: 62135 + - key: Paste + value: 62166 + - key: Time + value: 62174 + - key: Alarm + value: 62178 + - key: Cloud + value: 62181 + - key: Open In New + value: 62194 + - key: Color Palette + value: 62198 + - key: Message + value: 62208 + - key: Draft + value: 62229 + - key: Exit + value: 62233 + - key: User + value: 62240 + - key: Cut + value: 62267 + - key: Line Chart + value: 62269 + - key: Bar Chart + value: 62274 + - key: Pie Chart + value: 62277 + - key: Delete + value: 62285 + - key: Computer + value: 62298 + - key: Dialpad + value: 62303 + - key: Close + value: 62314 + - key: Cancel + value: 62318 + - key: Layout + value: 62326 + - key: Doc + value: 62329 + - key: Edit Doc + value: 62343 + - key: Globe + value: 62427 + - key: Edit + value: 62430 + - key: Smiley + value: 62433 + - key: Error + value: 62450 + - key: Flag Outline + value: 62476 + - key: Folder + value: 62489 + - key: Language + value: 62555 + - key: Headphones + value: 62578 + - key: Heart Outline + value: 62586 + - key: History + value: 62591 + - key: Home + value: 62593 + - key: Photo + value: 62601 + - key: Exclamation Point + value: 62624 + - key: Info + value: 62628 + - key: Pen Tip + value: 62632 + - key: Keyboard + value: 62649 + - key: Lightbulb + value: 62679 + - key: Link + value: 62693 + - key: Link 2 + value: 62700 + - key: Location On + value: 62713 + - key: Mail + value: 62727 + - key: Mic Off + value: 62785 + - key: More Vertical + value: 62807 + - key: Movie + value: 62810 + - key: My Location + value: 62815 + - key: Menu + value: 62817 + - key: Newspaper + value: 62822 + - key: Sticky Note + value: 62828 + - key: Add Note + value: 62831 + - key: Settings Sliders + value: 62856 + - key: Hierarchy + value: 62858 + - key: Group + value: 62889 + - key: Add Group + value: 62893 + - key: Person + value: 62910 + - key: Phone + value: 62945 + - key: Devices + value: 62950 + - key: Pin + value: 62978 + - key: Unpin + value: 62980 + - key: Play + value: 62982 + - key: Play Circle + value: 62984 + - key: Power Button + value: 62991 + - key: Print + value: 63019 + - key: Block + value: 63022 + - key: Question Mark + value: 63033 + - key: Record Circle + value: 63074 + - key: Save + value: 63104 + - key: Search + value: 63120 + - key: Send + value: 63130 + - key: Settings + value: 63146 + - key: Favorite + value: 63248 + - key: Add Favorite + value: 63252 + - key: Stop Circle + value: 63323 + - key: Tag + value: 63357 + - key: Thumb Up + value: 63518 + - key: Thumb Down value: 63520 - - key: Icon 139 + - key: Videocam value: 63565 - - key: Icon 140 + - key: Warning value: 63594 - - key: Icon 141 + - key: Undo value: 63703 - - key: Icon 142 + - key: Book value: 63742 iconFontAsset: {fileID: 11400000, guid: 533bdd8d5c92b52448ee2ecf7bd828a4, type: 2} optionalEditorMaterial: {fileID: 0} + fontIconSetDefinition: {fileID: 11400000, guid: e63daff880b56ed439a2e852b6e6993a, type: 2} diff --git a/org.mixedrealitytoolkit.standardassets/Icons/MRTK_FluentIconSet.asset b/org.mixedrealitytoolkit.standardassets/Icons/MRTK_FluentIconSet.asset index 49e186bde..54e471c82 100644 --- a/org.mixedrealitytoolkit.standardassets/Icons/MRTK_FluentIconSet.asset +++ b/org.mixedrealitytoolkit.standardassets/Icons/MRTK_FluentIconSet.asset @@ -14,289 +14,290 @@ MonoBehaviour: m_EditorClassIdentifier: glyphIconsByName: entries: - - key: Icon 137 - value: 63518 - - key: Icon 136 - value: 63357 - - key: Icon 135 - value: 63323 - - key: Icon 134 - value: 63252 - - key: Icon 133 - value: 63248 - - key: Icon 132 - value: 63146 - - key: Icon 131 - value: 63130 - - key: Icon 130 - value: 63120 - - key: Icon 129 - value: 63104 - - key: Icon 128 - value: 63074 - - key: Icon 127 - value: 63033 - - key: Icon 126 - value: 63022 - - key: Icon 125 - value: 63019 - - key: Icon 124 - value: 62991 - - key: Icon 123 - value: 62984 - - key: Icon 122 - value: 62982 - - key: Icon 121 - value: 62980 - - key: Icon 120 - value: 62978 - - key: Icon 119 - value: 62950 - - key: Icon 118 - value: 62945 - - key: Icon 117 - value: 62910 - - key: Icon 116 - value: 62893 - - key: Icon 115 - value: 62889 - - key: Icon 114 - value: 62858 - - key: Icon 113 - value: 62856 - - key: Icon 112 - value: 62831 - - key: Icon 111 - value: 62828 - - key: Icon 110 - value: 62822 - - key: Icon 109 - value: 62817 - - key: Icon 108 - value: 62815 - - key: Icon 107 - value: 62810 - - key: Icon 106 - value: 62807 - - key: Icon 105 - value: 62785 - - key: Icon 104 - value: 62727 - - key: Icon 103 - value: 62713 - - key: Icon 102 - value: 62700 - - key: Icon 101 - value: 62693 - - key: Icon 100 - value: 62679 - - key: Icon 99 - value: 62649 - - key: Icon 98 - value: 62632 - - key: Icon 97 - value: 62628 - - key: Icon 96 - value: 62624 - - key: Icon 95 - value: 62601 - - key: Icon 94 - value: 62593 - - key: Icon 93 - value: 62591 - - key: Icon 92 - value: 62586 - - key: Icon 91 - value: 62578 - - key: Icon 90 - value: 62555 - - key: Icon 89 - value: 62489 - - key: Icon 88 - value: 62476 - - key: Icon 87 - value: 62450 - - key: Icon 86 - value: 62433 - - key: Icon 85 - value: 62430 - - key: Icon 84 - value: 62427 - - key: Icon 83 - value: 62343 - - key: Icon 82 - value: 62329 - - key: Icon 81 - value: 62326 - - key: Icon 80 - value: 62318 - - key: Icon 79 - value: 62314 - - key: Icon 78 - value: 62303 - - key: Icon 77 - value: 62298 - - key: Icon 76 - value: 62285 - - key: Icon 75 - value: 62277 - - key: Icon 74 - value: 62274 - - key: Icon 73 - value: 62269 - - key: Icon 72 - value: 62267 - - key: Icon 71 - value: 62240 - - key: Icon 70 - value: 62233 - - key: Icon 69 - value: 62229 - - key: Icon 68 - value: 62208 - - key: Icon 67 - value: 62198 - - key: Icon 66 - value: 62194 - - key: Icon 65 - value: 62181 - - key: Icon 64 - value: 62178 - - key: Icon 63 - value: 62174 - - key: Icon 62 - value: 62166 - - key: Icon 61 - value: 62135 - - key: Icon 60 - value: 62129 - - key: Icon 59 - value: 62123 - - key: Icon 58 - value: 62116 - - key: Icon 57 - value: 62101 - - key: Icon 56 - value: 62087 - - key: Icon 55 - value: 62061 - - key: Icon 54 - value: 62059 - - key: Icon 53 - value: 62037 - - key: Icon 52 - value: 62024 - - key: Icon 51 - value: 61972 - - key: Icon 50 - value: 61967 - - key: Icon 49 - value: 61942 - - key: Icon 48 - value: 61923 - - key: Icon 47 - value: 61919 - - key: Icon 46 - value: 61877 - - key: Icon 45 - value: 61866 - - key: Icon 44 - value: 61852 - - key: Icon 43 - value: 61835 - - key: Icon 42 - value: 61826 - - key: Icon 41 - value: 61810 - - key: Icon 40 - value: 61801 - - key: Icon 39 - value: 61788 - - key: Icon 38 - value: 61769 - - key: Icon 37 - value: 61760 - - key: Icon 36 - value: 61758 - - key: Icon 35 - value: 61752 - - key: Icon 34 - value: 61733 - - key: Icon 33 - value: 61731 - - key: Icon 32 - value: 61721 - - key: Icon 31 - value: 61717 - - key: Icon 30 - value: 61709 - - key: Icon 29 - value: 61706 - - key: Icon 28 - value: 60390 - - key: Icon 27 - value: 60235 - - key: Icon 26 - value: 60227 - - key: Icon 25 - value: 59977 - - key: Icon 24 - value: 59846 - - key: Icon 23 - value: 59532 - - key: Icon 22 - value: 59531 - - key: Icon 21 - value: 59529 - - key: Icon 20 - value: 59527 - - key: Icon 19 - value: 59526 - - key: Icon 18 - value: 59525 - - key: Icon 17 - value: 59524 - - key: Icon 16 - value: 59523 - - key: Icon 15 - value: 59522 - - key: Icon 14 - value: 59521 - - key: Icon 13 - value: 59519 - - key: Icon 12 - value: 59518 - - key: Icon 11 - value: 59517 - - key: Icon 10 - value: 59512 - - key: Icon 9 - value: 59511 - - key: Icon 8 - value: 59508 - - key: Icon 7 - value: 59476 - - key: Icon 6 - value: 59461 - - key: Icon 2 + - key: Grid View + value: 59407 + - key: Show Chart value: 59416 - - key: Icon 3 + - key: Cached value: 59440 - - key: Icon 4 + - key: Brightness value: 59456 - - key: Icon 1 - value: 59407 - - key: Icon 5 + - key: Calendar value: 59460 - - key: Icon 138 + - key: Call + value: 59461 + - key: Clipboard + value: 59476 + - key: Erase + value: 59508 + - key: Visibility On + value: 59511 + - key: Visibility Off + value: 59512 + - key: Apps + value: 59517 + - key: Pan + value: 59518 + - key: Hand Left + value: 59519 + - key: Add Location + value: 59521 + - key: Remove Location + value: 59522 + - key: Location Off + value: 59523 + - key: Lock + value: 59524 + - key: Unlock + value: 59525 + - key: Write Mail + value: 59526 + - key: Mic + value: 59527 + - key: More Horizontal + value: 59529 + - key: Music + value: 59531 + - key: Music Mute + value: 59532 + - key: Circle + value: 59846 + - key: Save As + value: 59977 + - key: Sound + value: 60227 + - key: Mute + value: 60235 + - key: Add Tab + value: 60390 + - key: Add + value: 61706 + - key: Add Circle + value: 61709 + - key: Notifications + value: 61717 + - key: Notifications Off + value: 61721 + - key: Uniform Grid + value: 61731 + - key: Mobile + value: 61733 + - key: List + value: 61752 + - key: Refresh + value: 61758 + - key: Reset + value: 61760 + - key: Arrow Down + value: 61769 + - key: Arrow Left + value: 61788 + - key: Move + value: 61801 + - key: Repeat + value: 61810 + - key: Arrow Right + value: 61826 + - key: Swap Vert + value: 61835 + - key: Arrow Up + value: 61852 + - key: Attach + value: 61866 + - key: Tab + value: 61877 + - key: Bluetooth + value: 61919 + - key: Layout Grid + value: 61923 + - key: Bookmark + value: 61942 + - key: Vertical List + value: 61967 + - key: Horizontal List + value: 61972 + - key: Call End + value: 62024 + - key: Camera + value: 62037 + - key: Shopping Cart + value: 62059 + - key: Cast + value: 62061 + - key: Messenger + value: 62087 + - key: Check + value: 62101 + - key: Chevron Down + value: 62116 + - key: Chevron Left + value: 62123 + - key: Chevron Right + value: 62129 + - key: Chevron Up + value: 62135 + - key: Paste + value: 62166 + - key: Time + value: 62174 + - key: Alarm + value: 62178 + - key: Cloud + value: 62181 + - key: Open In New + value: 62194 + - key: Color Palette + value: 62198 + - key: Message + value: 62208 + - key: Draft + value: 62229 + - key: Exit + value: 62233 + - key: User + value: 62240 + - key: Cut + value: 62267 + - key: Line Chart + value: 62269 + - key: Bar Chart + value: 62274 + - key: Pie Chart + value: 62277 + - key: Delete + value: 62285 + - key: Computer + value: 62298 + - key: Dialpad + value: 62303 + - key: Close + value: 62314 + - key: Cancel + value: 62318 + - key: Layout + value: 62326 + - key: Doc + value: 62329 + - key: Edit Doc + value: 62343 + - key: Globe + value: 62427 + - key: Edit + value: 62430 + - key: Smiley + value: 62433 + - key: Error + value: 62450 + - key: Flag Outline + value: 62476 + - key: Folder + value: 62489 + - key: Language + value: 62555 + - key: Headphones + value: 62578 + - key: Heart Outline + value: 62586 + - key: History + value: 62591 + - key: Home + value: 62593 + - key: Photo + value: 62601 + - key: Exclamation Point + value: 62624 + - key: Info + value: 62628 + - key: Pen Tip + value: 62632 + - key: Keyboard + value: 62649 + - key: Lightbulb + value: 62679 + - key: Link + value: 62693 + - key: Link 2 + value: 62700 + - key: Location On + value: 62713 + - key: Mail + value: 62727 + - key: Mic Off + value: 62785 + - key: More Vertical + value: 62807 + - key: Movie + value: 62810 + - key: My Location + value: 62815 + - key: Menu + value: 62817 + - key: Newspaper + value: 62822 + - key: Sticky Note + value: 62828 + - key: Add Note + value: 62831 + - key: Settings Sliders + value: 62856 + - key: Hierarchy + value: 62858 + - key: Group + value: 62889 + - key: Add Group + value: 62893 + - key: Person + value: 62910 + - key: Phone + value: 62945 + - key: Devices + value: 62950 + - key: Pin + value: 62978 + - key: Unpin + value: 62980 + - key: Play + value: 62982 + - key: Play Circle + value: 62984 + - key: Power Button + value: 62991 + - key: Print + value: 63019 + - key: Block + value: 63022 + - key: Question Mark + value: 63033 + - key: Record Circle + value: 63074 + - key: Save + value: 63104 + - key: Search + value: 63120 + - key: Send + value: 63130 + - key: Settings + value: 63146 + - key: Favorite + value: 63248 + - key: Add Favorite + value: 63252 + - key: Stop Circle + value: 63323 + - key: Tag + value: 63357 + - key: Thumb Down + value: 63518 + - key: Thumb Up value: 63520 - - key: Icon 139 + - key: Videocam value: 63565 - - key: Icon 140 + - key: Warning value: 63594 - - key: Icon 141 + - key: Undo value: 63703 - - key: Icon 142 + - key: Book value: 63742 iconFontAsset: {fileID: 11400000, guid: 9b0d0ee11ff70b04d901a29b519cbaa0, type: 2} optionalEditorMaterial: {fileID: 0} + fontIconSetDefinition: {fileID: 11400000, guid: e63daff880b56ed439a2e852b6e6993a, type: 2} diff --git a/org.mixedrealitytoolkit.standardassets/package.json b/org.mixedrealitytoolkit.standardassets/package.json index a0b21e70f..0a7bb68b7 100644 --- a/org.mixedrealitytoolkit.standardassets/package.json +++ b/org.mixedrealitytoolkit.standardassets/package.json @@ -1,6 +1,6 @@ { "name": "org.mixedrealitytoolkit.standardassets", - "version": "3.2.1-development", + "version": "3.3.0-development.pre.1", "description": "Common assets used by the MRTK packages, including common fonts, materials, and models. Relies on the Graphics Tools collection of shaders.", "displayName": "MRTK Standard Assets", "msftFeatureCategory": "MRTK3", diff --git a/org.mixedrealitytoolkit.theming/AssemblyInfo.cs b/org.mixedrealitytoolkit.theming/AssemblyInfo.cs new file mode 100644 index 000000000..218ffdc9c --- /dev/null +++ b/org.mixedrealitytoolkit.theming/AssemblyInfo.cs @@ -0,0 +1,15 @@ +// Copyright (c) Mixed Reality Toolkit Contributors +// Licensed under the BSD 3-Clause + +using System.Reflection; +using System.Runtime.CompilerServices; + +[assembly: AssemblyProduct("Mixed Reality Toolkit UX Theming")] +[assembly: AssemblyCopyright("Copyright (c) Mixed Reality Toolkit Contributors")] + +[assembly: InternalsVisibleTo("MixedReality.Toolkit.Theming.Editor")] + +// The AssemblyVersion attribute is checked-in and is recommended not to be changed often. +// https://docs.microsoft.com/troubleshoot/visualstudio/general/assembly-version-assembly-file-version +// AssemblyFileVersion and AssemblyInformationalVersion are added by pack-upm.ps1 to match the current MRTK build version. +[assembly: AssemblyVersion("1.0.0.0")] diff --git a/org.mixedrealitytoolkit.theming/AssemblyInfo.cs.meta b/org.mixedrealitytoolkit.theming/AssemblyInfo.cs.meta new file mode 100644 index 000000000..892060a27 --- /dev/null +++ b/org.mixedrealitytoolkit.theming/AssemblyInfo.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: dd8f4169cd8a4df48ac8feff44ed8702 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/org.mixedrealitytoolkit.theming/Binders.meta b/org.mixedrealitytoolkit.theming/Binders.meta new file mode 100644 index 000000000..775fee110 --- /dev/null +++ b/org.mixedrealitytoolkit.theming/Binders.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ce334cc034bd7c7499ad53ab02d99c26 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/org.mixedrealitytoolkit.theming/Binders/BaseThemeBinder.cs b/org.mixedrealitytoolkit.theming/Binders/BaseThemeBinder.cs new file mode 100644 index 000000000..4f80c710b --- /dev/null +++ b/org.mixedrealitytoolkit.theming/Binders/BaseThemeBinder.cs @@ -0,0 +1,67 @@ +// Copyright (c) Mixed Reality Toolkit Contributors +// Licensed under the BSD 3-Clause + +using UnityEngine; +using UnityEngine.UIElements; + +namespace MixedReality.Toolkit.Theming +{ + /// + /// Base class for a theme binder that binds a theme data value of type to a target component of type . + /// + public abstract class BaseThemeBinder : IBinder + { + /// + /// The target component to apply the theme data to. + /// + [field: SerializeField] + protected K Target { get; private set; } + + /// + [field: SerializeField, HideInInspector] + public string ThemeDefinitionItemName { get; private set; } + + /// + /// Applies the theme data value to the target component. + /// + /// The theme data to apply. + protected abstract void Apply(BaseThemeItemData themeItemData); + + /// + /// Invoked when the active theme is changed on the data source. + /// + /// The change event containing the new theme. + protected void OnThemeChanged(ChangeEvent changeEvent) + { + if (changeEvent.newValue == null) + { + Debug.LogWarning($"{GetType().Name}: Received a theme change event with a null theme. Skipping Apply."); + return; + } + + if (!changeEvent.newValue.TryGetItemData(ThemeDefinitionItemName, out BaseThemeItemData value)) + { + Debug.LogWarning($"{GetType().Name}: No item named '{ThemeDefinitionItemName}' of type '{typeof(T).Name}' found in theme '{changeEvent.newValue.name}'."); + return; + } + + Apply(value); + } + + void IBinder.Subscribe(ThemeDataSource themeDataSource) + { + if (themeDataSource != null) + { + themeDataSource.AddListener(OnThemeChanged); + } + } + + void IBinder.Unsubscribe(ThemeDataSource themeDataSource) + { + if (themeDataSource != null) + { + themeDataSource.RemoveListener(OnThemeChanged); + } + } + } +} diff --git a/org.mixedrealitytoolkit.theming/Binders/BaseThemeBinder.cs.meta b/org.mixedrealitytoolkit.theming/Binders/BaseThemeBinder.cs.meta new file mode 100644 index 000000000..7f3c41224 --- /dev/null +++ b/org.mixedrealitytoolkit.theming/Binders/BaseThemeBinder.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 9459ae0bfe34be24e96f3f79e384d90b +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/org.mixedrealitytoolkit.theming/Binders/BehaviourEnabledBinder.cs b/org.mixedrealitytoolkit.theming/Binders/BehaviourEnabledBinder.cs new file mode 100644 index 000000000..a4221c91f --- /dev/null +++ b/org.mixedrealitytoolkit.theming/Binders/BehaviourEnabledBinder.cs @@ -0,0 +1,23 @@ +// Copyright (c) Mixed Reality Toolkit Contributors +// Licensed under the BSD 3-Clause + +using UnityEngine; + +namespace MixedReality.Toolkit.Theming +{ + /// + /// Binds a boolean theme data value to the enabled state of a . + /// + [System.Serializable] + public class BehaviourEnabledBinder : BaseThemeBinder + { + /// + protected override void Apply(BaseThemeItemData themeItemData) + { + if (Target != null) + { + Target.enabled = themeItemData.Value; + } + } + } +} diff --git a/org.mixedrealitytoolkit.theming/Binders/BehaviourEnabledBinder.cs.meta b/org.mixedrealitytoolkit.theming/Binders/BehaviourEnabledBinder.cs.meta new file mode 100644 index 000000000..e456b5a66 --- /dev/null +++ b/org.mixedrealitytoolkit.theming/Binders/BehaviourEnabledBinder.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: e360db02646a69842969f67dd0c46e9b \ No newline at end of file diff --git a/org.mixedrealitytoolkit.theming/Binders/FontIconSetBinder.cs b/org.mixedrealitytoolkit.theming/Binders/FontIconSetBinder.cs new file mode 100644 index 000000000..f93229968 --- /dev/null +++ b/org.mixedrealitytoolkit.theming/Binders/FontIconSetBinder.cs @@ -0,0 +1,73 @@ +// Copyright (c) Mixed Reality Toolkit Contributors +// Licensed under the BSD 3-Clause + +using MixedReality.Toolkit.UX; +using System; +using TMPro; +using UnityEngine; + +namespace MixedReality.Toolkit.Theming +{ + /// + /// Binds a font icon set theme data value to a . + /// + [Serializable] + public class FontIconSetBinder : BaseThemeBinder + { + /// + protected override void Apply(BaseThemeItemData themeItemData) + { + if (Target != null && + Target.TextMeshProComponent != null && + Target.IconSelector != null && + Target.IconSelector.CurrentIconName != null && + themeItemData?.Value?.FontIconSet != null && + themeItemData.Value.FontIconSet.GlyphIconsByName != null && + themeItemData.Value.FontIconSet.GlyphIconsByName.ContainsKey(Target.IconSelector.CurrentIconName)) + { + // Clear the text to prevent missing character warnings when changing the font + Target.TextMeshProComponent.text = string.Empty; + Target.TextMeshProComponent.font = themeItemData.Value.Font; + Target.IconSelector.SetFontIconSet(themeItemData.Value.FontIconSet, true); + } + } + + /// + /// A composite binding target for a and a component. + /// + [Serializable] + public class FontIconSetBinding + { + /// + /// The target icon selector component to apply the font icon set to. + /// + [field: SerializeField] + public FontIconSelector IconSelector { get; private set; } + + /// + /// The target text mesh pro component to apply the font asset to. + /// + [field: SerializeField] + public TMP_Text TextMeshProComponent { get; private set; } + } + + /// + /// A composite data type containing a and a . + /// + [Serializable] + public class FontIconSetData + { + /// + /// The font asset to apply to the text mesh pro component. + /// + [field: SerializeField] + public TMP_FontAsset Font { get; private set; } + + /// + /// The font icon set to apply to the icon selector component. + /// + [field: SerializeField] + public FontIconSet FontIconSet { get; private set; } + } + } +} diff --git a/org.mixedrealitytoolkit.theming/Binders/FontIconSetBinder.cs.meta b/org.mixedrealitytoolkit.theming/Binders/FontIconSetBinder.cs.meta new file mode 100644 index 000000000..3d285ca7b --- /dev/null +++ b/org.mixedrealitytoolkit.theming/Binders/FontIconSetBinder.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 79ad0c9f980cdb14c8e62716499c5da7 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/org.mixedrealitytoolkit.theming/Binders/GraphicColorBinder.cs b/org.mixedrealitytoolkit.theming/Binders/GraphicColorBinder.cs new file mode 100644 index 000000000..d92d615e9 --- /dev/null +++ b/org.mixedrealitytoolkit.theming/Binders/GraphicColorBinder.cs @@ -0,0 +1,24 @@ +// Copyright (c) Mixed Reality Toolkit Contributors +// Licensed under the BSD 3-Clause + +using UnityEngine; +using UnityEngine.UI; + +namespace MixedReality.Toolkit.Theming +{ + /// + /// Binds a color theme data value to the color property of a . + /// + [System.Serializable] + public class GraphicColorBinder : BaseThemeBinder + { + /// + protected override void Apply(BaseThemeItemData themeItemData) + { + if (Target != null) + { + Target.color = themeItemData.Value; + } + } + } +} diff --git a/org.mixedrealitytoolkit.theming/Binders/GraphicColorBinder.cs.meta b/org.mixedrealitytoolkit.theming/Binders/GraphicColorBinder.cs.meta new file mode 100644 index 000000000..578241ef3 --- /dev/null +++ b/org.mixedrealitytoolkit.theming/Binders/GraphicColorBinder.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 9e6dbd7ced329ef4f9b540ea7d4d5bee +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/org.mixedrealitytoolkit.theming/Binders/GraphicMaterialBinder.cs b/org.mixedrealitytoolkit.theming/Binders/GraphicMaterialBinder.cs new file mode 100644 index 000000000..96af3af55 --- /dev/null +++ b/org.mixedrealitytoolkit.theming/Binders/GraphicMaterialBinder.cs @@ -0,0 +1,24 @@ +// Copyright (c) Mixed Reality Toolkit Contributors +// Licensed under the BSD 3-Clause + +using UnityEngine; +using UnityEngine.UI; + +namespace MixedReality.Toolkit.Theming +{ + /// + /// Binds a material theme data value to the material property of a . + /// + [System.Serializable] + public class GraphicMaterialBinder : BaseThemeBinder + { + /// + protected override void Apply(BaseThemeItemData themeItemData) + { + if (Target != null) + { + Target.material = themeItemData.Value; + } + } + } +} diff --git a/org.mixedrealitytoolkit.theming/Binders/GraphicMaterialBinder.cs.meta b/org.mixedrealitytoolkit.theming/Binders/GraphicMaterialBinder.cs.meta new file mode 100644 index 000000000..d3394e15c --- /dev/null +++ b/org.mixedrealitytoolkit.theming/Binders/GraphicMaterialBinder.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 232b8661c9be4d446a7ce038f48b0760 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/org.mixedrealitytoolkit.theming/Binders/IBinder.cs b/org.mixedrealitytoolkit.theming/Binders/IBinder.cs new file mode 100644 index 000000000..e1ac52d7d --- /dev/null +++ b/org.mixedrealitytoolkit.theming/Binders/IBinder.cs @@ -0,0 +1,28 @@ +// Copyright (c) Mixed Reality Toolkit Contributors +// Licensed under the BSD 3-Clause + +namespace MixedReality.Toolkit.Theming +{ + /// + /// Interface for a theme binder that subscribes to a and applies theme data to a target. + /// + public interface IBinder + { + /// + /// Subscribes to the given theme data source for theme changes. + /// + /// The theme data source to subscribe to. + void Subscribe(ThemeDataSource themeDataSource); + + /// + /// Unsubscribes from the given theme data source. + /// + /// The theme data source to unsubscribe from. + void Unsubscribe(ThemeDataSource themeDataSource); + + /// + /// The name of the theme definition item this binder targets. + /// + string ThemeDefinitionItemName { get; } + } +} diff --git a/org.mixedrealitytoolkit.theming/Binders/IBinder.cs.meta b/org.mixedrealitytoolkit.theming/Binders/IBinder.cs.meta new file mode 100644 index 000000000..1f52cf3b6 --- /dev/null +++ b/org.mixedrealitytoolkit.theming/Binders/IBinder.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: f3ea076276620fc4888c26f7bc68d7f2 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/org.mixedrealitytoolkit.theming/Binders/ImageSpriteBinder.cs b/org.mixedrealitytoolkit.theming/Binders/ImageSpriteBinder.cs new file mode 100644 index 000000000..c72379ae1 --- /dev/null +++ b/org.mixedrealitytoolkit.theming/Binders/ImageSpriteBinder.cs @@ -0,0 +1,24 @@ +// Copyright (c) Mixed Reality Toolkit Contributors +// Licensed under the BSD 3-Clause + +using UnityEngine; +using UnityEngine.UI; + +namespace MixedReality.Toolkit.Theming +{ + /// + /// Binds a sprite theme data value to the sprite property of a . + /// + [System.Serializable] + public class ImageSpriteBinder : BaseThemeBinder + { + /// + protected override void Apply(BaseThemeItemData themeItemData) + { + if (Target != null) + { + Target.sprite = themeItemData.Value; + } + } + } +} diff --git a/org.mixedrealitytoolkit.theming/Binders/ImageSpriteBinder.cs.meta b/org.mixedrealitytoolkit.theming/Binders/ImageSpriteBinder.cs.meta new file mode 100644 index 000000000..9ff947f22 --- /dev/null +++ b/org.mixedrealitytoolkit.theming/Binders/ImageSpriteBinder.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 6ab68b63843d0f24eb3bc1a4349ed89e +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/org.mixedrealitytoolkit.theming/Binders/LayoutGroupPaddingBinder.cs b/org.mixedrealitytoolkit.theming/Binders/LayoutGroupPaddingBinder.cs new file mode 100644 index 000000000..a714bc9a5 --- /dev/null +++ b/org.mixedrealitytoolkit.theming/Binders/LayoutGroupPaddingBinder.cs @@ -0,0 +1,24 @@ +// Copyright (c) Mixed Reality Toolkit Contributors +// Licensed under the BSD 3-Clause + +using UnityEngine; +using UnityEngine.UI; + +namespace MixedReality.Toolkit.Theming +{ + /// + /// Binds a rect offset theme data value to the padding property of a . + /// + [System.Serializable] + public class LayoutGroupPaddingBinder : BaseThemeBinder + { + /// + protected override void Apply(BaseThemeItemData themeItemData) + { + if (Target != null) + { + Target.padding = themeItemData.Value; + } + } + } +} diff --git a/org.mixedrealitytoolkit.theming/Binders/LayoutGroupPaddingBinder.cs.meta b/org.mixedrealitytoolkit.theming/Binders/LayoutGroupPaddingBinder.cs.meta new file mode 100644 index 000000000..4709da232 --- /dev/null +++ b/org.mixedrealitytoolkit.theming/Binders/LayoutGroupPaddingBinder.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 9df85a72df4780545bb4ae373fbe6a0b +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/org.mixedrealitytoolkit.theming/Binders/RendererMaterialBinder.cs b/org.mixedrealitytoolkit.theming/Binders/RendererMaterialBinder.cs new file mode 100644 index 000000000..5dccbe78f --- /dev/null +++ b/org.mixedrealitytoolkit.theming/Binders/RendererMaterialBinder.cs @@ -0,0 +1,23 @@ +// Copyright (c) Mixed Reality Toolkit Contributors +// Licensed under the BSD 3-Clause + +using UnityEngine; + +namespace MixedReality.Toolkit.Theming +{ + /// + /// Binds a material theme data value to the material property of a . + /// + [System.Serializable] + public class RendererMaterialBinder : BaseThemeBinder + { + /// + protected override void Apply(BaseThemeItemData themeItemData) + { + if (Target != null) + { + Target.material = themeItemData.Value; + } + } + } +} diff --git a/org.mixedrealitytoolkit.theming/Binders/RendererMaterialBinder.cs.meta b/org.mixedrealitytoolkit.theming/Binders/RendererMaterialBinder.cs.meta new file mode 100644 index 000000000..2ee87530f --- /dev/null +++ b/org.mixedrealitytoolkit.theming/Binders/RendererMaterialBinder.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 5ad27e47d68f7044c948fe7bd2c2106a +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/org.mixedrealitytoolkit.theming/Binders/RoundedRectMask2DRadiusBinder.cs b/org.mixedrealitytoolkit.theming/Binders/RoundedRectMask2DRadiusBinder.cs new file mode 100644 index 000000000..7f8fbb414 --- /dev/null +++ b/org.mixedrealitytoolkit.theming/Binders/RoundedRectMask2DRadiusBinder.cs @@ -0,0 +1,24 @@ +// Copyright (c) Mixed Reality Toolkit Contributors +// Licensed under the BSD 3-Clause + +using Microsoft.MixedReality.GraphicsTools; +using UnityEngine; + +namespace MixedReality.Toolkit.Theming +{ + /// + /// Binds a float theme data value to the corner radii property of a . + /// + [System.Serializable] + public class RoundedRectMask2DRadiusBinder : BaseThemeBinder + { + /// + protected override void Apply(BaseThemeItemData themeItemData) + { + if (Target != null) + { + Target.Radii = Vector3.one * themeItemData.Value; + } + } + } +} diff --git a/org.mixedrealitytoolkit.theming/Binders/RoundedRectMask2DRadiusBinder.cs.meta b/org.mixedrealitytoolkit.theming/Binders/RoundedRectMask2DRadiusBinder.cs.meta new file mode 100644 index 000000000..0d78a3975 --- /dev/null +++ b/org.mixedrealitytoolkit.theming/Binders/RoundedRectMask2DRadiusBinder.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 7d52126062c5a4442bd6800e89d1f6cf +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/org.mixedrealitytoolkit.theming/Binders/SkyboxMaterialBinder.cs b/org.mixedrealitytoolkit.theming/Binders/SkyboxMaterialBinder.cs new file mode 100644 index 000000000..0efef5429 --- /dev/null +++ b/org.mixedrealitytoolkit.theming/Binders/SkyboxMaterialBinder.cs @@ -0,0 +1,23 @@ +// Copyright (c) Mixed Reality Toolkit Contributors +// Licensed under the BSD 3-Clause + +using UnityEngine; + +namespace MixedReality.Toolkit.Theming +{ + /// + /// Binds a material theme data value to the material property of a . + /// + [System.Serializable] + public class SkyboxMaterialBinder : BaseThemeBinder + { + /// + protected override void Apply(BaseThemeItemData themeItemData) + { + if (Target != null) + { + Target.material = themeItemData.Value; + } + } + } +} diff --git a/org.mixedrealitytoolkit.theming/Binders/SkyboxMaterialBinder.cs.meta b/org.mixedrealitytoolkit.theming/Binders/SkyboxMaterialBinder.cs.meta new file mode 100644 index 000000000..2a5595525 --- /dev/null +++ b/org.mixedrealitytoolkit.theming/Binders/SkyboxMaterialBinder.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 5970cbf205f8c324bb5e3f76a5cad6a0 \ No newline at end of file diff --git a/org.mixedrealitytoolkit.theming/Binders/SpriteRendererColorBinder.cs b/org.mixedrealitytoolkit.theming/Binders/SpriteRendererColorBinder.cs new file mode 100644 index 000000000..fb9a79086 --- /dev/null +++ b/org.mixedrealitytoolkit.theming/Binders/SpriteRendererColorBinder.cs @@ -0,0 +1,23 @@ +// Copyright (c) Mixed Reality Toolkit Contributors +// Licensed under the BSD 3-Clause + +using UnityEngine; + +namespace MixedReality.Toolkit.Theming +{ + /// + /// Binds a color theme data value to the color property of a . + /// + [System.Serializable] + public class SpriteRendererColorBinder : BaseThemeBinder + { + /// + protected override void Apply(BaseThemeItemData themeItemData) + { + if (Target != null) + { + Target.color = themeItemData.Value; + } + } + } +} diff --git a/org.mixedrealitytoolkit.theming/Binders/SpriteRendererColorBinder.cs.meta b/org.mixedrealitytoolkit.theming/Binders/SpriteRendererColorBinder.cs.meta new file mode 100644 index 000000000..650c562f1 --- /dev/null +++ b/org.mixedrealitytoolkit.theming/Binders/SpriteRendererColorBinder.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 0818ebc31f7842047a74482722d60201 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/org.mixedrealitytoolkit.theming/Binders/SpriteRendererSpriteBinder.cs b/org.mixedrealitytoolkit.theming/Binders/SpriteRendererSpriteBinder.cs new file mode 100644 index 000000000..cb0ed154b --- /dev/null +++ b/org.mixedrealitytoolkit.theming/Binders/SpriteRendererSpriteBinder.cs @@ -0,0 +1,23 @@ +// Copyright (c) Mixed Reality Toolkit Contributors +// Licensed under the BSD 3-Clause + +using UnityEngine; + +namespace MixedReality.Toolkit.Theming +{ + /// + /// Binds a sprite theme data value to the sprite property of a . + /// + [System.Serializable] + public class SpriteRendererSpriteBinder : BaseThemeBinder + { + /// + protected override void Apply(BaseThemeItemData themeItemData) + { + if (Target != null) + { + Target.sprite = themeItemData.Value; + } + } + } +} diff --git a/org.mixedrealitytoolkit.theming/Binders/SpriteRendererSpriteBinder.cs.meta b/org.mixedrealitytoolkit.theming/Binders/SpriteRendererSpriteBinder.cs.meta new file mode 100644 index 000000000..30b1f1142 --- /dev/null +++ b/org.mixedrealitytoolkit.theming/Binders/SpriteRendererSpriteBinder.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 8d37b91b434ef87458ad6c3515863101 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/org.mixedrealitytoolkit.theming/Binders/StateVisualizerEffectColorBinder.cs b/org.mixedrealitytoolkit.theming/Binders/StateVisualizerEffectColorBinder.cs new file mode 100644 index 000000000..f62fc6d3b --- /dev/null +++ b/org.mixedrealitytoolkit.theming/Binders/StateVisualizerEffectColorBinder.cs @@ -0,0 +1,82 @@ +// Copyright (c) Mixed Reality Toolkit Contributors +// Licensed under the BSD 3-Clause + +using MixedReality.Toolkit.UX; +using UnityEngine; + +namespace MixedReality.Toolkit.Theming +{ + /// + /// Binds a theme item to a single tint effect on a + /// component. + /// + /// + /// Add one of these binders per state (or per state+effect combination) to a + /// component. Each binder reads a Color from the + /// active theme and routes it to the matching tint effect via + /// . + /// + /// Set to one of the built-in state names (Disabled, + /// PassiveHover, ActiveHover, Select, Toggle) or any + /// custom state you have added. + /// + /// Leave unassigned to repaint every ITintEffect in that + /// state. Assign it to the specific Graphic or SpriteRenderer that appears + /// in the tintables list of the effect you want to target — this is rename-proof and + /// breaks visibly (missing reference) rather than silently if the object is deleted. + /// This is the preferred approach when one state contains multiple tint effects that need + /// different colors (e.g. a background tint and an icon tint). + /// + [System.Serializable] + public class StateVisualizerEffectColorBinder : BaseThemeBinder + { + [SerializeField] + [Tooltip("The name of the StateVisualizer state to target (e.g. 'PassiveHover', 'Toggle').")] + private string stateName = "PassiveHover"; + + /// The name of the state whose tint effect(s) will be updated. + public string StateName + { + get => stateName; + set => stateName = value; + } + + [SerializeField] + [Tooltip("The specific Graphic or SpriteRenderer that appears in the tintables list of " + + "the effect to target. Leave unassigned to update every tint effect in the state.")] + private UnityEngine.Object tintTarget; + + /// + /// The specific tintable component used to identify which ITintEffect to update, + /// or to update all tint effects in the state. + /// + /// + /// Assign the same Graphic or SpriteRenderer that is listed in the + /// effect's Tintables array in the Inspector. This is rename-proof and breaks + /// visibly (missing reference) rather than silently if the object is deleted. + /// + public UnityEngine.Object TintTarget + { + get => tintTarget; + set => tintTarget = value; + } + + /// + protected override void Apply(BaseThemeItemData themeItemData) + { + if (Target == null) + { + Debug.LogWarning($"{nameof(StateVisualizerEffectColorBinder)}: Target {nameof(StateVisualizer)} is null. Skipping Apply."); + return; + } + + if (string.IsNullOrEmpty(stateName)) + { + Debug.LogWarning($"{nameof(StateVisualizerEffectColorBinder)}: {nameof(StateName)} is not set. Skipping Apply."); + return; + } + + Target.TrySetStateTintColor(stateName, tintTarget, themeItemData.Value); + } + } +} diff --git a/org.mixedrealitytoolkit.theming/Binders/StateVisualizerEffectColorBinder.cs.meta b/org.mixedrealitytoolkit.theming/Binders/StateVisualizerEffectColorBinder.cs.meta new file mode 100644 index 000000000..9ad8ea4c0 --- /dev/null +++ b/org.mixedrealitytoolkit.theming/Binders/StateVisualizerEffectColorBinder.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: e0a31f0a06206334cb52572615736c37 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/org.mixedrealitytoolkit.theming/Binders/TMP_TextFontAssetBinder.cs b/org.mixedrealitytoolkit.theming/Binders/TMP_TextFontAssetBinder.cs new file mode 100644 index 000000000..3f5f2f345 --- /dev/null +++ b/org.mixedrealitytoolkit.theming/Binders/TMP_TextFontAssetBinder.cs @@ -0,0 +1,23 @@ +// Copyright (c) Mixed Reality Toolkit Contributors +// Licensed under the BSD 3-Clause + +using TMPro; + +namespace MixedReality.Toolkit.Theming +{ + /// + /// Binds a font asset theme data value to the font property of a . + /// + [System.Serializable] + public class TMP_TextFontAssetBinder : BaseThemeBinder + { + /// + protected override void Apply(BaseThemeItemData themeItemData) + { + if (Target != null) + { + Target.font = themeItemData.Value; + } + } + } +} diff --git a/org.mixedrealitytoolkit.theming/Binders/TMP_TextFontAssetBinder.cs.meta b/org.mixedrealitytoolkit.theming/Binders/TMP_TextFontAssetBinder.cs.meta new file mode 100644 index 000000000..a7a17d7b4 --- /dev/null +++ b/org.mixedrealitytoolkit.theming/Binders/TMP_TextFontAssetBinder.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 90624ee5453f0504db2aede9ac58879d +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/org.mixedrealitytoolkit.theming/Binders/TransformLocalScaleBinder.cs b/org.mixedrealitytoolkit.theming/Binders/TransformLocalScaleBinder.cs new file mode 100644 index 000000000..88ebe0f8a --- /dev/null +++ b/org.mixedrealitytoolkit.theming/Binders/TransformLocalScaleBinder.cs @@ -0,0 +1,23 @@ +// Copyright (c) Mixed Reality Toolkit Contributors +// Licensed under the BSD 3-Clause + +using UnityEngine; + +namespace MixedReality.Toolkit.Theming +{ + /// + /// Binds a vector3 theme data value to the local scale property of a . + /// + [System.Serializable] + public class TransformLocalScaleBinder : BaseThemeBinder + { + /// + protected override void Apply(BaseThemeItemData themeItemData) + { + if (Target != null) + { + Target.localScale = themeItemData.Value; + } + } + } +} diff --git a/org.mixedrealitytoolkit.theming/Binders/TransformLocalScaleBinder.cs.meta b/org.mixedrealitytoolkit.theming/Binders/TransformLocalScaleBinder.cs.meta new file mode 100644 index 000000000..be7c49e40 --- /dev/null +++ b/org.mixedrealitytoolkit.theming/Binders/TransformLocalScaleBinder.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: c6ba7974c6d770a4baa18e9a72c9429d +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/org.mixedrealitytoolkit.theming/CHANGELOG.md b/org.mixedrealitytoolkit.theming/CHANGELOG.md new file mode 100644 index 000000000..52880eb4c --- /dev/null +++ b/org.mixedrealitytoolkit.theming/CHANGELOG.md @@ -0,0 +1,21 @@ +# Changelog + +The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/). + +## Unreleased + +### Added + +* Added serializable theme item data types for booleans. [PR #1130](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1130) +* Added built-in binders for skybox materials and behaviour enabled states. [PR #1130](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1130) + +## [1.0.0-pre.1] - 2026-05-20 + +### Added + +* Added the new MRTK UX Theming package (`org.mixedrealitytoolkit.theming`) for runtime theme switching across MRTK canvas UI. [PR #1119](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1119) + * Added `ThemeDataSource`, `Theme`, `ThemeDefinition`, and `ThemeBinding` as the core theming data model and binding workflow. + * Added serializable theme item data types for colors, floats, font icon sets, materials, rect offsets, sprites, TextMeshPro font assets, and Vector3 values. + * Added built-in binders for common Unity and MRTK UI properties, including graphic color/material, renderer material, image and sprite renderer sprite/color, layout group padding, rounded rectangle mask radius, transform local scale, TMP font assets, font icon sets, and StateVisualizer tint colors. + * Added editor tooling for creating and configuring themes, theme data sources, theme bindings, and font icon set maps in the Unity Inspector. + * Added package documentation, screenshots, license, assembly definitions, sample theme assets, and a default MRTK font icon set map. diff --git a/org.mixedrealitytoolkit.theming/CHANGELOG.md.meta b/org.mixedrealitytoolkit.theming/CHANGELOG.md.meta new file mode 100644 index 000000000..e02f6f3e8 --- /dev/null +++ b/org.mixedrealitytoolkit.theming/CHANGELOG.md.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 8e60cbf77fc6f5e4ab9e709f98ff0ef9 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/org.mixedrealitytoolkit.theming/Documentation~/Images/ColorThemeItemData.png b/org.mixedrealitytoolkit.theming/Documentation~/Images/ColorThemeItemData.png new file mode 100644 index 000000000..b23476cc2 Binary files /dev/null and b/org.mixedrealitytoolkit.theming/Documentation~/Images/ColorThemeItemData.png differ diff --git a/org.mixedrealitytoolkit.theming/Documentation~/Images/TextColorMapping.png b/org.mixedrealitytoolkit.theming/Documentation~/Images/TextColorMapping.png new file mode 100644 index 000000000..ae75d59d9 Binary files /dev/null and b/org.mixedrealitytoolkit.theming/Documentation~/Images/TextColorMapping.png differ diff --git a/org.mixedrealitytoolkit.theming/Documentation~/Images/ThemeBinding.png b/org.mixedrealitytoolkit.theming/Documentation~/Images/ThemeBinding.png new file mode 100644 index 000000000..2573a2352 Binary files /dev/null and b/org.mixedrealitytoolkit.theming/Documentation~/Images/ThemeBinding.png differ diff --git a/org.mixedrealitytoolkit.theming/Documentation~/Images/ThemeBindingThemeSource.png b/org.mixedrealitytoolkit.theming/Documentation~/Images/ThemeBindingThemeSource.png new file mode 100644 index 000000000..6e1024e76 Binary files /dev/null and b/org.mixedrealitytoolkit.theming/Documentation~/Images/ThemeBindingThemeSource.png differ diff --git a/org.mixedrealitytoolkit.theming/Documentation~/Images/ThemeDataSource.png b/org.mixedrealitytoolkit.theming/Documentation~/Images/ThemeDataSource.png new file mode 100644 index 000000000..503d76308 Binary files /dev/null and b/org.mixedrealitytoolkit.theming/Documentation~/Images/ThemeDataSource.png differ diff --git a/org.mixedrealitytoolkit.theming/Editor.meta b/org.mixedrealitytoolkit.theming/Editor.meta new file mode 100644 index 000000000..44abac83d --- /dev/null +++ b/org.mixedrealitytoolkit.theming/Editor.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c140b5483033a0340ac014b9c87a8066 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/org.mixedrealitytoolkit.theming/Editor/AssemblyInfo.cs b/org.mixedrealitytoolkit.theming/Editor/AssemblyInfo.cs new file mode 100644 index 000000000..b607b960c --- /dev/null +++ b/org.mixedrealitytoolkit.theming/Editor/AssemblyInfo.cs @@ -0,0 +1,12 @@ +// Copyright (c) Mixed Reality Toolkit Contributors +// Licensed under the BSD 3-Clause + +using System.Reflection; + +[assembly: AssemblyProduct("Mixed Reality Toolkit UX Theming - Editor")] +[assembly: AssemblyCopyright("Copyright (c) Mixed Reality Toolkit Contributors")] + +// The AssemblyVersion attribute is checked-in and is recommended not to be changed often. +// https://docs.microsoft.com/troubleshoot/visualstudio/general/assembly-version-assembly-file-version +// AssemblyFileVersion and AssemblyInformationalVersion are added by pack-upm.ps1 to match the current MRTK build version. +[assembly: AssemblyVersion("1.0.0.0")] diff --git a/org.mixedrealitytoolkit.theming/Editor/AssemblyInfo.cs.meta b/org.mixedrealitytoolkit.theming/Editor/AssemblyInfo.cs.meta new file mode 100644 index 000000000..c17950303 --- /dev/null +++ b/org.mixedrealitytoolkit.theming/Editor/AssemblyInfo.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: d76b07a922b0df143a27a11a349459a6 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/org.mixedrealitytoolkit.theming/Editor/BaseThemeBinderDrawer.cs b/org.mixedrealitytoolkit.theming/Editor/BaseThemeBinderDrawer.cs new file mode 100644 index 000000000..aad4bb5b5 --- /dev/null +++ b/org.mixedrealitytoolkit.theming/Editor/BaseThemeBinderDrawer.cs @@ -0,0 +1,161 @@ +// Copyright (c) Mixed Reality Toolkit Contributors +// Licensed under the BSD 3-Clause + +using MixedReality.Toolkit.Editor; +using System.Collections.Generic; +using UnityEditor; +using UnityEngine; + +namespace MixedReality.Toolkit.Theming.Editor +{ + [CustomPropertyDrawer(typeof(BaseThemeBinder<,>), true)] + public class BaseThemeBinderDrawer : PropertyDrawer + { + private static string themeDefinitionItemNameField; + private static string ThemeDefinitionItemNameField => themeDefinitionItemNameField ??= InspectorUIUtility.GetBackingField("ThemeDefinitionItemName"); + + private static readonly Dictionary cachedLabels = new Dictionary(); + private static readonly Dictionary cachedValueTypes = new Dictionary(); + private static readonly List reusableMatchingItemNames = new List(); + + public override void OnGUI(Rect position, SerializedProperty property, GUIContent label) + { + if (label.text.StartsWith("Element")) + { + if (!cachedLabels.TryGetValue(label.text, out string cachedLabel)) + { + cachedLabel = label.text.Replace("Element", "Binder"); + cachedLabels[label.text] = cachedLabel; + } + label = new GUIContent(label) { text = cachedLabel }; + } + + SerializedProperty themeDataSourceProperty = property.serializedObject.FindProperty("themeDataSource"); + + string[] names = null; + SerializedProperty themeDefinitionItemName = null; + bool hasDataSource = themeDataSourceProperty != null && themeDataSourceProperty.objectReferenceValue != null; + + // Only pay the cost of parsing available items when the property is actively expanded + if (property.isExpanded && property.managedReferenceValue != null && hasDataSource) + { + themeDefinitionItemName = property.FindPropertyRelative(ThemeDefinitionItemNameField); + + ThemeDataSource dataSource = themeDataSourceProperty.objectReferenceValue as ThemeDataSource; + if (dataSource != null) + { + names = ParseThemeItems(dataSource.Definition, property.managedReferenceValue); + } + } + + label = EditorGUI.BeginProperty(position, label, property); + + // Draw the foldout and all child properties within the allocated rect. + Rect propertyRect = position; + if (hasDataSource) + { + // Reserve the last line for the Bound Theme Item popup when expanded. + propertyRect.height -= property.isExpanded ? EditorGUIUtility.singleLineHeight + EditorGUIUtility.standardVerticalSpacing : 0; + } + EditorGUI.PropertyField(propertyRect, property, label, true); + + // Draw the Bound Theme Item popup using the Rect API, within the allocated position. + if (hasDataSource && property.isExpanded) + { + // Child fields are indented 15px from position.x. Unity's label/control + // split is at position.x + labelWidth, so the label width is (labelWidth - 15f) + // and the control starts at that same absolute split point. + const float indentWidth = 15f; + float rowY = position.y + propertyRect.height + EditorGUIUtility.standardVerticalSpacing; + float splitX = position.x + EditorGUIUtility.labelWidth; + float rightEdge = position.x + position.width; + Rect labelRect = new Rect(position.x + indentWidth, rowY, EditorGUIUtility.labelWidth - indentWidth, EditorGUIUtility.singleLineHeight); + Rect controlRect = new Rect(splitX, rowY, rightEdge - splitX, EditorGUIUtility.singleLineHeight); + + if (names != null) + { + int selected = System.Array.IndexOf(names, themeDefinitionItemName.stringValue); + using (var check = new EditorGUI.ChangeCheckScope()) + { + EditorGUI.LabelField(labelRect, "Bound Theme Item"); + selected = EditorGUI.Popup(controlRect, selected, names); + if (check.changed) + { + themeDefinitionItemName.stringValue = names[selected]; + } + } + } + else + { + using (new EditorGUI.DisabledScope(true)) + { + EditorGUI.LabelField(labelRect, "Bound Theme Item"); + EditorGUI.Popup(controlRect, 0, new string[] { "(No matching items)" }); + } + } + } + + EditorGUI.EndProperty(); + } + + public override float GetPropertyHeight(SerializedProperty property, GUIContent label) + { + float height = EditorGUI.GetPropertyHeight(property); + + // Add a line for the Bound Theme Item popup when the foldout is expanded and a data source is available. + if (property.isExpanded && property.managedReferenceValue != null) + { + SerializedProperty themeDataSourceProperty = property.serializedObject.FindProperty("themeDataSource"); + if (themeDataSourceProperty != null && themeDataSourceProperty.objectReferenceValue != null) + { + height += EditorGUIUtility.singleLineHeight + EditorGUIUtility.standardVerticalSpacing; + } + } + + return height; + } + + private string[] ParseThemeItems(ThemeDefinition themeDefinition, object binder) + { + if (themeDefinition == null || themeDefinition.ThemeDefinitionItems == null || binder == null) + { + return null; + } + + System.Type binderType = binder.GetType(); + if (!cachedValueTypes.TryGetValue(binderType, out System.Type valueType)) + { + System.Type baseBinderType = binderType; + while (baseBinderType != null && (!baseBinderType.IsGenericType || baseBinderType.GetGenericTypeDefinition() != typeof(BaseThemeBinder<,>))) + { + baseBinderType = baseBinderType.BaseType; + } + + valueType = baseBinderType?.GenericTypeArguments[0]; + cachedValueTypes[binderType] = valueType; + } + + if (valueType == null) + { + return null; + } + + reusableMatchingItemNames.Clear(); + + foreach (ThemeDefinition.ThemeDefinitionItem item in themeDefinition.ThemeDefinitionItems) + { + if (item != null + && !string.IsNullOrWhiteSpace(item.Name) + && item.DataType?.Type != null + && item.DataType.Type.BaseType != null + && item.DataType.Type.BaseType.GenericTypeArguments.Length > 0 + && item.DataType.Type.BaseType.GenericTypeArguments[0].IsAssignableFrom(valueType)) + { + reusableMatchingItemNames.Add(item.Name); + } + } + + return reusableMatchingItemNames.Count > 0 ? reusableMatchingItemNames.ToArray() : null; + } + } +} diff --git a/org.mixedrealitytoolkit.theming/Editor/BaseThemeBinderDrawer.cs.meta b/org.mixedrealitytoolkit.theming/Editor/BaseThemeBinderDrawer.cs.meta new file mode 100644 index 000000000..514c5dfba --- /dev/null +++ b/org.mixedrealitytoolkit.theming/Editor/BaseThemeBinderDrawer.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: f0f8b840810ac3044aa74e3940c04c18 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/org.mixedrealitytoolkit.theming/Editor/FontIconSetMapEditor.cs b/org.mixedrealitytoolkit.theming/Editor/FontIconSetMapEditor.cs new file mode 100644 index 000000000..a9c9fcbf1 --- /dev/null +++ b/org.mixedrealitytoolkit.theming/Editor/FontIconSetMapEditor.cs @@ -0,0 +1,188 @@ +// Copyright (c) Mixed Reality Toolkit Contributors +// Licensed under the BSD 3-Clause + +using MixedReality.Toolkit.Editor; +using MixedReality.Toolkit.UX; +using System.Collections.Generic; +using UnityEditor; +using UnityEngine; + +namespace MixedReality.Toolkit.Theming.Editor +{ + [CustomEditor(typeof(FontIconSetMap))] + public class FontIconSetMapEditor : UnityEditor.Editor + { + private SerializedProperty setDefinitionProperty; + private SerializedProperty fontIconSetsProperty; + + private int numColumns = 4; + private bool editToggled = false; + private List foldoutStates = new(); + + // Deferred State Variables + private FontIconSet pendingIconSet = null; + private string pendingIconToRenameOld = null; + private string pendingIconToRenameNew = null; + + public void OnEnable() + { + setDefinitionProperty = serializedObject.FindProperty("setDefinition"); + fontIconSetsProperty = serializedObject.FindProperty("fontIconSets"); + // Ensure we have enough values to track all assigned icon sets + for (int i = foldoutStates.Count; i < fontIconSetsProperty.arraySize; i++) + { + foldoutStates.Add(false); + } + } + + public override void OnInspectorGUI() + { + serializedObject.Update(); + + if (Event.current.type == EventType.Layout) + { + if (pendingIconSet != null && pendingIconToRenameOld != null && pendingIconToRenameNew != null) + { + Undo.RecordObject(pendingIconSet, "Rename Icon"); + pendingIconSet.UpdateIconName(pendingIconToRenameOld, pendingIconToRenameNew); + EditorUtility.SetDirty(pendingIconSet); + pendingIconSet = null; + pendingIconToRenameOld = null; + pendingIconToRenameNew = null; + } + } + + EditorGUILayout.PropertyField(setDefinitionProperty); + EditorGUILayout.PropertyField(fontIconSetsProperty); + editToggled = EditorGUILayout.Toggle("Edit Names", editToggled); + EditorGUILayout.LabelField(string.Empty, GUI.skin.horizontalSlider); + + FontIconSetDefinition setDefinition = setDefinitionProperty.objectReferenceValue as FontIconSetDefinition; + const int TileSize = 90; + + Dictionary> iconMatches = new Dictionary>(); + + for (int i = 0; i < fontIconSetsProperty.arraySize; i++) + { + FontIconSet iconSet = fontIconSetsProperty.GetArrayElementAtIndex(i).objectReferenceValue as FontIconSet; + if (iconSet == null) + { + continue; + } + + List> glyphs = new List>(iconSet.GlyphIconsByName); + + int column = 0; + + if (editToggled) + { + glyphs.Sort((pair1, pair2) => pair1.Value.CompareTo(pair2.Value)); + + if (foldoutStates.Count <= i) + { + foldoutStates.Add(false); + } + + if (foldoutStates[i] = EditorGUILayout.Foldout(foldoutStates[i], iconSet.name, true)) + { + string[] availableNamesArray = null; + if (setDefinition != null && setDefinition.IconNames != null) + { + availableNamesArray = FontIconSetInspector.GetAvailableIconNames(iconSet, setDefinition); + FontIconSetInspector.DrawInvalidIconNameHelpBox(iconSet, setDefinition); + } + + EditorGUILayout.BeginHorizontal(); + foreach (KeyValuePair kv in glyphs) + { + if (column >= numColumns) + { + column = 0; + EditorGUILayout.EndHorizontal(); + EditorGUILayout.BeginHorizontal(); + } + + EditorGUILayout.BeginVertical(GUILayout.Width(TileSize)); + + Rect textureRect = GUILayoutUtility.GetRect(TileSize, TileSize, GUI.skin.box); + EditorGUI.DrawRect(textureRect, new Color(0f, 0f, 0f, 0.1f)); + FontIconSetInspector.EditorDrawTMPGlyph(textureRect, kv.Value, iconSet.IconFontAsset); + + if (availableNamesArray != null && FontIconSetInspector.DrawIconNamePopup(kv.Key, availableNamesArray, setDefinition.IconNames, TileSize, out string newName)) + { + pendingIconSet = iconSet; + pendingIconToRenameOld = kv.Key; + pendingIconToRenameNew = newName; + } + + EditorGUILayout.EndVertical(); + + column++; + } + + EditorGUILayout.EndHorizontal(); + } + } + else + { + foreach (KeyValuePair kv in glyphs) + { + if (iconMatches.TryGetValue(kv.Key, out List icons)) + { + icons.Add(iconSet); + } + else + { + iconMatches.Add(kv.Key, new List { iconSet }); + } + } + } + } + + if (!editToggled) + { + // Sort the matched keys so the icons display in a predictable alphabetical order. + List sortedKeys = new List(iconMatches.Keys); + sortedKeys.Sort(); + + foreach (string key in sortedKeys) + { + List icons = iconMatches[key]; + + if (setDefinition != null && setDefinition.IconNames != null) + { + EditorGUILayout.BeginVertical(); + + EditorGUILayout.LabelField(key, EditorStyles.boldLabel); + + EditorGUILayout.BeginHorizontal(); + + for (int i = 0; i < fontIconSetsProperty.arraySize; i++) + { + FontIconSet iconSet = fontIconSetsProperty.GetArrayElementAtIndex(i).objectReferenceValue as FontIconSet; + Rect iconRect = GUILayoutUtility.GetRect(TileSize, TileSize, GUI.skin.box); + EditorGUI.DrawRect(iconRect, new Color(0f, 0f, 0f, 0.1f)); + + if (icons.Contains(iconSet)) + { + FontIconSetInspector.EditorDrawTMPGlyph(iconRect, iconSet.GlyphIconsByName[key], iconSet.IconFontAsset); + } + } + + EditorGUILayout.EndHorizontal(); + + EditorGUILayout.EndVertical(); + } + } + } + + if (Event.current.type == EventType.Repaint) + { + float editorWindowWidth = GUILayoutUtility.GetLastRect().width; + numColumns = (int)Mathf.Floor(editorWindowWidth / (TileSize + GUI.skin.button.margin.right)); + } + + serializedObject.ApplyModifiedProperties(); + } + } +} diff --git a/org.mixedrealitytoolkit.theming/Editor/FontIconSetMapEditor.cs.meta b/org.mixedrealitytoolkit.theming/Editor/FontIconSetMapEditor.cs.meta new file mode 100644 index 000000000..d9d7cb69e --- /dev/null +++ b/org.mixedrealitytoolkit.theming/Editor/FontIconSetMapEditor.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: df22f8ff1a7c965478e57897bf2b0e1a +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/org.mixedrealitytoolkit.theming/Editor/MRTK.Theming.Editor.asmdef b/org.mixedrealitytoolkit.theming/Editor/MRTK.Theming.Editor.asmdef new file mode 100644 index 000000000..2a228dfae --- /dev/null +++ b/org.mixedrealitytoolkit.theming/Editor/MRTK.Theming.Editor.asmdef @@ -0,0 +1,23 @@ +{ + "name": "MixedReality.Toolkit.Theming.Editor", + "rootNamespace": "MixedReality.Toolkit.Theming.Editor", + "references": [ + "GUID:56255bd5d851a6243b63cb370cfc40b1", + "GUID:1712c250045dc734ba8993abefec8428", + "GUID:2238d58cada9b6746a548c6bff32c381", + "GUID:9a9367d437335a947a847011f5575869", + "GUID:e76caf03ea6b3df499bbc873e017d102", + "GUID:6055be8ebefd69e48b49212b09b47b2f" + ], + "includePlatforms": [ + "Editor" + ], + "excludePlatforms": [], + "allowUnsafeCode": false, + "overrideReferences": false, + "precompiledReferences": [], + "autoReferenced": true, + "defineConstraints": [], + "versionDefines": [], + "noEngineReferences": false +} \ No newline at end of file diff --git a/org.mixedrealitytoolkit.theming/Editor/MRTK.Theming.Editor.asmdef.meta b/org.mixedrealitytoolkit.theming/Editor/MRTK.Theming.Editor.asmdef.meta new file mode 100644 index 000000000..587dcc9ef --- /dev/null +++ b/org.mixedrealitytoolkit.theming/Editor/MRTK.Theming.Editor.asmdef.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 16570cd2fc0ec514cb2f350e689eeb09 +AssemblyDefinitionImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/org.mixedrealitytoolkit.theming/Editor/ThemeDataSourceEditor.cs b/org.mixedrealitytoolkit.theming/Editor/ThemeDataSourceEditor.cs new file mode 100644 index 000000000..3e331165b --- /dev/null +++ b/org.mixedrealitytoolkit.theming/Editor/ThemeDataSourceEditor.cs @@ -0,0 +1,66 @@ +// Copyright (c) Mixed Reality Toolkit Contributors +// Licensed under the BSD 3-Clause + +using UnityEditor; + +namespace MixedReality.Toolkit.Theming.Editor +{ + [CustomEditor(typeof(ThemeDataSource), true)] + public class ThemeDataSourceEditor : UnityEditor.Editor + { + private UnityEditor.Editor themeDefinitionEditor = null; + private static bool themeDefinitionFoldout = false; + + protected void OnDisable() + { + if (themeDefinitionEditor != null) + { + DestroyImmediate(themeDefinitionEditor); + themeDefinitionEditor = null; + } + } + + /// + /// Called by the Unity editor to render custom inspector UI for this component. + /// + public override void OnInspectorGUI() + { + serializedObject.Update(); + + SerializedProperty iterator = serializedObject.GetIterator(); + bool enterChildren = true; + + while (iterator.NextVisible(enterChildren)) + { + enterChildren = false; + + EditorGUILayout.PropertyField(iterator, true); + + if (iterator.name == "themeDefinition" && iterator.objectReferenceValue != null) + { + UnityEditor.Editor.CreateCachedEditor(iterator.objectReferenceValue, null, ref themeDefinitionEditor); + + themeDefinitionFoldout = EditorGUILayout.Foldout(themeDefinitionFoldout, "Definition Details", true); + if (themeDefinitionFoldout && themeDefinitionEditor != null) + { + using (new EditorGUI.IndentLevelScope()) + { + themeDefinitionEditor.OnInspectorGUI(); + } + } + } + + if (iterator.name == "activeTheme" && iterator.objectReferenceValue is Theme theme) + { + UnityEngine.Object activeDefinition = serializedObject.FindProperty("themeDefinition")?.objectReferenceValue; + if (theme.Definition != null && theme.Definition != activeDefinition) + { + EditorGUILayout.HelpBox($"Assigned theme's definition ({theme.Definition.name}) does not match this data source's definition ({(activeDefinition != null ? activeDefinition.name : "null")}).\nThis will lead to undefined behavior at runtime.", MessageType.Error); + } + } + } + + serializedObject.ApplyModifiedProperties(); + } + } +} diff --git a/org.mixedrealitytoolkit.theming/Editor/ThemeDataSourceEditor.cs.meta b/org.mixedrealitytoolkit.theming/Editor/ThemeDataSourceEditor.cs.meta new file mode 100644 index 000000000..b1d0a939e --- /dev/null +++ b/org.mixedrealitytoolkit.theming/Editor/ThemeDataSourceEditor.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: c0542958f16458042ab14a7595250755 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/org.mixedrealitytoolkit.theming/Editor/ThemeDefinitionEditor.cs b/org.mixedrealitytoolkit.theming/Editor/ThemeDefinitionEditor.cs new file mode 100644 index 000000000..17a68df4b --- /dev/null +++ b/org.mixedrealitytoolkit.theming/Editor/ThemeDefinitionEditor.cs @@ -0,0 +1,41 @@ +// Copyright (c) Mixed Reality Toolkit Contributors +// Licensed under the BSD 3-Clause + +using UnityEditor; + +namespace MixedReality.Toolkit.Theming.Editor +{ + [CustomEditor(typeof(ThemeDefinition))] + public class ThemeDefinitionEditor : UnityEditor.Editor + { + public override void OnInspectorGUI() + { + serializedObject.Update(); + + DrawDefaultInspector(); + + ThemeDefinition def = target as ThemeDefinition; + if (def != null && def.ThemeDefinitionItems != null) + { + foreach (var item in def.ThemeDefinitionItems) + { + if (item == null) { continue; } + + string displayLabel = string.IsNullOrWhiteSpace(item.Name) ? "(null)" : item.Name; + System.Type type = item.DataType?.Type; + + if (type == null) + { + EditorGUILayout.HelpBox($"Item '{displayLabel}' has no DataType selected, or the type could not be resolved.", MessageType.Warning); + } + else if (type.IsAbstract || type.IsInterface || type.IsGenericTypeDefinition) + { + EditorGUILayout.HelpBox($"Item '{displayLabel}' uses an invalid DataType ({type.Name}). It must be a concrete, non-generic class to be instantiated.", MessageType.Warning); + } + } + } + + serializedObject.ApplyModifiedProperties(); + } + } +} diff --git a/org.mixedrealitytoolkit.theming/Editor/ThemeDefinitionEditor.cs.meta b/org.mixedrealitytoolkit.theming/Editor/ThemeDefinitionEditor.cs.meta new file mode 100644 index 000000000..94b14e254 --- /dev/null +++ b/org.mixedrealitytoolkit.theming/Editor/ThemeDefinitionEditor.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: bd66f2c84c6572b48a8ed4194a8bc818 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/org.mixedrealitytoolkit.theming/Editor/ThemeEditor.cs b/org.mixedrealitytoolkit.theming/Editor/ThemeEditor.cs new file mode 100644 index 000000000..451512b7a --- /dev/null +++ b/org.mixedrealitytoolkit.theming/Editor/ThemeEditor.cs @@ -0,0 +1,187 @@ +// Copyright (c) Mixed Reality Toolkit Contributors +// Licensed under the BSD 3-Clause + +using MixedReality.Toolkit.Editor; +using System; +using UnityEditor; +using UnityEngine; + +namespace MixedReality.Toolkit.Theming.Editor +{ + [CustomEditor(typeof(Theme), true)] + public class ThemeEditor : UnityEditor.Editor + { + private SerializedProperty themeDefinitionProp = null; + private SerializedProperty themeItemsProp = null; + + private static bool itemsFoldout = false; + + private static readonly System.Collections.Generic.HashSet failedTypes = new System.Collections.Generic.HashSet(); + + private string nameField; + private string dataField; + private string valueField; + + static ThemeEditor() + { + AssemblyReloadEvents.afterAssemblyReload += failedTypes.Clear; + } + + protected void OnEnable() + { + themeDefinitionProp = serializedObject.FindProperty("definition"); + themeItemsProp = serializedObject.FindProperty("themeItems"); + + nameField = InspectorUIUtility.GetBackingField(nameof(ThemeDefinition.ThemeDefinitionItem.Name)); + dataField = InspectorUIUtility.GetBackingField(nameof(Theme.ThemeItem.Data)); + valueField = InspectorUIUtility.GetBackingField(nameof(BaseThemeItemData.Value)); + + // Clear the cache when the asset is (re)selected + failedTypes.Clear(); + } + + /// + /// Called by the Unity editor to render custom inspector UI for this component. + /// + public override void OnInspectorGUI() + { + serializedObject.Update(); + + EditorGUILayout.PropertyField(themeDefinitionProp); + + ThemeDefinition themeDefinition = themeDefinitionProp.objectReferenceValue as ThemeDefinition; + + if (themeDefinition != null && themeDefinition.ThemeDefinitionItems != null && themeItemsProp != null) + { + itemsFoldout = EditorGUILayout.Foldout(itemsFoldout, "Theme Values", true); + if (itemsFoldout) + { + if (Event.current.type == EventType.Layout) + { + ReconcileThemeItems(themeDefinition, themeItemsProp); + + // Force the SerializedObject to immediately sync any newly instantiated + // [SerializeReference] payloads so their child properties (like 'Value') + // are fully discoverable during this exact same Layout pass. + serializedObject.ApplyModifiedProperties(); + serializedObject.Update(); + } + + using (new EditorGUI.IndentLevelScope()) + { + for (int i = 0; i < themeItemsProp.arraySize; i++) + { + SerializedProperty themeItemProp = themeItemsProp.GetArrayElementAtIndex(i); + SerializedProperty dataProp = themeItemProp.FindPropertyRelative(dataField); + SerializedProperty valueProp = dataProp?.FindPropertyRelative(valueField); + + string themeItemName = themeItemProp.FindPropertyRelative(nameField).stringValue; + string displayLabel = string.IsNullOrWhiteSpace(themeItemName) ? "(null)" : themeItemName; + + if (valueProp != null) + { + // Draw just the Value field, labeled with the item name, + // skipping the intermediate "Data" foldout entirely. + EditorGUILayout.PropertyField(valueProp, new GUIContent(displayLabel), true); + } + else + { + if (dataProp?.managedReferenceValue == null) + { + if (i < themeDefinition.ThemeDefinitionItems.Length) + { + var definitionItem = themeDefinition.ThemeDefinitionItems[i]; + if (definitionItem.DataType?.Type == null) + { + EditorGUILayout.HelpBox($"'{displayLabel}' has no valid DataType selected in the ThemeDefinition.", MessageType.Warning); + } + else + { + EditorGUILayout.HelpBox($"Failed to initialize data for '{displayLabel}'. Ensure its DataType ({definitionItem.DataType.Type.Name}) is a concrete class with a default constructor.", MessageType.Warning); + } + } + + using (new EditorGUI.DisabledScope(true)) + { + EditorGUILayout.LabelField(displayLabel, "null"); + } + } + else + { + // Fallback for any item whose Data doesn't follow the + // BaseThemeItemData shape. + EditorGUILayout.PropertyField(dataProp, new GUIContent(displayLabel), true); + } + } + } + } + } + } + + serializedObject.ApplyModifiedProperties(); + } + + private void ReconcileThemeItems(ThemeDefinition themeDefinition, SerializedProperty themeItemsProp) + { + var definitionItems = themeDefinition.ThemeDefinitionItems; + for (int i = 0; i < definitionItems.Length; i++) + { + var definitionItem = definitionItems[i]; + if (definitionItem == null) { continue; } + string themeDefinitionItemName = definitionItem.Name; + + SerializedProperty themeItem = themeItemsProp.arraySize > i ? themeItemsProp.GetArrayElementAtIndex(i) : null; + if (themeItem == null + || themeItem.FindPropertyRelative(nameField).stringValue != themeDefinitionItemName) + { + // Search for an existing item with the matching name further in the list, + // so we can move it into position rather than discarding its saved values. + int existingIndex = -1; + for (int j = i + 1; j < themeItemsProp.arraySize; j++) + { + string existingName = themeItemsProp.GetArrayElementAtIndex(j) + .FindPropertyRelative(nameField) + .stringValue; + if (existingName == themeDefinitionItemName) + { + existingIndex = j; + break; + } + } + + if (existingIndex >= 0) + { + // Move the found item up to position i, preserving its saved values. + themeItemsProp.MoveArrayElement(existingIndex, i); + themeItem = themeItemsProp.GetArrayElementAtIndex(i); + } + else + { + // No existing item found — insert a fresh one with default values. + themeItemsProp.InsertArrayElementAtIndex(i); + themeItem = themeItemsProp.GetArrayElementAtIndex(i); + themeItem.managedReferenceValue = new Theme.ThemeItem(themeDefinitionItemName, null); + } + } + + // Unified instantiation and auto-healing for missing or mismatched data types + Type expectedType = definitionItem.DataType?.Type; + SerializedProperty dataProp = themeItem.FindPropertyRelative(dataField); + Type actualType = dataProp?.managedReferenceValue?.GetType(); + + if (dataProp != null && expectedType != null && expectedType != actualType && !failedTypes.Contains(expectedType)) + { + try + { + dataProp.managedReferenceValue = Activator.CreateInstance(expectedType); + } + catch + { + failedTypes.Add(expectedType); + } + } + } + themeItemsProp.arraySize = definitionItems.Length; + } + } +} diff --git a/org.mixedrealitytoolkit.theming/Editor/ThemeEditor.cs.meta b/org.mixedrealitytoolkit.theming/Editor/ThemeEditor.cs.meta new file mode 100644 index 000000000..a3731936c --- /dev/null +++ b/org.mixedrealitytoolkit.theming/Editor/ThemeEditor.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 11a69312bcdb62f4288e591dee20a625 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/org.mixedrealitytoolkit.theming/ItemData.meta b/org.mixedrealitytoolkit.theming/ItemData.meta new file mode 100644 index 000000000..1907237cd --- /dev/null +++ b/org.mixedrealitytoolkit.theming/ItemData.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2cce0cb63cfc327408973b9b78463a4d +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/org.mixedrealitytoolkit.theming/ItemData/BaseThemeItemData.cs b/org.mixedrealitytoolkit.theming/ItemData/BaseThemeItemData.cs new file mode 100644 index 000000000..f44b34f5d --- /dev/null +++ b/org.mixedrealitytoolkit.theming/ItemData/BaseThemeItemData.cs @@ -0,0 +1,13 @@ +// Copyright (c) Mixed Reality Toolkit Contributors +// Licensed under the BSD 3-Clause + +using UnityEngine; + +namespace MixedReality.Toolkit.Theming +{ + public abstract class BaseThemeItemData + { + [field: SerializeField] + public T Value { get; set; } + } +} diff --git a/org.mixedrealitytoolkit.theming/ItemData/BaseThemeItemData.cs.meta b/org.mixedrealitytoolkit.theming/ItemData/BaseThemeItemData.cs.meta new file mode 100644 index 000000000..bbc78b4a8 --- /dev/null +++ b/org.mixedrealitytoolkit.theming/ItemData/BaseThemeItemData.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 61742c507788fd34982b820b87e7da03 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/org.mixedrealitytoolkit.theming/ItemData/BoolItemData.cs b/org.mixedrealitytoolkit.theming/ItemData/BoolItemData.cs new file mode 100644 index 000000000..7a2fb0b5c --- /dev/null +++ b/org.mixedrealitytoolkit.theming/ItemData/BoolItemData.cs @@ -0,0 +1,8 @@ +// Copyright (c) Mixed Reality Toolkit Contributors +// Licensed under the BSD 3-Clause + +namespace MixedReality.Toolkit.Theming +{ + [System.Serializable] + public class BoolItemData : BaseThemeItemData { } +} diff --git a/org.mixedrealitytoolkit.theming/ItemData/BoolItemData.cs.meta b/org.mixedrealitytoolkit.theming/ItemData/BoolItemData.cs.meta new file mode 100644 index 000000000..3848b6cc7 --- /dev/null +++ b/org.mixedrealitytoolkit.theming/ItemData/BoolItemData.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 6eef238277b82de42820e22d387ab78a \ No newline at end of file diff --git a/org.mixedrealitytoolkit.theming/ItemData/ColorThemeItemData.cs b/org.mixedrealitytoolkit.theming/ItemData/ColorThemeItemData.cs new file mode 100644 index 000000000..4fc289559 --- /dev/null +++ b/org.mixedrealitytoolkit.theming/ItemData/ColorThemeItemData.cs @@ -0,0 +1,10 @@ +// Copyright (c) Mixed Reality Toolkit Contributors +// Licensed under the BSD 3-Clause + +using UnityEngine; + +namespace MixedReality.Toolkit.Theming +{ + [System.Serializable] + public class ColorThemeItemData : BaseThemeItemData { } +} diff --git a/org.mixedrealitytoolkit.theming/ItemData/ColorThemeItemData.cs.meta b/org.mixedrealitytoolkit.theming/ItemData/ColorThemeItemData.cs.meta new file mode 100644 index 000000000..29848c306 --- /dev/null +++ b/org.mixedrealitytoolkit.theming/ItemData/ColorThemeItemData.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 5759cf6e2c697a644998df43d99988db +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/org.mixedrealitytoolkit.theming/ItemData/FloatItemData.cs b/org.mixedrealitytoolkit.theming/ItemData/FloatItemData.cs new file mode 100644 index 000000000..1f419646f --- /dev/null +++ b/org.mixedrealitytoolkit.theming/ItemData/FloatItemData.cs @@ -0,0 +1,8 @@ +// Copyright (c) Mixed Reality Toolkit Contributors +// Licensed under the BSD 3-Clause + +namespace MixedReality.Toolkit.Theming +{ + [System.Serializable] + public class FloatItemData : BaseThemeItemData { } +} diff --git a/org.mixedrealitytoolkit.theming/ItemData/FloatItemData.cs.meta b/org.mixedrealitytoolkit.theming/ItemData/FloatItemData.cs.meta new file mode 100644 index 000000000..fc8e41e07 --- /dev/null +++ b/org.mixedrealitytoolkit.theming/ItemData/FloatItemData.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 80ecb1dc22674da4692bfa9e55c8a6a0 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/org.mixedrealitytoolkit.theming/ItemData/FontIconSetItemData.cs b/org.mixedrealitytoolkit.theming/ItemData/FontIconSetItemData.cs new file mode 100644 index 000000000..f83ea8527 --- /dev/null +++ b/org.mixedrealitytoolkit.theming/ItemData/FontIconSetItemData.cs @@ -0,0 +1,8 @@ +// Copyright (c) Mixed Reality Toolkit Contributors +// Licensed under the BSD 3-Clause + +namespace MixedReality.Toolkit.Theming +{ + [System.Serializable] + public class FontIconSetItemData : BaseThemeItemData { } +} diff --git a/org.mixedrealitytoolkit.theming/ItemData/FontIconSetItemData.cs.meta b/org.mixedrealitytoolkit.theming/ItemData/FontIconSetItemData.cs.meta new file mode 100644 index 000000000..62ee5ec1e --- /dev/null +++ b/org.mixedrealitytoolkit.theming/ItemData/FontIconSetItemData.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: cfb1186fc72d3f24d85b73210d22ed5b +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/org.mixedrealitytoolkit.theming/ItemData/MaterialThemeItemData.cs b/org.mixedrealitytoolkit.theming/ItemData/MaterialThemeItemData.cs new file mode 100644 index 000000000..09961cacb --- /dev/null +++ b/org.mixedrealitytoolkit.theming/ItemData/MaterialThemeItemData.cs @@ -0,0 +1,10 @@ +// Copyright (c) Mixed Reality Toolkit Contributors +// Licensed under the BSD 3-Clause + +using UnityEngine; + +namespace MixedReality.Toolkit.Theming +{ + [System.Serializable] + public class MaterialThemeItemData : BaseThemeItemData { } +} diff --git a/org.mixedrealitytoolkit.theming/ItemData/MaterialThemeItemData.cs.meta b/org.mixedrealitytoolkit.theming/ItemData/MaterialThemeItemData.cs.meta new file mode 100644 index 000000000..ce428ff29 --- /dev/null +++ b/org.mixedrealitytoolkit.theming/ItemData/MaterialThemeItemData.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 88c207c8a0256d047bd24a1867ea5825 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/org.mixedrealitytoolkit.theming/ItemData/RectOffsetItemData.cs b/org.mixedrealitytoolkit.theming/ItemData/RectOffsetItemData.cs new file mode 100644 index 000000000..5d91ee98d --- /dev/null +++ b/org.mixedrealitytoolkit.theming/ItemData/RectOffsetItemData.cs @@ -0,0 +1,10 @@ +// Copyright (c) Mixed Reality Toolkit Contributors +// Licensed under the BSD 3-Clause + +using UnityEngine; + +namespace MixedReality.Toolkit.Theming +{ + [System.Serializable] + public class RectOffsetItemData : BaseThemeItemData { } +} diff --git a/org.mixedrealitytoolkit.theming/ItemData/RectOffsetItemData.cs.meta b/org.mixedrealitytoolkit.theming/ItemData/RectOffsetItemData.cs.meta new file mode 100644 index 000000000..613e51664 --- /dev/null +++ b/org.mixedrealitytoolkit.theming/ItemData/RectOffsetItemData.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: dcca02906a2c1ae449af22395741eb86 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/org.mixedrealitytoolkit.theming/ItemData/SpriteThemeItemData.cs b/org.mixedrealitytoolkit.theming/ItemData/SpriteThemeItemData.cs new file mode 100644 index 000000000..9cc88ebb3 --- /dev/null +++ b/org.mixedrealitytoolkit.theming/ItemData/SpriteThemeItemData.cs @@ -0,0 +1,10 @@ +// Copyright (c) Mixed Reality Toolkit Contributors +// Licensed under the BSD 3-Clause + +using UnityEngine; + +namespace MixedReality.Toolkit.Theming +{ + [System.Serializable] + public class SpriteThemeItemData : BaseThemeItemData { } +} diff --git a/org.mixedrealitytoolkit.theming/ItemData/SpriteThemeItemData.cs.meta b/org.mixedrealitytoolkit.theming/ItemData/SpriteThemeItemData.cs.meta new file mode 100644 index 000000000..0e55b1d6c --- /dev/null +++ b/org.mixedrealitytoolkit.theming/ItemData/SpriteThemeItemData.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 27d6dc828636c2c4eb5a6b7e6dbfd8c7 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/org.mixedrealitytoolkit.theming/ItemData/TMP_FontAssetThemeItemData.cs b/org.mixedrealitytoolkit.theming/ItemData/TMP_FontAssetThemeItemData.cs new file mode 100644 index 000000000..461eb24ee --- /dev/null +++ b/org.mixedrealitytoolkit.theming/ItemData/TMP_FontAssetThemeItemData.cs @@ -0,0 +1,10 @@ +// Copyright (c) Mixed Reality Toolkit Contributors +// Licensed under the BSD 3-Clause + +using TMPro; + +namespace MixedReality.Toolkit.Theming +{ + [System.Serializable] + public class TMP_FontAssetThemeItemData : BaseThemeItemData { } +} diff --git a/org.mixedrealitytoolkit.theming/ItemData/TMP_FontAssetThemeItemData.cs.meta b/org.mixedrealitytoolkit.theming/ItemData/TMP_FontAssetThemeItemData.cs.meta new file mode 100644 index 000000000..40a28d6dd --- /dev/null +++ b/org.mixedrealitytoolkit.theming/ItemData/TMP_FontAssetThemeItemData.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 170a5653632decb4f85bd4e064ea893b +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/org.mixedrealitytoolkit.theming/ItemData/Vector3ItemData.cs b/org.mixedrealitytoolkit.theming/ItemData/Vector3ItemData.cs new file mode 100644 index 000000000..dfdaf84ce --- /dev/null +++ b/org.mixedrealitytoolkit.theming/ItemData/Vector3ItemData.cs @@ -0,0 +1,10 @@ +// Copyright (c) Mixed Reality Toolkit Contributors +// Licensed under the BSD 3-Clause + +using UnityEngine; + +namespace MixedReality.Toolkit.Theming +{ + [System.Serializable] + public class Vector3ItemData : BaseThemeItemData { } +} diff --git a/org.mixedrealitytoolkit.theming/ItemData/Vector3ItemData.cs.meta b/org.mixedrealitytoolkit.theming/ItemData/Vector3ItemData.cs.meta new file mode 100644 index 000000000..71e6ebdee --- /dev/null +++ b/org.mixedrealitytoolkit.theming/ItemData/Vector3ItemData.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 3418308499e06d045a124a4e446540c8 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/org.mixedrealitytoolkit.theming/LICENSE.md b/org.mixedrealitytoolkit.theming/LICENSE.md new file mode 100644 index 000000000..426390d68 --- /dev/null +++ b/org.mixedrealitytoolkit.theming/LICENSE.md @@ -0,0 +1,28 @@ +BSD 3-Clause License + +Copyright (c) 2026, Mixed Reality Toolkit Contributors + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +1. Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + +2. Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + +3. Neither the name of the copyright holder nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/org.mixedrealitytoolkit.theming/LICENSE.md.meta b/org.mixedrealitytoolkit.theming/LICENSE.md.meta new file mode 100644 index 000000000..cac902fe9 --- /dev/null +++ b/org.mixedrealitytoolkit.theming/LICENSE.md.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 1d1d898d173981e4ca6ff00eedb11863 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/org.mixedrealitytoolkit.theming/MRTK.Theming.asmdef b/org.mixedrealitytoolkit.theming/MRTK.Theming.asmdef new file mode 100644 index 000000000..0433b9dfa --- /dev/null +++ b/org.mixedrealitytoolkit.theming/MRTK.Theming.asmdef @@ -0,0 +1,19 @@ +{ + "name": "MixedReality.Toolkit.Theming", + "rootNamespace": "MixedReality.Toolkit.Theming", + "references": [ + "GUID:22213891bfe50254781c448a2277a9a5", + "GUID:56255bd5d851a6243b63cb370cfc40b1", + "GUID:9a9367d437335a947a847011f5575869", + "GUID:6055be8ebefd69e48b49212b09b47b2f" + ], + "includePlatforms": [], + "excludePlatforms": [], + "allowUnsafeCode": false, + "overrideReferences": false, + "precompiledReferences": [], + "autoReferenced": true, + "defineConstraints": [], + "versionDefines": [], + "noEngineReferences": false +} \ No newline at end of file diff --git a/org.mixedrealitytoolkit.theming/MRTK.Theming.asmdef.meta b/org.mixedrealitytoolkit.theming/MRTK.Theming.asmdef.meta new file mode 100644 index 000000000..7f0d40bd4 --- /dev/null +++ b/org.mixedrealitytoolkit.theming/MRTK.Theming.asmdef.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 2238d58cada9b6746a548c6bff32c381 +AssemblyDefinitionImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/org.mixedrealitytoolkit.theming/README.md b/org.mixedrealitytoolkit.theming/README.md new file mode 100644 index 000000000..e4884ca00 --- /dev/null +++ b/org.mixedrealitytoolkit.theming/README.md @@ -0,0 +1,145 @@ +# MRTK UX Theming + +## Overview + +MRTK Theming 3.0 is a lightweight data-binding system that routes named values from a theme asset to components in the scene. Switching the active theme on a `ThemeDataSource` instantly updates every bound component across all scenes and prefabs that reference it. + +The system has three layers: + +| Layer | Asset / Component | Purpose | +|---|---|---| +| **Schema** | `ThemeDefinition` (ScriptableObject) | Declares what named items exist and what type each one is | +| **State** | `ThemeDataSource` (ScriptableObject) | The single source of truth for the currently active theme | +| **Values** | `Theme` (ScriptableObject) | Provides a concrete value for every item in the definition | +| **Binding** | `ThemeBinding` (MonoBehaviour) + binders | Connects a theme item to a specific component on a GameObject | + +> [!NOTE] +> `ThemeBinding` exists in the UX Core package for cross-package compatibility. + +--- + +## Theme data source + +A `ThemeDataSource` ScriptableObject is the single source of truth for which theme is currently active. Create one per logical theme domain (e.g. one for the whole app, or one per scene). + +![ThemeDataSource](./Documentation~/Images/ThemeDataSource.png) + +The `ThemeDataSource` holds: + +- **`activeTheme`** — the currently applied `Theme` asset. +- **`themeDefinition`** — the `ThemeDefinition` asset (schema) that all compatible themes must conform to. + +To switch themes at runtime, assign a new `Theme` to `themeDataSource.value`. Every `ThemeBinding` component subscribed to that source will immediately receive and apply the new values. + +### Theme definition + +A `ThemeDefinition` ScriptableObject is a list of named items, each with a declared data type. It acts as the contract between the `ThemeDataSource` and all `Theme` assets that reference it — every `Theme` must provide a value for every item in the definition. + +Each item has: + +- **Name** — a string key used to match binders to values at runtime (e.g. `"Primary Color"`, `"Backplate Material"`). +- **Data type** — a concrete subclass of `BaseThemeItemData` (e.g. `ColorThemeItemData`, `MaterialThemeItemData`). + +![ColorThemeItemData](./Documentation~/Images/ColorThemeItemData.png) + +--- + +## Theme + +A `Theme` ScriptableObject is assigned to a `ThemeDataSource` and provides a concrete value for every item declared in its referenced `ThemeDefinition` schema. + +![TextColorMapping](./Documentation~/Images/TextColorMapping.png) + +The `Theme` inspector automatically displays one field per definition item, typed correctly. Themes are **complete** — every item in the definition must have a value. This ensures that switching themes always fully overwrites every bound property, with no leftover values from a previous theme. + +--- + +## Theme binding + +The `ThemeBinding` MonoBehaviour connects a `ThemeDataSource` to one or more components on the same GameObject (or its children). Add it to any GameObject that should respond to theme changes. + +![ThemeBindingThemeSource](./Documentation~/Images/ThemeBindingThemeSource.png) + +`ThemeBinding` holds: + +- **`themeDataSource`** — the source to subscribe to. +- **`binders`** — a list of `IBinder` implementations, each connecting one theme item to one component. + +On `OnEnable`, each binder subscribes to the data source and immediately receives the current theme. On `OnDisable`, binders unsubscribe. + +![ThemeBinding](./Documentation~/Images/ThemeBinding.png) + +### Theme binders + +A theme binder connects a named theme item to a specific component property. Each binder has: + +- **Target** — the component to update (e.g. a `Graphic`, `Transform`, `Renderer`). +- **Bound Theme Item** — the name of the item in the `ThemeDefinition` to read from. + +When the active theme changes, the binder looks up its named item in the new theme and calls `Apply` with the value. + +#### Built-in binders + +| Binder | Data type | Target | Sets | +|---|---|---|---| +| `GraphicColorBinder` | `Color` | `Graphic` | `Graphic.color` | +| `GraphicMaterialBinder` | `Material` | `Graphic` | `Graphic.material` | +| `RendererMaterialBinder` | `Material` | `Renderer` | `Renderer.material` | +| `TMP_TextFontAssetBinder` | `TMP_FontAsset` | `TMP_Text` | Font asset | +| `ImageSpriteBinder` | `Sprite` | `Image` | `Image.sprite` | +| `SpriteRendererSpriteBinder` | `Sprite` | `SpriteRenderer` | `SpriteRenderer.sprite` | +| `SpriteRendererColorBinder` | `Color` | `SpriteRenderer` | `SpriteRenderer.color` | +| `TransformLocalScaleBinder` | `Vector3` | `Transform` | `Transform.localScale` | +| `LayoutGroupPaddingBinder` | `RectOffset` | `HorizontalOrVerticalLayoutGroup` | Padding | +| `RoundedRectMask2DRadiusBinder` | `float` | `RoundedRectMask2D` | Corner radius | +| `FontIconSetBinder` | `FontIconSetData` | `FontIconSetBinding` | Font + icon set | +| `BehaviourEnabledBinder` | `bool` | `Behaviour` | `Behaviour.enabled` | +| `SkyboxMaterialBinder` | `Material` | `Skybox` | `Skybox.material` | +| `StateVisualizerEffectColorBinder` | `Color` | `StateVisualizer` | Tint effect color per state | + +--- + +## Extending the system + +### Creating a new theme item data type + +Subclass `BaseThemeItemData` with the desired value type and mark it `[Serializable]`: + +```csharp +[Serializable] +public class FloatItemData : BaseThemeItemData { } +``` + +The new type will automatically appear in the `ThemeDefinition` item type dropdown in the Inspector. + +### Creating a new binder + +Subclass `BaseThemeBinder` where `T` is the value type and `K` is the target component type. Mark it `[Serializable]` and implement `Apply`: + +```csharp +[Serializable] +public class MyCustomBinder : BaseThemeBinder +{ + protected override void Apply(BaseThemeItemData themeItemData) + { + if (Target != null) + { + Target.MyColorProperty = themeItemData.Value; + } + } +} +``` + +The new binder will automatically appear in the `ThemeBinding` binder type dropdown in the Inspector, and the **Bound Theme Item** dropdown will show only the definition items whose data type is compatible with `T`. + +--- + +## How theme switching works at runtime + +1. `themeDataSource.value = newTheme` is called. +2. `ThemeDataSource` fires a `ChangeEvent` to all listeners. +3. Each `ThemeBinding` component's binders receive the event via `OnThemeChanged`. +4. Each binder calls `Theme.TryGetItemData(ThemeDefinitionItemName, ...)` to look up its value. +5. If found, `Apply` is called with the new value. If not found, a warning is logged. + +Because themes are complete (every definition item has a value in every theme), every bound property is always overwritten on a theme switch — there are no partial updates or leftover values from a previous theme. diff --git a/org.mixedrealitytoolkit.uxcore/LegacyDialog/README.md.meta b/org.mixedrealitytoolkit.theming/README.md.meta similarity index 75% rename from org.mixedrealitytoolkit.uxcore/LegacyDialog/README.md.meta rename to org.mixedrealitytoolkit.theming/README.md.meta index 990fa1006..ebb7518d9 100644 --- a/org.mixedrealitytoolkit.uxcore/LegacyDialog/README.md.meta +++ b/org.mixedrealitytoolkit.theming/README.md.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 801e42c1927f7b3419ee02c0cf56eeb6 +guid: 700ac8701616d044d882395e52a8cbee TextScriptImporter: externalObjects: {} userData: diff --git a/org.mixedrealitytoolkit.theming/Theming.meta b/org.mixedrealitytoolkit.theming/Theming.meta new file mode 100644 index 000000000..7a0608b8b --- /dev/null +++ b/org.mixedrealitytoolkit.theming/Theming.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 95d454a1ae204534abca1c45248ba018 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/org.mixedrealitytoolkit.theming/Theming/FontIconSetMap.cs b/org.mixedrealitytoolkit.theming/Theming/FontIconSetMap.cs new file mode 100644 index 000000000..4a54a8385 --- /dev/null +++ b/org.mixedrealitytoolkit.theming/Theming/FontIconSetMap.cs @@ -0,0 +1,18 @@ +// Copyright (c) Mixed Reality Toolkit Contributors +// Licensed under the BSD 3-Clause + +using MixedReality.Toolkit.UX; +using UnityEngine; + +namespace MixedReality.Toolkit.Theming +{ + [CreateAssetMenu(fileName = "MRTK_Theming_FontIconSetMap_New", menuName = "MRTK/Theming/Font Icon Set Map")] + public class FontIconSetMap : ScriptableObject + { + [SerializeField] + private FontIconSetDefinition setDefinition; + + [SerializeField] + private FontIconSet[] fontIconSets; + } +} diff --git a/org.mixedrealitytoolkit.theming/Theming/FontIconSetMap.cs.meta b/org.mixedrealitytoolkit.theming/Theming/FontIconSetMap.cs.meta new file mode 100644 index 000000000..1d1c72e57 --- /dev/null +++ b/org.mixedrealitytoolkit.theming/Theming/FontIconSetMap.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 2a49c8c479a4ab64fa9d1ac42bf347e4 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/org.mixedrealitytoolkit.theming/Theming/MRTK_Theming_DataSource.asset b/org.mixedrealitytoolkit.theming/Theming/MRTK_Theming_DataSource.asset new file mode 100644 index 000000000..cc107dec7 --- /dev/null +++ b/org.mixedrealitytoolkit.theming/Theming/MRTK_Theming_DataSource.asset @@ -0,0 +1,19 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3f1a7927806b6cc45a1ef33fc3f04465, type: 3} + m_Name: MRTK_Theming_DataSource + m_EditorClassIdentifier: + activeTheme: {fileID: 0} + onThemeChanged: + m_PersistentCalls: + m_Calls: [] + themeDefinition: {fileID: 11400000, guid: da6ba53b6d024604bbff6fa870ff4e4e, type: 2} diff --git a/org.mixedrealitytoolkit.theming/Theming/MRTK_Theming_DataSource.asset.meta b/org.mixedrealitytoolkit.theming/Theming/MRTK_Theming_DataSource.asset.meta new file mode 100644 index 000000000..d8e4b4f75 --- /dev/null +++ b/org.mixedrealitytoolkit.theming/Theming/MRTK_Theming_DataSource.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 57993c46ea42acf4ca3067542443bc45 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/org.mixedrealitytoolkit.theming/Theming/MRTK_Theming_DefaultDefinition.asset b/org.mixedrealitytoolkit.theming/Theming/MRTK_Theming_DefaultDefinition.asset new file mode 100644 index 000000000..c69554af0 --- /dev/null +++ b/org.mixedrealitytoolkit.theming/Theming/MRTK_Theming_DefaultDefinition.asset @@ -0,0 +1,105 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3b6e110c23f5e404dbbfdc87cb47ff23, type: 3} + m_Name: MRTK_Theming_DefaultDefinition + m_EditorClassIdentifier: + k__BackingField: + - k__BackingField: Backplate Material + k__BackingField: + reference: MixedReality.Toolkit.Theming.MaterialThemeItemData, MixedReality.Toolkit.Theming + - k__BackingField: Non-Canvas Backplate (8mm) Material + k__BackingField: + reference: MixedReality.Toolkit.Theming.MaterialThemeItemData, MixedReality.Toolkit.Theming + - k__BackingField: Non-Canvas Backplate (10mm) Material + k__BackingField: + reference: MixedReality.Toolkit.Theming.MaterialThemeItemData, MixedReality.Toolkit.Theming + - k__BackingField: Non-Canvas Backplate (13mm) Material + k__BackingField: + reference: MixedReality.Toolkit.Theming.MaterialThemeItemData, MixedReality.Toolkit.Theming + - k__BackingField: Text Font + k__BackingField: + reference: MixedReality.Toolkit.Theming.TMP_FontAssetThemeItemData, MixedReality.Toolkit.Theming + - k__BackingField: Icon Set + k__BackingField: + reference: MixedReality.Toolkit.Theming.FontIconSetItemData, MixedReality.Toolkit.Theming + - k__BackingField: MRTK Logo + k__BackingField: + reference: MixedReality.Toolkit.Theming.SpriteThemeItemData, MixedReality.Toolkit.Theming + - k__BackingField: Canvas Backplate Quad Material + k__BackingField: + reference: MixedReality.Toolkit.Theming.MaterialThemeItemData, MixedReality.Toolkit.Theming + - k__BackingField: Panel Group Padding + k__BackingField: + reference: MixedReality.Toolkit.Theming.RectOffsetItemData, MixedReality.Toolkit.Theming + - k__BackingField: Button Corner Radius + k__BackingField: + reference: MixedReality.Toolkit.Theming.FloatItemData, MixedReality.Toolkit.Theming + - k__BackingField: Tab Indicator Material + k__BackingField: + reference: MixedReality.Toolkit.Theming.MaterialThemeItemData, MixedReality.Toolkit.Theming + - k__BackingField: Horizontal Tab Indicator Scale + k__BackingField: + reference: MixedReality.Toolkit.Theming.Vector3ItemData, MixedReality.Toolkit.Theming + - k__BackingField: Primary Color + k__BackingField: + reference: MixedReality.Toolkit.Theming.ColorThemeItemData, MixedReality.Toolkit.Theming + - k__BackingField: On Primary Color + k__BackingField: + reference: MixedReality.Toolkit.Theming.ColorThemeItemData, MixedReality.Toolkit.Theming + - k__BackingField: Primary Container Color + k__BackingField: + reference: MixedReality.Toolkit.Theming.ColorThemeItemData, MixedReality.Toolkit.Theming + - k__BackingField: On Primary Container Color + k__BackingField: + reference: MixedReality.Toolkit.Theming.ColorThemeItemData, MixedReality.Toolkit.Theming + - k__BackingField: Secondary Color + k__BackingField: + reference: MixedReality.Toolkit.Theming.ColorThemeItemData, MixedReality.Toolkit.Theming + - k__BackingField: On Secondary Color + k__BackingField: + reference: MixedReality.Toolkit.Theming.ColorThemeItemData, MixedReality.Toolkit.Theming + - k__BackingField: Secondary Container Color + k__BackingField: + reference: MixedReality.Toolkit.Theming.ColorThemeItemData, MixedReality.Toolkit.Theming + - k__BackingField: On Secondary Container Color + k__BackingField: + reference: MixedReality.Toolkit.Theming.ColorThemeItemData, MixedReality.Toolkit.Theming + - k__BackingField: Tertiary Color + k__BackingField: + reference: MixedReality.Toolkit.Theming.ColorThemeItemData, MixedReality.Toolkit.Theming + - k__BackingField: On Tertiary Color + k__BackingField: + reference: MixedReality.Toolkit.Theming.ColorThemeItemData, MixedReality.Toolkit.Theming + - k__BackingField: Tertiary Container Color + k__BackingField: + reference: MixedReality.Toolkit.Theming.ColorThemeItemData, MixedReality.Toolkit.Theming + - k__BackingField: On Tertiary Container Color + k__BackingField: + reference: MixedReality.Toolkit.Theming.ColorThemeItemData, MixedReality.Toolkit.Theming + - k__BackingField: Surface Color + k__BackingField: + reference: MixedReality.Toolkit.Theming.ColorThemeItemData, MixedReality.Toolkit.Theming + - k__BackingField: On Surface Color + k__BackingField: + reference: MixedReality.Toolkit.Theming.ColorThemeItemData, MixedReality.Toolkit.Theming + - k__BackingField: Surface Container Color + k__BackingField: + reference: MixedReality.Toolkit.Theming.ColorThemeItemData, MixedReality.Toolkit.Theming + - k__BackingField: Skybox + k__BackingField: + reference: MixedReality.Toolkit.Theming.MaterialThemeItemData, MixedReality.Toolkit.Theming + - k__BackingField: Enable Shared List Backplate + k__BackingField: + reference: MixedReality.Toolkit.Theming.BoolItemData, MixedReality.Toolkit.Theming + - k__BackingField: Enable Button Select Pulse + k__BackingField: + reference: MixedReality.Toolkit.Theming.BoolItemData, MixedReality.Toolkit.Theming diff --git a/org.mixedrealitytoolkit.theming/Theming/MRTK_Theming_DefaultDefinition.asset.meta b/org.mixedrealitytoolkit.theming/Theming/MRTK_Theming_DefaultDefinition.asset.meta new file mode 100644 index 000000000..fc09641d3 --- /dev/null +++ b/org.mixedrealitytoolkit.theming/Theming/MRTK_Theming_DefaultDefinition.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: da6ba53b6d024604bbff6fa870ff4e4e +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/org.mixedrealitytoolkit.theming/Theming/MRTK_Theming_FontIconSetMap.asset b/org.mixedrealitytoolkit.theming/Theming/MRTK_Theming_FontIconSetMap.asset new file mode 100644 index 000000000..21c5f4828 --- /dev/null +++ b/org.mixedrealitytoolkit.theming/Theming/MRTK_Theming_FontIconSetMap.asset @@ -0,0 +1,18 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2a49c8c479a4ab64fa9d1ac42bf347e4, type: 3} + m_Name: MRTK_Theming_FontIconSetMap + m_EditorClassIdentifier: + setDefinition: {fileID: 11400000, guid: e63daff880b56ed439a2e852b6e6993a, type: 2} + fontIconSets: + - {fileID: 11400000, guid: b490f983baa13694cb7e5ecc6bd0dae3, type: 2} + - {fileID: 11400000, guid: 98fec9bd136c93c44ba1f6f1bd5f38b5, type: 2} diff --git a/org.mixedrealitytoolkit.theming/Theming/MRTK_Theming_FontIconSetMap.asset.meta b/org.mixedrealitytoolkit.theming/Theming/MRTK_Theming_FontIconSetMap.asset.meta new file mode 100644 index 000000000..477da27e2 --- /dev/null +++ b/org.mixedrealitytoolkit.theming/Theming/MRTK_Theming_FontIconSetMap.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 596e56f5586db9b4098cd33d94c7fb72 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/org.mixedrealitytoolkit.theming/Theming/Theme.cs b/org.mixedrealitytoolkit.theming/Theming/Theme.cs new file mode 100644 index 000000000..f369fcd3f --- /dev/null +++ b/org.mixedrealitytoolkit.theming/Theming/Theme.cs @@ -0,0 +1,79 @@ +// Copyright (c) Mixed Reality Toolkit Contributors +// Licensed under the BSD 3-Clause + +using System; +using System.Collections.Generic; +using UnityEngine; + +namespace MixedReality.Toolkit.Theming +{ + /// + /// A ScriptableObject that provides concrete values for every item declared in a 's definition. + /// + [CreateAssetMenu(fileName = "Theme", menuName = "MRTK/Theming/Theme", order = 0)] + public class Theme : ScriptableObject + { + [SerializeField] + [Tooltip("The schema that this theme conforms to. Every theme item must map to an item defined here.")] + private ThemeDefinition definition; + + /// + /// The schema that this theme conforms to. Every theme item must map to an item defined here. + /// + public ThemeDefinition Definition => definition; + + [SerializeReference] + [Tooltip("The items defining this theme's data mapped to the definition's items.")] + private List themeItems = new List(); + + /// + /// Attempts to retrieve the data for a specific theme item by its name and expected type. + /// + /// The expected type of the theme item data (e.g., ). + /// The name of the theme item as defined in the theme definition. + /// When this method returns, contains the item data if found, or the default value otherwise. + /// if an item with the specified name and type is found; otherwise, . + public bool TryGetItemData(string itemName, out T itemValue) + { + if (themeItems != null) + { + foreach (var themeItem in themeItems) + { + if (themeItem != null && themeItem.Name == itemName && themeItem.Data is T themeItemData) + { + itemValue = themeItemData; + return true; + } + } + } + + itemValue = default; + return false; + } + + /// + /// Represents a single named entry in a theme containing a data payload. + /// + [Serializable] + internal class ThemeItem + { + /// + /// The name of the theme item. + /// + [field: SerializeField, HideInInspector] + public string Name { get; private set; } + + /// + /// The underlying data value for this theme item. + /// + [field: SerializeReference] + public object Data { get; private set; } + + public ThemeItem(string name, object data) + { + Name = name; + Data = data; + } + } + } +} diff --git a/org.mixedrealitytoolkit.theming/Theming/Theme.cs.meta b/org.mixedrealitytoolkit.theming/Theming/Theme.cs.meta new file mode 100644 index 000000000..c91085e14 --- /dev/null +++ b/org.mixedrealitytoolkit.theming/Theming/Theme.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 9530d537087fef24eb7a177accd13c7d +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/org.mixedrealitytoolkit.theming/Theming/ThemeDataSource.cs b/org.mixedrealitytoolkit.theming/Theming/ThemeDataSource.cs new file mode 100644 index 000000000..e99ec94f4 --- /dev/null +++ b/org.mixedrealitytoolkit.theming/Theming/ThemeDataSource.cs @@ -0,0 +1,71 @@ +// Copyright (c) Mixed Reality Toolkit Contributors +// Licensed under the BSD 3-Clause + +using UnityEngine; +using UnityEngine.Events; +using UnityEngine.UIElements; + +namespace MixedReality.Toolkit.Theming +{ + [CreateAssetMenu(fileName = "Theme Data Source", menuName = "MRTK/Theming/Theme Data Source", order = 0)] + public class ThemeDataSource : ScriptableObject, INotifyValueChanged + { + [SerializeField] + private Theme activeTheme; + + [SerializeField] + private UnityEvent> onThemeChanged = new(); + + [SerializeField] + private ThemeDefinition themeDefinition; + + public ThemeDefinition Definition => themeDefinition; + + #region INotifyValueChanged + + /// + public Theme value + { + get => activeTheme; + set + { + if (value != null && value.Definition != null && value.Definition != themeDefinition) + { + Debug.LogError($"New theme's definition ({value.Definition.name}) does not match this data source's definition ({(themeDefinition != null ? themeDefinition.name : "null")})"); + } + + using (ChangeEvent changeEvent = ChangeEvent.GetPooled(activeTheme, value)) + { + // target is intentionally unset, as ThemeDataSource is not a UIElements visual + // element, but ChangeEvent is used for its newValue/previousValue semantics + // and object pooling + SetValueWithoutNotify(value); + onThemeChanged.Invoke(changeEvent); + } + } + } + + /// + public void SetValueWithoutNotify(Theme newValue) + { + activeTheme = newValue; + } + + #endregion INotifyValueChanged + + public void AddListener(UnityAction> action) + { + if (action == null) { return; } + onThemeChanged.AddListener(action); + if (activeTheme == null) { return; } + using ChangeEvent changeEvent = ChangeEvent.GetPooled(null, activeTheme); + action.Invoke(changeEvent); + } + + public void RemoveListener(UnityAction> action) + { + if (action == null) { return; } + onThemeChanged.RemoveListener(action); + } + } +} diff --git a/org.mixedrealitytoolkit.theming/Theming/ThemeDataSource.cs.meta b/org.mixedrealitytoolkit.theming/Theming/ThemeDataSource.cs.meta new file mode 100644 index 000000000..381858223 --- /dev/null +++ b/org.mixedrealitytoolkit.theming/Theming/ThemeDataSource.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 3f1a7927806b6cc45a1ef33fc3f04465 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/org.mixedrealitytoolkit.theming/Theming/ThemeDefinition.cs b/org.mixedrealitytoolkit.theming/Theming/ThemeDefinition.cs new file mode 100644 index 000000000..037ec997f --- /dev/null +++ b/org.mixedrealitytoolkit.theming/Theming/ThemeDefinition.cs @@ -0,0 +1,26 @@ +// Copyright (c) Mixed Reality Toolkit Contributors +// Licensed under the BSD 3-Clause + +using System; +using UnityEngine; + +namespace MixedReality.Toolkit.Theming +{ + [CreateAssetMenu(fileName = "Theme Definition", menuName = "MRTK/Theming/Theme Definition", order = 1)] + public class ThemeDefinition : ScriptableObject + { + [field: SerializeField] + [Tooltip("The items defining the theme that can be bound to this source.")] + public ThemeDefinitionItem[] ThemeDefinitionItems { get; private set; } + + [Serializable] + public class ThemeDefinitionItem + { + [field: SerializeField] + public string Name { get; set; } + + [field: SerializeField, Extends(typeof(BaseThemeItemData<>), TypeGrouping.ByNamespaceFlat, AllowGenericTypeDefinition = true)] + public SystemType DataType { get; set; } + } + } +} diff --git a/org.mixedrealitytoolkit.theming/Theming/ThemeDefinition.cs.meta b/org.mixedrealitytoolkit.theming/Theming/ThemeDefinition.cs.meta new file mode 100644 index 000000000..b9634812c --- /dev/null +++ b/org.mixedrealitytoolkit.theming/Theming/ThemeDefinition.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 3b6e110c23f5e404dbbfdc87cb47ff23 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/org.mixedrealitytoolkit.theming/package.json b/org.mixedrealitytoolkit.theming/package.json new file mode 100644 index 000000000..0ee19c34c --- /dev/null +++ b/org.mixedrealitytoolkit.theming/package.json @@ -0,0 +1,24 @@ +{ + "name": "org.mixedrealitytoolkit.theming", + "version": "1.0.0-development.pre.2", + "description": "Core theming scripts for building MR UI components. Intended to be consumed when building UX libraries. For pre-existing library of components, see the UX Components package.", + "displayName": "MRTK UX Theming", + "author": "Mixed Reality Toolkit Contributors", + "license": "BSD 3-Clause", + "repository": { + "type": "git", + "url": "https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity.git" + }, + "bugs": { + "url": "https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/issues" + }, + "unity": "6000.0", + "unityRelease": "66f2", + "documentationUrl": "https://www.mixedrealitytoolkit.org", + "dependencies": { + "com.microsoft.mrtk.graphicstools.unity": "0.8.0", + "org.mixedrealitytoolkit.core": "4.0.0", + "org.mixedrealitytoolkit.uxcore": "4.0.0", + "com.unity.textmeshpro": "3.0.6" + } +} \ No newline at end of file diff --git a/org.mixedrealitytoolkit.theming/package.json.meta b/org.mixedrealitytoolkit.theming/package.json.meta new file mode 100644 index 000000000..4e1a918b6 --- /dev/null +++ b/org.mixedrealitytoolkit.theming/package.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: e0eea43c3b742dc4291ba8492ff3435a +PackageManifestImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/org.mixedrealitytoolkit.uxcomponents.noncanvas/AssemblyInfo.cs b/org.mixedrealitytoolkit.uxcomponents.noncanvas/AssemblyInfo.cs index a1321845c..dac89b477 100644 --- a/org.mixedrealitytoolkit.uxcomponents.noncanvas/AssemblyInfo.cs +++ b/org.mixedrealitytoolkit.uxcomponents.noncanvas/AssemblyInfo.cs @@ -12,4 +12,4 @@ // The AssemblyVersion attribute is checked-in and is recommended not to be changed often. // https://docs.microsoft.com/troubleshoot/visualstudio/general/assembly-version-assembly-file-version // AssemblyFileVersion and AssemblyInformationalVersion are added by pack-upm.ps1 to match the current MRTK build version. -[assembly: AssemblyVersion("3.0.0.0")] +[assembly: AssemblyVersion("4.0.0.0")] diff --git a/org.mixedrealitytoolkit.uxcomponents.noncanvas/Button/128x32/PressableButton_128x32mm_IconAndText_L.prefab b/org.mixedrealitytoolkit.uxcomponents.noncanvas/Button/128x32/PressableButton_128x32mm_IconAndText_L.prefab index 772d8cf60..59eb131a5 100644 --- a/org.mixedrealitytoolkit.uxcomponents.noncanvas/Button/128x32/PressableButton_128x32mm_IconAndText_L.prefab +++ b/org.mixedrealitytoolkit.uxcomponents.noncanvas/Button/128x32/PressableButton_128x32mm_IconAndText_L.prefab @@ -5,6 +5,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 1494106019810454970, guid: 72dfeb9ecf5ad884b87eff8bc5b49276, type: 3} @@ -43,10 +44,6 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 8829903862454882072, guid: 72dfeb9ecf5ad884b87eff8bc5b49276, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - target: {fileID: 8829903862454882072, guid: 72dfeb9ecf5ad884b87eff8bc5b49276, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -103,6 +100,8 @@ PrefabInstance: propertyPath: m_AnchoredPosition.x value: 0.00954 objectReference: {fileID: 0} - m_RemovedComponents: - - {fileID: 2981563222846597991, guid: 72dfeb9ecf5ad884b87eff8bc5b49276, type: 3} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 72dfeb9ecf5ad884b87eff8bc5b49276, type: 3} diff --git a/org.mixedrealitytoolkit.uxcomponents.noncanvas/Button/128x32/PressableButton_128x32mm_IconAndText_R.prefab b/org.mixedrealitytoolkit.uxcomponents.noncanvas/Button/128x32/PressableButton_128x32mm_IconAndText_R.prefab index e1f11a238..cec007aff 100644 --- a/org.mixedrealitytoolkit.uxcomponents.noncanvas/Button/128x32/PressableButton_128x32mm_IconAndText_R.prefab +++ b/org.mixedrealitytoolkit.uxcomponents.noncanvas/Button/128x32/PressableButton_128x32mm_IconAndText_R.prefab @@ -5,6 +5,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 1969163422732972035, guid: 72dfeb9ecf5ad884b87eff8bc5b49276, type: 3} @@ -31,10 +32,6 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 8829903862454882072, guid: 72dfeb9ecf5ad884b87eff8bc5b49276, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - target: {fileID: 8829903862454882072, guid: 72dfeb9ecf5ad884b87eff8bc5b49276, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -92,4 +89,7 @@ PrefabInstance: value: -0.00928 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 72dfeb9ecf5ad884b87eff8bc5b49276, type: 3} diff --git a/org.mixedrealitytoolkit.uxcomponents.noncanvas/Button/128x32/PressableButton_128x32mm_PersonAndText.prefab b/org.mixedrealitytoolkit.uxcomponents.noncanvas/Button/128x32/PressableButton_128x32mm_PersonAndText.prefab index e1343b6ca..cfea7ea2c 100644 --- a/org.mixedrealitytoolkit.uxcomponents.noncanvas/Button/128x32/PressableButton_128x32mm_PersonAndText.prefab +++ b/org.mixedrealitytoolkit.uxcomponents.noncanvas/Button/128x32/PressableButton_128x32mm_PersonAndText.prefab @@ -23,6 +23,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4912994083753280318} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0.048, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -31,7 +32,6 @@ Transform: - {fileID: 411343838116714667} - {fileID: 4907459964619627130} m_Father: {fileID: 4407735199717223959} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &5313832380967302489 GameObject: @@ -59,13 +59,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5313832380967302489} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.02, y: 0.02, z: 0.02} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1268481309119342633} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &3084448489427758450 MeshFilter: @@ -92,6 +92,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -125,9 +128,17 @@ MeshCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5313832380967302489} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 0 - serializedVersion: 4 + serializedVersion: 5 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} @@ -157,13 +168,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8012239837945830335} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0.0076, y: -0.007, z: 0} m_LocalScale: {x: 0.006177776, y: 0.006177776, z: 0.006177776} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1268481309119342633} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &2468094668517419922 MeshFilter: @@ -190,6 +201,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -223,9 +237,17 @@ MeshCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8012239837945830335} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 0 - serializedVersion: 4 + serializedVersion: 5 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} @@ -234,6 +256,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 564332035890725350, guid: 8ace9c04082e8ce4ea440f9bef681ce3, type: 3} @@ -244,10 +267,6 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 6366612888026126601, guid: 8ace9c04082e8ce4ea440f9bef681ce3, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - target: {fileID: 6366612888026126601, guid: 8ace9c04082e8ce4ea440f9bef681ce3, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -297,6 +316,12 @@ PrefabInstance: value: PressableButton_128x32mm_PersonAndText objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 9173695956475796094, guid: 8ace9c04082e8ce4ea440f9bef681ce3, type: 3} + insertIndex: -1 + addedObject: {fileID: 1268481309119342633} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 8ace9c04082e8ce4ea440f9bef681ce3, type: 3} --- !u!4 &4407735199717223959 stripped Transform: diff --git a/org.mixedrealitytoolkit.uxcomponents.noncanvas/Button/128x32/PressableButton_128x32mm_SinglelineTextWithSubtitle.prefab b/org.mixedrealitytoolkit.uxcomponents.noncanvas/Button/128x32/PressableButton_128x32mm_SinglelineTextWithSubtitle.prefab index 6eb3a1e29..1b737f970 100644 --- a/org.mixedrealitytoolkit.uxcomponents.noncanvas/Button/128x32/PressableButton_128x32mm_SinglelineTextWithSubtitle.prefab +++ b/org.mixedrealitytoolkit.uxcomponents.noncanvas/Button/128x32/PressableButton_128x32mm_SinglelineTextWithSubtitle.prefab @@ -31,7 +31,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6804149258562065805} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -55,6 +54,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -138,20 +140,23 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 00000000 m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 0 m_isCullingEnabled: 0 @@ -177,12 +182,9 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 8829903862454882072, guid: 72dfeb9ecf5ad884b87eff8bc5b49276, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - target: {fileID: 8829903862454882072, guid: 72dfeb9ecf5ad884b87eff8bc5b49276, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -232,6 +234,12 @@ PrefabInstance: value: 0.0024 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 6746213747597823087, guid: 72dfeb9ecf5ad884b87eff8bc5b49276, type: 3} + insertIndex: -1 + addedObject: {fileID: 162236023003044723} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 72dfeb9ecf5ad884b87eff8bc5b49276, type: 3} --- !u!4 &6804149258562065805 stripped Transform: diff --git a/org.mixedrealitytoolkit.uxcomponents.noncanvas/Button/128x32/PressableButton_128x32mm_SubtitleWithSinglelineText.prefab b/org.mixedrealitytoolkit.uxcomponents.noncanvas/Button/128x32/PressableButton_128x32mm_SubtitleWithSinglelineText.prefab index 52759dab8..2a871f01c 100644 --- a/org.mixedrealitytoolkit.uxcomponents.noncanvas/Button/128x32/PressableButton_128x32mm_SubtitleWithSinglelineText.prefab +++ b/org.mixedrealitytoolkit.uxcomponents.noncanvas/Button/128x32/PressableButton_128x32mm_SubtitleWithSinglelineText.prefab @@ -5,6 +5,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 162236023003044723, guid: 763be22d1f08e6741a7101dacd726814, type: 3} @@ -27,10 +28,6 @@ PrefabInstance: propertyPath: m_Name value: PressableButton_128x32mm_SubtitleWithSinglelineText objectReference: {fileID: 0} - - target: {fileID: 8752872172617307898, guid: 763be22d1f08e6741a7101dacd726814, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - target: {fileID: 8752872172617307898, guid: 763be22d1f08e6741a7101dacd726814, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -72,4 +69,7 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 763be22d1f08e6741a7101dacd726814, type: 3} diff --git a/org.mixedrealitytoolkit.uxcomponents.noncanvas/Button/128x32/PressableButton_128x32mm_TextOnly.prefab b/org.mixedrealitytoolkit.uxcomponents.noncanvas/Button/128x32/PressableButton_128x32mm_TextOnly.prefab index 8cff92436..a3f62a093 100644 --- a/org.mixedrealitytoolkit.uxcomponents.noncanvas/Button/128x32/PressableButton_128x32mm_TextOnly.prefab +++ b/org.mixedrealitytoolkit.uxcomponents.noncanvas/Button/128x32/PressableButton_128x32mm_TextOnly.prefab @@ -25,13 +25,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 263100982091000525} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 859854677370002547} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &3062714878936329399 MeshFilter: @@ -58,6 +58,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -106,6 +109,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 675712644852807673} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -0.004} m_LocalScale: {x: 1, y: 1, z: 1} @@ -116,7 +120,6 @@ Transform: - {fileID: 7156395073114111734} - {fileID: 8558624678631093332} m_Father: {fileID: 7475759467476053123} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2207251988623665081 GameObject: @@ -141,6 +144,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2207251988623665081} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0.0035} m_LocalScale: {x: 0.136, y: 0.04, z: 1} @@ -148,7 +152,6 @@ Transform: m_Children: - {fileID: 5381164659502394392} m_Father: {fileID: 8829903863711113859} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2667316837219457015 GameObject: @@ -182,7 +185,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6746213747597823087} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -206,6 +208,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -289,20 +294,23 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 00000000 m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 0 m_isCullingEnabled: 0 @@ -336,9 +344,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: fontIcons: {fileID: 11400000, guid: b490f983baa13694cb7e5ecc6bd0dae3, type: 2} - currentIconName: Icon 133 + currentIconName: Favorite textMeshProComponent: {fileID: 4424429222014533572} - iconFontAsset: {fileID: 0} + migratedSuccessfully: 1 --- !u!1 &5802628135588026377 GameObject: m_ObjectHideFlags: 0 @@ -362,6 +370,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5802628135588026377} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0.004} m_LocalScale: {x: 1, y: 1, z: 1} @@ -370,7 +379,6 @@ Transform: - {fileID: 6746213747597823087} - {fileID: 8829903862639773304} m_Father: {fileID: 8829903862454882072} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &7030335989691873649 GameObject: @@ -398,13 +406,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7030335989691873649} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8829903862639773304} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &6734234307310988398 MeshFilter: @@ -431,6 +439,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -493,13 +504,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8614915488467384402} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0.048, y: 0, z: 0} m_LocalScale: {x: 0.0088, y: 0.0088, z: 0.0025} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6746213747597823087} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &1969163422732972035 SpriteRenderer: @@ -518,6 +529,9 @@ SpriteRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -578,13 +592,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8829903862420055381} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0.048, y: 0, z: 0} m_LocalScale: {x: 0.032, y: 0.032, z: 0.032} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6746213747597823087} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &8829903862420055378 MeshFilter: @@ -611,6 +625,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -659,6 +676,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8829903862639773305} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -0.008} m_LocalScale: {x: 0.128, y: 0.032, z: 0.008} @@ -666,7 +684,6 @@ Transform: m_Children: - {fileID: 7699772147371746251} m_Father: {fileID: 7475759467476053123} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &8829903863008004601 GameObject: @@ -700,6 +717,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8829903863008004601} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -712,7 +730,6 @@ Transform: - {fileID: 1290675915836177998} - {fileID: 4030908413744510844} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &8829903863008004581 BoxCollider: @@ -722,9 +739,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8829903863008004601} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 0.128, y: 0.032, z: 0.031322923} m_Center: {x: 0, y: 0, z: -0.00033853762} --- !u!114 &8174955776655707806 @@ -741,13 +766,11 @@ MonoBehaviour: m_EditorClassIdentifier: m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 1 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -804,42 +827,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnHoverEntered: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_OnHoverExited: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectEntered: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectExited: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -932,6 +940,9 @@ MonoBehaviour: k__BackingField: 1 allowSelectByVoice: 1 speechRecognitionKeyword: select + k__BackingField: + m_PersistentCalls: + m_Calls: [] k__BackingField: 1 k__BackingField: 0 k__BackingField: @@ -961,6 +972,14 @@ MonoBehaviour: rollOffXYDepth: 3 rejectZRollOff: 0 extendSpeed: 0.5 + k__BackingField: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] --- !u!114 &954131435394119071 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1082,6 +1101,7 @@ AudioSource: serializedVersion: 4 OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 0} + m_Resource: {fileID: 0} m_PlayOnAwake: 1 m_Volume: 1 m_Pitch: 1 @@ -1182,7 +1202,7 @@ MonoBehaviour: bindingProfile: {fileID: 11400000, guid: c2554c7933796464c965ae0c4acf9561, type: 2} --- !u!95 &8453753501827628428 Animator: - serializedVersion: 5 + serializedVersion: 7 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -1196,6 +1216,7 @@ Animator: m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 m_StabilizeFeet: 0 + m_AnimatePhysics: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 @@ -1270,6 +1291,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: seeItSayItLabel: {fileID: 4905804341907317097} + pattern: Say '{0}' positionControl: {fileID: 0} --- !u!1 &8829903863595505675 GameObject: @@ -1302,7 +1324,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6746213747597823087} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -1326,6 +1347,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1409,20 +1433,23 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 00000000 m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 0 m_isCullingEnabled: 0 @@ -1466,6 +1493,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8829903863711113860} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -1473,17 +1501,17 @@ Transform: m_Children: - {fileID: 859854677370002547} m_Father: {fileID: 8829903862454882072} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &42739309186660027 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 8829903862454882072} m_Modifications: - target: {fileID: 3148769097004162997, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} - propertyPath: m_Materials.Array.data[0] + propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: f32fb793f8a4656469db1040ccf2cffb, type: 2} - target: {fileID: 4125495309553998321, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} @@ -1494,10 +1522,6 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} - - target: {fileID: 4205010513405509735, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - target: {fileID: 4205010513405509735, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -1555,6 +1579,9 @@ PrefabInstance: value: 0.004 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} --- !u!4 &4237014119923168988 stripped Transform: @@ -1566,16 +1593,13 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 8829903862454882072} m_Modifications: - target: {fileID: 1132637073067987526, guid: e3ee2968344c0ee41b950a4d2ab94b4c, type: 3} propertyPath: m_LocalScale.x value: 0.126 objectReference: {fileID: 0} - - target: {fileID: 5209440517997471518, guid: e3ee2968344c0ee41b950a4d2ab94b4c, type: 3} - propertyPath: m_RootOrder - value: 3 - objectReference: {fileID: 0} - target: {fileID: 5209440517997471518, guid: e3ee2968344c0ee41b950a4d2ab94b4c, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -1625,6 +1649,9 @@ PrefabInstance: value: UX.Button.BackplateQuad objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e3ee2968344c0ee41b950a4d2ab94b4c, type: 3} --- !u!4 &994071487416343378 stripped Transform: @@ -1636,6 +1663,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 8829903862454882072} m_Modifications: - target: {fileID: 1132637073067987526, guid: e3ee2968344c0ee41b950a4d2ab94b4c, type: 3} @@ -1646,10 +1674,6 @@ PrefabInstance: propertyPath: m_LocalScale.y value: 0.0343 objectReference: {fileID: 0} - - target: {fileID: 5209440517997471518, guid: e3ee2968344c0ee41b950a4d2ab94b4c, type: 3} - propertyPath: m_RootOrder - value: 4 - objectReference: {fileID: 0} - target: {fileID: 5209440517997471518, guid: e3ee2968344c0ee41b950a4d2ab94b4c, type: 3} propertyPath: m_LocalScale.x value: 1 @@ -1715,11 +1739,13 @@ PrefabInstance: value: UX.Button.BackplateToggleQuad objectReference: {fileID: 0} - target: {fileID: 9102658290673352242, guid: e3ee2968344c0ee41b950a4d2ab94b4c, type: 3} - propertyPath: m_Materials.Array.data[0] + propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: 13e97f0307ba0be4ab4e19d00e2f921e, type: 2} - m_RemovedComponents: - - {fileID: 8125166150531609143, guid: e3ee2968344c0ee41b950a4d2ab94b4c, type: 3} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e3ee2968344c0ee41b950a4d2ab94b4c, type: 3} --- !u!4 &1290675915836177998 stripped Transform: @@ -1736,6 +1762,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 8829903862454882072} m_Modifications: - target: {fileID: 2367726095401115057, guid: 6f685b60890c0884289dcc35603d03c2, type: 3} @@ -1750,10 +1777,6 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 5824337637746978049, guid: 6f685b60890c0884289dcc35603d03c2, type: 3} - propertyPath: m_RootOrder - value: 5 - objectReference: {fileID: 0} - target: {fileID: 5824337637746978049, guid: 6f685b60890c0884289dcc35603d03c2, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -1803,6 +1826,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 6f685b60890c0884289dcc35603d03c2, type: 3} --- !u!4 &4030908413744510844 stripped Transform: diff --git a/org.mixedrealitytoolkit.uxcomponents.noncanvas/Button/160x32/PressableButton_160x32mm_IconAndText_L.prefab b/org.mixedrealitytoolkit.uxcomponents.noncanvas/Button/160x32/PressableButton_160x32mm_IconAndText_L.prefab index 00952c2a3..12cbe7384 100644 --- a/org.mixedrealitytoolkit.uxcomponents.noncanvas/Button/160x32/PressableButton_160x32mm_IconAndText_L.prefab +++ b/org.mixedrealitytoolkit.uxcomponents.noncanvas/Button/160x32/PressableButton_160x32mm_IconAndText_L.prefab @@ -5,6 +5,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 2971829515096509026, guid: 8ace9c04082e8ce4ea440f9bef681ce3, type: 3} @@ -23,82 +24,14 @@ PrefabInstance: propertyPath: m_LocalScale.x value: 0.168 objectReference: {fileID: 0} - - target: {fileID: 6026828403977934991, guid: 8ace9c04082e8ce4ea440f9bef681ce3, type: 3} - propertyPath: isStatefulToggled.onExited.m_PersistentCalls.m_Calls.Array.size - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6026828403977934991, guid: 8ace9c04082e8ce4ea440f9bef681ce3, type: 3} - propertyPath: isStatefulToggled.onEntered.m_PersistentCalls.m_Calls.Array.size - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6026828403977934991, guid: 8ace9c04082e8ce4ea440f9bef681ce3, type: 3} - propertyPath: isStatefulToggled.onExited.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 6 - objectReference: {fileID: 0} - - target: {fileID: 6026828403977934991, guid: 8ace9c04082e8ce4ea440f9bef681ce3, type: 3} - propertyPath: isStatefulToggled.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 6 - objectReference: {fileID: 0} - - target: {fileID: 6026828403977934991, guid: 8ace9c04082e8ce4ea440f9bef681ce3, type: 3} - propertyPath: isStatefulToggled.onExited.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 2105723638768039693} - - target: {fileID: 6026828403977934991, guid: 8ace9c04082e8ce4ea440f9bef681ce3, type: 3} - propertyPath: isStatefulToggled.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 2105723638768039693} - - target: {fileID: 6026828403977934991, guid: 8ace9c04082e8ce4ea440f9bef681ce3, type: 3} - propertyPath: isStatefulToggled.onExited.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 6026828403977934991, guid: 8ace9c04082e8ce4ea440f9bef681ce3, type: 3} - propertyPath: isStatefulToggled.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 6026828403977934991, guid: 8ace9c04082e8ce4ea440f9bef681ce3, type: 3} - propertyPath: isStatefulToggled.onExited.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: SetActive - objectReference: {fileID: 0} - - target: {fileID: 6026828403977934991, guid: 8ace9c04082e8ce4ea440f9bef681ce3, type: 3} - propertyPath: isStatefulToggled.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: SetActive - objectReference: {fileID: 0} - - target: {fileID: 6026828403977934991, guid: 8ace9c04082e8ce4ea440f9bef681ce3, type: 3} - propertyPath: isStatefulToggled.onExited.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: UnityEngine.GameObject, UnityEngine - objectReference: {fileID: 0} - - target: {fileID: 6026828403977934991, guid: 8ace9c04082e8ce4ea440f9bef681ce3, type: 3} - propertyPath: isStatefulToggled.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: UnityEngine.GameObject, UnityEngine - objectReference: {fileID: 0} - - target: {fileID: 6026828403977934991, guid: 8ace9c04082e8ce4ea440f9bef681ce3, type: 3} - propertyPath: isStatefulToggled.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_BoolArgument - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6026828403977934991, guid: 8ace9c04082e8ce4ea440f9bef681ce3, type: 3} - propertyPath: isStatefulToggled.onExited.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - - target: {fileID: 6026828403977934991, guid: 8ace9c04082e8ce4ea440f9bef681ce3, type: 3} - propertyPath: isStatefulToggled.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - target: {fileID: 6059181787491541573, guid: 8ace9c04082e8ce4ea440f9bef681ce3, type: 3} propertyPath: m_LocalPosition.x value: -0.064 objectReference: {fileID: 0} - - target: {fileID: 6080572341111065694, guid: 8ace9c04082e8ce4ea440f9bef681ce3, type: 3} - propertyPath: m_LocalPosition.x - value: -0.016 - objectReference: {fileID: 0} - target: {fileID: 6366612887842050153, guid: 8ace9c04082e8ce4ea440f9bef681ce3, type: 3} propertyPath: m_LocalScale.x value: 0.16 objectReference: {fileID: 0} - - target: {fileID: 6366612888026126601, guid: 8ace9c04082e8ce4ea440f9bef681ce3, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - target: {fileID: 6366612888026126601, guid: 8ace9c04082e8ce4ea440f9bef681ce3, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -164,9 +97,7 @@ PrefabInstance: value: 0.1623 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 8ace9c04082e8ce4ea440f9bef681ce3, type: 3} ---- !u!1 &2105723638768039693 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 3921790805023570859, guid: 8ace9c04082e8ce4ea440f9bef681ce3, type: 3} - m_PrefabInstance: {fileID: 3122674094151814310} - m_PrefabAsset: {fileID: 0} diff --git a/org.mixedrealitytoolkit.uxcomponents.noncanvas/Button/160x32/PressableButton_160x32mm_SingleLineText.prefab b/org.mixedrealitytoolkit.uxcomponents.noncanvas/Button/160x32/PressableButton_160x32mm_SingleLineText.prefab index 8a485106b..720f1c7e0 100644 --- a/org.mixedrealitytoolkit.uxcomponents.noncanvas/Button/160x32/PressableButton_160x32mm_SingleLineText.prefab +++ b/org.mixedrealitytoolkit.uxcomponents.noncanvas/Button/160x32/PressableButton_160x32mm_SingleLineText.prefab @@ -5,6 +5,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 859854677370002547, guid: 72dfeb9ecf5ad884b87eff8bc5b49276, type: 3} @@ -27,10 +28,6 @@ PrefabInstance: propertyPath: m_LocalScale.x value: 0.168 objectReference: {fileID: 0} - - target: {fileID: 8829903862454882072, guid: 72dfeb9ecf5ad884b87eff8bc5b49276, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - target: {fileID: 8829903862454882072, guid: 72dfeb9ecf5ad884b87eff8bc5b49276, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -92,4 +89,7 @@ PrefabInstance: value: 0.132 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 72dfeb9ecf5ad884b87eff8bc5b49276, type: 3} diff --git a/org.mixedrealitytoolkit.uxcomponents.noncanvas/Button/32x32/PressableButton_32x32mm_Circular_IconOnly.prefab b/org.mixedrealitytoolkit.uxcomponents.noncanvas/Button/32x32/PressableButton_32x32mm_Circular_IconOnly.prefab index 027005def..9abf0b25a 100644 --- a/org.mixedrealitytoolkit.uxcomponents.noncanvas/Button/32x32/PressableButton_32x32mm_Circular_IconOnly.prefab +++ b/org.mixedrealitytoolkit.uxcomponents.noncanvas/Button/32x32/PressableButton_32x32mm_Circular_IconOnly.prefab @@ -5,20 +5,17 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 1071092161820629018, guid: cd0f0697f0939504389ec612388f609a, type: 3} - propertyPath: m_Materials.Array.data[0] + propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: 9bbf915647f6de74ca3799bd504483b4, type: 2} - target: {fileID: 2244185731031694095, guid: cd0f0697f0939504389ec612388f609a, type: 3} propertyPath: m_Name value: PressableButton_32x32mm_Circular_IconOnly objectReference: {fileID: 0} - - target: {fileID: 2244185731585867246, guid: cd0f0697f0939504389ec612388f609a, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - target: {fileID: 2244185731585867246, guid: cd0f0697f0939504389ec612388f609a, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -60,15 +57,15 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} - target: {fileID: 2251470966506924626, guid: cd0f0697f0939504389ec612388f609a, type: 3} - propertyPath: m_Materials.Array.data[0] + propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: 1b4c6757612a7ee4ebc060ae14fb9cac, type: 2} - target: {fileID: 5659782475194883064, guid: cd0f0697f0939504389ec612388f609a, type: 3} - propertyPath: m_Materials.Array.data[0] + propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: 7176a17b48880904b8a311fd53c55e35, type: 2} - target: {fileID: 6808825808564727944, guid: cd0f0697f0939504389ec612388f609a, type: 3} - propertyPath: m_Materials.Array.data[0] + propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: edcd7c74a5fcb1e4cb477a62e8ad276e, type: 2} - target: {fileID: 7867802180497734224, guid: cd0f0697f0939504389ec612388f609a, type: 3} @@ -76,4 +73,7 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: cd0f0697f0939504389ec612388f609a, type: 3} diff --git a/org.mixedrealitytoolkit.uxcomponents.noncanvas/Button/32x32/PressableButton_32x32mm_IconAndText.prefab b/org.mixedrealitytoolkit.uxcomponents.noncanvas/Button/32x32/PressableButton_32x32mm_IconAndText.prefab index 2b58109ec..f0b7ef4db 100644 --- a/org.mixedrealitytoolkit.uxcomponents.noncanvas/Button/32x32/PressableButton_32x32mm_IconAndText.prefab +++ b/org.mixedrealitytoolkit.uxcomponents.noncanvas/Button/32x32/PressableButton_32x32mm_IconAndText.prefab @@ -5,16 +5,13 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 1224743575262302074, guid: cd0f0697f0939504389ec612388f609a, type: 3} propertyPath: m_Controller value: objectReference: {fileID: 0} - - target: {fileID: 1997062889913927636, guid: cd0f0697f0939504389ec612388f609a, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - target: {fileID: 2244185730444192509, guid: cd0f0697f0939504389ec612388f609a, type: 3} propertyPath: m_IsActive value: 1 @@ -23,10 +20,6 @@ PrefabInstance: propertyPath: m_Name value: PressableButton_32x32mm_IconAndText objectReference: {fileID: 0} - - target: {fileID: 2244185731585867246, guid: cd0f0697f0939504389ec612388f609a, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - target: {fileID: 2244185731585867246, guid: cd0f0697f0939504389ec612388f609a, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -75,24 +68,12 @@ PrefabInstance: propertyPath: m_hasFontAssetChanged value: 0 objectReference: {fileID: 0} - - target: {fileID: 6937984443068901461, guid: cd0f0697f0939504389ec612388f609a, type: 3} - propertyPath: m_TextStyleHashCode - value: -1183493901 - objectReference: {fileID: 0} - target: {fileID: 7535415752403634025, guid: cd0f0697f0939504389ec612388f609a, type: 3} propertyPath: stateContainers.entries.Array.data[0].value.effects.Array.size value: 2 objectReference: {fileID: 0} - - target: {fileID: 7535415752403634025, guid: cd0f0697f0939504389ec612388f609a, type: 3} - propertyPath: stateContainers.entries.Array.data[0].value.effects.Array.data[2] - value: - objectReference: {fileID: 0} - - target: {fileID: 7535415752403634025, guid: cd0f0697f0939504389ec612388f609a, type: 3} - propertyPath: stateContainers.entries.Array.data[0].value.effects.Array.data[2].data - value: - objectReference: {fileID: 0} - target: {fileID: 7855682163667943843, guid: cd0f0697f0939504389ec612388f609a, type: 3} - propertyPath: m_Materials.Array.data[0] + propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 5762245003366665926, guid: 9b0d0ee11ff70b04d901a29b519cbaa0, type: 2} - target: {fileID: 8147799309782802252, guid: cd0f0697f0939504389ec612388f609a, type: 3} @@ -104,4 +85,7 @@ PrefabInstance: value: objectReference: {fileID: 21300000, guid: 5cddab770339b174eb9a8706f2266e90, type: 3} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: cd0f0697f0939504389ec612388f609a, type: 3} diff --git a/org.mixedrealitytoolkit.uxcomponents.noncanvas/Button/32x32/PressableButton_32x32mm_IconAndTextUnder.prefab b/org.mixedrealitytoolkit.uxcomponents.noncanvas/Button/32x32/PressableButton_32x32mm_IconAndTextUnder.prefab index a6891c618..c660cad4d 100644 --- a/org.mixedrealitytoolkit.uxcomponents.noncanvas/Button/32x32/PressableButton_32x32mm_IconAndTextUnder.prefab +++ b/org.mixedrealitytoolkit.uxcomponents.noncanvas/Button/32x32/PressableButton_32x32mm_IconAndTextUnder.prefab @@ -31,7 +31,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4500707569764308244} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -55,6 +54,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -138,20 +140,23 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 00000000 m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 0 m_isCullingEnabled: 0 @@ -177,20 +182,9 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 853027166633150111, guid: c25d8f2d22117bd40ad824684551fbde, type: 3} - propertyPath: m_RootOrder - value: 6 - objectReference: {fileID: 0} - - target: {fileID: 3300927970421739437, guid: c25d8f2d22117bd40ad824684551fbde, type: 3} - propertyPath: m_RootOrder - value: 4 - objectReference: {fileID: 0} - - target: {fileID: 5092507605265006331, guid: c25d8f2d22117bd40ad824684551fbde, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - target: {fileID: 5092507605265006331, guid: c25d8f2d22117bd40ad824684551fbde, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -240,6 +234,12 @@ PrefabInstance: value: PressableButton_32x32mm_IconAndTextUnder objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 5092507605265006331, guid: c25d8f2d22117bd40ad824684551fbde, type: 3} + insertIndex: -1 + addedObject: {fileID: 3879312081829613483} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c25d8f2d22117bd40ad824684551fbde, type: 3} --- !u!4 &4500707569764308244 stripped Transform: diff --git a/org.mixedrealitytoolkit.uxcomponents.noncanvas/Button/32x32/PressableButton_32x32mm_IconAndText_InnerQuadOnly.prefab b/org.mixedrealitytoolkit.uxcomponents.noncanvas/Button/32x32/PressableButton_32x32mm_IconAndText_InnerQuadOnly.prefab index d6988e671..568b5db72 100644 --- a/org.mixedrealitytoolkit.uxcomponents.noncanvas/Button/32x32/PressableButton_32x32mm_IconAndText_InnerQuadOnly.prefab +++ b/org.mixedrealitytoolkit.uxcomponents.noncanvas/Button/32x32/PressableButton_32x32mm_IconAndText_InnerQuadOnly.prefab @@ -5,16 +5,13 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 428199738449796777, guid: c25d8f2d22117bd40ad824684551fbde, type: 3} propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 5092507605265006331, guid: c25d8f2d22117bd40ad824684551fbde, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - target: {fileID: 5092507605265006331, guid: c25d8f2d22117bd40ad824684551fbde, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -60,4 +57,7 @@ PrefabInstance: value: PressableButton_32x32mm_IconAndText_InnerQuadOnly objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c25d8f2d22117bd40ad824684551fbde, type: 3} diff --git a/org.mixedrealitytoolkit.uxcomponents.noncanvas/Button/32x32/PressableButton_32x32mm_IconAndText_NoBackPlates.prefab b/org.mixedrealitytoolkit.uxcomponents.noncanvas/Button/32x32/PressableButton_32x32mm_IconAndText_NoBackPlates.prefab index 979901fbd..a65c596c4 100644 --- a/org.mixedrealitytoolkit.uxcomponents.noncanvas/Button/32x32/PressableButton_32x32mm_IconAndText_NoBackPlates.prefab +++ b/org.mixedrealitytoolkit.uxcomponents.noncanvas/Button/32x32/PressableButton_32x32mm_IconAndText_NoBackPlates.prefab @@ -5,6 +5,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 428199738449796777, guid: c25d8f2d22117bd40ad824684551fbde, type: 3} @@ -15,10 +16,6 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 5092507605265006331, guid: c25d8f2d22117bd40ad824684551fbde, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - target: {fileID: 5092507605265006331, guid: c25d8f2d22117bd40ad824684551fbde, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -64,4 +61,7 @@ PrefabInstance: value: PressableButton_32x32mm_IconAndText_NoBackPlates objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c25d8f2d22117bd40ad824684551fbde, type: 3} diff --git a/org.mixedrealitytoolkit.uxcomponents.noncanvas/Button/32x32/PressableButton_32x32mm_IconOnly.prefab b/org.mixedrealitytoolkit.uxcomponents.noncanvas/Button/32x32/PressableButton_32x32mm_IconOnly.prefab index 7dd24cf8d..0dc9add3c 100644 --- a/org.mixedrealitytoolkit.uxcomponents.noncanvas/Button/32x32/PressableButton_32x32mm_IconOnly.prefab +++ b/org.mixedrealitytoolkit.uxcomponents.noncanvas/Button/32x32/PressableButton_32x32mm_IconOnly.prefab @@ -5,12 +5,9 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 638014519639835038, guid: 72dfeb9ecf5ad884b87eff8bc5b49276, type: 3} - propertyPath: m_LocalPosition.x - value: -0.01700399 - objectReference: {fileID: 0} - target: {fileID: 859854677370002547, guid: 72dfeb9ecf5ad884b87eff8bc5b49276, type: 3} propertyPath: m_LocalScale.x value: 0.04 @@ -39,22 +36,6 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} - - target: {fileID: 2691048264859322108, guid: 72dfeb9ecf5ad884b87eff8bc5b49276, type: 3} - propertyPath: m_LocalPosition.x - value: 0.00056501105 - objectReference: {fileID: 0} - - target: {fileID: 3403461273566450486, guid: 72dfeb9ecf5ad884b87eff8bc5b49276, type: 3} - propertyPath: m_LocalPosition.x - value: -0.011624 - objectReference: {fileID: 0} - - target: {fileID: 3403461273566450486, guid: 72dfeb9ecf5ad884b87eff8bc5b49276, type: 3} - propertyPath: m_LocalPosition.y - value: 0.011509 - objectReference: {fileID: 0} - - target: {fileID: 3903713379709218524, guid: 72dfeb9ecf5ad884b87eff8bc5b49276, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - target: {fileID: 4167908885736566602, guid: 72dfeb9ecf5ad884b87eff8bc5b49276, type: 3} propertyPath: m_Name value: UIBackplateOuterGeometry @@ -63,10 +44,6 @@ PrefabInstance: propertyPath: m_LocalScale.x value: 0.03 objectReference: {fileID: 0} - - target: {fileID: 5494681404168759414, guid: 72dfeb9ecf5ad884b87eff8bc5b49276, type: 3} - propertyPath: m_LocalPosition.x - value: 0.00056 - objectReference: {fileID: 0} - target: {fileID: 6202915800659184406, guid: 72dfeb9ecf5ad884b87eff8bc5b49276, type: 3} propertyPath: m_LocalScale.x value: 0.0343 @@ -75,10 +52,6 @@ PrefabInstance: propertyPath: m_LocalScale.y value: 0.0343 objectReference: {fileID: 0} - - target: {fileID: 6204813041890052453, guid: 72dfeb9ecf5ad884b87eff8bc5b49276, type: 3} - propertyPath: m_LocalPosition.x - value: -0.013496991 - objectReference: {fileID: 0} - target: {fileID: 7156395073114111734, guid: 72dfeb9ecf5ad884b87eff8bc5b49276, type: 3} propertyPath: m_AnchoredPosition.x value: 0 @@ -91,10 +64,6 @@ PrefabInstance: propertyPath: m_LocalScale.y value: 0.04 objectReference: {fileID: 0} - - target: {fileID: 8008285569991035997, guid: 72dfeb9ecf5ad884b87eff8bc5b49276, type: 3} - propertyPath: m_LocalPosition.x - value: -0.014114991 - objectReference: {fileID: 0} - target: {fileID: 8558624678631093332, guid: 72dfeb9ecf5ad884b87eff8bc5b49276, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -108,7 +77,7 @@ PrefabInstance: value: objectReference: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} - target: {fileID: 8829903862420055379, guid: 72dfeb9ecf5ad884b87eff8bc5b49276, type: 3} - propertyPath: m_Materials.Array.data[0] + propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: 5aef1158e958b444cb0634a3d0cf0567, type: 2} - target: {fileID: 8829903862420055380, guid: 72dfeb9ecf5ad884b87eff8bc5b49276, type: 3} @@ -127,10 +96,6 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 8829903862454882072, guid: 72dfeb9ecf5ad884b87eff8bc5b49276, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - target: {fileID: 8829903862454882072, guid: 72dfeb9ecf5ad884b87eff8bc5b49276, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -212,4 +177,7 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 72dfeb9ecf5ad884b87eff8bc5b49276, type: 3} diff --git a/org.mixedrealitytoolkit.uxcomponents.noncanvas/Button/80x32/PressableButton_80x32mm_IconAndText.prefab b/org.mixedrealitytoolkit.uxcomponents.noncanvas/Button/80x32/PressableButton_80x32mm_IconAndText.prefab index f5fc2c414..192a9f171 100644 --- a/org.mixedrealitytoolkit.uxcomponents.noncanvas/Button/80x32/PressableButton_80x32mm_IconAndText.prefab +++ b/org.mixedrealitytoolkit.uxcomponents.noncanvas/Button/80x32/PressableButton_80x32mm_IconAndText.prefab @@ -5,6 +5,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 391159300930857138, guid: dc7ef7d5625c3454ab5097673a207485, type: 3} @@ -55,10 +56,6 @@ PrefabInstance: propertyPath: m_Name value: PressableButton_80x32mm_IconAndText objectReference: {fileID: 0} - - target: {fileID: 7256543901607729065, guid: dc7ef7d5625c3454ab5097673a207485, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - target: {fileID: 7256543901607729065, guid: dc7ef7d5625c3454ab5097673a207485, type: 3} propertyPath: m_LocalPosition.x value: -0.5937 @@ -112,4 +109,7 @@ PrefabInstance: value: -0.024 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: dc7ef7d5625c3454ab5097673a207485, type: 3} diff --git a/org.mixedrealitytoolkit.uxcomponents.noncanvas/Button/80x32/PressableButton_80x32mm_IconOnly.prefab b/org.mixedrealitytoolkit.uxcomponents.noncanvas/Button/80x32/PressableButton_80x32mm_IconOnly.prefab index 1bc791d22..7d2dad7e6 100644 --- a/org.mixedrealitytoolkit.uxcomponents.noncanvas/Button/80x32/PressableButton_80x32mm_IconOnly.prefab +++ b/org.mixedrealitytoolkit.uxcomponents.noncanvas/Button/80x32/PressableButton_80x32mm_IconOnly.prefab @@ -5,6 +5,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 663229184210891148, guid: 5e1e5c2fb89ded5469dd37ccbed1a896, type: 3} @@ -19,10 +20,6 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 1220126736778559586, guid: 5e1e5c2fb89ded5469dd37ccbed1a896, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - target: {fileID: 1220126736778559586, guid: 5e1e5c2fb89ded5469dd37ccbed1a896, type: 3} propertyPath: m_LocalPosition.x value: -0.5937 @@ -68,4 +65,7 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 5e1e5c2fb89ded5469dd37ccbed1a896, type: 3} diff --git a/org.mixedrealitytoolkit.uxcomponents.noncanvas/Button/80x32/PressableButton_80x32mm_SingleLineText.prefab b/org.mixedrealitytoolkit.uxcomponents.noncanvas/Button/80x32/PressableButton_80x32mm_SingleLineText.prefab index c806b417f..ebed067d3 100644 --- a/org.mixedrealitytoolkit.uxcomponents.noncanvas/Button/80x32/PressableButton_80x32mm_SingleLineText.prefab +++ b/org.mixedrealitytoolkit.uxcomponents.noncanvas/Button/80x32/PressableButton_80x32mm_SingleLineText.prefab @@ -5,6 +5,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 859854677370002547, guid: 72dfeb9ecf5ad884b87eff8bc5b49276, type: 3} @@ -43,10 +44,6 @@ PrefabInstance: propertyPath: m_LocalScale.y value: 0.04 objectReference: {fileID: 0} - - target: {fileID: 8829903862454882072, guid: 72dfeb9ecf5ad884b87eff8bc5b49276, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - target: {fileID: 8829903862454882072, guid: 72dfeb9ecf5ad884b87eff8bc5b49276, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -116,4 +113,7 @@ PrefabInstance: value: 0.06 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 72dfeb9ecf5ad884b87eff8bc5b49276, type: 3} diff --git a/org.mixedrealitytoolkit.uxcomponents.noncanvas/Button/Animations/NonCanvasButtonActiveFocus.anim b/org.mixedrealitytoolkit.uxcomponents.noncanvas/Button/Animations/NonCanvasButtonActiveFocus.anim index 4b948319d..e4f2768b5 100644 --- a/org.mixedrealitytoolkit.uxcomponents.noncanvas/Button/Animations/NonCanvasButtonActiveFocus.anim +++ b/org.mixedrealitytoolkit.uxcomponents.noncanvas/Button/Animations/NonCanvasButtonActiveFocus.anim @@ -7,7 +7,7 @@ AnimationClip: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: NonCanvasButtonActiveFocus - serializedVersion: 6 + serializedVersion: 7 m_Legacy: 0 m_Compressed: 0 m_UseHighQualityCurve: 1 @@ -17,7 +17,8 @@ AnimationClip: m_PositionCurves: [] m_ScaleCurves: [] m_FloatCurves: - - curve: + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -45,6 +46,7 @@ AnimationClip: path: CompressableButtonVisuals/FrontPlate/UX.Button.FrontplateHighlight classID: 23 script: {fileID: 0} + flags: 16 m_PPtrCurves: [] m_SampleRate: 60 m_WrapMode: 0 @@ -60,6 +62,8 @@ AnimationClip: typeID: 23 customType: 22 isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 pptrCurveMapping: [] m_AnimationClipSettings: serializedVersion: 2 @@ -82,7 +86,8 @@ AnimationClip: m_HeightFromFeet: 0 m_Mirror: 0 m_EditorCurves: - - curve: + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -110,6 +115,7 @@ AnimationClip: path: CompressableButtonVisuals/FrontPlate/UX.Button.FrontplateHighlight classID: 23 script: {fileID: 0} + flags: 16 m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 diff --git a/org.mixedrealitytoolkit.uxcomponents.noncanvas/Button/Animations/NonCanvasButtonDisabled.anim b/org.mixedrealitytoolkit.uxcomponents.noncanvas/Button/Animations/NonCanvasButtonDisabled.anim index 4c6914864..a3671dfea 100644 --- a/org.mixedrealitytoolkit.uxcomponents.noncanvas/Button/Animations/NonCanvasButtonDisabled.anim +++ b/org.mixedrealitytoolkit.uxcomponents.noncanvas/Button/Animations/NonCanvasButtonDisabled.anim @@ -7,7 +7,7 @@ AnimationClip: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: NonCanvasButtonDisabled - serializedVersion: 6 + serializedVersion: 7 m_Legacy: 0 m_Compressed: 0 m_UseHighQualityCurve: 1 @@ -17,7 +17,8 @@ AnimationClip: m_PositionCurves: [] m_ScaleCurves: [] m_FloatCurves: - - curve: + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -45,7 +46,9 @@ AnimationClip: path: CompressableButtonVisuals/FrontPlate/UX.Button.FrontplateHighlight classID: 23 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -73,6 +76,7 @@ AnimationClip: path: UIBackplateInnerQuad/UX.Button.BackplateQuad classID: 23 script: {fileID: 0} + flags: 16 m_PPtrCurves: [] m_SampleRate: 60 m_WrapMode: 0 @@ -88,6 +92,8 @@ AnimationClip: typeID: 23 customType: 22 isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 - serializedVersion: 2 path: 2903805740 attribute: 2269262469 @@ -95,6 +101,8 @@ AnimationClip: typeID: 23 customType: 22 isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 pptrCurveMapping: [] m_AnimationClipSettings: serializedVersion: 2 @@ -117,7 +125,8 @@ AnimationClip: m_HeightFromFeet: 0 m_Mirror: 0 m_EditorCurves: - - curve: + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -145,7 +154,9 @@ AnimationClip: path: CompressableButtonVisuals/FrontPlate/UX.Button.FrontplateHighlight classID: 23 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -173,6 +184,7 @@ AnimationClip: path: UIBackplateInnerQuad/UX.Button.BackplateQuad classID: 23 script: {fileID: 0} + flags: 16 m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 diff --git a/org.mixedrealitytoolkit.uxcomponents.noncanvas/Button/Animations/NonCanvasButtonPassiveFocus.anim b/org.mixedrealitytoolkit.uxcomponents.noncanvas/Button/Animations/NonCanvasButtonPassiveFocus.anim index 38559bdf2..ca35a78dc 100644 --- a/org.mixedrealitytoolkit.uxcomponents.noncanvas/Button/Animations/NonCanvasButtonPassiveFocus.anim +++ b/org.mixedrealitytoolkit.uxcomponents.noncanvas/Button/Animations/NonCanvasButtonPassiveFocus.anim @@ -7,7 +7,7 @@ AnimationClip: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: NonCanvasButtonPassiveFocus - serializedVersion: 6 + serializedVersion: 7 m_Legacy: 0 m_Compressed: 0 m_UseHighQualityCurve: 1 @@ -57,6 +57,8 @@ AnimationClip: typeID: 4 customType: 0 isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 pptrCurveMapping: [] m_AnimationClipSettings: serializedVersion: 2 @@ -79,7 +81,8 @@ AnimationClip: m_HeightFromFeet: 0 m_Mirror: 0 m_EditorCurves: - - curve: + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -107,6 +110,7 @@ AnimationClip: path: CompressableButtonVisuals/IconAndText classID: 4 script: {fileID: 0} + flags: 16 m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 diff --git a/org.mixedrealitytoolkit.uxcomponents.noncanvas/Button/Animations/NonCanvasButtonPress.anim b/org.mixedrealitytoolkit.uxcomponents.noncanvas/Button/Animations/NonCanvasButtonPress.anim index c18898786..2e379e488 100644 --- a/org.mixedrealitytoolkit.uxcomponents.noncanvas/Button/Animations/NonCanvasButtonPress.anim +++ b/org.mixedrealitytoolkit.uxcomponents.noncanvas/Button/Animations/NonCanvasButtonPress.anim @@ -7,7 +7,7 @@ AnimationClip: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: NonCanvasButtonPress - serializedVersion: 6 + serializedVersion: 7 m_Legacy: 0 m_Compressed: 0 m_UseHighQualityCurve: 1 @@ -42,7 +42,8 @@ AnimationClip: m_RotationOrder: 4 path: CompressableButtonVisuals m_FloatCurves: - - curve: + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -70,6 +71,7 @@ AnimationClip: path: ButtonContent/BG_sizer/UX.Button.BackplateHighlight classID: 23 script: {fileID: 0} + flags: 16 m_PPtrCurves: [] m_SampleRate: 60 m_WrapMode: 0 @@ -85,6 +87,8 @@ AnimationClip: typeID: 4 customType: 0 isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 - serializedVersion: 2 path: 3980734513 attribute: 2349330402 @@ -92,6 +96,8 @@ AnimationClip: typeID: 23 customType: 22 isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 pptrCurveMapping: [] m_AnimationClipSettings: serializedVersion: 2 @@ -114,7 +120,8 @@ AnimationClip: m_HeightFromFeet: 0 m_Mirror: 0 m_EditorCurves: - - curve: + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -142,7 +149,9 @@ AnimationClip: path: CompressableButtonVisuals classID: 4 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -170,6 +179,7 @@ AnimationClip: path: ButtonContent/BG_sizer/UX.Button.BackplateHighlight classID: 23 script: {fileID: 0} + flags: 16 m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 diff --git a/org.mixedrealitytoolkit.uxcomponents.noncanvas/Button/Animations/NonCanvasToggleSwitchBackplate.anim b/org.mixedrealitytoolkit.uxcomponents.noncanvas/Button/Animations/NonCanvasToggleSwitchBackplate.anim index 6bd435f3b..cca5dff4a 100644 --- a/org.mixedrealitytoolkit.uxcomponents.noncanvas/Button/Animations/NonCanvasToggleSwitchBackplate.anim +++ b/org.mixedrealitytoolkit.uxcomponents.noncanvas/Button/Animations/NonCanvasToggleSwitchBackplate.anim @@ -7,7 +7,7 @@ AnimationClip: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: NonCanvasToggleSwitchBackplate - serializedVersion: 6 + serializedVersion: 7 m_Legacy: 0 m_Compressed: 0 m_UseHighQualityCurve: 1 @@ -17,7 +17,8 @@ AnimationClip: m_PositionCurves: [] m_ScaleCurves: [] m_FloatCurves: - - curve: + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -45,6 +46,7 @@ AnimationClip: path: ToggleVIsuals/UX.Toggle.Backplate classID: 23 script: {fileID: 0} + flags: 16 m_PPtrCurves: [] m_SampleRate: 60 m_WrapMode: 0 @@ -60,6 +62,8 @@ AnimationClip: typeID: 23 customType: 22 isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 pptrCurveMapping: [] m_AnimationClipSettings: serializedVersion: 2 @@ -82,7 +86,8 @@ AnimationClip: m_HeightFromFeet: 0 m_Mirror: 0 m_EditorCurves: - - curve: + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -110,6 +115,7 @@ AnimationClip: path: ToggleVIsuals/UX.Toggle.Backplate classID: 23 script: {fileID: 0} + flags: 16 m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 diff --git a/org.mixedrealitytoolkit.uxcomponents.noncanvas/Button/Animations/ToggleIconDisabled.anim b/org.mixedrealitytoolkit.uxcomponents.noncanvas/Button/Animations/ToggleIconDisabled.anim index 570ea9d00..f4782ee32 100644 --- a/org.mixedrealitytoolkit.uxcomponents.noncanvas/Button/Animations/ToggleIconDisabled.anim +++ b/org.mixedrealitytoolkit.uxcomponents.noncanvas/Button/Animations/ToggleIconDisabled.anim @@ -7,7 +7,7 @@ AnimationClip: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: ToggleIconDisabled - serializedVersion: 6 + serializedVersion: 7 m_Legacy: 0 m_Compressed: 0 m_UseHighQualityCurve: 1 @@ -17,7 +17,8 @@ AnimationClip: m_PositionCurves: [] m_ScaleCurves: [] m_FloatCurves: - - curve: + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -45,6 +46,7 @@ AnimationClip: path: CompressableButtonVisuals/IconAndText/ToggleableIcon classID: 212 script: {fileID: 0} + flags: 16 m_PPtrCurves: [] m_SampleRate: 60 m_WrapMode: 0 @@ -60,6 +62,8 @@ AnimationClip: typeID: 212 customType: 0 isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 pptrCurveMapping: [] m_AnimationClipSettings: serializedVersion: 2 @@ -82,7 +86,8 @@ AnimationClip: m_HeightFromFeet: 0 m_Mirror: 0 m_EditorCurves: - - curve: + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -110,6 +115,7 @@ AnimationClip: path: CompressableButtonVisuals/IconAndText/ToggleableIcon classID: 212 script: {fileID: 0} + flags: 16 m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 diff --git a/org.mixedrealitytoolkit.uxcomponents.noncanvas/ButtonGroup/ButtonGroup_32x32mm_H3.prefab b/org.mixedrealitytoolkit.uxcomponents.noncanvas/ButtonGroup/ButtonGroup_32x32mm_H3.prefab index 3883c8818..bd0bdd13d 100644 --- a/org.mixedrealitytoolkit.uxcomponents.noncanvas/ButtonGroup/ButtonGroup_32x32mm_H3.prefab +++ b/org.mixedrealitytoolkit.uxcomponents.noncanvas/ButtonGroup/ButtonGroup_32x32mm_H3.prefab @@ -24,6 +24,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1960850289780299974} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -33,7 +34,6 @@ Transform: - {fileID: 6588957365607278563} - {fileID: 7815978412340218477} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &5710102704959182857 MonoBehaviour: @@ -71,6 +71,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3262248103610875913} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -83,13 +84,13 @@ Transform: - {fileID: 873924958518981982} - {fileID: 7455153383050956346} m_Father: {fileID: 1960850291408215591} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &274028282797594481 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 3262248103610875912} m_Modifications: - target: {fileID: 1147649739598636238, guid: bb45df82ba657a845aea1b5aa230164f, type: 3} @@ -149,6 +150,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: bb45df82ba657a845aea1b5aa230164f, type: 3} --- !u!4 &873924958518981982 stripped Transform: @@ -160,6 +164,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1960850291408215591} m_Modifications: - target: {fileID: 1132637073067987526, guid: e3ee2968344c0ee41b950a4d2ab94b4c, type: 3} @@ -215,6 +220,9 @@ PrefabInstance: value: UIBackplateInnerQuad objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e3ee2968344c0ee41b950a4d2ab94b4c, type: 3} --- !u!4 &7815978412340218477 stripped Transform: @@ -226,6 +234,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 3262248103610875912} m_Modifications: - target: {fileID: 428199738449796777, guid: c25d8f2d22117bd40ad824684551fbde, type: 3} @@ -297,6 +306,9 @@ PrefabInstance: value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c25d8f2d22117bd40ad824684551fbde, type: 3} --- !u!4 &7776007856098233998 stripped Transform: @@ -308,6 +320,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 3262248103610875912} m_Modifications: - target: {fileID: 428199738449796777, guid: c25d8f2d22117bd40ad824684551fbde, type: 3} @@ -379,6 +392,9 @@ PrefabInstance: value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c25d8f2d22117bd40ad824684551fbde, type: 3} --- !u!4 &7776007856704490529 stripped Transform: @@ -390,6 +406,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 3262248103610875912} m_Modifications: - target: {fileID: 428199738449796777, guid: c25d8f2d22117bd40ad824684551fbde, type: 3} @@ -461,6 +478,9 @@ PrefabInstance: value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c25d8f2d22117bd40ad824684551fbde, type: 3} --- !u!4 &7776007857336234800 stripped Transform: @@ -472,6 +492,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1960850291408215591} m_Modifications: - target: {fileID: 4125495309553998321, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} @@ -539,6 +560,9 @@ PrefabInstance: value: 0.004 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} --- !u!4 &6588957365607278563 stripped Transform: @@ -550,6 +574,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 3262248103610875912} m_Modifications: - target: {fileID: 1147649739598636238, guid: bb45df82ba657a845aea1b5aa230164f, type: 3} @@ -609,6 +634,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: bb45df82ba657a845aea1b5aa230164f, type: 3} --- !u!4 &7455153383050956346 stripped Transform: @@ -620,6 +648,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 3262248103610875912} m_Modifications: - target: {fileID: 1147649739598636238, guid: bb45df82ba657a845aea1b5aa230164f, type: 3} @@ -679,6 +708,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: bb45df82ba657a845aea1b5aa230164f, type: 3} --- !u!4 &8256070622142568957 stripped Transform: diff --git a/org.mixedrealitytoolkit.uxcomponents.noncanvas/ButtonGroup/ButtonGroup_32x32mm_H3_ToggleButtons.prefab b/org.mixedrealitytoolkit.uxcomponents.noncanvas/ButtonGroup/ButtonGroup_32x32mm_H3_ToggleButtons.prefab index 5dc4dec3e..9414a1e63 100644 --- a/org.mixedrealitytoolkit.uxcomponents.noncanvas/ButtonGroup/ButtonGroup_32x32mm_H3_ToggleButtons.prefab +++ b/org.mixedrealitytoolkit.uxcomponents.noncanvas/ButtonGroup/ButtonGroup_32x32mm_H3_ToggleButtons.prefab @@ -5,6 +5,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 38152025106030147, guid: 180d4d2203473be4fa3fef18d0bec80e, type: 3} @@ -35,10 +36,6 @@ PrefabInstance: propertyPath: m_Name value: ButtonGroup_32x32mm_H3_ToggleButtons objectReference: {fileID: 0} - - target: {fileID: 1960850291408215591, guid: 180d4d2203473be4fa3fef18d0bec80e, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - target: {fileID: 1960850291408215591, guid: 180d4d2203473be4fa3fef18d0bec80e, type: 3} propertyPath: m_LocalPosition.x value: -0.3804 @@ -128,4 +125,7 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 180d4d2203473be4fa3fef18d0bec80e, type: 3} diff --git a/org.mixedrealitytoolkit.uxcomponents.noncanvas/CHANGELOG.md b/org.mixedrealitytoolkit.uxcomponents.noncanvas/CHANGELOG.md index e955b55b5..e121dede7 100644 --- a/org.mixedrealitytoolkit.uxcomponents.noncanvas/CHANGELOG.md +++ b/org.mixedrealitytoolkit.uxcomponents.noncanvas/CHANGELOG.md @@ -2,6 +2,25 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/). +## Unreleased + +### Changed + +* Updated the minimum editor version to 6000.0.66f2 [PR #1112](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1112) +* Reserialized prefabs, materials, and animations to remove stale serialized fields. [PR #1126](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1126) + +## [4.0.0-pre.2] - 2025-12-05 + +### Changed + +* Updated the minimum editor version to 2022.3.6f1 [PR #1003](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1003) + +## [4.0.0-pre.1] - 2024-07-09 + +### Changed + +* Updated package com.unity.xr.interaction.toolkit to 3.0.4 + ## [3.1.5] - 2025-11-12 ### Fixed diff --git a/org.mixedrealitytoolkit.uxcomponents.noncanvas/Dialog/Dialog_168x108mm.prefab b/org.mixedrealitytoolkit.uxcomponents.noncanvas/Dialog/Dialog_168x108mm.prefab index 9e90b7510..c633a84de 100644 --- a/org.mixedrealitytoolkit.uxcomponents.noncanvas/Dialog/Dialog_168x108mm.prefab +++ b/org.mixedrealitytoolkit.uxcomponents.noncanvas/Dialog/Dialog_168x108mm.prefab @@ -5,6 +5,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 927697047111154695, guid: b18a8137ff3b1c441948d57f752d44a7, type: 3} @@ -108,4 +109,7 @@ PrefabInstance: value: -0.034 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b18a8137ff3b1c441948d57f752d44a7, type: 3} diff --git a/org.mixedrealitytoolkit.uxcomponents.noncanvas/Dialog/Dialog_168x140mm.prefab b/org.mixedrealitytoolkit.uxcomponents.noncanvas/Dialog/Dialog_168x140mm.prefab index b9f1e80b5..784ab3a90 100644 --- a/org.mixedrealitytoolkit.uxcomponents.noncanvas/Dialog/Dialog_168x140mm.prefab +++ b/org.mixedrealitytoolkit.uxcomponents.noncanvas/Dialog/Dialog_168x140mm.prefab @@ -23,6 +23,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2419664531546587679} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -32,7 +33,6 @@ Transform: - {fileID: 927697047111154695} - {fileID: 5349300082099270895} m_Father: {fileID: 5080262994328456691} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &3622131044746646031 GameObject: @@ -65,7 +65,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5080262994328456691} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -89,6 +88,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -175,20 +177,23 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 00000000 m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 0 m_isCullingEnabled: 0 @@ -240,7 +245,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5080262994328456691} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -264,6 +268,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -347,20 +354,23 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 00000000 m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 0 m_isCullingEnabled: 0 @@ -404,6 +414,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6923459934404722748} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -414,7 +425,6 @@ Transform: - {fileID: 3738983836677314281} - {fileID: 3476969185526564888} m_Father: {fileID: 1575804597640617691} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &8529335236329353063 GameObject: @@ -442,6 +452,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8529335236329353063} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -449,7 +460,6 @@ Transform: m_Children: - {fileID: 5080262994328456691} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &6679981582675968485 MonoBehaviour: @@ -489,7 +499,7 @@ MonoBehaviour: Label: {fileID: 5349300083105080318} --- !u!95 &3344117554610078294 Animator: - serializedVersion: 5 + serializedVersion: 7 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -503,6 +513,7 @@ Animator: m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 m_StabilizeFeet: 0 + m_AnimatePhysics: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 @@ -513,6 +524,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 3738983836677314281} m_Modifications: - target: {fileID: 983616338015347288, guid: 3e816bc244e720a44bdea29af72e0b8b, type: 3} @@ -692,6 +704,9 @@ PrefabInstance: value: 2 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 3e816bc244e720a44bdea29af72e0b8b, type: 3} --- !u!114 &4739423043801118057 stripped MonoBehaviour: @@ -725,10 +740,11 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 5080262994328456691} m_Modifications: - target: {fileID: 3148769097004162997, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} - propertyPath: m_Materials.Array.data[0] + propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: 337c6305e0165274582902976fb0141c, type: 2} - target: {fileID: 4125495309553998321, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} @@ -788,6 +804,9 @@ PrefabInstance: value: 0.14 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} --- !u!4 &3476969185526564888 stripped Transform: @@ -799,6 +818,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 3738983836677314281} m_Modifications: - target: {fileID: 2875849561365526523, guid: dc7ef7d5625c3454ab5097673a207485, type: 3} @@ -946,6 +966,9 @@ PrefabInstance: value: UnityEngine.Object, UnityEngine objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: dc7ef7d5625c3454ab5097673a207485, type: 3} --- !u!114 &2582621872905822114 stripped MonoBehaviour: @@ -979,6 +1002,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 3738983836677314281} m_Modifications: - target: {fileID: 2875849561365526523, guid: dc7ef7d5625c3454ab5097673a207485, type: 3} @@ -1130,6 +1154,9 @@ PrefabInstance: value: UnityEngine.Object, UnityEngine objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: dc7ef7d5625c3454ab5097673a207485, type: 3} --- !u!114 &515257247015861633 stripped MonoBehaviour: diff --git a/org.mixedrealitytoolkit.uxcomponents.noncanvas/Dialog/Dialog_168x88mm.prefab b/org.mixedrealitytoolkit.uxcomponents.noncanvas/Dialog/Dialog_168x88mm.prefab index 38fc00d69..f9132a008 100644 --- a/org.mixedrealitytoolkit.uxcomponents.noncanvas/Dialog/Dialog_168x88mm.prefab +++ b/org.mixedrealitytoolkit.uxcomponents.noncanvas/Dialog/Dialog_168x88mm.prefab @@ -5,6 +5,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 927697047111154695, guid: b18a8137ff3b1c441948d57f752d44a7, type: 3} @@ -104,4 +105,7 @@ PrefabInstance: value: -0.024 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b18a8137ff3b1c441948d57f752d44a7, type: 3} diff --git a/org.mixedrealitytoolkit.uxcomponents.noncanvas/Dialog/NonCanvasDialogDismiss.anim b/org.mixedrealitytoolkit.uxcomponents.noncanvas/Dialog/NonCanvasDialogDismiss.anim index c813661fe..c00a2a343 100644 --- a/org.mixedrealitytoolkit.uxcomponents.noncanvas/Dialog/NonCanvasDialogDismiss.anim +++ b/org.mixedrealitytoolkit.uxcomponents.noncanvas/Dialog/NonCanvasDialogDismiss.anim @@ -7,7 +7,7 @@ AnimationClip: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: NonCanvasDialogDismiss - serializedVersion: 6 + serializedVersion: 7 m_Legacy: 0 m_Compressed: 0 m_UseHighQualityCurve: 1 @@ -125,6 +125,8 @@ AnimationClip: typeID: 4 customType: 0 isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 - serializedVersion: 2 path: 1120787796 attribute: 4 @@ -132,6 +134,8 @@ AnimationClip: typeID: 4 customType: 4 isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 - serializedVersion: 2 path: 1120787796 attribute: 3 @@ -139,6 +143,8 @@ AnimationClip: typeID: 4 customType: 0 isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 pptrCurveMapping: [] m_AnimationClipSettings: serializedVersion: 2 @@ -161,7 +167,8 @@ AnimationClip: m_HeightFromFeet: 0 m_Mirror: 0 m_EditorCurves: - - curve: + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -189,7 +196,9 @@ AnimationClip: path: Dialog classID: 4 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -217,7 +226,9 @@ AnimationClip: path: Dialog classID: 4 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -245,7 +256,9 @@ AnimationClip: path: Dialog classID: 4 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -282,7 +295,9 @@ AnimationClip: path: Dialog classID: 4 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -310,7 +325,9 @@ AnimationClip: path: Dialog classID: 4 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -338,7 +355,9 @@ AnimationClip: path: Dialog classID: 4 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -375,7 +394,9 @@ AnimationClip: path: Dialog classID: 4 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -412,7 +433,9 @@ AnimationClip: path: Dialog classID: 4 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -449,8 +472,10 @@ AnimationClip: path: Dialog classID: 4 script: {fileID: 0} + flags: 16 m_EulerEditorCurves: - - curve: + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: [] m_PreInfinity: 2 @@ -460,7 +485,9 @@ AnimationClip: path: Dialog classID: 4 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: [] m_PreInfinity: 2 @@ -470,7 +497,9 @@ AnimationClip: path: Dialog classID: 4 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: [] m_PreInfinity: 2 @@ -480,6 +509,7 @@ AnimationClip: path: Dialog classID: 4 script: {fileID: 0} + flags: 16 m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 m_Events: [] diff --git a/org.mixedrealitytoolkit.uxcomponents.noncanvas/Dialog/NonCanvasDialogShow.anim b/org.mixedrealitytoolkit.uxcomponents.noncanvas/Dialog/NonCanvasDialogShow.anim index 6a27a2687..000fa5a53 100644 --- a/org.mixedrealitytoolkit.uxcomponents.noncanvas/Dialog/NonCanvasDialogShow.anim +++ b/org.mixedrealitytoolkit.uxcomponents.noncanvas/Dialog/NonCanvasDialogShow.anim @@ -7,7 +7,7 @@ AnimationClip: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: NonCanvasDialogShow - serializedVersion: 6 + serializedVersion: 7 m_Legacy: 0 m_Compressed: 0 m_UseHighQualityCurve: 1 @@ -107,6 +107,8 @@ AnimationClip: typeID: 4 customType: 0 isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 - serializedVersion: 2 path: 1120787796 attribute: 4 @@ -114,6 +116,8 @@ AnimationClip: typeID: 4 customType: 4 isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 - serializedVersion: 2 path: 1120787796 attribute: 3 @@ -121,6 +125,8 @@ AnimationClip: typeID: 4 customType: 0 isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 pptrCurveMapping: [] m_AnimationClipSettings: serializedVersion: 2 @@ -143,7 +149,8 @@ AnimationClip: m_HeightFromFeet: 0 m_Mirror: 0 m_EditorCurves: - - curve: + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -171,7 +178,9 @@ AnimationClip: path: Dialog classID: 4 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -199,7 +208,9 @@ AnimationClip: path: Dialog classID: 4 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -227,7 +238,9 @@ AnimationClip: path: Dialog classID: 4 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -255,7 +268,9 @@ AnimationClip: path: Dialog classID: 4 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -283,7 +298,9 @@ AnimationClip: path: Dialog classID: 4 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -311,7 +328,9 @@ AnimationClip: path: Dialog classID: 4 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -339,7 +358,9 @@ AnimationClip: path: Dialog classID: 4 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -367,7 +388,9 @@ AnimationClip: path: Dialog classID: 4 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -386,8 +409,10 @@ AnimationClip: path: Dialog classID: 4 script: {fileID: 0} + flags: 16 m_EulerEditorCurves: - - curve: + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: [] m_PreInfinity: 2 @@ -397,7 +422,9 @@ AnimationClip: path: Dialog classID: 4 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: [] m_PreInfinity: 2 @@ -407,7 +434,9 @@ AnimationClip: path: Dialog classID: 4 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: [] m_PreInfinity: 2 @@ -417,6 +446,7 @@ AnimationClip: path: Dialog classID: 4 script: {fileID: 0} + flags: 16 m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 m_Events: [] diff --git a/org.mixedrealitytoolkit.uxcomponents.noncanvas/HandMenu/Animations/HandMenuAnimation.anim b/org.mixedrealitytoolkit.uxcomponents.noncanvas/HandMenu/Animations/HandMenuAnimation.anim index 7a0c932ee..4c15af496 100644 --- a/org.mixedrealitytoolkit.uxcomponents.noncanvas/HandMenu/Animations/HandMenuAnimation.anim +++ b/org.mixedrealitytoolkit.uxcomponents.noncanvas/HandMenu/Animations/HandMenuAnimation.anim @@ -7,7 +7,7 @@ AnimationClip: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: HandMenuAnimation - serializedVersion: 6 + serializedVersion: 7 m_Legacy: 0 m_Compressed: 0 m_UseHighQualityCurve: 1 @@ -66,6 +66,8 @@ AnimationClip: typeID: 4 customType: 0 isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 pptrCurveMapping: [] m_AnimationClipSettings: serializedVersion: 2 @@ -88,7 +90,8 @@ AnimationClip: m_HeightFromFeet: 0 m_Mirror: 0 m_EditorCurves: - - curve: + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -125,7 +128,9 @@ AnimationClip: path: classID: 4 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -162,7 +167,9 @@ AnimationClip: path: classID: 4 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -199,6 +206,7 @@ AnimationClip: path: classID: 4 script: {fileID: 0} + flags: 16 m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 diff --git a/org.mixedrealitytoolkit.uxcomponents.noncanvas/HandMenu/Animations/HandMenuLarge.controller b/org.mixedrealitytoolkit.uxcomponents.noncanvas/HandMenu/Animations/HandMenuLarge.controller index 36770a500..c844077c5 100644 --- a/org.mixedrealitytoolkit.uxcomponents.noncanvas/HandMenu/Animations/HandMenuLarge.controller +++ b/org.mixedrealitytoolkit.uxcomponents.noncanvas/HandMenu/Animations/HandMenuLarge.controller @@ -39,7 +39,7 @@ AnimatorController: m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer diff --git a/org.mixedrealitytoolkit.uxcomponents.noncanvas/HandMenu/HandMenu.prefab b/org.mixedrealitytoolkit.uxcomponents.noncanvas/HandMenu/HandMenu.prefab index 45ba3b89a..aa2fe733b 100644 --- a/org.mixedrealitytoolkit.uxcomponents.noncanvas/HandMenu/HandMenu.prefab +++ b/org.mixedrealitytoolkit.uxcomponents.noncanvas/HandMenu/HandMenu.prefab @@ -23,6 +23,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1302509949484823789} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -31,7 +32,6 @@ Transform: - {fileID: 1947672046017524404} - {fileID: 7941081375704378960} m_Father: {fileID: 4233609346284486712} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1405337660458694711 GameObject: @@ -58,13 +58,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1405337660458694711} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.032, y: 0.096, z: 0.02} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 463105470572649040} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &925818638311368009 MeshFilter: @@ -91,6 +91,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -143,6 +146,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4233609346284486719} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -150,7 +154,6 @@ Transform: m_Children: - {fileID: 463105470572649040} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &4233609346284486715 MonoBehaviour: @@ -294,11 +297,11 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4797729326347123882} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 463105470572649040} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/org.mixedrealitytoolkit.uxcomponents.noncanvas/ListMenu/ListMenuBase_132x168mm.prefab b/org.mixedrealitytoolkit.uxcomponents.noncanvas/ListMenu/ListMenuBase_132x168mm.prefab index 08c2cb10a..07f5516c8 100644 --- a/org.mixedrealitytoolkit.uxcomponents.noncanvas/ListMenu/ListMenuBase_132x168mm.prefab +++ b/org.mixedrealitytoolkit.uxcomponents.noncanvas/ListMenu/ListMenuBase_132x168mm.prefab @@ -24,6 +24,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 290186505393097411} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: -0.064, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -34,7 +35,6 @@ Transform: - {fileID: 7583113131930569189} - {fileID: 3762112280869347568} m_Father: {fileID: 4750517852670520902} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &3399567114687463042 MonoBehaviour: @@ -84,6 +84,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4750517851954577810} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -91,7 +92,6 @@ Transform: m_Children: - {fileID: 4750517853124905383} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &4750517852670520897 GameObject: @@ -116,6 +116,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4750517852670520897} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -124,7 +125,6 @@ Transform: - {fileID: 4750517853167872787} - {fileID: 3145101612266733298} m_Father: {fileID: 4750517853124905383} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &4750517852833321564 GameObject: @@ -157,7 +157,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4750517853167872787} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -181,6 +180,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -264,20 +266,23 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 00000000 m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 0 m_isCullingEnabled: 0 @@ -322,6 +327,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4750517853124905382} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -329,7 +335,6 @@ Transform: m_Children: - {fileID: 4750517852670520902} m_Father: {fileID: 4750517851954577811} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1433249442055822411 MonoBehaviour: @@ -367,6 +372,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4750517853167872786} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -375,13 +381,13 @@ Transform: - {fileID: 8914321417178100875} - {fileID: 4750517852833321565} m_Father: {fileID: 4750517852670520902} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &3169408448429909035 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 3145101612266733298} m_Modifications: - target: {fileID: 1890993566523895136, guid: 4ba189283e6cdf849a83bbffd2355335, type: 3} @@ -445,6 +451,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4ba189283e6cdf849a83bbffd2355335, type: 3} --- !u!4 &3585472853119453515 stripped Transform: @@ -461,6 +470,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 3145101612266733298} m_Modifications: - target: {fileID: 1890993566523895136, guid: 4ba189283e6cdf849a83bbffd2355335, type: 3} @@ -524,6 +534,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4ba189283e6cdf849a83bbffd2355335, type: 3} --- !u!1 &3762112280348730897 stripped GameObject: @@ -540,6 +553,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 3145101612266733298} m_Modifications: - target: {fileID: 1890993566523895136, guid: 4ba189283e6cdf849a83bbffd2355335, type: 3} @@ -603,6 +617,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4ba189283e6cdf849a83bbffd2355335, type: 3} --- !u!1 &2399235965570136731 stripped GameObject: @@ -619,10 +636,11 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4750517853167872787} m_Modifications: - target: {fileID: 3148769097004162997, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} - propertyPath: m_Materials.Array.data[0] + propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: 337c6305e0165274582902976fb0141c, type: 2} - target: {fileID: 4125495309553998321, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} @@ -686,6 +704,9 @@ PrefabInstance: value: 0.168 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} --- !u!4 &8914321417178100875 stripped Transform: @@ -697,6 +718,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 3145101612266733298} m_Modifications: - target: {fileID: 1890993566523895136, guid: 4ba189283e6cdf849a83bbffd2355335, type: 3} @@ -760,6 +782,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4ba189283e6cdf849a83bbffd2355335, type: 3} --- !u!1 &7583113130337259268 stripped GameObject: diff --git a/org.mixedrealitytoolkit.uxcomponents.noncanvas/ListMenu/ListMenuBase_168x168mm.prefab b/org.mixedrealitytoolkit.uxcomponents.noncanvas/ListMenu/ListMenuBase_168x168mm.prefab index fe2fc24e5..2f79f1909 100644 --- a/org.mixedrealitytoolkit.uxcomponents.noncanvas/ListMenu/ListMenuBase_168x168mm.prefab +++ b/org.mixedrealitytoolkit.uxcomponents.noncanvas/ListMenu/ListMenuBase_168x168mm.prefab @@ -23,6 +23,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4510811711447679255} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -30,7 +31,6 @@ Transform: m_Children: - {fileID: 4510811712492669218} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &4510811712143142596 GameObject: @@ -55,6 +55,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4510811712143142596} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -63,7 +64,6 @@ Transform: - {fileID: 4510811712636431254} - {fileID: 6111667044297473655} m_Father: {fileID: 4510811712492669218} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &4510811712163500761 GameObject: @@ -96,7 +96,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4510811712636431254} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -120,6 +119,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -203,20 +205,23 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 00000000 m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 0 m_isCullingEnabled: 0 @@ -261,6 +266,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4510811712492669219} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -268,7 +274,6 @@ Transform: m_Children: - {fileID: 4510811712143142595} m_Father: {fileID: 4510811711447679254} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &2717484208537685996 MonoBehaviour: @@ -306,6 +311,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4510811712636431255} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -314,7 +320,6 @@ Transform: - {fileID: 343027365450609678} - {fileID: 4510811712163500760} m_Father: {fileID: 4510811712143142595} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &8895267449842436678 GameObject: @@ -339,6 +344,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8895267449842436678} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: -0.016, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -349,13 +355,13 @@ Transform: - {fileID: 6602941568602202712} - {fileID: 3218187849093660677} m_Father: {fileID: 4510811712143142595} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1538437001494241362 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 6111667044297473655} m_Modifications: - target: {fileID: 983616338015347288, guid: 3e816bc244e720a44bdea29af72e0b8b, type: 3} @@ -415,6 +421,9 @@ PrefabInstance: value: -1183493901 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 3e816bc244e720a44bdea29af72e0b8b, type: 3} --- !u!4 &6602941568602202712 stripped Transform: @@ -426,6 +435,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 6111667044297473655} m_Modifications: - target: {fileID: 983616338015347288, guid: 3e816bc244e720a44bdea29af72e0b8b, type: 3} @@ -485,6 +495,9 @@ PrefabInstance: value: -1183493901 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 3e816bc244e720a44bdea29af72e0b8b, type: 3} --- !u!4 &7975410147097104300 stripped Transform: @@ -496,10 +509,11 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4510811712636431254} m_Modifications: - target: {fileID: 3148769097004162997, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} - propertyPath: m_Materials.Array.data[0] + propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: 337c6305e0165274582902976fb0141c, type: 2} - target: {fileID: 4125495309553998321, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} @@ -563,6 +577,9 @@ PrefabInstance: value: 0.168 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} --- !u!4 &343027365450609678 stripped Transform: @@ -574,6 +591,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 6111667044297473655} m_Modifications: - target: {fileID: 983616338015347288, guid: 3e816bc244e720a44bdea29af72e0b8b, type: 3} @@ -633,6 +651,9 @@ PrefabInstance: value: -1183493901 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 3e816bc244e720a44bdea29af72e0b8b, type: 3} --- !u!4 &439186310055540550 stripped Transform: @@ -644,6 +665,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 6111667044297473655} m_Modifications: - target: {fileID: 983616338015347288, guid: 3e816bc244e720a44bdea29af72e0b8b, type: 3} @@ -703,6 +725,9 @@ PrefabInstance: value: -1183493901 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 3e816bc244e720a44bdea29af72e0b8b, type: 3} --- !u!4 &3218187849093660677 stripped Transform: diff --git a/org.mixedrealitytoolkit.uxcomponents.noncanvas/ListMenu/ListMenu_132x168mm_ToggleSwitch.prefab b/org.mixedrealitytoolkit.uxcomponents.noncanvas/ListMenu/ListMenu_132x168mm_ToggleSwitch.prefab index 3776f0ce3..322b0eee7 100644 --- a/org.mixedrealitytoolkit.uxcomponents.noncanvas/ListMenu/ListMenu_132x168mm_ToggleSwitch.prefab +++ b/org.mixedrealitytoolkit.uxcomponents.noncanvas/ListMenu/ListMenu_132x168mm_ToggleSwitch.prefab @@ -5,16 +5,13 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 6471251024058146536} m_Modifications: - target: {fileID: 1947733702553647451, guid: 8ace9c04082e8ce4ea440f9bef681ce3, type: 3} propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 6366612888026126601, guid: 8ace9c04082e8ce4ea440f9bef681ce3, type: 3} - propertyPath: m_RootOrder - value: 6 - objectReference: {fileID: 0} - target: {fileID: 6366612888026126601, guid: 8ace9c04082e8ce4ea440f9bef681ce3, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -64,7 +61,15 @@ PrefabInstance: value: PressableButton_128x32mm_IconAndText_L (2) objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 8ace9c04082e8ce4ea440f9bef681ce3, type: 3} +--- !u!4 &5204891528313127955 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6366612888026126601, guid: 8ace9c04082e8ce4ea440f9bef681ce3, type: 3} + m_PrefabInstance: {fileID: 1180433433868098842} + m_PrefabAsset: {fileID: 0} --- !u!1 &5204891528832697074 stripped GameObject: m_CorrespondingSourceObject: {fileID: 6366612889619439592, guid: 8ace9c04082e8ce4ea440f9bef681ce3, type: 3} @@ -75,16 +80,13 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 6471251024058146536} m_Modifications: - target: {fileID: 1947733702553647451, guid: 8ace9c04082e8ce4ea440f9bef681ce3, type: 3} propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 6366612888026126601, guid: 8ace9c04082e8ce4ea440f9bef681ce3, type: 3} - propertyPath: m_RootOrder - value: 7 - objectReference: {fileID: 0} - target: {fileID: 6366612888026126601, guid: 8ace9c04082e8ce4ea440f9bef681ce3, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -134,27 +136,32 @@ PrefabInstance: value: PressableButton_128x32mm_IconAndText_L (3) objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 8ace9c04082e8ce4ea440f9bef681ce3, type: 3} --- !u!1 &4759047231520021938 stripped GameObject: m_CorrespondingSourceObject: {fileID: 6366612889619439592, guid: 8ace9c04082e8ce4ea440f9bef681ce3, type: 3} m_PrefabInstance: {fileID: 1896376696651514458} m_PrefabAsset: {fileID: 0} +--- !u!4 &4759047233146886995 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6366612888026126601, guid: 8ace9c04082e8ce4ea440f9bef681ce3, type: 3} + m_PrefabInstance: {fileID: 1896376696651514458} + m_PrefabAsset: {fileID: 0} --- !u!1001 &5029982285798313861 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 6471251024058146536} m_Modifications: - target: {fileID: 1947733702553647451, guid: 8ace9c04082e8ce4ea440f9bef681ce3, type: 3} propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 6366612888026126601, guid: 8ace9c04082e8ce4ea440f9bef681ce3, type: 3} - propertyPath: m_RootOrder - value: 5 - objectReference: {fileID: 0} - target: {fileID: 6366612888026126601, guid: 8ace9c04082e8ce4ea440f9bef681ce3, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -204,7 +211,15 @@ PrefabInstance: value: PressableButton_128x32mm_IconAndText_L (1) objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 8ace9c04082e8ce4ea440f9bef681ce3, type: 3} +--- !u!4 &2131564427797632652 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6366612888026126601, guid: 8ace9c04082e8ce4ea440f9bef681ce3, type: 3} + m_PrefabInstance: {fileID: 5029982285798313861} + m_PrefabAsset: {fileID: 0} --- !u!1 &2131564428350754925 stripped GameObject: m_CorrespondingSourceObject: {fileID: 6366612889619439592, guid: 8ace9c04082e8ce4ea440f9bef681ce3, type: 3} @@ -215,16 +230,13 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 6471251024058146536} m_Modifications: - target: {fileID: 1947733702553647451, guid: 8ace9c04082e8ce4ea440f9bef681ce3, type: 3} propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 6366612888026126601, guid: 8ace9c04082e8ce4ea440f9bef681ce3, type: 3} - propertyPath: m_RootOrder - value: 4 - objectReference: {fileID: 0} - target: {fileID: 6366612888026126601, guid: 8ace9c04082e8ce4ea440f9bef681ce3, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -274,31 +286,32 @@ PrefabInstance: value: PressableButton_128x32mm_IconAndText_L objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 8ace9c04082e8ce4ea440f9bef681ce3, type: 3} --- !u!1 &762297244846027212 stripped GameObject: m_CorrespondingSourceObject: {fileID: 6366612889619439592, guid: 8ace9c04082e8ce4ea440f9bef681ce3, type: 3} m_PrefabInstance: {fileID: 5966981429127474724} m_PrefabAsset: {fileID: 0} +--- !u!4 &762297245399152429 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6366612888026126601, guid: 8ace9c04082e8ce4ea440f9bef681ce3, type: 3} + m_PrefabInstance: {fileID: 5966981429127474724} + m_PrefabAsset: {fileID: 0} --- !u!1001 &8244725073302577178 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 2399235965570136731, guid: d54d4850a15598940b56df0456b98b18, type: 3} propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 2414079005234473753, guid: d54d4850a15598940b56df0456b98b18, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2439666413094583957, guid: d54d4850a15598940b56df0456b98b18, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - target: {fileID: 3145101612266733298, guid: d54d4850a15598940b56df0456b98b18, type: 3} propertyPath: m_LocalPosition.y value: -0.0645 @@ -308,29 +321,21 @@ PrefabInstance: value: 4 objectReference: {fileID: 0} - target: {fileID: 3399567114687463042, guid: d54d4850a15598940b56df0456b98b18, type: 3} - propertyPath: objectBarObjects.Array.data[0] + propertyPath: 'objectBarObjects.Array.data[0]' value: objectReference: {fileID: 762297244846027212} - target: {fileID: 3399567114687463042, guid: d54d4850a15598940b56df0456b98b18, type: 3} - propertyPath: objectBarObjects.Array.data[1] + propertyPath: 'objectBarObjects.Array.data[1]' value: objectReference: {fileID: 2131564428350754925} - target: {fileID: 3399567114687463042, guid: d54d4850a15598940b56df0456b98b18, type: 3} - propertyPath: objectBarObjects.Array.data[2] + propertyPath: 'objectBarObjects.Array.data[2]' value: objectReference: {fileID: 5204891528832697074} - target: {fileID: 3399567114687463042, guid: d54d4850a15598940b56df0456b98b18, type: 3} - propertyPath: objectBarObjects.Array.data[3] + propertyPath: 'objectBarObjects.Array.data[3]' value: objectReference: {fileID: 4759047231520021938} - - target: {fileID: 3399567114687463042, guid: d54d4850a15598940b56df0456b98b18, type: 3} - propertyPath: objectBarObjects.Array.data[4] - value: - objectReference: {fileID: 0} - - target: {fileID: 3399567114687463042, guid: d54d4850a15598940b56df0456b98b18, type: 3} - propertyPath: objectBarObjects.Array.data[5] - value: - objectReference: {fileID: 0} - target: {fileID: 3585472853639024554, guid: d54d4850a15598940b56df0456b98b18, type: 3} propertyPath: m_IsActive value: 0 @@ -343,10 +348,6 @@ PrefabInstance: propertyPath: m_Name value: ListMenu_132x168mm_ToggleSwitch objectReference: {fileID: 0} - - target: {fileID: 4750517851954577811, guid: d54d4850a15598940b56df0456b98b18, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - target: {fileID: 4750517851954577811, guid: d54d4850a15598940b56df0456b98b18, type: 3} propertyPath: m_LocalPosition.x value: 0.9446 @@ -400,6 +401,21 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 3145101612266733298, guid: d54d4850a15598940b56df0456b98b18, type: 3} + insertIndex: -1 + addedObject: {fileID: 762297245399152429} + - targetCorrespondingSourceObject: {fileID: 3145101612266733298, guid: d54d4850a15598940b56df0456b98b18, type: 3} + insertIndex: -1 + addedObject: {fileID: 2131564427797632652} + - targetCorrespondingSourceObject: {fileID: 3145101612266733298, guid: d54d4850a15598940b56df0456b98b18, type: 3} + insertIndex: -1 + addedObject: {fileID: 5204891528313127955} + - targetCorrespondingSourceObject: {fileID: 3145101612266733298, guid: d54d4850a15598940b56df0456b98b18, type: 3} + insertIndex: -1 + addedObject: {fileID: 4759047233146886995} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: d54d4850a15598940b56df0456b98b18, type: 3} --- !u!4 &6471251024058146536 stripped Transform: diff --git a/org.mixedrealitytoolkit.uxcomponents.noncanvas/ListMenu/ListMenu_168x168mm_IconAndText.prefab b/org.mixedrealitytoolkit.uxcomponents.noncanvas/ListMenu/ListMenu_168x168mm_IconAndText.prefab index e46d97bd8..e8d95d532 100644 --- a/org.mixedrealitytoolkit.uxcomponents.noncanvas/ListMenu/ListMenu_168x168mm_IconAndText.prefab +++ b/org.mixedrealitytoolkit.uxcomponents.noncanvas/ListMenu/ListMenu_168x168mm_IconAndText.prefab @@ -5,6 +5,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2142693988633390172} m_Modifications: - target: {fileID: 3481927860371846653, guid: a69170382c049914c9866f5914e0adee, type: 3} @@ -15,10 +16,6 @@ PrefabInstance: propertyPath: m_Name value: PressableButton_160x32mm_IconAndText_L (1) objectReference: {fileID: 0} - - target: {fileID: 8290906169279731119, guid: a69170382c049914c9866f5914e0adee, type: 3} - propertyPath: m_RootOrder - value: 5 - objectReference: {fileID: 0} - target: {fileID: 8290906169279731119, guid: a69170382c049914c9866f5914e0adee, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -60,12 +57,21 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a69170382c049914c9866f5914e0adee, type: 3} +--- !u!4 &6821786778783004397 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8290906169279731119, guid: a69170382c049914c9866f5914e0adee, type: 3} + m_PrefabInstance: {fileID: 3289015128259978050} + m_PrefabAsset: {fileID: 0} --- !u!1001 &4050427077377470489 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2142693988633390172} m_Modifications: - target: {fileID: 3481927860371846653, guid: a69170382c049914c9866f5914e0adee, type: 3} @@ -76,10 +82,6 @@ PrefabInstance: propertyPath: m_Name value: PressableButton_160x32mm_IconAndText_L objectReference: {fileID: 0} - - target: {fileID: 8290906169279731119, guid: a69170382c049914c9866f5914e0adee, type: 3} - propertyPath: m_RootOrder - value: 4 - objectReference: {fileID: 0} - target: {fileID: 8290906169279731119, guid: a69170382c049914c9866f5914e0adee, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -121,12 +123,21 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a69170382c049914c9866f5914e0adee, type: 3} +--- !u!4 &5420423879031416246 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8290906169279731119, guid: a69170382c049914c9866f5914e0adee, type: 3} + m_PrefabInstance: {fileID: 4050427077377470489} + m_PrefabAsset: {fileID: 0} --- !u!1001 &4669113102317678795 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2142693988633390172} m_Modifications: - target: {fileID: 3481927860371846653, guid: a69170382c049914c9866f5914e0adee, type: 3} @@ -137,10 +148,6 @@ PrefabInstance: propertyPath: m_Name value: PressableButton_160x32mm_IconAndText_L (2) objectReference: {fileID: 0} - - target: {fileID: 8290906169279731119, guid: a69170382c049914c9866f5914e0adee, type: 3} - propertyPath: m_RootOrder - value: 6 - objectReference: {fileID: 0} - target: {fileID: 8290906169279731119, guid: a69170382c049914c9866f5914e0adee, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -182,12 +189,21 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a69170382c049914c9866f5914e0adee, type: 3} +--- !u!4 &3729880558663574884 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8290906169279731119, guid: a69170382c049914c9866f5914e0adee, type: 3} + m_PrefabInstance: {fileID: 4669113102317678795} + m_PrefabAsset: {fileID: 0} --- !u!1001 &5290990824531972651 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 439186309502415271, guid: 6567dce352f0d514498586fe24081f1c, type: 3} @@ -198,10 +214,6 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 4510811711447679254, guid: 6567dce352f0d514498586fe24081f1c, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - target: {fileID: 4510811711447679254, guid: 6567dce352f0d514498586fe24081f1c, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -255,6 +267,21 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 6111667044297473655, guid: 6567dce352f0d514498586fe24081f1c, type: 3} + insertIndex: -1 + addedObject: {fileID: 5420423879031416246} + - targetCorrespondingSourceObject: {fileID: 6111667044297473655, guid: 6567dce352f0d514498586fe24081f1c, type: 3} + insertIndex: -1 + addedObject: {fileID: 6821786778783004397} + - targetCorrespondingSourceObject: {fileID: 6111667044297473655, guid: 6567dce352f0d514498586fe24081f1c, type: 3} + insertIndex: -1 + addedObject: {fileID: 3729880558663574884} + - targetCorrespondingSourceObject: {fileID: 6111667044297473655, guid: 6567dce352f0d514498586fe24081f1c, type: 3} + insertIndex: -1 + addedObject: {fileID: 3332691472421203108} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 6567dce352f0d514498586fe24081f1c, type: 3} --- !u!4 &2142693988633390172 stripped Transform: @@ -266,6 +293,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2142693988633390172} m_Modifications: - target: {fileID: 3481927860371846653, guid: a69170382c049914c9866f5914e0adee, type: 3} @@ -276,10 +304,6 @@ PrefabInstance: propertyPath: m_Name value: PressableButton_160x32mm_IconAndText_L (3) objectReference: {fileID: 0} - - target: {fileID: 8290906169279731119, guid: a69170382c049914c9866f5914e0adee, type: 3} - propertyPath: m_RootOrder - value: 7 - objectReference: {fileID: 0} - target: {fileID: 8290906169279731119, guid: a69170382c049914c9866f5914e0adee, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -321,4 +345,12 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a69170382c049914c9866f5914e0adee, type: 3} +--- !u!4 &3332691472421203108 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8290906169279731119, guid: a69170382c049914c9866f5914e0adee, type: 3} + m_PrefabInstance: {fileID: 6723643377388157195} + m_PrefabAsset: {fileID: 0} diff --git a/org.mixedrealitytoolkit.uxcomponents.noncanvas/ListMenu/ListMenu_168x168mm_RadioToggleCollection.prefab b/org.mixedrealitytoolkit.uxcomponents.noncanvas/ListMenu/ListMenu_168x168mm_RadioToggleCollection.prefab index 12d225c8e..48cd11662 100644 --- a/org.mixedrealitytoolkit.uxcomponents.noncanvas/ListMenu/ListMenu_168x168mm_RadioToggleCollection.prefab +++ b/org.mixedrealitytoolkit.uxcomponents.noncanvas/ListMenu/ListMenu_168x168mm_RadioToggleCollection.prefab @@ -5,12 +5,9 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2776112012443186720} m_Modifications: - - target: {fileID: 3966874216475342198, guid: 3e1e99b2fe1097046bd53bf2066727d3, type: 3} - propertyPath: canDeselectToggle - value: 0 - objectReference: {fileID: 0} - target: {fileID: 3966874216475342198, guid: 3e1e99b2fe1097046bd53bf2066727d3, type: 3} propertyPath: k__BackingField value: 2 @@ -19,10 +16,6 @@ PrefabInstance: propertyPath: m_Name value: TogglePressableButton_160x32mm_Radio_L (3) objectReference: {fileID: 0} - - target: {fileID: 4392262143601636592, guid: 3e1e99b2fe1097046bd53bf2066727d3, type: 3} - propertyPath: m_RootOrder - value: 11 - objectReference: {fileID: 0} - target: {fileID: 4392262143601636592, guid: 3e1e99b2fe1097046bd53bf2066727d3, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -68,6 +61,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 3e1e99b2fe1097046bd53bf2066727d3, type: 3} --- !u!114 &3814334275375410175 stripped MonoBehaviour: @@ -80,17 +76,19 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c32e8a7644144f8419bb881ad588ed0e, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!4 &4545931789565651577 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4392262143601636592, guid: 3e1e99b2fe1097046bd53bf2066727d3, type: 3} + m_PrefabInstance: {fileID: 279812263604526729} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1374245459386607014 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2776112012443186720} m_Modifications: - - target: {fileID: 3966874216475342198, guid: 3e1e99b2fe1097046bd53bf2066727d3, type: 3} - propertyPath: canDeselectToggle - value: 0 - objectReference: {fileID: 0} - target: {fileID: 3966874216475342198, guid: 3e1e99b2fe1097046bd53bf2066727d3, type: 3} propertyPath: k__BackingField value: 2 @@ -99,10 +97,6 @@ PrefabInstance: propertyPath: m_Name value: TogglePressableButton_160x32mm_Radio_L (1) objectReference: {fileID: 0} - - target: {fileID: 4392262143601636592, guid: 3e1e99b2fe1097046bd53bf2066727d3, type: 3} - propertyPath: m_RootOrder - value: 9 - objectReference: {fileID: 0} - target: {fileID: 4392262143601636592, guid: 3e1e99b2fe1097046bd53bf2066727d3, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -148,6 +142,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 3e1e99b2fe1097046bd53bf2066727d3, type: 3} --- !u!114 &2602913337608343760 stripped MonoBehaviour: @@ -160,17 +157,19 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c32e8a7644144f8419bb881ad588ed0e, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!4 &3451516340520341846 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4392262143601636592, guid: 3e1e99b2fe1097046bd53bf2066727d3, type: 3} + m_PrefabInstance: {fileID: 1374245459386607014} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1756818032933125390 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2776112012443186720} m_Modifications: - - target: {fileID: 3966874216475342198, guid: 3e1e99b2fe1097046bd53bf2066727d3, type: 3} - propertyPath: canDeselectToggle - value: 0 - objectReference: {fileID: 0} - target: {fileID: 3966874216475342198, guid: 3e1e99b2fe1097046bd53bf2066727d3, type: 3} propertyPath: k__BackingField value: 2 @@ -179,10 +178,6 @@ PrefabInstance: propertyPath: m_Name value: TogglePressableButton_160x32mm_Radio_L objectReference: {fileID: 0} - - target: {fileID: 4392262143601636592, guid: 3e1e99b2fe1097046bd53bf2066727d3, type: 3} - propertyPath: m_RootOrder - value: 8 - objectReference: {fileID: 0} - target: {fileID: 4392262143601636592, guid: 3e1e99b2fe1097046bd53bf2066727d3, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -228,7 +223,15 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 3e1e99b2fe1097046bd53bf2066727d3, type: 3} +--- !u!4 &2636025889833339390 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4392262143601636592, guid: 3e1e99b2fe1097046bd53bf2066727d3, type: 3} + m_PrefabInstance: {fileID: 1756818032933125390} + m_PrefabAsset: {fileID: 0} --- !u!114 &3417198183226378360 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 3966874216475342198, guid: 3e1e99b2fe1097046bd53bf2066727d3, type: 3} @@ -245,12 +248,9 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2776112012443186720} m_Modifications: - - target: {fileID: 3966874216475342198, guid: 3e1e99b2fe1097046bd53bf2066727d3, type: 3} - propertyPath: canDeselectToggle - value: 0 - objectReference: {fileID: 0} - target: {fileID: 3966874216475342198, guid: 3e1e99b2fe1097046bd53bf2066727d3, type: 3} propertyPath: k__BackingField value: 2 @@ -259,10 +259,6 @@ PrefabInstance: propertyPath: m_Name value: TogglePressableButton_160x32mm_Radio_L (2) objectReference: {fileID: 0} - - target: {fileID: 4392262143601636592, guid: 3e1e99b2fe1097046bd53bf2066727d3, type: 3} - propertyPath: m_RootOrder - value: 10 - objectReference: {fileID: 0} - target: {fileID: 4392262143601636592, guid: 3e1e99b2fe1097046bd53bf2066727d3, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -308,7 +304,15 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 3e1e99b2fe1097046bd53bf2066727d3, type: 3} +--- !u!4 &1612171640098506742 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4392262143601636592, guid: 3e1e99b2fe1097046bd53bf2066727d3, type: 3} + m_PrefabInstance: {fileID: 3074804837163119366} + m_PrefabAsset: {fileID: 0} --- !u!114 &2136621161476884080 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 3966874216475342198, guid: 3e1e99b2fe1097046bd53bf2066727d3, type: 3} @@ -325,12 +329,9 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 309812799848155430, guid: 49b6ad76fc132fc489e1bfbb664b32c7, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - target: {fileID: 309812799848155430, guid: 49b6ad76fc132fc489e1bfbb664b32c7, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -399,6 +400,24 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 7927516803987453511, guid: 49b6ad76fc132fc489e1bfbb664b32c7, type: 3} + insertIndex: -1 + addedObject: {fileID: 2636025889833339390} + - targetCorrespondingSourceObject: {fileID: 7927516803987453511, guid: 49b6ad76fc132fc489e1bfbb664b32c7, type: 3} + insertIndex: -1 + addedObject: {fileID: 3451516340520341846} + - targetCorrespondingSourceObject: {fileID: 7927516803987453511, guid: 49b6ad76fc132fc489e1bfbb664b32c7, type: 3} + insertIndex: -1 + addedObject: {fileID: 1612171640098506742} + - targetCorrespondingSourceObject: {fileID: 7927516803987453511, guid: 49b6ad76fc132fc489e1bfbb664b32c7, type: 3} + insertIndex: -1 + addedObject: {fileID: 4545931789565651577} + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 4730860839926973046, guid: 49b6ad76fc132fc489e1bfbb664b32c7, type: 3} + insertIndex: -1 + addedObject: {fileID: 9102704827051185613} m_SourcePrefab: {fileID: 100100000, guid: 49b6ad76fc132fc489e1bfbb664b32c7, type: 3} --- !u!1 &659194041059312145 stripped GameObject: diff --git a/org.mixedrealitytoolkit.uxcomponents.noncanvas/ListMenu/ListMenu_168x168mm_RoundCheck.prefab b/org.mixedrealitytoolkit.uxcomponents.noncanvas/ListMenu/ListMenu_168x168mm_RoundCheck.prefab index d573dc536..363f4ee4d 100644 --- a/org.mixedrealitytoolkit.uxcomponents.noncanvas/ListMenu/ListMenu_168x168mm_RoundCheck.prefab +++ b/org.mixedrealitytoolkit.uxcomponents.noncanvas/ListMenu/ListMenu_168x168mm_RoundCheck.prefab @@ -5,16 +5,13 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 340578924453632057} m_Modifications: - target: {fileID: 1841487703143564163, guid: b5123914d76037647bcd4c8209908ad0, type: 3} propertyPath: m_Name value: TogglePressableButton_160x32mm_RoundCheck_L objectReference: {fileID: 0} - - target: {fileID: 1841487703696688482, guid: b5123914d76037647bcd4c8209908ad0, type: 3} - propertyPath: m_RootOrder - value: 8 - objectReference: {fileID: 0} - target: {fileID: 1841487703696688482, guid: b5123914d76037647bcd4c8209908ad0, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -60,22 +57,27 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b5123914d76037647bcd4c8209908ad0, type: 3} +--- !u!4 &296314997202239058 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1841487703696688482, guid: b5123914d76037647bcd4c8209908ad0, type: 3} + m_PrefabInstance: {fileID: 2131046657042381616} + m_PrefabAsset: {fileID: 0} --- !u!1001 &4017600396897836743 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 340578924453632057} m_Modifications: - target: {fileID: 1841487703143564163, guid: b5123914d76037647bcd4c8209908ad0, type: 3} propertyPath: m_Name value: TogglePressableButton_160x32mm_RoundCheck_L (1) objectReference: {fileID: 0} - - target: {fileID: 1841487703696688482, guid: b5123914d76037647bcd4c8209908ad0, type: 3} - propertyPath: m_RootOrder - value: 9 - objectReference: {fileID: 0} - target: {fileID: 1841487703696688482, guid: b5123914d76037647bcd4c8209908ad0, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -121,22 +123,27 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b5123914d76037647bcd4c8209908ad0, type: 3} +--- !u!4 &3336926569750272933 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1841487703696688482, guid: b5123914d76037647bcd4c8209908ad0, type: 3} + m_PrefabInstance: {fileID: 4017600396897836743} + m_PrefabAsset: {fileID: 0} --- !u!1001 &4418761375940159311 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 340578924453632057} m_Modifications: - target: {fileID: 1841487703143564163, guid: b5123914d76037647bcd4c8209908ad0, type: 3} propertyPath: m_Name value: TogglePressableButton_160x32mm_RoundCheck_L (3) objectReference: {fileID: 0} - - target: {fileID: 1841487703696688482, guid: b5123914d76037647bcd4c8209908ad0, type: 3} - propertyPath: m_RootOrder - value: 11 - objectReference: {fileID: 0} - target: {fileID: 1841487703696688482, guid: b5123914d76037647bcd4c8209908ad0, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -182,22 +189,27 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b5123914d76037647bcd4c8209908ad0, type: 3} +--- !u!4 &2656243346300101165 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1841487703696688482, guid: b5123914d76037647bcd4c8209908ad0, type: 3} + m_PrefabInstance: {fileID: 4418761375940159311} + m_PrefabAsset: {fileID: 0} --- !u!1001 &4824959916554565024 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 340578924453632057} m_Modifications: - target: {fileID: 1841487703143564163, guid: b5123914d76037647bcd4c8209908ad0, type: 3} propertyPath: m_Name value: TogglePressableButton_160x32mm_RoundCheck_L (2) objectReference: {fileID: 0} - - target: {fileID: 1841487703696688482, guid: b5123914d76037647bcd4c8209908ad0, type: 3} - propertyPath: m_RootOrder - value: 10 - objectReference: {fileID: 0} - target: {fileID: 1841487703696688482, guid: b5123914d76037647bcd4c8209908ad0, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -243,18 +255,23 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b5123914d76037647bcd4c8209908ad0, type: 3} +--- !u!4 &6592130990954311874 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1841487703696688482, guid: b5123914d76037647bcd4c8209908ad0, type: 3} + m_PrefabInstance: {fileID: 4824959916554565024} + m_PrefabAsset: {fileID: 0} --- !u!1001 &7691523856742723198 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 309812799848155430, guid: 49b6ad76fc132fc489e1bfbb664b32c7, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - target: {fileID: 309812799848155430, guid: 49b6ad76fc132fc489e1bfbb664b32c7, type: 3} propertyPath: m_LocalPosition.x value: 0.3843 @@ -320,6 +337,21 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 7927516803987453511, guid: 49b6ad76fc132fc489e1bfbb664b32c7, type: 3} + insertIndex: -1 + addedObject: {fileID: 296314997202239058} + - targetCorrespondingSourceObject: {fileID: 7927516803987453511, guid: 49b6ad76fc132fc489e1bfbb664b32c7, type: 3} + insertIndex: -1 + addedObject: {fileID: 3336926569750272933} + - targetCorrespondingSourceObject: {fileID: 7927516803987453511, guid: 49b6ad76fc132fc489e1bfbb664b32c7, type: 3} + insertIndex: -1 + addedObject: {fileID: 6592130990954311874} + - targetCorrespondingSourceObject: {fileID: 7927516803987453511, guid: 49b6ad76fc132fc489e1bfbb664b32c7, type: 3} + insertIndex: -1 + addedObject: {fileID: 2656243346300101165} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 49b6ad76fc132fc489e1bfbb664b32c7, type: 3} --- !u!4 &340578924453632057 stripped Transform: diff --git a/org.mixedrealitytoolkit.uxcomponents.noncanvas/ListMenu/ListMenu_168x168mm_SquareCheck.prefab b/org.mixedrealitytoolkit.uxcomponents.noncanvas/ListMenu/ListMenu_168x168mm_SquareCheck.prefab index 429a2797a..91cd46c86 100644 --- a/org.mixedrealitytoolkit.uxcomponents.noncanvas/ListMenu/ListMenu_168x168mm_SquareCheck.prefab +++ b/org.mixedrealitytoolkit.uxcomponents.noncanvas/ListMenu/ListMenu_168x168mm_SquareCheck.prefab @@ -5,16 +5,13 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 7927516803987453511} m_Modifications: - target: {fileID: 4310492076816344796, guid: a508d1f64cf0cc5448908128ae1fcf82, type: 3} propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 8686472260681893518, guid: a508d1f64cf0cc5448908128ae1fcf82, type: 3} - propertyPath: m_RootOrder - value: 5 - objectReference: {fileID: 0} - target: {fileID: 8686472260681893518, guid: a508d1f64cf0cc5448908128ae1fcf82, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -60,22 +57,27 @@ PrefabInstance: value: TogglePressableButton_160x32mm_SquareCheck_L (1) objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a508d1f64cf0cc5448908128ae1fcf82, type: 3} +--- !u!4 &5511019691187166549 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8686472260681893518, guid: a508d1f64cf0cc5448908128ae1fcf82, type: 3} + m_PrefabInstance: {fileID: 3816694351180749787} + m_PrefabAsset: {fileID: 0} --- !u!1001 &3890150096148776469 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 7927516803987453511} m_Modifications: - target: {fileID: 4310492076816344796, guid: a508d1f64cf0cc5448908128ae1fcf82, type: 3} propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 8686472260681893518, guid: a508d1f64cf0cc5448908128ae1fcf82, type: 3} - propertyPath: m_RootOrder - value: 4 - objectReference: {fileID: 0} - target: {fileID: 8686472260681893518, guid: a508d1f64cf0cc5448908128ae1fcf82, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -121,22 +123,27 @@ PrefabInstance: value: TogglePressableButton_160x32mm_SquareCheck_L objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a508d1f64cf0cc5448908128ae1fcf82, type: 3} +--- !u!4 &5579989183866126491 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8686472260681893518, guid: a508d1f64cf0cc5448908128ae1fcf82, type: 3} + m_PrefabInstance: {fileID: 3890150096148776469} + m_PrefabAsset: {fileID: 0} --- !u!1001 &4230790420221080724 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 7927516803987453511} m_Modifications: - target: {fileID: 4310492076816344796, guid: a508d1f64cf0cc5448908128ae1fcf82, type: 3} propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 8686472260681893518, guid: a508d1f64cf0cc5448908128ae1fcf82, type: 3} - propertyPath: m_RootOrder - value: 6 - objectReference: {fileID: 0} - target: {fileID: 8686472260681893518, guid: a508d1f64cf0cc5448908128ae1fcf82, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -182,12 +189,21 @@ PrefabInstance: value: TogglePressableButton_160x32mm_SquareCheck_L (2) objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a508d1f64cf0cc5448908128ae1fcf82, type: 3} +--- !u!4 &4772202652549100058 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8686472260681893518, guid: a508d1f64cf0cc5448908128ae1fcf82, type: 3} + m_PrefabInstance: {fileID: 4230790420221080724} + m_PrefabAsset: {fileID: 0} --- !u!1001 &4239349890608744496 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 439186309502415271, guid: 6567dce352f0d514498586fe24081f1c, type: 3} @@ -198,10 +214,6 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 4510811711447679254, guid: 6567dce352f0d514498586fe24081f1c, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - target: {fileID: 4510811711447679254, guid: 6567dce352f0d514498586fe24081f1c, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -255,6 +267,21 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 6111667044297473655, guid: 6567dce352f0d514498586fe24081f1c, type: 3} + insertIndex: -1 + addedObject: {fileID: 5579989183866126491} + - targetCorrespondingSourceObject: {fileID: 6111667044297473655, guid: 6567dce352f0d514498586fe24081f1c, type: 3} + insertIndex: -1 + addedObject: {fileID: 5511019691187166549} + - targetCorrespondingSourceObject: {fileID: 6111667044297473655, guid: 6567dce352f0d514498586fe24081f1c, type: 3} + insertIndex: -1 + addedObject: {fileID: 4772202652549100058} + - targetCorrespondingSourceObject: {fileID: 6111667044297473655, guid: 6567dce352f0d514498586fe24081f1c, type: 3} + insertIndex: -1 + addedObject: {fileID: 3530228032149463520} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 6567dce352f0d514498586fe24081f1c, type: 3} --- !u!4 &7927516803987453511 stripped Transform: @@ -266,16 +293,13 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 7927516803987453511} m_Modifications: - target: {fileID: 4310492076816344796, guid: a508d1f64cf0cc5448908128ae1fcf82, type: 3} propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 8686472260681893518, guid: a508d1f64cf0cc5448908128ae1fcf82, type: 3} - propertyPath: m_RootOrder - value: 7 - objectReference: {fileID: 0} - target: {fileID: 8686472260681893518, guid: a508d1f64cf0cc5448908128ae1fcf82, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -321,4 +345,12 @@ PrefabInstance: value: TogglePressableButton_160x32mm_SquareCheck_L (3) objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a508d1f64cf0cc5448908128ae1fcf82, type: 3} +--- !u!4 &3530228032149463520 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8686472260681893518, guid: a508d1f64cf0cc5448908128ae1fcf82, type: 3} + m_PrefabInstance: {fileID: 5220076379850123118} + m_PrefabAsset: {fileID: 0} diff --git a/org.mixedrealitytoolkit.uxcomponents.noncanvas/ListMenu/ListMenu_168x168mm_ToggleSwitch.prefab b/org.mixedrealitytoolkit.uxcomponents.noncanvas/ListMenu/ListMenu_168x168mm_ToggleSwitch.prefab index f188fa8f5..4483304b1 100644 --- a/org.mixedrealitytoolkit.uxcomponents.noncanvas/ListMenu/ListMenu_168x168mm_ToggleSwitch.prefab +++ b/org.mixedrealitytoolkit.uxcomponents.noncanvas/ListMenu/ListMenu_168x168mm_ToggleSwitch.prefab @@ -5,16 +5,13 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 3251862855226327459} m_Modifications: - target: {fileID: 191803137951876204, guid: b7b55b04f2004024fba97cc25b2cde3e, type: 3} propertyPath: m_Name value: TogglePressableButton_160x32mm_Switch_L (3) objectReference: {fileID: 0} - - target: {fileID: 191803139578741389, guid: b7b55b04f2004024fba97cc25b2cde3e, type: 3} - propertyPath: m_RootOrder - value: 11 - objectReference: {fileID: 0} - target: {fileID: 191803139578741389, guid: b7b55b04f2004024fba97cc25b2cde3e, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -60,22 +57,27 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b7b55b04f2004024fba97cc25b2cde3e, type: 3} +--- !u!4 &163396405288745030 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 191803139578741389, guid: b7b55b04f2004024fba97cc25b2cde3e, type: 3} + m_PrefabInstance: {fileID: 66968892218211019} + m_PrefabAsset: {fileID: 0} --- !u!1001 &2222115872810566924 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 3251862855226327459} m_Modifications: - target: {fileID: 191803137951876204, guid: b7b55b04f2004024fba97cc25b2cde3e, type: 3} propertyPath: m_Name value: TogglePressableButton_160x32mm_Switch_L (1) objectReference: {fileID: 0} - - target: {fileID: 191803139578741389, guid: b7b55b04f2004024fba97cc25b2cde3e, type: 3} - propertyPath: m_RootOrder - value: 9 - objectReference: {fileID: 0} - target: {fileID: 191803139578741389, guid: b7b55b04f2004024fba97cc25b2cde3e, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -121,12 +123,21 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b7b55b04f2004024fba97cc25b2cde3e, type: 3} +--- !u!4 &2053607811254110081 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 191803139578741389, guid: b7b55b04f2004024fba97cc25b2cde3e, type: 3} + m_PrefabInstance: {fileID: 2222115872810566924} + m_PrefabAsset: {fileID: 0} --- !u!1001 &3502833889835363839 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 3332691474015562309, guid: 3fb505a7f547bb44aa5edf1bbec53138, type: 3} @@ -149,10 +160,6 @@ PrefabInstance: propertyPath: m_Name value: ListMenu_168x168mm_ToggleSwitch objectReference: {fileID: 0} - - target: {fileID: 8643814256977285949, guid: 3fb505a7f547bb44aa5edf1bbec53138, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - target: {fileID: 8643814256977285949, guid: 3fb505a7f547bb44aa5edf1bbec53138, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -194,6 +201,21 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 2142693988633390172, guid: 3fb505a7f547bb44aa5edf1bbec53138, type: 3} + insertIndex: -1 + addedObject: {fileID: 8635523127390854701} + - targetCorrespondingSourceObject: {fileID: 2142693988633390172, guid: 3fb505a7f547bb44aa5edf1bbec53138, type: 3} + insertIndex: -1 + addedObject: {fileID: 2053607811254110081} + - targetCorrespondingSourceObject: {fileID: 2142693988633390172, guid: 3fb505a7f547bb44aa5edf1bbec53138, type: 3} + insertIndex: -1 + addedObject: {fileID: 4078307464274222643} + - targetCorrespondingSourceObject: {fileID: 2142693988633390172, guid: 3fb505a7f547bb44aa5edf1bbec53138, type: 3} + insertIndex: -1 + addedObject: {fileID: 163396405288745030} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 3fb505a7f547bb44aa5edf1bbec53138, type: 3} --- !u!4 &3251862855226327459 stripped Transform: @@ -205,16 +227,13 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 3251862855226327459} m_Modifications: - target: {fileID: 191803137951876204, guid: b7b55b04f2004024fba97cc25b2cde3e, type: 3} propertyPath: m_Name value: TogglePressableButton_160x32mm_Switch_L (2) objectReference: {fileID: 0} - - target: {fileID: 191803139578741389, guid: b7b55b04f2004024fba97cc25b2cde3e, type: 3} - propertyPath: m_RootOrder - value: 10 - objectReference: {fileID: 0} - target: {fileID: 191803139578741389, guid: b7b55b04f2004024fba97cc25b2cde3e, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -260,22 +279,27 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b7b55b04f2004024fba97cc25b2cde3e, type: 3} +--- !u!4 &4078307464274222643 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 191803139578741389, guid: b7b55b04f2004024fba97cc25b2cde3e, type: 3} + m_PrefabInstance: {fileID: 4192962267744492734} + m_PrefabAsset: {fileID: 0} --- !u!1001 &8466452257039719584 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 3251862855226327459} m_Modifications: - target: {fileID: 191803137951876204, guid: b7b55b04f2004024fba97cc25b2cde3e, type: 3} propertyPath: m_Name value: TogglePressableButton_160x32mm_Switch_L objectReference: {fileID: 0} - - target: {fileID: 191803139578741389, guid: b7b55b04f2004024fba97cc25b2cde3e, type: 3} - propertyPath: m_RootOrder - value: 8 - objectReference: {fileID: 0} - target: {fileID: 191803139578741389, guid: b7b55b04f2004024fba97cc25b2cde3e, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -321,4 +345,12 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b7b55b04f2004024fba97cc25b2cde3e, type: 3} +--- !u!4 &8635523127390854701 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 191803139578741389, guid: b7b55b04f2004024fba97cc25b2cde3e, type: 3} + m_PrefabInstance: {fileID: 8466452257039719584} + m_PrefabAsset: {fileID: 0} diff --git a/org.mixedrealitytoolkit.uxcomponents.noncanvas/ObjectBar/HorizontalAppBar.prefab b/org.mixedrealitytoolkit.uxcomponents.noncanvas/ObjectBar/HorizontalAppBar.prefab index a60ce82ae..1972bfb09 100644 --- a/org.mixedrealitytoolkit.uxcomponents.noncanvas/ObjectBar/HorizontalAppBar.prefab +++ b/org.mixedrealitytoolkit.uxcomponents.noncanvas/ObjectBar/HorizontalAppBar.prefab @@ -24,6 +24,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3433554895966514135} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -34,7 +35,6 @@ Transform: - {fileID: 383522639857287699} - {fileID: 383522640772357039} m_Father: {fileID: 3433554896176381700} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &3433554895966514137 MonoBehaviour: @@ -76,6 +76,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3433554896176381698} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.04899999, y: 0.0322, z: 0.018999979} m_LocalScale: {x: 1, y: 1, z: 1} @@ -84,7 +85,6 @@ Transform: - {fileID: 3433554895966514134} - {fileID: 1584525123498210643} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &3433554896176381701 MonoBehaviour: @@ -129,12 +129,9 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 3433554895966514134} m_Modifications: - - target: {fileID: 3095349751890438921, guid: e5b53b02ddc453d49a3a36a85164095f, type: 3} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - target: {fileID: 3095349751890438921, guid: e5b53b02ddc453d49a3a36a85164095f, type: 3} propertyPath: m_LocalPosition.x value: 0.064 @@ -184,6 +181,9 @@ PrefabInstance: value: objectReference: {fileID: 21300000, guid: e7a37761780007545a89ece9b43ce0e8, type: 3} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e5b53b02ddc453d49a3a36a85164095f, type: 3} --- !u!4 &383522639857287699 stripped Transform: @@ -200,16 +200,13 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 3433554896176381700} m_Modifications: - target: {fileID: 4125495309553998321, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} propertyPath: m_Name value: UIBackplate objectReference: {fileID: 0} - - target: {fileID: 4205010513405509735, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - target: {fileID: 4205010513405509735, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -271,6 +268,9 @@ PrefabInstance: value: 0.005 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} --- !u!4 &1584525123498210643 stripped Transform: @@ -287,44 +287,25 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 3433554895966514134} m_Modifications: - - target: {fileID: 2381766503070149263, guid: e5b53b02ddc453d49a3a36a85164095f, type: 3} - propertyPath: OnClicked.m_PersistentCalls.m_Calls.Array.size - value: 1 - objectReference: {fileID: 0} - target: {fileID: 2381766503070149263, guid: e5b53b02ddc453d49a3a36a85164095f, type: 3} propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.size value: 1 objectReference: {fileID: 0} - - target: {fileID: 2381766503070149263, guid: e5b53b02ddc453d49a3a36a85164095f, type: 3} - propertyPath: OnClicked.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - target: {fileID: 2381766503070149263, guid: e5b53b02ddc453d49a3a36a85164095f, type: 3} propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[0].m_Mode value: 1 objectReference: {fileID: 0} - - target: {fileID: 2381766503070149263, guid: e5b53b02ddc453d49a3a36a85164095f, type: 3} - propertyPath: OnClicked.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 3433554895966514137} - target: {fileID: 2381766503070149263, guid: e5b53b02ddc453d49a3a36a85164095f, type: 3} propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: objectReference: {fileID: 3433554895966514137} - - target: {fileID: 2381766503070149263, guid: e5b53b02ddc453d49a3a36a85164095f, type: 3} - propertyPath: OnClicked.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - target: {fileID: 2381766503070149263, guid: e5b53b02ddc453d49a3a36a85164095f, type: 3} propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[0].m_CallState value: 2 objectReference: {fileID: 0} - - target: {fileID: 2381766503070149263, guid: e5b53b02ddc453d49a3a36a85164095f, type: 3} - propertyPath: OnClicked.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: RemoveLastFromObjectBarList - objectReference: {fileID: 0} - target: {fileID: 2381766503070149263, guid: e5b53b02ddc453d49a3a36a85164095f, type: 3} propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName value: RemoveLastFromObjectBarList @@ -333,18 +314,10 @@ PrefabInstance: propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.size value: 1 objectReference: {fileID: 0} - - target: {fileID: 2381766503070149263, guid: e5b53b02ddc453d49a3a36a85164095f, type: 3} - propertyPath: isStatefulSelected.onEntered.m_PersistentCalls.m_Calls.Array.size - value: 1 - objectReference: {fileID: 0} - target: {fileID: 2381766503070149263, guid: e5b53b02ddc453d49a3a36a85164095f, type: 3} propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Mode value: 1 objectReference: {fileID: 0} - - target: {fileID: 2381766503070149263, guid: e5b53b02ddc453d49a3a36a85164095f, type: 3} - propertyPath: OnClicked.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: MixedReality.Toolkit.UX.ObjectBarAddRemoveItems, MixedReality.Toolkit.UXComponents - objectReference: {fileID: 0} - target: {fileID: 2381766503070149263, guid: e5b53b02ddc453d49a3a36a85164095f, type: 3} propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName value: MixedReality.Toolkit.UX.ObjectBarAddRemoveItems, MixedReality.Toolkit.UXComponents @@ -353,14 +326,6 @@ PrefabInstance: propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: objectReference: {fileID: 3433554895966514137} - - target: {fileID: 2381766503070149263, guid: e5b53b02ddc453d49a3a36a85164095f, type: 3} - propertyPath: isStatefulSelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2381766503070149263, guid: e5b53b02ddc453d49a3a36a85164095f, type: 3} - propertyPath: isStatefulSelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 3433554895966514137} - target: {fileID: 2381766503070149263, guid: e5b53b02ddc453d49a3a36a85164095f, type: 3} propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_CallState value: 2 @@ -369,26 +334,10 @@ PrefabInstance: propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName value: RemoveLastFromObjectBarList objectReference: {fileID: 0} - - target: {fileID: 2381766503070149263, guid: e5b53b02ddc453d49a3a36a85164095f, type: 3} - propertyPath: isStatefulSelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 2381766503070149263, guid: e5b53b02ddc453d49a3a36a85164095f, type: 3} - propertyPath: isStatefulSelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: RemoveLastFromObjectBarList - objectReference: {fileID: 0} - target: {fileID: 2381766503070149263, guid: e5b53b02ddc453d49a3a36a85164095f, type: 3} propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName value: MixedReality.Toolkit.UX.ObjectBarAddRemoveItems, MixedReality.Toolkit.UXComponents objectReference: {fileID: 0} - - target: {fileID: 2381766503070149263, guid: e5b53b02ddc453d49a3a36a85164095f, type: 3} - propertyPath: isStatefulSelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: MixedReality.Toolkit.UX.ObjectBarAddRemoveItems, MixedReality.Toolkit.UXComponents - objectReference: {fileID: 0} - - target: {fileID: 2381766503070149263, guid: e5b53b02ddc453d49a3a36a85164095f, type: 3} - propertyPath: OnClicked.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - target: {fileID: 2381766503070149263, guid: e5b53b02ddc453d49a3a36a85164095f, type: 3} propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName value: UnityEngine.Object, UnityEngine @@ -397,14 +346,6 @@ PrefabInstance: propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName value: UnityEngine.Object, UnityEngine objectReference: {fileID: 0} - - target: {fileID: 2381766503070149263, guid: e5b53b02ddc453d49a3a36a85164095f, type: 3} - propertyPath: isStatefulSelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - - target: {fileID: 3095349751890438921, guid: e5b53b02ddc453d49a3a36a85164095f, type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - target: {fileID: 3095349751890438921, guid: e5b53b02ddc453d49a3a36a85164095f, type: 3} propertyPath: m_LocalPosition.x value: 0.032 @@ -458,6 +399,9 @@ PrefabInstance: value: objectReference: {fileID: 21300000, guid: d78e812d92f277e4697483d4cb58238e, type: 3} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e5b53b02ddc453d49a3a36a85164095f, type: 3} --- !u!4 &383522639486788586 stripped Transform: @@ -474,44 +418,25 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 3433554895966514134} m_Modifications: - - target: {fileID: 2381766503070149263, guid: e5b53b02ddc453d49a3a36a85164095f, type: 3} - propertyPath: OnClicked.m_PersistentCalls.m_Calls.Array.size - value: 1 - objectReference: {fileID: 0} - target: {fileID: 2381766503070149263, guid: e5b53b02ddc453d49a3a36a85164095f, type: 3} propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.size value: 1 objectReference: {fileID: 0} - - target: {fileID: 2381766503070149263, guid: e5b53b02ddc453d49a3a36a85164095f, type: 3} - propertyPath: OnClicked.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - target: {fileID: 2381766503070149263, guid: e5b53b02ddc453d49a3a36a85164095f, type: 3} propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[0].m_Mode value: 1 objectReference: {fileID: 0} - - target: {fileID: 2381766503070149263, guid: e5b53b02ddc453d49a3a36a85164095f, type: 3} - propertyPath: OnClicked.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 3433554895966514137} - target: {fileID: 2381766503070149263, guid: e5b53b02ddc453d49a3a36a85164095f, type: 3} propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: objectReference: {fileID: 3433554895966514137} - - target: {fileID: 2381766503070149263, guid: e5b53b02ddc453d49a3a36a85164095f, type: 3} - propertyPath: OnClicked.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - target: {fileID: 2381766503070149263, guid: e5b53b02ddc453d49a3a36a85164095f, type: 3} propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[0].m_CallState value: 2 objectReference: {fileID: 0} - - target: {fileID: 2381766503070149263, guid: e5b53b02ddc453d49a3a36a85164095f, type: 3} - propertyPath: OnClicked.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: AddToObjectBarList - objectReference: {fileID: 0} - target: {fileID: 2381766503070149263, guid: e5b53b02ddc453d49a3a36a85164095f, type: 3} propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName value: AddToObjectBarList @@ -520,18 +445,10 @@ PrefabInstance: propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.size value: 1 objectReference: {fileID: 0} - - target: {fileID: 2381766503070149263, guid: e5b53b02ddc453d49a3a36a85164095f, type: 3} - propertyPath: isStatefulSelected.onEntered.m_PersistentCalls.m_Calls.Array.size - value: 1 - objectReference: {fileID: 0} - target: {fileID: 2381766503070149263, guid: e5b53b02ddc453d49a3a36a85164095f, type: 3} propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Mode value: 1 objectReference: {fileID: 0} - - target: {fileID: 2381766503070149263, guid: e5b53b02ddc453d49a3a36a85164095f, type: 3} - propertyPath: OnClicked.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: MixedReality.Toolkit.UX.ObjectBarAddRemoveItems, MixedReality.Toolkit.UXComponents - objectReference: {fileID: 0} - target: {fileID: 2381766503070149263, guid: e5b53b02ddc453d49a3a36a85164095f, type: 3} propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName value: MixedReality.Toolkit.UX.ObjectBarAddRemoveItems, MixedReality.Toolkit.UXComponents @@ -540,14 +457,6 @@ PrefabInstance: propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: objectReference: {fileID: 3433554895966514137} - - target: {fileID: 2381766503070149263, guid: e5b53b02ddc453d49a3a36a85164095f, type: 3} - propertyPath: isStatefulSelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2381766503070149263, guid: e5b53b02ddc453d49a3a36a85164095f, type: 3} - propertyPath: isStatefulSelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 3433554895966514137} - target: {fileID: 2381766503070149263, guid: e5b53b02ddc453d49a3a36a85164095f, type: 3} propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_CallState value: 2 @@ -556,26 +465,10 @@ PrefabInstance: propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName value: AddToObjectBarList objectReference: {fileID: 0} - - target: {fileID: 2381766503070149263, guid: e5b53b02ddc453d49a3a36a85164095f, type: 3} - propertyPath: isStatefulSelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 2381766503070149263, guid: e5b53b02ddc453d49a3a36a85164095f, type: 3} - propertyPath: isStatefulSelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: AddToObjectBarList - objectReference: {fileID: 0} - target: {fileID: 2381766503070149263, guid: e5b53b02ddc453d49a3a36a85164095f, type: 3} propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName value: MixedReality.Toolkit.UX.ObjectBarAddRemoveItems, MixedReality.Toolkit.UXComponents objectReference: {fileID: 0} - - target: {fileID: 2381766503070149263, guid: e5b53b02ddc453d49a3a36a85164095f, type: 3} - propertyPath: isStatefulSelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: MixedReality.Toolkit.UX.ObjectBarAddRemoveItems, MixedReality.Toolkit.UXComponents - objectReference: {fileID: 0} - - target: {fileID: 2381766503070149263, guid: e5b53b02ddc453d49a3a36a85164095f, type: 3} - propertyPath: OnClicked.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - target: {fileID: 2381766503070149263, guid: e5b53b02ddc453d49a3a36a85164095f, type: 3} propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName value: UnityEngine.Object, UnityEngine @@ -584,14 +477,6 @@ PrefabInstance: propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName value: UnityEngine.Object, UnityEngine objectReference: {fileID: 0} - - target: {fileID: 2381766503070149263, guid: e5b53b02ddc453d49a3a36a85164095f, type: 3} - propertyPath: isStatefulSelected.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - - target: {fileID: 3095349751890438921, guid: e5b53b02ddc453d49a3a36a85164095f, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - target: {fileID: 3095349751890438921, guid: e5b53b02ddc453d49a3a36a85164095f, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -645,6 +530,9 @@ PrefabInstance: value: objectReference: {fileID: 21300000, guid: 7cd5b104a735bbc4dbe839386eb8df9a, type: 3} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e5b53b02ddc453d49a3a36a85164095f, type: 3} --- !u!4 &383522640001266510 stripped Transform: @@ -661,12 +549,9 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 3433554895966514134} m_Modifications: - - target: {fileID: 3095349751890438921, guid: e5b53b02ddc453d49a3a36a85164095f, type: 3} - propertyPath: m_RootOrder - value: 3 - objectReference: {fileID: 0} - target: {fileID: 3095349751890438921, guid: e5b53b02ddc453d49a3a36a85164095f, type: 3} propertyPath: m_LocalPosition.x value: 0.096 @@ -716,6 +601,9 @@ PrefabInstance: value: objectReference: {fileID: 21300000, guid: a4b456277eaceb444b12d617c8f86a61, type: 3} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e5b53b02ddc453d49a3a36a85164095f, type: 3} --- !u!1 &383522640251739470 stripped GameObject: diff --git a/org.mixedrealitytoolkit.uxcomponents.noncanvas/ObjectBar/HorizontalAppBarWithDivider.prefab b/org.mixedrealitytoolkit.uxcomponents.noncanvas/ObjectBar/HorizontalAppBarWithDivider.prefab index 965d89fb4..2783e1740 100644 --- a/org.mixedrealitytoolkit.uxcomponents.noncanvas/ObjectBar/HorizontalAppBarWithDivider.prefab +++ b/org.mixedrealitytoolkit.uxcomponents.noncanvas/ObjectBar/HorizontalAppBarWithDivider.prefab @@ -23,6 +23,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6675957056742955634} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -34,7 +35,6 @@ Transform: - {fileID: 4042998141007513676} - {fileID: 6675957057147064828} m_Father: {fileID: 6675957057942723116} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &6675957057147064831 GameObject: @@ -62,13 +62,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6675957057147064831} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0.08050001, y: 0, z: 0} m_LocalScale: {x: 0.001, y: 0.016, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6675957056742955635} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &6675957057147064827 MeshFilter: @@ -95,6 +95,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -128,9 +131,17 @@ MeshCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6675957057147064831} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 4 + serializedVersion: 5 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} @@ -159,6 +170,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6675957057942723118} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.049, y: -0.0467, z: 0.019} m_LocalScale: {x: 1, y: 1, z: 1} @@ -167,7 +179,6 @@ Transform: - {fileID: 6675957056742955635} - {fileID: 7421634608445774133} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &6675957057942723119 MonoBehaviour: @@ -213,6 +224,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 6675957056742955635} m_Modifications: - target: {fileID: 389455286654617651, guid: 6ce24ddaab37c8c4aa01ee45349b4583, type: 3} @@ -272,6 +284,9 @@ PrefabInstance: value: PressableButton_32x32mm_IconAndText_NoBackPlates (2) objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 6ce24ddaab37c8c4aa01ee45349b4583, type: 3} --- !u!4 &4042998139641244439 stripped Transform: @@ -288,6 +303,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 6675957057942723116} m_Modifications: - target: {fileID: 4125495309553998321, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} @@ -359,6 +375,9 @@ PrefabInstance: value: 0.005 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} --- !u!1 &624060170706142410 stripped GameObject: @@ -375,6 +394,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 6675957056742955635} m_Modifications: - target: {fileID: 389455286654617651, guid: 6ce24ddaab37c8c4aa01ee45349b4583, type: 3} @@ -434,6 +454,9 @@ PrefabInstance: value: PressableButton_32x32mm_IconAndText_NoBackPlates (1) objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 6ce24ddaab37c8c4aa01ee45349b4583, type: 3} --- !u!1 &4042998139657896566 stripped GameObject: @@ -450,6 +473,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 6675957056742955635} m_Modifications: - target: {fileID: 389455286654617651, guid: 6ce24ddaab37c8c4aa01ee45349b4583, type: 3} @@ -537,6 +561,9 @@ PrefabInstance: value: UnityEngine.Object, UnityEngine objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 6ce24ddaab37c8c4aa01ee45349b4583, type: 3} --- !u!1 &4042998139086237065 stripped GameObject: @@ -553,6 +580,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 6675957056742955635} m_Modifications: - target: {fileID: 1633295506271318166, guid: 6ce24ddaab37c8c4aa01ee45349b4583, type: 3} @@ -608,6 +636,9 @@ PrefabInstance: value: PressableButton_32x32mm_IconAndText_NoBackPlates (3) objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 6ce24ddaab37c8c4aa01ee45349b4583, type: 3} --- !u!1 &4042998139414204077 stripped GameObject: diff --git a/org.mixedrealitytoolkit.uxcomponents.noncanvas/ObjectBar/HorizontalObjectBarWithDivider.prefab b/org.mixedrealitytoolkit.uxcomponents.noncanvas/ObjectBar/HorizontalObjectBarWithDivider.prefab index 2472e560f..faf5b7e7e 100644 --- a/org.mixedrealitytoolkit.uxcomponents.noncanvas/ObjectBar/HorizontalObjectBarWithDivider.prefab +++ b/org.mixedrealitytoolkit.uxcomponents.noncanvas/ObjectBar/HorizontalObjectBarWithDivider.prefab @@ -26,13 +26,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 411325798229672299} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.0132596465, y: 0.0132596465, z: 0.0132596465} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2857455909976057328} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &7653898167426890657 MeshFilter: @@ -59,6 +59,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -92,9 +95,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 411325798229672299} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 1.7013043, y: 1.7013043, z: 1.7013043} m_Center: {x: 0, y: 0.00000023841858, z: 0} --- !u!1 &1214183257308660142 @@ -123,13 +134,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1214183257308660142} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0.148446, y: 0, z: 0} m_LocalScale: {x: 0.026085308, y: 0.026085308, z: 0.026085308} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2857455909976057328} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &1214183257308660130 MeshFilter: @@ -156,6 +167,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -189,9 +203,17 @@ SphereCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1214183257308660142} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Radius: 0.5 m_Center: {x: 0, y: 0, z: 0} --- !u!1 &1876121402514751633 @@ -220,13 +242,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1876121402514751633} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0.068106696, y: 0, z: 0} m_LocalScale: {x: 0.0132596465, y: 0.0132596465, z: 0.0132596465} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2857455909976057328} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &7654696305902638757 MeshFilter: @@ -253,6 +275,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -286,9 +311,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1876121402514751633} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 1.7013043, y: 1.7013043, z: 1.7013043} m_Center: {x: 0, y: 0.00000023841858, z: 0} --- !u!1 &2226762984136146720 @@ -314,6 +347,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2226762984136146720} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -321,7 +355,6 @@ Transform: m_Children: - {fileID: 5483002956488581721} m_Father: {fileID: 2857455910923249071} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2857455909558873724 GameObject: @@ -349,13 +382,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2857455909558873724} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0.12516868, y: 0, z: 0} m_LocalScale: {x: 0.00046929, y: 0.00750864, z: 0.46929} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2857455909976057328} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &2857455909558873720 MeshFilter: @@ -382,6 +415,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -415,9 +451,17 @@ MeshCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2857455909558873724} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 4 + serializedVersion: 5 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} @@ -444,6 +488,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2857455909976057329} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -456,7 +501,6 @@ Transform: - {fileID: 2857455909558873727} - {fileID: 1214183257308660143} m_Father: {fileID: 2857455910923249071} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2857455910923249069 GameObject: @@ -483,6 +527,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2857455910923249069} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0.024360001, y: -0.0279971, z: 0.0005669296} m_LocalScale: {x: 1, y: 1, z: 1} @@ -491,7 +536,6 @@ Transform: - {fileID: 2857455909976057328} - {fileID: 2160755624768202422} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &2857455910923249068 MonoBehaviour: @@ -559,13 +603,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3743550875563166325} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0.102160044, y: 0, z: 0} m_LocalScale: {x: 0.0132596465, y: 0.0132596465, z: 0.0132596465} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2857455909976057328} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &2270605691652552319 MeshFilter: @@ -592,6 +636,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -625,9 +672,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3743550875563166325} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 1.9267479, y: 1.8948233, z: 1.840549} m_Center: {x: -0.0000032186508, y: -0.0000011324883, z: 0.0000047385693} --- !u!1 &7272449416537703243 @@ -656,13 +711,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7272449416537703243} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0.034053348, y: 0, z: 0} m_LocalScale: {x: 0.0132596465, y: 0.0132596465, z: 0.0132596465} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2857455909976057328} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &8731894276629860257 MeshFilter: @@ -689,6 +744,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -722,9 +780,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7272449416537703243} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 1.9267479, y: 1.8948233, z: 1.840549} m_Center: {x: -0.0000032186508, y: -0.0000011324883, z: 0.0000047385693} --- !u!1 &8334863266126986057 @@ -752,13 +818,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8334863266126986057} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0.074223, y: 0, z: 0.02} m_LocalScale: {x: 0.20453131, y: 0.056085303, z: 0.02} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2160755624768202422} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &1934480222331879482 MeshFilter: @@ -785,6 +851,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: diff --git a/org.mixedrealitytoolkit.uxcomponents.noncanvas/ObjectBar/VerticalAppBar.prefab b/org.mixedrealitytoolkit.uxcomponents.noncanvas/ObjectBar/VerticalAppBar.prefab index 07cc16757..140f37294 100644 --- a/org.mixedrealitytoolkit.uxcomponents.noncanvas/ObjectBar/VerticalAppBar.prefab +++ b/org.mixedrealitytoolkit.uxcomponents.noncanvas/ObjectBar/VerticalAppBar.prefab @@ -24,6 +24,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5763790692010210364} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -34,7 +35,6 @@ Transform: - {fileID: 7280628636203058469} - {fileID: 7280628637746647712} m_Father: {fileID: 5763790693068648986} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &5763790692010210366 MonoBehaviour: @@ -76,6 +76,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5763790693068648984} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0.0098, y: -0.0395, z: 0.0017077327} m_LocalScale: {x: 1, y: 1, z: 1} @@ -84,7 +85,6 @@ Transform: - {fileID: 5763790692010210367} - {fileID: 8477511523347361871} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &5763790693068648987 MonoBehaviour: @@ -129,6 +129,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 5763790692010210367} m_Modifications: - target: {fileID: 3095349751890438921, guid: e5b53b02ddc453d49a3a36a85164095f, type: 3} @@ -184,6 +185,9 @@ PrefabInstance: value: objectReference: {fileID: 21300000, guid: a80438fec029d8d478c42c1074d1b666, type: 3} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e5b53b02ddc453d49a3a36a85164095f, type: 3} --- !u!4 &7280628636203058469 stripped Transform: @@ -200,6 +204,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 5763790692010210367} m_Modifications: - target: {fileID: 2381766503070149263, guid: e5b53b02ddc453d49a3a36a85164095f, type: 3} @@ -371,6 +376,9 @@ PrefabInstance: value: objectReference: {fileID: 21300000, guid: 7cd5b104a735bbc4dbe839386eb8df9a, type: 3} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e5b53b02ddc453d49a3a36a85164095f, type: 3} --- !u!4 &7280628636621329487 stripped Transform: @@ -387,6 +395,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 5763790692010210367} m_Modifications: - target: {fileID: 2381766503070149263, guid: e5b53b02ddc453d49a3a36a85164095f, type: 3} @@ -558,6 +567,9 @@ PrefabInstance: value: objectReference: {fileID: 21300000, guid: d78e812d92f277e4697483d4cb58238e, type: 3} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e5b53b02ddc453d49a3a36a85164095f, type: 3} --- !u!4 &7280628636647028740 stripped Transform: @@ -574,6 +586,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 5763790693068648986} m_Modifications: - target: {fileID: 4125495309553998321, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} @@ -649,6 +662,9 @@ PrefabInstance: value: 0.005 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} --- !u!1 &2013603682404887984 stripped GameObject: @@ -665,6 +681,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 5763790692010210367} m_Modifications: - target: {fileID: 3095349751890438921, guid: e5b53b02ddc453d49a3a36a85164095f, type: 3} @@ -720,6 +737,9 @@ PrefabInstance: value: objectReference: {fileID: 21300000, guid: 03af59644a0d5ea4e9258630e3a672e6, type: 3} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e5b53b02ddc453d49a3a36a85164095f, type: 3} --- !u!1 &7280628636152288321 stripped GameObject: diff --git a/org.mixedrealitytoolkit.uxcomponents.noncanvas/ObjectBar/VerticalAppBarWithDivider.prefab b/org.mixedrealitytoolkit.uxcomponents.noncanvas/ObjectBar/VerticalAppBarWithDivider.prefab index 0b27e8203..7d5f2b357 100644 --- a/org.mixedrealitytoolkit.uxcomponents.noncanvas/ObjectBar/VerticalAppBarWithDivider.prefab +++ b/org.mixedrealitytoolkit.uxcomponents.noncanvas/ObjectBar/VerticalAppBarWithDivider.prefab @@ -25,6 +25,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5187099724391636964} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0.08409998, y: -0.040999997, z: 0.0017077327} m_LocalScale: {x: 1, y: 1, z: 1} @@ -33,7 +34,6 @@ Transform: - {fileID: 5187099724704590520} - {fileID: 9054334768105864109} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &5187099724391636967 MonoBehaviour: @@ -97,6 +97,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5187099724704590521} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -108,7 +109,6 @@ Transform: - {fileID: 2540620928514445879} - {fileID: 5187099724903728565} m_Father: {fileID: 5187099724391636966} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &5187099724903728554 GameObject: @@ -136,13 +136,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5187099724903728554} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0.7071068, w: 0.7071068} m_LocalPosition: {x: 0, y: 0.08050001, z: 0} m_LocalScale: {x: 0.001, y: 0.016, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5187099724704590520} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90} --- !u!33 &5187099724903728566 MeshFilter: @@ -169,6 +169,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -202,9 +205,17 @@ MeshCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5187099724903728554} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 4 + serializedVersion: 5 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} @@ -213,6 +224,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 5187099724391636966} m_Modifications: - target: {fileID: 4125495309553998321, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} @@ -288,6 +300,9 @@ PrefabInstance: value: 0.005 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c2f49d0d909d3fc4bbc20d1cb743ab1d, type: 3} --- !u!1 &1436823438657594962 stripped GameObject: @@ -304,6 +319,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 5187099724704590520} m_Modifications: - target: {fileID: 389455286654617651, guid: 6ce24ddaab37c8c4aa01ee45349b4583, type: 3} @@ -359,6 +375,9 @@ PrefabInstance: value: PressableButton_32x32mm_IconAndText_NoBackPlates (2) objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 6ce24ddaab37c8c4aa01ee45349b4583, type: 3} --- !u!4 &2540620928385852740 stripped Transform: @@ -375,6 +394,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 5187099724704590520} m_Modifications: - target: {fileID: 389455286654617651, guid: 6ce24ddaab37c8c4aa01ee45349b4583, type: 3} @@ -430,6 +450,9 @@ PrefabInstance: value: PressableButton_32x32mm_IconAndText_NoBackPlates (3) objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 6ce24ddaab37c8c4aa01ee45349b4583, type: 3} --- !u!4 &2540620928514445879 stripped Transform: @@ -446,6 +469,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 5187099724704590520} m_Modifications: - target: {fileID: 389455286654617651, guid: 6ce24ddaab37c8c4aa01ee45349b4583, type: 3} @@ -529,6 +553,9 @@ PrefabInstance: value: UnityEngine.Object, UnityEngine objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 6ce24ddaab37c8c4aa01ee45349b4583, type: 3} --- !u!4 &2540620928782666571 stripped Transform: @@ -545,6 +572,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 5187099724704590520} m_Modifications: - target: {fileID: 389455286654617651, guid: 6ce24ddaab37c8c4aa01ee45349b4583, type: 3} @@ -600,6 +628,9 @@ PrefabInstance: value: PressableButton_32x32mm_IconAndText_NoBackPlates (1) objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 6ce24ddaab37c8c4aa01ee45349b4583, type: 3} --- !u!4 &2540620929034369931 stripped Transform: diff --git a/org.mixedrealitytoolkit.uxcomponents.noncanvas/SeeItSayItLabel/ActiveFocusNonCanvasSeeItSayIt.anim b/org.mixedrealitytoolkit.uxcomponents.noncanvas/SeeItSayItLabel/ActiveFocusNonCanvasSeeItSayIt.anim index 96333c737..85e4d5db3 100644 --- a/org.mixedrealitytoolkit.uxcomponents.noncanvas/SeeItSayItLabel/ActiveFocusNonCanvasSeeItSayIt.anim +++ b/org.mixedrealitytoolkit.uxcomponents.noncanvas/SeeItSayItLabel/ActiveFocusNonCanvasSeeItSayIt.anim @@ -7,7 +7,7 @@ AnimationClip: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: ActiveFocusNonCanvasSeeItSayIt - serializedVersion: 6 + serializedVersion: 7 m_Legacy: 0 m_Compressed: 0 m_UseHighQualityCurve: 1 @@ -17,7 +17,8 @@ AnimationClip: m_PositionCurves: [] m_ScaleCurves: [] m_FloatCurves: - - curve: + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -45,7 +46,9 @@ AnimationClip: path: TextMeshPro classID: 1 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -73,6 +76,7 @@ AnimationClip: path: LabelPlate classID: 1 script: {fileID: 0} + flags: 16 m_PPtrCurves: [] m_SampleRate: 60 m_WrapMode: 0 @@ -88,6 +92,8 @@ AnimationClip: typeID: 1 customType: 0 isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 - serializedVersion: 2 path: 1847533144 attribute: 2086281974 @@ -95,6 +101,8 @@ AnimationClip: typeID: 1 customType: 0 isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 pptrCurveMapping: [] m_AnimationClipSettings: serializedVersion: 2 @@ -117,7 +125,8 @@ AnimationClip: m_HeightFromFeet: 0 m_Mirror: 0 m_EditorCurves: - - curve: + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -145,7 +154,9 @@ AnimationClip: path: TextMeshPro classID: 1 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -173,6 +184,7 @@ AnimationClip: path: LabelPlate classID: 1 script: {fileID: 0} + flags: 16 m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 diff --git a/org.mixedrealitytoolkit.uxcomponents.noncanvas/SeeItSayItLabel/SeeItSayItLabel-NonCanvas.prefab b/org.mixedrealitytoolkit.uxcomponents.noncanvas/SeeItSayItLabel/SeeItSayItLabel-NonCanvas.prefab index bcd6fb8db..d2d8a364a 100644 --- a/org.mixedrealitytoolkit.uxcomponents.noncanvas/SeeItSayItLabel/SeeItSayItLabel-NonCanvas.prefab +++ b/org.mixedrealitytoolkit.uxcomponents.noncanvas/SeeItSayItLabel/SeeItSayItLabel-NonCanvas.prefab @@ -23,6 +23,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2367726095401115057} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -30,7 +31,6 @@ Transform: m_Children: - {fileID: 6013838003119366516} m_Father: {fileID: 5824337637746978049} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2535657362945162004 GameObject: @@ -57,6 +57,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2535657362945162004} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -65,11 +66,10 @@ Transform: - {fileID: 5752759292769305146} - {fileID: 3422880608582003536} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!95 &7038992219896028499 Animator: - serializedVersion: 5 + serializedVersion: 7 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -83,6 +83,7 @@ Animator: m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 m_StabilizeFeet: 0 + m_AnimatePhysics: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 @@ -162,13 +163,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3444108485348951450} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.036, y: 0.01, z: 0.0053754} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3422880608582003536} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &3538369526204656543 MeshFilter: @@ -195,6 +196,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -251,7 +255,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5824337637746978049} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -275,6 +278,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -358,20 +364,23 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 00000000 m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 0 m_isCullingEnabled: 0 diff --git a/org.mixedrealitytoolkit.uxcomponents.noncanvas/Slates/Slate.prefab b/org.mixedrealitytoolkit.uxcomponents.noncanvas/Slates/Slate.prefab index 8eca8f063..144ffa886 100644 --- a/org.mixedrealitytoolkit.uxcomponents.noncanvas/Slates/Slate.prefab +++ b/org.mixedrealitytoolkit.uxcomponents.noncanvas/Slates/Slate.prefab @@ -25,6 +25,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2589716731366296177} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -33,7 +34,6 @@ Transform: - {fileID: 6070966254075524225} - {fileID: 601986242425173794} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &7214214271229060289 MonoBehaviour: @@ -121,13 +121,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5561744655428495453} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0.012, z: 0} m_LocalScale: {x: 0.352, y: 0.196, z: 0.02} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6612599088134562825} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &8952815302870399247 MeshFilter: @@ -154,6 +154,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -197,6 +200,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4557506528664156442} m_Modifications: - target: {fileID: 2244185731031694095, guid: cd0f0697f0939504389ec612388f609a, type: 3} @@ -268,7 +272,7 @@ PrefabInstance: value: Icon 21 objectReference: {fileID: 0} - target: {fileID: 7855682163667943843, guid: cd0f0697f0939504389ec612388f609a, type: 3} - propertyPath: m_Materials.Array.data[0] + propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 5762245003366665926, guid: 9b0d0ee11ff70b04d901a29b519cbaa0, type: 2} - target: {fileID: 7867802180497734224, guid: cd0f0697f0939504389ec612388f609a, type: 3} @@ -280,12 +284,21 @@ PrefabInstance: value: objectReference: {fileID: 21300000, guid: 057a7bb98bb3cf64a8d90e1b4a324c0e, type: 3} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: cd0f0697f0939504389ec612388f609a, type: 3} +--- !u!4 &3939605952973044483 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2244185731585867246, guid: cd0f0697f0939504389ec612388f609a, type: 3} + m_PrefabInstance: {fileID: 2992846141991945965} + m_PrefabAsset: {fileID: 0} --- !u!1001 &4949626711672066342 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4557506528664156442} m_Modifications: - target: {fileID: 1503546110793399400, guid: cd0f0697f0939504389ec612388f609a, type: 3} @@ -433,7 +446,7 @@ PrefabInstance: value: Icon 101 objectReference: {fileID: 0} - target: {fileID: 7855682163667943843, guid: cd0f0697f0939504389ec612388f609a, type: 3} - propertyPath: m_Materials.Array.data[0] + propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 5762245003366665926, guid: 9b0d0ee11ff70b04d901a29b519cbaa0, type: 2} - target: {fileID: 7867802180497734224, guid: cd0f0697f0939504389ec612388f609a, type: 3} @@ -445,6 +458,9 @@ PrefabInstance: value: objectReference: {fileID: 21300000, guid: e7a37761780007545a89ece9b43ce0e8, type: 3} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: cd0f0697f0939504389ec612388f609a, type: 3} --- !u!114 &5795341611655048526 stripped MonoBehaviour: @@ -457,11 +473,17 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c32e8a7644144f8419bb881ad588ed0e, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!4 &6599014035047541960 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2244185731585867246, guid: cd0f0697f0939504389ec612388f609a, type: 3} + m_PrefabInstance: {fileID: 4949626711672066342} + m_PrefabAsset: {fileID: 0} --- !u!1001 &5016850984781580552 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4557506528664156442} m_Modifications: - target: {fileID: 2244185731031694095, guid: cd0f0697f0939504389ec612388f609a, type: 3} @@ -533,7 +555,7 @@ PrefabInstance: value: Icon 92 objectReference: {fileID: 0} - target: {fileID: 7855682163667943843, guid: cd0f0697f0939504389ec612388f609a, type: 3} - propertyPath: m_Materials.Array.data[0] + propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 5762245003366665926, guid: 9b0d0ee11ff70b04d901a29b519cbaa0, type: 2} - target: {fileID: 7867802180497734224, guid: cd0f0697f0939504389ec612388f609a, type: 3} @@ -545,12 +567,21 @@ PrefabInstance: value: objectReference: {fileID: 21300000, guid: b5655403f01d9fb41b1b785c8f20decf, type: 3} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: cd0f0697f0939504389ec612388f609a, type: 3} +--- !u!4 &6537991270585169126 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2244185731585867246, guid: cd0f0697f0939504389ec612388f609a, type: 3} + m_PrefabInstance: {fileID: 5016850984781580552} + m_PrefabAsset: {fileID: 0} --- !u!1001 &7497672022493330809 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 6612599088134562825} m_Modifications: - target: {fileID: 1565942459441548184, guid: 0a1b473550575964795cb3e01a678613, type: 3} @@ -666,7 +697,7 @@ PrefabInstance: value: UnityEngine.Object, UnityEngine objectReference: {fileID: 0} - target: {fileID: 3357846739743591266, guid: 0a1b473550575964795cb3e01a678613, type: 3} - propertyPath: m_Materials.Array.data[0] + propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: -1005824763306460071, guid: 533bdd8d5c92b52448ee2ecf7bd828a4, type: 2} - target: {fileID: 3588878034339634083, guid: 0a1b473550575964795cb3e01a678613, type: 3} @@ -726,7 +757,7 @@ PrefabInstance: value: Icon 79 objectReference: {fileID: 0} - target: {fileID: 6309614454519040208, guid: 0a1b473550575964795cb3e01a678613, type: 3} - propertyPath: m_Materials.Array.data[0] + propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 5762245003366665926, guid: 9b0d0ee11ff70b04d901a29b519cbaa0, type: 2} - target: {fileID: 6315368024079053603, guid: 0a1b473550575964795cb3e01a678613, type: 3} @@ -782,6 +813,36 @@ PrefabInstance: value: 2 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 6283243792239002723, guid: 0a1b473550575964795cb3e01a678613, type: 3} + insertIndex: -1 + addedObject: {fileID: 6599014035047541960} + - targetCorrespondingSourceObject: {fileID: 6283243792239002723, guid: 0a1b473550575964795cb3e01a678613, type: 3} + insertIndex: -1 + addedObject: {fileID: 3939605952973044483} + - targetCorrespondingSourceObject: {fileID: 6283243792239002723, guid: 0a1b473550575964795cb3e01a678613, type: 3} + insertIndex: -1 + addedObject: {fileID: 6537991270585169126} + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 3638217883559720406, guid: 0a1b473550575964795cb3e01a678613, type: 3} + insertIndex: -1 + addedObject: {fileID: 1579271233971449938} + - targetCorrespondingSourceObject: {fileID: 3638217883559720406, guid: 0a1b473550575964795cb3e01a678613, type: 3} + insertIndex: -1 + addedObject: {fileID: 5465044698509744976} + - targetCorrespondingSourceObject: {fileID: 3638217883559720406, guid: 0a1b473550575964795cb3e01a678613, type: 3} + insertIndex: -1 + addedObject: {fileID: 1182525986} + - targetCorrespondingSourceObject: {fileID: 3638217883559720406, guid: 0a1b473550575964795cb3e01a678613, type: 3} + insertIndex: -1 + addedObject: {fileID: 984399069295386066} + - targetCorrespondingSourceObject: {fileID: 3638217883559720406, guid: 0a1b473550575964795cb3e01a678613, type: 3} + insertIndex: -1 + addedObject: {fileID: 7056686424932172569} + - targetCorrespondingSourceObject: {fileID: 3638217883559720406, guid: 0a1b473550575964795cb3e01a678613, type: 3} + insertIndex: -1 + addedObject: {fileID: 8314098896222724917} m_SourcePrefab: {fileID: 100100000, guid: 0a1b473550575964795cb3e01a678613, type: 3} --- !u!4 &4557506528664156442 stripped Transform: @@ -806,9 +867,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6516883592442120367} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 0.36, y: 0.032, z: 0.02} m_Center: {x: 0, y: 0, z: 0} --- !u!82 &5465044698509744976 @@ -822,6 +891,7 @@ AudioSource: serializedVersion: 4 OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 0} + m_Resource: {fileID: 0} m_PlayOnAwake: 1 m_Volume: 1 m_Pitch: 1 @@ -939,13 +1009,11 @@ MonoBehaviour: m_InteractionManager: {fileID: 0} m_Colliders: - {fileID: 1579271233971449938} - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 0 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -982,8 +1050,7 @@ MonoBehaviour: m_BoolArgument: 0 m_CallState: 2 - m_Target: {fileID: 5795341611655048526} - m_TargetAssemblyTypeName: MixedReality.Toolkit.StatefulInteractable, - MixedReality.Toolkit.Core + m_TargetAssemblyTypeName: MixedReality.Toolkit.StatefulInteractable, MixedReality.Toolkit.Core m_MethodName: ForceSetToggled m_Mode: 6 m_Arguments: @@ -1015,42 +1082,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_Deactivated: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnLastHoverExited: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectEntered: - m_PersistentCalls: - m_Calls: [] - m_OnSelectExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -1143,6 +1195,9 @@ MonoBehaviour: k__BackingField: 1 allowSelectByVoice: 0 speechRecognitionKeyword: select + k__BackingField: + m_PersistentCalls: + m_Calls: [] k__BackingField: 1 k__BackingField: 0 k__BackingField: @@ -1165,6 +1220,7 @@ MonoBehaviour: hostTransform: {fileID: 6612599088134562825} allowedManipulations: 7 allowedInteractionTypes: 7 + rigidbodyMovementType: 0 applyTorque: 1 springForceSoftness: 0.1 springTorqueSoftness: 0.1 @@ -1187,8 +1243,7 @@ MonoBehaviour: moveLogicType: reference: MixedReality.Toolkit.SpatialManipulation.MoveLogic, MixedReality.Toolkit.SpatialManipulation rotateLogicType: - reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, - MixedReality.Toolkit.SpatialManipulation + reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, MixedReality.Toolkit.SpatialManipulation scaleLogicType: reference: MixedReality.Toolkit.SpatialManipulation.ScaleLogic, MixedReality.Toolkit.SpatialManipulation --- !u!114 &7056686424932172569 diff --git a/org.mixedrealitytoolkit.uxcomponents.noncanvas/Slates/TitleBar.prefab b/org.mixedrealitytoolkit.uxcomponents.noncanvas/Slates/TitleBar.prefab index 97d9bec15..55214fb40 100644 --- a/org.mixedrealitytoolkit.uxcomponents.noncanvas/Slates/TitleBar.prefab +++ b/org.mixedrealitytoolkit.uxcomponents.noncanvas/Slates/TitleBar.prefab @@ -31,7 +31,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4345256064901925368} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -55,6 +54,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -138,20 +140,23 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 00000000 m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 0 m_isCullingEnabled: 0 @@ -196,6 +201,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3638217883559720406} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0.129, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -205,7 +211,6 @@ Transform: - {fileID: 2165265580557114057} - {fileID: 6283243792239002723} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &3588878034339634083 MonoBehaviour: @@ -245,13 +250,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7492014267416176910} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.352, y: 0.032, z: 0.02} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4345256064901925368} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &7925801624542624189 MeshFilter: @@ -278,6 +283,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -326,6 +334,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8781398875331709719} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -333,13 +342,13 @@ Transform: m_Children: - {fileID: 2715757078020306077} m_Father: {fileID: 4345256064901925368} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &4221207263471978867 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 6283243792239002723} m_Modifications: - target: {fileID: 2244185731031694095, guid: cd0f0697f0939504389ec612388f609a, type: 3} @@ -391,6 +400,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: cd0f0697f0939504389ec612388f609a, type: 3} --- !u!4 &2715757078020306077 stripped Transform: diff --git a/org.mixedrealitytoolkit.uxcomponents.noncanvas/Slates/UIBackplate.prefab b/org.mixedrealitytoolkit.uxcomponents.noncanvas/Slates/UIBackplate.prefab index 03e11f23a..c13fdb9bb 100644 --- a/org.mixedrealitytoolkit.uxcomponents.noncanvas/Slates/UIBackplate.prefab +++ b/org.mixedrealitytoolkit.uxcomponents.noncanvas/Slates/UIBackplate.prefab @@ -24,6 +24,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4125495309553998321} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -31,7 +32,6 @@ Transform: m_Children: - {fileID: 7759758375038403720} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &8773149955608181693 MonoBehaviour: @@ -71,13 +71,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6056454165148638616} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.128, y: 0.128, z: 0.02} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4205010513405509735} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &4431294101009311467 MeshFilter: @@ -104,6 +104,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: diff --git a/org.mixedrealitytoolkit.uxcomponents.noncanvas/Slates/UIBackplateInnerQuad.prefab b/org.mixedrealitytoolkit.uxcomponents.noncanvas/Slates/UIBackplateInnerQuad.prefab index 757995390..1e051b026 100644 --- a/org.mixedrealitytoolkit.uxcomponents.noncanvas/Slates/UIBackplateInnerQuad.prefab +++ b/org.mixedrealitytoolkit.uxcomponents.noncanvas/Slates/UIBackplateInnerQuad.prefab @@ -24,6 +24,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5557127370827511018} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0.0035} m_LocalScale: {x: 1, y: 1, z: 1} @@ -31,7 +32,6 @@ Transform: m_Children: - {fileID: 1132637073067987526} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &9170894604927313430 MonoBehaviour: @@ -71,13 +71,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6077720326341080553} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.03, y: 0.03, z: 0.01} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5209440517997471518} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &654142137593956184 MeshFilter: @@ -104,6 +104,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: diff --git a/org.mixedrealitytoolkit.uxcomponents.noncanvas/Slider/NonCanvasSliderBase.prefab b/org.mixedrealitytoolkit.uxcomponents.noncanvas/Slider/NonCanvasSliderBase.prefab index 5b8d0a7ed..e7b32f379 100644 --- a/org.mixedrealitytoolkit.uxcomponents.noncanvas/Slider/NonCanvasSliderBase.prefab +++ b/org.mixedrealitytoolkit.uxcomponents.noncanvas/Slider/NonCanvasSliderBase.prefab @@ -24,13 +24,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 480074433283511612} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 3.1814, z: 0.022441499} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3268973316923210140} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &480074433283511614 BoxCollider: @@ -40,9 +40,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 480074433283511612} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 1, y: 1, z: 0.4} m_Center: {x: 0, y: 0, z: 0} --- !u!1 &1948749779168063452 @@ -70,13 +78,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1948749779168063452} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.25, y: 0, z: -0.00037640333} m_LocalScale: {x: 0.5, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3268973316923210140} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &7469231407990690726 MeshFilter: @@ -103,6 +111,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -153,6 +164,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2624031095332604921} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -9.313226e-10, y: 0, z: 0} m_LocalScale: {x: 0.1, y: 0.002, z: 1} @@ -161,7 +173,6 @@ Transform: - {fileID: 7661392059221250966} - {fileID: 480074433283511613} m_Father: {fileID: 5595139221873180800} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &5247118366091656350 MeshFilter: @@ -188,6 +199,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -236,13 +250,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4326098741778262769} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0.05, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5595139221873180800} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &4326098742403253988 GameObject: @@ -267,13 +281,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4326098742403253988} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0.05, y: 0, z: -0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5595139221873180800} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &4713996577027406645 GameObject: @@ -299,6 +313,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4713996577027406645} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -9.313226e-10, y: 0, z: 0} m_LocalScale: {x: 0.004, y: 0.011999998, z: 0.062525995} @@ -306,7 +321,6 @@ Transform: m_Children: - {fileID: 4326098741687393202} m_Father: {fileID: 5595139221873180800} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &2780919004144464692 BoxCollider: @@ -316,9 +330,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4713996577027406645} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 3, y: 2, z: 0.15} m_Center: {x: 0, y: 0, z: -0.05} --- !u!1 &7429095020531837142 @@ -349,6 +371,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7429095020531837142} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0.0113, y: -0.2729, z: 0.6711} m_LocalScale: {x: 1, y: 1, z: 1} @@ -359,7 +382,6 @@ Transform: - {fileID: 4713996577027893013} - {fileID: 3268973316923210140} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &7429095020531837143 MonoBehaviour: @@ -375,13 +397,11 @@ MonoBehaviour: m_EditorClassIdentifier: m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 0 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -414,42 +434,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnHoverEntered: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_OnHoverExited: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectEntered: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectExited: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -541,6 +546,9 @@ MonoBehaviour: k__BackingField: 1 allowSelectByVoice: 1 speechRecognitionKeyword: select + k__BackingField: + m_PersistentCalls: + m_Calls: [] k__BackingField: 1 k__BackingField: 0 k__BackingField: @@ -666,6 +674,7 @@ AudioSource: serializedVersion: 4 OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 0} + m_Resource: {fileID: 0} m_PlayOnAwake: 1 m_Volume: 1 m_Pitch: 1 @@ -756,6 +765,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4713996577027893013} m_Modifications: - target: {fileID: 100000, guid: 5d1a0e539954477d8f80559f6385c0d1, type: 3} @@ -819,10 +829,13 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} - target: {fileID: 2300000, guid: 5d1a0e539954477d8f80559f6385c0d1, type: 3} - propertyPath: m_Materials.Array.data[0] + propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: 952eab906a13e2946b3f763e4882c6a8, type: 2} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 5d1a0e539954477d8f80559f6385c0d1, type: 3} --- !u!4 &4326098741687393202 stripped Transform: diff --git a/org.mixedrealitytoolkit.uxcomponents.noncanvas/Slider/Slider_168x40mm_Base.prefab b/org.mixedrealitytoolkit.uxcomponents.noncanvas/Slider/Slider_168x40mm_Base.prefab index 915469cea..da1eff872 100644 --- a/org.mixedrealitytoolkit.uxcomponents.noncanvas/Slider/Slider_168x40mm_Base.prefab +++ b/org.mixedrealitytoolkit.uxcomponents.noncanvas/Slider/Slider_168x40mm_Base.prefab @@ -23,6 +23,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3782554933949265689} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -31,7 +32,6 @@ Transform: - {fileID: 966879584335333670} - {fileID: 5521597236021772094} m_Father: {fileID: 5400660482802044065} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &5908209549497931938 GameObject: @@ -56,6 +56,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5908209549497931938} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0.01, y: 0.01, z: 0.1718} m_LocalScale: {x: 1, y: 1, z: 1} @@ -63,7 +64,6 @@ Transform: m_Children: - {fileID: 4261494006239253419} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &6762919931471871106 GameObject: @@ -88,6 +88,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6762919931471871106} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -95,7 +96,6 @@ Transform: m_Children: - {fileID: 4315013420193485141} m_Father: {fileID: 4261494006239253419} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &6908072146892031730 GameObject: @@ -121,6 +121,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6908072146892031730} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -128,7 +129,6 @@ Transform: m_Children: - {fileID: 5400660482802044065} m_Father: {fileID: 5908209549497931936} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &5556820440220222023 MonoBehaviour: @@ -166,6 +166,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7422690157277977666} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -173,13 +174,13 @@ Transform: m_Children: - {fileID: 3153964761291410927} m_Father: {fileID: 4315013420193485141} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &3153964761291020143 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 5521597236021772094} m_Modifications: - target: {fileID: 100000, guid: fbc47027e54e49848fdfd6d5e20510e7, type: 3} @@ -243,7 +244,7 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} - target: {fileID: 2300000, guid: fbc47027e54e49848fdfd6d5e20510e7, type: 3} - propertyPath: m_Materials.Array.data[0] + propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: 9bcfe6e80e7f20c4c95aa47d2107fd7f, type: 2} - target: {fileID: 6247680693794872434, guid: 5cf5d5d5cc7fe184a93c388dbab66bb9, type: 3} @@ -267,6 +268,9 @@ PrefabInstance: value: 0.5 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fbc47027e54e49848fdfd6d5e20510e7, type: 3} --- !u!4 &3153964761291410927 stripped Transform: @@ -278,6 +282,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4315013420193485141} m_Modifications: - target: {fileID: 3268973316923210140, guid: 5cf5d5d5cc7fe184a93c388dbab66bb9, type: 3} @@ -361,6 +366,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 5cf5d5d5cc7fe184a93c388dbab66bb9, type: 3} --- !u!4 &966879584335333670 stripped Transform: diff --git a/org.mixedrealitytoolkit.uxcomponents.noncanvas/Slider/Slider_168x40mm_IconAndValue.prefab b/org.mixedrealitytoolkit.uxcomponents.noncanvas/Slider/Slider_168x40mm_IconAndValue.prefab index a5ca138bf..e00099a76 100644 --- a/org.mixedrealitytoolkit.uxcomponents.noncanvas/Slider/Slider_168x40mm_IconAndValue.prefab +++ b/org.mixedrealitytoolkit.uxcomponents.noncanvas/Slider/Slider_168x40mm_IconAndValue.prefab @@ -5,6 +5,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 118672800903753395, guid: 882e525521c52cb4ab9230fe77b5cd72, type: 3} @@ -15,10 +16,6 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 5908209549497931936, guid: 882e525521c52cb4ab9230fe77b5cd72, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - target: {fileID: 5908209549497931936, guid: 882e525521c52cb4ab9230fe77b5cd72, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -72,4 +69,7 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 882e525521c52cb4ab9230fe77b5cd72, type: 3} diff --git a/org.mixedrealitytoolkit.uxcomponents.noncanvas/Tests/Editor/AssemblyInfo.cs b/org.mixedrealitytoolkit.uxcomponents.noncanvas/Tests/Editor/AssemblyInfo.cs index 0ec016923..cd31338d6 100644 --- a/org.mixedrealitytoolkit.uxcomponents.noncanvas/Tests/Editor/AssemblyInfo.cs +++ b/org.mixedrealitytoolkit.uxcomponents.noncanvas/Tests/Editor/AssemblyInfo.cs @@ -9,4 +9,4 @@ // The AssemblyVersion attribute is checked-in and is recommended not to be changed often. // https://docs.microsoft.com/troubleshoot/visualstudio/general/assembly-version-assembly-file-version // AssemblyFileVersion and AssemblyInformationalVersion are added by pack-upm.ps1 to match the current MRTK build version. -[assembly: AssemblyVersion("3.0.0.0")] +[assembly: AssemblyVersion("4.0.0.0")] diff --git a/org.mixedrealitytoolkit.uxcomponents.noncanvas/Tests/Runtime/AssemblyInfo.cs b/org.mixedrealitytoolkit.uxcomponents.noncanvas/Tests/Runtime/AssemblyInfo.cs index e58f37b04..9dec28e25 100644 --- a/org.mixedrealitytoolkit.uxcomponents.noncanvas/Tests/Runtime/AssemblyInfo.cs +++ b/org.mixedrealitytoolkit.uxcomponents.noncanvas/Tests/Runtime/AssemblyInfo.cs @@ -9,4 +9,4 @@ // The AssemblyVersion attribute is checked-in and is recommended not to be changed often. // https://docs.microsoft.com/troubleshoot/visualstudio/general/assembly-version-assembly-file-version // AssemblyFileVersion and AssemblyInformationalVersion are added by pack-upm.ps1 to match the current MRTK build version. -[assembly: AssemblyVersion("3.0.0.0")] +[assembly: AssemblyVersion("4.0.0.0")] diff --git a/org.mixedrealitytoolkit.uxcomponents.noncanvas/Tests/Runtime/DialogTests.cs b/org.mixedrealitytoolkit.uxcomponents.noncanvas/Tests/Runtime/DialogTests.cs index 7dd0d087e..9579bce34 100644 --- a/org.mixedrealitytoolkit.uxcomponents.noncanvas/Tests/Runtime/DialogTests.cs +++ b/org.mixedrealitytoolkit.uxcomponents.noncanvas/Tests/Runtime/DialogTests.cs @@ -13,7 +13,8 @@ using UnityEditor; using UnityEngine; using UnityEngine.TestTools; -using UnityEngine.XR.Interaction.Toolkit; +using UnityEngine.XR.Interaction.Toolkit.Interactables; +using UnityEngine.XR.Interaction.Toolkit.Interactors; namespace MixedReality.Toolkit.UX.Runtime.Tests { @@ -236,7 +237,7 @@ public IEnumerator TestPoolingPolitely() } // We have to query by the impl here. - object[] dialogs = FindObjectUtility.FindObjectsByType(typeof(Dialog), true); + Dialog[] dialogs = Object.FindObjectsByType(FindObjectsInactive.Include, FindObjectsSortMode.InstanceID); Assert.AreEqual(1, dialogs.Length, "There should be only one pooled dialog in the scene."); } @@ -262,7 +263,7 @@ public IEnumerator TestPoolingRudely() } // We have to query by the impl here. - object[] dialogs = FindObjectUtility.FindObjectsByType(typeof(Dialog), true); + Dialog[] dialogs = Object.FindObjectsByType(FindObjectsInactive.Include, FindObjectsSortMode.InstanceID); Assert.AreEqual(5, dialogs.Length, "There should have been 5 total dialogs used."); } @@ -363,4 +364,4 @@ private async Task WaitAsyncFrames(int frames) } } } -#pragma warning restore CS1591 \ No newline at end of file +#pragma warning restore CS1591 diff --git a/org.mixedrealitytoolkit.uxcomponents.noncanvas/Tests/Runtime/PressableButtonTests.cs b/org.mixedrealitytoolkit.uxcomponents.noncanvas/Tests/Runtime/PressableButtonTests.cs index a45cb3a59..d971652f8 100644 --- a/org.mixedrealitytoolkit.uxcomponents.noncanvas/Tests/Runtime/PressableButtonTests.cs +++ b/org.mixedrealitytoolkit.uxcomponents.noncanvas/Tests/Runtime/PressableButtonTests.cs @@ -250,6 +250,7 @@ public IEnumerator PressButtonFast([ValueSource(nameof(PressableButtonsTestPrefa // Ony two steps! Very fast. yield return hand.MoveTo(testButton.transform.position + p2, 2); + yield return RuntimeTestUtilities.WaitForUpdates(); Assert.IsTrue(buttonPressed, "Button did not get pressed when hand moved to press it."); diff --git a/org.mixedrealitytoolkit.uxcomponents.noncanvas/Tests/Runtime/SliderTests.cs b/org.mixedrealitytoolkit.uxcomponents.noncanvas/Tests/Runtime/SliderTests.cs index 9bf892875..f240650b5 100644 --- a/org.mixedrealitytoolkit.uxcomponents.noncanvas/Tests/Runtime/SliderTests.cs +++ b/org.mixedrealitytoolkit.uxcomponents.noncanvas/Tests/Runtime/SliderTests.cs @@ -11,7 +11,7 @@ using UnityEditor; using UnityEngine; using UnityEngine.TestTools; -using UnityEngine.XR.Interaction.Toolkit; +using UnityEngine.XR.Interaction.Toolkit.Interactables; using HandshapeId = MixedReality.Toolkit.Input.HandshapeTypes.HandshapeId; diff --git a/org.mixedrealitytoolkit.uxcomponents.noncanvas/Toggles/128x32/TogglePressableButton_128x32mm_IconAndText_L.prefab b/org.mixedrealitytoolkit.uxcomponents.noncanvas/Toggles/128x32/TogglePressableButton_128x32mm_IconAndText_L.prefab index 6c44814c6..fa451d22d 100644 --- a/org.mixedrealitytoolkit.uxcomponents.noncanvas/Toggles/128x32/TogglePressableButton_128x32mm_IconAndText_L.prefab +++ b/org.mixedrealitytoolkit.uxcomponents.noncanvas/Toggles/128x32/TogglePressableButton_128x32mm_IconAndText_L.prefab @@ -5,6 +5,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 842311133697310070, guid: 8ace9c04082e8ce4ea440f9bef681ce3, type: 3} @@ -141,6 +142,9 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: - {fileID: 842311133697310070, guid: 8ace9c04082e8ce4ea440f9bef681ce3, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 8ace9c04082e8ce4ea440f9bef681ce3, type: 3} --- !u!1 &4202663842332636073 stripped GameObject: diff --git a/org.mixedrealitytoolkit.uxcomponents.noncanvas/Toggles/128x32/TogglePressableButton_128x32mm_Radio_L.prefab b/org.mixedrealitytoolkit.uxcomponents.noncanvas/Toggles/128x32/TogglePressableButton_128x32mm_Radio_L.prefab index 22204b1cd..bbbd24287 100644 --- a/org.mixedrealitytoolkit.uxcomponents.noncanvas/Toggles/128x32/TogglePressableButton_128x32mm_Radio_L.prefab +++ b/org.mixedrealitytoolkit.uxcomponents.noncanvas/Toggles/128x32/TogglePressableButton_128x32mm_Radio_L.prefab @@ -5,6 +5,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 3674388428467052374, guid: d421d0209a69df74f98666291a669e55, type: 3} @@ -76,4 +77,7 @@ PrefabInstance: value: Toggle Button Radio Left objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: d421d0209a69df74f98666291a669e55, type: 3} diff --git a/org.mixedrealitytoolkit.uxcomponents.noncanvas/Toggles/128x32/TogglePressableButton_128x32mm_Radio_R.prefab b/org.mixedrealitytoolkit.uxcomponents.noncanvas/Toggles/128x32/TogglePressableButton_128x32mm_Radio_R.prefab index aafd14953..1bb3ac482 100644 --- a/org.mixedrealitytoolkit.uxcomponents.noncanvas/Toggles/128x32/TogglePressableButton_128x32mm_Radio_R.prefab +++ b/org.mixedrealitytoolkit.uxcomponents.noncanvas/Toggles/128x32/TogglePressableButton_128x32mm_Radio_R.prefab @@ -5,6 +5,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 2980225933636764412, guid: d4ce83b8ab85d86408f92a7184cd4fad, type: 3} @@ -104,4 +105,7 @@ PrefabInstance: value: 0.52156866 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: d4ce83b8ab85d86408f92a7184cd4fad, type: 3} diff --git a/org.mixedrealitytoolkit.uxcomponents.noncanvas/Toggles/128x32/TogglePressableButton_128x32mm_RoundCheck_L.prefab b/org.mixedrealitytoolkit.uxcomponents.noncanvas/Toggles/128x32/TogglePressableButton_128x32mm_RoundCheck_L.prefab index 10959074d..f02af7ee5 100644 --- a/org.mixedrealitytoolkit.uxcomponents.noncanvas/Toggles/128x32/TogglePressableButton_128x32mm_RoundCheck_L.prefab +++ b/org.mixedrealitytoolkit.uxcomponents.noncanvas/Toggles/128x32/TogglePressableButton_128x32mm_RoundCheck_L.prefab @@ -5,6 +5,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 341293155273246972, guid: d4ce83b8ab85d86408f92a7184cd4fad, type: 3} @@ -60,7 +61,7 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} - target: {fileID: 7107312069049022770, guid: d4ce83b8ab85d86408f92a7184cd4fad, type: 3} - propertyPath: m_Materials.Array.data[0] + propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: 5aef1158e958b444cb0634a3d0cf0567, type: 2} - target: {fileID: 7107312069049022771, guid: d4ce83b8ab85d86408f92a7184cd4fad, type: 3} @@ -108,4 +109,7 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: d4ce83b8ab85d86408f92a7184cd4fad, type: 3} diff --git a/org.mixedrealitytoolkit.uxcomponents.noncanvas/Toggles/128x32/TogglePressableButton_128x32mm_RoundCheck_R.prefab b/org.mixedrealitytoolkit.uxcomponents.noncanvas/Toggles/128x32/TogglePressableButton_128x32mm_RoundCheck_R.prefab index e51d075da..4b2ee44b4 100644 --- a/org.mixedrealitytoolkit.uxcomponents.noncanvas/Toggles/128x32/TogglePressableButton_128x32mm_RoundCheck_R.prefab +++ b/org.mixedrealitytoolkit.uxcomponents.noncanvas/Toggles/128x32/TogglePressableButton_128x32mm_RoundCheck_R.prefab @@ -5,10 +5,11 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 624329646436594517, guid: 72dfeb9ecf5ad884b87eff8bc5b49276, type: 3} - propertyPath: m_Materials.Array.data[0] + propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - target: {fileID: 954131435394119071, guid: 72dfeb9ecf5ad884b87eff8bc5b49276, type: 3} @@ -16,7 +17,7 @@ PrefabInstance: value: 2 objectReference: {fileID: 0} - target: {fileID: 954131435394119071, guid: 72dfeb9ecf5ad884b87eff8bc5b49276, type: 3} - propertyPath: managedReferences[0].tintables.Array.data[1] + propertyPath: 'managedReferences[0].tintables.Array.data[1]' value: objectReference: {fileID: 2980225933636764412} - target: {fileID: 954131435394119071, guid: 72dfeb9ecf5ad884b87eff8bc5b49276, type: 3} @@ -28,7 +29,7 @@ PrefabInstance: value: 2 objectReference: {fileID: 0} - target: {fileID: 954131435394119071, guid: 72dfeb9ecf5ad884b87eff8bc5b49276, type: 3} - propertyPath: stateContainers.entries.Array.data[0].value.effects.Array.data[0].tintables.Array.data[1] + propertyPath: 'stateContainers.entries.Array.data[0].value.effects.Array.data[0].tintables.Array.data[1]' value: objectReference: {fileID: 2980225933636764412} - target: {fileID: 2667316837219457015, guid: 72dfeb9ecf5ad884b87eff8bc5b49276, type: 3} @@ -108,7 +109,7 @@ PrefabInstance: value: objectReference: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} - target: {fileID: 8829903862420055379, guid: 72dfeb9ecf5ad884b87eff8bc5b49276, type: 3} - propertyPath: m_Materials.Array.data[0] + propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: 5aef1158e958b444cb0634a3d0cf0567, type: 2} - target: {fileID: 8829903862420055380, guid: 72dfeb9ecf5ad884b87eff8bc5b49276, type: 3} @@ -196,6 +197,12 @@ PrefabInstance: value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 6746213747597823087, guid: 72dfeb9ecf5ad884b87eff8bc5b49276, type: 3} + insertIndex: -1 + addedObject: {fileID: 341293155273246972} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 72dfeb9ecf5ad884b87eff8bc5b49276, type: 3} --- !u!4 &5023622194610704398 stripped Transform: @@ -218,6 +225,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 5023622194610704398} m_Modifications: - target: {fileID: 267863659013112660, guid: cb7225c84c3f4104791f51760eaa1f03, type: 3} @@ -401,7 +409,15 @@ PrefabInstance: value: objectReference: {fileID: 7591774414076744447} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: cb7225c84c3f4104791f51760eaa1f03, type: 3} +--- !u!4 &341293155273246972 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3337382241816840532, guid: cb7225c84c3f4104791f51760eaa1f03, type: 3} + m_PrefabInstance: {fileID: 3092925274768343464} + m_PrefabAsset: {fileID: 0} --- !u!212 &2980225933636764412 stripped SpriteRenderer: m_CorrespondingSourceObject: {fileID: 267863659013112660, guid: cb7225c84c3f4104791f51760eaa1f03, type: 3} diff --git a/org.mixedrealitytoolkit.uxcomponents.noncanvas/Toggles/128x32/TogglePressableButton_128x32mm_SquareCheck_L.prefab b/org.mixedrealitytoolkit.uxcomponents.noncanvas/Toggles/128x32/TogglePressableButton_128x32mm_SquareCheck_L.prefab index 71d2ee4ee..3cd008e97 100644 --- a/org.mixedrealitytoolkit.uxcomponents.noncanvas/Toggles/128x32/TogglePressableButton_128x32mm_SquareCheck_L.prefab +++ b/org.mixedrealitytoolkit.uxcomponents.noncanvas/Toggles/128x32/TogglePressableButton_128x32mm_SquareCheck_L.prefab @@ -5,6 +5,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 3674388428467052374, guid: d421d0209a69df74f98666291a669e55, type: 3} @@ -72,4 +73,7 @@ PrefabInstance: value: Toggle Pressable Button Square Check Left objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: d421d0209a69df74f98666291a669e55, type: 3} diff --git a/org.mixedrealitytoolkit.uxcomponents.noncanvas/Toggles/128x32/TogglePressableButton_128x32mm_SquareCheck_R.prefab b/org.mixedrealitytoolkit.uxcomponents.noncanvas/Toggles/128x32/TogglePressableButton_128x32mm_SquareCheck_R.prefab index 7781ee325..74b0d6df5 100644 --- a/org.mixedrealitytoolkit.uxcomponents.noncanvas/Toggles/128x32/TogglePressableButton_128x32mm_SquareCheck_R.prefab +++ b/org.mixedrealitytoolkit.uxcomponents.noncanvas/Toggles/128x32/TogglePressableButton_128x32mm_SquareCheck_R.prefab @@ -5,6 +5,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 2980225933636764412, guid: d4ce83b8ab85d86408f92a7184cd4fad, type: 3} @@ -100,4 +101,7 @@ PrefabInstance: value: 0.52156866 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: d4ce83b8ab85d86408f92a7184cd4fad, type: 3} diff --git a/org.mixedrealitytoolkit.uxcomponents.noncanvas/Toggles/128x32/TogglePressableButton_128x32mm_Switch_L.prefab b/org.mixedrealitytoolkit.uxcomponents.noncanvas/Toggles/128x32/TogglePressableButton_128x32mm_Switch_L.prefab index a042f880c..c5b708c6c 100644 --- a/org.mixedrealitytoolkit.uxcomponents.noncanvas/Toggles/128x32/TogglePressableButton_128x32mm_Switch_L.prefab +++ b/org.mixedrealitytoolkit.uxcomponents.noncanvas/Toggles/128x32/TogglePressableButton_128x32mm_Switch_L.prefab @@ -5,6 +5,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 4490143930930398713, guid: 02905dde8e7f36a43a8824640905e919, type: 3} @@ -76,4 +77,7 @@ PrefabInstance: value: -0.048 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 02905dde8e7f36a43a8824640905e919, type: 3} diff --git a/org.mixedrealitytoolkit.uxcomponents.noncanvas/Toggles/128x32/TogglePressableButton_128x32mm_Switch_R.prefab b/org.mixedrealitytoolkit.uxcomponents.noncanvas/Toggles/128x32/TogglePressableButton_128x32mm_Switch_R.prefab index f4f33adea..5f186e7c5 100644 --- a/org.mixedrealitytoolkit.uxcomponents.noncanvas/Toggles/128x32/TogglePressableButton_128x32mm_Switch_R.prefab +++ b/org.mixedrealitytoolkit.uxcomponents.noncanvas/Toggles/128x32/TogglePressableButton_128x32mm_Switch_R.prefab @@ -5,6 +5,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4490143932523709208} m_Modifications: - target: {fileID: 6293017779727346121, guid: 73fe1e0781857a548bdd21f3e344f650, type: 3} @@ -56,16 +57,27 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} - target: {fileID: 7844508667005061968, guid: 73fe1e0781857a548bdd21f3e344f650, type: 3} - propertyPath: m_Materials.Array.data[0] + propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: a5e18561b49fc5148824ed7c16d531f5, type: 2} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 6293017779727346121, guid: 73fe1e0781857a548bdd21f3e344f650, type: 3} + insertIndex: -1 + addedObject: {fileID: 9142581645191163662} m_SourcePrefab: {fileID: 100100000, guid: 73fe1e0781857a548bdd21f3e344f650, type: 3} --- !u!1 &6616608981005156477 stripped GameObject: m_CorrespondingSourceObject: {fileID: 6293017779010451976, guid: 73fe1e0781857a548bdd21f3e344f650, type: 3} m_PrefabInstance: {fileID: 902866841538034293} m_PrefabAsset: {fileID: 0} +--- !u!4 &6616608981442352003 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6293017779727346166, guid: 73fe1e0781857a548bdd21f3e344f650, type: 3} + m_PrefabInstance: {fileID: 902866841538034293} + m_PrefabAsset: {fileID: 0} --- !u!1 &6616608981442352060 stripped GameObject: m_CorrespondingSourceObject: {fileID: 6293017779727346121, guid: 73fe1e0781857a548bdd21f3e344f650, type: 3} @@ -125,10 +137,11 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 954131435394119071, guid: 72dfeb9ecf5ad884b87eff8bc5b49276, type: 3} - propertyPath: managedReferences[1393819269385945091] + propertyPath: 'managedReferences[1393819269385945091]' value: MixedReality.Toolkit.UXCore MixedReality.Toolkit.UX.AnimationEffect objectReference: {fileID: 0} - target: {fileID: 954131435394119071, guid: 72dfeb9ecf5ad884b87eff8bc5b49276, type: 3} @@ -160,7 +173,7 @@ PrefabInstance: value: 1 objectReference: {fileID: 0} - target: {fileID: 954131435394119071, guid: 72dfeb9ecf5ad884b87eff8bc5b49276, type: 3} - propertyPath: stateContainers.entries.Array.data[4].value.effects.Array.data[0] + propertyPath: 'stateContainers.entries.Array.data[4].value.effects.Array.data[0]' value: 1393819269385945091 objectReference: {fileID: 0} - target: {fileID: 954131435394119071, guid: 72dfeb9ecf5ad884b87eff8bc5b49276, type: 3} @@ -320,6 +333,12 @@ PrefabInstance: value: -0.01041 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 8829903862454882072, guid: 72dfeb9ecf5ad884b87eff8bc5b49276, type: 3} + insertIndex: -1 + addedObject: {fileID: 6616608981442352003} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 72dfeb9ecf5ad884b87eff8bc5b49276, type: 3} --- !u!114 &3866738496716522142 stripped MonoBehaviour: diff --git a/org.mixedrealitytoolkit.uxcomponents.noncanvas/Toggles/160x32/TogglePressableButton_160x32mm_IconAndText_L.prefab b/org.mixedrealitytoolkit.uxcomponents.noncanvas/Toggles/160x32/TogglePressableButton_160x32mm_IconAndText_L.prefab index cbe2c90e3..9f9ebe19a 100644 --- a/org.mixedrealitytoolkit.uxcomponents.noncanvas/Toggles/160x32/TogglePressableButton_160x32mm_IconAndText_L.prefab +++ b/org.mixedrealitytoolkit.uxcomponents.noncanvas/Toggles/160x32/TogglePressableButton_160x32mm_IconAndText_L.prefab @@ -5,6 +5,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 2105723638768039693, guid: a69170382c049914c9866f5914e0adee, type: 3} @@ -140,6 +141,9 @@ PrefabInstance: value: UnityEngine.Object, UnityEngine objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a69170382c049914c9866f5914e0adee, type: 3} --- !u!1 &7185924171883479182 stripped GameObject: diff --git a/org.mixedrealitytoolkit.uxcomponents.noncanvas/Toggles/160x32/TogglePressableButton_160x32mm_Radio_L.prefab b/org.mixedrealitytoolkit.uxcomponents.noncanvas/Toggles/160x32/TogglePressableButton_160x32mm_Radio_L.prefab index 0a414d69e..153a9ff7f 100644 --- a/org.mixedrealitytoolkit.uxcomponents.noncanvas/Toggles/160x32/TogglePressableButton_160x32mm_Radio_L.prefab +++ b/org.mixedrealitytoolkit.uxcomponents.noncanvas/Toggles/160x32/TogglePressableButton_160x32mm_Radio_L.prefab @@ -5,6 +5,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 3707959368759039755, guid: a508d1f64cf0cc5448908128ae1fcf82, type: 3} @@ -72,4 +73,7 @@ PrefabInstance: value: TogglePressableButton_160x32mm_Radio_L objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a508d1f64cf0cc5448908128ae1fcf82, type: 3} diff --git a/org.mixedrealitytoolkit.uxcomponents.noncanvas/Toggles/160x32/TogglePressableButton_160x32mm_RoundCheck_L.prefab b/org.mixedrealitytoolkit.uxcomponents.noncanvas/Toggles/160x32/TogglePressableButton_160x32mm_RoundCheck_L.prefab index 996821568..0f480fee8 100644 --- a/org.mixedrealitytoolkit.uxcomponents.noncanvas/Toggles/160x32/TogglePressableButton_160x32mm_RoundCheck_L.prefab +++ b/org.mixedrealitytoolkit.uxcomponents.noncanvas/Toggles/160x32/TogglePressableButton_160x32mm_RoundCheck_L.prefab @@ -5,6 +5,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 3869396094104662090, guid: 3e1e99b2fe1097046bd53bf2066727d3, type: 3} @@ -72,4 +73,7 @@ PrefabInstance: value: objectReference: {fileID: 21300000, guid: 86499e843285f904285211605894be72, type: 3} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 3e1e99b2fe1097046bd53bf2066727d3, type: 3} diff --git a/org.mixedrealitytoolkit.uxcomponents.noncanvas/Toggles/160x32/TogglePressableButton_160x32mm_SquareCheck_L.prefab b/org.mixedrealitytoolkit.uxcomponents.noncanvas/Toggles/160x32/TogglePressableButton_160x32mm_SquareCheck_L.prefab index 2674756a3..19b45026d 100644 --- a/org.mixedrealitytoolkit.uxcomponents.noncanvas/Toggles/160x32/TogglePressableButton_160x32mm_SquareCheck_L.prefab +++ b/org.mixedrealitytoolkit.uxcomponents.noncanvas/Toggles/160x32/TogglePressableButton_160x32mm_SquareCheck_L.prefab @@ -5,6 +5,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 606282416026189974, guid: bfd33c1492ad87d45baa20abdafc1454, type: 3} @@ -88,4 +89,7 @@ PrefabInstance: value: 0.16 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: bfd33c1492ad87d45baa20abdafc1454, type: 3} diff --git a/org.mixedrealitytoolkit.uxcomponents.noncanvas/Toggles/160x32/TogglePressableButton_160x32mm_Switch_L.prefab b/org.mixedrealitytoolkit.uxcomponents.noncanvas/Toggles/160x32/TogglePressableButton_160x32mm_Switch_L.prefab index 265cd4837..dcee8372f 100644 --- a/org.mixedrealitytoolkit.uxcomponents.noncanvas/Toggles/160x32/TogglePressableButton_160x32mm_Switch_L.prefab +++ b/org.mixedrealitytoolkit.uxcomponents.noncanvas/Toggles/160x32/TogglePressableButton_160x32mm_Switch_L.prefab @@ -5,6 +5,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 323159698493470450, guid: c31c3c18fbaebe44c81393ab32d91b79, type: 3} @@ -96,4 +97,7 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c31c3c18fbaebe44c81393ab32d91b79, type: 3} diff --git a/org.mixedrealitytoolkit.uxcomponents.noncanvas/Toggles/32x32/TogglePressableButton_32x32mm_Circular_IconOnly.prefab b/org.mixedrealitytoolkit.uxcomponents.noncanvas/Toggles/32x32/TogglePressableButton_32x32mm_Circular_IconOnly.prefab index 68d0d2568..08bbbd72d 100644 --- a/org.mixedrealitytoolkit.uxcomponents.noncanvas/Toggles/32x32/TogglePressableButton_32x32mm_Circular_IconOnly.prefab +++ b/org.mixedrealitytoolkit.uxcomponents.noncanvas/Toggles/32x32/TogglePressableButton_32x32mm_Circular_IconOnly.prefab @@ -5,6 +5,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 1147649739598636238, guid: bb45df82ba657a845aea1b5aa230164f, type: 3} @@ -64,7 +65,7 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} - target: {fileID: 1150496780815463827, guid: bb45df82ba657a845aea1b5aa230164f, type: 3} - propertyPath: m_Materials.Array.data[0] + propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: 1b4c6757612a7ee4ebc060ae14fb9cac, type: 2} - target: {fileID: 1510850789505225798, guid: bb45df82ba657a845aea1b5aa230164f, type: 3} @@ -72,7 +73,7 @@ PrefabInstance: value: UX.Button.CircularFrontplateHighlight objectReference: {fileID: 0} - target: {fileID: 2167637656416700379, guid: bb45df82ba657a845aea1b5aa230164f, type: 3} - propertyPath: m_Materials.Array.data[0] + propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: 9bbf915647f6de74ca3799bd504483b4, type: 2} - target: {fileID: 2448924970063169044, guid: bb45df82ba657a845aea1b5aa230164f, type: 3} @@ -88,15 +89,15 @@ PrefabInstance: value: 0.05 objectReference: {fileID: 0} - target: {fileID: 5671290511877435209, guid: bb45df82ba657a845aea1b5aa230164f, type: 3} - propertyPath: m_Materials.Array.data[0] + propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: edcd7c74a5fcb1e4cb477a62e8ad276e, type: 2} - target: {fileID: 5951146835784878677, guid: bb45df82ba657a845aea1b5aa230164f, type: 3} - propertyPath: m_Materials.Array.data[0] + propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: ad348facc7af0d64b9557bdfcbcd29d6, type: 2} - target: {fileID: 6792026918138184761, guid: bb45df82ba657a845aea1b5aa230164f, type: 3} - propertyPath: m_Materials.Array.data[0] + propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: 7176a17b48880904b8a311fd53c55e35, type: 2} - target: {fileID: 7259589016949695634, guid: bb45df82ba657a845aea1b5aa230164f, type: 3} @@ -120,4 +121,7 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: bb45df82ba657a845aea1b5aa230164f, type: 3} diff --git a/org.mixedrealitytoolkit.uxcomponents.noncanvas/Toggles/32x32/TogglePressableButton_32x32mm_IconAndText.prefab b/org.mixedrealitytoolkit.uxcomponents.noncanvas/Toggles/32x32/TogglePressableButton_32x32mm_IconAndText.prefab index 03c299c4f..bfbfb24d1 100644 --- a/org.mixedrealitytoolkit.uxcomponents.noncanvas/Toggles/32x32/TogglePressableButton_32x32mm_IconAndText.prefab +++ b/org.mixedrealitytoolkit.uxcomponents.noncanvas/Toggles/32x32/TogglePressableButton_32x32mm_IconAndText.prefab @@ -5,6 +5,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 183870191141822808, guid: ebf6a177e3199274b8bd12a0c8157f29, type: 3} @@ -140,7 +141,7 @@ PrefabInstance: value: 1 objectReference: {fileID: 0} - target: {fileID: 8259050266689090269, guid: ebf6a177e3199274b8bd12a0c8157f29, type: 3} - propertyPath: managedReferences[1393819269385945103] + propertyPath: 'managedReferences[1393819269385945103]' value: MixedReality.Toolkit.UXCore MixedReality.Toolkit.UX.SetTargetsActiveEffect objectReference: {fileID: 0} - target: {fileID: 8259050266689090269, guid: ebf6a177e3199274b8bd12a0c8157f29, type: 3} @@ -156,7 +157,7 @@ PrefabInstance: value: 1 objectReference: {fileID: 0} - target: {fileID: 8259050266689090269, guid: ebf6a177e3199274b8bd12a0c8157f29, type: 3} - propertyPath: managedReferences[1393819269385945103].targets.Array.data[0] + propertyPath: 'managedReferences[1393819269385945103].targets.Array.data[0]' value: objectReference: {fileID: 7051363911311458445} - target: {fileID: 8259050266689090269, guid: ebf6a177e3199274b8bd12a0c8157f29, type: 3} @@ -164,7 +165,7 @@ PrefabInstance: value: 1 objectReference: {fileID: 0} - target: {fileID: 8259050266689090269, guid: ebf6a177e3199274b8bd12a0c8157f29, type: 3} - propertyPath: stateContainers.entries.Array.data[4].value.effects.Array.data[0] + propertyPath: 'stateContainers.entries.Array.data[4].value.effects.Array.data[0]' value: 1393819269385945103 objectReference: {fileID: 0} - target: {fileID: 8259050266689090269, guid: ebf6a177e3199274b8bd12a0c8157f29, type: 3} @@ -192,10 +193,13 @@ PrefabInstance: value: 1 objectReference: {fileID: 0} - target: {fileID: 8259050266689090269, guid: ebf6a177e3199274b8bd12a0c8157f29, type: 3} - propertyPath: stateContainers.entries.Array.data[4].value.effects.Array.data[0].targets.Array.data[0] + propertyPath: 'stateContainers.entries.Array.data[4].value.effects.Array.data[0].targets.Array.data[0]' value: objectReference: {fileID: 7051363911311458445} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: ebf6a177e3199274b8bd12a0c8157f29, type: 3} --- !u!1 &7051363911311458445 stripped GameObject: diff --git a/org.mixedrealitytoolkit.uxcomponents.noncanvas/Toggles/32x32/TogglePressableButton_32x32mm_Radio.prefab b/org.mixedrealitytoolkit.uxcomponents.noncanvas/Toggles/32x32/TogglePressableButton_32x32mm_Radio.prefab index f803efc65..5335d1b71 100644 --- a/org.mixedrealitytoolkit.uxcomponents.noncanvas/Toggles/32x32/TogglePressableButton_32x32mm_Radio.prefab +++ b/org.mixedrealitytoolkit.uxcomponents.noncanvas/Toggles/32x32/TogglePressableButton_32x32mm_Radio.prefab @@ -5,6 +5,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 2111029842618737434, guid: 32fa8a656cfcde24da6a4ec1fdc0bdef, type: 3} @@ -68,4 +69,7 @@ PrefabInstance: value: objectReference: {fileID: 21300000, guid: 91ddf1a8cf8c577499fe347cd46a5d05, type: 3} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 32fa8a656cfcde24da6a4ec1fdc0bdef, type: 3} diff --git a/org.mixedrealitytoolkit.uxcomponents.noncanvas/Toggles/32x32/TogglePressableButton_32x32mm_RoundCheck.prefab b/org.mixedrealitytoolkit.uxcomponents.noncanvas/Toggles/32x32/TogglePressableButton_32x32mm_RoundCheck.prefab index e0db21ad2..e4ccb4063 100644 --- a/org.mixedrealitytoolkit.uxcomponents.noncanvas/Toggles/32x32/TogglePressableButton_32x32mm_RoundCheck.prefab +++ b/org.mixedrealitytoolkit.uxcomponents.noncanvas/Toggles/32x32/TogglePressableButton_32x32mm_RoundCheck.prefab @@ -5,6 +5,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 9170803425525947472} m_Modifications: - target: {fileID: 267863659013112660, guid: cb7225c84c3f4104791f51760eaa1f03, type: 3} @@ -188,17 +189,26 @@ PrefabInstance: value: objectReference: {fileID: 7591774414076744447, guid: d4ce83b8ab85d86408f92a7184cd4fad, type: 3} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: cb7225c84c3f4104791f51760eaa1f03, type: 3} --- !u!212 &2111029842618737434 stripped SpriteRenderer: m_CorrespondingSourceObject: {fileID: 267863659013112660, guid: cb7225c84c3f4104791f51760eaa1f03, type: 3} m_PrefabInstance: {fileID: 2232737448058642510} m_PrefabAsset: {fileID: 0} +--- !u!4 &3507325090701240602 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3337382241816840532, guid: cb7225c84c3f4104791f51760eaa1f03, type: 3} + m_PrefabInstance: {fileID: 2232737448058642510} + m_PrefabAsset: {fileID: 0} --- !u!1001 &2232737448771101148 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 90244099029470759, guid: c25d8f2d22117bd40ad824684551fbde, type: 3} @@ -218,7 +228,7 @@ PrefabInstance: value: 2 objectReference: {fileID: 0} - target: {fileID: 3538676005348672636, guid: c25d8f2d22117bd40ad824684551fbde, type: 3} - propertyPath: managedReferences[0].tintables.Array.data[1] + propertyPath: 'managedReferences[0].tintables.Array.data[1]' value: objectReference: {fileID: 2111029842618737434} - target: {fileID: 3538676005348672636, guid: c25d8f2d22117bd40ad824684551fbde, type: 3} @@ -234,11 +244,11 @@ PrefabInstance: value: 2 objectReference: {fileID: 0} - target: {fileID: 3538676005348672636, guid: c25d8f2d22117bd40ad824684551fbde, type: 3} - propertyPath: stateContainers.entries.Array.data[0].value.effects.Array.data[0].tintables.Array.data[1] + propertyPath: 'stateContainers.entries.Array.data[0].value.effects.Array.data[0].tintables.Array.data[1]' value: objectReference: {fileID: 2111029842618737434} - target: {fileID: 3786461762529493686, guid: c25d8f2d22117bd40ad824684551fbde, type: 3} - propertyPath: m_Materials.Array.data[0] + propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 5762245003366665926, guid: 9b0d0ee11ff70b04d901a29b519cbaa0, type: 2} - target: {fileID: 5092507605265006331, guid: c25d8f2d22117bd40ad824684551fbde, type: 3} @@ -314,6 +324,12 @@ PrefabInstance: value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 7041795561998941580, guid: c25d8f2d22117bd40ad824684551fbde, type: 3} + insertIndex: -1 + addedObject: {fileID: 3507325090701240602} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c25d8f2d22117bd40ad824684551fbde, type: 3} --- !u!114 &6028391899441880737 stripped MonoBehaviour: diff --git a/org.mixedrealitytoolkit.uxcomponents.noncanvas/Toggles/32x32/TogglePressableButton_32x32mm_Switch.prefab b/org.mixedrealitytoolkit.uxcomponents.noncanvas/Toggles/32x32/TogglePressableButton_32x32mm_Switch.prefab index e3f120bb1..b7e754b67 100644 --- a/org.mixedrealitytoolkit.uxcomponents.noncanvas/Toggles/32x32/TogglePressableButton_32x32mm_Switch.prefab +++ b/org.mixedrealitytoolkit.uxcomponents.noncanvas/Toggles/32x32/TogglePressableButton_32x32mm_Switch.prefab @@ -5,6 +5,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 90244099029470759, guid: c25d8f2d22117bd40ad824684551fbde, type: 3} @@ -24,7 +25,7 @@ PrefabInstance: value: 4 objectReference: {fileID: 0} - target: {fileID: 3538676005348672636, guid: c25d8f2d22117bd40ad824684551fbde, type: 3} - propertyPath: managedReferences[1393819269385945104] + propertyPath: 'managedReferences[1393819269385945104]' value: MixedReality.Toolkit.UXCore MixedReality.Toolkit.UX.AnimationEffect objectReference: {fileID: 0} - target: {fileID: 3538676005348672636, guid: c25d8f2d22117bd40ad824684551fbde, type: 3} @@ -56,7 +57,7 @@ PrefabInstance: value: 1 objectReference: {fileID: 0} - target: {fileID: 3538676005348672636, guid: c25d8f2d22117bd40ad824684551fbde, type: 3} - propertyPath: stateContainers.entries.Array.data[4].value.effects.Array.data[0] + propertyPath: 'stateContainers.entries.Array.data[4].value.effects.Array.data[0]' value: 1393819269385945104 objectReference: {fileID: 0} - target: {fileID: 3538676005348672636, guid: c25d8f2d22117bd40ad824684551fbde, type: 3} @@ -88,7 +89,7 @@ PrefabInstance: value: 3 objectReference: {fileID: 0} - target: {fileID: 3786461762529493686, guid: c25d8f2d22117bd40ad824684551fbde, type: 3} - propertyPath: m_Materials.Array.data[0] + propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 5762245003366665926, guid: 9b0d0ee11ff70b04d901a29b519cbaa0, type: 2} - target: {fileID: 5092507605265006331, guid: c25d8f2d22117bd40ad824684551fbde, type: 3} @@ -164,6 +165,12 @@ PrefabInstance: value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 5092507605265006331, guid: c25d8f2d22117bd40ad824684551fbde, type: 3} + insertIndex: -1 + addedObject: {fileID: 4805475335681852259} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c25d8f2d22117bd40ad824684551fbde, type: 3} --- !u!4 &6001337465202651611 stripped Transform: @@ -186,6 +193,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 6001337465202651611} m_Modifications: - target: {fileID: 6293017779727346121, guid: 73fe1e0781857a548bdd21f3e344f650, type: 3} @@ -237,10 +245,16 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} - target: {fileID: 7844508667005061968, guid: 73fe1e0781857a548bdd21f3e344f650, type: 3} - propertyPath: m_Materials.Array.data[0] + propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: a5e18561b49fc5148824ed7c16d531f5, type: 2} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 6293017779727346121, guid: 73fe1e0781857a548bdd21f3e344f650, type: 3} + insertIndex: -1 + addedObject: {fileID: 275243561} m_SourcePrefab: {fileID: 100100000, guid: 73fe1e0781857a548bdd21f3e344f650, type: 3} --- !u!1 &4805475335120933021 stripped GameObject: @@ -301,3 +315,8 @@ MonoBehaviour: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 +--- !u!4 &4805475335681852259 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6293017779727346166, guid: 73fe1e0781857a548bdd21f3e344f650, type: 3} + m_PrefabInstance: {fileID: 1577720086887295637} + m_PrefabAsset: {fileID: 0} diff --git a/org.mixedrealitytoolkit.uxcomponents.noncanvas/Toggles/96x32/TogglePressableButton_96x32mm_Switch_L.prefab b/org.mixedrealitytoolkit.uxcomponents.noncanvas/Toggles/96x32/TogglePressableButton_96x32mm_Switch_L.prefab index 4d2b2205a..3dad46360 100644 --- a/org.mixedrealitytoolkit.uxcomponents.noncanvas/Toggles/96x32/TogglePressableButton_96x32mm_Switch_L.prefab +++ b/org.mixedrealitytoolkit.uxcomponents.noncanvas/Toggles/96x32/TogglePressableButton_96x32mm_Switch_L.prefab @@ -5,6 +5,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 323159698493470450, guid: c31c3c18fbaebe44c81393ab32d91b79, type: 3} @@ -104,4 +105,7 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c31c3c18fbaebe44c81393ab32d91b79, type: 3} diff --git a/org.mixedrealitytoolkit.uxcomponents.noncanvas/Toggles/ToggleCollection.prefab b/org.mixedrealitytoolkit.uxcomponents.noncanvas/Toggles/ToggleCollection.prefab index 3e1ad2a6c..936ec2bd8 100644 --- a/org.mixedrealitytoolkit.uxcomponents.noncanvas/Toggles/ToggleCollection.prefab +++ b/org.mixedrealitytoolkit.uxcomponents.noncanvas/Toggles/ToggleCollection.prefab @@ -24,6 +24,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7901979436809311521} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.044, y: -0.0704, z: 0.552} m_LocalScale: {x: 1, y: 1, z: 1} @@ -33,7 +34,6 @@ Transform: - {fileID: 1084037950028722989} - {fileID: 1084037950416786278} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &7901979436809311534 MonoBehaviour: @@ -61,6 +61,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 7901979436809311535} m_Modifications: - target: {fileID: 7107312069017326457, guid: d4ce83b8ab85d86408f92a7184cd4fad, type: 3} @@ -116,6 +117,9 @@ PrefabInstance: value: 2 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: d4ce83b8ab85d86408f92a7184cd4fad, type: 3} --- !u!114 &356381359321608875 stripped MonoBehaviour: @@ -138,6 +142,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 7901979436809311535} m_Modifications: - target: {fileID: 7107312069017326457, guid: d4ce83b8ab85d86408f92a7184cd4fad, type: 3} @@ -193,6 +198,9 @@ PrefabInstance: value: 2 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: d4ce83b8ab85d86408f92a7184cd4fad, type: 3} --- !u!114 &356381359705215712 stripped MonoBehaviour: @@ -215,6 +223,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 7901979436809311535} m_Modifications: - target: {fileID: 7107312069017326457, guid: d4ce83b8ab85d86408f92a7184cd4fad, type: 3} @@ -270,6 +279,9 @@ PrefabInstance: value: 2 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: d4ce83b8ab85d86408f92a7184cd4fad, type: 3} --- !u!114 &356381358237148105 stripped MonoBehaviour: diff --git a/org.mixedrealitytoolkit.uxcomponents.noncanvas/Toggles/ToggleableIcon.prefab b/org.mixedrealitytoolkit.uxcomponents.noncanvas/Toggles/ToggleableIcon.prefab index 30e7e3266..1e37c28ca 100644 --- a/org.mixedrealitytoolkit.uxcomponents.noncanvas/Toggles/ToggleableIcon.prefab +++ b/org.mixedrealitytoolkit.uxcomponents.noncanvas/Toggles/ToggleableIcon.prefab @@ -25,13 +25,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6373007353952585040} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &4686225858939836011 MonoBehaviour: @@ -67,6 +67,9 @@ SpriteRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: diff --git a/org.mixedrealitytoolkit.uxcomponents.noncanvas/Toggles/ToggleableRadioIcon.prefab b/org.mixedrealitytoolkit.uxcomponents.noncanvas/Toggles/ToggleableRadioIcon.prefab index 8bf228cb7..fa9804656 100644 --- a/org.mixedrealitytoolkit.uxcomponents.noncanvas/Toggles/ToggleableRadioIcon.prefab +++ b/org.mixedrealitytoolkit.uxcomponents.noncanvas/Toggles/ToggleableRadioIcon.prefab @@ -5,6 +5,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 267863659013112660, guid: cb7225c84c3f4104791f51760eaa1f03, type: 3} @@ -176,4 +177,7 @@ PrefabInstance: value: objectReference: {fileID: 7591774414076744447, guid: d4ce83b8ab85d86408f92a7184cd4fad, type: 3} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: cb7225c84c3f4104791f51760eaa1f03, type: 3} diff --git a/org.mixedrealitytoolkit.uxcomponents.noncanvas/Toggles/ToggleableSquareIcon.prefab b/org.mixedrealitytoolkit.uxcomponents.noncanvas/Toggles/ToggleableSquareIcon.prefab index 60384194a..730fbce7e 100644 --- a/org.mixedrealitytoolkit.uxcomponents.noncanvas/Toggles/ToggleableSquareIcon.prefab +++ b/org.mixedrealitytoolkit.uxcomponents.noncanvas/Toggles/ToggleableSquareIcon.prefab @@ -5,6 +5,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 267863659013112660, guid: cb7225c84c3f4104791f51760eaa1f03, type: 3} @@ -176,4 +177,7 @@ PrefabInstance: value: objectReference: {fileID: 7591774414076744447, guid: d4ce83b8ab85d86408f92a7184cd4fad, type: 3} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: cb7225c84c3f4104791f51760eaa1f03, type: 3} diff --git a/org.mixedrealitytoolkit.uxcomponents.noncanvas/Toggles/ToggleableSwitch.prefab b/org.mixedrealitytoolkit.uxcomponents.noncanvas/Toggles/ToggleableSwitch.prefab index 4f047ac2a..ab1fd3255 100644 --- a/org.mixedrealitytoolkit.uxcomponents.noncanvas/Toggles/ToggleableSwitch.prefab +++ b/org.mixedrealitytoolkit.uxcomponents.noncanvas/Toggles/ToggleableSwitch.prefab @@ -24,13 +24,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 911086024546675638} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.016, y: 0.016, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6293017779010451977} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &6223377637519675895 SpriteRenderer: @@ -49,6 +49,9 @@ SpriteRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -107,6 +110,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6293017779010451976} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -115,7 +119,6 @@ Transform: - {fileID: 8664488436338100658} - {fileID: 7844508667006831024} m_Father: {fileID: 6293017779727346166} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &6293017779727346121 GameObject: @@ -141,6 +144,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6293017779727346121} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -149,7 +153,6 @@ Transform: - {fileID: 6293017779010451977} - {fileID: 3956075823119825570} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &6132424618410281316 MonoBehaviour: @@ -169,6 +172,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 6293017779727346166} m_Modifications: - target: {fileID: -8679921383154817045, guid: 05123a8b693b9134d8918ad90d864c0b, type: 3} @@ -228,7 +232,7 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} - target: {fileID: -7511558181221131132, guid: 05123a8b693b9134d8918ad90d864c0b, type: 3} - propertyPath: m_Materials.Array.data[0] + propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: 55d70a39c152f374bacfd3f11cd57a0c, type: 2} - target: {fileID: 919132149155446097, guid: 05123a8b693b9134d8918ad90d864c0b, type: 3} @@ -236,6 +240,9 @@ PrefabInstance: value: UX.Toggle.Backplate objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 05123a8b693b9134d8918ad90d864c0b, type: 3} --- !u!4 &3956075823119825570 stripped Transform: @@ -247,6 +254,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 6293017779010451977} m_Modifications: - target: {fileID: 100000, guid: fbc47027e54e49848fdfd6d5e20510e7, type: 3} @@ -314,10 +322,13 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} - target: {fileID: 2300000, guid: fbc47027e54e49848fdfd6d5e20510e7, type: 3} - propertyPath: m_Materials.Array.data[0] + propertyPath: 'm_Materials.Array.data[0]' value: objectReference: {fileID: 2100000, guid: a5e18561b49fc5148824ed7c16d531f5, type: 2} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fbc47027e54e49848fdfd6d5e20510e7, type: 3} --- !u!4 &7844508667006831024 stripped Transform: diff --git a/org.mixedrealitytoolkit.uxcomponents.noncanvas/package.json b/org.mixedrealitytoolkit.uxcomponents.noncanvas/package.json index 9a76f681f..7bed92bc4 100644 --- a/org.mixedrealitytoolkit.uxcomponents.noncanvas/package.json +++ b/org.mixedrealitytoolkit.uxcomponents.noncanvas/package.json @@ -1,6 +1,6 @@ { "name": "org.mixedrealitytoolkit.uxcomponents.noncanvas", - "version": "3.1.5-development", + "version": "4.0.0-development.pre.3", "description": "UX component library for 3D UX without Canvas layout. In some cases, non-Canvas UI may offer better performance.", "displayName": "MRTK UX Components (Non-Canvas)", "msftFeatureCategory": "MRTK3", @@ -13,18 +13,18 @@ "bugs": { "url": "https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/issues" }, - "unity": "2021.3", - "unityRelease": "26f1", + "unity": "6000.0", + "unityRelease": "66f2", "documentationUrl": "https://www.mixedrealitytoolkit.org", "dependencies": { - "org.mixedrealitytoolkit.uxcore": "3.3.0", - "org.mixedrealitytoolkit.spatialmanipulation": "3.4.0", + "org.mixedrealitytoolkit.uxcore": "4.0.0", + "org.mixedrealitytoolkit.spatialmanipulation": "4.0.0", "org.mixedrealitytoolkit.standardassets": "3.2.1" }, "msftOptionalPackages": { "org.mixedrealitytoolkit.data": "1.0.0-development" }, "msftTestDependencies": { - "org.mixedrealitytoolkit.input": "3.0.0" + "org.mixedrealitytoolkit.input": "4.0.0" } } \ No newline at end of file diff --git a/org.mixedrealitytoolkit.uxcomponents/AssemblyInfo.cs b/org.mixedrealitytoolkit.uxcomponents/AssemblyInfo.cs index 7884bdb11..9bf7e53a6 100644 --- a/org.mixedrealitytoolkit.uxcomponents/AssemblyInfo.cs +++ b/org.mixedrealitytoolkit.uxcomponents/AssemblyInfo.cs @@ -12,4 +12,4 @@ // The AssemblyVersion attribute is checked-in and is recommended not to be changed often. // https://docs.microsoft.com/troubleshoot/visualstudio/general/assembly-version-assembly-file-version // AssemblyFileVersion and AssemblyInformationalVersion are added by pack-upm.ps1 to match the current MRTK build version. -[assembly: AssemblyVersion("3.0.0.0")] +[assembly: AssemblyVersion("4.0.0.0")] diff --git a/org.mixedrealitytoolkit.uxcomponents/Button/Animations/ButtonActiveFocus.anim b/org.mixedrealitytoolkit.uxcomponents/Button/Animations/ButtonActiveFocus.anim index 74e5254df..8c9b04136 100644 --- a/org.mixedrealitytoolkit.uxcomponents/Button/Animations/ButtonActiveFocus.anim +++ b/org.mixedrealitytoolkit.uxcomponents/Button/Animations/ButtonActiveFocus.anim @@ -7,7 +7,7 @@ AnimationClip: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: ButtonActiveFocus - serializedVersion: 6 + serializedVersion: 7 m_Legacy: 0 m_Compressed: 0 m_UseHighQualityCurve: 1 @@ -17,7 +17,8 @@ AnimationClip: m_PositionCurves: [] m_ScaleCurves: [] m_FloatCurves: - - curve: + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -45,6 +46,7 @@ AnimationClip: path: Frontplate classID: 114 script: {fileID: 11500000, guid: ccb4029f7caac6b4182b04101ab54870, type: 3} + flags: 16 m_PPtrCurves: [] m_SampleRate: 60 m_WrapMode: 0 @@ -60,6 +62,8 @@ AnimationClip: typeID: 114 customType: 0 isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 pptrCurveMapping: [] m_AnimationClipSettings: serializedVersion: 2 @@ -82,7 +86,8 @@ AnimationClip: m_HeightFromFeet: 0 m_Mirror: 0 m_EditorCurves: - - curve: + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -110,6 +115,7 @@ AnimationClip: path: Frontplate classID: 114 script: {fileID: 11500000, guid: ccb4029f7caac6b4182b04101ab54870, type: 3} + flags: 16 m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 diff --git a/org.mixedrealitytoolkit.uxcomponents/Button/Animations/ButtonPassiveFocus.anim b/org.mixedrealitytoolkit.uxcomponents/Button/Animations/ButtonPassiveFocus.anim index 517f1af79..3f678ff50 100644 --- a/org.mixedrealitytoolkit.uxcomponents/Button/Animations/ButtonPassiveFocus.anim +++ b/org.mixedrealitytoolkit.uxcomponents/Button/Animations/ButtonPassiveFocus.anim @@ -7,7 +7,7 @@ AnimationClip: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: ButtonPassiveFocus - serializedVersion: 6 + serializedVersion: 7 m_Legacy: 0 m_Compressed: 0 m_UseHighQualityCurve: 1 @@ -17,7 +17,8 @@ AnimationClip: m_PositionCurves: [] m_ScaleCurves: [] m_FloatCurves: - - curve: + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -45,6 +46,7 @@ AnimationClip: path: Frontplate/AnimatedContent classID: 224 script: {fileID: 0} + flags: 16 m_PPtrCurves: [] m_SampleRate: 60 m_WrapMode: 0 @@ -60,6 +62,8 @@ AnimationClip: typeID: 224 customType: 28 isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 pptrCurveMapping: [] m_AnimationClipSettings: serializedVersion: 2 @@ -82,7 +86,8 @@ AnimationClip: m_HeightFromFeet: 0 m_Mirror: 0 m_EditorCurves: - - curve: + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -110,6 +115,7 @@ AnimationClip: path: Frontplate/AnimatedContent classID: 224 script: {fileID: 0} + flags: 16 m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 diff --git a/org.mixedrealitytoolkit.uxcomponents/Button/Animations/ButtonPress.anim b/org.mixedrealitytoolkit.uxcomponents/Button/Animations/ButtonPress.anim index 4e616fab2..d8dc835fb 100644 --- a/org.mixedrealitytoolkit.uxcomponents/Button/Animations/ButtonPress.anim +++ b/org.mixedrealitytoolkit.uxcomponents/Button/Animations/ButtonPress.anim @@ -7,7 +7,7 @@ AnimationClip: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: ButtonPress - serializedVersion: 6 + serializedVersion: 7 m_Legacy: 0 m_Compressed: 0 m_UseHighQualityCurve: 1 @@ -42,7 +42,8 @@ AnimationClip: m_RotationOrder: 4 path: Frontplate m_FloatCurves: - - curve: + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -70,7 +71,9 @@ AnimationClip: path: Backglow classID: 114 script: {fileID: 11500000, guid: 8c32952b3c466d34ba06bd1204afec4c, type: 3} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -98,6 +101,7 @@ AnimationClip: path: Frontplate classID: 224 script: {fileID: 0} + flags: 16 m_PPtrCurves: [] m_SampleRate: 60 m_WrapMode: 0 @@ -113,6 +117,8 @@ AnimationClip: typeID: 4 customType: 0 isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 - serializedVersion: 2 path: 2296449033 attribute: 1007153122 @@ -120,6 +126,8 @@ AnimationClip: typeID: 114 customType: 0 isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 - serializedVersion: 2 path: 1530273532 attribute: 2033536083 @@ -127,6 +135,8 @@ AnimationClip: typeID: 224 customType: 28 isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 pptrCurveMapping: [] m_AnimationClipSettings: serializedVersion: 2 @@ -149,7 +159,8 @@ AnimationClip: m_HeightFromFeet: 0 m_Mirror: 0 m_EditorCurves: - - curve: + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -177,7 +188,9 @@ AnimationClip: path: Backglow classID: 114 script: {fileID: 11500000, guid: 8c32952b3c466d34ba06bd1204afec4c, type: 3} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -205,7 +218,9 @@ AnimationClip: path: Frontplate classID: 224 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -233,7 +248,9 @@ AnimationClip: path: Frontplate classID: 224 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -261,7 +278,9 @@ AnimationClip: path: Frontplate classID: 224 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -289,6 +308,7 @@ AnimationClip: path: Frontplate classID: 224 script: {fileID: 0} + flags: 16 m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 diff --git a/org.mixedrealitytoolkit.uxcomponents/Button/Animations/ToggleSwitchForward.anim b/org.mixedrealitytoolkit.uxcomponents/Button/Animations/ToggleSwitchForward.anim index 5e7dc999a..1b9bd2d6f 100644 --- a/org.mixedrealitytoolkit.uxcomponents/Button/Animations/ToggleSwitchForward.anim +++ b/org.mixedrealitytoolkit.uxcomponents/Button/Animations/ToggleSwitchForward.anim @@ -7,7 +7,7 @@ AnimationClip: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: ToggleSwitchForward - serializedVersion: 6 + serializedVersion: 7 m_Legacy: 0 m_Compressed: 0 m_UseHighQualityCurve: 1 @@ -17,7 +17,8 @@ AnimationClip: m_PositionCurves: [] m_ScaleCurves: [] m_FloatCurves: - - curve: + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -45,7 +46,9 @@ AnimationClip: path: Dot classID: 224 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -73,7 +76,9 @@ AnimationClip: path: Dot classID: 224 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -101,6 +106,7 @@ AnimationClip: path: Dot classID: 224 script: {fileID: 0} + flags: 16 m_PPtrCurves: [] m_SampleRate: 60 m_WrapMode: 0 @@ -116,6 +122,8 @@ AnimationClip: typeID: 224 customType: 28 isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 - serializedVersion: 2 path: 1038040643 attribute: 3640387206 @@ -123,6 +131,8 @@ AnimationClip: typeID: 224 customType: 28 isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 - serializedVersion: 2 path: 1038040643 attribute: 538195251 @@ -130,6 +140,8 @@ AnimationClip: typeID: 224 customType: 28 isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 pptrCurveMapping: [] m_AnimationClipSettings: serializedVersion: 2 @@ -152,7 +164,8 @@ AnimationClip: m_HeightFromFeet: 0 m_Mirror: 0 m_EditorCurves: - - curve: + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -180,7 +193,9 @@ AnimationClip: path: Dot classID: 224 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -208,7 +223,9 @@ AnimationClip: path: Dot classID: 224 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -236,6 +253,7 @@ AnimationClip: path: Dot classID: 224 script: {fileID: 0} + flags: 16 m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 diff --git a/org.mixedrealitytoolkit.uxcomponents/Button/Animations/ToggleSwitchPressed.anim b/org.mixedrealitytoolkit.uxcomponents/Button/Animations/ToggleSwitchPressed.anim index 8445228fa..90ff863b3 100644 --- a/org.mixedrealitytoolkit.uxcomponents/Button/Animations/ToggleSwitchPressed.anim +++ b/org.mixedrealitytoolkit.uxcomponents/Button/Animations/ToggleSwitchPressed.anim @@ -7,7 +7,7 @@ AnimationClip: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: ToggleSwitchPressed - serializedVersion: 6 + serializedVersion: 7 m_Legacy: 0 m_Compressed: 0 m_UseHighQualityCurve: 1 @@ -17,7 +17,8 @@ AnimationClip: m_PositionCurves: [] m_ScaleCurves: [] m_FloatCurves: - - curve: + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -54,7 +55,9 @@ AnimationClip: path: Dot classID: 224 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -91,6 +94,7 @@ AnimationClip: path: Dot classID: 224 script: {fileID: 0} + flags: 16 m_PPtrCurves: [] m_SampleRate: 60 m_WrapMode: 0 @@ -106,6 +110,8 @@ AnimationClip: typeID: 224 customType: 28 isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 - serializedVersion: 2 path: 1038040643 attribute: 38095219 @@ -113,6 +119,8 @@ AnimationClip: typeID: 224 customType: 28 isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 pptrCurveMapping: [] m_AnimationClipSettings: serializedVersion: 2 @@ -135,7 +143,8 @@ AnimationClip: m_HeightFromFeet: 0 m_Mirror: 0 m_EditorCurves: - - curve: + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -172,7 +181,9 @@ AnimationClip: path: Dot classID: 224 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -209,6 +220,7 @@ AnimationClip: path: Dot classID: 224 script: {fileID: 0} + flags: 16 m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 diff --git a/org.mixedrealitytoolkit.uxcomponents/Button/Animations/ToggleSwitchReverse.anim b/org.mixedrealitytoolkit.uxcomponents/Button/Animations/ToggleSwitchReverse.anim index 4f5090ef4..7c68f2039 100644 --- a/org.mixedrealitytoolkit.uxcomponents/Button/Animations/ToggleSwitchReverse.anim +++ b/org.mixedrealitytoolkit.uxcomponents/Button/Animations/ToggleSwitchReverse.anim @@ -7,7 +7,7 @@ AnimationClip: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: ToggleSwitchReverse - serializedVersion: 6 + serializedVersion: 7 m_Legacy: 0 m_Compressed: 0 m_UseHighQualityCurve: 1 @@ -17,7 +17,8 @@ AnimationClip: m_PositionCurves: [] m_ScaleCurves: [] m_FloatCurves: - - curve: + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -45,7 +46,9 @@ AnimationClip: path: Dot classID: 224 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -73,7 +76,9 @@ AnimationClip: path: Dot classID: 224 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -101,6 +106,7 @@ AnimationClip: path: Dot classID: 224 script: {fileID: 0} + flags: 16 m_PPtrCurves: [] m_SampleRate: 60 m_WrapMode: 0 @@ -116,6 +122,8 @@ AnimationClip: typeID: 224 customType: 28 isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 - serializedVersion: 2 path: 1038040643 attribute: 538195251 @@ -123,6 +131,8 @@ AnimationClip: typeID: 224 customType: 28 isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 - serializedVersion: 2 path: 1038040643 attribute: 3640387206 @@ -130,6 +140,8 @@ AnimationClip: typeID: 224 customType: 28 isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 pptrCurveMapping: [] m_AnimationClipSettings: serializedVersion: 2 @@ -152,7 +164,8 @@ AnimationClip: m_HeightFromFeet: 0 m_Mirror: 0 m_EditorCurves: - - curve: + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -180,7 +193,9 @@ AnimationClip: path: Dot classID: 224 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -208,7 +223,9 @@ AnimationClip: path: Dot classID: 224 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -236,6 +253,7 @@ AnimationClip: path: Dot classID: 224 script: {fileID: 0} + flags: 16 m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 diff --git a/org.mixedrealitytoolkit.uxcomponents/Button/Prefabs/Action Button Checkbox.prefab b/org.mixedrealitytoolkit.uxcomponents/Button/Prefabs/Action Button Checkbox.prefab index aeb7c4bf4..1c7668d2e 100644 --- a/org.mixedrealitytoolkit.uxcomponents/Button/Prefabs/Action Button Checkbox.prefab +++ b/org.mixedrealitytoolkit.uxcomponents/Button/Prefabs/Action Button Checkbox.prefab @@ -5,6 +5,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4851079940021564989} m_Modifications: - target: {fileID: 1345098608517470577, guid: f9ae8e304f5c6864980818dec2c95633, type: 3} @@ -19,10 +20,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 3514389556853228399, guid: f9ae8e304f5c6864980818dec2c95633, type: 3} - propertyPath: m_RootOrder - value: 3 - objectReference: {fileID: 0} - target: {fileID: 3514389556853228399, guid: f9ae8e304f5c6864980818dec2c95633, type: 3} propertyPath: m_AnchorMax.x value: 0.5 @@ -100,12 +97,21 @@ PrefabInstance: value: objectReference: {fileID: 6001619397259380672} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f9ae8e304f5c6864980818dec2c95633, type: 3} +--- !u!224 &2412827742066679234 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3514389556853228399, guid: f9ae8e304f5c6864980818dec2c95633, type: 3} + m_PrefabInstance: {fileID: 1277202201462431405} + m_PrefabAsset: {fileID: 0} --- !u!1001 &2843419059293016730 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 201938300658660728, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -152,10 +158,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0.5 @@ -229,6 +231,12 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 7216918420766221479, guid: c6b351a67ceb69140b199996bbbea156, type: 3} + insertIndex: -1 + addedObject: {fileID: 2412827742066679234} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &4851079940021564989 stripped RectTransform: diff --git a/org.mixedrealitytoolkit.uxcomponents/Button/Prefabs/Action Button.prefab b/org.mixedrealitytoolkit.uxcomponents/Button/Prefabs/Action Button.prefab index a94284ef7..71579c827 100644 --- a/org.mixedrealitytoolkit.uxcomponents/Button/Prefabs/Action Button.prefab +++ b/org.mixedrealitytoolkit.uxcomponents/Button/Prefabs/Action Button.prefab @@ -32,7 +32,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7216918420766221479} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -105,20 +104,23 @@ MonoBehaviour: m_VerticalAlignment: 4096 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -149,9 +151,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: fontIcons: {fileID: 11400000, guid: 98fec9bd136c93c44ba1f6f1bd5f38b5, type: 2} - currentIconName: Icon 117 + currentIconName: Person textMeshProComponent: {fileID: 5095746839500215027} - iconFontAsset: {fileID: 0} + migratedSuccessfully: 1 --- !u!1 &410843422125320171 GameObject: m_ObjectHideFlags: 0 @@ -185,7 +187,6 @@ RectTransform: - {fileID: 6412008622008300943} - {fileID: 1520311476867378557} m_Father: {fileID: 6922469056340231698} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -245,7 +246,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4185972052008607586} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -369,7 +369,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6922469056340231698} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -442,20 +441,23 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 00000000 m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -525,7 +527,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7216918420766221479} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -614,7 +615,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7216918420766221479} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -687,20 +687,23 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 00000000 m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -743,6 +746,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 3705378105823492738, guid: b85e005d231192249b7077b40a4d4e45, type: 3} @@ -829,10 +833,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: b85e005d231192249b7077b40a4d4e45, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - target: {fileID: 3705378105823492765, guid: b85e005d231192249b7077b40a4d4e45, type: 3} propertyPath: m_AnchorMax.x value: 0.5 @@ -905,16 +905,12 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 7746750332524202746, guid: b85e005d231192249b7077b40a4d4e45, type: 3} - propertyPath: m_Enabled - value: 0 - objectReference: {fileID: 0} - target: {fileID: 8714766618717182506, guid: b85e005d231192249b7077b40a4d4e45, type: 3} - propertyPath: managedReferences[1393819269385945089] + propertyPath: 'managedReferences[1393819269385945089]' value: MixedReality.Toolkit.UXCore MixedReality.Toolkit.UX.GraphicTintEffect objectReference: {fileID: 0} - target: {fileID: 8714766618717182506, guid: b85e005d231192249b7077b40a4d4e45, type: 3} - propertyPath: managedReferences[1393819269385945090] + propertyPath: 'managedReferences[1393819269385945090]' value: MixedReality.Toolkit.UXCore MixedReality.Toolkit.UX.GraphicTintEffect objectReference: {fileID: 0} - target: {fileID: 8714766618717182506, guid: b85e005d231192249b7077b40a4d4e45, type: 3} @@ -990,27 +986,27 @@ PrefabInstance: value: 1 objectReference: {fileID: 0} - target: {fileID: 8714766618717182506, guid: b85e005d231192249b7077b40a4d4e45, type: 3} - propertyPath: managedReferences[1393819269385945089].tintables.Array.data[0] + propertyPath: 'managedReferences[1393819269385945089].tintables.Array.data[0]' value: objectReference: {fileID: 2228947736508096533} - target: {fileID: 8714766618717182506, guid: b85e005d231192249b7077b40a4d4e45, type: 3} - propertyPath: managedReferences[1393819269385945089].tintables.Array.data[1] + propertyPath: 'managedReferences[1393819269385945089].tintables.Array.data[1]' value: objectReference: {fileID: 8493469810320727241} - target: {fileID: 8714766618717182506, guid: b85e005d231192249b7077b40a4d4e45, type: 3} - propertyPath: managedReferences[1393819269385945089].tintables.Array.data[2] + propertyPath: 'managedReferences[1393819269385945089].tintables.Array.data[2]' value: objectReference: {fileID: 8467006667157818416} - target: {fileID: 8714766618717182506, guid: b85e005d231192249b7077b40a4d4e45, type: 3} - propertyPath: managedReferences[1393819269385945089].tintables.Array.data[3] + propertyPath: 'managedReferences[1393819269385945089].tintables.Array.data[3]' value: objectReference: {fileID: 1922220768106560367} - target: {fileID: 8714766618717182506, guid: b85e005d231192249b7077b40a4d4e45, type: 3} - propertyPath: managedReferences[1393819269385945089].tintables.Array.data[4] + propertyPath: 'managedReferences[1393819269385945089].tintables.Array.data[4]' value: objectReference: {fileID: 5095746839500215027} - target: {fileID: 8714766618717182506, guid: b85e005d231192249b7077b40a4d4e45, type: 3} - propertyPath: managedReferences[1393819269385945090].tintables.Array.data[0] + propertyPath: 'managedReferences[1393819269385945090].tintables.Array.data[0]' value: objectReference: {fileID: 8467006667157818416} - target: {fileID: 8714766618717182506, guid: b85e005d231192249b7077b40a4d4e45, type: 3} @@ -1022,11 +1018,11 @@ PrefabInstance: value: 2 objectReference: {fileID: 0} - target: {fileID: 8714766618717182506, guid: b85e005d231192249b7077b40a4d4e45, type: 3} - propertyPath: stateContainers.entries.Array.data[0].value.effects.Array.data[1] + propertyPath: 'stateContainers.entries.Array.data[0].value.effects.Array.data[1]' value: 1393819269385945089 objectReference: {fileID: 0} - target: {fileID: 8714766618717182506, guid: b85e005d231192249b7077b40a4d4e45, type: 3} - propertyPath: stateContainers.entries.Array.data[4].value.effects.Array.data[1] + propertyPath: 'stateContainers.entries.Array.data[4].value.effects.Array.data[1]' value: 1393819269385945090 objectReference: {fileID: 0} - target: {fileID: 8714766618717182506, guid: b85e005d231192249b7077b40a4d4e45, type: 3} @@ -1102,30 +1098,48 @@ PrefabInstance: value: 1 objectReference: {fileID: 0} - target: {fileID: 8714766618717182506, guid: b85e005d231192249b7077b40a4d4e45, type: 3} - propertyPath: stateContainers.entries.Array.data[0].value.effects.Array.data[1].tintables.Array.data[0] + propertyPath: 'stateContainers.entries.Array.data[0].value.effects.Array.data[1].tintables.Array.data[0]' value: objectReference: {fileID: 2228947736508096533} - target: {fileID: 8714766618717182506, guid: b85e005d231192249b7077b40a4d4e45, type: 3} - propertyPath: stateContainers.entries.Array.data[0].value.effects.Array.data[1].tintables.Array.data[1] + propertyPath: 'stateContainers.entries.Array.data[0].value.effects.Array.data[1].tintables.Array.data[1]' value: objectReference: {fileID: 8493469810320727241} - target: {fileID: 8714766618717182506, guid: b85e005d231192249b7077b40a4d4e45, type: 3} - propertyPath: stateContainers.entries.Array.data[0].value.effects.Array.data[1].tintables.Array.data[2] + propertyPath: 'stateContainers.entries.Array.data[0].value.effects.Array.data[1].tintables.Array.data[2]' value: objectReference: {fileID: 8467006667157818416} - target: {fileID: 8714766618717182506, guid: b85e005d231192249b7077b40a4d4e45, type: 3} - propertyPath: stateContainers.entries.Array.data[0].value.effects.Array.data[1].tintables.Array.data[3] + propertyPath: 'stateContainers.entries.Array.data[0].value.effects.Array.data[1].tintables.Array.data[3]' value: objectReference: {fileID: 1922220768106560367} - target: {fileID: 8714766618717182506, guid: b85e005d231192249b7077b40a4d4e45, type: 3} - propertyPath: stateContainers.entries.Array.data[0].value.effects.Array.data[1].tintables.Array.data[4] + propertyPath: 'stateContainers.entries.Array.data[0].value.effects.Array.data[1].tintables.Array.data[4]' value: objectReference: {fileID: 5095746839500215027} - target: {fileID: 8714766618717182506, guid: b85e005d231192249b7077b40a4d4e45, type: 3} - propertyPath: stateContainers.entries.Array.data[4].value.effects.Array.data[1].tintables.Array.data[0] + propertyPath: 'stateContainers.entries.Array.data[4].value.effects.Array.data[1].tintables.Array.data[0]' value: objectReference: {fileID: 8467006667157818416} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 9026472854072389794, guid: b85e005d231192249b7077b40a4d4e45, type: 3} + insertIndex: -1 + addedObject: {fileID: 4897024374970528438} + - targetCorrespondingSourceObject: {fileID: 2828958436599032274, guid: b85e005d231192249b7077b40a4d4e45, type: 3} + insertIndex: -1 + addedObject: {fileID: 7216918420766221479} + - targetCorrespondingSourceObject: {fileID: 2828958436599032274, guid: b85e005d231192249b7077b40a4d4e45, type: 3} + insertIndex: -1 + addedObject: {fileID: 5319578128471115350} + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 3705378105823492738, guid: b85e005d231192249b7077b40a4d4e45, type: 3} + insertIndex: -1 + addedObject: {fileID: 7344942429739044722} + - targetCorrespondingSourceObject: {fileID: 2828958436599032273, guid: b85e005d231192249b7077b40a4d4e45, type: 3} + insertIndex: -1 + addedObject: {fileID: 3015392985318836008} m_SourcePrefab: {fileID: 100100000, guid: b85e005d231192249b7077b40a4d4e45, type: 3} --- !u!114 &3229655124915905850 stripped MonoBehaviour: @@ -1138,11 +1152,33 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &4185972052008607584 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 9026472854072389792, guid: b85e005d231192249b7077b40a4d4e45, type: 3} + m_PrefabInstance: {fileID: 5139722473249402816} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!224 &4185972052008607586 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 9026472854072389794, guid: b85e005d231192249b7077b40a4d4e45, type: 3} m_PrefabInstance: {fileID: 5139722473249402816} m_PrefabAsset: {fileID: 0} +--- !u!114 &4585478379361187306 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 8714766618717182506, guid: b85e005d231192249b7077b40a4d4e45, type: 3} + m_PrefabInstance: {fileID: 5139722473249402816} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8376646494505211202} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 02df0dfd31465cf42bd60027ac90b874, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &6922469056340231697 stripped GameObject: m_CorrespondingSourceObject: {fileID: 2828958436599032273, guid: b85e005d231192249b7077b40a4d4e45, type: 3} @@ -1179,6 +1215,88 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 2828958436599032274, guid: b85e005d231192249b7077b40a4d4e45, type: 3} m_PrefabInstance: {fileID: 5139722473249402816} m_PrefabAsset: {fileID: 0} +--- !u!1 &8376646494505211202 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3705378105823492738, guid: b85e005d231192249b7077b40a4d4e45, type: 3} + m_PrefabInstance: {fileID: 5139722473249402816} + m_PrefabAsset: {fileID: 0} +--- !u!114 &7344942429739044722 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8376646494505211202} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 699100ca886480c4a94ced56b1ae0e94, type: 3} + m_Name: + m_EditorClassIdentifier: + themeDataSource: {fileID: 11400000, guid: 57993c46ea42acf4ca3067542443bc45, type: 2} + binders: + - rid: 6006879866990887121 + - rid: 6006879866990887122 + - rid: 6006879866990887123 + - rid: 6006879866990887124 + - rid: 6006879866990887125 + - rid: 6006879866990887126 + - rid: 6006879866990887127 + - rid: 6006879866990887129 + - rid: 6006879866990887128 + references: + version: 2 + RefIds: + - rid: 6006879866990887121 + type: {class: FontIconSetBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: + k__BackingField: {fileID: 7245587814888172855} + k__BackingField: {fileID: 5095746839500215027} + k__BackingField: Icon Set + - rid: 6006879866990887122 + type: {class: TMP_TextFontAssetBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 1922220768106560367} + k__BackingField: Text Font + - rid: 6006879866990887123 + type: {class: GraphicColorBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 1922220768106560367} + k__BackingField: On Surface Color + - rid: 6006879866990887124 + type: {class: GraphicColorBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 8493469810320727241} + k__BackingField: On Surface Color + - rid: 6006879866990887125 + type: {class: GraphicColorBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 5095746839500215027} + k__BackingField: On Surface Color + - rid: 6006879866990887126 + type: {class: GraphicColorBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 2228947736508096533} + k__BackingField: On Surface Color + - rid: 6006879866990887127 + type: {class: GraphicMaterialBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 8467006667157818416} + k__BackingField: Tab Indicator Material + - rid: 6006879866990887128 + type: {class: StateVisualizerEffectColorBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 4585478379361187306} + k__BackingField: Primary Color + stateName: Toggle + tintTarget: {fileID: 8467006667157818416} + - rid: 6006879866990887129 + type: {class: StateVisualizerEffectColorBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 4585478379361187306} + k__BackingField: Primary Color + stateName: Toggle + tintTarget: {fileID: 4185972052008607584} --- !u!224 &8376646494505211229 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 3705378105823492765, guid: b85e005d231192249b7077b40a4d4e45, type: 3} diff --git a/org.mixedrealitytoolkit.uxcomponents/Button/Prefabs/CanvasButtonToggleSwitch.prefab b/org.mixedrealitytoolkit.uxcomponents/Button/Prefabs/CanvasButtonToggleSwitch.prefab index 167841a7d..7325c40b2 100644 --- a/org.mixedrealitytoolkit.uxcomponents/Button/Prefabs/CanvasButtonToggleSwitch.prefab +++ b/org.mixedrealitytoolkit.uxcomponents/Button/Prefabs/CanvasButtonToggleSwitch.prefab @@ -5,12 +5,9 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 2828958437302116044, guid: b85e005d231192249b7077b40a4d4e45, type: 3} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - target: {fileID: 3705378105823492738, guid: b85e005d231192249b7077b40a4d4e45, type: 3} propertyPath: m_Name value: CanvasButtonToggleSwitch @@ -99,10 +96,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: b85e005d231192249b7077b40a4d4e45, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - target: {fileID: 3705378105823492765, guid: b85e005d231192249b7077b40a4d4e45, type: 3} propertyPath: m_AnchorMax.x value: 0.5 @@ -175,24 +168,16 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 6293367208459292257, guid: b85e005d231192249b7077b40a4d4e45, type: 3} - propertyPath: m_SizeDelta.x - value: -42 - objectReference: {fileID: 0} - - target: {fileID: 6293367208459292257, guid: b85e005d231192249b7077b40a4d4e45, type: 3} - propertyPath: m_AnchoredPosition.x - value: 10 - objectReference: {fileID: 0} - target: {fileID: 7746750332524202746, guid: b85e005d231192249b7077b40a4d4e45, type: 3} propertyPath: m_Enabled value: 0 objectReference: {fileID: 0} - target: {fileID: 8714766618717182506, guid: b85e005d231192249b7077b40a4d4e45, type: 3} - propertyPath: managedReferences[1393819269385945109] + propertyPath: 'managedReferences[1393819269385945109]' value: MixedReality.Toolkit.UXCore MixedReality.Toolkit.UX.AnimationEffect objectReference: {fileID: 0} - target: {fileID: 8714766618717182506, guid: b85e005d231192249b7077b40a4d4e45, type: 3} - propertyPath: managedReferences[1393819269385945110] + propertyPath: 'managedReferences[1393819269385945110]' value: MixedReality.Toolkit.UXCore MixedReality.Toolkit.UX.TwoWayAnimationEffect objectReference: {fileID: 0} - target: {fileID: 8714766618717182506, guid: b85e005d231192249b7077b40a4d4e45, type: 3} @@ -252,17 +237,13 @@ PrefabInstance: value: 1 objectReference: {fileID: 0} - target: {fileID: 8714766618717182506, guid: b85e005d231192249b7077b40a4d4e45, type: 3} - propertyPath: stateContainers.entries.Array.data[3].value.effects.Array.data[1] + propertyPath: 'stateContainers.entries.Array.data[3].value.effects.Array.data[1]' value: 1393819269385945109 objectReference: {fileID: 0} - target: {fileID: 8714766618717182506, guid: b85e005d231192249b7077b40a4d4e45, type: 3} - propertyPath: stateContainers.entries.Array.data[4].value.effects.Array.data[0] + propertyPath: 'stateContainers.entries.Array.data[4].value.effects.Array.data[0]' value: 1393819269385945110 objectReference: {fileID: 0} - - target: {fileID: 8714766618717182506, guid: b85e005d231192249b7077b40a4d4e45, type: 3} - propertyPath: stateContainers.entries.Array.data[4].value.effects.Array.data[1] - value: MixedReality.Toolkit.UXCore MixedReality.Toolkit.UX.TwoWayAnimationEffect - objectReference: {fileID: 0} - target: {fileID: 8714766618717182506, guid: b85e005d231192249b7077b40a4d4e45, type: 3} propertyPath: stateContainers.entries.Array.data[3].value.effects.Array.data[1].clip value: @@ -275,10 +256,6 @@ PrefabInstance: propertyPath: stateContainers.entries.Array.data[4].value.effects.Array.data[0].name value: Two Way Animation objectReference: {fileID: 0} - - target: {fileID: 8714766618717182506, guid: b85e005d231192249b7077b40a4d4e45, type: 3} - propertyPath: stateContainers.entries.Array.data[4].value.effects.Array.data[1].name - value: Two Way Animation - objectReference: {fileID: 0} - target: {fileID: 8714766618717182506, guid: b85e005d231192249b7077b40a4d4e45, type: 3} propertyPath: stateContainers.entries.Array.data[3].value.effects.Array.data[1].speed value: 1 @@ -287,10 +264,6 @@ PrefabInstance: propertyPath: stateContainers.entries.Array.data[4].value.effects.Array.data[0].speed value: 2 objectReference: {fileID: 0} - - target: {fileID: 8714766618717182506, guid: b85e005d231192249b7077b40a4d4e45, type: 3} - propertyPath: stateContainers.entries.Array.data[4].value.effects.Array.data[1].speed - value: 1 - objectReference: {fileID: 0} - target: {fileID: 8714766618717182506, guid: b85e005d231192249b7077b40a4d4e45, type: 3} propertyPath: stateContainers.entries.Array.data[4].value.effects.Array.data[0].forwardClip value: @@ -299,23 +272,17 @@ PrefabInstance: propertyPath: stateContainers.entries.Array.data[4].value.effects.Array.data[0].reverseClip value: objectReference: {fileID: 7400000, guid: 8153e68380e78334e9695c9373c9c95e, type: 2} - - target: {fileID: 8714766618717182506, guid: b85e005d231192249b7077b40a4d4e45, type: 3} - propertyPath: stateContainers.entries.Array.data[4].value.effects.Array.data[1].forwardClip - value: - objectReference: {fileID: 7400000, guid: 8153e68380e78334e9695c9373c9c95e, type: 2} - - target: {fileID: 8714766618717182506, guid: b85e005d231192249b7077b40a4d4e45, type: 3} - propertyPath: stateContainers.entries.Array.data[4].value.effects.Array.data[1].reverseClip - value: - objectReference: {fileID: 7400000, guid: 376a441245b6d0e40b11001e28c88df9, type: 2} - target: {fileID: 8714766618717182506, guid: b85e005d231192249b7077b40a4d4e45, type: 3} propertyPath: stateContainers.entries.Array.data[3].value.effects.Array.data[1].playbackMode value: 0 objectReference: {fileID: 0} - - target: {fileID: 8980970493985434242, guid: b85e005d231192249b7077b40a4d4e45, type: 3} - propertyPath: m_RootOrder - value: 4 - objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 3705378105823492765, guid: b85e005d231192249b7077b40a4d4e45, type: 3} + insertIndex: -1 + addedObject: {fileID: 7149590210257778641} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b85e005d231192249b7077b40a4d4e45, type: 3} --- !u!224 &381969322861459379 stripped RectTransform: @@ -349,6 +316,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 381969322861459379} m_Modifications: - target: {fileID: 1345098608517470577, guid: 16750275763719646afa2c7c7592395d, type: 3} @@ -363,10 +331,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 3514389556853228399, guid: 16750275763719646afa2c7c7592395d, type: 3} - propertyPath: m_RootOrder - value: 3 - objectReference: {fileID: 0} - target: {fileID: 3514389556853228399, guid: 16750275763719646afa2c7c7592395d, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -444,4 +408,12 @@ PrefabInstance: value: objectReference: {fileID: 381969322861459380} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 16750275763719646afa2c7c7592395d, type: 3} +--- !u!224 &7149590210257778641 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3514389556853228399, guid: 16750275763719646afa2c7c7592395d, type: 3} + m_PrefabInstance: {fileID: 6052253801192240318} + m_PrefabAsset: {fileID: 0} diff --git a/org.mixedrealitytoolkit.uxcomponents/Button/Prefabs/Empty Button.prefab b/org.mixedrealitytoolkit.uxcomponents/Button/Prefabs/Empty Button.prefab index 5a51b3b7e..13acc34a9 100644 --- a/org.mixedrealitytoolkit.uxcomponents/Button/Prefabs/Empty Button.prefab +++ b/org.mixedrealitytoolkit.uxcomponents/Button/Prefabs/Empty Button.prefab @@ -29,7 +29,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2828958437302116044} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -71,7 +70,6 @@ RectTransform: m_Children: - {fileID: 2828958436599032274} m_Father: {fileID: 3705378105823492765} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -236,7 +234,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3705378105823492765} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -348,6 +345,7 @@ GameObject: - component: {fileID: 7976009683108370513} - component: {fileID: 2632565233158286779} - component: {fileID: 1995394188294645620} + - component: {fileID: 3722787625447876489} m_Layer: 5 m_Name: Empty Button m_TagString: Untagged @@ -372,7 +370,6 @@ RectTransform: - {fileID: 2828958437302116044} - {fileID: 8980970493985434242} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -393,13 +390,11 @@ MonoBehaviour: m_EditorClassIdentifier: m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 1 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -456,42 +451,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnHoverEntered: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_OnHoverExited: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectEntered: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectExited: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -584,6 +564,9 @@ MonoBehaviour: k__BackingField: 1 allowSelectByVoice: 1 speechRecognitionKeyword: select + k__BackingField: + m_PersistentCalls: + m_Calls: [] k__BackingField: 1 k__BackingField: 0 k__BackingField: @@ -696,9 +679,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3705378105823492738} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 32, y: 32, z: 26.38652} m_Center: {x: 0, y: 0, z: 4.6067348} --- !u!114 &3705378105823492761 @@ -734,7 +725,7 @@ MonoBehaviour: colliderFitter: {fileID: 3705378105823492761} --- !u!95 &3705378105823492766 Animator: - serializedVersion: 5 + serializedVersion: 7 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -748,6 +739,7 @@ Animator: m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 m_StabilizeFeet: 0 + m_AnimatePhysics: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 @@ -764,6 +756,7 @@ AudioSource: serializedVersion: 4 OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 0} + m_Resource: {fileID: 0} m_PlayOnAwake: 1 m_Volume: 1 m_Pitch: 1 @@ -1008,7 +1001,43 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: seeItSayItLabel: {fileID: 3358038249354970442} + pattern: Say '{0}' positionControl: {fileID: 0} +--- !u!114 &3722787625447876489 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3705378105823492738} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 699100ca886480c4a94ced56b1ae0e94, type: 3} + m_Name: + m_EditorClassIdentifier: + themeDataSource: {fileID: 11400000, guid: 57993c46ea42acf4ca3067542443bc45, type: 2} + binders: + - rid: 1538473242837123161 + - rid: 1538473242837123160 + - rid: 8397413649693540611 + references: + version: 2 + RefIds: + - rid: 1538473242837123160 + type: {class: GraphicColorBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 9026472854072389792} + k__BackingField: Surface Color + - rid: 1538473242837123161 + type: {class: GraphicMaterialBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 9026472854072389792} + k__BackingField: Canvas Backplate Quad Material + - rid: 8397413649693540611 + type: {class: BehaviourEnabledBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 7976009683108370513} + k__BackingField: Enable Button Select Pulse --- !u!1 &9026472854072389795 GameObject: m_ObjectHideFlags: 0 @@ -1041,7 +1070,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3705378105823492765} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -1100,6 +1128,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 3705378105823492765} m_Modifications: - target: {fileID: 1400135068623992445, guid: d9e84b5a8037fd946aa503a059fee93f, type: 3} @@ -1146,10 +1175,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8174497233233282343, guid: d9e84b5a8037fd946aa503a059fee93f, type: 3} - propertyPath: m_RootOrder - value: 3 - objectReference: {fileID: 0} - target: {fileID: 8174497233233282343, guid: d9e84b5a8037fd946aa503a059fee93f, type: 3} propertyPath: m_AnchorMax.x value: 0.5 @@ -1239,6 +1264,9 @@ PrefabInstance: value: -5 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: d9e84b5a8037fd946aa503a059fee93f, type: 3} --- !u!1 &3358038249354970442 stripped GameObject: diff --git a/org.mixedrealitytoolkit.uxcomponents/Button/Prefabs/Experimental/SimpleActionButton.prefab b/org.mixedrealitytoolkit.uxcomponents/Button/Prefabs/Experimental/SimpleActionButton.prefab index b2eef82d5..69b4bb0ea 100644 --- a/org.mixedrealitytoolkit.uxcomponents/Button/Prefabs/Experimental/SimpleActionButton.prefab +++ b/org.mixedrealitytoolkit.uxcomponents/Button/Prefabs/Experimental/SimpleActionButton.prefab @@ -5,6 +5,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 566563330114838537, guid: 7ed78718e86d3cc469e6abbecb4a8508, type: 3} @@ -31,10 +32,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 4636237264255655829, guid: 7ed78718e86d3cc469e6abbecb4a8508, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - target: {fileID: 4636237264255655829, guid: 7ed78718e86d3cc469e6abbecb4a8508, type: 3} propertyPath: m_AnchorMax.x value: 0.5 @@ -108,6 +105,15 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 2685256455627464243, guid: 7ed78718e86d3cc469e6abbecb4a8508, type: 3} + insertIndex: -1 + addedObject: {fileID: 1811022617095368524} + - targetCorrespondingSourceObject: {fileID: 2685256455627464243, guid: 7ed78718e86d3cc469e6abbecb4a8508, type: 3} + insertIndex: -1 + addedObject: {fileID: 1185686644332750506} m_SourcePrefab: {fileID: 100100000, guid: 7ed78718e86d3cc469e6abbecb4a8508, type: 3} --- !u!1 &8909511300571199238 stripped GameObject: @@ -180,20 +186,23 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 diff --git a/org.mixedrealitytoolkit.uxcomponents/Button/Prefabs/Experimental/SimpleEmptyButton.prefab b/org.mixedrealitytoolkit.uxcomponents/Button/Prefabs/Experimental/SimpleEmptyButton.prefab index ca56e86dc..753cbdd38 100644 --- a/org.mixedrealitytoolkit.uxcomponents/Button/Prefabs/Experimental/SimpleEmptyButton.prefab +++ b/org.mixedrealitytoolkit.uxcomponents/Button/Prefabs/Experimental/SimpleEmptyButton.prefab @@ -29,7 +29,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4636237264255655829} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -82,7 +81,6 @@ RectTransform: - {fileID: 1479722257174828772} - {fileID: 8330882562871208312} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -103,13 +101,11 @@ MonoBehaviour: m_EditorClassIdentifier: m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 1 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -166,42 +162,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnHoverEntered: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_OnHoverExited: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectEntered: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectExited: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -294,6 +275,9 @@ MonoBehaviour: k__BackingField: 1 allowSelectByVoice: 1 speechRecognitionKeyword: select + k__BackingField: + m_PersistentCalls: + m_Calls: [] k__BackingField: 1 k__BackingField: 0 k__BackingField: @@ -382,9 +366,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3281884835854150738} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 32, y: 32, z: 26.38652} m_Center: {x: 0, y: 0, z: 4.606735} --- !u!114 &447327801528964319 @@ -406,7 +398,7 @@ MonoBehaviour: canToggleCollider: 1 --- !u!95 &1144530035273243757 Animator: - serializedVersion: 5 + serializedVersion: 7 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -420,6 +412,7 @@ Animator: m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 m_StabilizeFeet: 0 + m_AnimatePhysics: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 @@ -436,6 +429,7 @@ AudioSource: serializedVersion: 4 OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 0} + m_Resource: {fileID: 0} m_PlayOnAwake: 1 m_Volume: 1 m_Pitch: 1 @@ -667,6 +661,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: seeItSayItLabel: {fileID: 2424565416812693168} + pattern: Say '{0}' positionControl: {fileID: 0} --- !u!1 &4329706101934279475 GameObject: @@ -697,7 +692,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4636237264255655829} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -736,7 +730,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4636237264255655829} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -824,7 +817,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4636237264255655829} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -960,7 +952,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4636237264255655829} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -1048,7 +1039,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4636237264255655829} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -1185,6 +1175,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4636237264255655829} m_Modifications: - target: {fileID: 2542652557800958703, guid: d9e84b5a8037fd946aa503a059fee93f, type: 3} @@ -1215,10 +1206,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8174497233233282343, guid: d9e84b5a8037fd946aa503a059fee93f, type: 3} - propertyPath: m_RootOrder - value: 6 - objectReference: {fileID: 0} - target: {fileID: 8174497233233282343, guid: d9e84b5a8037fd946aa503a059fee93f, type: 3} propertyPath: m_AnchorMax.x value: 0.5 @@ -1308,6 +1295,9 @@ PrefabInstance: value: -5 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: d9e84b5a8037fd946aa503a059fee93f, type: 3} --- !u!1 &2424565416812693168 stripped GameObject: diff --git a/org.mixedrealitytoolkit.uxcomponents/Button/Prefabs/PressableButton_Custom_Cube.prefab b/org.mixedrealitytoolkit.uxcomponents/Button/Prefabs/PressableButton_Custom_Cube.prefab index 7cdb01323..8d8a9a2dd 100644 --- a/org.mixedrealitytoolkit.uxcomponents/Button/Prefabs/PressableButton_Custom_Cube.prefab +++ b/org.mixedrealitytoolkit.uxcomponents/Button/Prefabs/PressableButton_Custom_Cube.prefab @@ -27,6 +27,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1963561307345040800} + serializedVersion: 2 m_LocalRotation: {x: 0.48831657, y: 0, z: 0, w: 0.8726666} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -35,7 +36,6 @@ Transform: - {fileID: 1963561309176567214} - {fileID: 1963561308925566221} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 58.46, y: 0, z: 0} --- !u!65 &8609638598831408988 BoxCollider: @@ -45,9 +45,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1963561307345040800} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 0.04, y: 0.04, z: 0.024406368} m_Center: {x: 0, y: -0.000000007435849, z: -0.005536412} --- !u!114 &1963561307345040802 @@ -64,13 +72,11 @@ MonoBehaviour: m_EditorClassIdentifier: m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 1 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -103,42 +109,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_Deactivated: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnLastHoverExited: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectEntered: - m_PersistentCalls: - m_Calls: [] - m_OnSelectExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -231,6 +222,9 @@ MonoBehaviour: k__BackingField: 1 allowSelectByVoice: 1 speechRecognitionKeyword: select + k__BackingField: + m_PersistentCalls: + m_Calls: [] k__BackingField: 1 k__BackingField: 0 k__BackingField: @@ -260,6 +254,14 @@ MonoBehaviour: rollOffXYDepth: 3 rejectZRollOff: 0 extendSpeed: 0.5 + k__BackingField: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] --- !u!114 &534056556898233740 MonoBehaviour: m_ObjectHideFlags: 0 @@ -341,13 +343,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1963561308925566214} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0.000000014901161, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.049434587, y: 0.049434587, z: 0.011897914} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1963561307345040812} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 31.327, y: -398.699, z: -28.878} --- !u!33 &1963561308925566210 MeshFilter: @@ -374,6 +376,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -422,6 +427,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1963561309176567215} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0.000000014901161, w: 1} m_LocalPosition: {x: 0, y: 0, z: -0.017477516} m_LocalScale: {x: 0.049434587, y: 0.049434587, z: 0.011897914} @@ -429,7 +435,6 @@ Transform: m_Children: - {fileID: 1963561309274324387} m_Father: {fileID: 1963561307345040812} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1963561309274324384 GameObject: @@ -456,13 +461,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1963561309274324384} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: -0, z: 0.55} m_LocalScale: {x: 0.80000013, y: 0.8000001, z: 1.1072} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1963561309176567214} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: -33.053, y: -47.723, z: 12.029} --- !u!33 &1963561309274324396 MeshFilter: @@ -489,6 +494,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: diff --git a/org.mixedrealitytoolkit.uxcomponents/Button/Prefabs/PressableButton_Custom_Cylinder.prefab b/org.mixedrealitytoolkit.uxcomponents/Button/Prefabs/PressableButton_Custom_Cylinder.prefab index 3b30f4604..7bd5d61b5 100644 --- a/org.mixedrealitytoolkit.uxcomponents/Button/Prefabs/PressableButton_Custom_Cylinder.prefab +++ b/org.mixedrealitytoolkit.uxcomponents/Button/Prefabs/PressableButton_Custom_Cylinder.prefab @@ -25,13 +25,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4416665202393003929} + serializedVersion: 2 m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} m_LocalPosition: {x: -0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5415826251688893504} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} --- !u!33 &484577862851493595 MeshFilter: @@ -58,6 +58,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -110,6 +113,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4639606898651727610} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.043278, y: 0.043277998, z: 0.043277998} @@ -118,7 +122,6 @@ Transform: - {fileID: 3445153172489160041} - {fileID: 4648374810286258266} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &1444642281957391992 BoxCollider: @@ -128,9 +131,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4639606898651727610} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 1, y: 1, z: 0.8885529} m_Center: {x: 0, y: -0.000000007855584, z: 0.055723984} --- !u!114 &2712310172936119071 @@ -147,13 +158,11 @@ MonoBehaviour: m_EditorClassIdentifier: m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 1 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -186,42 +195,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnHoverEntered: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_OnHoverExited: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectEntered: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectExited: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -314,6 +308,9 @@ MonoBehaviour: k__BackingField: 1 allowSelectByVoice: 1 speechRecognitionKeyword: select + k__BackingField: + m_PersistentCalls: + m_Calls: [] k__BackingField: 1 k__BackingField: 0 k__BackingField: @@ -343,6 +340,14 @@ MonoBehaviour: rollOffXYDepth: 3 rejectZRollOff: 0 extendSpeed: 0.5 + k__BackingField: + active: 0 + onEntered: + m_PersistentCalls: + m_Calls: [] + onExited: + m_PersistentCalls: + m_Calls: [] --- !u!114 &3298454244601473750 MonoBehaviour: m_ObjectHideFlags: 0 @@ -422,6 +427,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4753533514136551607} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -0.37946695} m_LocalScale: {x: 1, y: 1, z: 1} @@ -429,7 +435,6 @@ Transform: m_Children: - {fileID: 1195967107483607450} m_Father: {fileID: 5415826251688893504} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &9086983856083482027 GameObject: @@ -456,13 +461,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 9086983856083482027} + serializedVersion: 2 m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} m_LocalPosition: {x: 0, y: 0, z: 0.137} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3445153172489160041} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} --- !u!33 &493766096292266990 MeshFilter: @@ -489,6 +494,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: diff --git a/org.mixedrealitytoolkit.uxcomponents/Button/Prefabs/UIMenuBackplate_R13.prefab b/org.mixedrealitytoolkit.uxcomponents/Button/Prefabs/UIMenuBackplate_R13.prefab index eca2d9e71..6b5d7d688 100644 --- a/org.mixedrealitytoolkit.uxcomponents/Button/Prefabs/UIMenuBackplate_R13.prefab +++ b/org.mixedrealitytoolkit.uxcomponents/Button/Prefabs/UIMenuBackplate_R13.prefab @@ -11,6 +11,7 @@ GameObject: - component: {fileID: 1619375032725711555} - component: {fileID: 961341594221179252} - component: {fileID: 8652067621810633434} + - component: {fileID: 785579326716734801} m_Layer: 5 m_Name: UIMenuBackplate_R13 m_TagString: Untagged @@ -31,7 +32,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -66,7 +66,37 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] + m_Texture: {fileID: 0} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 radius: 13 thickness: 2 wedges: 8 calculateSmoothEdges: 1 +--- !u!114 &785579326716734801 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8510261678218358358} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 699100ca886480c4a94ced56b1ae0e94, type: 3} + m_Name: + m_EditorClassIdentifier: + themeDataSource: {fileID: 11400000, guid: 57993c46ea42acf4ca3067542443bc45, type: 2} + binders: + - rid: 7617100121658621954 + references: + version: 2 + RefIds: + - rid: 7617100121658621954 + type: {class: GraphicMaterialBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 8652067621810633434} + k__BackingField: Backplate Material diff --git a/org.mixedrealitytoolkit.uxcomponents/Button/Prefabs/UIPanelBackplate_R16.prefab b/org.mixedrealitytoolkit.uxcomponents/Button/Prefabs/UIPanelBackplate_R16.prefab index 340450faa..36c737c0e 100644 --- a/org.mixedrealitytoolkit.uxcomponents/Button/Prefabs/UIPanelBackplate_R16.prefab +++ b/org.mixedrealitytoolkit.uxcomponents/Button/Prefabs/UIPanelBackplate_R16.prefab @@ -11,6 +11,7 @@ GameObject: - component: {fileID: 1619375032725711555} - component: {fileID: 961341594221179252} - component: {fileID: 8652067621810633434} + - component: {fileID: 3367734699037627833} m_Layer: 5 m_Name: UIPanelBackplate_R16 m_TagString: Untagged @@ -31,7 +32,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -66,7 +66,37 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] + m_Texture: {fileID: 0} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 radius: 16 thickness: 2 wedges: 8 calculateSmoothEdges: 1 +--- !u!114 &3367734699037627833 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8510261678218358358} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 699100ca886480c4a94ced56b1ae0e94, type: 3} + m_Name: + m_EditorClassIdentifier: + themeDataSource: {fileID: 11400000, guid: 57993c46ea42acf4ca3067542443bc45, type: 2} + binders: + - rid: 7617100121658621953 + references: + version: 2 + RefIds: + - rid: 7617100121658621953 + type: {class: GraphicMaterialBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 8652067621810633434} + k__BackingField: Backplate Material diff --git a/org.mixedrealitytoolkit.uxcomponents/ButtonBar/CanvasButtonBar.prefab b/org.mixedrealitytoolkit.uxcomponents/ButtonBar/CanvasButtonBar.prefab index 6841293dd..285b2d2b3 100644 --- a/org.mixedrealitytoolkit.uxcomponents/ButtonBar/CanvasButtonBar.prefab +++ b/org.mixedrealitytoolkit.uxcomponents/ButtonBar/CanvasButtonBar.prefab @@ -13,6 +13,7 @@ GameObject: - component: {fileID: 6264478733034656625} - component: {fileID: 233999318278807519} - component: {fileID: 1925175511647506998} + - component: {fileID: 6793636336473426600} m_Layer: 5 m_Name: CanvasButtonBar m_TagString: Untagged @@ -37,7 +38,6 @@ RectTransform: - {fileID: 8864547319737434740} - {fileID: 8864547320873569819} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -72,6 +72,13 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] + m_Texture: {fileID: 0} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 radius: 13 thickness: 2 wedges: 8 @@ -114,17 +121,37 @@ MonoBehaviour: m_Spacing: {x: 0, y: 0} m_Constraint: 2 m_ConstraintCount: 1 +--- !u!114 &6793636336473426600 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6264478733034656630} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 699100ca886480c4a94ced56b1ae0e94, type: 3} + m_Name: + m_EditorClassIdentifier: + themeDataSource: {fileID: 11400000, guid: 57993c46ea42acf4ca3067542443bc45, type: 2} + binders: + - rid: 1538473309753835627 + references: + version: 2 + RefIds: + - rid: 1538473309753835627 + type: {class: GraphicMaterialBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 6264478733034656625} + k__BackingField: Backplate Material --- !u!1001 &1097437160816526514 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 6264478733034656631} m_Modifications: - - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - target: {fileID: 2142167140070017856, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive value: 0 @@ -205,10 +232,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -282,6 +305,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &8864547321217110511 stripped RectTransform: @@ -293,12 +319,9 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 6264478733034656631} m_Modifications: - - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - target: {fileID: 2142167140070017856, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive value: 0 @@ -379,10 +402,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 3 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -456,6 +475,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &8864547320873569819 stripped RectTransform: @@ -467,12 +489,9 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 6264478733034656631} m_Modifications: - - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - target: {fileID: 2142167140070017856, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive value: 0 @@ -553,10 +572,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -630,6 +645,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &8864547319737434740 stripped RectTransform: @@ -641,16 +659,9 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 6264478733034656631} m_Modifications: - - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2142167140070017856, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - target: {fileID: 5319578128471115350, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.y value: 1 @@ -727,10 +738,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -804,6 +811,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &8864547319186590330 stripped RectTransform: diff --git a/org.mixedrealitytoolkit.uxcomponents/ButtonBar/CanvasButtonBar_SharedBackplate.prefab b/org.mixedrealitytoolkit.uxcomponents/ButtonBar/CanvasButtonBar_SharedBackplate.prefab index 4698b9ad3..914b65e60 100644 --- a/org.mixedrealitytoolkit.uxcomponents/ButtonBar/CanvasButtonBar_SharedBackplate.prefab +++ b/org.mixedrealitytoolkit.uxcomponents/ButtonBar/CanvasButtonBar_SharedBackplate.prefab @@ -33,7 +33,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6264478733034656631} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -120,6 +119,7 @@ GameObject: - component: {fileID: 6264478733034656625} - component: {fileID: 233999318278807519} - component: {fileID: 1925175511647506998} + - component: {fileID: 3508941522267798669} m_Layer: 5 m_Name: CanvasButtonBar_SharedBackplate m_TagString: Untagged @@ -145,7 +145,6 @@ RectTransform: - {fileID: 8864547319737434740} - {fileID: 8864547320873569819} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -180,6 +179,13 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] + m_Texture: {fileID: 0} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 radius: 13 thickness: 2 wedges: 8 @@ -222,17 +228,49 @@ MonoBehaviour: m_Spacing: {x: 0, y: 0} m_Constraint: 2 m_ConstraintCount: 1 +--- !u!114 &3508941522267798669 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6264478733034656630} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 699100ca886480c4a94ced56b1ae0e94, type: 3} + m_Name: + m_EditorClassIdentifier: + themeDataSource: {fileID: 11400000, guid: 57993c46ea42acf4ca3067542443bc45, type: 2} + binders: + - rid: 1538473309753835628 + - rid: 1538473309753835629 + - rid: 1538473309753835630 + references: + version: 2 + RefIds: + - rid: 1538473309753835628 + type: {class: GraphicMaterialBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 6264478733034656625} + k__BackingField: Backplate Material + - rid: 1538473309753835629 + type: {class: GraphicMaterialBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 2047881656393054248} + k__BackingField: Canvas Backplate Quad Material + - rid: 1538473309753835630 + type: {class: GraphicColorBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 2047881656393054248} + k__BackingField: Primary Container Color --- !u!1001 &1097437160816526514 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 6264478733034656631} m_Modifications: - - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - target: {fileID: 2142167140070017856, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive value: 0 @@ -317,10 +355,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -394,6 +428,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &8864547321217110511 stripped RectTransform: @@ -405,12 +442,9 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 6264478733034656631} m_Modifications: - - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - target: {fileID: 2142167140070017856, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive value: 0 @@ -495,10 +529,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 4 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -572,6 +602,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &8864547320873569819 stripped RectTransform: @@ -583,12 +616,9 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 6264478733034656631} m_Modifications: - - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - target: {fileID: 2142167140070017856, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive value: 0 @@ -673,10 +703,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 3 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -750,6 +776,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &8864547319737434740 stripped RectTransform: @@ -761,12 +790,9 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 6264478733034656631} m_Modifications: - - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - target: {fileID: 2142167140070017856, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_IsActive value: 0 @@ -851,10 +877,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -928,6 +950,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &8864547319186590330 stripped RectTransform: diff --git a/org.mixedrealitytoolkit.uxcomponents/ButtonBar/CanvasButtonBar_Toggles.prefab b/org.mixedrealitytoolkit.uxcomponents/ButtonBar/CanvasButtonBar_Toggles.prefab index 80b89bd37..5f491dbcf 100644 --- a/org.mixedrealitytoolkit.uxcomponents/ButtonBar/CanvasButtonBar_Toggles.prefab +++ b/org.mixedrealitytoolkit.uxcomponents/ButtonBar/CanvasButtonBar_Toggles.prefab @@ -5,6 +5,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 1394474569622378618, guid: 61b1d2477609bc34297ebc4689fffbe8, type: 3} @@ -35,10 +36,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 6264478733034656631, guid: 61b1d2477609bc34297ebc4689fffbe8, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - target: {fileID: 6264478733034656631, guid: 61b1d2477609bc34297ebc4689fffbe8, type: 3} propertyPath: m_AnchorMax.x value: 0.5 @@ -368,6 +365,12 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 6264478733034656630, guid: 61b1d2477609bc34297ebc4689fffbe8, type: 3} + insertIndex: -1 + addedObject: {fileID: 2863438162968678084} m_SourcePrefab: {fileID: 100100000, guid: 61b1d2477609bc34297ebc4689fffbe8, type: 3} --- !u!114 &5386334695286782484 stripped MonoBehaviour: diff --git a/org.mixedrealitytoolkit.uxcomponents/CHANGELOG.md b/org.mixedrealitytoolkit.uxcomponents/CHANGELOG.md index 46cc14ae6..378ac88f8 100644 --- a/org.mixedrealitytoolkit.uxcomponents/CHANGELOG.md +++ b/org.mixedrealitytoolkit.uxcomponents/CHANGELOG.md @@ -2,6 +2,37 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/). +## Unreleased + +### Added + +* Added "Enable Button Select Pulse" binding to "Empty Button.prefab". [PR #1130](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1130) + +### Changed + +* Reserialized prefabs and materials to remove additional stale serialized fields. [PR #1126](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1126) + +## [4.0.0-pre.3] - 2026-05-20 + +### Changed + +* Updated the minimum editor version to 6000.0.66f2 [PR #1112](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1112) +* Reserialized prefabs and animations to remove stale serialized fields. [PR #1115](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1115) +* Updated the Action Button prefab to have a more descriptive icon name. [PR #1117](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1117) +* Updated various prefabs to be themeable. [PR #1119](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1119) + +## [4.0.0-pre.2] - 2025-12-05 + +### Changed + +* Updated the minimum editor version to 2022.3.6f1 [PR #1003](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1003) + +## [4.0.0-pre.1] - 2024-07-09 + +### Changed + +* Updated package com.unity.xr.interaction.toolkit to 3.0.4 + ## [3.4.0] - 2025-11-12 ### Added diff --git a/org.mixedrealitytoolkit.uxcomponents/Dialog/CanvasDialog.prefab b/org.mixedrealitytoolkit.uxcomponents/Dialog/CanvasDialog.prefab index d3ba1eff3..db6c6fc5a 100644 --- a/org.mixedrealitytoolkit.uxcomponents/Dialog/CanvasDialog.prefab +++ b/org.mixedrealitytoolkit.uxcomponents/Dialog/CanvasDialog.prefab @@ -36,7 +36,6 @@ RectTransform: - {fileID: 6930810734955394187} - {fileID: 9068894983387194500} m_Father: {fileID: 3464395001938839902} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -60,7 +59,9 @@ Canvas: m_OverrideSorting: 0 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 m_AdditionalShaderChannelsFlag: 31 + m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 @@ -136,7 +137,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7220921723076383083} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -171,6 +171,13 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] + m_Texture: {fileID: 0} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 radius: 13 thickness: 2 wedges: 8 @@ -206,6 +213,7 @@ GameObject: - component: {fileID: 3464395001938839902} - component: {fileID: 4665157281537287932} - component: {fileID: 941895475344048534} + - component: {fileID: 3304842204257264291} m_Layer: 5 m_Name: CanvasDialog m_TagString: Untagged @@ -220,6 +228,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6930810733556124559} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -227,7 +236,6 @@ Transform: m_Children: - {fileID: 7220921723076383083} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &4665157281537287932 MonoBehaviour: @@ -254,7 +262,7 @@ MonoBehaviour: Label: {fileID: 386046704865972471} --- !u!95 &941895475344048534 Animator: - serializedVersion: 5 + serializedVersion: 7 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -268,11 +276,59 @@ Animator: m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 m_StabilizeFeet: 0 + m_AnimatePhysics: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 +--- !u!114 &3304842204257264291 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6930810733556124559} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 699100ca886480c4a94ced56b1ae0e94, type: 3} + m_Name: + m_EditorClassIdentifier: + themeDataSource: {fileID: 11400000, guid: 57993c46ea42acf4ca3067542443bc45, type: 2} + binders: + - rid: 7617100121658622016 + - rid: 7617100121658622018 + - rid: 7617100121658622019 + - rid: 7617100121658622020 + - rid: 7617100121658622021 + references: + version: 2 + RefIds: + - rid: 7617100121658622016 + type: {class: GraphicColorBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 6930810734963254062} + k__BackingField: On Surface Color + - rid: 7617100121658622018 + type: {class: TMP_TextFontAssetBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 6930810734963254062} + k__BackingField: Text Font + - rid: 7617100121658622019 + type: {class: GraphicColorBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 6930810734943986774} + k__BackingField: On Surface Color + - rid: 7617100121658622020 + type: {class: TMP_TextFontAssetBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 6930810734943986774} + k__BackingField: Text Font + - rid: 7617100121658622021 + type: {class: GraphicMaterialBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 8902223861511733022} + k__BackingField: Backplate Material --- !u!1 &6930810734943986772 GameObject: m_ObjectHideFlags: 0 @@ -304,7 +360,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7220921723076383083} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -383,20 +438,23 @@ MonoBehaviour: m_VerticalAlignment: 256 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -447,7 +505,6 @@ RectTransform: - {fileID: 1445932826319549428} - {fileID: 7766819771636563653} m_Father: {fileID: 7220921723076383083} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -512,7 +569,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7220921723076383083} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -585,20 +641,23 @@ MonoBehaviour: m_VerticalAlignment: 256 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -641,6 +700,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 6930810734955394187} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -731,10 +791,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -820,6 +876,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!114 &386046704865972471 stripped MonoBehaviour: @@ -853,6 +912,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 6930810734955394187} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -939,10 +999,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -1016,6 +1072,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &1445932827003000033 stripped RectTransform: @@ -1049,6 +1108,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 6930810734955394187} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -1135,10 +1195,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -1212,6 +1268,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!114 &1445932826319549427 stripped MonoBehaviour: diff --git a/org.mixedrealitytoolkit.uxcomponents/Dialog/CanvasDialogAnimator.controller b/org.mixedrealitytoolkit.uxcomponents/Dialog/CanvasDialogAnimator.controller index 4913ed0a8..a5caf4041 100644 --- a/org.mixedrealitytoolkit.uxcomponents/Dialog/CanvasDialogAnimator.controller +++ b/org.mixedrealitytoolkit.uxcomponents/Dialog/CanvasDialogAnimator.controller @@ -14,7 +14,7 @@ AnimatorController: m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer diff --git a/org.mixedrealitytoolkit.uxcomponents/Dialog/CanvasDialogDismiss.anim b/org.mixedrealitytoolkit.uxcomponents/Dialog/CanvasDialogDismiss.anim index 6d4d4c2b7..9cba2485c 100644 --- a/org.mixedrealitytoolkit.uxcomponents/Dialog/CanvasDialogDismiss.anim +++ b/org.mixedrealitytoolkit.uxcomponents/Dialog/CanvasDialogDismiss.anim @@ -7,7 +7,7 @@ AnimationClip: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: CanvasDialogDismiss - serializedVersion: 6 + serializedVersion: 7 m_Legacy: 0 m_Compressed: 0 m_UseHighQualityCurve: 1 @@ -76,7 +76,8 @@ AnimationClip: m_RotationOrder: 4 path: Canvas m_FloatCurves: - - curve: + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -104,7 +105,9 @@ AnimationClip: path: Canvas classID: 224 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -132,7 +135,9 @@ AnimationClip: path: Canvas classID: 224 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -151,7 +156,9 @@ AnimationClip: path: Canvas classID: 224 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -179,7 +186,9 @@ AnimationClip: path: Canvas classID: 224 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -207,6 +216,7 @@ AnimationClip: path: Canvas classID: 224 script: {fileID: 0} + flags: 16 m_PPtrCurves: [] m_SampleRate: 60 m_WrapMode: 0 @@ -222,6 +232,8 @@ AnimationClip: typeID: 4 customType: 4 isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 - serializedVersion: 2 path: 2721278254 attribute: 3 @@ -229,6 +241,8 @@ AnimationClip: typeID: 4 customType: 0 isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 - serializedVersion: 2 path: 2721278254 attribute: 538195251 @@ -236,6 +250,8 @@ AnimationClip: typeID: 224 customType: 28 isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 - serializedVersion: 2 path: 2721278254 attribute: 3762036201 @@ -243,6 +259,8 @@ AnimationClip: typeID: 224 customType: 0 isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 - serializedVersion: 2 path: 2721278254 attribute: 2033536083 @@ -250,6 +268,8 @@ AnimationClip: typeID: 224 customType: 28 isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 - serializedVersion: 2 path: 2721278254 attribute: 1460864421 @@ -257,6 +277,8 @@ AnimationClip: typeID: 224 customType: 28 isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 - serializedVersion: 2 path: 2721278254 attribute: 2537237887 @@ -264,6 +286,8 @@ AnimationClip: typeID: 224 customType: 0 isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 pptrCurveMapping: [] m_AnimationClipSettings: serializedVersion: 2 @@ -286,7 +310,8 @@ AnimationClip: m_HeightFromFeet: 0 m_Mirror: 0 m_EditorCurves: - - curve: + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -323,7 +348,9 @@ AnimationClip: path: Canvas classID: 224 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -351,7 +378,9 @@ AnimationClip: path: Canvas classID: 224 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -379,7 +408,9 @@ AnimationClip: path: Canvas classID: 224 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -407,7 +438,9 @@ AnimationClip: path: Canvas classID: 224 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -435,7 +468,9 @@ AnimationClip: path: Canvas classID: 224 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -454,7 +489,9 @@ AnimationClip: path: Canvas classID: 224 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -482,7 +519,9 @@ AnimationClip: path: Canvas classID: 224 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -510,7 +549,9 @@ AnimationClip: path: Canvas classID: 224 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -538,7 +579,9 @@ AnimationClip: path: Canvas classID: 224 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -566,7 +609,9 @@ AnimationClip: path: Canvas classID: 224 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -594,8 +639,10 @@ AnimationClip: path: Canvas classID: 224 script: {fileID: 0} + flags: 16 m_EulerEditorCurves: - - curve: + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: [] m_PreInfinity: 2 @@ -605,7 +652,9 @@ AnimationClip: path: Canvas classID: 224 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: [] m_PreInfinity: 2 @@ -615,7 +664,9 @@ AnimationClip: path: Canvas classID: 224 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: [] m_PreInfinity: 2 @@ -625,6 +676,7 @@ AnimationClip: path: Canvas classID: 224 script: {fileID: 0} + flags: 16 m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 m_Events: [] diff --git a/org.mixedrealitytoolkit.uxcomponents/Dialog/CanvasDialogShow.anim b/org.mixedrealitytoolkit.uxcomponents/Dialog/CanvasDialogShow.anim index 3c431f79f..d98343319 100644 --- a/org.mixedrealitytoolkit.uxcomponents/Dialog/CanvasDialogShow.anim +++ b/org.mixedrealitytoolkit.uxcomponents/Dialog/CanvasDialogShow.anim @@ -7,7 +7,7 @@ AnimationClip: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: CanvasDialogShow - serializedVersion: 6 + serializedVersion: 7 m_Legacy: 0 m_Compressed: 0 m_UseHighQualityCurve: 1 @@ -67,7 +67,8 @@ AnimationClip: m_RotationOrder: 4 path: Canvas m_FloatCurves: - - curve: + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -95,7 +96,9 @@ AnimationClip: path: Canvas classID: 224 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -123,7 +126,9 @@ AnimationClip: path: Canvas classID: 224 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -151,7 +156,9 @@ AnimationClip: path: Canvas classID: 224 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -170,6 +177,7 @@ AnimationClip: path: Canvas classID: 224 script: {fileID: 0} + flags: 16 m_PPtrCurves: [] m_SampleRate: 60 m_WrapMode: 0 @@ -185,6 +193,8 @@ AnimationClip: typeID: 4 customType: 4 isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 - serializedVersion: 2 path: 2721278254 attribute: 3 @@ -192,6 +202,8 @@ AnimationClip: typeID: 4 customType: 0 isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 - serializedVersion: 2 path: 2721278254 attribute: 538195251 @@ -199,6 +211,8 @@ AnimationClip: typeID: 224 customType: 28 isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 - serializedVersion: 2 path: 2721278254 attribute: 3762036201 @@ -206,6 +220,8 @@ AnimationClip: typeID: 224 customType: 0 isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 - serializedVersion: 2 path: 2721278254 attribute: 2537237887 @@ -213,6 +229,8 @@ AnimationClip: typeID: 224 customType: 0 isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 - serializedVersion: 2 path: 2721278254 attribute: 2033536083 @@ -220,6 +238,8 @@ AnimationClip: typeID: 224 customType: 28 isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 pptrCurveMapping: [] m_AnimationClipSettings: serializedVersion: 2 @@ -242,7 +262,8 @@ AnimationClip: m_HeightFromFeet: 0 m_Mirror: 0 m_EditorCurves: - - curve: + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -270,7 +291,9 @@ AnimationClip: path: Canvas classID: 224 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -298,7 +321,9 @@ AnimationClip: path: Canvas classID: 224 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -326,7 +351,9 @@ AnimationClip: path: Canvas classID: 224 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -354,7 +381,9 @@ AnimationClip: path: Canvas classID: 224 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -382,7 +411,9 @@ AnimationClip: path: Canvas classID: 224 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -410,7 +441,9 @@ AnimationClip: path: Canvas classID: 224 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -429,7 +462,9 @@ AnimationClip: path: Canvas classID: 224 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -457,7 +492,9 @@ AnimationClip: path: Canvas classID: 224 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -485,7 +522,9 @@ AnimationClip: path: Canvas classID: 224 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -513,8 +552,10 @@ AnimationClip: path: Canvas classID: 224 script: {fileID: 0} + flags: 16 m_EulerEditorCurves: - - curve: + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: [] m_PreInfinity: 2 @@ -524,7 +565,9 @@ AnimationClip: path: Canvas classID: 224 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: [] m_PreInfinity: 2 @@ -534,7 +577,9 @@ AnimationClip: path: Canvas classID: 224 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: [] m_PreInfinity: 2 @@ -544,6 +589,7 @@ AnimationClip: path: Canvas classID: 224 script: {fileID: 0} + flags: 16 m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 m_Events: [] diff --git a/org.mixedrealitytoolkit.uxcomponents/Editor/AssemblyInfo.cs b/org.mixedrealitytoolkit.uxcomponents/Editor/AssemblyInfo.cs index 8f5c1a1c9..d99c4abc9 100644 --- a/org.mixedrealitytoolkit.uxcomponents/Editor/AssemblyInfo.cs +++ b/org.mixedrealitytoolkit.uxcomponents/Editor/AssemblyInfo.cs @@ -9,4 +9,4 @@ // The AssemblyVersion attribute is checked-in and is recommended not to be changed often. // https://docs.microsoft.com/troubleshoot/visualstudio/general/assembly-version-assembly-file-version // AssemblyFileVersion and AssemblyInformationalVersion are added by pack-upm.ps1 to match the current MRTK build version. -[assembly: AssemblyVersion("3.0.0.0")] +[assembly: AssemblyVersion("4.0.0.0")] diff --git a/org.mixedrealitytoolkit.uxcomponents/Experimental/NonNativeKeyboard/NonNativeKeyboard.prefab b/org.mixedrealitytoolkit.uxcomponents/Experimental/NonNativeKeyboard/NonNativeKeyboard.prefab index 5c6f31f9f..54418d7b7 100644 --- a/org.mixedrealitytoolkit.uxcomponents/Experimental/NonNativeKeyboard/NonNativeKeyboard.prefab +++ b/org.mixedrealitytoolkit.uxcomponents/Experimental/NonNativeKeyboard/NonNativeKeyboard.prefab @@ -31,7 +31,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22490200} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -104,20 +103,23 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 00000000 m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -170,7 +172,6 @@ RectTransform: - {fileID: 22427104} - {fileID: 22417272} m_Father: {fileID: 22460848} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -307,7 +308,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22462662} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -380,20 +380,23 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 00000000 m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -449,7 +452,6 @@ RectTransform: - {fileID: 22462662} - {fileID: 22451892} m_Father: {fileID: 22458684} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} @@ -525,7 +527,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22492868} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -605,7 +606,6 @@ RectTransform: - {fileID: 22426486} - {fileID: 22480834} m_Father: {fileID: 22479812} - m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -742,7 +742,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22412128} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -818,7 +817,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22405132} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -891,20 +889,23 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 00000000 m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -953,7 +954,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22439758} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -1064,7 +1064,6 @@ RectTransform: - {fileID: 22422930} - {fileID: 22444694} m_Father: {fileID: 22458684} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -1144,7 +1143,6 @@ RectTransform: - {fileID: 22433460} - {fileID: 22477236} m_Father: {fileID: 22441282} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -1281,7 +1279,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22406720} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -1354,20 +1351,23 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 00000000 m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -1416,7 +1416,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22413622} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -1489,20 +1488,23 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -1551,7 +1553,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22477678} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -1624,20 +1625,23 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -1690,7 +1694,6 @@ RectTransform: - {fileID: 22485696} - {fileID: 22416406} m_Father: {fileID: 22464878} - m_RootOrder: 15 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -1827,7 +1830,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22404266} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -1903,7 +1905,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22424052} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -1976,20 +1977,23 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 00000000 m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -2038,7 +2042,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22468698} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -2114,7 +2117,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22491728} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -2190,7 +2192,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22457066} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -2263,20 +2264,23 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 00000000 m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -2329,7 +2333,6 @@ RectTransform: - {fileID: 22411230} - {fileID: 22428030} m_Father: {fileID: 22479812} - m_RootOrder: 28 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -2466,7 +2469,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22446928} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -2539,20 +2541,23 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 00000000 m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -2601,7 +2606,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22412186} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -2674,20 +2678,23 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 00000000 m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -2736,7 +2743,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22496850} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -2812,7 +2818,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22451892} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -2892,7 +2897,6 @@ RectTransform: - {fileID: 22417264} - {fileID: 22414504} m_Father: {fileID: 22479812} - m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -3029,7 +3033,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22430750} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -3109,7 +3112,6 @@ RectTransform: - {fileID: 22402854} - {fileID: 22477136} m_Father: {fileID: 22479812} - m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -3246,7 +3248,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22411626} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -3326,7 +3327,6 @@ RectTransform: - {fileID: 22497062} - {fileID: 22465256} m_Father: {fileID: 22464878} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -3463,7 +3463,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22476324} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -3539,7 +3538,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22418770} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -3612,20 +3610,23 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 00000000 m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -3674,7 +3675,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22447026} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -3747,20 +3747,23 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 00000000 m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -3809,7 +3812,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22474578} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -3889,7 +3891,6 @@ RectTransform: - {fileID: 22449608} - {fileID: 22475582} m_Father: {fileID: 22441282} - m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -4026,7 +4027,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22425902} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -4099,20 +4099,23 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -4161,7 +4164,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22409728} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -4234,20 +4236,23 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 00000000 m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -4296,7 +4301,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22446786} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -4372,7 +4376,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22497832} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -4445,20 +4448,23 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 00000000 m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -4511,7 +4517,6 @@ RectTransform: - {fileID: 22499340} - {fileID: 22462540} m_Father: {fileID: 22400998} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} @@ -4587,7 +4592,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22488768} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -4667,7 +4671,6 @@ RectTransform: - {fileID: 22446988} - {fileID: 22416294} m_Father: {fileID: 22416050} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -4802,7 +4805,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22404838} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -4878,7 +4880,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22474762} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -4954,7 +4955,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22477678} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -5030,7 +5030,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22405132} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -5110,7 +5109,6 @@ RectTransform: - {fileID: 22443268} - {fileID: 22425116} m_Father: {fileID: 22405956} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -5245,7 +5243,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22491366} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -5318,20 +5315,23 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 00000000 m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -5380,7 +5380,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22411502} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -5453,20 +5452,23 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -5515,7 +5517,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22441896} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -5591,7 +5592,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22434070} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -5664,20 +5664,23 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 00000000 m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -5726,7 +5729,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22448648} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -5806,7 +5808,6 @@ RectTransform: - {fileID: 22442870} - {fileID: 22419104} m_Father: {fileID: 22479812} - m_RootOrder: 24 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -5947,7 +5948,6 @@ RectTransform: - {fileID: 22467450} - {fileID: 7284901212049262146} m_Father: {fileID: 22429566} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -6101,7 +6101,6 @@ RectTransform: - {fileID: 22404266} - {fileID: 22477008} m_Father: {fileID: 22400998} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} @@ -6177,7 +6176,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22454786} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -6250,20 +6248,23 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 00000000 m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -6312,7 +6313,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22448248} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -6385,20 +6385,23 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 00000000 m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -6447,7 +6450,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22477008} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -6520,20 +6522,23 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 00000000 m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -6582,7 +6587,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22462540} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -6662,7 +6666,6 @@ RectTransform: - {fileID: 22436294} - {fileID: 22429130} m_Father: {fileID: 22464878} - m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -6803,7 +6806,6 @@ RectTransform: - {fileID: 22495432} - {fileID: 22465560} m_Father: {fileID: 22479812} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -6940,7 +6942,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22473450} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -7013,20 +7014,23 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 00000000 m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -7075,7 +7079,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22412128} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -7148,20 +7151,23 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 00000000 m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -7210,7 +7216,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22423982} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -7283,20 +7288,23 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -7345,7 +7353,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22461886} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -7421,7 +7428,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22484182} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -7494,20 +7500,23 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -7556,7 +7565,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22410804} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -7629,20 +7637,23 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 00000000 m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -7691,7 +7702,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22486042} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -7767,7 +7777,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22476324} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -7840,20 +7849,23 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -7902,7 +7914,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22475972} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -7985,7 +7996,6 @@ RectTransform: - {fileID: 22448648} - {fileID: 22497832} m_Father: {fileID: 22458684} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} @@ -8061,7 +8071,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22411502} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -8137,7 +8146,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22479472} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -8217,7 +8225,6 @@ RectTransform: - {fileID: 22418584} - {fileID: 22456780} m_Father: {fileID: 22479812} - m_RootOrder: 15 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -8365,7 +8372,6 @@ RectTransform: - {fileID: 22446928} - {fileID: 22401602} m_Father: {fileID: 22400998} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -8441,7 +8447,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22422930} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -8517,7 +8522,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22475638} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -8590,20 +8594,23 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -8656,7 +8663,6 @@ RectTransform: - {fileID: 22494754} - {fileID: 22455986} m_Father: {fileID: 22479812} - m_RootOrder: 21 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -8793,7 +8799,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22436598} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -8873,7 +8878,6 @@ RectTransform: - {fileID: 22406246} - {fileID: 22429358} m_Father: {fileID: 22479812} - m_RootOrder: 20 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -9010,7 +9014,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22447026} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -9086,7 +9089,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22485892} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -9162,7 +9164,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22462662} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -9242,7 +9243,6 @@ RectTransform: - {fileID: 22461740} - {fileID: 22410810} m_Father: {fileID: 22405956} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -9381,7 +9381,6 @@ RectTransform: - {fileID: 22404284} - {fileID: 22499418} m_Father: {fileID: 22460848} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -9518,7 +9517,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22491366} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -9594,7 +9592,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22491032} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -9667,20 +9664,23 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -9729,7 +9729,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22425902} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -9809,7 +9808,6 @@ RectTransform: - {fileID: 22476458} - {fileID: 22404638} m_Father: {fileID: 22425748} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -9946,7 +9944,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22417666} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -10026,7 +10023,6 @@ RectTransform: - {fileID: 22416218} - {fileID: 22422222} m_Father: {fileID: 22479812} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -10167,7 +10163,6 @@ RectTransform: - {fileID: 22486324} - {fileID: 22496102} m_Father: {fileID: 22464878} - m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -10304,7 +10299,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22478130} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -10377,20 +10371,23 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -10443,7 +10440,6 @@ RectTransform: - {fileID: 22409046} - {fileID: 22402642} m_Father: {fileID: 22479812} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -10580,7 +10576,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22411788} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -10653,20 +10648,23 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 00000000 m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -10715,7 +10713,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22422930} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -10788,20 +10785,23 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -10854,7 +10854,6 @@ RectTransform: - {fileID: 261783965268383605} - {fileID: 22435746} m_Father: {fileID: 22410434} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -10989,7 +10988,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22427586} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -11069,7 +11067,6 @@ RectTransform: - {fileID: 22411388} - {fileID: 22407926} m_Father: {fileID: 22479812} - m_RootOrder: 33 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -11206,7 +11203,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22432870} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -11279,20 +11275,23 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 00000000 m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -11345,7 +11344,6 @@ RectTransform: - {fileID: 22482596} - {fileID: 22480030} m_Father: {fileID: 22460848} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -11482,7 +11480,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22446000} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -11555,20 +11552,23 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -11621,7 +11621,6 @@ RectTransform: - {fileID: 22419976} - {fileID: 22470588} m_Father: {fileID: 22425748} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -11762,7 +11761,6 @@ RectTransform: - {fileID: 22400698} - {fileID: 22483284} m_Father: {fileID: 22464878} - m_RootOrder: 18 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -11897,7 +11895,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22490200} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -11973,7 +11970,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22409590} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -12046,20 +12042,23 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 00000000 m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -12112,7 +12111,6 @@ RectTransform: - {fileID: 22434488} - {fileID: 22438322} m_Father: {fileID: 22441282} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -12249,7 +12247,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22424052} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -12325,7 +12322,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22484182} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -12401,7 +12397,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22468454} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -12474,20 +12469,23 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 00000000 m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -12536,7 +12534,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22410434} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -12612,7 +12609,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22496850} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -12685,20 +12681,23 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 00000000 m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -12747,7 +12746,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22448248} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -12827,7 +12825,6 @@ RectTransform: - {fileID: 22443326} - {fileID: 22485332} m_Father: {fileID: 22464878} - m_RootOrder: 16 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -12968,7 +12965,6 @@ RectTransform: - {fileID: 22442172} - {fileID: 22430620} m_Father: {fileID: 22479812} - m_RootOrder: 17 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -13109,7 +13105,6 @@ RectTransform: - {fileID: 22495524} - {fileID: 22463126} m_Father: {fileID: 22464878} - m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -13246,7 +13241,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22448102} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -13322,7 +13316,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22411788} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -13398,7 +13391,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22496376} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -13471,20 +13463,23 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -13533,7 +13528,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22439758} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -13606,20 +13600,23 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 00000000 m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -13668,7 +13665,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22421144} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -13748,7 +13744,6 @@ RectTransform: - {fileID: 22489008} - {fileID: 22465744} m_Father: {fileID: 22464878} - m_RootOrder: 14 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -13889,7 +13884,6 @@ RectTransform: - {fileID: 22465028} - {fileID: 22494460} m_Father: {fileID: 22479812} - m_RootOrder: 32 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -14026,7 +14020,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22412186} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -14106,7 +14099,6 @@ RectTransform: - {fileID: 22463646} - {fileID: 22457912} m_Father: {fileID: 22460848} - m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -14241,7 +14233,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22402474} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -14314,20 +14305,23 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -14380,7 +14374,6 @@ RectTransform: - {fileID: 22406332} - {fileID: 22400898} m_Father: {fileID: 22479812} - m_RootOrder: 31 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -14521,7 +14514,6 @@ RectTransform: - {fileID: 22427190} - {fileID: 22480748} m_Father: {fileID: 22425748} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -14656,7 +14648,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22452272} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -14732,7 +14723,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22468454} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -14808,7 +14798,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22462540} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -14881,20 +14870,23 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 00000000 m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -14948,7 +14940,6 @@ RectTransform: - {fileID: 22439214} - {fileID: 22466028} m_Father: {fileID: 22439972} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -15083,7 +15074,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22448648} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -15156,20 +15146,23 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 00000000 m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -15222,7 +15215,6 @@ RectTransform: - {fileID: 22434470} - {fileID: 22468980} m_Father: {fileID: 22441282} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -15372,7 +15364,6 @@ RectTransform: - {fileID: 22460848} - {fileID: 22425748} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -15396,7 +15387,9 @@ Canvas: m_OverrideSorting: 0 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 m_AdditionalShaderChannelsFlag: 31 + m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 @@ -15547,7 +15540,8 @@ AudioSource: m_Enabled: 1 serializedVersion: 4 OutputAudioMixerGroup: {fileID: 0} - m_audioClip: {fileID: 8300000, guid: 51de19e15e660e845bdedcfbb9c6a0e8, type: 3} + m_audioClip: {fileID: 0} + m_Resource: {fileID: 8300000, guid: 51de19e15e660e845bdedcfbb9c6a0e8, type: 3} m_PlayOnAwake: 1 m_Volume: 1 m_Pitch: 1 @@ -15676,7 +15670,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22401602} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -15756,7 +15749,6 @@ RectTransform: - {fileID: 22463620} - {fileID: 22407342} m_Father: {fileID: 22416050} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -15891,7 +15883,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22451892} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -15964,20 +15955,23 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 00000000 m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -16026,7 +16020,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22471260} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -16106,7 +16099,6 @@ RectTransform: - {fileID: 22456742} - {fileID: 22475506} m_Father: {fileID: 22464878} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -16243,7 +16235,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22477742} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -16316,20 +16307,23 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 00000000 m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -16382,7 +16376,6 @@ RectTransform: - {fileID: 22408530} - {fileID: 22438832} m_Father: {fileID: 22464878} - m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -16523,7 +16516,6 @@ RectTransform: - {fileID: 22415302} - {fileID: 22470238} m_Father: {fileID: 22429566} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -16658,7 +16650,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22401602} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -16731,20 +16722,23 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 00000000 m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -16793,7 +16787,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22436598} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -16866,20 +16859,23 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -16928,7 +16924,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22452272} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -17001,20 +16996,23 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -17067,7 +17065,6 @@ RectTransform: - {fileID: 22423630} - {fileID: 22444158} m_Father: {fileID: 22479812} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -17209,7 +17206,6 @@ RectTransform: - {fileID: 22479472} - {fileID: 6163252882088474250} m_Father: {fileID: 22439972} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} @@ -17341,7 +17337,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22454856} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -17414,20 +17409,23 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 00000000 m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -17480,7 +17478,6 @@ RectTransform: - {fileID: 22430090} - {fileID: 22498516} m_Father: {fileID: 22479812} - m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -17617,7 +17614,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22409728} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -17697,7 +17693,6 @@ RectTransform: - {fileID: 22494100} - {fileID: 22482704} m_Father: {fileID: 22460848} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -17836,7 +17831,6 @@ RectTransform: - {fileID: 22471102} - {fileID: 22477742} m_Father: {fileID: 22400998} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} @@ -17912,7 +17906,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22444694} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -17992,7 +17985,6 @@ RectTransform: - {fileID: 22435236} - {fileID: 22490664} m_Father: {fileID: 22479812} - m_RootOrder: 16 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -18129,7 +18121,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22458212} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -18205,7 +18196,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22471068} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -18278,20 +18268,23 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -18340,7 +18333,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22421144} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -18413,20 +18405,23 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 00000000 m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -18475,7 +18470,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22478130} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -18555,7 +18549,6 @@ RectTransform: - {fileID: 22439980} - {fileID: 22417676} m_Father: {fileID: 22479812} - m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -18690,7 +18683,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22428854} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -18763,20 +18755,23 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -18825,7 +18820,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22492986} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -18901,7 +18895,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22471068} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -18981,7 +18974,6 @@ RectTransform: - {fileID: 22462732} - {fileID: 22444016} m_Father: {fileID: 22464878} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -19122,7 +19114,6 @@ RectTransform: - {fileID: 22440338} - {fileID: 22479624} m_Father: {fileID: 22479812} - m_RootOrder: 22 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -19257,7 +19248,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22402474} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -19337,7 +19327,6 @@ RectTransform: - {fileID: 22492534} - {fileID: 22496022} m_Father: {fileID: 22479812} - m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -19477,7 +19466,6 @@ RectTransform: - {fileID: 22432408} - {fileID: 22446000} m_Father: {fileID: 22458684} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} @@ -19553,7 +19541,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22446928} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -19629,7 +19616,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22432408} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -19705,7 +19691,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22430750} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -19778,20 +19763,23 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -19840,7 +19828,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22496376} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -19920,7 +19907,6 @@ RectTransform: - {fileID: 22454728} - {fileID: 22459372} m_Father: {fileID: 22479812} - m_RootOrder: 30 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -20057,7 +20043,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22418770} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -20133,7 +20118,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22429856} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -20206,20 +20190,23 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -20272,7 +20259,6 @@ RectTransform: - {fileID: 22478356} - {fileID: 22438076} m_Father: {fileID: 22441282} - m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -20413,7 +20399,6 @@ RectTransform: - {fileID: 22424336} - {fileID: 22482286} m_Father: {fileID: 22479812} - m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -20550,7 +20535,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22401596} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -20626,7 +20610,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22418362} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -20702,7 +20685,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22475638} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -20778,7 +20760,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22413830} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -20851,20 +20832,23 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -20913,7 +20897,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22474578} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -20986,20 +20969,23 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 00000000 m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -21048,7 +21034,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22434070} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -21124,7 +21109,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22474762} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -21200,7 +21184,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22475972} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -21273,20 +21256,23 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 00000000 m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -21339,7 +21325,6 @@ RectTransform: - {fileID: 22482356} - {fileID: 22464976} m_Father: {fileID: 22410434} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -21474,7 +21459,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22444694} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -21550,7 +21534,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22471260} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -21623,20 +21606,23 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 00000000 m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -21689,7 +21675,6 @@ RectTransform: - {fileID: 22487824} - {fileID: 22438784} m_Father: {fileID: 22479812} - m_RootOrder: 27 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -21826,7 +21811,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22487526} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -21906,7 +21890,6 @@ RectTransform: - {fileID: 22453786} - {fileID: 22411772} m_Father: {fileID: 22405956} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -22045,7 +22028,6 @@ RectTransform: - {fileID: 22482422} - {fileID: 22408096} m_Father: {fileID: 22441282} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -22182,7 +22164,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22421948} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -22258,7 +22239,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22487526} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -22331,20 +22311,23 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -22397,7 +22380,6 @@ RectTransform: - {fileID: 22481452} - {fileID: 22488306} m_Father: {fileID: 22441282} - m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -22538,7 +22520,6 @@ RectTransform: - {fileID: 22473732} - {fileID: 22452782} m_Father: {fileID: 22479812} - m_RootOrder: 19 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -22679,7 +22660,6 @@ RectTransform: - {fileID: 22441504} - {fileID: 22456290} m_Father: {fileID: 22479812} - m_RootOrder: 25 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -22816,7 +22796,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22484368} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -22892,7 +22871,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22490040} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -22968,7 +22946,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22417666} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -23049,7 +23026,6 @@ RectTransform: - {fileID: 8033748712597358602} - {fileID: 22433320} m_Father: {fileID: 22479812} - m_RootOrder: 34 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -23188,7 +23164,6 @@ RectTransform: - {fileID: 22454146} - {fileID: 22438734} m_Father: {fileID: 22464878} - m_RootOrder: 17 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -23325,7 +23300,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22455304} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -23401,7 +23375,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22442914} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -23481,7 +23454,6 @@ RectTransform: - {fileID: 22429652} - {fileID: 22437868} m_Father: {fileID: 22441282} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -23618,7 +23590,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22479472} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -23698,7 +23669,6 @@ RectTransform: - {fileID: 22420378} - {fileID: 22499626} m_Father: {fileID: 22460848} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -23835,7 +23805,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22441896} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -23908,20 +23877,23 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 00000000 m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -23970,7 +23942,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22421948} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -24043,20 +24014,23 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 00000000 m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -24105,7 +24079,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22454856} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -24185,7 +24158,6 @@ RectTransform: - {fileID: 22485260} - {fileID: 22407146} m_Father: {fileID: 22464878} - m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -24322,7 +24294,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22418362} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -24398,7 +24369,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22423580} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -24471,20 +24441,23 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -24533,7 +24506,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22423982} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -24609,7 +24581,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22465210} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -24682,20 +24653,23 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 00000000 m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -24748,7 +24722,6 @@ RectTransform: - {fileID: 22409068} - {fileID: 22455186} m_Father: {fileID: 22416050} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -24883,7 +24856,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22465210} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -24959,7 +24931,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22484182} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -25035,7 +25006,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22492986} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -25108,20 +25078,23 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -25174,7 +25147,6 @@ RectTransform: - {fileID: 22467832} - {fileID: 22411494} m_Father: {fileID: 22429566} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -25309,7 +25281,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22409590} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -25389,7 +25360,6 @@ RectTransform: - {fileID: 22478120} - {fileID: 22438964} m_Father: {fileID: 22479812} - m_RootOrder: 26 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -25526,7 +25496,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22454786} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -25606,7 +25575,6 @@ RectTransform: - {fileID: 22441282} - {fileID: 22405956} m_Father: {fileID: 22458684} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -25686,7 +25654,6 @@ RectTransform: - {fileID: 22499186} - {fileID: 22488246} m_Father: {fileID: 22479812} - m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -25821,7 +25788,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22432870} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -25897,7 +25863,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22406720} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -25977,7 +25942,6 @@ RectTransform: - {fileID: 22474814} - {fileID: 22490568} m_Father: {fileID: 22441282} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -26114,7 +26078,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22491032} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -26190,7 +26153,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22408352} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -26263,20 +26225,23 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 00000000 m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -26325,7 +26290,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22404266} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -26398,20 +26362,23 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 00000000 m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -26464,7 +26431,6 @@ RectTransform: - {fileID: 22413816} - {fileID: 22481614} m_Father: {fileID: 22425748} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -26601,7 +26567,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22471102} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -26674,20 +26639,23 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 00000000 m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -26736,7 +26704,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22490040} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -26809,20 +26776,23 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -26875,7 +26845,6 @@ RectTransform: - {fileID: 22420350} - {fileID: 22406776} m_Father: {fileID: 22460848} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -27010,7 +26979,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22486042} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -27083,20 +27051,23 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -27145,7 +27116,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22471102} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -27221,7 +27191,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22497832} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -27297,7 +27266,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22410804} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -27373,7 +27341,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22429856} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -27449,7 +27416,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22411316} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -27522,20 +27488,23 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -27584,7 +27553,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22406000} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -27665,7 +27633,6 @@ RectTransform: - {fileID: 3067303607484302081} - {fileID: 22422604} m_Father: {fileID: 22479812} - m_RootOrder: 23 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -27802,7 +27769,6 @@ RectTransform: - {fileID: 22484182} - {fileID: 22410434} m_Father: {fileID: 22458684} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -27878,7 +27844,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22446000} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -27958,7 +27923,6 @@ RectTransform: - {fileID: 22459416} - {fileID: 22424178} m_Father: {fileID: 22479812} - m_RootOrder: 18 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -28095,7 +28059,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22427586} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -28168,20 +28131,23 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 00000000 m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -28230,7 +28196,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22473450} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -28310,7 +28275,6 @@ RectTransform: - {fileID: 22434546} - {fileID: 22435952} m_Father: {fileID: 22425748} - m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -28445,7 +28409,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22446786} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -28518,20 +28481,23 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 00000000 m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -28584,7 +28550,6 @@ RectTransform: - {fileID: 22436468} - {fileID: 22406124} m_Father: {fileID: 22464878} - m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -28725,7 +28690,6 @@ RectTransform: - {fileID: 22457140} - {fileID: 2039602587935630709} m_Father: {fileID: 22429566} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -28860,7 +28824,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22423580} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -28936,7 +28899,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22477008} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -29012,7 +28974,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22457066} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -29088,7 +29049,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22428854} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -29164,7 +29124,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22432408} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -29237,20 +29196,23 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -29299,7 +29261,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22485892} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -29372,20 +29333,23 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -29434,7 +29398,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22413622} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -29514,7 +29477,6 @@ RectTransform: - {fileID: 22465312} - {fileID: 22477418} m_Father: {fileID: 22464878} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -29651,7 +29613,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22458212} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -29731,7 +29692,6 @@ RectTransform: - {fileID: 22430760} - {fileID: 22451410} m_Father: {fileID: 22425748} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -29868,7 +29828,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22442914} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -29941,20 +29900,23 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 00000000 m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -30003,7 +29965,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22477742} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -30079,7 +30040,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22488768} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -30152,20 +30112,23 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -30214,7 +30177,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22401596} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -30287,20 +30249,23 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -30349,7 +30314,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22492868} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -30422,20 +30386,23 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -30484,7 +30451,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22461886} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -30557,20 +30523,23 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 00000000 m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -30623,7 +30592,6 @@ RectTransform: - {fileID: 22425852} - {fileID: 22404324} m_Father: {fileID: 22479812} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -30764,7 +30732,6 @@ RectTransform: - {fileID: 22424590} - {fileID: 22469802} m_Father: {fileID: 22425748} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -30899,7 +30866,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22499340} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -30979,7 +30945,6 @@ RectTransform: - {fileID: 22400958} - {fileID: 22481370} m_Father: {fileID: 22464878} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -31120,7 +31085,6 @@ RectTransform: - {fileID: 22483672} - {fileID: 22472954} m_Father: {fileID: 22479812} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -31257,7 +31221,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22406000} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -31330,20 +31293,23 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 00000000 m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -31396,7 +31362,6 @@ RectTransform: - {fileID: 22427742} - {fileID: 22488698} m_Father: {fileID: 22464878} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -31537,7 +31502,6 @@ RectTransform: - {fileID: 22425072} - {fileID: 22401506} m_Father: {fileID: 22441282} - m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -31674,7 +31638,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22411626} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -31747,20 +31710,23 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -31813,7 +31779,6 @@ RectTransform: - {fileID: 22461686} - {fileID: 22407376} m_Father: {fileID: 22479812} - m_RootOrder: 29 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -31954,7 +31919,6 @@ RectTransform: - {fileID: 22466816} - {fileID: 22490744} m_Father: {fileID: 22441282} - m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -32091,7 +32055,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22455304} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -32164,20 +32127,23 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -32226,7 +32192,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22408352} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -32302,7 +32267,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22411316} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -32378,7 +32342,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22491728} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -32451,20 +32414,23 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 00000000 m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -32517,7 +32483,6 @@ RectTransform: - {fileID: 22461666} - {fileID: 22456716} m_Father: {fileID: 22464878} - m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -32658,7 +32623,6 @@ RectTransform: - {fileID: 22460070} - {fileID: 22494920} m_Father: {fileID: 22464878} - m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -32799,7 +32763,6 @@ RectTransform: - {fileID: 22418888} - {fileID: 22433482} m_Father: {fileID: 22405956} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -32938,7 +32901,6 @@ RectTransform: - {fileID: 22480580} - {fileID: 22457776} m_Father: {fileID: 22479812} - m_RootOrder: 14 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -33075,7 +33037,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22484368} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -33148,20 +33109,23 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -33210,7 +33174,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22413830} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -33286,7 +33249,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22448102} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -33363,7 +33325,6 @@ RectTransform: m_Children: - {fileID: 6677080775266270871} m_Father: {fileID: 6163252882088474250} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -33436,20 +33397,23 @@ MonoBehaviour: m_VerticalAlignment: 256 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 0 + m_TextWrappingMode: 0 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -33499,7 +33463,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22468698} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -33572,20 +33535,23 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 00000000 m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -33616,9 +33582,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: fontIcons: {fileID: 11400000, guid: b490f983baa13694cb7e5ecc6bd0dae3, type: 2} - currentIconName: Icon 42 + currentIconName: Arrow Right textMeshProComponent: {fileID: 1851442636371205706} - iconFontAsset: {fileID: 0} + migratedSuccessfully: 1 --- !u!1 &457749926282753362 GameObject: m_ObjectHideFlags: 0 @@ -33651,7 +33617,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22444694} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -33724,20 +33689,23 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -33768,9 +33736,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: fontIcons: {fileID: 11400000, guid: b490f983baa13694cb7e5ecc6bd0dae3, type: 2} - currentIconName: Icon 44 + currentIconName: Arrow Up textMeshProComponent: {fileID: 4700198312997907203} - iconFontAsset: {fileID: 0} + migratedSuccessfully: 1 --- !u!1 &1195796392646670598 GameObject: m_ObjectHideFlags: 0 @@ -33803,7 +33771,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6163252882088474250} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -33891,7 +33858,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22404838} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -33968,7 +33934,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1368284319806243332} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} @@ -34057,7 +34022,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22499340} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -34130,20 +34094,23 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 00000000 m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -34174,9 +34141,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: fontIcons: {fileID: 11400000, guid: b490f983baa13694cb7e5ecc6bd0dae3, type: 2} - currentIconName: Icon 39 + currentIconName: Arrow Left textMeshProComponent: {fileID: 9102639994062334726} - iconFontAsset: {fileID: 0} + migratedSuccessfully: 1 --- !u!1 &6916386755006368770 GameObject: m_ObjectHideFlags: 0 @@ -34210,7 +34177,6 @@ RectTransform: - {fileID: 1368284319806243332} - {fileID: 1123086001961791811} m_Father: {fileID: 22410434} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -34271,7 +34237,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22458212} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -34344,20 +34309,23 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -34388,6 +34356,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: fontIcons: {fileID: 11400000, guid: b490f983baa13694cb7e5ecc6bd0dae3, type: 2} - currentIconName: Icon 44 + currentIconName: Arrow Up textMeshProComponent: {fileID: 3229080939679983313} - iconFontAsset: {fileID: 0} + migratedSuccessfully: 1 diff --git a/org.mixedrealitytoolkit.uxcomponents/Experimental/NonNativeKeyboard/TouchableNonNativeKeyboard.prefab b/org.mixedrealitytoolkit.uxcomponents/Experimental/NonNativeKeyboard/TouchableNonNativeKeyboard.prefab index 5e3cb4865..306cad0b9 100644 --- a/org.mixedrealitytoolkit.uxcomponents/Experimental/NonNativeKeyboard/TouchableNonNativeKeyboard.prefab +++ b/org.mixedrealitytoolkit.uxcomponents/Experimental/NonNativeKeyboard/TouchableNonNativeKeyboard.prefab @@ -5,6 +5,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 146120, guid: 74b589d1efab94a4cb70e4b5c22783f8, type: 3} @@ -13,7 +14,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 11499414, guid: 74b589d1efab94a4cb70e4b5c22783f8, type: 3} propertyPath: m_PresetInfoIsWorld - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 22458684, guid: 74b589d1efab94a4cb70e4b5c22783f8, type: 3} propertyPath: m_Pivot.x @@ -112,6 +113,15 @@ PrefabInstance: value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 146120, guid: 74b589d1efab94a4cb70e4b5c22783f8, type: 3} + insertIndex: -1 + addedObject: {fileID: 4419896904837032465} + - targetCorrespondingSourceObject: {fileID: 146120, guid: 74b589d1efab94a4cb70e4b5c22783f8, type: 3} + insertIndex: -1 + addedObject: {fileID: 6914410306487292552} m_SourcePrefab: {fileID: 100100000, guid: 74b589d1efab94a4cb70e4b5c22783f8, type: 3} --- !u!1 &6492709475619610834 stripped GameObject: diff --git a/org.mixedrealitytoolkit.uxcomponents/Experimental/Scrollable/ScrollablePanel.prefab b/org.mixedrealitytoolkit.uxcomponents/Experimental/Scrollable/ScrollablePanel.prefab index 474e6feca..c6972065e 100644 --- a/org.mixedrealitytoolkit.uxcomponents/Experimental/Scrollable/ScrollablePanel.prefab +++ b/org.mixedrealitytoolkit.uxcomponents/Experimental/Scrollable/ScrollablePanel.prefab @@ -37,7 +37,6 @@ RectTransform: m_Children: - {fileID: 6449560765081929048} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -90,9 +89,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6449560764903005697} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 100, y: 100, z: 20} m_Center: {x: 0, y: 0, z: 10} --- !u!114 &6449560764903005706 @@ -111,6 +118,7 @@ MonoBehaviour: attachedRectTransform: {fileID: 6449560764903005710} padding: {x: 0, y: 0} forceUpdateEveryFrame: 0 + canToggleCollider: 1 --- !u!114 &6449560764903005709 MonoBehaviour: m_ObjectHideFlags: 0 @@ -174,8 +182,10 @@ MonoBehaviour: RefIds: - rid: 2896949501434265604 type: {class: BubbleChildHoverEvents, ns: MixedReality.Toolkit.Experimental, asm: MixedReality.Toolkit.Core} + data: - rid: 2896949501434265605 type: {class: BubbleChildSelectEvents, ns: MixedReality.Toolkit.Experimental, asm: MixedReality.Toolkit.Core} + data: --- !u!114 &6449560764903005711 MonoBehaviour: m_ObjectHideFlags: 0 @@ -191,13 +201,11 @@ MonoBehaviour: m_InteractionManager: {fileID: 0} m_Colliders: - {fileID: 6449560764903005707} - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 0 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -230,42 +238,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_OnLastHoverExited: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_OnHoverEntered: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnHoverExited: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectEntered: - m_PersistentCalls: - m_Calls: [] - m_OnSelectExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -385,7 +378,6 @@ RectTransform: m_Children: - {fileID: 6449560765461398682} m_Father: {fileID: 6449560764903005710} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -448,11 +440,10 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6449560765081929048} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0.014124214, y: -0.034411807} + m_AnchoredPosition: {x: 0.0019512651, y: 0.038625885} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 1} --- !u!114 &6449560765461398680 diff --git a/org.mixedrealitytoolkit.uxcomponents/HandMenu/HandMenuBase.prefab b/org.mixedrealitytoolkit.uxcomponents/HandMenu/HandMenuBase.prefab index 8245d8808..a1de72caf 100644 --- a/org.mixedrealitytoolkit.uxcomponents/HandMenu/HandMenuBase.prefab +++ b/org.mixedrealitytoolkit.uxcomponents/HandMenu/HandMenuBase.prefab @@ -27,6 +27,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1947121577341454423} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -34,7 +35,6 @@ Transform: m_Children: - {fileID: 7332201463210307094} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!82 &4364620896303573788 AudioSource: @@ -47,6 +47,7 @@ AudioSource: serializedVersion: 4 OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 0} + m_Resource: {fileID: 0} m_PlayOnAwake: 1 m_Volume: 1 m_Pitch: 1 @@ -269,7 +270,6 @@ RectTransform: m_Children: - {fileID: 7083505145275335002} m_Father: {fileID: 1947121577341454504} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -293,7 +293,9 @@ Canvas: m_OverrideSorting: 0 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 m_AdditionalShaderChannelsFlag: 31 + m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 @@ -334,7 +336,6 @@ RectTransform: - {fileID: 9076431640829730957} - {fileID: 4820305362186937808} m_Father: {fileID: 7332201463210307094} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -393,6 +394,13 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] + m_Texture: {fileID: 0} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 radius: 13 thickness: 1 wedges: 8 @@ -416,6 +424,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 7083505145275335002} m_Modifications: - target: {fileID: 7216918420766221479, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -539,6 +548,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &9076431640829730957 stripped RectTransform: @@ -550,6 +562,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 7083505145275335002} m_Modifications: - target: {fileID: 7216918420766221479, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -673,6 +686,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &7002844371585223464 stripped RectTransform: @@ -684,6 +700,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 7083505145275335002} m_Modifications: - target: {fileID: 7216918420766221479, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -807,6 +824,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &5935963046560133883 stripped RectTransform: @@ -818,6 +838,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 7083505145275335002} m_Modifications: - target: {fileID: 7216918420766221479, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -941,6 +962,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &4820305362186937808 stripped RectTransform: diff --git a/org.mixedrealitytoolkit.uxcomponents/InputField/MRTKTMPInputField.prefab b/org.mixedrealitytoolkit.uxcomponents/InputField/MRTKTMPInputField.prefab index d1e18b340..6951e8156 100644 --- a/org.mixedrealitytoolkit.uxcomponents/InputField/MRTKTMPInputField.prefab +++ b/org.mixedrealitytoolkit.uxcomponents/InputField/MRTKTMPInputField.prefab @@ -32,7 +32,6 @@ RectTransform: - {fileID: 832010973} - {fileID: 1810163919} m_Father: {fileID: 1801132718} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -85,7 +84,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 566332952} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -158,20 +156,23 @@ MonoBehaviour: m_VerticalAlignment: 256 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 0 + m_TextWrappingMode: 0 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 1 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -242,7 +243,6 @@ RectTransform: m_Children: - {fileID: 566332952} m_Father: {fileID: 7291631689291610058} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -381,10 +381,13 @@ MonoBehaviour: m_GlobalFontAsset: {fileID: 0} m_OnFocusSelectAll: 1 m_ResetOnDeActivation: 1 + m_KeepTextSelectionVisible: 0 m_RestoreOriginalTextOnEscape: 1 m_isRichTextEditingAllowed: 0 m_LineLimit: 0 + isAlert: 0 m_InputValidator: {fileID: 0} + m_ShouldActivateOnSelect: 1 --- !u!1 &1810163918 GameObject: m_ObjectHideFlags: 0 @@ -416,7 +419,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 566332952} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -489,20 +491,23 @@ MonoBehaviour: m_VerticalAlignment: 256 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 0 + m_TextWrappingMode: 3 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 1 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -525,6 +530,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 3705378105823492738, guid: b85e005d231192249b7077b40a4d4e45, type: 3} @@ -603,10 +609,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: b85e005d231192249b7077b40a4d4e45, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - target: {fileID: 3705378105823492765, guid: b85e005d231192249b7077b40a4d4e45, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -679,11 +681,13 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 8980970493985434242, guid: b85e005d231192249b7077b40a4d4e45, type: 3} - propertyPath: m_RootOrder - value: 4 - objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 3705378105823492765, guid: b85e005d231192249b7077b40a4d4e45, type: 3} + insertIndex: -1 + addedObject: {fileID: 1801132718} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b85e005d231192249b7077b40a4d4e45, type: 3} --- !u!224 &7291631689291610058 stripped RectTransform: diff --git a/org.mixedrealitytoolkit.uxcomponents/InputField/MRTKUGUIInputField.prefab b/org.mixedrealitytoolkit.uxcomponents/InputField/MRTKUGUIInputField.prefab index 040840144..d27ccb93b 100644 --- a/org.mixedrealitytoolkit.uxcomponents/InputField/MRTKUGUIInputField.prefab +++ b/org.mixedrealitytoolkit.uxcomponents/InputField/MRTKUGUIInputField.prefab @@ -31,7 +31,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1258590077} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -114,7 +113,6 @@ RectTransform: - {fileID: 43253008} - {fileID: 1446504176} m_Father: {fileID: 1765799051758416197} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -258,7 +256,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1258590077} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -312,6 +309,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 3705378105823492738, guid: b85e005d231192249b7077b40a4d4e45, type: 3} @@ -390,10 +388,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 3705378105823492765, guid: b85e005d231192249b7077b40a4d4e45, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - target: {fileID: 3705378105823492765, guid: b85e005d231192249b7077b40a4d4e45, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -466,11 +460,13 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 8980970493985434242, guid: b85e005d231192249b7077b40a4d4e45, type: 3} - propertyPath: m_RootOrder - value: 4 - objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 3705378105823492765, guid: b85e005d231192249b7077b40a4d4e45, type: 3} + insertIndex: -1 + addedObject: {fileID: 1258590077} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b85e005d231192249b7077b40a4d4e45, type: 3} --- !u!224 &1765799051758416197 stripped RectTransform: diff --git a/org.mixedrealitytoolkit.uxcomponents/Keyboard/NativeKeyboard/Materials/KeyboardPreviewBackPlate.mat b/org.mixedrealitytoolkit.uxcomponents/Keyboard/NativeKeyboard/Materials/KeyboardPreviewBackPlate.mat index b8f282ea9..efe6826c1 100644 --- a/org.mixedrealitytoolkit.uxcomponents/Keyboard/NativeKeyboard/Materials/KeyboardPreviewBackPlate.mat +++ b/org.mixedrealitytoolkit.uxcomponents/Keyboard/NativeKeyboard/Materials/KeyboardPreviewBackPlate.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: KeyboardPreviewBackPlate m_Shader: {fileID: 4800000, guid: 29b058829dc4dbf449bc59c038dfa631, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _IRIDESCENCE_ENABLE_ m_InvalidKeywords: @@ -31,6 +33,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -157,6 +160,7 @@ Material: - _DetailNormalMapScale: 1 - _DirectionalLight: 0 - _DstBlend: 0 + - _DstBlendAlpha: 1 - _EdgeSmoothingMode: 0 - _EdgeSmoothingValue: 0.0002 - _Edge_Only_: 0 @@ -227,7 +231,9 @@ Material: - _NearLightFade: 0 - _NearPlaneFade: 0 - _NormalMapScale: 1 + - _Occluded_Intensity_: 1 - _OcclusionStrength: 1 + - _Orthographic_Distance_: 400 - _Parallax: 0.02 - _Pinched_: 0 - _Power_: 1 @@ -262,12 +268,14 @@ Material: - _Sharpness_: 0 - _Shininess_: 10 - _Sky_Enabled_: 1 + - _Smooth_Edges_: 0 - _Smoothness: 0.5 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 0 - _Specular_: 0 - _SphericalHarmonics: 0 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Stencil: 0 - _StencilComp: 0 - _StencilComparison: 0 @@ -339,3 +347,4 @@ Material: - _Top_Left_: {r: 1, g: 0.690196, b: 0.976471, a: 1} - _Top_Right_: {r: 0, g: 0.33, b: 0.88, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/org.mixedrealitytoolkit.uxcomponents/Keyboard/NativeKeyboard/Materials/KeyboardPreviewButtonBackPlate.mat b/org.mixedrealitytoolkit.uxcomponents/Keyboard/NativeKeyboard/Materials/KeyboardPreviewButtonBackPlate.mat index d84252f38..f22122318 100644 --- a/org.mixedrealitytoolkit.uxcomponents/Keyboard/NativeKeyboard/Materials/KeyboardPreviewButtonBackPlate.mat +++ b/org.mixedrealitytoolkit.uxcomponents/Keyboard/NativeKeyboard/Materials/KeyboardPreviewButtonBackPlate.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: KeyboardPreviewButtonBackPlate m_Shader: {fileID: 4800000, guid: 5bdea20278144b11916d77503ba1467a, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: - _BORDER_LIGHT_REPLACES_ALBEDO @@ -23,6 +25,7 @@ Material: stringTagMap: RenderType: Opaque disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -196,3 +199,4 @@ Material: - _ProximityLightOuterColorOverride: {r: 0, g: 0, b: 1, a: 1} - _RimColor: {r: 1, g: 1, b: 1, a: 0.497} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/org.mixedrealitytoolkit.uxcomponents/Keyboard/NativeKeyboard/Materials/KeyboardPreviewCaret.mat b/org.mixedrealitytoolkit.uxcomponents/Keyboard/NativeKeyboard/Materials/KeyboardPreviewCaret.mat index c4d31213b..6ddddf988 100644 --- a/org.mixedrealitytoolkit.uxcomponents/Keyboard/NativeKeyboard/Materials/KeyboardPreviewCaret.mat +++ b/org.mixedrealitytoolkit.uxcomponents/Keyboard/NativeKeyboard/Materials/KeyboardPreviewCaret.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: KeyboardPreviewCaret m_Shader: {fileID: 4800000, guid: df5380aa6ab293c4fafbb942ed5da93f, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _ALPHABLEND_TRANS_ON - _USE_WORLD_SCALE @@ -19,8 +21,10 @@ Material: m_DoubleSidedGI: 0 m_CustomRenderQueue: 3000 stringTagMap: + DisableBatching: False RenderType: Fade disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -48,6 +52,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _EmissiveMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _IridescentSpectrumMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -100,6 +108,7 @@ Material: - _DetailNormalMapScale: 1 - _DirectionalLight: 0 - _DstBlend: 10 + - _DstBlendAlpha: 1 - _EdgeSmoothingMode: 0 - _EdgeSmoothingValue: 0.00008 - _EnableChannelMap: 0 @@ -137,6 +146,7 @@ Material: - _Metallic: 0 - _MipmapBias: -2 - _Mode: 3 + - _NPR: 0 - _NearLightFade: 0 - _NearPlaneFade: 0 - _NormalMapScale: 1 @@ -160,6 +170,7 @@ Material: - _SpecularHighlights: 0 - _SphericalHarmonics: 0 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Stencil: 0 - _StencilComp: 0 - _StencilComparison: 0 @@ -173,6 +184,7 @@ Material: - _UseWorldScale: 1 - _VertexColors: 0 - _VertexExtrusion: 0 + - _VertexExtrusionConstantWidth: 0 - _VertexExtrusionSmoothNormals: 0 - _VertexExtrusionValue: 0 - _ZOffsetFactor: 0 @@ -206,3 +218,4 @@ Material: - _RimColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} - _RoundCornersRadius: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/org.mixedrealitytoolkit.uxcomponents/Keyboard/NativeKeyboard/Materials/KeyboardPreviewTextRect.mat b/org.mixedrealitytoolkit.uxcomponents/Keyboard/NativeKeyboard/Materials/KeyboardPreviewTextRect.mat index 47c6a859a..edf4ec94a 100644 --- a/org.mixedrealitytoolkit.uxcomponents/Keyboard/NativeKeyboard/Materials/KeyboardPreviewTextRect.mat +++ b/org.mixedrealitytoolkit.uxcomponents/Keyboard/NativeKeyboard/Materials/KeyboardPreviewTextRect.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: KeyboardPreviewTextRect m_Shader: {fileID: 4800000, guid: df5380aa6ab293c4fafbb942ed5da93f, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _USE_WORLD_SCALE m_InvalidKeywords: @@ -20,6 +22,7 @@ Material: stringTagMap: RenderType: Opaque disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -47,6 +50,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _EmissiveMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _IridescentSpectrumMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -99,6 +106,7 @@ Material: - _DetailNormalMapScale: 1 - _DirectionalLight: 0 - _DstBlend: 0 + - _DstBlendAlpha: 1 - _EdgeSmoothingMode: 0 - _EdgeSmoothingValue: 0.002 - _EnableChannelMap: 0 @@ -136,6 +144,7 @@ Material: - _Metallic: 0 - _MipmapBias: -2 - _Mode: 0 + - _NPR: 0 - _NearLightFade: 0 - _NearPlaneFade: 0 - _NormalMapScale: 1 @@ -159,6 +168,7 @@ Material: - _SpecularHighlights: 0 - _SphericalHarmonics: 0 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Stencil: 0 - _StencilComp: 0 - _StencilComparison: 0 @@ -172,6 +182,7 @@ Material: - _UseWorldScale: 1 - _VertexColors: 0 - _VertexExtrusion: 0 + - _VertexExtrusionConstantWidth: 0 - _VertexExtrusionSmoothNormals: 0 - _VertexExtrusionValue: 0 - _ZOffsetFactor: 0 @@ -190,6 +201,8 @@ Material: - _EnvironmentColorX: {r: 1, g: 0, b: 0, a: 1} - _EnvironmentColorY: {r: 0, g: 1, b: 0, a: 1} - _EnvironmentColorZ: {r: 0, g: 0, b: 1, a: 1} + - _GradientAlpha: {r: 1, g: 1, b: 1, a: 1} + - _GradientAlphaTime: {r: 0, g: 0, b: 0, a: 0} - _GradientColor0: {r: 0.631373, g: 0.631373, b: 0.631373, a: 0} - _GradientColor1: {r: 1, g: 0.690196, b: 0.976471, a: 0.25} - _GradientColor2: {r: 0, g: 0.33, b: 0.88, a: 0.5} @@ -203,3 +216,4 @@ Material: - _RimColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} - _RoundCornersRadius: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/org.mixedrealitytoolkit.uxcomponents/Keyboard/NativeKeyboard/Prefabs/KeyboardPreview.prefab b/org.mixedrealitytoolkit.uxcomponents/Keyboard/NativeKeyboard/Prefabs/KeyboardPreview.prefab index 641d6c16e..f747ccd0f 100644 --- a/org.mixedrealitytoolkit.uxcomponents/Keyboard/NativeKeyboard/Prefabs/KeyboardPreview.prefab +++ b/org.mixedrealitytoolkit.uxcomponents/Keyboard/NativeKeyboard/Prefabs/KeyboardPreview.prefab @@ -33,7 +33,6 @@ RectTransform: - {fileID: 6641627769331613525} - {fileID: 4701989828203236370} m_Father: {fileID: 8159570493184885537} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -94,7 +93,6 @@ RectTransform: m_Children: - {fileID: 1332805473237025734} m_Father: {fileID: 1972180559625030619} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -167,20 +165,23 @@ MonoBehaviour: m_VerticalAlignment: 256 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 0 + m_TextWrappingMode: 0 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -229,7 +230,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8159570493184885537} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -264,6 +264,13 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] + m_Texture: {fileID: 0} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 radius: 12 thickness: 2 wedges: 8 @@ -299,7 +306,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1972180559625030619} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -373,7 +379,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8159570493184885537} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -417,7 +422,6 @@ RectTransform: - {fileID: 8203160154026346605} - {fileID: 7017536481509416456} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -515,7 +519,9 @@ Canvas: m_OverrideSorting: 0 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 m_AdditionalShaderChannelsFlag: 31 + m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 @@ -550,7 +556,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6641627769331613525} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} @@ -600,6 +605,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 8159570493184885537} m_Modifications: - target: {fileID: 2228947736508096533, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -668,8 +674,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: MixedReality.Toolkit.UXComponents.MixedRealityKeyboardPreview, - MixedReality.Toolkit.UXComponents + value: MixedReality.Toolkit.UXComponents.MixedRealityKeyboardPreview, MixedReality.Toolkit.UXComponents objectReference: {fileID: 0} - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Target @@ -685,8 +690,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: MixedReality.Toolkit.UXComponents.MixedRealityKeyboardPreview, - MixedReality.Toolkit.UXComponents + value: MixedReality.Toolkit.UXComponents.MixedRealityKeyboardPreview, MixedReality.Toolkit.UXComponents objectReference: {fileID: 0} - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName @@ -704,10 +708,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 3 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 1 @@ -781,6 +781,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &7017536481509416456 stripped RectTransform: diff --git a/org.mixedrealitytoolkit.uxcomponents/NearMenu/GrabBar.mat b/org.mixedrealitytoolkit.uxcomponents/NearMenu/GrabBar.mat index c3e032056..489f42ce8 100644 --- a/org.mixedrealitytoolkit.uxcomponents/NearMenu/GrabBar.mat +++ b/org.mixedrealitytoolkit.uxcomponents/NearMenu/GrabBar.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: GrabBar m_Shader: {fileID: 4800000, guid: df5380aa6ab293c4fafbb942ed5da93f, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _ADDITIVE_ON - _EDGE_SMOOTHING_AUTOMATIC @@ -24,6 +26,7 @@ Material: stringTagMap: RenderType: Fade disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -51,6 +54,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _EmissiveMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _IridescentSpectrumMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -102,6 +109,7 @@ Material: - _DetailNormalMapScale: 1 - _DirectionalLight: 0 - _DstBlend: 1 + - _DstBlendAlpha: 1 - _EdgeSmoothingMode: 1 - _EdgeSmoothingValue: 0.25 - _EnableChannelMap: 0 @@ -136,6 +144,7 @@ Material: - _Metallic: 0 - _MipmapBias: -2 - _Mode: 4 + - _NPR: 0 - _NearLightFade: 0 - _NearPlaneFade: 0 - _NormalMapScale: 1 @@ -159,6 +168,7 @@ Material: - _SpecularHighlights: 1 - _SphericalHarmonics: 0 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Stencil: 0 - _StencilComp: 0 - _StencilComparison: 0 @@ -172,6 +182,7 @@ Material: - _UseWorldScale: 0 - _VertexColors: 1 - _VertexExtrusion: 0 + - _VertexExtrusionConstantWidth: 0 - _VertexExtrusionSmoothNormals: 0 - _VertexExtrusionValue: 0 - _ZOffsetFactor: 0 @@ -190,6 +201,8 @@ Material: - _EnvironmentColorX: {r: 1, g: 0, b: 0, a: 1} - _EnvironmentColorY: {r: 0, g: 1, b: 0, a: 1} - _EnvironmentColorZ: {r: 0, g: 0, b: 1, a: 1} + - _GradientAlpha: {r: 1, g: 1, b: 1, a: 1} + - _GradientAlphaTime: {r: 0, g: 0, b: 0, a: 0} - _GradientColor0: {r: 0.631373, g: 0.631373, b: 0.631373, a: 0} - _GradientColor1: {r: 1, g: 0.690196, b: 0.976471, a: 0.25} - _GradientColor2: {r: 0, g: 0.33, b: 0.88, a: 0.5} @@ -203,3 +216,4 @@ Material: - _RimColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} - _RoundCornersRadius: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/org.mixedrealitytoolkit.uxcomponents/NearMenu/NearMenuBase.prefab b/org.mixedrealitytoolkit.uxcomponents/NearMenu/NearMenuBase.prefab index 7f6d6a0a7..a2a56769a 100644 --- a/org.mixedrealitytoolkit.uxcomponents/NearMenu/NearMenuBase.prefab +++ b/org.mixedrealitytoolkit.uxcomponents/NearMenu/NearMenuBase.prefab @@ -39,7 +39,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8110664055982005406} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} @@ -62,9 +61,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 964753268971573295} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 102, y: 13, z: 10} m_Center: {x: 0, y: 0, z: 0} --- !u!114 &5746536157198180628 @@ -83,6 +90,7 @@ MonoBehaviour: attachedRectTransform: {fileID: 5453643585072226201} padding: {x: 5, y: 5} forceUpdateEveryFrame: 0 + canToggleCollider: 1 --- !u!114 &7079387741216611205 MonoBehaviour: m_ObjectHideFlags: 0 @@ -196,13 +204,11 @@ MonoBehaviour: m_EditorClassIdentifier: m_InteractionManager: {fileID: 0} m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 0 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -283,42 +289,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_Deactivated: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnLastHoverExited: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectEntered: - m_PersistentCalls: - m_Calls: [] - m_OnSelectExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -411,6 +402,9 @@ MonoBehaviour: k__BackingField: 1 allowSelectByVoice: 1 speechRecognitionKeyword: select + k__BackingField: + m_PersistentCalls: + m_Calls: [] k__BackingField: 1 k__BackingField: 0 k__BackingField: @@ -433,6 +427,7 @@ MonoBehaviour: hostTransform: {fileID: 791738712976538213} allowedManipulations: 7 allowedInteractionTypes: -2147483641 + rigidbodyMovementType: 0 applyTorque: 1 springForceSoftness: 0.1 springTorqueSoftness: 0.1 @@ -455,8 +450,7 @@ MonoBehaviour: moveLogicType: reference: MixedReality.Toolkit.SpatialManipulation.MoveLogic, MixedReality.Toolkit.SpatialManipulation rotateLogicType: - reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, - MixedReality.Toolkit.SpatialManipulation + reference: MixedReality.Toolkit.SpatialManipulation.RotateLogic, MixedReality.Toolkit.SpatialManipulation scaleLogicType: reference: MixedReality.Toolkit.SpatialManipulation.ScaleLogic, MixedReality.Toolkit.SpatialManipulation --- !u!114 &5713527417212831176 @@ -522,6 +516,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2335485236933921044} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -529,7 +524,6 @@ Transform: m_Children: - {fileID: 3450833885017814221} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!82 &576144249672297055 AudioSource: @@ -542,6 +536,7 @@ AudioSource: serializedVersion: 4 OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 0} + m_Resource: {fileID: 0} m_PlayOnAwake: 1 m_Volume: 1 m_Pitch: 1 @@ -678,6 +673,7 @@ MonoBehaviour: useFixedVerticalPosition: 1 fixedVerticalPosition: -0.35 orientToReferenceDirection: 0 + initializeToTargetForward: 0 --- !u!1 &3290671103035759102 GameObject: m_ObjectHideFlags: 0 @@ -715,11 +711,10 @@ RectTransform: - {fileID: 223372579958337542} - {fileID: 8530624725811928831} m_Father: {fileID: 3450833885017814221} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 52, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 52, y: -20} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &9005125325574834608 @@ -788,6 +783,13 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] + m_Texture: {fileID: 0} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 radius: 13 thickness: 1 wedges: 8 @@ -826,7 +828,6 @@ RectTransform: - {fileID: 8110664055982005406} - {fileID: 992451720734287869} m_Father: {fileID: 791738712976538213} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -850,7 +851,9 @@ Canvas: m_OverrideSorting: 0 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 m_AdditionalShaderChannelsFlag: 31 + m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 @@ -927,7 +930,6 @@ RectTransform: m_Children: - {fileID: 6473538699528776753} m_Father: {fileID: 3450833885017814221} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -962,6 +964,13 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] + m_Texture: {fileID: 0} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 radius: 13 thickness: 2 wedges: 8 @@ -997,6 +1006,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 8110664055982005406} m_Modifications: - target: {fileID: 7216918420766221479, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -1043,10 +1053,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 3 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -1120,6 +1126,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &8530624725811928831 stripped RectTransform: @@ -1131,6 +1140,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 992451720734287869} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -1237,38 +1247,6 @@ PrefabInstance: propertyPath: isToggled.onEntered.m_PersistentCalls.m_Calls.Array.size value: 1 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 6 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[1].m_Mode - value: 6 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 7750909895656655776, guid: 6e4f04248152fd94983920cd0f82fa0f, type: 3} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[1].m_Target - value: - objectReference: {fileID: 7750909895656655776, guid: 6e4f04248152fd94983920cd0f82fa0f, type: 3} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[1].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: SetActive - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName - value: SetActive - objectReference: {fileID: 0} - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: isToggled.onExited.m_PersistentCalls.m_Calls.Array.data[0].m_Mode value: 6 @@ -1309,14 +1287,6 @@ PrefabInstance: propertyPath: k__BackingField.onEntered.m_PersistentCalls.m_Calls.Array.size value: 1 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: UnityEngine.GameObject, UnityEngine - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[1].m_TargetAssemblyTypeName - value: UnityEngine.GameObject, UnityEngine - objectReference: {fileID: 0} - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: k__BackingField.onExited.m_PersistentCalls.m_Calls.Array.data[0].m_Mode value: 6 @@ -1361,14 +1331,6 @@ PrefabInstance: propertyPath: k__BackingField.onEntered.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName value: set_enabled objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: onClicked.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: k__BackingField.onExited.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName value: UnityEngine.Behaviour, UnityEngine @@ -1405,10 +1367,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -1482,6 +1440,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!1 &6473538699528776750 stripped GameObject: @@ -1498,6 +1459,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 8110664055982005406} m_Modifications: - target: {fileID: 7216918420766221479, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -1544,10 +1506,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -1621,6 +1579,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &6492567553477273859 stripped RectTransform: @@ -1632,6 +1593,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 8110664055982005406} m_Modifications: - target: {fileID: 7216918420766221479, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -1678,10 +1640,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -1755,6 +1713,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &223372579958337542 stripped RectTransform: diff --git a/org.mixedrealitytoolkit.uxcomponents/SeeItSayItLabel/ActiveFocusCanvasSeeItSayIt.anim b/org.mixedrealitytoolkit.uxcomponents/SeeItSayItLabel/ActiveFocusCanvasSeeItSayIt.anim index 9ba8b4e81..eecc09bf8 100644 --- a/org.mixedrealitytoolkit.uxcomponents/SeeItSayItLabel/ActiveFocusCanvasSeeItSayIt.anim +++ b/org.mixedrealitytoolkit.uxcomponents/SeeItSayItLabel/ActiveFocusCanvasSeeItSayIt.anim @@ -7,7 +7,7 @@ AnimationClip: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: ActiveFocusCanvasSeeItSayIt - serializedVersion: 6 + serializedVersion: 7 m_Legacy: 0 m_Compressed: 0 m_UseHighQualityCurve: 1 @@ -17,7 +17,8 @@ AnimationClip: m_PositionCurves: [] m_ScaleCurves: [] m_FloatCurves: - - curve: + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -45,6 +46,7 @@ AnimationClip: path: CanvasRoot classID: 1 script: {fileID: 0} + flags: 16 m_PPtrCurves: [] m_SampleRate: 60 m_WrapMode: 0 @@ -60,6 +62,8 @@ AnimationClip: typeID: 1 customType: 0 isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 pptrCurveMapping: [] m_AnimationClipSettings: serializedVersion: 2 @@ -82,7 +86,8 @@ AnimationClip: m_HeightFromFeet: 0 m_Mirror: 0 m_EditorCurves: - - curve: + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -110,6 +115,7 @@ AnimationClip: path: CanvasRoot classID: 1 script: {fileID: 0} + flags: 16 m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 diff --git a/org.mixedrealitytoolkit.uxcomponents/SeeItSayItLabel/SeeItSayItLabel-Canvas.prefab b/org.mixedrealitytoolkit.uxcomponents/SeeItSayItLabel/SeeItSayItLabel-Canvas.prefab index 28f3591bb..a3ea5643c 100644 --- a/org.mixedrealitytoolkit.uxcomponents/SeeItSayItLabel/SeeItSayItLabel-Canvas.prefab +++ b/org.mixedrealitytoolkit.uxcomponents/SeeItSayItLabel/SeeItSayItLabel-Canvas.prefab @@ -34,7 +34,6 @@ RectTransform: m_Children: - {fileID: 8947839890988736513} m_Father: {fileID: 2648010737493403592} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -69,6 +68,13 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] + m_Texture: {fileID: 0} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 radius: 5 thickness: 0.6 wedges: 8 @@ -123,8 +129,6 @@ GameObject: m_Component: - component: {fileID: 2648010737493403592} - component: {fileID: 613211636435409487} - - component: {fileID: 6468409002762060768} - - component: {fileID: 1984157648487324098} m_Layer: 5 m_Name: CanvasRoot m_TagString: Untagged @@ -146,7 +150,6 @@ RectTransform: m_Children: - {fileID: 6129546144166981335} m_Father: {fileID: 8174497233233282343} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -170,50 +173,12 @@ Canvas: m_OverrideSorting: 0 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 m_AdditionalShaderChannelsFlag: 31 + m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 ---- !u!114 &6468409002762060768 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1400135068623992445} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} - m_Name: - m_EditorClassIdentifier: - m_UiScaleMode: 0 - m_ReferencePixelsPerUnit: 100 - m_ScaleFactor: 1 - m_ReferenceResolution: {x: 800, y: 600} - m_ScreenMatchMode: 0 - m_MatchWidthOrHeight: 0 - m_PhysicalUnit: 3 - m_FallbackScreenDPI: 96 - m_DefaultSpriteDPI: 96 - m_DynamicPixelsPerUnit: 1 - m_PresetInfoIsWorld: 1 ---- !u!114 &1984157648487324098 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1400135068623992445} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreReversedGraphics: 1 - m_BlockingObjects: 0 - m_BlockingMask: - serializedVersion: 2 - m_Bits: 4294967295 --- !u!1 &2542652557800958703 GameObject: m_ObjectHideFlags: 0 @@ -225,6 +190,7 @@ GameObject: - component: {fileID: 8174497233233282343} - component: {fileID: 7378201789336955507} - component: {fileID: 4142207705701966788} + - component: {fileID: -6408582823915813169} m_Layer: 0 m_Name: SeeItSayItLabel-Canvas m_TagString: Untagged @@ -246,7 +212,6 @@ RectTransform: m_Children: - {fileID: 2648010737493403592} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -255,7 +220,7 @@ RectTransform: m_Pivot: {x: 0.5, y: 0.5} --- !u!95 &7378201789336955507 Animator: - serializedVersion: 5 + serializedVersion: 7 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -269,6 +234,7 @@ Animator: m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 m_StabilizeFeet: 0 + m_AnimatePhysics: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 @@ -323,6 +289,41 @@ MonoBehaviour: playbackMode: 0 weightMode: 0 transitionDuration: 0 +--- !u!114 &-6408582823915813169 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2542652557800958703} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 699100ca886480c4a94ced56b1ae0e94, type: 3} + m_Name: + m_EditorClassIdentifier: + themeDataSource: {fileID: 11400000, guid: 57993c46ea42acf4ca3067542443bc45, type: 2} + binders: + - rid: 7617100032241303552 + - rid: 7617100032241303553 + - rid: 7617100032241303554 + references: + version: 2 + RefIds: + - rid: 7617100032241303552 + type: {class: GraphicMaterialBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 1094569825582854354} + k__BackingField: Backplate Material + - rid: 7617100032241303553 + type: {class: GraphicColorBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 2762179398116406116} + k__BackingField: On Surface Color + - rid: 7617100032241303554 + type: {class: TMP_TextFontAssetBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 2762179398116406116} + k__BackingField: Text Font --- !u!1 &8925799636652996939 GameObject: m_ObjectHideFlags: 0 @@ -355,7 +356,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6129546144166981335} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -428,20 +428,23 @@ MonoBehaviour: m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 00000000 m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 diff --git a/org.mixedrealitytoolkit.uxcomponents/Slider/CanvasSlider.prefab b/org.mixedrealitytoolkit.uxcomponents/Slider/CanvasSlider.prefab index 205478794..4bc37f3b3 100644 --- a/org.mixedrealitytoolkit.uxcomponents/Slider/CanvasSlider.prefab +++ b/org.mixedrealitytoolkit.uxcomponents/Slider/CanvasSlider.prefab @@ -32,7 +32,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5677198132670553562} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -67,6 +66,13 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] + m_Texture: {fileID: 0} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 radius: 3 thickness: 2 wedges: 8 @@ -161,7 +167,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6072842358248388887} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0.5, y: 1} @@ -247,7 +252,6 @@ RectTransform: m_Children: - {fileID: 735343268046678716} m_Father: {fileID: 5677198132984834578} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -262,9 +266,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5677198132670553563} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 10, y: 10, z: 8} m_Center: {x: 0, y: 0, z: 0} --- !u!114 &5273090305525414288 @@ -283,6 +295,7 @@ MonoBehaviour: attachedRectTransform: {fileID: 5677198132670553562} padding: {x: 2, y: 2} forceUpdateEveryFrame: 0 + canToggleCollider: 1 --- !u!1 &5677198132965683084 GameObject: m_ObjectHideFlags: 0 @@ -312,7 +325,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5677198132984834578} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} @@ -359,7 +371,6 @@ RectTransform: - {fileID: 5677198132670553562} - {fileID: 6072842358248388887} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -382,13 +393,11 @@ MonoBehaviour: m_Colliders: - {fileID: 1197545758422362387} - {fileID: 4270209841583229004} - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 0 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -421,42 +430,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_OnHoverEntered: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_OnHoverExited: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectEntered: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -548,6 +542,9 @@ MonoBehaviour: k__BackingField: 1 allowSelectByVoice: 1 speechRecognitionKeyword: select + k__BackingField: + m_PersistentCalls: + m_Calls: [] k__BackingField: 1 k__BackingField: 0 k__BackingField: @@ -622,7 +619,7 @@ MonoBehaviour: audioSource: {fileID: 7149116039216951488} --- !u!95 &1304092318350955345 Animator: - serializedVersion: 5 + serializedVersion: 7 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -636,6 +633,7 @@ Animator: m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 m_StabilizeFeet: 0 + m_AnimatePhysics: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 @@ -754,6 +752,7 @@ AudioSource: serializedVersion: 4 OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 0} + m_Resource: {fileID: 0} m_PlayOnAwake: 1 m_Volume: 1 m_Pitch: 1 @@ -868,7 +867,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5677198132984834578} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} @@ -910,7 +908,6 @@ RectTransform: m_Children: - {fileID: 5677198131096132917} m_Father: {fileID: 5677198132984834578} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} @@ -972,9 +969,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8139673189668472571} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 100, y: 14, z: 6} m_Center: {x: 0, y: 0, z: 0} --- !u!114 &2205050521121921003 @@ -993,3 +998,4 @@ MonoBehaviour: attachedRectTransform: {fileID: 6072842358248388887} padding: {x: 0, y: 6} forceUpdateEveryFrame: 0 + canToggleCollider: 1 diff --git a/org.mixedrealitytoolkit.uxcomponents/Slider/Materials/HandleBevel.mat b/org.mixedrealitytoolkit.uxcomponents/Slider/Materials/HandleBevel.mat index 925995555..fda6c9088 100644 --- a/org.mixedrealitytoolkit.uxcomponents/Slider/Materials/HandleBevel.mat +++ b/org.mixedrealitytoolkit.uxcomponents/Slider/Materials/HandleBevel.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: HandleBevel m_Shader: {fileID: 4800000, guid: 29b058829dc4dbf449bc59c038dfa631, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: - _DECAL_FRONT_ONLY__ON @@ -20,6 +22,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -57,6 +60,7 @@ Material: - _Decal_Enable_: 0 - _Decal_Front_Only_: 1 - _DstBlend: 0 + - _DstBlendAlpha: 1 - _Edge_Only_: 0 - _Edge_Power_: 0 - _Edge_Reflect_: 1 @@ -80,6 +84,8 @@ Material: - _Line_Gradient_Blend_: 0 - _Line_Width_: 1 - _Mapped_Environment_Enabled_: 0 + - _Occluded_Intensity_: 1 + - _Orthographic_Distance_: 400 - _Power_: 1 - _Rate_: 0 - _Reflected_: 1 @@ -87,8 +93,10 @@ Material: - _Sharpness_: 0 - _Shininess_: 10 - _Sky_Enabled_: 1 + - _Smooth_Edges_: 0 - _Specular_: 0 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _StencilComparison: 0 - _StencilOperation: 0 - _StencilReference: 0 @@ -119,3 +127,4 @@ Material: - _Top_Left_: {r: 0.827044, g: 0.83262324, b: 1, a: 1} - _Top_Right_: {r: 0.3647059, g: 0.35686275, b: 0.83137256, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/org.mixedrealitytoolkit.uxcomponents/Slider/Materials/SliderBackground.mat b/org.mixedrealitytoolkit.uxcomponents/Slider/Materials/SliderBackground.mat index aaa75de2e..28cecfaed 100644 --- a/org.mixedrealitytoolkit.uxcomponents/Slider/Materials/SliderBackground.mat +++ b/org.mixedrealitytoolkit.uxcomponents/Slider/Materials/SliderBackground.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: SliderBackground m_Shader: {fileID: 4800000, guid: df5380aa6ab293c4fafbb942ed5da93f, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _ADDITIVE_ON - _EDGE_SMOOTHING_AUTOMATIC @@ -22,8 +24,10 @@ Material: m_DoubleSidedGI: 0 m_CustomRenderQueue: 3000 stringTagMap: + DisableBatching: true RenderType: Fade disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -55,6 +59,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _EmissiveMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _Indirect_Environment_: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -120,6 +128,7 @@ Material: - _DetailNormalMapScale: 1 - _DirectionalLight: 0 - _DstBlend: 1 + - _DstBlendAlpha: 1 - _EdgeSmoothingMode: 1 - _EdgeSmoothingValue: 0.3 - _Edge_Reflect_: 1 @@ -162,6 +171,7 @@ Material: - _Metallic: 0 - _MipmapBias: -2 - _Mode: 4 + - _NPR: 0 - _NearLightFade: 0 - _NearPlaneFade: 0 - _NormalMapScale: 1 @@ -191,6 +201,7 @@ Material: - _Specular_: 0 - _SphericalHarmonics: 0 - _SrcBlend: 1 + - _SrcBlendAlpha: 1 - _Stencil: 0 - _StencilComp: 0 - _StencilComparison: 0 @@ -208,6 +219,7 @@ Material: - _UseWorldScale: 0 - _VertexColors: 0 - _VertexExtrusion: 0 + - _VertexExtrusionConstantWidth: 0 - _VertexExtrusionSmoothNormals: 0 - _VertexExtrusionValue: 0 - _ZOffsetFactor: 0 @@ -228,6 +240,8 @@ Material: - _EnvironmentColorX: {r: 1, g: 0, b: 0, a: 1} - _EnvironmentColorY: {r: 0, g: 1, b: 0, a: 1} - _EnvironmentColorZ: {r: 0, g: 0, b: 1, a: 1} + - _GradientAlpha: {r: 1, g: 1, b: 1, a: 1} + - _GradientAlphaTime: {r: 0, g: 0, b: 0, a: 0} - _GradientColor0: {r: 0.631373, g: 0.631373, b: 0.631373, a: 0} - _GradientColor1: {r: 1, g: 0.690196, b: 0.976471, a: 0.25} - _GradientColor2: {r: 0, g: 0.33, b: 0.88, a: 0.5} @@ -244,3 +258,4 @@ Material: - _RoundCornersRadius: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} - _Sky_Color_: {r: 0.866667, g: 0.917647, b: 1, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/org.mixedrealitytoolkit.uxcomponents/Slider/Materials/SliderFill.mat b/org.mixedrealitytoolkit.uxcomponents/Slider/Materials/SliderFill.mat index 6aead3c24..cc599c0f2 100644 --- a/org.mixedrealitytoolkit.uxcomponents/Slider/Materials/SliderFill.mat +++ b/org.mixedrealitytoolkit.uxcomponents/Slider/Materials/SliderFill.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: SliderFill m_Shader: {fileID: 4800000, guid: df5380aa6ab293c4fafbb942ed5da93f, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _ALPHABLEND_ON - _EDGE_SMOOTHING_AUTOMATIC @@ -25,6 +27,7 @@ Material: stringTagMap: RenderType: Fade disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -56,6 +59,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _EmissiveMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _Indirect_Environment_: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -121,6 +128,7 @@ Material: - _DetailNormalMapScale: 1 - _DirectionalLight: 0 - _DstBlend: 10 + - _DstBlendAlpha: 1 - _EdgeSmoothingMode: 1 - _EdgeSmoothingValue: 0.3 - _Edge_Reflect_: 1 @@ -163,6 +171,7 @@ Material: - _Metallic: 0 - _MipmapBias: -2 - _Mode: 2 + - _NPR: 0 - _NearLightFade: 0 - _NearPlaneFade: 0 - _NormalMapScale: 1 @@ -192,6 +201,7 @@ Material: - _Specular_: 0 - _SphericalHarmonics: 0 - _SrcBlend: 5 + - _SrcBlendAlpha: 1 - _Stencil: 0 - _StencilComp: 0 - _StencilComparison: 0 @@ -209,6 +219,7 @@ Material: - _UseWorldScale: 0 - _VertexColors: 0 - _VertexExtrusion: 0 + - _VertexExtrusionConstantWidth: 0 - _VertexExtrusionSmoothNormals: 0 - _VertexExtrusionValue: 0 - _ZOffsetFactor: 0 @@ -229,6 +240,8 @@ Material: - _EnvironmentColorX: {r: 1, g: 0, b: 0, a: 1} - _EnvironmentColorY: {r: 0, g: 1, b: 0, a: 1} - _EnvironmentColorZ: {r: 0, g: 0, b: 1, a: 1} + - _GradientAlpha: {r: 1, g: 1, b: 1, a: 1} + - _GradientAlphaTime: {r: 0, g: 0, b: 0, a: 0} - _GradientColor0: {r: 1, g: 1, b: 1, a: 0.0531} - _GradientColor1: {r: 0.7830189, g: 0.7830189, b: 0.7830189, a: 1} - _GradientColor2: {r: 0.7830189, g: 0.7830189, b: 0.7830189, a: 1} @@ -245,3 +258,4 @@ Material: - _RoundCornersRadius: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} - _Sky_Color_: {r: 0.866667, g: 0.917647, b: 1, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/org.mixedrealitytoolkit.uxcomponents/Slider/SliderHover.anim b/org.mixedrealitytoolkit.uxcomponents/Slider/SliderHover.anim index c7f1c8ce0..f1c483e21 100644 --- a/org.mixedrealitytoolkit.uxcomponents/Slider/SliderHover.anim +++ b/org.mixedrealitytoolkit.uxcomponents/Slider/SliderHover.anim @@ -7,7 +7,7 @@ AnimationClip: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: SliderHover - serializedVersion: 6 + serializedVersion: 7 m_Legacy: 0 m_Compressed: 0 m_UseHighQualityCurve: 1 @@ -17,7 +17,8 @@ AnimationClip: m_PositionCurves: [] m_ScaleCurves: [] m_FloatCurves: - - curve: + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -45,7 +46,9 @@ AnimationClip: path: Handle classID: 224 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -73,7 +76,9 @@ AnimationClip: path: Handle classID: 224 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -101,6 +106,7 @@ AnimationClip: path: Handle/Thumb classID: 114 script: {fileID: 11500000, guid: e4220fa33d0e48745b2cb5c52731e75e, type: 3} + flags: 16 m_PPtrCurves: [] m_SampleRate: 60 m_WrapMode: 0 @@ -116,6 +122,8 @@ AnimationClip: typeID: 224 customType: 28 isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 - serializedVersion: 2 path: 2519475695 attribute: 38095219 @@ -123,6 +131,8 @@ AnimationClip: typeID: 224 customType: 28 isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 - serializedVersion: 2 path: 2829435493 attribute: 998010458 @@ -130,6 +140,8 @@ AnimationClip: typeID: 114 customType: 0 isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 pptrCurveMapping: [] m_AnimationClipSettings: serializedVersion: 2 @@ -152,7 +164,8 @@ AnimationClip: m_HeightFromFeet: 0 m_Mirror: 0 m_EditorCurves: - - curve: + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -180,7 +193,9 @@ AnimationClip: path: Handle classID: 224 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -208,7 +223,9 @@ AnimationClip: path: Handle classID: 224 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -236,6 +253,7 @@ AnimationClip: path: Handle/Thumb classID: 114 script: {fileID: 11500000, guid: e4220fa33d0e48745b2cb5c52731e75e, type: 3} + flags: 16 m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 diff --git a/org.mixedrealitytoolkit.uxcomponents/Slider/SliderSelect.anim b/org.mixedrealitytoolkit.uxcomponents/Slider/SliderSelect.anim index d85837ec2..e4d7d2e34 100644 --- a/org.mixedrealitytoolkit.uxcomponents/Slider/SliderSelect.anim +++ b/org.mixedrealitytoolkit.uxcomponents/Slider/SliderSelect.anim @@ -7,7 +7,7 @@ AnimationClip: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: SliderSelect - serializedVersion: 6 + serializedVersion: 7 m_Legacy: 0 m_Compressed: 0 m_UseHighQualityCurve: 1 @@ -17,7 +17,8 @@ AnimationClip: m_PositionCurves: [] m_ScaleCurves: [] m_FloatCurves: - - curve: + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -45,6 +46,7 @@ AnimationClip: path: Handle/Thumb classID: 114 script: {fileID: 11500000, guid: c28c4d67c20be674e8eb96316b321fc1, type: 3} + flags: 16 m_PPtrCurves: [] m_SampleRate: 60 m_WrapMode: 0 @@ -60,6 +62,8 @@ AnimationClip: typeID: 114 customType: 0 isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 pptrCurveMapping: [] m_AnimationClipSettings: serializedVersion: 2 @@ -82,7 +86,8 @@ AnimationClip: m_HeightFromFeet: 0 m_Mirror: 0 m_EditorCurves: - - curve: + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -110,6 +115,7 @@ AnimationClip: path: Handle/Thumb classID: 114 script: {fileID: 11500000, guid: c28c4d67c20be674e8eb96316b321fc1, type: 3} + flags: 16 m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 diff --git a/org.mixedrealitytoolkit.uxcomponents/Tests/Editor/AssemblyInfo.cs b/org.mixedrealitytoolkit.uxcomponents/Tests/Editor/AssemblyInfo.cs index f0103de2c..d313068ce 100644 --- a/org.mixedrealitytoolkit.uxcomponents/Tests/Editor/AssemblyInfo.cs +++ b/org.mixedrealitytoolkit.uxcomponents/Tests/Editor/AssemblyInfo.cs @@ -9,4 +9,4 @@ // The AssemblyVersion attribute is checked-in and is recommended not to be changed often. // https://docs.microsoft.com/troubleshoot/visualstudio/general/assembly-version-assembly-file-version // AssemblyFileVersion and AssemblyInformationalVersion are added by pack-upm.ps1 to match the current MRTK build version. -[assembly: AssemblyVersion("3.0.0.0")] +[assembly: AssemblyVersion("4.0.0.0")] diff --git a/org.mixedrealitytoolkit.uxcomponents/Tests/Runtime/AssemblyInfo.cs b/org.mixedrealitytoolkit.uxcomponents/Tests/Runtime/AssemblyInfo.cs index cf1f99b42..3712e2cfb 100644 --- a/org.mixedrealitytoolkit.uxcomponents/Tests/Runtime/AssemblyInfo.cs +++ b/org.mixedrealitytoolkit.uxcomponents/Tests/Runtime/AssemblyInfo.cs @@ -9,4 +9,4 @@ // The AssemblyVersion attribute is checked-in and is recommended not to be changed often. // https://docs.microsoft.com/troubleshoot/visualstudio/general/assembly-version-assembly-file-version // AssemblyFileVersion and AssemblyInformationalVersion are added by pack-upm.ps1 to match the current MRTK build version. -[assembly: AssemblyVersion("3.0.0.0")] +[assembly: AssemblyVersion("4.0.0.0")] diff --git a/org.mixedrealitytoolkit.uxcomponents/Tests/Runtime/CanvasDialogTests.cs b/org.mixedrealitytoolkit.uxcomponents/Tests/Runtime/CanvasDialogTests.cs index f39b75e89..68c4cd816 100644 --- a/org.mixedrealitytoolkit.uxcomponents/Tests/Runtime/CanvasDialogTests.cs +++ b/org.mixedrealitytoolkit.uxcomponents/Tests/Runtime/CanvasDialogTests.cs @@ -6,14 +6,14 @@ using System.Collections; using System.Threading.Tasks; -using MixedReality.Toolkit.Core.Tests; using MixedReality.Toolkit.Input.Tests; using NUnit.Framework; using TMPro; using UnityEditor; using UnityEngine; using UnityEngine.TestTools; -using UnityEngine.XR.Interaction.Toolkit; +using UnityEngine.XR.Interaction.Toolkit.Interactables; +using UnityEngine.XR.Interaction.Toolkit.Interactors; namespace MixedReality.Toolkit.UX.Runtime.Tests { @@ -236,7 +236,7 @@ public IEnumerator TestPoolingPolitely() } // We have to query by the impl here. - object[] dialogs = FindObjectUtility.FindObjectsByType(typeof(Dialog), true); + Dialog[] dialogs = Object.FindObjectsByType(FindObjectsInactive.Include, FindObjectsSortMode.InstanceID); Assert.AreEqual(1, dialogs.Length, "There should be only one pooled dialog in the scene."); } @@ -262,7 +262,7 @@ public IEnumerator TestPoolingRudely() } // We have to query by the impl here. - object[] dialogs = FindObjectUtility.FindObjectsByType(typeof(Dialog), true); + Dialog[] dialogs = Object.FindObjectsByType(FindObjectsInactive.Include, FindObjectsSortMode.InstanceID); Assert.AreEqual(5, dialogs.Length, "There should have been 5 total dialogs used."); } @@ -363,4 +363,4 @@ private async Task WaitAsyncFrames(int frames) } } } -#pragma warning restore CS1591 \ No newline at end of file +#pragma warning restore CS1591 diff --git a/org.mixedrealitytoolkit.uxcomponents/Tests/Runtime/Prefabs/HortizontalScrollingTest.prefab b/org.mixedrealitytoolkit.uxcomponents/Tests/Runtime/Prefabs/HortizontalScrollingTest.prefab index c5a710fe2..f1f0601f8 100644 --- a/org.mixedrealitytoolkit.uxcomponents/Tests/Runtime/Prefabs/HortizontalScrollingTest.prefab +++ b/org.mixedrealitytoolkit.uxcomponents/Tests/Runtime/Prefabs/HortizontalScrollingTest.prefab @@ -25,6 +25,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8135927676198852370} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: -0.139, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -32,7 +33,6 @@ Transform: m_Children: - {fileID: 8135927677500322039} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!198 &8135927676198852373 ParticleSystem: @@ -252,6 +252,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -281,6 +282,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 startSize: @@ -602,6 +604,7 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 randomizeRotationDirection: 0 + gravitySource: 0 maxNumParticles: 1000 customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 @@ -1389,6 +1392,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -1418,6 +1422,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 UVModule: @@ -3638,6 +3643,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -3667,6 +3673,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 range: {x: 0, y: 1} @@ -4044,6 +4051,7 @@ ParticleSystem: m_RotationOrder: 4 minVertexDistance: 0.2 textureMode: 0 + textureScale: {x: 1, y: 1} ribbonCount: 1 shadowBias: 0.5 worldSpace: 0 @@ -4086,6 +4094,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -4115,6 +4124,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 widthOverTrail: @@ -4202,6 +4212,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -4231,6 +4242,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 CustomDataModule: @@ -4269,6 +4281,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -4298,6 +4311,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 colorLabel0: Color @@ -4551,6 +4565,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -4580,6 +4595,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 colorLabel1: Color @@ -4817,6 +4833,9 @@ ParticleSystemRenderer: m_ReflectionProbeUsage: 0 m_RayTracingMode: 0 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4855,13 +4874,15 @@ ParticleSystemRenderer: m_RenderAlignment: 0 m_Pivot: {x: 0, y: 0, z: 0} m_Flip: {x: 0, y: 0, z: 0} - m_UseCustomVertexStreams: 0 m_EnableGPUInstancing: 1 m_ApplyActiveColorSpace: 1 m_AllowRoll: 1 m_FreeformStretching: 0 m_RotateWithStretchDirection: 1 + m_UseCustomVertexStreams: 0 m_VertexStreams: 00010304 + m_UseCustomTrailVertexStreams: 0 + m_TrailVertexStreams: 00010304 m_Mesh: {fileID: 0} m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} @@ -4907,7 +4928,6 @@ RectTransform: m_Children: - {fileID: 8135927677813488293} m_Father: {fileID: 8135927677780495537} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -4960,9 +4980,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8135927676978638390} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 117.32, y: 38, z: 25.94947} m_Center: {x: 0, y: 0, z: 4.547837} --- !u!114 &8135927676978638394 @@ -4981,6 +5009,7 @@ MonoBehaviour: attachedRectTransform: {fileID: 8135927676978638391} padding: {x: 0, y: 0} forceUpdateEveryFrame: 0 + canToggleCollider: 1 --- !u!114 &8135927676978638393 MonoBehaviour: m_ObjectHideFlags: 0 @@ -5001,8 +5030,10 @@ MonoBehaviour: RefIds: - rid: 5356761795612114952 type: {class: BubbleChildHoverEvents, ns: MixedReality.Toolkit.Experimental, asm: MixedReality.Toolkit.Core} + data: - rid: 5356761795612114953 type: {class: BubbleChildSelectEvents, ns: MixedReality.Toolkit.Experimental, asm: MixedReality.Toolkit.Core} + data: --- !u!114 &8135927676978638392 MonoBehaviour: m_ObjectHideFlags: 0 @@ -5018,13 +5049,11 @@ MonoBehaviour: m_InteractionManager: {fileID: 0} m_Colliders: - {fileID: 8135927676978638395} - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 0 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -5057,42 +5086,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnHoverExited: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectEntered: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectExited: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectCanceled: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -5212,7 +5226,6 @@ RectTransform: m_Children: - {fileID: 8135927677780495537} m_Father: {fileID: 8135927676198852371} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -5236,7 +5249,9 @@ Canvas: m_OverrideSorting: 0 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 m_AdditionalShaderChannelsFlag: 31 + m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 @@ -5346,7 +5361,6 @@ RectTransform: - {fileID: 348831639980139006} - {fileID: 348831639318528328} m_Father: {fileID: 8135927677813488293} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1} @@ -5438,7 +5452,6 @@ RectTransform: m_Children: - {fileID: 8135927676978638391} m_Father: {fileID: 8135927677500322039} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -5473,6 +5486,13 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] + m_Texture: {fileID: 0} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 radius: 13 thickness: 2 wedges: 8 @@ -5509,7 +5529,6 @@ RectTransform: m_Children: - {fileID: 8135927677568226426} m_Father: {fileID: 8135927676978638391} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -5545,6 +5564,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 8135927677568226426} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -5635,30 +5655,6 @@ PrefabInstance: propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.size value: 0 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: Increment - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: MixedReality.Toolkit.Examples.Demos.ColorChanger, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -5667,10 +5663,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -5744,6 +5736,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &348831640874909144 stripped RectTransform: @@ -5755,6 +5750,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 8135927677568226426} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -5845,30 +5841,6 @@ PrefabInstance: propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.size value: 0 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: Increment - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: MixedReality.Toolkit.Examples.Demos.ColorChanger, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -5877,10 +5849,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 7 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -5954,6 +5922,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &348831640886588833 stripped RectTransform: @@ -5965,6 +5936,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 8135927677568226426} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -6055,30 +6027,6 @@ PrefabInstance: propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.size value: 0 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: Increment - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: MixedReality.Toolkit.Examples.Demos.ColorChanger, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -6087,10 +6035,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 47 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -6164,6 +6108,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &348831640975972532 stripped RectTransform: @@ -6175,6 +6122,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 8135927677568226426} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -6265,30 +6213,6 @@ PrefabInstance: propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.size value: 0 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: Increment - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: MixedReality.Toolkit.Examples.Demos.ColorChanger, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -6297,10 +6221,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 33 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -6374,6 +6294,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &348831640735392408 stripped RectTransform: @@ -6385,6 +6308,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 8135927677568226426} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -6475,30 +6399,6 @@ PrefabInstance: propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.size value: 0 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: Increment - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: MixedReality.Toolkit.Examples.Demos.ColorChanger, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -6507,10 +6407,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 10 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -6584,6 +6480,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &348831640855182798 stripped RectTransform: @@ -6595,6 +6494,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 8135927677568226426} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -6685,30 +6585,6 @@ PrefabInstance: propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.size value: 0 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: Increment - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: MixedReality.Toolkit.Examples.Demos.ColorChanger, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -6717,10 +6593,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -6794,6 +6666,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &348831640814249493 stripped RectTransform: @@ -6805,6 +6680,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 8135927677568226426} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -6895,30 +6771,6 @@ PrefabInstance: propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.size value: 0 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: Increment - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: MixedReality.Toolkit.Examples.Demos.ColorChanger, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -6927,10 +6779,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 27 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -7004,6 +6852,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &348831640820037909 stripped RectTransform: @@ -7015,6 +6866,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 8135927677568226426} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -7105,30 +6957,6 @@ PrefabInstance: propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.size value: 0 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: Increment - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: MixedReality.Toolkit.Examples.Demos.ColorChanger, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -7137,10 +6965,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 9 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -7214,6 +7038,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &348831640648743254 stripped RectTransform: @@ -7225,6 +7052,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 8135927677568226426} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -7315,30 +7143,6 @@ PrefabInstance: propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.size value: 0 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: Increment - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: MixedReality.Toolkit.Examples.Demos.ColorChanger, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -7347,10 +7151,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 23 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -7424,6 +7224,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &348831640695182457 stripped RectTransform: @@ -7435,6 +7238,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 8135927677568226426} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -7525,30 +7329,6 @@ PrefabInstance: propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.size value: 0 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: Increment - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: MixedReality.Toolkit.Examples.Demos.ColorChanger, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -7557,10 +7337,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 19 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -7634,6 +7410,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &348831640707451817 stripped RectTransform: @@ -7645,6 +7424,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 8135927677568226426} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -7735,30 +7515,6 @@ PrefabInstance: propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.size value: 0 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: Increment - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: MixedReality.Toolkit.Examples.Demos.ColorChanger, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -7767,10 +7523,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 46 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -7844,6 +7596,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &348831640719220459 stripped RectTransform: @@ -7855,6 +7610,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 8135927677568226426} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -7945,30 +7701,6 @@ PrefabInstance: propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.size value: 0 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: Increment - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: MixedReality.Toolkit.Examples.Demos.ColorChanger, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -7977,10 +7709,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 43 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -8054,6 +7782,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &348831640667072026 stripped RectTransform: @@ -8065,6 +7796,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 8135927677568226426} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -8155,30 +7887,6 @@ PrefabInstance: propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.size value: 0 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: Increment - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: MixedReality.Toolkit.Examples.Demos.ColorChanger, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -8187,10 +7895,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 28 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -8264,6 +7968,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &348831640691661490 stripped RectTransform: @@ -8275,6 +7982,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 8135927677568226426} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -8365,30 +8073,6 @@ PrefabInstance: propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.size value: 0 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: Increment - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: MixedReality.Toolkit.Examples.Demos.ColorChanger, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -8397,10 +8081,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 35 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -8474,6 +8154,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &348831640376324629 stripped RectTransform: @@ -8485,6 +8168,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 8135927677568226426} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -8575,30 +8259,6 @@ PrefabInstance: propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.size value: 0 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: Increment - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: MixedReality.Toolkit.Examples.Demos.ColorChanger, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -8607,10 +8267,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 16 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -8684,6 +8340,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &348831640230510469 stripped RectTransform: @@ -8695,6 +8354,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 8135927677568226426} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -8785,30 +8445,6 @@ PrefabInstance: propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.size value: 0 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: Increment - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: MixedReality.Toolkit.Examples.Demos.ColorChanger, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -8817,10 +8453,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 18 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -8894,6 +8526,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &348831640191012374 stripped RectTransform: @@ -8905,6 +8540,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 8135927677568226426} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -8995,30 +8631,6 @@ PrefabInstance: propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.size value: 0 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: Increment - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: MixedReality.Toolkit.Examples.Demos.ColorChanger, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -9027,10 +8639,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 39 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -9104,6 +8712,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &348831640204372115 stripped RectTransform: @@ -9115,6 +8726,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 8135927677568226426} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -9205,30 +8817,6 @@ PrefabInstance: propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.size value: 0 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: Increment - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: MixedReality.Toolkit.Examples.Demos.ColorChanger, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -9237,10 +8825,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 12 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -9314,6 +8898,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &348831640260231082 stripped RectTransform: @@ -9325,6 +8912,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 8135927677568226426} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -9415,30 +9003,6 @@ PrefabInstance: propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.size value: 0 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: Increment - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: MixedReality.Toolkit.Examples.Demos.ColorChanger, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -9447,10 +9011,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 6 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -9524,6 +9084,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &348831640181191363 stripped RectTransform: @@ -9535,6 +9098,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 8135927677568226426} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -9625,30 +9189,6 @@ PrefabInstance: propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.size value: 0 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: Increment - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: MixedReality.Toolkit.Examples.Demos.ColorChanger, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -9657,10 +9197,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 40 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -9734,6 +9270,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &348831640187906570 stripped RectTransform: @@ -9745,6 +9284,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 8135927677568226426} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -9835,30 +9375,6 @@ PrefabInstance: propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.size value: 0 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: Increment - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: MixedReality.Toolkit.Examples.Demos.ColorChanger, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -9867,10 +9383,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 8 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -9944,6 +9456,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &348831640130202485 stripped RectTransform: @@ -9955,6 +9470,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 8135927677568226426} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -10045,30 +9561,6 @@ PrefabInstance: propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.size value: 0 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: Increment - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: MixedReality.Toolkit.Examples.Demos.ColorChanger, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -10077,10 +9569,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 31 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -10154,6 +9642,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &348831640147226866 stripped RectTransform: @@ -10165,6 +9656,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 8135927677568226426} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -10255,30 +9747,6 @@ PrefabInstance: propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.size value: 0 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: Increment - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: MixedReality.Toolkit.Examples.Demos.ColorChanger, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -10287,10 +9755,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 49 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -10364,6 +9828,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &348831639980139006 stripped RectTransform: @@ -10375,6 +9842,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 8135927677568226426} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -10465,30 +9933,6 @@ PrefabInstance: propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.size value: 0 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: Increment - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: MixedReality.Toolkit.Examples.Demos.ColorChanger, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -10497,10 +9941,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 48 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -10574,6 +10014,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &348831639802670880 stripped RectTransform: @@ -10585,6 +10028,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 8135927677568226426} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -10675,30 +10119,6 @@ PrefabInstance: propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.size value: 0 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: Increment - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: MixedReality.Toolkit.Examples.Demos.ColorChanger, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -10707,10 +10127,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 17 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -10784,6 +10200,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &348831639865504989 stripped RectTransform: @@ -10795,6 +10214,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 8135927677568226426} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -10885,30 +10305,6 @@ PrefabInstance: propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.size value: 0 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: Increment - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: MixedReality.Toolkit.Examples.Demos.ColorChanger, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -10917,10 +10313,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 11 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -10994,6 +10386,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &348831639866964940 stripped RectTransform: @@ -11005,6 +10400,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 8135927677568226426} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -11095,30 +10491,6 @@ PrefabInstance: propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.size value: 0 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: Increment - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: MixedReality.Toolkit.Examples.Demos.ColorChanger, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -11127,10 +10499,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 25 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -11204,6 +10572,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &348831639887572795 stripped RectTransform: @@ -11215,6 +10586,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 8135927677568226426} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -11305,30 +10677,6 @@ PrefabInstance: propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.size value: 0 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: Increment - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: MixedReality.Toolkit.Examples.Demos.ColorChanger, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -11337,10 +10685,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 44 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -11414,6 +10758,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &348831639736248965 stripped RectTransform: @@ -11425,6 +10772,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 8135927677568226426} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -11515,30 +10863,6 @@ PrefabInstance: propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.size value: 0 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: Increment - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: MixedReality.Toolkit.Examples.Demos.ColorChanger, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -11547,10 +10871,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 30 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -11624,6 +10944,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &348831639743536008 stripped RectTransform: @@ -11635,6 +10958,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 8135927677568226426} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -11725,30 +11049,6 @@ PrefabInstance: propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.size value: 0 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: Increment - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: MixedReality.Toolkit.Examples.Demos.ColorChanger, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -11757,10 +11057,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 4 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -11834,6 +11130,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &348831639556999931 stripped RectTransform: @@ -11845,6 +11144,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 8135927677568226426} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -11935,30 +11235,6 @@ PrefabInstance: propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.size value: 0 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: Increment - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: MixedReality.Toolkit.Examples.Demos.ColorChanger, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -11967,10 +11243,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 29 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -12044,6 +11316,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &348831639561725271 stripped RectTransform: @@ -12055,6 +11330,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 8135927677568226426} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -12145,30 +11421,6 @@ PrefabInstance: propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.size value: 0 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: Increment - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: MixedReality.Toolkit.Examples.Demos.ColorChanger, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -12177,10 +11429,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 13 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -12254,6 +11502,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &348831639547705090 stripped RectTransform: @@ -12265,6 +11516,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 8135927677568226426} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -12355,30 +11607,6 @@ PrefabInstance: propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.size value: 0 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: Increment - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: MixedReality.Toolkit.Examples.Demos.ColorChanger, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -12387,10 +11615,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 14 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -12464,6 +11688,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &348831639633292372 stripped RectTransform: @@ -12475,6 +11702,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 8135927677568226426} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -12565,30 +11793,6 @@ PrefabInstance: propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.size value: 0 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: Increment - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: MixedReality.Toolkit.Examples.Demos.ColorChanger, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -12597,10 +11801,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 37 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -12674,6 +11874,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &348831639636322058 stripped RectTransform: @@ -12685,6 +11888,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 8135927677568226426} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -12775,30 +11979,6 @@ PrefabInstance: propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.size value: 0 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: Increment - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: MixedReality.Toolkit.Examples.Demos.ColorChanger, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -12807,10 +11987,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 45 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -12884,6 +12060,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &348831639604649700 stripped RectTransform: @@ -12895,6 +12074,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 8135927677568226426} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -12985,30 +12165,6 @@ PrefabInstance: propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.size value: 0 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: Increment - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: MixedReality.Toolkit.Examples.Demos.ColorChanger, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -13017,10 +12173,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 34 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -13094,6 +12246,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &348831639607211468 stripped RectTransform: @@ -13105,6 +12260,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 8135927677568226426} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -13195,30 +12351,6 @@ PrefabInstance: propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.size value: 0 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: Increment - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: MixedReality.Toolkit.Examples.Demos.ColorChanger, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -13227,10 +12359,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 38 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -13304,6 +12432,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &348831639443635482 stripped RectTransform: @@ -13315,6 +12446,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 8135927677568226426} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -13405,30 +12537,6 @@ PrefabInstance: propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.size value: 0 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: Increment - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: MixedReality.Toolkit.Examples.Demos.ColorChanger, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -13437,10 +12545,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 41 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -13514,6 +12618,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &348831639500726297 stripped RectTransform: @@ -13525,6 +12632,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 8135927677568226426} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -13615,30 +12723,6 @@ PrefabInstance: propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.size value: 0 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: Increment - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: MixedReality.Toolkit.Examples.Demos.ColorChanger, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -13647,10 +12731,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 20 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -13724,6 +12804,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &348831639289223115 stripped RectTransform: @@ -13735,6 +12818,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 8135927677568226426} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -13825,30 +12909,6 @@ PrefabInstance: propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.size value: 0 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: Increment - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: MixedReality.Toolkit.Examples.Demos.ColorChanger, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -13857,10 +12917,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -13934,6 +12990,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &348831639318297356 stripped RectTransform: @@ -13945,6 +13004,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 8135927677568226426} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -14035,30 +13095,6 @@ PrefabInstance: propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.size value: 0 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: Increment - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: MixedReality.Toolkit.Examples.Demos.ColorChanger, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -14067,10 +13103,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 50 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -14144,6 +13176,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &348831639318528328 stripped RectTransform: @@ -14155,6 +13190,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 8135927677568226426} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -14245,30 +13281,6 @@ PrefabInstance: propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.size value: 0 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: Increment - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: MixedReality.Toolkit.Examples.Demos.ColorChanger, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -14277,10 +13289,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 24 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -14354,6 +13362,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &348831639253503345 stripped RectTransform: @@ -14365,6 +13376,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 8135927677568226426} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -14455,30 +13467,6 @@ PrefabInstance: propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.size value: 0 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: Increment - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: MixedReality.Toolkit.Examples.Demos.ColorChanger, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -14487,10 +13475,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 36 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -14564,6 +13548,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &348831639361762475 stripped RectTransform: @@ -14575,6 +13562,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 8135927677568226426} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -14665,30 +13653,6 @@ PrefabInstance: propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.size value: 0 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: Increment - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: MixedReality.Toolkit.Examples.Demos.ColorChanger, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -14697,10 +13661,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 26 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -14774,6 +13734,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &348831639163603430 stripped RectTransform: @@ -14785,6 +13748,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 8135927677568226426} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -14875,30 +13839,6 @@ PrefabInstance: propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.size value: 0 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: Increment - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: MixedReality.Toolkit.Examples.Demos.ColorChanger, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -14907,10 +13847,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 22 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -14984,6 +13920,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &348831639229153768 stripped RectTransform: @@ -14995,6 +13934,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 8135927677568226426} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -15085,30 +14025,6 @@ PrefabInstance: propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.size value: 0 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: Increment - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: MixedReality.Toolkit.Examples.Demos.ColorChanger, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -15117,10 +14033,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 42 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -15194,6 +14106,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &348831639247407988 stripped RectTransform: @@ -15205,6 +14120,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 8135927677568226426} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -15295,30 +14211,6 @@ PrefabInstance: propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.size value: 0 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: Increment - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: MixedReality.Toolkit.Examples.Demos.ColorChanger, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -15327,10 +14219,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 3 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -15404,6 +14292,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &348831639192847406 stripped RectTransform: @@ -15415,6 +14306,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 8135927677568226426} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -15505,30 +14397,6 @@ PrefabInstance: propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.size value: 0 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: Increment - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: MixedReality.Toolkit.Examples.Demos.ColorChanger, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -15537,10 +14405,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 5 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -15614,6 +14478,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &348831639215803710 stripped RectTransform: @@ -15625,6 +14492,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 8135927677568226426} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -15715,30 +14583,6 @@ PrefabInstance: propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.size value: 0 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: Increment - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: MixedReality.Toolkit.Examples.Demos.ColorChanger, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -15747,10 +14591,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 21 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -15824,6 +14664,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &348831639091186366 stripped RectTransform: @@ -15835,6 +14678,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 8135927677568226426} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -15925,30 +14769,6 @@ PrefabInstance: propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.size value: 0 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: Increment - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: MixedReality.Toolkit.Examples.Demos.ColorChanger, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -15957,10 +14777,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 15 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -16034,6 +14850,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &348831639062863595 stripped RectTransform: @@ -16045,6 +14864,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 8135927677568226426} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -16135,30 +14955,6 @@ PrefabInstance: propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.size value: 0 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: Increment - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: MixedReality.Toolkit.Examples.Demos.ColorChanger, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -16167,10 +14963,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 32 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -16244,6 +15036,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &348831638872263518 stripped RectTransform: diff --git a/org.mixedrealitytoolkit.uxcomponents/Tests/Runtime/Prefabs/VerticalAndHortizontalScrollingTest.prefab b/org.mixedrealitytoolkit.uxcomponents/Tests/Runtime/Prefabs/VerticalAndHortizontalScrollingTest.prefab index e29a439ad..10a9e880f 100644 --- a/org.mixedrealitytoolkit.uxcomponents/Tests/Runtime/Prefabs/VerticalAndHortizontalScrollingTest.prefab +++ b/org.mixedrealitytoolkit.uxcomponents/Tests/Runtime/Prefabs/VerticalAndHortizontalScrollingTest.prefab @@ -34,7 +34,6 @@ RectTransform: - {fileID: 7330688082711273111} - {fileID: 7663648831210571001} m_Father: {fileID: 268796749188009752} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -69,6 +68,13 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] + m_Texture: {fileID: 0} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 radius: 13 thickness: 2 wedges: 8 @@ -131,7 +137,6 @@ RectTransform: m_Children: - {fileID: 7082581829065130862} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -155,7 +160,9 @@ Canvas: m_OverrideSorting: 0 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 m_AdditionalShaderChannelsFlag: 31 + m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 @@ -214,7 +221,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7082581829065130862} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -287,20 +293,23 @@ MonoBehaviour: m_VerticalAlignment: 256 m_textAlignment: 65535 m_characterSpacing: 0 + m_characterHorizontalScale: 1 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 00000000 m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -370,7 +379,6 @@ RectTransform: m_Children: - {fileID: 1972999353984507552} m_Father: {fileID: 7663648831210571001} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -439,7 +447,6 @@ RectTransform: m_Children: - {fileID: 9168451286498420222} m_Father: {fileID: 7082581829065130862} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -512,9 +519,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3275986650805296233} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 277.66977, y: 152.03629, z: 20.727037} m_Center: {x: 0, y: 0, z: 10.56081} --- !u!114 &6789133379472538145 @@ -533,6 +548,7 @@ MonoBehaviour: attachedRectTransform: {fileID: 7663648831210571001} padding: {x: 0, y: 0} forceUpdateEveryFrame: 0 + canToggleCollider: 1 --- !u!114 &2245257752993140648 MonoBehaviour: m_ObjectHideFlags: 0 @@ -596,8 +612,10 @@ MonoBehaviour: RefIds: - rid: 5356761795612114954 type: {class: BubbleChildHoverEvents, ns: MixedReality.Toolkit.Experimental, asm: MixedReality.Toolkit.Core} + data: - rid: 5356761795612114955 type: {class: BubbleChildSelectEvents, ns: MixedReality.Toolkit.Experimental, asm: MixedReality.Toolkit.Core} + data: --- !u!114 &4934992231776710177 MonoBehaviour: m_ObjectHideFlags: 0 @@ -613,13 +631,11 @@ MonoBehaviour: m_InteractionManager: {fileID: 0} m_Colliders: - {fileID: 2653880020749470902} - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 0 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -652,42 +668,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_OnHoverEntered: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_OnHoverExited: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectEntered: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -858,7 +859,6 @@ RectTransform: - {fileID: 603087116787730763} - {fileID: 5339366548130328408} m_Father: {fileID: 9168451286498420222} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -923,6 +923,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1972999353984507552} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -1126,6 +1127,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &8160956743342162616 stripped RectTransform: @@ -1137,6 +1141,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1972999353984507552} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -1340,6 +1345,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &8212274118810391799 stripped RectTransform: @@ -1351,6 +1359,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1972999353984507552} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -1554,6 +1563,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &9174170480990244740 stripped RectTransform: @@ -1565,6 +1577,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1972999353984507552} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -1768,6 +1781,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &7244605014106202068 stripped RectTransform: @@ -1779,6 +1795,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1972999353984507552} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -1982,6 +1999,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &7263153790212209915 stripped RectTransform: @@ -1993,6 +2013,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1972999353984507552} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -2196,6 +2217,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &7356246687778248637 stripped RectTransform: @@ -2207,6 +2231,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1972999353984507552} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -2410,6 +2435,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &7463557459883065940 stripped RectTransform: @@ -2421,6 +2449,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1972999353984507552} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -2624,6 +2653,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &6941513354004232054 stripped RectTransform: @@ -2635,6 +2667,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1972999353984507552} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -2838,6 +2871,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &6954252009370750313 stripped RectTransform: @@ -2849,6 +2885,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1972999353984507552} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -3052,6 +3089,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &6993639276446203492 stripped RectTransform: @@ -3063,6 +3103,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1972999353984507552} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -3266,6 +3307,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &7149176553870524714 stripped RectTransform: @@ -3277,6 +3321,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1972999353984507552} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -3480,6 +3525,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &8048722116495272946 stripped RectTransform: @@ -3491,6 +3539,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1972999353984507552} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -3694,6 +3743,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &7605441586441341883 stripped RectTransform: @@ -3705,6 +3757,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1972999353984507552} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -3908,6 +3961,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &6109292387491697756 stripped RectTransform: @@ -3919,6 +3975,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1972999353984507552} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -4122,6 +4179,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &6209402777567781599 stripped RectTransform: @@ -4133,6 +4193,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1972999353984507552} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -4336,6 +4397,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &6204941782661405693 stripped RectTransform: @@ -4347,6 +4411,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1972999353984507552} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -4550,6 +4615,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &6220574593372663030 stripped RectTransform: @@ -4561,6 +4629,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1972999353984507552} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -4764,6 +4833,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &5859322511313441915 stripped RectTransform: @@ -4775,6 +4847,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1972999353984507552} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -4978,6 +5051,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &5893797694856176372 stripped RectTransform: @@ -4989,6 +5065,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1972999353984507552} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -5192,6 +5269,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &6661332856909115876 stripped RectTransform: @@ -5203,6 +5283,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1972999353984507552} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -5406,6 +5487,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &6558623091332351319 stripped RectTransform: @@ -5417,6 +5501,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1972999353984507552} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -5620,6 +5705,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &6622773468790149332 stripped RectTransform: @@ -5631,6 +5719,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1972999353984507552} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -5834,6 +5923,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &6614911240196247831 stripped RectTransform: @@ -5845,6 +5937,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1972999353984507552} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -6048,6 +6141,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &5121808758314378672 stripped RectTransform: @@ -6059,6 +6155,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1972999353984507552} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -6262,6 +6359,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &5134110996628601241 stripped RectTransform: @@ -6273,6 +6373,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1972999353984507552} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -6476,6 +6577,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &4623516838211091400 stripped RectTransform: @@ -6487,6 +6591,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1972999353984507552} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -6690,6 +6795,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &4745783622172041340 stripped RectTransform: @@ -6701,6 +6809,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1972999353984507552} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -6904,6 +7013,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &5669239603695197149 stripped RectTransform: @@ -6915,6 +7027,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1972999353984507552} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -7118,6 +7231,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &5744166164182672136 stripped RectTransform: @@ -7129,6 +7245,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1972999353984507552} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -7332,6 +7449,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &5339366548130328408 stripped RectTransform: @@ -7343,6 +7463,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1972999353984507552} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -7546,6 +7667,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &3805426473038061623 stripped RectTransform: @@ -7557,6 +7681,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1972999353984507552} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -7760,6 +7885,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &4174399573363938160 stripped RectTransform: @@ -7771,6 +7899,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1972999353984507552} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -7974,6 +8103,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &4167276435634980098 stripped RectTransform: @@ -7985,6 +8117,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1972999353984507552} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -8188,6 +8321,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &4272642811226838042 stripped RectTransform: @@ -8199,6 +8335,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1972999353984507552} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -8402,6 +8539,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &2767950925200596216 stripped RectTransform: @@ -8413,6 +8553,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1972999353984507552} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -8616,6 +8757,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &2782991661769593459 stripped RectTransform: @@ -8627,6 +8771,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1972999353984507552} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -8830,6 +8975,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &2799898394869510289 stripped RectTransform: @@ -8841,6 +8989,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1972999353984507552} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -9044,6 +9193,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &2466934212415297210 stripped RectTransform: @@ -9055,6 +9207,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1972999353984507552} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -9258,6 +9411,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &1674438386153752773 stripped RectTransform: @@ -9269,6 +9425,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1972999353984507552} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -9472,6 +9629,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &1405318994215635415 stripped RectTransform: @@ -9483,6 +9643,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1972999353984507552} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -9686,6 +9847,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &2207638224345528020 stripped RectTransform: @@ -9697,6 +9861,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1972999353984507552} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -9900,6 +10065,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &306300994757592042 stripped RectTransform: @@ -9911,6 +10079,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1972999353984507552} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -10114,6 +10283,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &3261134910123381 stripped RectTransform: @@ -10125,6 +10297,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1972999353984507552} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -10328,6 +10501,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &217458243608629422 stripped RectTransform: @@ -10339,6 +10515,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1972999353984507552} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -10542,6 +10719,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &274501143564656057 stripped RectTransform: @@ -10553,6 +10733,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1972999353984507552} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -10756,6 +10937,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &897647836528601747 stripped RectTransform: @@ -10767,6 +10951,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1972999353984507552} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -10970,6 +11155,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &932173767447387281 stripped RectTransform: @@ -10981,6 +11169,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1972999353984507552} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -11184,6 +11373,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &1070478096387386431 stripped RectTransform: @@ -11195,6 +11387,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1972999353984507552} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -11398,6 +11591,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &603087116787730763 stripped RectTransform: @@ -11409,6 +11605,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1972999353984507552} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -11612,6 +11809,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &705503974363227667 stripped RectTransform: @@ -11623,6 +11823,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1972999353984507552} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -11826,6 +12027,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &739736694692113004 stripped RectTransform: diff --git a/org.mixedrealitytoolkit.uxcomponents/Tests/Runtime/Prefabs/VerticalScrollingTest.prefab b/org.mixedrealitytoolkit.uxcomponents/Tests/Runtime/Prefabs/VerticalScrollingTest.prefab index f6c9b5693..ad4decc6c 100644 --- a/org.mixedrealitytoolkit.uxcomponents/Tests/Runtime/Prefabs/VerticalScrollingTest.prefab +++ b/org.mixedrealitytoolkit.uxcomponents/Tests/Runtime/Prefabs/VerticalScrollingTest.prefab @@ -25,6 +25,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6118246675992765729} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.1857, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -32,7 +33,6 @@ Transform: m_Children: - {fileID: 6118246676327570041} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!198 &6118246675992765734 ParticleSystem: @@ -252,6 +252,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -281,6 +282,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 startSize: @@ -602,6 +604,7 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 randomizeRotationDirection: 0 + gravitySource: 0 maxNumParticles: 1000 customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 @@ -1389,6 +1392,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -1418,6 +1422,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 UVModule: @@ -3638,6 +3643,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -3667,6 +3673,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 range: {x: 0, y: 1} @@ -4044,6 +4051,7 @@ ParticleSystem: m_RotationOrder: 4 minVertexDistance: 0.2 textureMode: 0 + textureScale: {x: 1, y: 1} ribbonCount: 1 shadowBias: 0.5 worldSpace: 0 @@ -4086,6 +4094,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -4115,6 +4124,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 widthOverTrail: @@ -4202,6 +4212,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -4231,6 +4242,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 CustomDataModule: @@ -4269,6 +4281,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -4298,6 +4311,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 colorLabel0: Color @@ -4551,6 +4565,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -4580,6 +4595,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 colorLabel1: Color @@ -4817,6 +4833,9 @@ ParticleSystemRenderer: m_ReflectionProbeUsage: 0 m_RayTracingMode: 0 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4855,13 +4874,15 @@ ParticleSystemRenderer: m_RenderAlignment: 0 m_Pivot: {x: 0, y: 0, z: 0} m_Flip: {x: 0, y: 0, z: 0} - m_UseCustomVertexStreams: 0 m_EnableGPUInstancing: 1 m_ApplyActiveColorSpace: 1 m_AllowRoll: 1 m_FreeformStretching: 0 m_RotateWithStretchDirection: 1 + m_UseCustomVertexStreams: 0 m_VertexStreams: 00010304 + m_UseCustomTrailVertexStreams: 0 + m_TrailVertexStreams: 00010304 m_Mesh: {fileID: 0} m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} @@ -4903,7 +4924,6 @@ RectTransform: m_Children: - {fileID: 6118246677110830121} m_Father: {fileID: 6118246675992765728} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -4927,7 +4947,9 @@ Canvas: m_OverrideSorting: 0 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 m_AdditionalShaderChannelsFlag: 31 + m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 @@ -4986,7 +5008,6 @@ RectTransform: m_Children: - {fileID: 6118246677534590630} m_Father: {fileID: 6118246676753796445} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -5053,7 +5074,6 @@ RectTransform: m_Children: - {fileID: 6118246676544658154} m_Father: {fileID: 6118246677110830121} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -5106,9 +5126,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6118246676753796446} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 38, y: 117.32, z: 23.612677} m_Center: {x: 0, y: 0, z: 11.734276} --- !u!114 &6118246676753796434 @@ -5127,6 +5155,7 @@ MonoBehaviour: attachedRectTransform: {fileID: 6118246676753796445} padding: {x: 0, y: 0} forceUpdateEveryFrame: 0 + canToggleCollider: 1 --- !u!114 &6118246676753796435 MonoBehaviour: m_ObjectHideFlags: 0 @@ -5147,8 +5176,10 @@ MonoBehaviour: RefIds: - rid: 5356761795612114950 type: {class: BubbleChildHoverEvents, ns: MixedReality.Toolkit.Experimental, asm: MixedReality.Toolkit.Core} + data: - rid: 5356761795612114951 type: {class: BubbleChildSelectEvents, ns: MixedReality.Toolkit.Experimental, asm: MixedReality.Toolkit.Core} + data: --- !u!114 &6118246676753796444 MonoBehaviour: m_ObjectHideFlags: 0 @@ -5164,13 +5195,11 @@ MonoBehaviour: m_InteractionManager: {fileID: 0} m_Colliders: - {fileID: 6118246676753796433} - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 0 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -5203,42 +5232,27 @@ MonoBehaviour: m_SelectExited: m_PersistentCalls: m_Calls: [] - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnHoverExited: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectEntered: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectExited: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectCanceled: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] isGazePinchSelected: active: 0 onEntered: @@ -5358,7 +5372,6 @@ RectTransform: m_Children: - {fileID: 6118246676753796445} m_Father: {fileID: 6118246676327570041} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -5393,6 +5406,13 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] + m_Texture: {fileID: 0} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 radius: 13 thickness: 2 wedges: 8 @@ -5480,7 +5500,6 @@ RectTransform: - {fileID: 2366557446114351338} - {fileID: 2366557445223014978} m_Father: {fileID: 6118246676544658154} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1} @@ -5545,6 +5564,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 6118246677534590630} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -5635,30 +5655,6 @@ PrefabInstance: propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.size value: 0 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: Increment - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: MixedReality.Toolkit.Examples.Demos.ColorChanger, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -5667,10 +5663,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 30 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -5744,6 +5736,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &2366557446313924683 stripped RectTransform: @@ -5755,6 +5750,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 6118246677534590630} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -5845,30 +5841,6 @@ PrefabInstance: propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.size value: 0 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: Increment - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: MixedReality.Toolkit.Examples.Demos.ColorChanger, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -5877,10 +5849,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 45 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -5954,6 +5922,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &2366557446279278252 stripped RectTransform: @@ -5965,6 +5936,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 6118246677534590630} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -6055,30 +6027,6 @@ PrefabInstance: propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.size value: 0 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: Increment - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: MixedReality.Toolkit.Examples.Demos.ColorChanger, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -6087,10 +6035,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 25 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -6164,6 +6108,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &2366557446298195003 stripped RectTransform: @@ -6175,6 +6122,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 6118246677534590630} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -6265,30 +6213,6 @@ PrefabInstance: propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.size value: 0 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: Increment - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: MixedReality.Toolkit.Examples.Demos.ColorChanger, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -6297,10 +6221,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 31 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -6374,6 +6294,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &2366557446254128873 stripped RectTransform: @@ -6385,6 +6308,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 6118246677534590630} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -6475,30 +6399,6 @@ PrefabInstance: propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.size value: 0 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: Increment - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: MixedReality.Toolkit.Examples.Demos.ColorChanger, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -6507,10 +6407,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 7 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -6584,6 +6480,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &2366557446257131373 stripped RectTransform: @@ -6595,6 +6494,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 6118246677534590630} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -6685,30 +6585,6 @@ PrefabInstance: propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.size value: 0 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: Increment - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: MixedReality.Toolkit.Examples.Demos.ColorChanger, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -6717,10 +6593,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -6794,6 +6666,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &2366557446093391000 stripped RectTransform: @@ -6805,6 +6680,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 6118246677534590630} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -6895,30 +6771,6 @@ PrefabInstance: propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.size value: 0 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: Increment - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: MixedReality.Toolkit.Examples.Demos.ColorChanger, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -6927,10 +6779,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 35 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -7004,6 +6852,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &2366557446162931204 stripped RectTransform: @@ -7015,6 +6866,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 6118246677534590630} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -7105,30 +6957,6 @@ PrefabInstance: propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.size value: 0 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: Increment - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: MixedReality.Toolkit.Examples.Demos.ColorChanger, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -7137,10 +6965,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 49 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -7214,6 +7038,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &2366557446114351338 stripped RectTransform: @@ -7225,6 +7052,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 6118246677534590630} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -7315,30 +7143,6 @@ PrefabInstance: propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.size value: 0 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: Increment - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: MixedReality.Toolkit.Examples.Demos.ColorChanger, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -7347,10 +7151,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 4 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -7424,6 +7224,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &2366557445978035627 stripped RectTransform: @@ -7435,6 +7238,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 6118246677534590630} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -7525,30 +7329,6 @@ PrefabInstance: propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.size value: 0 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: Increment - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: MixedReality.Toolkit.Examples.Demos.ColorChanger, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -7557,10 +7337,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 32 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -7634,6 +7410,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &2366557445983828699 stripped RectTransform: @@ -7645,6 +7424,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 6118246677534590630} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -7735,30 +7515,6 @@ PrefabInstance: propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.size value: 0 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: Increment - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: MixedReality.Toolkit.Examples.Demos.ColorChanger, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -7767,10 +7523,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -7844,6 +7596,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &2366557445994131445 stripped RectTransform: @@ -7855,6 +7610,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 6118246677534590630} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -7945,30 +7701,6 @@ PrefabInstance: propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.size value: 0 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: Increment - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: MixedReality.Toolkit.Examples.Demos.ColorChanger, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -7977,10 +7709,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 10 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -8054,6 +7782,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &2366557446000921470 stripped RectTransform: @@ -8065,6 +7796,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 6118246677534590630} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -8155,30 +7887,6 @@ PrefabInstance: propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.size value: 0 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: Increment - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: MixedReality.Toolkit.Examples.Demos.ColorChanger, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -8187,10 +7895,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 20 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -8264,6 +7968,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &2366557446005269723 stripped RectTransform: @@ -8275,6 +7982,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 6118246677534590630} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -8365,30 +8073,6 @@ PrefabInstance: propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.size value: 0 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: Increment - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: MixedReality.Toolkit.Examples.Demos.ColorChanger, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -8397,10 +8081,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 36 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -8474,6 +8154,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &2366557445783038276 stripped RectTransform: @@ -8485,6 +8168,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 6118246677534590630} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -8575,30 +8259,6 @@ PrefabInstance: propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.size value: 0 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: Increment - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: MixedReality.Toolkit.Examples.Demos.ColorChanger, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -8607,10 +8267,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 38 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -8684,6 +8340,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &2366557445789774921 stripped RectTransform: @@ -8695,6 +8354,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 6118246677534590630} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -8785,30 +8445,6 @@ PrefabInstance: propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.size value: 0 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: Increment - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: MixedReality.Toolkit.Examples.Demos.ColorChanger, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -8817,10 +8453,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 18 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -8894,6 +8526,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &2366557445798305578 stripped RectTransform: @@ -8905,6 +8540,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 6118246677534590630} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -8995,30 +8631,6 @@ PrefabInstance: propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.size value: 0 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: Increment - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: MixedReality.Toolkit.Examples.Demos.ColorChanger, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -9027,10 +8639,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 34 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -9104,6 +8712,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &2366557445805676887 stripped RectTransform: @@ -9115,6 +8726,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 6118246677534590630} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -9205,30 +8817,6 @@ PrefabInstance: propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.size value: 0 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: Increment - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: MixedReality.Toolkit.Examples.Demos.ColorChanger, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -9237,10 +8825,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 40 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -9314,6 +8898,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &2366557445891698900 stripped RectTransform: @@ -9325,6 +8912,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 6118246677534590630} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -9415,30 +9003,6 @@ PrefabInstance: propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.size value: 0 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: Increment - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: MixedReality.Toolkit.Examples.Demos.ColorChanger, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -9447,10 +9011,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 16 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -9524,6 +9084,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &2366557445673788223 stripped RectTransform: @@ -9535,6 +9098,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 6118246677534590630} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -9625,30 +9189,6 @@ PrefabInstance: propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.size value: 0 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: Increment - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: MixedReality.Toolkit.Examples.Demos.ColorChanger, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -9657,10 +9197,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 12 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -9734,6 +9270,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &2366557445751944103 stripped RectTransform: @@ -9745,6 +9284,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 6118246677534590630} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -9835,30 +9375,6 @@ PrefabInstance: propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.size value: 0 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: Increment - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: MixedReality.Toolkit.Examples.Demos.ColorChanger, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -9867,10 +9383,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 48 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -9944,6 +9456,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &2366557445571484346 stripped RectTransform: @@ -9955,6 +9470,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 6118246677534590630} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -10045,30 +9561,6 @@ PrefabInstance: propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.size value: 0 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: Increment - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: MixedReality.Toolkit.Examples.Demos.ColorChanger, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -10077,10 +9569,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 37 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -10154,6 +9642,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &2366557445617174167 stripped RectTransform: @@ -10165,6 +9656,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 6118246677534590630} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -10255,30 +9747,6 @@ PrefabInstance: propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.size value: 0 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: Increment - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: MixedReality.Toolkit.Examples.Demos.ColorChanger, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -10287,10 +9755,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 42 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -10364,6 +9828,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &2366557445622680858 stripped RectTransform: @@ -10375,6 +9842,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 6118246677534590630} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -10465,30 +9933,6 @@ PrefabInstance: propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.size value: 0 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: Increment - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: MixedReality.Toolkit.Examples.Demos.ColorChanger, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -10497,10 +9941,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 14 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -10574,6 +10014,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &2366557445580850674 stripped RectTransform: @@ -10585,6 +10028,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 6118246677534590630} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -10675,30 +10119,6 @@ PrefabInstance: propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.size value: 0 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: Increment - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: MixedReality.Toolkit.Examples.Demos.ColorChanger, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -10707,10 +10127,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 19 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -10784,6 +10200,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &2366557445585371244 stripped RectTransform: @@ -10795,6 +10214,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 6118246677534590630} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -10885,30 +10305,6 @@ PrefabInstance: propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.size value: 0 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: Increment - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: MixedReality.Toolkit.Examples.Demos.ColorChanger, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -10917,10 +10313,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 41 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -10994,6 +10386,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &2366557445382072673 stripped RectTransform: @@ -11005,6 +10400,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 6118246677534590630} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -11095,30 +10491,6 @@ PrefabInstance: propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.size value: 0 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: Increment - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: MixedReality.Toolkit.Examples.Demos.ColorChanger, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -11127,10 +10499,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 44 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -11204,6 +10572,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &2366557445442795864 stripped RectTransform: @@ -11215,6 +10586,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 6118246677534590630} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -11305,30 +10677,6 @@ PrefabInstance: propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.size value: 0 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: Increment - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: MixedReality.Toolkit.Examples.Demos.ColorChanger, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -11337,10 +10685,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 15 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -11414,6 +10758,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &2366557445453539400 stripped RectTransform: @@ -11425,6 +10772,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 6118246677534590630} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -11515,30 +10863,6 @@ PrefabInstance: propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.size value: 0 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: Increment - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: MixedReality.Toolkit.Examples.Demos.ColorChanger, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -11547,10 +10871,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 24 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -11624,6 +10944,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &2366557445352633093 stripped RectTransform: @@ -11635,6 +10958,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 6118246677534590630} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -11725,30 +11049,6 @@ PrefabInstance: propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.size value: 0 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: Increment - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: MixedReality.Toolkit.Examples.Demos.ColorChanger, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -11757,10 +11057,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 46 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -11834,6 +11130,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &2366557445367438142 stripped RectTransform: @@ -11845,6 +11144,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 6118246677534590630} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -11935,30 +11235,6 @@ PrefabInstance: propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.size value: 0 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: Increment - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: MixedReality.Toolkit.Examples.Demos.ColorChanger, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -11967,10 +11243,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 43 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -12044,6 +11316,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &2366557445313775749 stripped RectTransform: @@ -12055,6 +11330,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 6118246677534590630} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -12145,30 +11421,6 @@ PrefabInstance: propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.size value: 0 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: Increment - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: MixedReality.Toolkit.Examples.Demos.ColorChanger, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -12177,10 +11429,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 9 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -12254,6 +11502,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &2366557445170505042 stripped RectTransform: @@ -12265,6 +11516,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 6118246677534590630} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -12355,30 +11607,6 @@ PrefabInstance: propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.size value: 0 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: Increment - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: MixedReality.Toolkit.Examples.Demos.ColorChanger, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -12387,10 +11615,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 13 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -12464,6 +11688,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &2366557445222504679 stripped RectTransform: @@ -12475,6 +11702,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 6118246677534590630} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -12565,30 +11793,6 @@ PrefabInstance: propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.size value: 0 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: Increment - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: MixedReality.Toolkit.Examples.Demos.ColorChanger, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -12597,10 +11801,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 50 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -12674,6 +11874,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &2366557445223014978 stripped RectTransform: @@ -12685,6 +11888,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 6118246677534590630} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -12775,30 +11979,6 @@ PrefabInstance: propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.size value: 0 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: Increment - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: MixedReality.Toolkit.Examples.Demos.ColorChanger, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -12807,10 +11987,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 23 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -12884,6 +12060,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &2366557445024084815 stripped RectTransform: @@ -12895,6 +12074,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 6118246677534590630} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -12985,30 +12165,6 @@ PrefabInstance: propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.size value: 0 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: Increment - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: MixedReality.Toolkit.Examples.Demos.ColorChanger, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -13017,10 +12173,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 11 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -13094,6 +12246,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &2366557444977364305 stripped RectTransform: @@ -13105,6 +12260,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 6118246677534590630} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -13195,30 +12351,6 @@ PrefabInstance: propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.size value: 0 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: Increment - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: MixedReality.Toolkit.Examples.Demos.ColorChanger, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -13227,10 +12359,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 5 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -13304,6 +12432,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &2366557444997110274 stripped RectTransform: @@ -13315,6 +12446,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 6118246677534590630} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -13405,30 +12537,6 @@ PrefabInstance: propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.size value: 0 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: Increment - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: MixedReality.Toolkit.Examples.Demos.ColorChanger, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -13437,10 +12545,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 6 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -13514,6 +12618,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &2366557445085249531 stripped RectTransform: @@ -13525,6 +12632,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 6118246677534590630} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -13615,30 +12723,6 @@ PrefabInstance: propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.size value: 0 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: Increment - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: MixedReality.Toolkit.Examples.Demos.ColorChanger, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -13647,10 +12731,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 47 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -13724,6 +12804,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &2366557444947899166 stripped RectTransform: @@ -13735,6 +12818,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 6118246677534590630} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -13825,30 +12909,6 @@ PrefabInstance: propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.size value: 0 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: Increment - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: MixedReality.Toolkit.Examples.Demos.ColorChanger, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -13857,10 +12917,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 33 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -13934,6 +12990,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &2366557444912334658 stripped RectTransform: @@ -13945,6 +13004,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 6118246677534590630} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -14035,30 +13095,6 @@ PrefabInstance: propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.size value: 0 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: Increment - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: MixedReality.Toolkit.Examples.Demos.ColorChanger, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -14067,10 +13103,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -14144,6 +13176,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &2366557444918597195 stripped RectTransform: @@ -14155,6 +13190,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 6118246677534590630} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -14245,30 +13281,6 @@ PrefabInstance: propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.size value: 0 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: Increment - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: MixedReality.Toolkit.Examples.Demos.ColorChanger, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -14277,10 +13289,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 27 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -14354,6 +13362,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &2366557444761906282 stripped RectTransform: @@ -14365,6 +13376,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 6118246677534590630} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -14455,30 +13467,6 @@ PrefabInstance: propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.size value: 0 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: Increment - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: MixedReality.Toolkit.Examples.Demos.ColorChanger, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -14487,10 +13475,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 3 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -14564,6 +13548,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &2366557444713811286 stripped RectTransform: @@ -14575,6 +13562,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 6118246677534590630} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -14665,30 +13653,6 @@ PrefabInstance: propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.size value: 0 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: Increment - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: MixedReality.Toolkit.Examples.Demos.ColorChanger, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -14697,10 +13661,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 26 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -14774,6 +13734,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &2366557444782439318 stripped RectTransform: @@ -14785,6 +13748,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 6118246677534590630} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -14875,30 +13839,6 @@ PrefabInstance: propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.size value: 0 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: Increment - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: MixedReality.Toolkit.Examples.Demos.ColorChanger, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -14907,10 +13847,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 8 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -14984,6 +13920,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &2366557444597658181 stripped RectTransform: @@ -14995,6 +13934,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 6118246677534590630} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -15085,30 +14025,6 @@ PrefabInstance: propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.size value: 0 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: Increment - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: MixedReality.Toolkit.Examples.Demos.ColorChanger, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -15117,10 +14033,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 29 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -15194,6 +14106,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &2366557444690717208 stripped RectTransform: @@ -15205,6 +14120,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 6118246677534590630} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -15295,30 +14211,6 @@ PrefabInstance: propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.size value: 0 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: Increment - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: MixedReality.Toolkit.Examples.Demos.ColorChanger, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -15327,10 +14219,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 17 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -15404,6 +14292,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &2366557444638430938 stripped RectTransform: @@ -15415,6 +14306,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 6118246677534590630} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -15505,30 +14397,6 @@ PrefabInstance: propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.size value: 0 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: Increment - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: MixedReality.Toolkit.Examples.Demos.ColorChanger, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -15537,10 +14405,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 28 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -15614,6 +14478,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &2366557444659521871 stripped RectTransform: @@ -15625,6 +14492,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 6118246677534590630} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -15715,30 +14583,6 @@ PrefabInstance: propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.size value: 0 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: Increment - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: MixedReality.Toolkit.Examples.Demos.ColorChanger, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -15747,10 +14591,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 22 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -15824,6 +14664,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &2366557444550979441 stripped RectTransform: @@ -15835,6 +14678,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 6118246677534590630} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -15925,30 +14769,6 @@ PrefabInstance: propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.size value: 0 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: Increment - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: MixedReality.Toolkit.Examples.Demos.ColorChanger, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -15957,10 +14777,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 21 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -16034,6 +14850,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &2366557444418463203 stripped RectTransform: @@ -16045,6 +14864,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 6118246677534590630} m_Modifications: - target: {fileID: 410843422125320171, guid: c6b351a67ceb69140b199996bbbea156, type: 3} @@ -16135,30 +14955,6 @@ PrefabInstance: propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.size value: 0 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: Increment - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: MixedReality.Toolkit.Examples.Demos.ColorChanger, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 8376646494505211226, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: k__BackingField.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -16167,10 +14963,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} - propertyPath: m_RootOrder - value: 39 - objectReference: {fileID: 0} - target: {fileID: 8376646494505211229, guid: c6b351a67ceb69140b199996bbbea156, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -16244,6 +15036,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c6b351a67ceb69140b199996bbbea156, type: 3} --- !u!224 &2366557444384057897 stripped RectTransform: diff --git a/org.mixedrealitytoolkit.uxcomponents/Tests/Runtime/SeeItSayItCanvasTests.cs b/org.mixedrealitytoolkit.uxcomponents/Tests/Runtime/SeeItSayItCanvasTests.cs index b565108ae..0426a4efa 100644 --- a/org.mixedrealitytoolkit.uxcomponents/Tests/Runtime/SeeItSayItCanvasTests.cs +++ b/org.mixedrealitytoolkit.uxcomponents/Tests/Runtime/SeeItSayItCanvasTests.cs @@ -86,6 +86,7 @@ public IEnumerator TestLabelEnabledOnHover() yield return hand.Show(Vector3.one); yield return RuntimeTestUtilities.WaitForUpdates(); yield return hand.MoveTo(testButton.transform.position); + // Label show animation takes 1.0 seconds. Wait for it to finish. yield return new WaitForSecondsRealtime(1.25f); Assert.IsTrue(labelChild?.activeInHierarchy == true, $"The label is enabled when the button is hovered."); @@ -119,4 +120,4 @@ private GameObject InstantiateChildPrefab(string prefabPath, Transform parent) } } } -#pragma warning restore CS1591 \ No newline at end of file +#pragma warning restore CS1591 diff --git a/org.mixedrealitytoolkit.uxcomponents/ToggleIndicators/Checkbox.prefab b/org.mixedrealitytoolkit.uxcomponents/ToggleIndicators/Checkbox.prefab index b4f39bd0f..03d7421ec 100644 --- a/org.mixedrealitytoolkit.uxcomponents/ToggleIndicators/Checkbox.prefab +++ b/org.mixedrealitytoolkit.uxcomponents/ToggleIndicators/Checkbox.prefab @@ -13,6 +13,7 @@ GameObject: - component: {fileID: 4920426125932797076} - component: {fileID: 1755546517986312659} - component: {fileID: 1333775942222694079} + - component: {fileID: 5024593287958842062} m_Layer: 5 m_Name: Checkbox m_TagString: Untagged @@ -34,7 +35,6 @@ RectTransform: m_Children: - {fileID: 1203832545719423472} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -113,7 +113,7 @@ MonoBehaviour: inactiveSprite: {fileID: 21300000, guid: 5cd8ced9e22ece448acdc3a8df358a0b, type: 3} --- !u!95 &4920426125932797076 Animator: - serializedVersion: 5 + serializedVersion: 7 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -127,6 +127,7 @@ Animator: m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 m_StabilizeFeet: 0 + m_AnimatePhysics: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 @@ -160,6 +161,31 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1345098608517470577} m_CullTransparentMesh: 1 +--- !u!114 &5024593287958842062 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1345098608517470577} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 699100ca886480c4a94ced56b1ae0e94, type: 3} + m_Name: + m_EditorClassIdentifier: + themeDataSource: {fileID: 11400000, guid: 57993c46ea42acf4ca3067542443bc45, type: 2} + binders: + - rid: 6006879866990887130 + references: + version: 2 + RefIds: + - rid: 6006879866990887130 + type: {class: StateVisualizerEffectColorBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 6434074875067239604} + k__BackingField: Primary Color + stateName: Toggle + tintTarget: {fileID: 269199439855791924} --- !u!1 &7189414470030404245 GameObject: m_ObjectHideFlags: 0 @@ -172,6 +198,7 @@ GameObject: - component: {fileID: 1989956866083351710} - component: {fileID: 269199439855791924} - component: {fileID: 6136921357999623811} + - component: {fileID: 5834772403435721670} m_Layer: 5 m_Name: Icon m_TagString: Untagged @@ -192,7 +219,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3514389556853228399} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -249,3 +275,26 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0fda4953718e0264291c42cb2a637fb5, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &5834772403435721670 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7189414470030404245} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 699100ca886480c4a94ced56b1ae0e94, type: 3} + m_Name: + m_EditorClassIdentifier: + themeDataSource: {fileID: 11400000, guid: 57993c46ea42acf4ca3067542443bc45, type: 2} + binders: + - rid: 7636826640568287483 + references: + version: 2 + RefIds: + - rid: 7636826640568287483 + type: {class: GraphicColorBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 269199439855791924} + k__BackingField: On Surface Color diff --git a/org.mixedrealitytoolkit.uxcomponents/ToggleIndicators/CheckboxBackground.mat b/org.mixedrealitytoolkit.uxcomponents/ToggleIndicators/CheckboxBackground.mat index 50828840a..2cd273811 100644 --- a/org.mixedrealitytoolkit.uxcomponents/ToggleIndicators/CheckboxBackground.mat +++ b/org.mixedrealitytoolkit.uxcomponents/ToggleIndicators/CheckboxBackground.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: CheckboxBackground m_Shader: {fileID: 4800000, guid: df5380aa6ab293c4fafbb942ed5da93f, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _ALPHABLEND_ON - _SPECULAR_HIGHLIGHTS @@ -20,8 +22,10 @@ Material: m_DoubleSidedGI: 0 m_CustomRenderQueue: 3000 stringTagMap: + DisableBatching: False RenderType: Fade disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -49,6 +53,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _EmissiveMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _IridescentSpectrumMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -99,6 +107,7 @@ Material: - _DetailNormalMapScale: 1 - _DirectionalLight: 0 - _DstBlend: 10 + - _DstBlendAlpha: 1 - _EdgeSmoothingMode: 0 - _EdgeSmoothingValue: 0.002 - _EnableChannelMap: 0 @@ -133,6 +142,7 @@ Material: - _Metallic: 0 - _MipmapBias: -2 - _Mode: 2 + - _NPR: 0 - _NearLightFade: 0 - _NearPlaneFade: 0 - _NormalMapScale: 1 @@ -156,6 +166,7 @@ Material: - _SpecularHighlights: 1 - _SphericalHarmonics: 0 - _SrcBlend: 5 + - _SrcBlendAlpha: 1 - _Stencil: 0 - _StencilComp: 0 - _StencilOp: 0 @@ -166,6 +177,7 @@ Material: - _UseWorldScale: 1 - _VertexColors: 1 - _VertexExtrusion: 0 + - _VertexExtrusionConstantWidth: 0 - _VertexExtrusionSmoothNormals: 0 - _VertexExtrusionValue: 0 - _ZOffsetFactor: 0 @@ -184,6 +196,8 @@ Material: - _EnvironmentColorX: {r: 1, g: 0, b: 0, a: 1} - _EnvironmentColorY: {r: 0, g: 1, b: 0, a: 1} - _EnvironmentColorZ: {r: 0, g: 0, b: 1, a: 1} + - _GradientAlpha: {r: 1, g: 1, b: 1, a: 1} + - _GradientAlphaTime: {r: 0, g: 0, b: 0, a: 0} - _GradientColor0: {r: 0.21383637, g: 0.51905286, b: 1, a: 0} - _GradientColor1: {r: 0.22327036, g: 0.27875102, b: 1, a: 1} - _GradientColor2: {r: 0.22327036, g: 0.27875102, b: 1, a: 1} @@ -197,3 +211,4 @@ Material: - _RimColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} - _RoundCornersRadius: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/org.mixedrealitytoolkit.uxcomponents/ToggleIndicators/ToggleSwitch.prefab b/org.mixedrealitytoolkit.uxcomponents/ToggleIndicators/ToggleSwitch.prefab index 72cd023b2..ce378c389 100644 --- a/org.mixedrealitytoolkit.uxcomponents/ToggleIndicators/ToggleSwitch.prefab +++ b/org.mixedrealitytoolkit.uxcomponents/ToggleIndicators/ToggleSwitch.prefab @@ -12,6 +12,7 @@ GameObject: - component: {fileID: 6434074875067239604} - component: {fileID: 4920426125932797076} - component: {fileID: 1755546517986312659} + - component: {fileID: 1109057887825850324} m_Layer: 5 m_Name: ToggleSwitch m_TagString: Untagged @@ -34,7 +35,6 @@ RectTransform: - {fileID: 1203832545719423472} - {fileID: 1874495531747150209} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} @@ -113,7 +113,7 @@ MonoBehaviour: blendMode: 0 --- !u!95 &4920426125932797076 Animator: - serializedVersion: 5 + serializedVersion: 7 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -127,6 +127,7 @@ Animator: m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 m_StabilizeFeet: 0 + m_AnimatePhysics: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 @@ -152,6 +153,43 @@ MonoBehaviour: m_FlexibleWidth: -1 m_FlexibleHeight: -1 m_LayoutPriority: 1 +--- !u!114 &1109057887825850324 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1345098608517470577} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 699100ca886480c4a94ced56b1ae0e94, type: 3} + m_Name: + m_EditorClassIdentifier: + themeDataSource: {fileID: 11400000, guid: 57993c46ea42acf4ca3067542443bc45, type: 2} + binders: + - rid: 1538473376477610083 + - rid: 7636826640568287486 + - rid: 1538473382797639794 + references: + version: 2 + RefIds: + - rid: 1538473376477610083 + type: {class: GraphicColorBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 269199439855791924} + k__BackingField: Surface Container Color + - rid: 1538473382797639794 + type: {class: StateVisualizerEffectColorBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 6434074875067239604} + k__BackingField: Primary Color + stateName: Toggle + tintTarget: {fileID: 269199439855791924} + - rid: 7636826640568287486 + type: {class: GraphicColorBinder, ns: MixedReality.Toolkit.Theming, asm: MixedReality.Toolkit.Theming} + data: + k__BackingField: {fileID: 8388226346315569560} + k__BackingField: Primary Color --- !u!1 &7189414470030404245 GameObject: m_ObjectHideFlags: 0 @@ -184,7 +222,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3514389556853228399} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -272,7 +309,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1874495531747150209} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -346,7 +382,6 @@ RectTransform: m_Children: - {fileID: 7721594729358357529} m_Father: {fileID: 3514389556853228399} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -381,6 +416,13 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] + m_Texture: {fileID: 0} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 radius: 2.5 thickness: 1 wedges: 8 diff --git a/org.mixedrealitytoolkit.uxcomponents/package.json b/org.mixedrealitytoolkit.uxcomponents/package.json index daaa7efee..bfe9eaca4 100644 --- a/org.mixedrealitytoolkit.uxcomponents/package.json +++ b/org.mixedrealitytoolkit.uxcomponents/package.json @@ -1,6 +1,6 @@ { "name": "org.mixedrealitytoolkit.uxcomponents", - "version": "3.4.0-development", + "version": "4.0.0-development.pre.4", "description": "UX library leveraging RectTransform and Canvas for dynamic layout and presentation. Contains prefabs, visuals, controls, and everything to get started building 3D user interfaces for mixed reality.", "displayName": "MRTK UX Components", "msftFeatureCategory": "MRTK3", @@ -13,18 +13,18 @@ "bugs": { "url": "https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/issues" }, - "unity": "2021.3", - "unityRelease": "26f1", + "unity": "6000.0", + "unityRelease": "66f2", "documentationUrl": "https://www.mixedrealitytoolkit.org", "dependencies": { "com.microsoft.mrtk.graphicstools.unity": "0.8.0", - "org.mixedrealitytoolkit.uxcore": "3.3.0", - "org.mixedrealitytoolkit.spatialmanipulation": "3.4.0", + "org.mixedrealitytoolkit.uxcore": "4.0.0", + "org.mixedrealitytoolkit.spatialmanipulation": "4.0.0", "org.mixedrealitytoolkit.standardassets": "3.2.1", - "com.unity.xr.interaction.toolkit": "2.3.0" + "com.unity.xr.interaction.toolkit": "3.0.4" }, "msftTestDependencies": { - "org.mixedrealitytoolkit.input": "3.0.0", + "org.mixedrealitytoolkit.input": "4.0.0", "com.unity.textmeshpro": "3.0.6" } } \ No newline at end of file diff --git a/org.mixedrealitytoolkit.uxcore/AssemblyInfo.cs b/org.mixedrealitytoolkit.uxcore/AssemblyInfo.cs index 3cb0b8e08..52a3ace8f 100644 --- a/org.mixedrealitytoolkit.uxcore/AssemblyInfo.cs +++ b/org.mixedrealitytoolkit.uxcore/AssemblyInfo.cs @@ -15,4 +15,4 @@ // The AssemblyVersion attribute is checked-in and is recommended not to be changed often. // https://docs.microsoft.com/troubleshoot/visualstudio/general/assembly-version-assembly-file-version // AssemblyFileVersion and AssemblyInformationalVersion are added by pack-upm.ps1 to match the current MRTK build version. -[assembly: AssemblyVersion("3.0.0.0")] +[assembly: AssemblyVersion("4.0.0.0")] diff --git a/org.mixedrealitytoolkit.uxcore/Button/PressableButton.cs b/org.mixedrealitytoolkit.uxcore/Button/PressableButton.cs index 53aef5e56..ac95cde2c 100644 --- a/org.mixedrealitytoolkit.uxcore/Button/PressableButton.cs +++ b/org.mixedrealitytoolkit.uxcore/Button/PressableButton.cs @@ -6,6 +6,8 @@ using UnityEngine; using UnityEngine.Serialization; using UnityEngine.XR.Interaction.Toolkit; +using UnityEngine.XR.Interaction.Toolkit.Interactables; +using UnityEngine.XR.Interaction.Toolkit.Interactors; #if MRTK_INPUT_PRESENT using MixedReality.Toolkit.Input; @@ -344,7 +346,7 @@ public override bool IsSelectableBy(IXRSelectInteractor interactor) // \ // b (this frame) - // Heuristic: Allow select iff (a in AB || ab intersects A) && (b in BC || ab intersects C) + // Heuristic: Allow select if and only if (a in AB || ab intersects A) && (b in BC || ab intersects C) // ab intersect A float worldStartPlane = distanceSpaceMode == SpaceMode.Local ? startPushPlane * LocalToWorldScale : startPushPlane; diff --git a/org.mixedrealitytoolkit.uxcore/CHANGELOG.md b/org.mixedrealitytoolkit.uxcore/CHANGELOG.md index f5b02e2d5..514019778 100644 --- a/org.mixedrealitytoolkit.uxcore/CHANGELOG.md +++ b/org.mixedrealitytoolkit.uxcore/CHANGELOG.md @@ -2,7 +2,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/). -## Unreleased +## [4.0.0-pre.4] - 2026-06-10 ### Added @@ -10,8 +10,53 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/). ### Fixed +* Fixed build issue caused by `FontIconSelectorMigrationUtility` not being in an Editor-only assembly. + +## [4.0.0-pre.3] - 2026-05-20 + +### Added + +* Added the ability to map different icon sets together to have matching names (prerequisite for theming work). [PR #1077](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1077) +* Added "Sort and Deduplicate" option to `FontIconSetDefinition`. [PR #1119](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1119) +* Added tests for hot-swapping `Interactable` and `Animator` on `StatefulVisualizer`. [PR #1123](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1123) + +### Changed + +* Updated the minimum editor version to 6000.0.66f2 [PR #1112](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1112) +* Updated `FontIconSelector`, `StateVisualizer`, and `TintEffect` to be themeable. [PR #1119](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1119) + +### Fixed + * Fixed "leaked managed shell" issue in `UGUIInputAdapter`. [PR #1096](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1096) * Fixed "Attribute 'SerializeField' is not valid on this declaration type. It is only valid on 'field' declarations" error on `DialogButton` in Unity 6.3. [PR #1108](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1108) +* Fixed bug where the interactable could be changed but the visualizer would stay subscribed to the old interactable. [PR #1123](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1123) +* Fixed bug where the animator could be changed but the visualizer wouldn't update the `AnimationPlayableOutput`. [PR #1123](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1123) + +## [4.0.0-pre.2] - 2025-12-05 + +### Changed + +* Updated the minimum editor version to 2022.3.6f1 [PR #1003](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1003) +* Updated InteractablePulse to work across all IXRInteractor implementations, instead of just MRTK-specific IHandedInteractor implementations. [PR #1042](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1042) + +## [4.0.0-pre.1] - 2024-07-09 + +### Changed + +* Updated package com.unity.xr.interaction.toolkit to 3.0.3 + +### Removed + +* Removed LegacyDialog/Dialog files. +* Removed LegacyDialog/DialogButton files. +* Removed LegacyDialog/DialogButtonContext files. +* Removed LegacyDialog/DialogButtonHelpers files. +* Removed LegacyDialog/DialogButtonTypes files. +* Removed LegacyDialog/DialogProperty files. +* Removed LegacyDialog/DialogShell files. +* Removed LegacyDialog/DialogState files. +* Removed LegacyDialog/README files. +* Removed obsolete Slider.SliderValue fields. ## [3.3.0] - 2025-11-12 diff --git a/org.mixedrealitytoolkit.uxcore/Dialog/Dialog.cs b/org.mixedrealitytoolkit.uxcore/Dialog/Dialog.cs index ecd5d7711..57732bddd 100644 --- a/org.mixedrealitytoolkit.uxcore/Dialog/Dialog.cs +++ b/org.mixedrealitytoolkit.uxcore/Dialog/Dialog.cs @@ -3,12 +3,9 @@ using System; using System.Collections; -using System.Collections.Generic; using System.Threading.Tasks; using TMPro; using UnityEngine; -using UnityEngine.Serialization; -using UnityEngine.Events; #if MRTK_SPATIAL_PRESENT using MixedReality.Toolkit.SpatialManipulation; @@ -292,4 +289,4 @@ internal struct DialogButton public TMP_Text Label; } -} \ No newline at end of file +} diff --git a/org.mixedrealitytoolkit.uxcore/Editor/AssemblyInfo.cs b/org.mixedrealitytoolkit.uxcore/Editor/AssemblyInfo.cs index d44ff24ae..6ffe10e44 100644 --- a/org.mixedrealitytoolkit.uxcore/Editor/AssemblyInfo.cs +++ b/org.mixedrealitytoolkit.uxcore/Editor/AssemblyInfo.cs @@ -9,4 +9,4 @@ // The AssemblyVersion attribute is checked-in and is recommended not to be changed often. // https://docs.microsoft.com/troubleshoot/visualstudio/general/assembly-version-assembly-file-version // AssemblyFileVersion and AssemblyInformationalVersion are added by pack-upm.ps1 to match the current MRTK build version. -[assembly: AssemblyVersion("3.0.0.0")] +[assembly: AssemblyVersion("4.0.0.0")] diff --git a/org.mixedrealitytoolkit.uxcore/Editor/FontIconSelectorMigrationUtility.cs b/org.mixedrealitytoolkit.uxcore/Editor/FontIconSelectorMigrationUtility.cs new file mode 100644 index 000000000..69d8aadd1 --- /dev/null +++ b/org.mixedrealitytoolkit.uxcore/Editor/FontIconSelectorMigrationUtility.cs @@ -0,0 +1,111 @@ +// Copyright (c) Mixed Reality Toolkit Contributors +// Licensed under the BSD 3-Clause + +using MixedReality.Toolkit.UX; +using UnityEditor; +using UnityEditor.SceneManagement; +using UnityEngine; +using UnityEngine.SceneManagement; + +namespace MixedReality.Toolkit.Editor +{ + /// + /// Utility to bulk-migrate components to the new descriptive naming format. + /// + public static class FontIconSelectorMigrationUtility + { + [MenuItem("Mixed Reality/MRTK3/Utilities/Migrate Font Icon Selectors", false, 100)] + public static void MigrateProject() + { + // Prompt the user to save any unsaved work before we start swapping scenes + if (!EditorSceneManager.SaveCurrentModifiedScenesIfUserWantsTo()) + { + return; + } + + int migratedCount = 0; + + // 1. Migrate all prefabs in the project + string[] prefabGuids = AssetDatabase.FindAssets("t:Prefab"); + foreach (string guid in prefabGuids) + { + string path = AssetDatabase.GUIDToAssetPath(guid); + GameObject prefab = AssetDatabase.LoadAssetAtPath(path); + + if (prefab == null) { continue; } + + FontIconSelector[] selectors = prefab.GetComponentsInChildren(true); + foreach (FontIconSelector selector in selectors) + { + if (ProcessSelector(selector)) + { + migratedCount++; + } + } + } + + // 2. Migrate all scenes in Build Settings + SceneSetup[] setup = EditorSceneManager.GetSceneManagerSetup(); + + foreach (EditorBuildSettingsScene buildScene in EditorBuildSettings.scenes) + { + if (!buildScene.enabled || string.IsNullOrEmpty(buildScene.path)) { continue; } + + Scene scene = EditorSceneManager.OpenScene(buildScene.path, OpenSceneMode.Single); + bool sceneModified = false; + + FontIconSelector[] sceneSelectors = Object.FindObjectsByType(FindObjectsInactive.Include, FindObjectsSortMode.None); + foreach (FontIconSelector selector in sceneSelectors) + { + // Skip prefabs that might accidentally be caught in FindObjectsOfType + if (PrefabUtility.IsPartOfPrefabAsset(selector)) { continue; } + + if (ProcessSelector(selector)) + { + sceneModified = true; + migratedCount++; + } + } + + if (sceneModified) + { + EditorSceneManager.MarkSceneDirty(scene); + EditorSceneManager.SaveScene(scene); + } + } + + // Restore the user's initially opened scenes + if (setup != null && setup.Length > 0) + { + EditorSceneManager.RestoreSceneManagerSetup(setup); + } + + // Save all the SetDirty changes we applied to the prefabs + AssetDatabase.SaveAssets(); + + Debug.Log($"[{nameof(FontIconSelectorMigrationUtility)}] Migration complete! Processed and upgraded {migratedCount} FontIconSelectors."); + } + + /// + /// Checks a selector's serialization state, runs migration, and dirty flags it if changes occurred. + /// + private static bool ProcessSelector(FontIconSelector selector) + { + Undo.RecordObject(selector, "Migrate Font Icon Selector"); + + if (selector.TryMigrate()) + { + // Ensure that changes to prefab instances in scenes are explicitly recorded as overrides. + if (PrefabUtility.IsPartOfPrefabInstance(selector)) + { + PrefabUtility.RecordPrefabInstancePropertyModifications(selector); + } + + EditorUtility.SetDirty(selector); + return true; + } + + return false; + } + } +} diff --git a/org.mixedrealitytoolkit.uxcore/Editor/FontIconSelectorMigrationUtility.cs.meta b/org.mixedrealitytoolkit.uxcore/Editor/FontIconSelectorMigrationUtility.cs.meta new file mode 100644 index 000000000..5c74fcfa9 --- /dev/null +++ b/org.mixedrealitytoolkit.uxcore/Editor/FontIconSelectorMigrationUtility.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 2ad50c43ce4334344b21243c33f0279c +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/org.mixedrealitytoolkit.uxcore/Editor/Inspectors/FontIconSet/FontIconSelectorInspector.cs b/org.mixedrealitytoolkit.uxcore/Editor/Inspectors/FontIconSet/FontIconSelectorInspector.cs index 115528aeb..48f9c8206 100644 --- a/org.mixedrealitytoolkit.uxcore/Editor/Inspectors/FontIconSet/FontIconSelectorInspector.cs +++ b/org.mixedrealitytoolkit.uxcore/Editor/Inspectors/FontIconSet/FontIconSelectorInspector.cs @@ -1,8 +1,8 @@ - // Copyright (c) Mixed Reality Toolkit Contributors // Licensed under the BSD 3-Clause using MixedReality.Toolkit.UX; +using System.Collections.Generic; using TMPro; using UnityEditor; using UnityEngine; @@ -13,22 +13,16 @@ namespace MixedReality.Toolkit.Editor [CanEditMultipleObjects] class FontIconSelectorInspector : UnityEditor.Editor { - - private const string defaultShaderName = "TextMeshPro/Distance Field SSD"; - private float fontTileSize = 32; - - private static Material fontRenderMaterial; - - private const string noFontIconsMessage = "No IconFontSet profile selected. No icons available."; - private const string emptyFontIconSetMessage = "The selected IconFontSet profile has no icons defined. Please edit the IconFontSet."; + private const string NoFontIconsMessage = "No FontIconSet profile selected. No icons available."; + private const string EmptyFontIconSetMessage = "The selected FontIconSet profile has no icons defined. Please edit the FontIconSet."; private SerializedProperty fontIconsProp = null; private SerializedProperty currentIconNameProp = null; private SerializedProperty tmProProp = null; - private GUIStyle currentButtonStyle; + private GUIStyle currentButtonStyle = null; - private bool initializedStyle = false; + private float fontTileSize = 32; /// /// A Unity event function that is called when the script component has been enabled. @@ -38,7 +32,31 @@ private void OnEnable() fontIconsProp = serializedObject.FindProperty("fontIcons"); currentIconNameProp = serializedObject.FindProperty("currentIconName"); tmProProp = serializedObject.FindProperty("textMeshProComponent"); - + + bool migratedAny = false; + foreach (Object targetObject in targets) + { + FontIconSelector selector = targetObject as FontIconSelector; + if (selector != null) + { + Undo.RecordObject(selector, "Migrate Font Icon Selector"); + + if (selector.TryMigrate()) + { + EditorUtility.SetDirty(selector); + if (PrefabUtility.IsPartOfPrefabInstance(selector)) + { + PrefabUtility.RecordPrefabInstancePropertyModifications(selector); + } + migratedAny = true; + } + } + } + + if (migratedAny) + { + serializedObject.Update(); + } } /// @@ -46,11 +64,9 @@ private void OnEnable() /// public override void OnInspectorGUI() { - if (!initializedStyle) - { - currentButtonStyle = new GUIStyle(GUI.skin.button); - initializedStyle = true; - } + serializedObject.Update(); + + currentButtonStyle ??= new GUIStyle(GUI.skin.button); FontIconSelector fontIconSelector = (FontIconSelector)target; FontIconSet fontIconSet = fontIconSelector.FontIcons; @@ -66,11 +82,11 @@ public override void OnInspectorGUI() if (fontIconsProp.objectReferenceValue == null) { - EditorGUILayout.HelpBox(noFontIconsMessage, MessageType.Warning); + EditorGUILayout.HelpBox(NoFontIconsMessage, MessageType.Warning); } else if (!fontIconSet || fontIconSet.GlyphIconsByName.Count == 0) { - EditorGUILayout.HelpBox(emptyFontIconSetMessage, MessageType.Warning); + EditorGUILayout.HelpBox(EmptyFontIconSetMessage, MessageType.Warning); } else { @@ -90,8 +106,9 @@ public override void OnInspectorGUI() } private int numColumns = 4; - private Vector2 scrollAmount; + private float cachedTileSize = 0f; + private GUILayoutOption[] cachedButtonOptions; public void DrawIconGrid(FontIconSelector fontIconSelector, float tileSize) { @@ -101,45 +118,68 @@ public void DrawIconGrid(FontIconSelector fontIconSelector, float tileSize) scrollAmount = EditorGUILayout.BeginScrollView(scrollAmount, GUILayout.MaxHeight(128), GUILayout.MinHeight(64)); EditorGUILayout.BeginHorizontal(); - - foreach (string iconName in fontIconSet.GlyphIconsByName.Keys) + + List> sortedIcons = new List>(fontIconSet.GlyphIconsByName); + sortedIcons.Sort((a, b) => a.Key.CompareTo(b.Key)); + + if (cachedTileSize != tileSize || cachedButtonOptions == null) + { + cachedTileSize = tileSize; + cachedButtonOptions = new GUILayoutOption[] { GUILayout.Height(tileSize), GUILayout.Width(tileSize) }; + } + + foreach (KeyValuePair kvp in sortedIcons) { - uint unicodeValue = fontIconSet.GlyphIconsByName[iconName]; - bool selected = (iconName == fontIconSelector.CurrentIconName); + string iconName = kvp.Key; + uint unicodeValue = kvp.Value; + if (column >= numColumns) { column = 0; EditorGUILayout.EndHorizontal(); EditorGUILayout.BeginHorizontal(); } - if (GUILayout.Button(" ", - GUILayout.MinHeight(tileSize), - GUILayout.MaxHeight(tileSize), - GUILayout.MinWidth(tileSize), - GUILayout.MaxWidth(tileSize))) + + if (GUILayout.Button(" ", cachedButtonOptions)) { - Undo.RecordObjects(new UnityEngine.Object[]{fontIconSelector, fontIconSelector.TextMeshProComponent}, "Changed icon"); + // Flush any pending changes from other Inspector fields (e.g. lost focus) manually editing the icon name + serializedObject.ApplyModifiedProperties(); + + if (fontIconSelector.TextMeshProComponent != null) + { + Undo.RecordObjects(new Object[] { fontIconSelector, fontIconSelector.TextMeshProComponent }, "Changed icon"); + } + else + { + Undo.RecordObject(fontIconSelector, "Changed icon"); + } + fontIconSelector.CurrentIconName = iconName; + PrefabUtility.RecordPrefabInstancePropertyModifications(fontIconSelector); - PrefabUtility.RecordPrefabInstancePropertyModifications(fontIconSelector.TextMeshProComponent); + if (fontIconSelector.TextMeshProComponent != null) + { + PrefabUtility.RecordPrefabInstancePropertyModifications(fontIconSelector.TextMeshProComponent); + } + + // Resync the serialized object after manually editing the icon name + serializedObject.Update(); } + Rect textureRect = GUILayoutUtility.GetLastRect(); if (textureRect.yMin + 8 < scrollAmount.y || textureRect.yMax - 8 > scrollAmount.y + 128) { unicodeValue = 0; } - textureRect.width = tileSize; textureRect.height = tileSize; - FontIconSetInspector.EditorDrawTMPGlyph(textureRect, unicodeValue, fontAsset, selected); + FontIconSetInspector.EditorDrawTMPGlyph(textureRect, unicodeValue, fontAsset, iconName == fontIconSelector.CurrentIconName); + column++; } - if (column > 0) - { - EditorGUILayout.EndHorizontal(); - } - + EditorGUILayout.EndHorizontal(); + if (Event.current.type == EventType.Repaint) { float editorWindowWidth = GUILayoutUtility.GetLastRect().width; diff --git a/org.mixedrealitytoolkit.uxcore/Editor/Inspectors/FontIconSet/FontIconSetInspector.cs b/org.mixedrealitytoolkit.uxcore/Editor/Inspectors/FontIconSet/FontIconSetInspector.cs index f500e5882..38aa1af8d 100644 --- a/org.mixedrealitytoolkit.uxcore/Editor/Inspectors/FontIconSet/FontIconSetInspector.cs +++ b/org.mixedrealitytoolkit.uxcore/Editor/Inspectors/FontIconSet/FontIconSetInspector.cs @@ -1,4 +1,3 @@ - // Copyright (c) Mixed Reality Toolkit Contributors // Licensed under the BSD 3-Clause @@ -23,49 +22,110 @@ public class FontIconSetInspector : UnityEditor.Editor private const string AvailableIconsFoldoutKey = "MixedRealityToolkit.FontIconSet.ShowAvailableIcons"; private const string SelectedIconsFoldoutKey = "MixedRealityToolkit.FontIconSet.ShowSelectedIcons"; - private const string defaultShaderName = "TextMeshPro/Distance Field SSD"; // Only used for presentation in inspector, not at runtime. - private const int glyphDrawSize = 75; - private const int buttonWidth = 75; - private const int buttonHeight = 90; - private const int maxButtonsPerColumn = 6; - - private static Material fontRenderMaterial; + private const string DefaultShaderName = "TextMeshPro/Distance Field SSD"; // Only used for presentation in inspector, not at runtime. + private const int GlyphDrawSize = 75; + private const int ButtonDimension = 75; + private const int MaxButtonsPerColumn = 6; - private const string noIconFontMessage = "No icon font asset selected. Icon fonts will be unavailable."; - private const string downloadIconFontMessage = "For instructions on how to install the HoloLens icon font asset, click the button below."; - private const string hololensIconFontUrl = "https://docs.microsoft.com/windows/mixed-reality/mrtk-unity/features/ux-building-blocks/button"; - private const string mdl2IconFontName = "holomdl2"; - private const string textMeshProMenuItem = "Window/TextMeshPro/Font Asset Creator"; + private const string NoIconFontMessage = "No icon font asset selected. Icon fonts will be unavailable."; + private const string DownloadIconFontMessage = "For instructions on how to install the HoloLens icon font asset, click the button below."; + private const string HoloLensIconFontUrl = "https://docs.microsoft.com/windows/mixed-reality/mrtk-unity/features/ux-building-blocks/button"; + private const string MDL2IconFontName = "holomdl2"; + private const string TextMeshProMenuItem = "Window/TextMeshPro/Font Asset Creator"; private SerializedProperty iconFontAssetProp = null; + private SerializedProperty fontIconSetDefinitionProp = null; - private class IconEntry - { - public string Name; - public uint UnicodeValue; - - public IconEntry(string name, uint unicodeValue) - { - Name = name; - UnicodeValue = unicodeValue; - } - } + private List> iconEntries = new List>(); + private List validNames = new List(); + private HashSet selectedUnicodeValues = new HashSet(); + private string[] availableNamesArray = Array.Empty(); + private bool requiresUpdate = false; - private List iconEntries = new List(); + // Deferred State Variables + private uint? pendingIconToAdd = null; + private string pendingIconToRemove = null; + private string pendingIconToRenameOld = null; + private string pendingIconToRenameNew = null; /// /// A Unity event function that is called when the script component has been enabled. /// private void OnEnable() { - FontIconSet fontIconSet = (FontIconSet)target; iconFontAssetProp = serializedObject.FindProperty("iconFontAsset"); + fontIconSetDefinitionProp = serializedObject.FindProperty("fontIconSetDefinition"); + + foreach (UnityEngine.Object targetObject in targets) + { + FontIconSet fontIconSet = targetObject as FontIconSet; + if (fontIconSet != null && fontIconSet.SortIcons()) + { + EditorUtility.SetDirty(fontIconSet); + } + } + + // Listen for undo/redo events to ensure our local iconEntries cache stays in sync + Undo.undoRedoPerformed += OnUndoRedo; + UpdateIconEntries(); + } + + private void OnDisable() + { + Undo.undoRedoPerformed -= OnUndoRedo; + } + + private void OnUndoRedo() + { + requiresUpdate = true; + Repaint(); + } + + private void UpdateIconEntries() + { + FontIconSet fontIconSet = target as FontIconSet; + if (fontIconSet == null) { return; } + + iconEntries.Clear(); + + if (iconEntries.Capacity < fontIconSet.GlyphIconsByName.Count) + { + iconEntries.Capacity = fontIconSet.GlyphIconsByName.Count; + } + + selectedUnicodeValues.Clear(); - // Make a list out of dictionary to avoid changing order while editing names foreach (KeyValuePair kv in fontIconSet.GlyphIconsByName) { - iconEntries.Add(new IconEntry(kv.Key, kv.Value)); + iconEntries.Add(new KeyValuePair(kv.Value, kv.Key)); + selectedUnicodeValues.Add(kv.Value); + } + iconEntries.Sort((a, b) => a.Key.CompareTo(b.Key)); + + validNames.Clear(); + + if (fontIconSetDefinitionProp != null) + { + FontIconSetDefinition setDefinition = fontIconSetDefinitionProp.objectReferenceValue as FontIconSetDefinition; + if (setDefinition != null && setDefinition.IconNames != null) + { + foreach (string name in setDefinition.IconNames) + { + validNames.Add(name); + } + availableNamesArray = GetAvailableIconNames(fontIconSet, setDefinition); + } + else + { + availableNamesArray = new string[] { string.Empty }; + } + } + else + { + availableNamesArray = new string[] { string.Empty }; } + + Repaint(); } /// @@ -73,7 +133,40 @@ private void OnEnable() /// public override void OnInspectorGUI() { - FontIconSet fontIconSet = (FontIconSet)target; + if (Event.current.type == EventType.Layout) + { + if (pendingIconToAdd.HasValue) + { + foreach (var t in targets) + { + requiresUpdate |= AddIcon((FontIconSet)t, pendingIconToAdd.Value); + } + pendingIconToAdd = null; + } + if (pendingIconToRemove != null) + { + foreach (var t in targets) + { + requiresUpdate |= RemoveIcon((FontIconSet)t, pendingIconToRemove); + } + pendingIconToRemove = null; + } + if (pendingIconToRenameOld != null && pendingIconToRenameNew != null) + { + foreach (var t in targets) + { + requiresUpdate |= UpdateIconName((FontIconSet)t, pendingIconToRenameOld, pendingIconToRenameNew); + } + pendingIconToRenameOld = null; + pendingIconToRenameNew = null; + } + + if (requiresUpdate) + { + UpdateIconEntries(); + requiresUpdate = false; + } + } bool showGlyphIconFoldout = SessionState.GetBool(ShowGlyphIconsFoldoutKey, false); bool showAvailableIcons = SessionState.GetBool(AvailableIconsFoldoutKey, true); @@ -81,31 +174,40 @@ public override void OnInspectorGUI() serializedObject.Update(); - showGlyphIconFoldout = EditorGUILayout.BeginFoldoutHeaderGroup(showGlyphIconFoldout, "Font Icons"); - EditorGUILayout.EndFoldoutHeaderGroup(); - + showGlyphIconFoldout = EditorGUILayout.Foldout(showGlyphIconFoldout, "Font Icons", true); if (showGlyphIconFoldout) { EditorGUILayout.PropertyField(iconFontAssetProp); + EditorGUI.BeginChangeCheck(); + EditorGUILayout.PropertyField(fontIconSetDefinitionProp); + if (EditorGUI.EndChangeCheck()) + { + serializedObject.ApplyModifiedProperties(); + requiresUpdate = true; + } if (iconFontAssetProp.objectReferenceValue == null) { - EditorGUILayout.HelpBox(noIconFontMessage, MessageType.Warning); - if (!CheckIfHololensIconFontExists()) + EditorGUILayout.HelpBox(NoIconFontMessage, MessageType.Warning); + if (!CheckIfHoloLensIconFontExists()) { - EditorGUILayout.HelpBox(downloadIconFontMessage, MessageType.Info); + EditorGUILayout.HelpBox(DownloadIconFontMessage, MessageType.Info); if (GUILayout.Button("View Font Asset Icons Documentation")) { - EditorApplication.ExecuteMenuItem(textMeshProMenuItem); - Application.OpenURL(hololensIconFontUrl); + EditorApplication.ExecuteMenuItem(TextMeshProMenuItem); + Application.OpenURL(HoloLensIconFontUrl); } } } else { - TMP_FontAsset fontAsset = (TMP_FontAsset)iconFontAssetProp.objectReferenceValue; + FontIconSet fontIconSet = target as FontIconSet; + TMP_FontAsset fontAsset = iconFontAssetProp.objectReferenceValue as TMP_FontAsset; + if (fontAsset == null) { return; } + + FontIconSetDefinition setDefinition = fontIconSetDefinitionProp.objectReferenceValue as FontIconSetDefinition; - showAvailableIcons = EditorGUILayout.BeginFoldoutHeaderGroup(showAvailableIcons, "Available Icons"); + showAvailableIcons = EditorGUILayout.Foldout(showAvailableIcons, "Available Icons", true); if (showAvailableIcons) { if (fontAsset.characterTable.Count == 0) @@ -113,7 +215,7 @@ public override void OnInspectorGUI() EditorGUILayout.HelpBox("No icons are available in this font. The font may be configured incorrectly.", MessageType.Warning); if (GUILayout.Button("Open Font Editor")) { - Selection.activeObject = fontIconSet.IconFontAsset; + Selection.activeObject = fontAsset; } } else @@ -121,64 +223,90 @@ public override void OnInspectorGUI() EditorGUILayout.HelpBox("Click an icon to add it to your selected icons.", MessageType.Info); if (GUILayout.Button("Open Font Editor")) { - Selection.activeObject = fontIconSet.IconFontAsset; + Selection.activeObject = fontAsset; } - DrawFontGlyphsGrid(fontIconSet, maxButtonsPerColumn); + DrawFontGlyphsGrid(fontAsset, MaxButtonsPerColumn); } EditorGUILayout.Space(); } - EditorGUILayout.EndFoldoutHeaderGroup(); - showSelectedIcons = EditorGUILayout.BeginFoldoutHeaderGroup(showSelectedIcons, "Selected Icons"); + showSelectedIcons = EditorGUILayout.Foldout(showSelectedIcons, "Selected Icons", true); if (showSelectedIcons) { - if (fontIconSet.GlyphIconsByName.Count > 0) + if (iconEntries.Count > 0) { EditorGUILayout.HelpBox("These icons will appear in the button config helper inspector. Click an icon to remove it from this list.", MessageType.Info); - using (new EditorGUILayout.VerticalScope()) + if (fontIconSetDefinitionProp.objectReferenceValue == null) + { + EditorGUILayout.HelpBox("It's recommended to use a Font Icon Set Definition to ensure consistent icon names across icon sets.", MessageType.Warning); + } + else { - string iconToRemove = null; - foreach (IconEntry iconEntry in iconEntries) + DrawInvalidIconNameHelpBox(fontIconSet, setDefinition); + + // Catch edge cases where the external asset size changes while this inspector is still focused + if (setDefinition.IconNames != null && validNames.Count != setDefinition.IconNames.Count) { - using (new EditorGUILayout.HorizontalScope()) - { - if (GUILayout.Button(" ", GUILayout.MinHeight(buttonHeight), GUILayout.MaxHeight(buttonHeight), GUILayout.MaxWidth(buttonWidth))) - { - iconToRemove = iconEntry.Name; - } - Rect textureRect = GUILayoutUtility.GetLastRect(); - textureRect.width = glyphDrawSize; - textureRect.height = glyphDrawSize; - EditorDrawTMPGlyph(textureRect, iconEntry.UnicodeValue, fontAsset); - - string currentName = iconEntry.Name; - currentName = EditorGUILayout.TextField(currentName); - if (currentName != iconEntry.Name) - { - UpdateIconName(fontIconSet, iconEntry.Name, currentName); - } - EditorGUILayout.Space(); - } + requiresUpdate = true; + } + } - EditorGUILayout.Space(); + int column = 0; + EditorGUILayout.BeginHorizontal(); + foreach (KeyValuePair iconEntry in iconEntries) + { + if (column >= MaxButtonsPerColumn) + { + column = 0; + EditorGUILayout.EndHorizontal(); + EditorGUILayout.BeginHorizontal(); + } + + EditorGUILayout.BeginVertical(GUILayout.Width(ButtonDimension)); + + if (GUILayout.Button(" ", + GUILayout.Height(ButtonDimension), + GUILayout.MaxWidth(ButtonDimension))) + { + pendingIconToRemove = iconEntry.Value; } - if (iconToRemove != null) + Rect textureRect = GUILayoutUtility.GetLastRect(); + textureRect.width = GlyphDrawSize; + textureRect.height = GlyphDrawSize; + EditorDrawTMPGlyph(textureRect, iconEntry.Key, fontAsset); + + if (fontIconSetDefinitionProp.objectReferenceValue != null) + { + if (DrawIconNamePopup(iconEntry.Value, availableNamesArray, validNames, ButtonDimension, out string newName)) + { + pendingIconToRenameNew = newName; + pendingIconToRenameOld = iconEntry.Value; + } + } + else { - RemoveIcon(fontIconSet, iconToRemove); + string currentName = EditorGUILayout.TextField(iconEntry.Value); + if (currentName != iconEntry.Value) + { + pendingIconToRenameNew = currentName; + pendingIconToRenameOld = iconEntry.Value; + } } + EditorGUILayout.EndVertical(); + + column++; } + EditorGUILayout.EndHorizontal(); } else { EditorGUILayout.HelpBox("No icons added yet. Click available icons to add.", MessageType.Info); } } - - EditorGUILayout.EndFoldoutHeaderGroup(); } } @@ -194,9 +322,20 @@ public override void OnInspectorGUI() /// /// The set of font glyphs to draw. /// The number of buttons per column. + [Obsolete("This method has been deprecated in version 4.0 and will be removed in a future version.")] public void DrawFontGlyphsGrid(FontIconSet fontIconSet, int maxButtonsPerColumn) { - TMP_FontAsset fontAsset = fontIconSet.IconFontAsset; + DrawFontGlyphsGrid(fontIconSet.IconFontAsset, maxButtonsPerColumn); + } + + /// + /// Draw a grid of buttons than can be clicked to select a glyph from a set up glyphs. + /// + /// The font asset containing the glyphs. + /// The set of font glyphs to draw. + /// The number of buttons per column. + private void DrawFontGlyphsGrid(TMP_FontAsset fontAsset, int maxButtonsPerColumn) + { int column = 0; EditorGUILayout.BeginHorizontal(); for (int i = 0; i < fontAsset.characterTable.Count; i++) @@ -207,84 +346,175 @@ public void DrawFontGlyphsGrid(FontIconSet fontIconSet, int maxButtonsPerColumn) EditorGUILayout.EndHorizontal(); EditorGUILayout.BeginHorizontal(); } - if (GUILayout.Button(" ", - GUILayout.MinHeight(buttonHeight), - GUILayout.MaxHeight(buttonHeight), - GUILayout.MaxWidth(buttonWidth))) + + using (new EditorGUI.DisabledGroupScope(selectedUnicodeValues.Contains(fontAsset.characterTable[i].unicode))) { - AddIcon(fontIconSet, fontAsset.characterTable[i].unicode); - EditorUtility.SetDirty(target); + if (GUILayout.Button(" ", + GUILayout.Height(ButtonDimension), + GUILayout.MaxWidth(ButtonDimension))) + { + pendingIconToAdd = fontAsset.characterTable[i].unicode; + } + + Rect textureRect = GUILayoutUtility.GetLastRect(); + textureRect.width = GlyphDrawSize; + textureRect.height = GlyphDrawSize; + EditorDrawTMPGlyph(textureRect, fontAsset, fontAsset.characterTable[i]); } - Rect textureRect = GUILayoutUtility.GetLastRect(); - textureRect.width = glyphDrawSize; - textureRect.height = glyphDrawSize; - EditorDrawTMPGlyph(textureRect, fontAsset, fontAsset.characterTable[i]); - column++; - } - if (column > 0) - { - EditorGUILayout.EndHorizontal(); + column++; } + EditorGUILayout.EndHorizontal(); } private bool AddIcon(FontIconSet fontIconSet, uint unicodeValue) { - string name = "Icon " + (iconEntries.Count + 1); + string name = $"Icon {unicodeValue}"; + + Undo.RecordObject(fontIconSet, "Add Icon"); if (fontIconSet.AddIcon(name, unicodeValue)) { - iconEntries.Add(new IconEntry(name, unicodeValue)); + EditorUtility.SetDirty(fontIconSet); + return true; } - return true; + return false; } private bool RemoveIcon(FontIconSet fontIconSet, string iconName) { - bool removed = fontIconSet.RemoveIcon(iconName); - if (removed) + if (fontIconSet.TryGetGlyphIcon(iconName, out uint unicodeValue)) { - if (FindIconIndexByName(iconName, out int index)) + Undo.RecordObject(fontIconSet, "Remove Icon"); + if (fontIconSet.RemoveIcon(iconName)) { - iconEntries.RemoveAt(index); + EditorUtility.SetDirty(fontIconSet); + return true; } } - return removed; + return false; + } + + private bool UpdateIconName(FontIconSet fontIconSet, string oldName, string newName) + { + Undo.RecordObject(fontIconSet, "Rename Icon"); + if (fontIconSet.UpdateIconName(oldName, newName)) + { + EditorUtility.SetDirty(fontIconSet); + return true; + } + return false; } - private bool FindIconIndexByName(string iconName, out int outIndex) + private bool CheckIfHoloLensIconFontExists() { - for (outIndex = 0; outIndex < iconEntries.Count; outIndex++) + foreach (string guid in AssetDatabase.FindAssets($"t:{nameof(Font)}")) { - if (iconEntries[outIndex].Name == iconName) + if (AssetDatabase.GUIDToAssetPath(guid).Contains(MDL2IconFontName)) { return true; } } - outIndex = -1; return false; } - private void UpdateIconName(FontIconSet fontIconSet, string oldName, string newName) + /// + /// Generates an array of available icon names (those present in the definition but not yet assigned in the icon set), + /// with an empty string at index 0 to act as a placeholder for the currently selected icon name. + /// + public static string[] GetAvailableIconNames(FontIconSet iconSet, FontIconSetDefinition setDefinition) { - if (fontIconSet.UpdateIconName(oldName, newName)) + if (iconSet == null || setDefinition == null || setDefinition.IconNames == null) + { + return null; + } + + List availableNames = new List(); + foreach (string name in setDefinition.IconNames) + { + if (!iconSet.GlyphIconsByName.ContainsKey(name)) + { + availableNames.Add(name); + } + } + availableNames.Sort(); + availableNames.Insert(0, string.Empty); + return availableNames.ToArray(); + } + + /// + /// Draws a warning HelpBox if the provided contains assigned icon names that are not present in the . + /// + public static void DrawInvalidIconNameHelpBox(FontIconSet iconSet, FontIconSetDefinition setDefinition) + { + if (iconSet == null || setDefinition == null || setDefinition.IconNames == null) + { + return; + } + + foreach (string assignedName in iconSet.GlyphIconsByName.Keys) { - if (FindIconIndexByName(oldName, out int index)) + bool isNameValid = false; + foreach (string validName in setDefinition.IconNames) { - iconEntries[index].Name = newName; + if (validName == assignedName) + { + isNameValid = true; + break; + } + } + + if (!isNameValid) + { + EditorGUILayout.HelpBox("Icon names highlighted yellow are not present in the selected Font Icon Set Definition and should be updated.", MessageType.Warning); + return; } } } - private bool CheckIfHololensIconFontExists() + /// + /// Draws a popup for renaming an icon, highlighting it yellow if the name is invalid/missing from the definition. + /// + public static bool DrawIconNamePopup(string currentName, string[] availableNamesArray, IEnumerable validNames, float maxWidth, out string newName) { - foreach (string guid in AssetDatabase.FindAssets($"t:{typeof(UnityEngine.Font).Name}")) + newName = currentName; + if (availableNamesArray == null || availableNamesArray.Length == 0) + { + return false; + } + + availableNamesArray[0] = currentName; + + bool changed = false; + using (var check = new EditorGUI.ChangeCheckScope()) { - if (AssetDatabase.GUIDToAssetPath(guid).Contains(mdl2IconFontName)) + Color oldColor = GUI.backgroundColor; + + bool isNameValid = false; + foreach (string validName in validNames) { - return true; + if (validName == currentName) + { + isNameValid = true; + break; + } + } + + if (!isNameValid) + { + GUI.backgroundColor = Color.yellow; + } + + int selected = EditorGUILayout.Popup(string.Empty, 0, availableNamesArray, GUILayout.MaxWidth(maxWidth)); + if (check.changed) + { + newName = availableNamesArray[selected]; + changed = true; } + + GUI.backgroundColor = oldColor; } - return false; + + return changed; } /// @@ -292,7 +522,7 @@ private bool CheckIfHololensIconFontExists() /// public static void EditorDrawTMPGlyph(Rect position, uint unicode, TMP_FontAsset fontAsset, bool selected = false, Material fontRenderMaterial = null) { - if (fontAsset.characterLookupTable.TryGetValue(unicode, out TMP_Character character)) + if (fontAsset != null && fontAsset.characterLookupTable.TryGetValue(unicode, out TMP_Character character)) { EditorDrawTMPGlyph(position, fontAsset, character, selected, fontRenderMaterial); } @@ -301,13 +531,13 @@ public static void EditorDrawTMPGlyph(Rect position, uint unicode, TMP_FontAsset /// /// Draws a Text Mesh Pro glyph in the supplied . /// - public static void EditorDrawTMPGlyph(Rect glyphRect, TMP_FontAsset fontAsset, TMP_Character character, bool selected = false, Material fontRenderMaterial = null) + private static void EditorDrawTMPGlyph(Rect glyphRect, TMP_FontAsset fontAsset, TMP_Character character, bool selected = false, Material fontRenderMaterial = null) { if (Event.current.type == EventType.Repaint) { try { - float iconSizeMultiplier = 0.625f; + const float IconSizeMultiplier = 0.625f; // Get a reference to the Glyph Table int glyphIndex = (int)character.glyphIndex; @@ -325,20 +555,12 @@ public static void EditorDrawTMPGlyph(Rect glyphRect, TMP_FontAsset fontAsset, T { if (fontRenderMaterial == null) { - fontRenderMaterial = new Material(Shader.Find(defaultShaderName)); + fontRenderMaterial = new Material(Shader.Find(DefaultShaderName)); } Material glyphMaterial = fontRenderMaterial; glyphMaterial.mainTexture = atlasTexture; - - if (selected) - { - glyphMaterial.SetColor("_Color", Color.green); - } - else - { - glyphMaterial.SetColor("_Color", Color.white); - } + glyphMaterial.SetColor("_FaceColor", selected ? Color.green : Color.white); int glyphOriginX = glyph.glyphRect.x; int glyphOriginY = glyph.glyphRect.y; @@ -346,13 +568,13 @@ public static void EditorDrawTMPGlyph(Rect glyphRect, TMP_FontAsset fontAsset, T int glyphHeight = glyph.glyphRect.height; float normalizedHeight = fontAsset.faceInfo.ascentLine - fontAsset.faceInfo.descentLine; - float scale = Mathf.Min(glyphRect.width, glyphRect.height) / normalizedHeight * iconSizeMultiplier; + float scale = Mathf.Min(glyphRect.width, glyphRect.height) / normalizedHeight * IconSizeMultiplier; // Compute the normalized texture coordinates Rect texCoords = new Rect((float)glyphOriginX / atlasTexture.width, (float)glyphOriginY / atlasTexture.height, (float)glyphWidth / atlasTexture.width, (float)glyphHeight / atlasTexture.height); - glyphWidth = (int)Mathf.Min(glyphDrawSize, glyphWidth * scale); - glyphHeight = (int)Mathf.Min(glyphDrawSize, glyphHeight * scale); + glyphWidth = (int)Mathf.Min(GlyphDrawSize, glyphWidth * scale); + glyphHeight = (int)Mathf.Min(GlyphDrawSize, glyphHeight * scale); glyphRect.x += (glyphRect.width - glyphWidth) / 2; glyphRect.y += (glyphRect.height - glyphHeight) / 2; @@ -364,9 +586,9 @@ public static void EditorDrawTMPGlyph(Rect glyphRect, TMP_FontAsset fontAsset, T } } } - catch (Exception) + catch (Exception e) { - EditorGUILayout.LabelField("Couldn't draw character icon. UnicodeValue may not be available in the font asset."); + GUI.Label(glyphRect, new GUIContent($"Couldn't draw icon: {e.Message}")); } } } diff --git a/org.mixedrealitytoolkit.uxcore/Editor/Inspectors/PressableButton/PressableButtonInspector.cs b/org.mixedrealitytoolkit.uxcore/Editor/Inspectors/PressableButton/PressableButtonInspector.cs index ea8889c10..80505eac0 100644 --- a/org.mixedrealitytoolkit.uxcore/Editor/Inspectors/PressableButton/PressableButtonInspector.cs +++ b/org.mixedrealitytoolkit.uxcore/Editor/Inspectors/PressableButton/PressableButtonInspector.cs @@ -195,11 +195,7 @@ private float DrawPlaneAndHandle(Vector3[] vertices, Vector2 halfExtents, float Handles.ArrowHandleCap(0, vertices[1], Quaternion.LookRotation(planeNormal), handleSize * 2, EventType.Repaint); Handles.ArrowHandleCap(0, vertices[1], Quaternion.LookRotation(-planeNormal), handleSize * 2, EventType.Repaint); -#if UNITY_2022_1_OR_NEWER Vector3 newPosition = Handles.FreeMoveHandle(vertices[1], handleSize, Vector3.zero, Handles.SphereHandleCap); -#else - Vector3 newPosition = Handles.FreeMoveHandle(vertices[1], Quaternion.identity, handleSize, Vector3.zero, Handles.SphereHandleCap); -#endif if (!newPosition.Equals(vertices[1])) { diff --git a/org.mixedrealitytoolkit.uxcore/Editor/Inspectors/Slider/SliderInspector.cs b/org.mixedrealitytoolkit.uxcore/Editor/Inspectors/Slider/SliderInspector.cs index 97162249a..169da2c2e 100644 --- a/org.mixedrealitytoolkit.uxcore/Editor/Inspectors/Slider/SliderInspector.cs +++ b/org.mixedrealitytoolkit.uxcore/Editor/Inspectors/Slider/SliderInspector.cs @@ -69,31 +69,15 @@ private void OnSceneGUI() EditorGUI.BeginChangeCheck(); -#if UNITY_2022_1_OR_NEWER Vector3 newStartPosition = Handles.FreeMoveHandle(startPos, handleSize, Vector3.zero, Handles.SphereHandleCap); -#else - Vector3 newStartPosition = Handles.FreeMoveHandle(startPos, - Quaternion.identity, - handleSize, - Vector3.zero, - Handles.SphereHandleCap); -#endif -#if UNITY_2022_1_OR_NEWER - Vector3 newEndPosition = Handles.FreeMoveHandle(endPos, - handleSize, - Vector3.zero, - Handles.SphereHandleCap); -#else Vector3 newEndPosition = Handles.FreeMoveHandle(endPos, - Quaternion.identity, handleSize, Vector3.zero, Handles.SphereHandleCap); -#endif if (EditorGUI.EndChangeCheck()) { diff --git a/org.mixedrealitytoolkit.uxcore/Experimental/List/Scrollable.cs b/org.mixedrealitytoolkit.uxcore/Experimental/List/Scrollable.cs index b5a0e2b7b..e5dde1ef4 100644 --- a/org.mixedrealitytoolkit.uxcore/Experimental/List/Scrollable.cs +++ b/org.mixedrealitytoolkit.uxcore/Experimental/List/Scrollable.cs @@ -8,6 +8,8 @@ using UnityEngine; using UnityEngine.UI; using UnityEngine.XR.Interaction.Toolkit; +using UnityEngine.XR.Interaction.Toolkit.Interactables; +using UnityEngine.XR.Interaction.Toolkit.Interactors; namespace MixedReality.Toolkit.UX.Experimental { diff --git a/org.mixedrealitytoolkit.uxcore/FontIcons/FontIconSelector.cs b/org.mixedrealitytoolkit.uxcore/FontIcons/FontIconSelector.cs index 54e81f646..232fec77e 100644 --- a/org.mixedrealitytoolkit.uxcore/FontIcons/FontIconSelector.cs +++ b/org.mixedrealitytoolkit.uxcore/FontIcons/FontIconSelector.cs @@ -1,7 +1,7 @@ // Copyright (c) Mixed Reality Toolkit Contributors // Licensed under the BSD 3-Clause -using System; +using System.Collections.Generic; using TMPro; using UnityEngine; @@ -25,7 +25,7 @@ public class FontIconSelector : MonoBehaviour [Tooltip("The currently selected icon's name, as defined by the FontIconSet.")] [SerializeField] - private string currentIconName; + private string currentIconName = string.Empty; /// /// The currently selected icon's name, as defined by the . @@ -52,6 +52,21 @@ public string CurrentIconName /// public TMP_Text TextMeshProComponent => textMeshProComponent; + /// + /// A temporary variable used to migrate instances of FontIconSelector to use new FontIconSetDefinition names. + /// + /// TODO: Remove this after some time to ensure users have successfully migrated. + [SerializeField, HideInInspector] + private bool migratedSuccessfully = false; + + /// + /// A Unity event function that is called when the script component is added to a GameObject. + /// + private void Reset() + { + textMeshProComponent = GetComponent(); + } + /// /// A Unity event function that is called when an enabled script instance is being loaded. /// @@ -61,6 +76,7 @@ private void Awake() { textMeshProComponent = GetComponent(); } + TryMigrate(); SetIcon(currentIconName); } @@ -72,25 +88,106 @@ private void OnValidate() SetIcon(currentIconName); } - [Tooltip("Any TextMeshPro Font Asset that contains the desired icons as glyphs that map to Unicode character values.")] - [SerializeField] - private TMP_FontAsset iconFontAsset = null; - /// - /// A TextMeshPro Font Asset that contains the desired icons as glyphs that map to Unicode character values. + /// Updates the current and optionally refreshes the icon. /// - public TMP_FontAsset IconFontAsset => iconFontAsset; + /// + /// If you plan on manually setting after calling this method, it's recommended not to refresh the icon here. + /// + /// The new font icon set to use for this selector. + /// Whether to update the icon using the currently-set name using the new font icon set. + public void SetFontIconSet(FontIconSet fontIconSet, bool refreshIcon = false) + { + fontIcons = fontIconSet; + + if (refreshIcon) + { + SetIcon(currentIconName); + } + } + /// + /// Looks up the Unicode value for the specified icon name and applies it to the text component. + /// + /// The descriptive name of the icon to set. private void SetIcon(string newIconName) { - if (fontIcons != null && textMeshProComponent != null) + if (fontIcons != null && textMeshProComponent != null && fontIcons.TryGetGlyphIcon(newIconName, out uint unicodeValue)) + { + currentIconName = newIconName; + textMeshProComponent.text = FontIconSet.ConvertUnicodeToHexString(unicodeValue); + } + } + + /// + /// Attempts to migrate the icon selector to use descriptive names. + /// + /// if a migration was successfully performed or an empty icon state was resolved, otherwise . + public bool TryMigrate() + { + if (fontIcons == null || fontIcons.FontIconSetDefinition == null) { - if (fontIcons.TryGetGlyphIcon(newIconName, out uint unicodeValue)) + return false; + } + + uint unicodeValue = 0; + + if (textMeshProComponent != null && !string.IsNullOrEmpty(textMeshProComponent.text)) + { + unicodeValue = FontIconSet.ConvertHexStringToUnicode(textMeshProComponent.text); + } + + if (unicodeValue == 0) + { + // If there's no icon text assigned, there's nothing to migrate. + if (textMeshProComponent != null) + { + if (!migratedSuccessfully) + { + migratedSuccessfully = true; + return true; + } + } + return false; + } + + // Check if the current icon name is already in sync with the text component's unicode value. + if (fontIcons.TryGetGlyphIcon(currentIconName, out uint expectedUnicode) && expectedUnicode == unicodeValue) + { + if (!migratedSuccessfully) { - currentIconName = newIconName; - textMeshProComponent.text = FontIconSet.ConvertUnicodeToHexString(unicodeValue); + migratedSuccessfully = true; + return true; } + return false; } + + bool foundMatch = false; + + foreach (KeyValuePair kv in fontIcons.GlyphIconsByName) + { + if (kv.Value == unicodeValue) + { + if (currentIconName != kv.Key) + { + Debug.Log($"[{nameof(FontIconSelector)}] Successfully migrated icon: \"{currentIconName}\" to \"{kv.Key}\"", this); + + // Update the backing field directly to avoid calling the property setter during initialization. + currentIconName = kv.Key; + } + + migratedSuccessfully = true; + foundMatch = true; + break; + } + } + + if (!foundMatch) + { + Debug.LogWarning($"[{nameof(FontIconSelector)}] Failed to migrate icon. Unicode value '{unicodeValue}' was not found in FontIconSet '{fontIcons.name}'.", this); + } + + return foundMatch; } } } diff --git a/org.mixedrealitytoolkit.uxcore/FontIcons/FontIconSet.cs b/org.mixedrealitytoolkit.uxcore/FontIcons/FontIconSet.cs index 730ad7324..1964b4c8c 100644 --- a/org.mixedrealitytoolkit.uxcore/FontIcons/FontIconSet.cs +++ b/org.mixedrealitytoolkit.uxcore/FontIcons/FontIconSet.cs @@ -1,7 +1,7 @@ // Copyright (c) Mixed Reality Toolkit Contributors // Licensed under the BSD 3-Clause -using System.Text; +using System.Collections.Generic; using TMPro; using UnityEngine; @@ -28,10 +28,10 @@ public class FontIconSet : ScriptableObject /// /// A mapping between icon names and the unicode value of the glyph it describes. /// - public SerializableDictionary GlyphIconsByName => glyphIconsByName; + public IReadOnlyDictionary GlyphIconsByName => glyphIconsByName; - [Tooltip("Any TextMeshPro Font Asset that contains the desired icons as glyphs that map to Unicode character values.")] [SerializeField] + [Tooltip("Any TextMeshPro Font Asset that contains the desired icons as glyphs that map to Unicode character values.")] private TMP_FontAsset iconFontAsset = null; /// @@ -39,8 +39,8 @@ public class FontIconSet : ScriptableObject /// public TMP_FontAsset IconFontAsset => iconFontAsset; - [Tooltip("Optional material to use for rendering glyphs in editor.")] [SerializeField] + [Tooltip("Optional material to use for rendering glyphs in editor.")] private Material optionalEditorMaterial; /// @@ -48,6 +48,15 @@ public class FontIconSet : ScriptableObject /// public Material OptionalEditorMaterial => optionalEditorMaterial; + [SerializeField] + [Tooltip("Optional definition to provide consistent icon names.")] + private FontIconSetDefinition fontIconSetDefinition; + + /// + /// Optional definition to provide consistent icon names. + /// + public FontIconSetDefinition FontIconSetDefinition => fontIconSetDefinition; + /// /// Try to get a glyph icon's unicode value by name. /// @@ -56,10 +65,24 @@ public class FontIconSet : ScriptableObject /// if icon name found, otherwise . public bool TryGetGlyphIcon(string iconName, out uint unicodeValue) { - unicodeValue = 0; + if (string.IsNullOrEmpty(iconName)) + { + unicodeValue = 0; + return false; + } return glyphIconsByName.TryGetValue(iconName, out unicodeValue); } + /// + /// Checks if an icon with the specified unicode value exists in the set. + /// + /// The unicode value to check. + /// if the unicode value exists, otherwise . + public bool ContainsIcon(uint unicodeValue) + { + return glyphIconsByName.ContainsValue(unicodeValue); + } + /// /// Add icon to the available set based on a glyph in the TMP_FontAsset. /// @@ -70,13 +93,19 @@ public bool AddIcon(string name, uint unicodeValue) { if (glyphIconsByName.ContainsValue(unicodeValue)) { + Debug.LogWarning($"[{nameof(FontIconSet)}] Failed to add icon '{name}'. An icon with the unicode value '{unicodeValue}' already exists in '{this.name}'.", this); return false; } - else + + if (!glyphIconsByName.TryAdd(name, unicodeValue)) { - glyphIconsByName[name] = unicodeValue; - return true; + Debug.LogWarning($"[{nameof(FontIconSet)}] Failed to add icon '{name}'. An icon with that name already exists in '{this.name}'.", this); + return false; } + + SortIcons(); + + return true; } /// @@ -86,15 +115,11 @@ public bool AddIcon(string name, uint unicodeValue) /// Whether it was able to find the name and remove it. public bool RemoveIcon(string iconName) { - if (glyphIconsByName.ContainsKey(iconName)) - { - glyphIconsByName.Remove(iconName); - return true; - } - else + if (string.IsNullOrEmpty(iconName)) { return false; } + return glyphIconsByName.Remove(iconName); } /// @@ -109,18 +134,63 @@ public bool RemoveIcon(string iconName) /// if it was able to find and update the name. public bool UpdateIconName(string oldName, string newName) { - if (glyphIconsByName.ContainsKey(oldName) && !glyphIconsByName.ContainsKey(newName)) + if (string.IsNullOrEmpty(oldName) || string.IsNullOrEmpty(newName)) + { + return false; + } + + if (glyphIconsByName.TryGetValue(oldName, out uint unicodeValue) && glyphIconsByName.TryAdd(newName, unicodeValue) && glyphIconsByName.Remove(oldName)) { - glyphIconsByName[newName] = glyphIconsByName[oldName]; - glyphIconsByName.Remove(oldName); + SortIcons(); return true; } - else + + if (!glyphIconsByName.ContainsKey(oldName)) { - return false; + Debug.LogWarning($"[{nameof(FontIconSet)}] Failed to rename icon '{oldName}'. The icon could not be found in '{this.name}'.", this); } + else if (glyphIconsByName.ContainsKey(newName)) + { + Debug.LogWarning($"[{nameof(FontIconSet)}] Failed to rename icon '{oldName}' to '{newName}'. An icon with the name '{newName}' already exists in '{this.name}'.", this); + } + + return false; } + /// + /// Sorts the icons by their unicode value to ensure deterministic serialization. + /// + /// if the dictionary was modified, otherwise . + public bool SortIcons() + { + bool isSorted = true; + uint previousValue = 0; + foreach (uint value in glyphIconsByName.Values) + { + if (value < previousValue) + { + isSorted = false; + break; + } + previousValue = value; + } + + if (isSorted) + { + return false; + } + + var sortedEntries = new List>(glyphIconsByName); + sortedEntries.Sort((a, b) => a.Value.CompareTo(b.Value)); + + glyphIconsByName.Clear(); + foreach (KeyValuePair kv in sortedEntries) + { + glyphIconsByName.TryAdd(kv.Key, kv.Value); + } + + return true; + } /// /// Converts a unicode string to a uint code (for use with TextMeshPro). /// @@ -128,36 +198,25 @@ public bool UpdateIconName(string oldName, string newName) /// The binary unicode value. public static uint ConvertHexStringToUnicode(string charString) { - uint unicode = 0; - if (string.IsNullOrEmpty(charString)) return 0; - for (int i = 0; i < charString.Length; i++) - { - unicode = charString[i]; - // Handle surrogate pairs - if (i < charString.Length - 1 && char.IsHighSurrogate((char)unicode) && char.IsLowSurrogate(charString[i + 1])) - { - unicode = (uint)char.ConvertToUtf32(charString[i], charString[i + 1]); - i += 1; - } - } - return unicode; + // Retrieve the 32-bit unicode codepoint for the first character in the string, + // automatically handling surrogate pairs if the character is outside the BMP. + return (uint)char.ConvertToUtf32(charString, 0); } /// /// Converts a unicode value to a string. /// /// - /// This is used to convert unicode values into a strings that can be applied to text fields. + /// This is used to convert unicode values into strings that can be applied to text fields. /// /// Unicode value to be converted to a hexadecimal string representation. /// The string version of the unicode value in the form of '\uFFFF', where FFFF is replaced with the associated hexadecimal value. public static string ConvertUnicodeToHexString(uint unicode) { - byte[] bytes = System.BitConverter.GetBytes(unicode); - return Encoding.Unicode.GetString(bytes); + return char.ConvertFromUtf32((int)unicode); } } } diff --git a/org.mixedrealitytoolkit.uxcore/FontIcons/FontIconSetDefinition.cs b/org.mixedrealitytoolkit.uxcore/FontIcons/FontIconSetDefinition.cs new file mode 100644 index 000000000..da535c498 --- /dev/null +++ b/org.mixedrealitytoolkit.uxcore/FontIcons/FontIconSetDefinition.cs @@ -0,0 +1,43 @@ +// Copyright (c) Mixed Reality Toolkit Contributors +// Licensed under the BSD 3-Clause + +using System.Collections.Generic; +using UnityEngine; + +namespace MixedReality.Toolkit.UX +{ + [CreateAssetMenu(fileName = "FontIconSetDefinition", menuName = "MRTK/UX/Font Icon Set Definition")] + public class FontIconSetDefinition : ScriptableObject + { + [SerializeField] + private string[] iconNames; + + /// + /// The list of icon names defined by this asset. + /// + public IReadOnlyList IconNames => iconNames; + +#if UNITY_EDITOR + /// + /// Sorts the icon names and removes duplicates for cleaner serialization. + /// + [ContextMenu("Sort and Deduplicate")] + public void SortAndDeduplicate() + { + if (iconNames == null || iconNames.Length == 0) + { + return; + } + + UnityEditor.Undo.RecordObject(this, "Sort and Deduplicate Icon Names"); + + var uniqueSorted = new List(new HashSet(iconNames)); + uniqueSorted.Sort(); + + iconNames = uniqueSorted.ToArray(); + + UnityEditor.EditorUtility.SetDirty(this); + } +#endif + } +} diff --git a/org.mixedrealitytoolkit.uxcore/FontIcons/FontIconSetDefinition.cs.meta b/org.mixedrealitytoolkit.uxcore/FontIcons/FontIconSetDefinition.cs.meta new file mode 100644 index 000000000..d2f677246 --- /dev/null +++ b/org.mixedrealitytoolkit.uxcore/FontIcons/FontIconSetDefinition.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 073dfa6d3114b214d8a2d2954d572301 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/org.mixedrealitytoolkit.uxcore/FontIcons/MRTKFontIconSetDefinition.asset b/org.mixedrealitytoolkit.uxcore/FontIcons/MRTKFontIconSetDefinition.asset new file mode 100644 index 000000000..787f96148 --- /dev/null +++ b/org.mixedrealitytoolkit.uxcore/FontIcons/MRTKFontIconSetDefinition.asset @@ -0,0 +1,175 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 073dfa6d3114b214d8a2d2954d572301, type: 3} + m_Name: MRTKFontIconSetDefinition + m_EditorClassIdentifier: + iconNames: + - Account Tree + - Add + - Add Circle + - Add Favorite + - Add Group + - Add Location + - Add Note + - Add Tab + - Airplane + - Alarm + - Alarm Off + - Apps + - Arrow Down + - Arrow Left + - Arrow Right + - Arrow Up + - Attach + - Bar Chart + - Block + - Bluetooth + - Book + - Bookmark + - Brightness + - Cached + - Calendar + - Call + - Call End + - Camera + - Cancel + - Cast + - Check + - Chevron Down + - Chevron Left + - Chevron Right + - Chevron Up + - Circle + - Clipboard + - Close + - Cloud + - Color Palette + - Computer + - Copy + - Cut + - Delete + - Devices + - Dialpad + - Display + - Doc + - Draft + - Edit + - Edit Doc + - Erase + - Error + - Exclamation Point + - Exit + - Favorite + - Flag Outline + - Folder + - Globe + - Graph + - Grid View + - Group + - Hand Left + - Hand Right + - Headphones + - Heart Outline + - Hierarchy + - History + - Home + - Horizontal List + - Info + - Keep + - Keyboard + - Label + - Language + - Layout + - Layout Grid + - Lightbulb + - Line Chart + - Link + - Link 2 + - List + - Location Off + - Location On + - Lock + - Mail + - Menu + - Message + - Messenger + - Mic + - Mic Off + - Mobile + - More Horizontal + - More Vertical + - Move + - Movie + - Music + - Music Info + - Music Mute + - Mute + - My Location + - Newspaper + - No Sound + - Notifications + - Notifications Off + - Open In New + - Pan + - Paste + - Pen Tip + - Person + - Phone + - Photo + - Pie Chart + - Pin + - Play + - Play Circle + - Power Button + - Print + - Pushpin + - Question Mark + - Record Circle + - Refresh + - Remove + - Remove Location + - Repeat + - Report + - Reset + - Save + - Save As + - Search + - Send + - Settings + - Settings Sliders + - Shopping Cart + - Show Chart + - Smiley + - Sound + - Sticky Note + - Stop Circle + - Sunny + - Swap Vert + - Tab + - Tag + - Thumb Down + - Thumb Up + - Time + - Tune + - Undo + - Uniform Grid + - Unlock + - Unpin + - User + - Vertical List + - Videocam + - Visibility Off + - Visibility On + - Warning + - Wifi + - Write Mail + - Zoom diff --git a/org.mixedrealitytoolkit.uxcore/FontIcons/MRTKFontIconSetDefinition.asset.meta b/org.mixedrealitytoolkit.uxcore/FontIcons/MRTKFontIconSetDefinition.asset.meta new file mode 100644 index 000000000..d0756e855 --- /dev/null +++ b/org.mixedrealitytoolkit.uxcore/FontIcons/MRTKFontIconSetDefinition.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e63daff880b56ed439a2e852b6e6993a +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/org.mixedrealitytoolkit.uxcore/Interop/CanvasProxyInteractor.cs b/org.mixedrealitytoolkit.uxcore/Interop/CanvasProxyInteractor.cs index aeec7b7d2..2ca66f397 100644 --- a/org.mixedrealitytoolkit.uxcore/Interop/CanvasProxyInteractor.cs +++ b/org.mixedrealitytoolkit.uxcore/Interop/CanvasProxyInteractor.cs @@ -1,9 +1,11 @@ // Copyright (c) Mixed Reality Toolkit Contributors // Licensed under the BSD 3-Clause +using System; using System.Collections.Generic; using UnityEngine; -using UnityEngine.XR.Interaction.Toolkit; +using UnityEngine.XR.Interaction.Toolkit.Interactables; +using UnityEngine.XR.Interaction.Toolkit.Interactors; namespace MixedReality.Toolkit.UX { @@ -11,7 +13,10 @@ namespace MixedReality.Toolkit.UX /// A simple proxy interactor which will select and hover things on MRTK's behalf, for canvas input. /// [AddComponentMenu("MRTK/UX/Canvas Proxy Interactor")] - public class CanvasProxyInteractor : XRBaseInteractor, IProxyInteractor, IModeManagedInteractor + public class CanvasProxyInteractor : + XRBaseInteractor, + IProxyInteractor, + IModeManagedInteractor { /// /// The hash set containing a collection of valid interactable targets for this this interactor. @@ -28,6 +33,9 @@ public class CanvasProxyInteractor : XRBaseInteractor, IProxyInteractor, IModeMa // events (like OnClicked) on any StatefulInteractable. private bool isCancellingInteraction = false; + /// + public GameObject ModeManagedRoot => gameObject; + /// public void StartHover(IXRHoverInteractable target) { @@ -104,7 +112,7 @@ public void EndSelect(IXRSelectInteractable target, bool suppressEvents = false) } } } - + /// public override void GetValidTargets(List targets) { @@ -143,6 +151,7 @@ public override bool isSelectActive public override bool isHoverActive => base.isHoverActive && !isCancellingInteraction; /// - public GameObject GetModeManagedController() => gameObject; + [Obsolete("This function has been deprecated in version 4.0.0 and will be removed in the next major release. Use ModeManagedRoot instead.")] + public GameObject GetModeManagedController() => ModeManagedRoot; } } diff --git a/org.mixedrealitytoolkit.uxcore/Interop/UGUIInputAdapter.cs b/org.mixedrealitytoolkit.uxcore/Interop/UGUIInputAdapter.cs index ecd6517c7..f38562598 100644 --- a/org.mixedrealitytoolkit.uxcore/Interop/UGUIInputAdapter.cs +++ b/org.mixedrealitytoolkit.uxcore/Interop/UGUIInputAdapter.cs @@ -7,6 +7,8 @@ using UnityEngine.EventSystems; using UnityEngine.UI; using UnityEngine.XR.Interaction.Toolkit; +using UnityEngine.XR.Interaction.Toolkit.Interactables; +using UnityEngine.XR.Interaction.Toolkit.Interactors; using UnityEngine.XR.Interaction.Toolkit.UI; namespace MixedReality.Toolkit.UX diff --git a/org.mixedrealitytoolkit.uxcore/Interop/UGUIInputAdapterDraggable.cs b/org.mixedrealitytoolkit.uxcore/Interop/UGUIInputAdapterDraggable.cs index 4390b9893..4cabe49c0 100644 --- a/org.mixedrealitytoolkit.uxcore/Interop/UGUIInputAdapterDraggable.cs +++ b/org.mixedrealitytoolkit.uxcore/Interop/UGUIInputAdapterDraggable.cs @@ -3,7 +3,7 @@ using UnityEngine; using UnityEngine.EventSystems; -using UnityEngine.XR.Interaction.Toolkit; +using UnityEngine.XR.Interaction.Toolkit.Interactables; namespace MixedReality.Toolkit.UX { diff --git a/org.mixedrealitytoolkit.uxcore/LegacyDialog/Dialog.cs b/org.mixedrealitytoolkit.uxcore/LegacyDialog/Dialog.cs deleted file mode 100644 index 5384eb732..000000000 --- a/org.mixedrealitytoolkit.uxcore/LegacyDialog/Dialog.cs +++ /dev/null @@ -1,281 +0,0 @@ -// Copyright (c) Mixed Reality Toolkit Contributors -// Licensed under the BSD 3-Clause - -using System; -using UnityEngine; - -namespace MixedReality.Toolkit.UX.Deprecated -{ - /// - /// Abstract class that presents a Dialog object. - /// - /// - /// The Legacy Dialog is deprecated. Please migrate to the - /// new Dialog. If you'd like to continue using the - /// Legacy Dialog implementation, it is recommended that the legacy code - /// be copied to the application's code base, and maintained independently by the application developer. Otherwise, it is strongly recommended - /// that the application be updated to use the new DialogPool system. - /// - [Obsolete("This legacy dialog system has been deprecated. Please migrate to the new dialog system, see MixedReality.Toolkit.UX.DialogPool for more details.")] - public abstract class Dialog : MonoBehaviour - { - /// - /// The current state of the dialog. - /// - [Obsolete("This legacy dialog system has been deprecated. Please migrate to the new dialog system, see MixedReality.Toolkit.UX.DialogPool for more details.")] - public DialogState State { get; protected set; } = DialogState.Uninitialized; - - /// - /// Called after user has clicked a button and the dialog has finished closing. - /// - [Obsolete("Legacy Dialog is deprecated. Please migrate to the new Dialog. See uxcore/LegacyDialog/README.md")] - public Action OnClosed { get; set; } - - /// - /// Retrieve the properties of the dialog (including the result). - /// - [Obsolete("Legacy Dialog is deprecated. Please migrate to the new Dialog. See uxcore/LegacyDialog/README.md")] - public DialogProperty Property { get; protected set; } - - [SerializeField] - [HideInInspector] - private float followMinDistanceNear = 0.25f; - - /// - /// The min distance setting on the follow solver attached to this dialog in near interaction placement mode. - /// - [Obsolete("Legacy Dialog is deprecated. Please migrate to the new Dialog. See uxcore/LegacyDialog/README.md")] - public float FollowMinDistanceNear - { - get => followMinDistanceNear; - set => followMinDistanceNear = value; - } - - [SerializeField] - [HideInInspector] - private float followMaxDistanceNear = 0.6f; - - /// - /// The max distance setting on the follow solver attached to this dialog in near interaction placement mode. - /// - [Obsolete("Legacy Dialog is deprecated. Please migrate to the new Dialog. See uxcore/LegacyDialog/README.md")] - public float FollowMaxDistanceNear - { - get => followMaxDistanceNear; - set => followMaxDistanceNear = value; - } - - [SerializeField] - [HideInInspector] - private float followDefaultDistanceNear = 0.4f; - - /// - /// The default distance setting on the follow solver attached to this dialog in near interaction placement mode. - /// - [Obsolete("Legacy Dialog is deprecated. Please migrate to the new Dialog. See uxcore/LegacyDialog/README.md")] - public float FollowDefaultDistanceNear - { - get => followDefaultDistanceNear; - set => followDefaultDistanceNear = value; - } - - [SerializeField] - [HideInInspector] - private float followMinDistanceFar = 1f; - - /// - /// The min distance setting on the follow solver attached to this dialog in far interaction placement mode. - /// - [Obsolete("Legacy Dialog is deprecated. Please migrate to the new Dialog. See uxcore/LegacyDialog/README.md")] - public float FollowMinDistanceFar - { - get => followMinDistanceFar; - set => followMinDistanceFar = value; - } - - [SerializeField] - [HideInInspector] - private float followMaxDistanceFar = 1.5f; - - /// - /// The max distance setting on the follow solver attached to this dialog in far interaction placement mode. - /// - [Obsolete("Legacy Dialog is deprecated. Please migrate to the new Dialog. See uxcore/LegacyDialog/README.md")] - public float FollowMaxDistanceFar - { - get => followMaxDistanceFar; - set => followMaxDistanceFar = value; - } - - [SerializeField] - [HideInInspector] - private float followDefaultDistanceFar = 1.2f; - - /// - /// The default distance setting on the follow solver attached to this dialog in far interaction placement mode. - /// - [Obsolete("Legacy Dialog is deprecated. Please migrate to the new Dialog. See uxcore/LegacyDialog/README.md")] - public float FollowDefaultDistanceFar - { - get => followDefaultDistanceFar; - set => followDefaultDistanceFar = value; - } - - [SerializeField] - [HideInInspector] - private bool placeForNearInteraction = true; - - /// - /// Use placement optimized for near interaction instead of far interaction. - /// - [Obsolete("Legacy Dialog is deprecated. Please migrate to the new Dialog. See uxcore/LegacyDialog/README.md")] - public bool PlaceForNearInteraction - { - get => placeForNearInteraction; - set - { - if (placeForNearInteraction != value) - { - SetInteractionMode(value); - placeForNearInteraction = value; - } - } - } - - /// - /// Generates buttons - Must parent them under buttonParent! - /// - [Obsolete("Legacy Dialog is deprecated. Please migrate to the new Dialog. See uxcore/LegacyDialog/README.md")] - protected abstract void GenerateButtons(); - - /// - /// This is called after the buttons are generated and - /// the title and message have been set. - /// Perform here any operations that you'd like - /// Lays out the buttons on the dialog - /// E.g. using an ObjectCollection - /// - [Obsolete("Legacy Dialog is deprecated. Please migrate to the new Dialog. See uxcore/LegacyDialog/README.md")] - protected abstract void FinalizeLayout(); - - /// - /// Set the title and message using the result - /// E.g. using TextMesh components - /// - [Obsolete("Legacy Dialog is deprecated. Please migrate to the new Dialog. See uxcore/LegacyDialog/README.md")] - protected abstract void SetTitleAndMessage(); - - /// - /// Closes the dialog - state is set to Closed - /// - [Obsolete("Legacy Dialog is deprecated. Please migrate to the new Dialog. See uxcore/LegacyDialog/README.md")] - protected virtual void Close() { } - - /// - /// Dismisses the Dialog. - /// - /// If false the dialog will not be destroyed after being dismissed but instead the GameObject will be disabled - [Obsolete("Legacy Dialog is deprecated. Please migrate to the new Dialog. See uxcore/LegacyDialog/README.md")] - public void Dismiss(bool destroyDialog = true) - { - Close(); - OnClosed?.Invoke(Property); - State = DialogState.Closed; - if (destroyDialog) - { - Destroy(gameObject); - } - else - { - gameObject.SetActive(false); - } - } - - /// - /// Opens a dialog - /// - /// DialogProperty class object which contains information such as title and description text - /// Use placement optimized for near interaction instead of far interaction - [Obsolete("Legacy Dialog is deprecated. Please migrate to the new Dialog. See uxcore/LegacyDialog/README.md")] - public virtual void Open(DialogProperty property = null, bool? placeForNearInteraction = null) - { - State = DialogState.Opening; - if (!gameObject.activeSelf) - { - gameObject.SetActive(true); - } - if (property != null) - { - Property = property; - Property.TargetDialog = this; - } - else if (Property == null) - { - Debug.LogError("Cannot open the dialog because the property is not specified"); - return; - } - if (placeForNearInteraction != null) - { - PlaceForNearInteraction = placeForNearInteraction.GetValueOrDefault(); - } - // Create buttons and set up message - GenerateButtons(); - SetTitleAndMessage(); - FinalizeLayout(); - State = DialogState.WaitingForInput; - } - - /// - /// Instantiates a dialog using the parameters - /// - /// The dialog component on a Dialog prefab - /// DialogProperty class object which contains information such as title and description text - /// Use placement optimized for near interaction instead of far interaction - /// Whether the dialog should be opened now - [Obsolete("Legacy Dialog is deprecated. Please migrate to the new Dialog. See uxcore/LegacyDialog/README.md")] - public static Dialog InstantiateFromPrefab(Dialog dialogComponentOnPrefab, DialogProperty property = null, bool placeForNearInteraction = true, bool openOnInstantiate = false) - { - GameObject dialogGameObject = Instantiate(dialogComponentOnPrefab.gameObject); - - Dialog dialog = dialogGameObject.GetComponent(); - if (property != null) - { - dialog.Property = property; - dialog.Property.TargetDialog = dialog; - } - - dialog.PlaceForNearInteraction = placeForNearInteraction; - - if (openOnInstantiate) - { - if (property == null) - { - Debug.LogError("Cannot open the dialog because the property is not specified"); - dialogGameObject.SetActive(false); - return dialog; - } - dialog.Open(); - } - else - { - dialogGameObject.SetActive(false); - } - - return dialog; - } - - /// - /// A Unity event function that is called when an enabled script instance is being loaded. - /// - protected virtual void Awake() - { - SetInteractionMode(PlaceForNearInteraction); - } - - /// - /// Apply settings to the follow solver based on the selected interaction mode. - /// - [Obsolete("Legacy Dialog is deprecated. Please migrate to the new Dialog. See uxcore/LegacyDialog/README.md")] - protected virtual void SetInteractionMode(bool useNearInteractionPlacement) { } - } -} diff --git a/org.mixedrealitytoolkit.uxcore/LegacyDialog/DialogButton.cs b/org.mixedrealitytoolkit.uxcore/LegacyDialog/DialogButton.cs deleted file mode 100644 index ef2d07b20..000000000 --- a/org.mixedrealitytoolkit.uxcore/LegacyDialog/DialogButton.cs +++ /dev/null @@ -1,116 +0,0 @@ -// Copyright (c) Mixed Reality Toolkit Contributors -// Licensed under the BSD 3-Clause - -using System; -using TMPro; -using UnityEngine; - -namespace MixedReality.Toolkit.UX.Deprecated -{ - /// - /// Handling click event and dismiss dialog - /// - /// - /// This and the Legacy Dialog are deprecated. Please migrate to the - /// new Dialog. If you'd like to continue using the - /// Legacy Dialog implementation, it is recommended that the legacy code - /// be copied to the application's code base, and maintained independently by the application developer. Otherwise, it is strongly recommended - /// that the application be updated to use the new DialogPool system. - /// - [Obsolete("This legacy dialog system has been deprecated. Please migrate to the new dialog system, see MixedReality.Toolkit.UX.DialogPool for more details.")] - public class DialogButton : MonoBehaviour - { - [SerializeField, Tooltip("The TextMeshPro component for displaying text on the button itself.")] - private TMP_Text buttonText; - - /// - /// The TextMeshPro component for displaying text on the button itself. - /// - [Obsolete("This legacy dialog system has been deprecated. Please migrate to the new dialog system, see MixedReality.Toolkit.UX.DialogPool for more details.")] - public TMP_Text ButtonText - { - get => buttonText; - set => buttonText = value; - } - - /// - /// A reference to the Dialog that this button is on. - /// - [Obsolete("This legacy dialog system has been deprecated. Please migrate to the new dialog system, see MixedReality.Toolkit.UX.DialogPool for more details.")] - public Dialog ParentDialog { get; set; } - - /// - /// The type description of the button. - /// - [Obsolete("This legacy dialog system has been deprecated. Please migrate to the new dialog system, see MixedReality.Toolkit.UX.DialogPool for more details.")] - public DialogButtonTypes ButtonTypeEnum => DialogProperty.Convert(ButtonContext.ButtonType); - - [SerializeField, Tooltip("The type description of the button.")] - [Obsolete("This legacy dialog system has been deprecated. Please migrate to the new dialog system, see MixedReality.Toolkit.UX.DialogPool for more details.")] - - private DialogButtonContext buttonContext; - - /// - /// The context, including type and an optional label, of the button. - /// - [Obsolete("This legacy dialog system has been deprecated. Please migrate to the new dialog system, see MixedReality.Toolkit.UX.DialogPool for more details.")] - public DialogButtonContext ButtonContext => buttonContext; - - /// - /// A Unity Editor only event function that is called when the script is loaded or a value changes in the Unity Inspector. - /// - [Obsolete("This legacy dialog system has been deprecated. Please migrate to the new dialog system, see MixedReality.Toolkit.UX.DialogPool for more details.")] - - private void OnValidate() - { - SetButtonContext(ButtonContext); - } - - /// - /// Event handler that runs when button is clicked. - /// Dismisses the parent dialog. - /// - [Obsolete("This legacy dialog system has been deprecated. Please migrate to the new dialog system, see MixedReality.Toolkit.UX.DialogPool for more details.")] - public void OnButtonClicked() - { - if (ParentDialog != null) - { - ParentDialog.Property.ResultContext = ButtonContext; - ParentDialog.Dismiss(); - } - } - - /// - /// Set the dialog's label or title. - /// - /// New label text for the button. - [Obsolete("Use SetLabel or SetButtonContext instead.")] - public void SetTitle(string title) => SetLabel(title); - - /// - /// Sets the label text on the button. - /// - /// New label text for the button. - [Obsolete("This legacy dialog system has been deprecated. Please migrate to the new dialog system, see MixedReality.Toolkit.UX.DialogPool for more details.")] - public void SetLabel(string label) - { - buttonContext.Label = label; - - if (ButtonText != null) - { - ButtonText.text = !string.IsNullOrWhiteSpace(buttonContext.Label) ? buttonContext.Label : buttonContext.ButtonType.ToString(); - } - } - - /// - /// Sets the button context and the label text on the button. - /// - /// New button context for this button. - [Obsolete("This legacy dialog system has been deprecated. Please migrate to the new dialog system, see MixedReality.Toolkit.UX.DialogPool for more details.")] - public void SetButtonContext(DialogButtonContext buttonContext) - { - this.buttonContext = buttonContext; - SetLabel(buttonContext.Label); - } - } -} diff --git a/org.mixedrealitytoolkit.uxcore/LegacyDialog/DialogButtonContext.cs b/org.mixedrealitytoolkit.uxcore/LegacyDialog/DialogButtonContext.cs deleted file mode 100644 index 823f78d32..000000000 --- a/org.mixedrealitytoolkit.uxcore/LegacyDialog/DialogButtonContext.cs +++ /dev/null @@ -1,48 +0,0 @@ -// Copyright (c) Mixed Reality Toolkit Contributors -// Licensed under the BSD 3-Clause - -using System; -using UnityEngine; - -namespace MixedReality.Toolkit.UX.Deprecated -{ - /// - /// Represents a button with its type and an optional custom label. - /// - /// - /// This and the Legacy Dialog are deprecated. Please migrate to the - /// new Dialog. If you'd like to continue using the - /// Legacy Dialog implementation, it is recommended that the legacy code - /// be copied to the application's code base, and maintained independently by the application developer. Otherwise, it is strongly recommended - /// that the application be updated to use the new DialogPool system. - /// - [Serializable] - [Obsolete("This legacy dialog system has been deprecated. Please migrate to the new dialog system, see MixedReality.Toolkit.UX.DialogPool for more details.")] - public struct DialogButtonContext - { - /// - /// Initializes a struct. - /// - [Obsolete("This legacy dialog system has been deprecated. Please migrate to the new dialog system, see MixedReality.Toolkit.UX.DialogPool for more details.")] - public DialogButtonContext(DialogButtonType buttonType, string label = null) - { - ButtonType = buttonType; - Label = label; - } - - /// - /// The type of this button. - /// - [field: SerializeField, Tooltip("The type of this button.")] - [Obsolete("This legacy dialog system has been deprecated. Please migrate to the new dialog system, see MixedReality.Toolkit.UX.DialogPool for more details.")] - public DialogButtonType ButtonType { get; internal set; } - - /// - /// The optional label for this button. - /// - /// If none is provided, the string representation of will be used. - [field: SerializeField, Tooltip("The optional label for this button. If none is provided, the string representation of Button Type will be used.")] - [Obsolete("This legacy dialog system has been deprecated. Please migrate to the new dialog system, see MixedReality.Toolkit.UX.DialogPool for more details.")] - public string Label { get; internal set; } - } -} diff --git a/org.mixedrealitytoolkit.uxcore/LegacyDialog/DialogButtonHelpers.cs b/org.mixedrealitytoolkit.uxcore/LegacyDialog/DialogButtonHelpers.cs deleted file mode 100644 index f5e90cbe4..000000000 --- a/org.mixedrealitytoolkit.uxcore/LegacyDialog/DialogButtonHelpers.cs +++ /dev/null @@ -1,39 +0,0 @@ -// Copyright (c) Mixed Reality Toolkit Contributors -// Licensed under the BSD 3-Clause - -using System; - -namespace MixedReality.Toolkit.UX.Deprecated -{ - /// - /// Provides a pre-defined set of button contexts for ease of dialog creation. - /// - /// - /// This and the Legacy Dialog are deprecated. Please migrate to the - /// new Dialog. If you'd like to continue using the - /// Legacy Dialog implementation, it is recommended that the legacy code - /// be copied to the application's code base, and maintained independently by the application developer. Otherwise, it is strongly recommended - /// that the application be updated to use the new DialogPool system. - /// - [Obsolete("This legacy dialog system has been deprecated. Please migrate to the new dialog system, see MixedReality.Toolkit.UX.DialogPool for more details.")] - public static class DialogButtonHelpers - { - /// - /// Represents a single OK button. - /// - [Obsolete("This legacy dialog system has been deprecated. Please migrate to the new dialog system, see MixedReality.Toolkit.UX.DialogPool for more details.")] - public static DialogButtonContext[] OK { get; } = new DialogButtonContext[] { new DialogButtonContext(DialogButtonType.OK) }; - - /// - /// Represents a pair of OK and Cancel buttons. - /// - [Obsolete("This legacy dialog system has been deprecated. Please migrate to the new dialog system, see MixedReality.Toolkit.UX.DialogPool for more details.")] - public static DialogButtonContext[] OKCancel { get; } = new DialogButtonContext[] { new DialogButtonContext(DialogButtonType.OK), new DialogButtonContext(DialogButtonType.Cancel) }; - - /// - /// Represents a pair of Yes and No buttons. - /// - [Obsolete("This legacy dialog system has been deprecated. Please migrate to the new dialog system, see MixedReality.Toolkit.UX.DialogPool for more details.")] - public static DialogButtonContext[] YesNo { get; } = new DialogButtonContext[] { new DialogButtonContext(DialogButtonType.Yes), new DialogButtonContext(DialogButtonType.No) }; - } -} diff --git a/org.mixedrealitytoolkit.uxcore/LegacyDialog/DialogButtonTypes.cs b/org.mixedrealitytoolkit.uxcore/LegacyDialog/DialogButtonTypes.cs deleted file mode 100644 index 91ea7cbbf..000000000 --- a/org.mixedrealitytoolkit.uxcore/LegacyDialog/DialogButtonTypes.cs +++ /dev/null @@ -1,116 +0,0 @@ -// Copyright (c) Mixed Reality Toolkit Contributors -// Licensed under the BSD 3-Clause - -using System; - -namespace MixedReality.Toolkit.UX.Deprecated -{ - /// - /// The style of a legacy dialog button. - /// - /// - /// This and the Legacy Dialog are deprecated. Please migrate to the - /// new Dialog. If you'd like to continue using the - /// Legacy Dialog implementation, it is recommended that the legacy code - /// be copied to the application's code base, and maintained independently by the application developer. Otherwise, it is strongly recommended - /// that the application be updated to use the new DialogPool system. - /// - [Obsolete("This legacy dialog system has been deprecated. Please migrate to the new dialog system, see MixedReality.Toolkit.UX.DialogPool for more details.")] - public enum DialogButtonType - { - /// - /// An unspecified button type. - /// - None = 0, - - /// - /// Represents a close dialog button. - /// - Close = 1, - - /// - /// Represents a confirmation dialog button. - /// - Confirm = 2, - - /// - /// Represents a cancel dialog button. - /// - Cancel = 3, - - /// - /// Represents an accept dialog button. - /// - Accept = 4, - - /// - /// Represents a "yes" dialog button. - /// - Yes = 5, - - /// - /// Represents a "no" dialog button. - /// - No = 6, - - /// - /// Represents an "okay" dialog button. - /// - OK = 7, - } - - /// - /// The style of a legacy dialog button. - /// - /// - /// This and the Legacy Dialog are deprecated. Please migrate to the - /// new Dialog. If you'd like to continue using the - /// Legacy Dialog implementation, it is recommended that the legacy code - /// be copied to the application's code base, and maintained independently by the application developer. Otherwise, it is strongly recommended - /// that the application be updated to use the new DialogPool system. - /// - [Flags] - [Obsolete("This legacy dialog system has been deprecated. Please migrate to the new dialog system, see MixedReality.Toolkit.UX.DialogPool for more details.")] - public enum DialogButtonTypes - { - /// - /// No button style has been specified. - /// - None = 0 << 0, - - /// - /// Represents a close dialog button. - /// - Close = 1 << 0, - - /// - /// Represents a confirmation dialog button. - /// - Confirm = 1 << 1, - - /// - /// Represents a cancel dialog button. - /// - Cancel = 1 << 2, - - /// - /// Represents an accept dialog button. - /// - Accept = 1 << 3, - - /// - /// Represents a "yes" dialog button. - /// - Yes = 1 << 4, - - /// - /// Represents a "no" dialog button. - /// - No = 1 << 5, - - /// - /// Represents an "okay" dialog button. - /// - OK = 1 << 6, - } -} diff --git a/org.mixedrealitytoolkit.uxcore/LegacyDialog/DialogButtonTypes.cs.meta b/org.mixedrealitytoolkit.uxcore/LegacyDialog/DialogButtonTypes.cs.meta deleted file mode 100644 index 99f0eb43e..000000000 --- a/org.mixedrealitytoolkit.uxcore/LegacyDialog/DialogButtonTypes.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 5678fb7ca58a9824ba0f170ced98d822 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/org.mixedrealitytoolkit.uxcore/LegacyDialog/DialogProperty.cs b/org.mixedrealitytoolkit.uxcore/LegacyDialog/DialogProperty.cs deleted file mode 100644 index 213f99ae9..000000000 --- a/org.mixedrealitytoolkit.uxcore/LegacyDialog/DialogProperty.cs +++ /dev/null @@ -1,144 +0,0 @@ -// Copyright (c) Mixed Reality Toolkit Contributors -// Licensed under the BSD 3-Clause - -using System; -using System.Collections.Generic; - -namespace MixedReality.Toolkit.UX.Deprecated -{ - /// - /// Object containing properties about a dialog. - /// - /// - /// This and the Legacy Dialog are deprecated. Please migrate to the - /// new Dialog. If you'd like to continue using the - /// Legacy Dialog implementation, it is recommended that the legacy code - /// be copied to the application's code base, and maintained independently by the application developer. Otherwise, it is strongly recommended - /// that the application be updated to use the new DialogPool system. - /// - [Obsolete("This legacy dialog system has been deprecated. Please migrate to the new dialog system, see MixedReality.Toolkit.UX.DialogPool for more details.")] - public class DialogProperty - { - /// - /// Initializes a new instance of the class. - /// - /// The title bar string (top-most) on the dialog. - /// The message content string of the dialog. - /// The button type(s) available on the dialog. - [Obsolete("This legacy dialog system has been deprecated. Please migrate to the new dialog system, see MixedReality.Toolkit.UX.DialogPool for more details.")] - public DialogProperty(string title, string message, params DialogButtonContext[] buttonContexts) - { - Title = title; - Message = message; - - // This is done for back compat with the obsolete property. - foreach (DialogButtonContext buttonContext in buttonContexts) - { - ButtonTypes |= Convert(buttonContext.ButtonType); - } - - ButtonContexts = buttonContexts; - } - - /// - /// Initializes a new instance of the class. - /// - [Obsolete("This legacy dialog system has been deprecated. Please migrate to the new dialog system, see MixedReality.Toolkit.UX.DialogPool for more details.")] - public DialogProperty(string title, string message, DialogButtonTypes buttonTypes) : this(title, message) - { - List buttonTypesList = new List(); - foreach (DialogButtonTypes buttonType in Enum.GetValues(typeof(DialogButtonTypes))) - { - if (buttonType != DialogButtonTypes.None && (buttonTypes & buttonType) == buttonType) - { - buttonTypesList.Add(new DialogButtonContext(Convert(buttonType))); - } - } - - ButtonTypes = buttonTypes; - ButtonContexts = buttonTypesList.ToArray(); - } - - /// - /// Convert a enumeration value to a see enumeration value - /// - [Obsolete("This legacy dialog system has been deprecated. Please migrate to the new dialog system, see MixedReality.Toolkit.UX.DialogPool for more details.")] - private static DialogButtonType Convert(DialogButtonTypes dialogButtonTypes) - { - switch (dialogButtonTypes) - { - case DialogButtonTypes.None: return DialogButtonType.None; - case DialogButtonTypes.Close: return DialogButtonType.Close; - case DialogButtonTypes.Confirm: return DialogButtonType.Confirm; - case DialogButtonTypes.Cancel: return DialogButtonType.Cancel; - case DialogButtonTypes.Accept: return DialogButtonType.Accept; - case DialogButtonTypes.Yes: return DialogButtonType.Yes; - case DialogButtonTypes.No: return DialogButtonType.No; - case DialogButtonTypes.OK: return DialogButtonType.OK; - default: return DialogButtonType.None; - } - } - - /// - /// Convert a enumeration value to a see enumeration value - /// - [Obsolete("This legacy dialog system has been deprecated. Please migrate to the new dialog system, see MixedReality.Toolkit.UX.DialogPool for more details.")] - internal static DialogButtonTypes Convert(DialogButtonType dialogButtonTypes) - { - switch (dialogButtonTypes) - { - case DialogButtonType.None: return DialogButtonTypes.None; - case DialogButtonType.Close: return DialogButtonTypes.Close; - case DialogButtonType.Confirm: return DialogButtonTypes.Confirm; - case DialogButtonType.Cancel: return DialogButtonTypes.Cancel; - case DialogButtonType.Accept: return DialogButtonTypes.Accept; - case DialogButtonType.Yes: return DialogButtonTypes.Yes; - case DialogButtonType.No: return DialogButtonTypes.No; - case DialogButtonType.OK: return DialogButtonTypes.OK; - default: return DialogButtonTypes.None; - } - } - - /// - /// The title bar string (top-most) on the dialog. - /// - [Obsolete("This legacy dialog system has been deprecated. Please migrate to the new dialog system, see MixedReality.Toolkit.UX.DialogPool for more details.")] - public string Title { get; } = string.Empty; - - /// - /// The message content string of the dialog. - /// - [Obsolete("This legacy dialog system has been deprecated. Please migrate to the new dialog system, see MixedReality.Toolkit.UX.DialogPool for more details.")] - public string Message { get; } = string.Empty; - - /// - /// The button type(s) available on the dialog. - /// - [Obsolete("This legacy dialog system has been deprecated. Please migrate to the new dialog system, see MixedReality.Toolkit.UX.DialogPool for more details.")] - public DialogButtonTypes ButtonTypes { get; } = DialogButtonTypes.Close; - - /// - /// Contexts for the buttons, in order of their appearance on the dialog. - /// - [Obsolete("This legacy dialog system has been deprecated. Please migrate to the new dialog system, see MixedReality.Toolkit.UX.DialogPool for more details.")] - public IReadOnlyList ButtonContexts { get; } = null; - - /// - /// Which button was clicked to dismiss the dialog. - /// - [Obsolete("This legacy dialog system has been deprecated. Please migrate to the new dialog system, see MixedReality.Toolkit.UX.DialogPool for more details.")] - public DialogButtonTypes Result => Convert(ResultContext.ButtonType); - - /// - /// Which button was clicked to dismiss the dialog. - /// - [Obsolete("This legacy dialog system has been deprecated. Please migrate to the new dialog system, see MixedReality.Toolkit.UX.DialogPool for more details.")] - public DialogButtonContext ResultContext { get; internal set; } = default; - - /// - /// Reference to the dialog this property applies to. - /// - [Obsolete("This legacy dialog system has been deprecated. Please migrate to the new dialog system, see MixedReality.Toolkit.UX.DialogPool for more details.")] - public Dialog TargetDialog { get; internal set; } - } -} diff --git a/org.mixedrealitytoolkit.uxcore/LegacyDialog/DialogProperty.cs.meta b/org.mixedrealitytoolkit.uxcore/LegacyDialog/DialogProperty.cs.meta deleted file mode 100644 index 89b558536..000000000 --- a/org.mixedrealitytoolkit.uxcore/LegacyDialog/DialogProperty.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 88428fe063c4b3b45ac4087c60905ad5 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/org.mixedrealitytoolkit.uxcore/LegacyDialog/DialogShell.cs b/org.mixedrealitytoolkit.uxcore/LegacyDialog/DialogShell.cs deleted file mode 100644 index b2486a296..000000000 --- a/org.mixedrealitytoolkit.uxcore/LegacyDialog/DialogShell.cs +++ /dev/null @@ -1,130 +0,0 @@ -// Copyright (c) Mixed Reality Toolkit Contributors -// Licensed under the BSD 3-Clause - -using System; -using System.Collections.Generic; -using TMPro; -using UnityEngine; - -namespace MixedReality.Toolkit.UX.Deprecated -{ - /// - /// This class implements the abstract class Dialog. - /// DialogShell class manages a dialog object that can have one or two option buttons. - /// If you try to open a dialog with more than two option buttons, it will show the first two. - /// - /// - /// This and the Legacy Dialog are deprecated. Please migrate to the - /// new Dialog. If you'd like to continue using the - /// Legacy Dialog implementation, it is recommended that the legacy code - /// be copied to the application's code base, and maintained independently by the application developer. Otherwise, it is strongly recommended - /// that the application be updated to use the new DialogPool system. - /// - [Obsolete("This legacy dialog system has been deprecated. Please migrate to the new dialog system, see MixedReality.Toolkit.UX.DialogPool for more details.")] - public class DialogShell : Dialog - { - [SerializeField] - [Tooltip("Title text of the dialog")] - private TMP_Text titleText = null; - - /// - /// Title text of the dialog - /// - [Obsolete("This legacy dialog system has been deprecated. Please migrate to the new dialog system, see MixedReality.Toolkit.UX.DialogPool for more details.")] - public TMP_Text TitleText - { - get { return titleText; } - set { titleText = value; } - } - - [SerializeField] - [Tooltip("Description text of the dialog")] - private TMP_Text descriptionText = null; - - /// - /// Description text of the dialog - /// - [Obsolete("This legacy dialog system has been deprecated. Please migrate to the new dialog system, see MixedReality.Toolkit.UX.DialogPool for more details.")] - public TMP_Text DescriptionText - { - get { return descriptionText; } - set { descriptionText = value; } - } - - /// - [Obsolete("This legacy dialog system has been deprecated. Please migrate to the new dialog system, see MixedReality.Toolkit.UX.DialogPool for more details.")] - protected override void FinalizeLayout() { } - - /// - [Obsolete("This legacy dialog system has been deprecated. Please migrate to the new dialog system, see MixedReality.Toolkit.UX.DialogPool for more details.")] - protected override void GenerateButtons() - { - // Find all buttons on dialog... - List buttonsOnDialog = GetAllDialogButtons(); - - int buttonContextsCount = Property.ButtonContexts.Count; - - // Set desired buttons active and the rest inactive - SetButtonsActiveStates(buttonsOnDialog, buttonContextsCount); - - // Set titles and types - if (buttonContextsCount > 0) - { - // If we have two button contexts, skip the first button GameObject. - // This is due to the set-up of the prefab, where there's one GameObject - // which takes up the whole width of the dialog and two GameObjects - // after that in the hierarchy representing a split-width two-button dialog. - int step = buttonContextsCount >= 2 ? 1 : 0; - for (int i = 0; i < buttonContextsCount && i < 2; ++i) - { - buttonsOnDialog[i + step].SetButtonContext(Property.ButtonContexts[i]); - } - } - } - - private void SetButtonsActiveStates(List buttons, int count) - { - for (int i = 0; i < buttons.Count; ++i) - { - bool flag1 = (count == 1) && (i == 0); - bool flag2 = (count >= 2) && (i > 0); - buttons[i].ParentDialog = this; - buttons[i].gameObject.SetActive(flag1 || flag2); - } - } - - private List GetAllDialogButtons() - { - List buttonsOnDialog = new List(); - foreach (Transform child in transform) - { - if (child.name == "ButtonParent") - { - DialogButton[] buttons = child.GetComponentsInChildren(); - if (buttons != null) - { - buttonsOnDialog.AddRange(buttons); - } - } - } - return buttonsOnDialog; - } - - /// - /// Set Title and Text on the Dialog. - /// - [Obsolete("This legacy dialog system has been deprecated. Please migrate to the new dialog system, see MixedReality.Toolkit.UX.DialogPool for more details.")] - protected override void SetTitleAndMessage() - { - if (titleText != null) - { - titleText.text = Property.Title; - } - - if (descriptionText != null) - { - descriptionText.text = Property.Message; - } - } - } -} diff --git a/org.mixedrealitytoolkit.uxcore/LegacyDialog/DialogShell.cs.meta b/org.mixedrealitytoolkit.uxcore/LegacyDialog/DialogShell.cs.meta deleted file mode 100644 index b5cd6186f..000000000 --- a/org.mixedrealitytoolkit.uxcore/LegacyDialog/DialogShell.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 3208e5e91ed10084497b8e702a9abfd5 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/org.mixedrealitytoolkit.uxcore/LegacyDialog/DialogState.cs b/org.mixedrealitytoolkit.uxcore/LegacyDialog/DialogState.cs deleted file mode 100644 index 56bbb17e8..000000000 --- a/org.mixedrealitytoolkit.uxcore/LegacyDialog/DialogState.cs +++ /dev/null @@ -1,41 +0,0 @@ -// Copyright (c) Mixed Reality Toolkit Contributors -// Licensed under the BSD 3-Clause - -using System; - -namespace MixedReality.Toolkit.UX.Deprecated -{ - /// - /// Describes the current state of a Dialog. - /// - /// - /// This and the Legacy Dialog are deprecated. Please migrate to the - /// new Dialog. If you'd like to continue using the - /// Legacy Dialog implementation, it is recommended that the legacy code - /// be copied to the application's code base, and maintained independently by the application developer. Otherwise, it is strongly recommended - /// that the application be updated to use the new DialogPool system. - /// - [Obsolete("This legacy dialog system has been deprecated. Please migrate to the new dialog system, see MixedReality.Toolkit.UX.DialogPool for more details.")] - public enum DialogState - { - /// - /// The dialog has not been opened or closed yet. - /// - Uninitialized = 0, - - /// - /// The dialog is in the process of opening. - /// - Opening, - - /// - /// The dialog is opened and is ready of input. - /// - WaitingForInput, - - /// - /// The dialog is now closed. - /// - Closed - } -} diff --git a/org.mixedrealitytoolkit.uxcore/LegacyDialog/DialogState.cs.meta b/org.mixedrealitytoolkit.uxcore/LegacyDialog/DialogState.cs.meta deleted file mode 100644 index 7df4ec3d3..000000000 --- a/org.mixedrealitytoolkit.uxcore/LegacyDialog/DialogState.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 6a8a055985571364e8a36912a127ff02 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/org.mixedrealitytoolkit.uxcore/LegacyDialog/README.md b/org.mixedrealitytoolkit.uxcore/LegacyDialog/README.md deleted file mode 100644 index 8a7ed8789..000000000 --- a/org.mixedrealitytoolkit.uxcore/LegacyDialog/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# Legacy Dialog - -"Legacy Dialog" is the deprecated legacy Dialog implementation ported from MRTK v2. If you'd like to continue using this legacy Dialog implementation, we recommend copying this folder to your local project and maintaining the implementation yourself. Otherwise, we strongly recommend migrating to the new Dialog system located in the uxcore/Dialog folder. diff --git a/org.mixedrealitytoolkit.uxcore/Pulse/InteractablePulse.cs b/org.mixedrealitytoolkit.uxcore/Pulse/InteractablePulse.cs index f6659aaf4..68f92901a 100644 --- a/org.mixedrealitytoolkit.uxcore/Pulse/InteractablePulse.cs +++ b/org.mixedrealitytoolkit.uxcore/Pulse/InteractablePulse.cs @@ -4,6 +4,7 @@ using Microsoft.MixedReality.GraphicsTools; using UnityEngine; using UnityEngine.XR.Interaction.Toolkit; +using UnityEngine.XR.Interaction.Toolkit.Interactors; namespace MixedReality.Toolkit.UX { @@ -50,10 +51,7 @@ protected void OnDisable() private void OnSelectEntered(SelectEnterEventArgs args) { - if (args.interactorObject is IHandedInteractor handedInteractor) - { - pulse.Pulse(handedInteractor.GetAttachTransform(Interactable).position, handedInteractor.Handedness == Handedness.Left); - } + pulse.Pulse(args.interactorObject.GetAttachTransform(Interactable).position, args.interactorObject.handedness == InteractorHandedness.Left); } } } diff --git a/org.mixedrealitytoolkit.uxcore/Slider/Slider.cs b/org.mixedrealitytoolkit.uxcore/Slider/Slider.cs index c0bc6b755..64cf41d2e 100644 --- a/org.mixedrealitytoolkit.uxcore/Slider/Slider.cs +++ b/org.mixedrealitytoolkit.uxcore/Slider/Slider.cs @@ -6,6 +6,8 @@ using UnityEngine; using UnityEngine.Serialization; using UnityEngine.XR.Interaction.Toolkit; +using UnityEngine.XR.Interaction.Toolkit.Interactables; +using UnityEngine.XR.Interaction.Toolkit.Interactors; using SliderEvent = UnityEngine.Events.UnityEvent; @@ -137,12 +139,6 @@ public float MaxValue [SerializeField] private float value = 0.5f; - /// - /// The current value of the slider. - /// - [Obsolete("Use Value instead")] - public float SliderValue => Value; - /// /// The current value of the slider /// diff --git a/org.mixedrealitytoolkit.uxcore/StateVisualizer/Effects/TintEffect.cs b/org.mixedrealitytoolkit.uxcore/StateVisualizer/Effects/TintEffect.cs index 511b3de07..65a38cf6f 100644 --- a/org.mixedrealitytoolkit.uxcore/StateVisualizer/Effects/TintEffect.cs +++ b/org.mixedrealitytoolkit.uxcore/StateVisualizer/Effects/TintEffect.cs @@ -8,6 +8,29 @@ namespace MixedReality.Toolkit.UX { + /// + /// Exposes tint color mutation on a without requiring knowledge of its generic type. + /// Used by external systems (e.g. theming) to set colors at runtime. + /// + internal interface ITintEffect + { + /// + /// The tint color applied by this effect. + /// + Color TintColor { get; set; } + + /// + /// Returns if is one of the tintable + /// objects owned by this effect. + /// + /// + /// The check is performed inside against the original + /// typed List<T>, so Unity's overloaded == operator fires correctly + /// without any upcast that would reduce the comparison to managed-wrapper reference equality. + /// + bool HasTintable(UnityEngine.Object obj); + } + /// /// An that wraps a Unity PlayableBehaviour /// component, and can tint arbitrary types of components. @@ -19,7 +42,7 @@ namespace MixedReality.Toolkit.UX /// Subclass this class to create tinting behaviour for arbitrary Unity components. /// [Serializable] - internal abstract class TintEffect : PlayableEffect, ISerializationCallbackReceiver + internal abstract class TintEffect : PlayableEffect, ITintEffect, ISerializationCallbackReceiver { /// /// A PlayableBehavior that controls the tint effect, based on the @@ -204,6 +227,9 @@ internal enum BlendType AlphaBlend } + // Used internally to hint to the editor that this is a variable/float-based state. + // Kept in sync with the concrete subclass name via OnBeforeSerialize/OnAfterDeserialize + // so the reorderable-list header in the Inspector stays readable. [SerializeField] [HideInInspector] #pragma warning disable CS0414 // Inspector uses this as a helpful label in lists. @@ -221,10 +247,38 @@ internal enum BlendType [Tooltip("The objects to tint. All of them must share the same tint color; use separate TintEffects for different colors.")] private List tintables; + /// + bool ITintEffect.HasTintable(UnityEngine.Object obj) + { + if (tintables == null || obj == null) + { + return false; + } + + // Iterate against the original List so that Unity's overloaded == operator + // is used for the comparison, rather than managed-wrapper reference equality. + foreach (T item in tintables) + { + if (item is UnityEngine.Object unityObj && unityObj == obj) + { + return true; + } + } + + return false; + } + [SerializeField] [Tooltip("Tint color.")] private Color color = Color.white; + /// + Color ITintEffect.TintColor + { + get => color; + set => color = value; + } + [SerializeField] [Tooltip("Should the playable be played back as a one-shot triggered effect, or should the playback time be directly driven by the state's value?")] private PlayableEffect.PlaybackType playbackMode; diff --git a/org.mixedrealitytoolkit.uxcore/StateVisualizer/StateVisualizer.cs b/org.mixedrealitytoolkit.uxcore/StateVisualizer/StateVisualizer.cs index 09f58c0b3..1f7fa6b26 100644 --- a/org.mixedrealitytoolkit.uxcore/StateVisualizer/StateVisualizer.cs +++ b/org.mixedrealitytoolkit.uxcore/StateVisualizer/StateVisualizer.cs @@ -117,7 +117,17 @@ public StatefulInteractable Interactable return interactable; } - set => interactable = value; + set + { + if (interactable != value) + { + interactable = value; + if (playableGraph.IsValid()) + { + UpdateInteractableSubscription(); + } + } + } } [SerializeField] @@ -130,12 +140,36 @@ public StatefulInteractable Interactable public Animator Animator { get => animator; - set => animator = value; + set + { + if (animator != value) + { + if (animator != null) + { + animator.enabled = false; + } + + animator = value; + + if (playableGraph.IsValid()) + { + animationPlayableOutput.SetTarget(animator); + playableGraph.Evaluate(); + if (animator != null) + { + animator.enabled = playableGraph.IsPlaying(); + } + } + } + } } // The PlayableGraph that injects animation data into the Animator. private PlayableGraph playableGraph; + // The animation output for the PlayableGraph. + private AnimationPlayableOutput animationPlayableOutput; + // The single animation mixer that all animation-based effects mix into. private AnimationLayerMixerPlayable animationMixerPlayable; @@ -149,6 +183,12 @@ public Animator Animator // A runtime scratchpad for recording where each IMixableEffect is connected on the mixer. private Dictionary mixableIndices = new Dictionary(); + // A shared scratchpad for counting unique mixable effects during graph construction without allocating. + private static readonly HashSet mixableEffectScratchpad = new HashSet(); + + // Tracks which interactable we are currently subscribed to, to prevent redundant delegate allocations. + private StatefulInteractable subscribedInteractable; + /// /// A Unity Editor only event function that is called when the script is loaded or a value changes in the Unity Inspector. /// @@ -182,35 +222,105 @@ private UnityAction Subscribe(UnityEvent evt, UnityAction callback) return () => evt.RemoveListener(callback); } + private void UpdateInteractableSubscription() + { + if (interactable != subscribedInteractable) + { + // Unsubscribe from any previous interactable if we are hot-swapping + foreach (UnityAction unsubscribe in unsubscribeActions) + { + unsubscribe(); + } + unsubscribeActions.Clear(); + + if (interactable != null) + { + unsubscribeActions.Add(Subscribe(interactable.hoverEntered, WakeUp)); + unsubscribeActions.Add(Subscribe(interactable.hoverExited, WakeUp)); + unsubscribeActions.Add(Subscribe(interactable.selectEntered, WakeUp)); + unsubscribeActions.Add(Subscribe(interactable.selectExited, WakeUp)); + unsubscribeActions.Add(Subscribe(interactable.IsToggled.OnEntered, WakeUp)); + unsubscribeActions.Add(Subscribe(interactable.IsToggled.OnExited, WakeUp)); + unsubscribeActions.Add(Subscribe(interactable.OnEnabled, WakeUp)); + unsubscribeActions.Add(Subscribe(interactable.OnDisabled, WakeUp)); + } + + subscribedInteractable = interactable; + + // If we hot-swapped at runtime, immediately wake up so the visualizer + // evaluates the new interactable's current state (e.g. if it is already hovered). + if (playableGraph.IsValid()) + { + WakeUp(); + } + } + } + + /// + /// Tears down the current and rebuilds it from the + /// current state of . + /// + /// + /// Call this after modifying the effect lists at runtime — for example, after a + /// theme switch via . + /// Any effects added since the last call will not participate in + /// the graph until is called. + /// + internal void Rebuild() + { + if (playableGraph.IsValid()) + { + playableGraph.Destroy(); + } + mixableIndices.Clear(); + Start(); + } + /// /// A Unity event function that is called on the frame when a script is enabled just before any of the update methods are called the first time. - /// + /// protected virtual void Start() { - OnValidate(); - - if (interactable != null) + // If the graph is already valid, Start() has already executed (e.g. manually invoked + // by Rebuild() before Unity's natural Start lifecycle). Return early to prevent + // memory leaks of unmanaged PlayableGraphs and duplicate event subscriptions. + if (playableGraph.IsValid()) { - unsubscribeActions.Add(Subscribe(interactable.hoverEntered, WakeUp)); - unsubscribeActions.Add(Subscribe(interactable.hoverExited, WakeUp)); - unsubscribeActions.Add(Subscribe(interactable.selectEntered, WakeUp)); - unsubscribeActions.Add(Subscribe(interactable.selectExited, WakeUp)); - unsubscribeActions.Add(Subscribe(interactable.IsToggled.OnEntered, WakeUp)); - unsubscribeActions.Add(Subscribe(interactable.IsToggled.OnExited, WakeUp)); - unsubscribeActions.Add(Subscribe(interactable.OnEnabled, WakeUp)); - unsubscribeActions.Add(Subscribe(interactable.OnDisabled, WakeUp)); + return; } + OnValidate(); + + UpdateInteractableSubscription(); + // Creates the graph, the mixer and binds them to the Animator. playableGraph = PlayableGraph.Create(); // We can use a single animation output for all animation-based playables. - var animationPlayableOutput = AnimationPlayableOutput.Create(playableGraph, "Animation", GetComponent()); + animationPlayableOutput = AnimationPlayableOutput.Create(playableGraph, "Animation", animator); + + // AnimationLayerMixerPlayable does not support dynamic resizing via SetInputCount well. + // We must pre-calculate the required number of inputs before creation to prevent Playable exceptions. + mixableEffectScratchpad.Clear(); + foreach (var kvp in stateContainers) + { + foreach (IEffect effect in kvp.Value.Effects) + { + if (effect is IAnimationMixableEffect) + { + mixableEffectScratchpad.Add(effect); + } + } + } // We use a single master mixer for all animation-based playables. // Two-way animation playables mix into this mixer. - animationMixerPlayable = AnimationLayerMixerPlayable.Create(playableGraph, 1); + // We start with at least 1 input to prevent Playable API issues with 0-input layer mixers. + animationMixerPlayable = AnimationLayerMixerPlayable.Create(playableGraph, Mathf.Max(1, mixableEffectScratchpad.Count)); animationPlayableOutput.SetSourcePlayable(animationMixerPlayable); + mixableEffectScratchpad.Clear(); + + int currentSlot = 0; foreach (var kvp in stateContainers) { @@ -227,10 +337,13 @@ protected virtual void Start() // Connect all AnimationEffects to our single, reusable AnimationMixer. if (effect is IAnimationMixableEffect mixableEffect) { - // Expand the mixer's slots to fit our new playable. - int currentSlot = animationMixerPlayable.GetInputCount(); - animationMixerPlayable.SetInputCount(currentSlot + 1); - // animationMixerPlayable.SetInputWeight(currentSlot, 1); + // Guard against duplicate entries, which can occur if the same + // effect instance appears more than once across stateContainers. + if (mixableIndices.ContainsKey(mixableEffect)) + { + Debug.LogWarning($"{nameof(StateVisualizer)}: Duplicate IAnimationMixableEffect instance detected in stateContainers ({effect.GetType().Name}). Skipping duplicate."); + continue; + } // Configure the layer in the mixer, based on the effect's settings. // For now, additive mixing is blocked by a Unity bug, described at the following links. @@ -244,6 +357,8 @@ protected virtual void Start() // Record the index for later retrieval. mixableIndices.Add(mixableEffect, currentSlot); + + currentSlot++; } else { @@ -259,10 +374,40 @@ protected virtual void Start() } } - // Start awake. We'll go back to sleep if nothing happens. - animator.enabled = true; - playableGraph.Play(); - enabled = true; + // Update state values to match the current interactable state before setting weights. + UpdateStateValues(); + + // Snap the weights to the current state value initially so Rebuild() doesn't cause + // a visual glitch by lerping from 0, or flashing the bind pose. + foreach (var kvp in stateContainers) + { + foreach (IEffect effect in kvp.Value.Effects) + { + if (effect is IAnimationMixableEffect mixableEffect && mixableIndices.TryGetValue(mixableEffect, out int slot)) + { + animationMixerPlayable.SetInputWeight(slot, kvp.Value.Value); + } + } + } + + // Determine if we actually need to be awake. + if (EvaluateEffects() && interactable != null && !interactable.isSelected && !interactable.isHovered) + { + // Start asleep if nothing is happening. This prevents the Animator from + // briefly waking up and applying bind poses with 0 weights, which overwrites + // values set by other components (like theme binders). + playableGraph.Evaluate(); + animator.enabled = false; + playableGraph.Stop(); + enabled = false; + } + else + { + animator.enabled = true; + playableGraph.Play(); + enabled = true; + sleepTimer = keepAliveTime; + } } /// @@ -301,10 +446,10 @@ private void Update() } // If we're asleep, quit early. - if (!animator.enabled) + if (!animator.enabled) { enabled = false; - return; + return; } // Returns true if all effects are done playing. @@ -322,6 +467,7 @@ private void Update() if (sleepTimer <= 0 && interactable != null && !interactable.isSelected && !interactable.isHovered) { // All effects are done, let's go to sleep. + playableGraph.Evaluate(); animator.enabled = false; playableGraph.Stop(); enabled = false; @@ -351,10 +497,94 @@ private void OnDestroy() } } + /// + /// Sets the tint color on all effects within the named state. + /// + /// The name of the state whose tint effects should be updated. + /// The color to apply. + /// + /// if the state was found and at least one tint effect was updated, + /// otherwise. + /// + public bool TrySetStateTintColor(string stateName, Color color) + { + if (!stateContainers.TryGetValue(stateName, out State state)) + { + return false; + } + + bool anyUpdated = false; + foreach (IEffect effect in state.Effects) + { + if (effect is ITintEffect tintEffect) + { + tintEffect.TintColor = color; + anyUpdated = true; + } + } + + return anyUpdated; + } + + /// + /// Sets the tint color on the within the named state whose + /// returns for + /// . + /// + /// + /// This is the preferred overload when a single state contains multiple tint effects that + /// need different colors (e.g. a background tint and an icon tint). Assign the + /// UnityEngine.Object reference directly in the Inspector — it is rename-proof and + /// breaks visibly (missing reference) rather than silently if the object is deleted. + /// + /// If is this method behaves + /// identically to and updates every + /// tint effect in the state. + /// + /// The name of the state whose tint effects should be updated. + /// A that appears in the + /// tintables list of the effect to update, or to update all tint + /// effects in the state. + /// The color to apply. + /// + /// if the state was found and at least one matching tint effect was + /// updated, otherwise. + /// + public bool TrySetStateTintColor(string stateName, UnityEngine.Object tintTarget, Color color) + { + if (tintTarget == null) + { + return TrySetStateTintColor(stateName, color); + } + + if (!stateContainers.TryGetValue(stateName, out State state)) + { + return false; + } + + bool anyUpdated = false; + foreach (IEffect effect in state.Effects) + { + if (effect is ITintEffect tintEffect && + tintEffect.HasTintable(tintTarget)) + { + tintEffect.TintColor = color; + anyUpdated = true; + } + } + + return anyUpdated; + } + /// /// Adds the provided effect to the state with name . /// Creates the state if it doesn't exist. /// + /// + /// If this method is called at runtime after the component has been initialized, + /// you must manually call to regenerate the + /// so the new effect's playables are properly evaluated and connected. + /// /// The name of the state to add the effect to. /// The effect to add. internal void AddEffect(string stateName, IEffect effect) @@ -370,6 +600,11 @@ internal void AddEffect(string stateName, IEffect effect) /// /// Removes the specified effect from the state with name . /// + /// + /// If this method is called at runtime after the component has been initialized, + /// you must manually call to properly disconnect and destroy + /// the removed effect's playables from the . + /// /// The name of the state to remove the effect from. /// The effect to remove. /// if the effect was removed, otherwise. @@ -390,7 +625,7 @@ internal bool RemoveEffect(string stateName, IEffect effect) // is a non-issue for now. /// - /// Sets the parameter value on each state. + /// Sets the parameter value on each state. /// Override + extend this method to implement custom state parameters. /// /// @@ -447,11 +682,11 @@ protected internal bool UpdateStateValue(string stateName, float newValue) /// Call before calling this method. /// /// - /// The and connected will be put to + /// The and connected will be put to /// sleep if this returns . /// /// - /// if all effects are done playing, otherwise. + /// if all effects are done playing, otherwise. /// private bool EvaluateEffects() { @@ -485,16 +720,17 @@ private bool EvaluateEffects() private bool UpdateWeight(IAnimationMixableEffect mixableEffect, State state) { bool done = true; + int inputIndex = mixableIndices[mixableEffect]; if (mixableEffect.WeightMode == WeightType.MatchStateValue) { // Set the playable's weight directly to the state's value. - animationMixerPlayable.SetInputWeight(mixableEffect.Playable, state.Value); + animationMixerPlayable.SetInputWeight(inputIndex, state.Value); } else if (mixableEffect.WeightMode == WeightType.Transition) { // Grab the current weight, using our cached mixable indices. - float currentWeight = animationMixerPlayable.GetInputWeight(mixableIndices[mixableEffect]); + float currentWeight = animationMixerPlayable.GetInputWeight(inputIndex); // Compute the direction of the transition. bool shouldBeActive = !Mathf.Approximately(state.Value, 0.0f); @@ -513,7 +749,7 @@ private bool UpdateWeight(IAnimationMixableEffect mixableEffect, State state) else { // WeightType.Constant is the only remaining option; the weight is always 1.0. - animationMixerPlayable.SetInputWeight(mixableEffect.Playable, 1.0f); + animationMixerPlayable.SetInputWeight(inputIndex, 1.0f); } return done; diff --git a/org.mixedrealitytoolkit.uxcore/Tests/Editor/AssemblyInfo.cs b/org.mixedrealitytoolkit.uxcore/Tests/Editor/AssemblyInfo.cs index 290a07c9a..18a4d592f 100644 --- a/org.mixedrealitytoolkit.uxcore/Tests/Editor/AssemblyInfo.cs +++ b/org.mixedrealitytoolkit.uxcore/Tests/Editor/AssemblyInfo.cs @@ -9,4 +9,4 @@ // The AssemblyVersion attribute is checked-in and is recommended not to be changed often. // https://docs.microsoft.com/troubleshoot/visualstudio/general/assembly-version-assembly-file-version // AssemblyFileVersion and AssemblyInformationalVersion are added by pack-upm.ps1 to match the current MRTK build version. -[assembly: AssemblyVersion("3.0.0.0")] +[assembly: AssemblyVersion("4.0.0.0")] diff --git a/org.mixedrealitytoolkit.uxcore/Tests/Runtime/AssemblyInfo.cs b/org.mixedrealitytoolkit.uxcore/Tests/Runtime/AssemblyInfo.cs index 433b24373..a688740c2 100644 --- a/org.mixedrealitytoolkit.uxcore/Tests/Runtime/AssemblyInfo.cs +++ b/org.mixedrealitytoolkit.uxcore/Tests/Runtime/AssemblyInfo.cs @@ -9,4 +9,4 @@ // The AssemblyVersion attribute is checked-in and is recommended not to be changed often. // https://docs.microsoft.com/troubleshoot/visualstudio/general/assembly-version-assembly-file-version // AssemblyFileVersion and AssemblyInformationalVersion are added by pack-upm.ps1 to match the current MRTK build version. -[assembly: AssemblyVersion("3.0.0.0")] +[assembly: AssemblyVersion("4.0.0.0")] diff --git a/org.mixedrealitytoolkit.uxcore/Tests/Runtime/FontIconSelectorTests.cs b/org.mixedrealitytoolkit.uxcore/Tests/Runtime/FontIconSelectorTests.cs new file mode 100644 index 000000000..120912d99 --- /dev/null +++ b/org.mixedrealitytoolkit.uxcore/Tests/Runtime/FontIconSelectorTests.cs @@ -0,0 +1,65 @@ +// Copyright (c) Mixed Reality Toolkit Contributors +// Licensed under the BSD 3-Clause + +using MixedReality.Toolkit.UX; +using NUnit.Framework; +using System.Collections; +using System.Reflection; +using TMPro; +using UnityEngine; +using UnityEngine.TestTools; + +namespace MixedReality.Toolkit.UX.Runtime.Tests +{ + /// + /// Tests for the component. + /// + public class FontIconSelectorTests + { + [UnityTest] + public IEnumerator TestMigrationToDescriptiveNames() + { + // 1. Create a mock FontIconSetDefinition + FontIconSetDefinition iconSetDef = ScriptableObject.CreateInstance(); + + // 2. Create a mock FontIconSet and assign the definition to it via Reflection + FontIconSet iconSet = ScriptableObject.CreateInstance(); + typeof(FontIconSet).GetField("fontIconSetDefinition", BindingFlags.NonPublic | BindingFlags.Instance) + ?.SetValue(iconSet, iconSetDef); + + // 3. Add an icon with a descriptive name and a specific unicode value + uint checkmarkUnicode = 0xE10B; + iconSet.AddIcon("Checkmark", checkmarkUnicode); + + // 4. Create a GameObject with a text component and a FontIconSelector + GameObject go = new GameObject("IconSelectorTest"); + TMP_Text textComponent = go.AddComponent(); + + // Set the text component to the old un-migrated unicode character + textComponent.text = FontIconSet.ConvertUnicodeToHexString(checkmarkUnicode); + + FontIconSelector selector = go.AddComponent(); + + // Assign our mock FontIconSet + typeof(FontIconSelector).GetField("fontIcons", BindingFlags.NonPublic | BindingFlags.Instance) + ?.SetValue(selector, iconSet); + + // At this point, the selector doesn't know its descriptive name + Assert.AreNotEqual("Checkmark", selector.CurrentIconName); + + // 5. Trigger migration + bool migrationSucceeded = selector.TryMigrate(); + + // 6. Verify the migration accurately found and assigned the descriptive name + Assert.IsTrue(migrationSucceeded, "TryMigrate should have returned true."); + Assert.AreEqual("Checkmark", selector.CurrentIconName, "FontIconSelector did not migrate to the descriptive icon name."); + + // Cleanup + Object.Destroy(go); + Object.Destroy(iconSet); + Object.Destroy(iconSetDef); + + yield return null; + } + } +} diff --git a/org.mixedrealitytoolkit.uxcore/Tests/Runtime/FontIconSelectorTests.cs.meta b/org.mixedrealitytoolkit.uxcore/Tests/Runtime/FontIconSelectorTests.cs.meta new file mode 100644 index 000000000..99de019a2 --- /dev/null +++ b/org.mixedrealitytoolkit.uxcore/Tests/Runtime/FontIconSelectorTests.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: f1a3703ea830e754cae0879bfd198ff4 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/org.mixedrealitytoolkit.uxcore/Tests/Runtime/SeeItSayItLabelEnablerTests.cs b/org.mixedrealitytoolkit.uxcore/Tests/Runtime/SeeItSayItLabelEnablerTests.cs index f92b9b7de..d026a2f87 100644 --- a/org.mixedrealitytoolkit.uxcore/Tests/Runtime/SeeItSayItLabelEnablerTests.cs +++ b/org.mixedrealitytoolkit.uxcore/Tests/Runtime/SeeItSayItLabelEnablerTests.cs @@ -4,15 +4,12 @@ // Disable "missing XML comment" warning for tests. While nice to have, this documentation is not required. #pragma warning disable CS1591 -using System.Collections; -using System.Text.RegularExpressions; -using System.Threading.Tasks; -using MixedReality.Toolkit.Core.Tests; using MixedReality.Toolkit.Input; using MixedReality.Toolkit.Input.Tests; using NUnit.Framework; +using System.Collections; +using System.Text.RegularExpressions; using TMPro; -using UnityEditor; using UnityEngine; using UnityEngine.TestTools; @@ -30,25 +27,32 @@ public IEnumerator TestEnableAndSetLabel() Transform label = testButton.transform.GetChild(0); #if MRTK_INPUT_PRESENT && MRTK_SPEECH_PRESENT - SpeechInteractor interactor = FindObjectUtility.FindAnyObjectByType(true); - interactor.gameObject.SetActive(true); - - yield return null; if (Application.isBatchMode) { - LogAssert.Expect(LogType.Exception, new Regex("Speech recognition is not supported on this machine")); + Debug.Log("Did not run SeeItSayItLabelEnablerTests, since speech is not available in batch mode."); + } + else + { + SpeechInteractor interactor = Object.FindAnyObjectByType(FindObjectsInactive.Include); + interactor.gameObject.SetActive(true); + yield return null; + + if (Application.isBatchMode) + { + LogAssert.Expect(LogType.Exception, new Regex("Speech recognition is not supported on this machine")); + } + + Transform sublabel = label.transform.GetChild(0); + Assert.IsTrue(label.gameObject.activeSelf, "Label is enabled"); + Assert.IsTrue(!sublabel.gameObject.activeSelf, "Child objects are disabled"); + TMP_Text text = label.gameObject.GetComponentInChildren(true); + Assert.AreEqual(text.text, "Say 'test'", "Label text was set to voice command keyword."); + Object.Destroy(testButton); } - - Transform sublabel = label.transform.GetChild(0); - Assert.IsTrue(label.gameObject.activeSelf, "Label is enabled"); - Assert.IsTrue(!sublabel.gameObject.activeSelf, "Child objects are disabled"); - TMP_Text text = label.gameObject.GetComponentInChildren(true); - Assert.AreEqual(text.text, "Say 'test'", "Label text was set to voice command keyword."); #else - Assert.IsTrue(!label.gameObject.activeSelf, "Did not enable label because voice commands unavailable."); + Debug.Log("Did not run SeeItSayItLabelEnablerTests, since speech is not present."); #endif - Object.Destroy(testButton); // Wait for a frame to give Unity a change to actually destroy the object yield return null; } @@ -60,22 +64,29 @@ public IEnumerator TestAutoUpdateLabel() Transform label = testButton.transform.GetChild(0); #if MRTK_INPUT_PRESENT && MRTK_SPEECH_PRESENT - SpeechInteractor interactor = FindObjectUtility.FindAnyObjectByType(true); - interactor.gameObject.SetActive(true); - - yield return null; if (Application.isBatchMode) { - LogAssert.Expect(LogType.Exception, new Regex("Speech recognition is not supported on this machine")); + Debug.Log("Did not run SeeItSayItLabelEnablerTests, since speech is not available in batch mode."); } + else + { + SpeechInteractor interactor = Object.FindAnyObjectByType(FindObjectsInactive.Include); + interactor.gameObject.SetActive(true); + yield return null; + + if (Application.isBatchMode) + { + LogAssert.Expect(LogType.Exception, new Regex("Speech recognition is not supported on this machine")); + } - Transform sublabel = label.transform.GetChild(0); - TMP_Text text = label.gameObject.GetComponentInChildren(true); - Assert.AreEqual(text.text, "Say 'test'", "Label text was set to voice command keyword."); + Transform sublabel = label.transform.GetChild(0); + TMP_Text text = label.gameObject.GetComponentInChildren(true); + Assert.AreEqual(text.text, "Say 'test'", "Label text was set to voice command keyword."); - testButton.GetComponent().SpeechRecognitionKeyword = "hello world"; + testButton.GetComponent().SpeechRecognitionKeyword = "hello world"; - Assert.AreEqual(text.text, "Say 'hello world'", "Label text was updated according to voice command keyword."); + Assert.AreEqual(text.text, "Say 'hello world'", "Label text was updated according to voice command keyword."); + } #else Assert.IsTrue(!label.gameObject.activeSelf, "Did not enable label because voice commands unavailable."); #endif @@ -111,22 +122,29 @@ public IEnumerator TestPositionCanvasLabel() Transform label = testButton.transform.GetChild(0); #if MRTK_INPUT_PRESENT && MRTK_SPEECH_PRESENT - SpeechInteractor interactor = FindObjectUtility.FindAnyObjectByType(true); - interactor.gameObject.SetActive(true); - - yield return null; if (Application.isBatchMode) { - LogAssert.Expect(LogType.Exception, new Regex("Speech recognition is not supported on this machine")); + Debug.Log("Did not run TestPositionCanvasLabel, since speech is not available in batch mode."); + } + else + { + SpeechInteractor interactor = Object.FindAnyObjectByType(FindObjectsInactive.Include); + interactor.gameObject.SetActive(true); + yield return null; + + if (Application.isBatchMode) + { + LogAssert.Expect(LogType.Exception, new Regex("Speech recognition is not supported on this machine")); + } + + RectTransform sublabel = label.transform.GetChild(0) as RectTransform; + Assert.AreEqual(sublabel.anchoredPosition3D, new Vector3(10, -30, -10), "Label is positioned correctly"); + Object.Destroy(testButton); } - - RectTransform sublabel = label.transform.GetChild(0) as RectTransform; - Assert.AreEqual(sublabel.anchoredPosition3D, new Vector3(10, -30, -10), "Label is positioned correctly"); #else - Assert.IsTrue(!label.gameObject.activeSelf, "Did not enable label because voice commands unavailable."); + Debug.Log("Did not run TestPositionCanvasLabel, since speech is not present."); #endif - Object.Destroy(testButton); // Wait for a frame to give Unity a change to actually destroy the object yield return null; } @@ -138,21 +156,28 @@ public IEnumerator TestPositionNonCanvasLabel() Transform label = testButton.transform.GetChild(0); #if MRTK_INPUT_PRESENT && MRTK_SPEECH_PRESENT - SpeechInteractor interactor = FindObjectUtility.FindAnyObjectByType(true); - interactor.gameObject.SetActive(true); - - yield return null; if (Application.isBatchMode) { - LogAssert.Expect(LogType.Exception, new Regex("Speech recognition is not supported on this machine")); + Debug.Log("Did not run TestPositionNonCanvasLabel, since speech is not available in batch mode."); } + else + { + SpeechInteractor interactor = Object.FindAnyObjectByType(FindObjectsInactive.Include); + interactor.gameObject.SetActive(true); + yield return null; - Assert.AreEqual(label.transform.localPosition, new Vector3(10f, -.504f, -.004f), "Label is positioned correctly"); + if (Application.isBatchMode) + { + LogAssert.Expect(LogType.Exception, new Regex("Speech recognition is not supported on this machine")); + } + + Assert.AreEqual(label.transform.localPosition, new Vector3(10f, -.504f, -.004f), "Label is positioned correctly"); + Object.Destroy(testButton); + } #else - Assert.IsTrue(!label.gameObject.activeSelf, "Did not enable label because voice commands unavailable."); + Debug.Log("Did not run TestPositionNonCanvasLabel, since speech is not present."); #endif - Object.Destroy(testButton); // Wait for a frame to give Unity a change to actually destroy the object yield return null; } @@ -165,7 +190,7 @@ private GameObject SetUpButton(bool allowSelectByVoice, Control control) pressablebutton.AllowSelectByVoice = allowSelectByVoice; pressablebutton.SpeechRecognitionKeyword = "test"; - // Create a label GameObject to generate + // Create a label GameObject to generate GameObject label = new GameObject("Label"); label.transform.SetParent(testButton.transform, false); label.SetActive(false); diff --git a/org.mixedrealitytoolkit.uxcore/Tests/Runtime/StateVisualizerTests.cs b/org.mixedrealitytoolkit.uxcore/Tests/Runtime/StateVisualizerTests.cs index 298120042..46646b1f6 100644 --- a/org.mixedrealitytoolkit.uxcore/Tests/Runtime/StateVisualizerTests.cs +++ b/org.mixedrealitytoolkit.uxcore/Tests/Runtime/StateVisualizerTests.cs @@ -10,6 +10,7 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; +using UnityEngine.Animations; using UnityEngine.Playables; using UnityEngine.TestTools; @@ -140,6 +141,27 @@ public bool Evaluate(float parameter) } } + /// + /// A minimal mixable effect to verify PlayableGraph connections. + /// + private class TestMixableEffect : IAnimationMixableEffect, IPlayableEffect + { + public Playable Playable { get; private set; } + + public float TransitionDuration => 0f; + + public IAnimationMixableEffect.WeightType WeightMode => IAnimationMixableEffect.WeightType.MatchStateValue; + + public void Setup(PlayableGraph graph, GameObject owner) + { + AnimationClip clip = new AnimationClip(); + clip.SetCurve("", typeof(Transform), "localPosition.y", AnimationCurve.Constant(0f, 1f, 42f)); + Playable = AnimationClipPlayable.Create(graph, clip); + } + + public bool Evaluate(float parameter) => true; + } + /// /// Tests to see whether StateVisualizer can properly evaluate/execute a custom effect, /// defined above (CustomTestEffect). @@ -292,7 +314,7 @@ public IEnumerator TestWaitForLongRunningEffect() Assert.IsTrue(sv.Animator.enabled, "The animator should still be enabled after a short delay."); // Wait for the keepAliveTime - yield return new WaitForSeconds(0.1f); + yield return new WaitForSeconds(0.12f); Assert.IsFalse(sv.Animator.enabled, "The animator should be disabled after the keepAliveTime has elapsed."); @@ -340,6 +362,173 @@ public IEnumerator TestAnimatorMissing() Assert.IsTrue(cube.GetComponent() != null, "An animator wasn't automatically added when it was missing!"); } + + /// + /// Tests that setting a new Interactable safely unsubscribes from the old and subscribes to the new. + /// + [UnityTest] + public IEnumerator TestInteractableHotSwap() + { + GameObject cube1 = GameObject.CreatePrimitive(PrimitiveType.Cube); + StatefulInteractable interactable1 = cube1.AddComponent(); + interactable1.DisableInteractorType(typeof(IPokeInteractor)); + cube1.AddComponent(); + StateVisualizer sv = cube1.AddComponent(); + + cube1.transform.position = InputTestUtilities.InFrontOfUser(new Vector3(-0.2f, 0.1f, 1)); + cube1.transform.localScale = Vector3.one * 0.1f; + + GameObject cube2 = GameObject.CreatePrimitive(PrimitiveType.Cube); + StatefulInteractable interactable2 = cube2.AddComponent(); + interactable2.DisableInteractorType(typeof(IPokeInteractor)); + cube2.transform.position = InputTestUtilities.InFrontOfUser(new Vector3(0.2f, 0.1f, 1)); + cube2.transform.localScale = Vector3.one * 0.1f; + + CustomTestEffect customEffect = new CustomTestEffect(); + sv.AddEffect("Select", customEffect); + + var rightHand = new TestHand(Handedness.Right); + yield return rightHand.Show(InputTestUtilities.InFrontOfUser(0.5f)); + yield return RuntimeTestUtilities.WaitForUpdates(); + + // Interact with cube 1 + yield return rightHand.MoveTo(cube1.transform.position); + yield return RuntimeTestUtilities.WaitForUpdates(); + yield return rightHand.SetHandshape(HandshapeId.Pinch); + yield return RuntimeTestUtilities.WaitForUpdates(); + Assert.AreEqual(1.0f, customEffect.LastSetParameter, 0.00001f, "Effect should trigger on interactable 1."); + + yield return rightHand.SetHandshape(HandshapeId.Open); + yield return RuntimeTestUtilities.WaitForUpdates(); + Assert.AreEqual(0.0f, customEffect.LastSetParameter, 0.00001f, "Effect should reset."); + + // Swap interactable + sv.Interactable = interactable2; + yield return RuntimeTestUtilities.WaitForUpdates(); + + // Interact with cube 1 again (should NOT trigger) + yield return rightHand.SetHandshape(HandshapeId.Pinch); + yield return RuntimeTestUtilities.WaitForUpdates(); + Assert.AreEqual(0.0f, customEffect.LastSetParameter, 0.00001f, "Effect should NOT trigger on interactable 1 after hot-swap."); + + yield return rightHand.SetHandshape(HandshapeId.Open); + yield return RuntimeTestUtilities.WaitForUpdates(); + + // Interact with cube 2 + yield return rightHand.MoveTo(cube2.transform.position); + yield return RuntimeTestUtilities.WaitForUpdates(); + yield return rightHand.SetHandshape(HandshapeId.Pinch); + yield return RuntimeTestUtilities.WaitForUpdates(); + Assert.AreEqual(1.0f, customEffect.LastSetParameter, 0.00001f, "Effect should trigger on interactable 2 after hot-swap."); + } + + /// + /// Tests that setting a new Animator at runtime successfully triggers a Rebuild and updates the target. + /// + [UnityTest] + public IEnumerator TestAnimatorHotSwap() + { + GameObject cube1 = GameObject.CreatePrimitive(PrimitiveType.Cube); + StatefulInteractable interactable = cube1.AddComponent(); + interactable.DisableInteractorType(typeof(IPokeInteractor)); + Animator anim1 = cube1.AddComponent(); + StateVisualizer sv = cube1.AddComponent(); + + cube1.transform.position = InputTestUtilities.InFrontOfUser(new Vector3(0.1f, 0.1f, 1)); + cube1.transform.localScale = Vector3.one * 0.1f; + + // Add the effect BEFORE Start() so we don't need to manually Rebuild() to pick it up. + CustomTestEffect customEffect = new CustomTestEffect(); + sv.AddEffect("Select", customEffect); + + TestMixableEffect mixableEffect = new TestMixableEffect(); + sv.AddEffect("Select", mixableEffect); + + yield return RuntimeTestUtilities.WaitForUpdates(); + + GameObject cube2 = GameObject.CreatePrimitive(PrimitiveType.Cube); + Animator anim2 = cube2.AddComponent(); + + var rightHand = new TestHand(Handedness.Right); + yield return rightHand.Show(cube1.transform.position); + yield return RuntimeTestUtilities.WaitForUpdates(); + + Assert.AreEqual(anim1, sv.Animator, "SV should default to Animator on the same GameObject."); + Assert.IsTrue(anim1.enabled, "The initial Animator should be enabled because the StateVisualizer is hovered."); + + // Swap animator while awake + sv.Animator = anim2; + + Assert.IsFalse(anim1.enabled, "The old Animator should be disabled immediately after hot-swap."); + Assert.IsTrue(anim2.enabled, "The new Animator should instantly inherit the playing state from the PlayableGraph."); + Assert.AreEqual(anim2, sv.Animator, "SV Animator should be updated."); + + // Wait for it to go to sleep + yield return rightHand.MoveTo(Vector3.zero); + yield return new WaitForSeconds(0.25f); + Assert.IsFalse(anim2.enabled, "The new Animator should have been put to sleep by the visualizer after keepAliveTime elapsed."); + + // Hot swap while asleep + GameObject cube3 = GameObject.CreatePrimitive(PrimitiveType.Cube); + Animator anim3 = cube3.AddComponent(); + sv.Animator = anim3; + + Assert.IsFalse(anim2.enabled, "The old Animator should still be disabled after hot-swap."); + Assert.IsFalse(anim3.enabled, "The newly swapped Animator should remain asleep because the PlayableGraph is stopped."); + Assert.AreEqual(42f, cube3.transform.localPosition.y, 0.001f, "The newly swapped Animator should instantly inherit the evaluated pose before being put back to sleep."); + + yield return rightHand.MoveTo(cube1.transform.position); + yield return RuntimeTestUtilities.WaitForUpdates(); + + Assert.IsTrue(anim3.enabled, "The new Animator should be enabled when the StateVisualizer wakes up."); + + yield return rightHand.SetHandshape(HandshapeId.Pinch); + yield return RuntimeTestUtilities.WaitForUpdates(); + Assert.AreEqual(1.0f, customEffect.LastSetParameter, 0.00001f, "Effect should trigger after Animator hot-swap."); + Assert.AreEqual(42f, cube3.transform.localPosition.y, 0.001f, "The mixable effect should have animated the new Animator's GameObject."); + + // Verify destruction doesn't cause PlayableGraph leaks/errors + Object.Destroy(cube1); + Object.Destroy(cube2); + Object.Destroy(cube3); + yield return RuntimeTestUtilities.WaitForUpdates(); + } + + /// + /// Tests that calling Rebuild() multiple times doesn't cause crashes, leaks, or break existing effects. + /// + [UnityTest] + public IEnumerator TestRebuild() + { + GameObject cube = GameObject.CreatePrimitive(PrimitiveType.Cube); + StatefulInteractable interactable = cube.AddComponent(); + interactable.DisableInteractorType(typeof(IPokeInteractor)); + cube.AddComponent(); + StateVisualizer sv = cube.AddComponent(); + cube.transform.position = InputTestUtilities.InFrontOfUser(new Vector3(0.1f, 0.1f, 1)); + cube.transform.localScale = Vector3.one * 0.1f; + yield return RuntimeTestUtilities.WaitForUpdates(); + + CustomTestEffect customEffect = new CustomTestEffect(); + sv.AddEffect("Select", customEffect); + + // Call rebuild multiple times to ensure no crashes or obvious leaks. + sv.Rebuild(); + sv.Rebuild(); + sv.Rebuild(); + + yield return RuntimeTestUtilities.WaitForUpdates(); + + var rightHand = new TestHand(Handedness.Right); + yield return rightHand.Show(InputTestUtilities.InFrontOfUser(0.5f)); + yield return RuntimeTestUtilities.WaitForUpdates(); + yield return rightHand.MoveTo(cube.transform.position); + yield return RuntimeTestUtilities.WaitForUpdates(); + yield return rightHand.SetHandshape(HandshapeId.Pinch); + yield return RuntimeTestUtilities.WaitForUpdates(); + + Assert.AreEqual(1.0f, customEffect.LastSetParameter, 0.00001f, "Effect should trigger after multiple Rebuilds."); + } } } #pragma warning restore CS1591 diff --git a/org.mixedrealitytoolkit.uxcore/Tests/Runtime/ToggleCollectionTests.cs b/org.mixedrealitytoolkit.uxcore/Tests/Runtime/ToggleCollectionTests.cs index d5b6ec8b8..378941b22 100644 --- a/org.mixedrealitytoolkit.uxcore/Tests/Runtime/ToggleCollectionTests.cs +++ b/org.mixedrealitytoolkit.uxcore/Tests/Runtime/ToggleCollectionTests.cs @@ -9,7 +9,8 @@ using System.Collections; using UnityEngine; using UnityEngine.TestTools; -using UnityEngine.XR.Interaction.Toolkit; +using UnityEngine.XR.Interaction.Toolkit.Interactables; +using UnityEngine.XR.Interaction.Toolkit.Interactors; namespace MixedReality.Toolkit.UX.Runtime.Tests { @@ -151,4 +152,4 @@ public IEnumerator TestAllowSwitchOff() } } } -#pragma warning restore CS1591 \ No newline at end of file +#pragma warning restore CS1591 diff --git a/org.mixedrealitytoolkit.uxcore/Theming.meta b/org.mixedrealitytoolkit.uxcore/Theming.meta new file mode 100644 index 000000000..4de1b65ff --- /dev/null +++ b/org.mixedrealitytoolkit.uxcore/Theming.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3b4588601bed84d47965abae903e7c03 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/org.mixedrealitytoolkit.uxcore/Theming/AssemblyInfo.cs b/org.mixedrealitytoolkit.uxcore/Theming/AssemblyInfo.cs new file mode 100644 index 000000000..588a0bff2 --- /dev/null +++ b/org.mixedrealitytoolkit.uxcore/Theming/AssemblyInfo.cs @@ -0,0 +1,12 @@ +// Copyright (c) Mixed Reality Toolkit Contributors +// Licensed under the BSD 3-Clause + +using System.Reflection; + +[assembly: AssemblyProduct("Mixed Reality Toolkit UX Core Theming")] +[assembly: AssemblyCopyright("Copyright (c) Mixed Reality Toolkit Contributors")] + +// The AssemblyVersion attribute is checked-in and is recommended not to be changed often. +// https://docs.microsoft.com/troubleshoot/visualstudio/general/assembly-version-assembly-file-version +// AssemblyFileVersion and AssemblyInformationalVersion are added by pack-upm.ps1 to match the current MRTK build version. +[assembly: AssemblyVersion("4.0.0.0")] diff --git a/org.mixedrealitytoolkit.uxcore/Theming/AssemblyInfo.cs.meta b/org.mixedrealitytoolkit.uxcore/Theming/AssemblyInfo.cs.meta new file mode 100644 index 000000000..ab588279e --- /dev/null +++ b/org.mixedrealitytoolkit.uxcore/Theming/AssemblyInfo.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: dca329abb86cbed439db681cb5c19650 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/org.mixedrealitytoolkit.uxcore/Theming/MRTK.UXCore.Theming.asmdef b/org.mixedrealitytoolkit.uxcore/Theming/MRTK.UXCore.Theming.asmdef new file mode 100644 index 000000000..0e1ed8af8 --- /dev/null +++ b/org.mixedrealitytoolkit.uxcore/Theming/MRTK.UXCore.Theming.asmdef @@ -0,0 +1,23 @@ +{ + "name": "MixedReality.Toolkit.UXCore.Theming", + "rootNamespace": "MixedReality.Toolkit.UX", + "references": [ + "GUID:56255bd5d851a6243b63cb370cfc40b1", + "GUID:2238d58cada9b6746a548c6bff32c381" + ], + "includePlatforms": [], + "excludePlatforms": [], + "allowUnsafeCode": false, + "overrideReferences": false, + "precompiledReferences": [], + "autoReferenced": true, + "defineConstraints": [], + "versionDefines": [ + { + "name": "org.mixedrealitytoolkit.theming", + "expression": "", + "define": "MRTK_THEMING_PRESENT" + } + ], + "noEngineReferences": false +} \ No newline at end of file diff --git a/org.mixedrealitytoolkit.uxcore/Theming/MRTK.UXCore.Theming.asmdef.meta b/org.mixedrealitytoolkit.uxcore/Theming/MRTK.UXCore.Theming.asmdef.meta new file mode 100644 index 000000000..cc29fc63a --- /dev/null +++ b/org.mixedrealitytoolkit.uxcore/Theming/MRTK.UXCore.Theming.asmdef.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 9ec3d438d2c0eb94ca75bc73e75e1937 +AssemblyDefinitionImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/org.mixedrealitytoolkit.uxcore/Theming/ThemeBinding.cs b/org.mixedrealitytoolkit.uxcore/Theming/ThemeBinding.cs new file mode 100644 index 000000000..b07482816 --- /dev/null +++ b/org.mixedrealitytoolkit.uxcore/Theming/ThemeBinding.cs @@ -0,0 +1,71 @@ +// Copyright (c) Mixed Reality Toolkit Contributors +// Licensed under the BSD 3-Clause + +#if MRTK_THEMING_PRESENT +using MixedReality.Toolkit.Theming; +#endif + +using UnityEngine; + +namespace MixedReality.Toolkit.UX +{ + public class ThemeBinding : MonoBehaviour + { +#if MRTK_THEMING_PRESENT + [SerializeField] + [Tooltip("The theme data source manager.")] + private ThemeDataSource themeDataSource; + + [SerializeReference, InterfaceSelector] + [Tooltip("The list of bound theme entries.")] + private IBinder[] binders = System.Array.Empty(); + + private readonly System.Collections.Generic.List subscribedBinders = new System.Collections.Generic.List(); + private ThemeDataSource subscribedDataSource; + + protected void OnEnable() + { + if (themeDataSource == null) + { + Debug.LogWarning($"{nameof(ThemeBinding)} on '{gameObject.name}' has no {nameof(ThemeDataSource)} assigned.", this); + return; + } + + subscribedDataSource = themeDataSource; + + if (binders != null) + { + foreach (IBinder binder in binders) + { + if (binder == null) + { + Debug.LogWarning($"{nameof(ThemeBinding)} on '{gameObject.name}' has a null binder entry.", this); + continue; + } + + if (string.IsNullOrWhiteSpace(binder.ThemeDefinitionItemName)) + { + Debug.LogWarning($"{nameof(ThemeBinding)} on '{gameObject.name}' has a {binder.GetType().Name} with no theme item assigned.", this); + } + + binder.Subscribe(subscribedDataSource); + subscribedBinders.Add(binder); + } + } + } + + protected void OnDisable() + { + if (subscribedDataSource != null) + { + foreach (IBinder binder in subscribedBinders) + { + binder?.Unsubscribe(subscribedDataSource); + } + subscribedBinders.Clear(); + subscribedDataSource = null; + } + } +#endif + } +} diff --git a/org.mixedrealitytoolkit.uxcore/Theming/ThemeBinding.cs.meta b/org.mixedrealitytoolkit.uxcore/Theming/ThemeBinding.cs.meta new file mode 100644 index 000000000..621e0b4b3 --- /dev/null +++ b/org.mixedrealitytoolkit.uxcore/Theming/ThemeBinding.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 699100ca886480c4a94ced56b1ae0e94 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/org.mixedrealitytoolkit.uxcore/package.json b/org.mixedrealitytoolkit.uxcore/package.json index b8ab15c5c..95a6fa50a 100644 --- a/org.mixedrealitytoolkit.uxcore/package.json +++ b/org.mixedrealitytoolkit.uxcore/package.json @@ -1,6 +1,6 @@ { "name": "org.mixedrealitytoolkit.uxcore", - "version": "3.3.1-development", + "version": "4.0.0-development.pre.4", "description": "Core interaction and visualization scripts for building MR UI components. Intended to be consumed when building UX libraries. For pre-existing library of components, see the UX Components package.", "displayName": "MRTK UX Core Scripts", "msftFeatureCategory": "MRTK3", @@ -13,21 +13,21 @@ "bugs": { "url": "https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/issues" }, - "unity": "2021.3", - "unityRelease": "26f1", + "unity": "6000.0", + "unityRelease": "66f2", "documentationUrl": "https://www.mixedrealitytoolkit.org", "dependencies": { "com.microsoft.mrtk.graphicstools.unity": "0.8.0", - "org.mixedrealitytoolkit.core": "3.3.0", + "org.mixedrealitytoolkit.core": "4.0.0", "com.unity.inputsystem": "1.6.1", "com.unity.textmeshpro": "3.0.6", - "com.unity.xr.interaction.toolkit": "2.3.0" + "com.unity.xr.interaction.toolkit": "3.0.4" }, "msftOptionalPackages": { "org.mixedrealitytoolkit.data": "1.0.0-development", - "org.mixedrealitytoolkit.spatialmanipulation": "3.0.0" + "org.mixedrealitytoolkit.spatialmanipulation": "4.0.0" }, "msftTestDependencies": { - "org.mixedrealitytoolkit.input": "3.0.0" + "org.mixedrealitytoolkit.input": "4.0.0" } } \ No newline at end of file