diff --git a/Assets/Samples/XR Hands/1.3.0/HandVisualizer/HandVisualizer.unity b/Assets/Samples/XR Hands/1.3.0/HandVisualizer/HandVisualizer.unity index 2216157..d185197 100644 --- a/Assets/Samples/XR Hands/1.3.0/HandVisualizer/HandVisualizer.unity +++ b/Assets/Samples/XR Hands/1.3.0/HandVisualizer/HandVisualizer.unity @@ -104,7 +104,7 @@ NavMeshSettings: serializedVersion: 2 m_ObjectHideFlags: 0 m_BuildSettings: - serializedVersion: 3 + serializedVersion: 2 agentTypeID: 0 agentRadius: 0.5 agentHeight: 2 @@ -117,7 +117,7 @@ NavMeshSettings: cellSize: 0.16666667 manualTileSize: 0 tileSize: 256 - buildHeightMesh: 0 + accuratePlacement: 0 maxJobWorkers: 0 preserveTilesOutsideBounds: 0 debug: @@ -130,7 +130,7 @@ LightingSettings: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: - serializedVersion: 6 + serializedVersion: 3 m_GIWorkflowMode: 1 m_EnableBakedLightmaps: 1 m_EnableRealtimeLightmaps: 0 @@ -143,7 +143,7 @@ LightingSettings: m_LightmapMaxSize: 1024 m_BakeResolution: 40 m_Padding: 2 - m_LightmapCompression: 3 + m_TextureCompression: 1 m_AO: 0 m_AOMaxDistance: 1 m_CompAOExponent: 1 @@ -169,8 +169,8 @@ LightingSettings: m_PVREnvironmentReferencePointCount: 2048 m_LightProbeSampleCountMultiplier: 4 m_PVRBounces: 2 - m_PVRMinBounces: 2 - m_PVREnvironmentImportanceSampling: 1 + m_PVRMinBounces: 1 + m_PVREnvironmentMIS: 1 m_PVRFilteringMode: 1 m_PVRDenoiserTypeDirect: 1 m_PVRDenoiserTypeIndirect: 1 @@ -184,9 +184,6 @@ LightingSettings: m_PVRFilteringAtrousPositionSigmaDirect: 0.5 m_PVRFilteringAtrousPositionSigmaIndirect: 2 m_PVRFilteringAtrousPositionSigmaAO: 1 - m_PVRTiledBaking: 0 - m_NumRaysToShootPerTexel: -1 - m_RespectSceneVisibilityWhenBakingGI: 0 --- !u!1 &92641028 stripped GameObject: m_CorrespondingSourceObject: {fileID: 3133494152545806682, guid: 3f7511fbc40ae7a4b89c3298a3de199d, type: 3} @@ -210,7 +207,6 @@ GameObject: - component: {fileID: 215855083} - component: {fileID: 215855082} - component: {fileID: 215855085} - - component: {fileID: 215855086} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -225,13 +221,12 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 215855080} - 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: 944581975} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &215855082 MonoBehaviour: @@ -273,17 +268,9 @@ 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 @@ -411,56 +398,12 @@ MonoBehaviour: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 ---- !u!114 &215855086 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 215855080} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} - m_Name: - m_EditorClassIdentifier: - m_RenderShadows: 1 - m_RequiresDepthTextureOption: 2 - m_RequiresOpaqueTextureOption: 2 - m_CameraType: 0 - m_Cameras: [] - m_RendererIndex: -1 - m_VolumeLayerMask: - serializedVersion: 2 - m_Bits: 1 - m_VolumeTrigger: {fileID: 0} - m_VolumeFrameworkUpdateModeOption: 2 - m_RenderPostProcessing: 0 - m_Antialiasing: 0 - m_AntialiasingQuality: 2 - m_StopNaN: 0 - m_Dithering: 0 - m_ClearDepth: 1 - m_AllowXRRendering: 1 - m_AllowHDROutput: 1 - m_UseScreenCoordOverride: 0 - m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0} - m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0} - m_RequiresDepthTexture: 0 - m_RequiresColorTexture: 0 - m_Version: 2 - m_TaaSettings: - quality: 3 - frameInfluence: 0.1 - jitterScale: 1 - mipBias: 0 - varianceClampScale: 0.9 - contrastAdaptiveSharpening: 0 + m_HasMigratedActions: 1 --- !u!1001 &402783663 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - serializedVersion: 3 m_TransformParent: {fileID: 944581975} m_Modifications: - target: {fileID: 2321527512367231968, guid: 3f7511fbc40ae7a4b89c3298a3de199d, type: 3} @@ -512,9 +455,6 @@ PrefabInstance: value: Right Hand Tracking objectReference: {fileID: 0} m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 3f7511fbc40ae7a4b89c3298a3de199d, type: 3} --- !u!1 &935940900 GameObject: @@ -541,13 +481,12 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 935940900} - 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: 944581975} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &935940902 MonoBehaviour: @@ -562,6 +501,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_UseOptimizedControls: 0 + m_Origin: {fileID: 1085439596} m_LeftHandMesh: {fileID: 1048441851} m_RightHandMesh: {fileID: 92641028} m_HandMeshMaterial: {fileID: 2100000, guid: 613690cd962241049a0ec289a6ff835e, type: 2} @@ -605,24 +545,22 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 944581974} - serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 1.2, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 m_Children: - {fileID: 215855081} - {fileID: 935940901} - {fileID: 1048441850} - {fileID: 92641029} m_Father: {fileID: 1085439597} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1048441849 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - serializedVersion: 3 m_TransformParent: {fileID: 944581975} m_Modifications: - target: {fileID: 141466980049140221, guid: b3ed8a0a703ebd34a9e44ed3d9f1fcf6, type: 3} @@ -674,9 +612,6 @@ PrefabInstance: value: Left Hand Tracking objectReference: {fileID: 0} m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b3ed8a0a703ebd34a9e44ed3d9f1fcf6, type: 3} --- !u!4 &1048441850 stripped Transform: @@ -729,14 +664,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1085439595} - 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: 944581975} m_Father: {fileID: 0} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1517268251 GameObject: @@ -748,7 +682,6 @@ GameObject: m_Component: - component: {fileID: 1517268253} - component: {fileID: 1517268252} - - component: {fileID: 1517268254} m_Layer: 0 m_Name: Directional Light m_TagString: Untagged @@ -825,40 +758,10 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1517268251} - 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!114 &1517268254 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1517268251} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Version: 3 - m_UsePipelineSettings: 1 - m_AdditionalLightsShadowResolutionTier: 2 - m_LightLayerMask: 1 - m_RenderingLayers: 1 - m_CustomShadowLayers: 0 - m_ShadowLayerMask: 1 - m_ShadowRenderingLayers: 1 - m_LightCookieSize: {x: 1, y: 1} - m_LightCookieOffset: {x: 0, y: 0} - m_SoftShadowQuality: 0 ---- !u!1660057539 &9223372036854775807 -SceneRoots: - m_ObjectHideFlags: 0 - m_Roots: - - {fileID: 1517268253} - - {fileID: 1085439597} diff --git a/Assets/Samples/XR Hands/1.3.0/HandVisualizer/Materials/Blue.mat b/Assets/Samples/XR Hands/1.3.0/HandVisualizer/Materials/Blue.mat index 57f8e38..93221bc 100644 --- a/Assets/Samples/XR Hands/1.3.0/HandVisualizer/Materials/Blue.mat +++ b/Assets/Samples/XR Hands/1.3.0/HandVisualizer/Materials/Blue.mat @@ -1,47 +1,24 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!114 &-7871365558910426608 -MonoBehaviour: - m_ObjectHideFlags: 11 - 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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} - m_Name: - m_EditorClassIdentifier: - version: 7 --- !u!21 &2100000 Material: - serializedVersion: 8 + serializedVersion: 6 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Blue - m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: - - _SMOOTHNESS_TEXTURE_ALBEDO_CHANNEL_A - m_InvalidKeywords: [] + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: _SMOOTHNESS_TEXTURE_ALBEDO_CHANNEL_A m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: - RenderType: Opaque + stringTagMap: {} disabledShaderPasses: [] - m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: - - _BaseMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - _BumpMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -78,38 +55,11 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - - _SpecGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - unity_Lightmaps: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - unity_LightmapsInd: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - unity_ShadowMasks: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] m_Floats: - - _AlphaClip: 0 - - _AlphaToMask: 0 - - _Blend: 0 - - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - - _ClearCoatMask: 0 - - _ClearCoatSmoothness: 0 - - _Cull: 2 - _Cutoff: 0.5 - - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 - - _DstBlendAlpha: 0 - - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossyReflections: 1 @@ -117,20 +67,12 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 - - _QueueOffset: 0 - - _ReceiveShadows: 1 - - _Smoothness: 0.5 - _SmoothnessTextureChannel: 1 - _SpecularHighlights: 1 - _SrcBlend: 1 - - _SrcBlendAlpha: 1 - - _Surface: 0 - _UVSec: 0 - - _WorkflowMode: 1 - _ZWrite: 1 m_Colors: - - _BaseColor: {r: 0, g: 0, b: 1, a: 1} - _Color: {r: 0, g: 0, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Samples/XR Hands/1.3.0/HandVisualizer/Materials/Green.mat b/Assets/Samples/XR Hands/1.3.0/HandVisualizer/Materials/Green.mat index 1665376..0ed1af8 100644 --- a/Assets/Samples/XR Hands/1.3.0/HandVisualizer/Materials/Green.mat +++ b/Assets/Samples/XR Hands/1.3.0/HandVisualizer/Materials/Green.mat @@ -1,47 +1,24 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!114 &-557068714958142375 -MonoBehaviour: - m_ObjectHideFlags: 11 - 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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} - m_Name: - m_EditorClassIdentifier: - version: 7 --- !u!21 &2100000 Material: - serializedVersion: 8 + serializedVersion: 6 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Green - m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: - - _SMOOTHNESS_TEXTURE_ALBEDO_CHANNEL_A - m_InvalidKeywords: [] + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: _SMOOTHNESS_TEXTURE_ALBEDO_CHANNEL_A m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: - RenderType: Opaque + stringTagMap: {} disabledShaderPasses: [] - m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: - - _BaseMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - _BumpMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -78,38 +55,11 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - - _SpecGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - unity_Lightmaps: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - unity_LightmapsInd: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - unity_ShadowMasks: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] m_Floats: - - _AlphaClip: 0 - - _AlphaToMask: 0 - - _Blend: 0 - - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - - _ClearCoatMask: 0 - - _ClearCoatSmoothness: 0 - - _Cull: 2 - _Cutoff: 0.5 - - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 - - _DstBlendAlpha: 0 - - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossyReflections: 1 @@ -117,20 +67,12 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 - - _QueueOffset: 0 - - _ReceiveShadows: 1 - - _Smoothness: 0.5 - _SmoothnessTextureChannel: 1 - _SpecularHighlights: 1 - _SrcBlend: 1 - - _SrcBlendAlpha: 1 - - _Surface: 0 - _UVSec: 0 - - _WorkflowMode: 1 - _ZWrite: 1 m_Colors: - - _BaseColor: {r: 0, g: 1, b: 0, a: 1} - _Color: {r: 0, g: 1, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Samples/XR Hands/1.3.0/HandVisualizer/Materials/HandsDefaultMaterial.mat b/Assets/Samples/XR Hands/1.3.0/HandVisualizer/Materials/HandsDefaultMaterial.mat index b2e7d49..04b02ad 100644 --- a/Assets/Samples/XR Hands/1.3.0/HandVisualizer/Materials/HandsDefaultMaterial.mat +++ b/Assets/Samples/XR Hands/1.3.0/HandVisualizer/Materials/HandsDefaultMaterial.mat @@ -2,37 +2,24 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 8 + serializedVersion: 6 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: HandsDefaultMaterial - m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: - - _ALPHAPREMULTIPLY_ON - - _SURFACE_TYPE_TRANSPARENT - m_InvalidKeywords: - - _ALPHABLEND_ON + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: _ALPHABLEND_ON m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: 3000 stringTagMap: RenderType: Transparent - disabledShaderPasses: - - DepthOnly - - SHADOWCASTER - m_LockedProperties: + disabledShaderPasses: [] m_SavedProperties: serializedVersion: 3 m_TexEnvs: - - _BaseMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - _BumpMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -69,38 +56,11 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - - _SpecGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - unity_Lightmaps: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - unity_LightmapsInd: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - unity_ShadowMasks: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] m_Floats: - - _AlphaClip: 0 - - _AlphaToMask: 0 - - _Blend: 0 - - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - - _ClearCoatMask: 0 - - _ClearCoatSmoothness: 0 - - _Cull: 2 - _Cutoff: 0.5 - - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 10 - - _DstBlendAlpha: 10 - - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0 - _GlossyReflections: 1 @@ -108,33 +68,12 @@ Material: - _Mode: 2 - _OcclusionStrength: 1 - _Parallax: 0.02 - - _QueueOffset: 0 - - _ReceiveShadows: 1 - - _Smoothness: 0 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _SrcBlendAlpha: 1 - - _Surface: 1 + - _SrcBlend: 5 - _UVSec: 0 - - _WorkflowMode: 1 - _ZWrite: 0 m_Colors: - - _BaseColor: {r: 0.66518503, g: 0.66518503, b: 0.66518503, a: 0.64705884} - _Color: {r: 0.66518503, g: 0.66518503, b: 0.66518503, a: 0.64705884} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] ---- !u!114 &7044949765083627469 -MonoBehaviour: - m_ObjectHideFlags: 11 - 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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} - m_Name: - m_EditorClassIdentifier: - version: 7 diff --git a/Assets/Samples/XR Hands/1.3.0/HandVisualizer/Materials/Red.mat b/Assets/Samples/XR Hands/1.3.0/HandVisualizer/Materials/Red.mat index caacd15..a35c5b1 100644 --- a/Assets/Samples/XR Hands/1.3.0/HandVisualizer/Materials/Red.mat +++ b/Assets/Samples/XR Hands/1.3.0/HandVisualizer/Materials/Red.mat @@ -2,33 +2,23 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 8 + serializedVersion: 6 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Red - m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: - - _SMOOTHNESS_TEXTURE_ALBEDO_CHANNEL_A - m_InvalidKeywords: [] + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: _SMOOTHNESS_TEXTURE_ALBEDO_CHANNEL_A m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: - RenderType: Opaque + stringTagMap: {} disabledShaderPasses: [] - m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: - - _BaseMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - _BumpMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -65,38 +55,11 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - - _SpecGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - unity_Lightmaps: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - unity_LightmapsInd: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - unity_ShadowMasks: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] m_Floats: - - _AlphaClip: 0 - - _AlphaToMask: 0 - - _Blend: 0 - - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - - _ClearCoatMask: 0 - - _ClearCoatSmoothness: 0 - - _Cull: 2 - _Cutoff: 0.5 - - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 - - _DstBlendAlpha: 0 - - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossyReflections: 1 @@ -104,33 +67,12 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 - - _QueueOffset: 0 - - _ReceiveShadows: 1 - - _Smoothness: 0.5 - _SmoothnessTextureChannel: 1 - _SpecularHighlights: 1 - _SrcBlend: 1 - - _SrcBlendAlpha: 1 - - _Surface: 0 - _UVSec: 0 - - _WorkflowMode: 1 - _ZWrite: 1 m_Colors: - - _BaseColor: {r: 1, g: 0, b: 0, a: 1} - _Color: {r: 1, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] ---- !u!114 &3387862549524906758 -MonoBehaviour: - m_ObjectHideFlags: 11 - 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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} - m_Name: - m_EditorClassIdentifier: - version: 7 diff --git a/Assets/Samples/XR Hands/1.3.0/HandVisualizer/Materials/White.mat b/Assets/Samples/XR Hands/1.3.0/HandVisualizer/Materials/White.mat index 062ddd3..1c152bb 100644 --- a/Assets/Samples/XR Hands/1.3.0/HandVisualizer/Materials/White.mat +++ b/Assets/Samples/XR Hands/1.3.0/HandVisualizer/Materials/White.mat @@ -1,47 +1,24 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!114 &-3264336014846312431 -MonoBehaviour: - m_ObjectHideFlags: 11 - 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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} - m_Name: - m_EditorClassIdentifier: - version: 7 --- !u!21 &2100000 Material: - serializedVersion: 8 + serializedVersion: 6 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: White - m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: - - _SMOOTHNESS_TEXTURE_ALBEDO_CHANNEL_A - m_InvalidKeywords: [] + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: _SMOOTHNESS_TEXTURE_ALBEDO_CHANNEL_A m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: - RenderType: Opaque + stringTagMap: {} disabledShaderPasses: [] - m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: - - _BaseMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - _BumpMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -78,38 +55,11 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - - _SpecGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - unity_Lightmaps: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - unity_LightmapsInd: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - unity_ShadowMasks: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] m_Floats: - - _AlphaClip: 0 - - _AlphaToMask: 0 - - _Blend: 0 - - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - - _ClearCoatMask: 0 - - _ClearCoatSmoothness: 0 - - _Cull: 2 - _Cutoff: 0.5 - - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 - - _DstBlendAlpha: 0 - - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossyReflections: 1 @@ -117,20 +67,12 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 - - _QueueOffset: 0 - - _ReceiveShadows: 1 - - _Smoothness: 0.5 - _SmoothnessTextureChannel: 1 - _SpecularHighlights: 1 - _SrcBlend: 1 - - _SrcBlendAlpha: 1 - - _Surface: 0 - _UVSec: 0 - - _WorkflowMode: 1 - _ZWrite: 1 m_Colors: - - _BaseColor: {r: 0.9686274, g: 0.9686274, b: 0.9686274, a: 1} - - _Color: {r: 0.9686274, g: 0.9686274, b: 0.9686274, a: 1} + - _Color: {r: 0.96862745, g: 0.96862745, b: 0.96862745, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2.meta similarity index 77% rename from Assets/Samples/XR Interaction Toolkit/2.5.0.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2.meta index 4241de4..e05aed6 100644 --- a/Assets/Samples/XR Interaction Toolkit/2.5.0.meta +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: e1a25289d0ac9384a9611dbaf3c6e47c +guid: 17cd9d4a79d4a3449bebcf65b856b37a folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo.meta similarity index 77% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo.meta index 58d17d7..5d88c39 100644 --- a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo.meta +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: a549c603ca252ca429b0ec93bf532b92 +guid: c3eeea6fc179a8a438d79f05ce0ba151 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/.sample.json b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/.sample.json similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/.sample.json rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/.sample.json diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/AffordanceThemes.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/AffordanceThemes.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/AffordanceThemes.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/AffordanceThemes.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/AffordanceThemes/FingerColorAffordanceTheme.asset b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/AffordanceThemes/FingerColorAffordanceTheme.asset similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/AffordanceThemes/FingerColorAffordanceTheme.asset rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/AffordanceThemes/FingerColorAffordanceTheme.asset diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/AffordanceThemes/FingerColorAffordanceTheme.asset.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/AffordanceThemes/FingerColorAffordanceTheme.asset.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/AffordanceThemes/FingerColorAffordanceTheme.asset.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/AffordanceThemes/FingerColorAffordanceTheme.asset.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/AffordanceThemes/HandEdgeColorAffordanceTheme.asset b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/AffordanceThemes/HandEdgeColorAffordanceTheme.asset similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/AffordanceThemes/HandEdgeColorAffordanceTheme.asset rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/AffordanceThemes/HandEdgeColorAffordanceTheme.asset diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/AffordanceThemes/HandEdgeColorAffordanceTheme.asset.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/AffordanceThemes/HandEdgeColorAffordanceTheme.asset.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/AffordanceThemes/HandEdgeColorAffordanceTheme.asset.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/AffordanceThemes/HandEdgeColorAffordanceTheme.asset.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/AffordanceThemes/InteractionColorAffordanceTheme.asset b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/AffordanceThemes/InteractionColorAffordanceTheme.asset similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/AffordanceThemes/InteractionColorAffordanceTheme.asset rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/AffordanceThemes/InteractionColorAffordanceTheme.asset diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/AffordanceThemes/InteractionColorAffordanceTheme.asset.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/AffordanceThemes/InteractionColorAffordanceTheme.asset.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/AffordanceThemes/InteractionColorAffordanceTheme.asset.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/AffordanceThemes/InteractionColorAffordanceTheme.asset.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/AffordanceThemes/PinchPoint.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/AffordanceThemes/PinchPoint.meta new file mode 100644 index 0000000..f7e2034 --- /dev/null +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/AffordanceThemes/PinchPoint.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 34e352a1666bde6488650a627865ac8b +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/AffordanceThemes/PinchPoint/PinchPointBlendShape.asset b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/AffordanceThemes/PinchPoint/PinchPointBlendShape.asset new file mode 100644 index 0000000..26d2788 --- /dev/null +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/AffordanceThemes/PinchPoint/PinchPointBlendShape.asset @@ -0,0 +1,66 @@ +%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: b53eb82258e249bb97cf3789c6a97dda, type: 3} + m_Name: PinchPointBlendShape + m_EditorClassIdentifier: + m_Comments: + m_ReadOnly: 1 + m_Value: + m_StateAnimationCurve: + m_UseConstant: 1 + m_ConstantValue: + 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: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_Variable: {fileID: 0} + m_List: + - stateName: disabled + animationStateStartValue: 0 + animationStateEndValue: 0 + - stateName: idle + animationStateStartValue: 0 + animationStateEndValue: 0 + - stateName: hovered + animationStateStartValue: 0 + animationStateEndValue: 100 + - stateName: hoveredPriority + animationStateStartValue: 0 + animationStateEndValue: 0 + - stateName: selected + animationStateStartValue: 100 + animationStateEndValue: 100 + - stateName: activated + animationStateStartValue: 0 + animationStateEndValue: 0 + - stateName: focused + animationStateStartValue: 0 + animationStateEndValue: 0 diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/AffordanceThemes/PinchPoint/PinchPointBlendShape.asset.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/AffordanceThemes/PinchPoint/PinchPointBlendShape.asset.meta new file mode 100644 index 0000000..601edf0 --- /dev/null +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/AffordanceThemes/PinchPoint/PinchPointBlendShape.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: fbf5c74e21f572740881de5634f1ce9c +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/AffordanceThemes/PinchPoint/PinchPointColor.asset b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/AffordanceThemes/PinchPoint/PinchPointColor.asset new file mode 100644 index 0000000..edb52ac --- /dev/null +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/AffordanceThemes/PinchPoint/PinchPointColor.asset @@ -0,0 +1,68 @@ +%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: b5d80f45fb5f4418a5e84a476e517628, type: 3} + m_Name: PinchPointColor + m_EditorClassIdentifier: + m_Comments: + m_ReadOnly: 1 + m_Value: + m_StateAnimationCurve: + m_UseConstant: 1 + m_ConstantValue: + 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: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_Variable: {fileID: 0} + m_List: + - stateName: disabled + animationStateStartValue: {r: 0, g: 0, b: 0, a: 0.09803922} + animationStateEndValue: {r: 0, g: 0, b: 0, a: 0.09803922} + - stateName: idle + animationStateStartValue: {r: 0, g: 0, b: 0, a: 0.5019608} + animationStateEndValue: {r: 0, g: 0, b: 0, a: 0.5019608} + - stateName: hovered + animationStateStartValue: {r: 0, g: 0, b: 0, a: 0.7254902} + animationStateEndValue: {r: 0, g: 0, b: 0, a: 0.7254902} + - stateName: hoveredPriority + animationStateStartValue: {r: 0, g: 0, b: 0, a: 0.7254902} + animationStateEndValue: {r: 0, g: 0, b: 0, a: 0.7254902} + - stateName: selected + animationStateStartValue: {r: 0, g: 0, b: 0, a: 0.7254902} + animationStateEndValue: {r: 0, g: 0, b: 0, a: 0.7254902} + - stateName: activated + animationStateStartValue: {r: 0, g: 0, b: 0, a: 0.7254902} + animationStateEndValue: {r: 0, g: 0, b: 0, a: 0.7254902} + - stateName: focused + animationStateStartValue: {r: 0, g: 0, b: 0, a: 0.5019608} + animationStateEndValue: {r: 0, g: 0, b: 0, a: 0.5019608} + m_ColorBlendMode: 0 + m_BlendAmount: 1 diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/AffordanceThemes/PinchPoint/PinchPointColor.asset.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/AffordanceThemes/PinchPoint/PinchPointColor.asset.meta new file mode 100644 index 0000000..1c7ba36 --- /dev/null +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/AffordanceThemes/PinchPoint/PinchPointColor.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1468864c36cbf39428681b1f0d9ef149 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/AffordanceThemes/PinchPoint/PinchPointEdgeStrength.asset b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/AffordanceThemes/PinchPoint/PinchPointEdgeStrength.asset new file mode 100644 index 0000000..8bc26f3 --- /dev/null +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/AffordanceThemes/PinchPoint/PinchPointEdgeStrength.asset @@ -0,0 +1,66 @@ +%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: b53eb82258e249bb97cf3789c6a97dda, type: 3} + m_Name: PinchPointEdgeStrength + m_EditorClassIdentifier: + m_Comments: + m_ReadOnly: 1 + m_Value: + m_StateAnimationCurve: + m_UseConstant: 1 + m_ConstantValue: + 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: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_Variable: {fileID: 0} + m_List: + - stateName: disabled + animationStateStartValue: 4 + animationStateEndValue: 4 + - stateName: idle + animationStateStartValue: 4 + animationStateEndValue: 4 + - stateName: hovered + animationStateStartValue: 3 + animationStateEndValue: 2.5 + - stateName: hoveredPriority + animationStateStartValue: 3 + animationStateEndValue: 3 + - stateName: selected + animationStateStartValue: 2.5 + animationStateEndValue: 2 + - stateName: activated + animationStateStartValue: 2 + animationStateEndValue: 2 + - stateName: focused + animationStateStartValue: 3 + animationStateEndValue: 3 diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/AffordanceThemes/PinchPoint/PinchPointEdgeStrength.asset.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/AffordanceThemes/PinchPoint/PinchPointEdgeStrength.asset.meta new file mode 100644 index 0000000..0e550a0 --- /dev/null +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/AffordanceThemes/PinchPoint/PinchPointEdgeStrength.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2d9d4878bfb037248af1d243a0638dd0 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/AffordanceThemes/PinchPoint/PinchPointHighlightColor.asset b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/AffordanceThemes/PinchPoint/PinchPointHighlightColor.asset new file mode 100644 index 0000000..3e5d58f --- /dev/null +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/AffordanceThemes/PinchPoint/PinchPointHighlightColor.asset @@ -0,0 +1,68 @@ +%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: b5d80f45fb5f4418a5e84a476e517628, type: 3} + m_Name: PinchPointHighlightColor + m_EditorClassIdentifier: + m_Comments: + m_ReadOnly: 1 + m_Value: + m_StateAnimationCurve: + m_UseConstant: 1 + m_ConstantValue: + 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: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_Variable: {fileID: 0} + m_List: + - stateName: disabled + animationStateStartValue: {r: 1, g: 1, b: 1, a: 0.5019608} + animationStateEndValue: {r: 1, g: 1, b: 1, a: 0.5019608} + - stateName: idle + animationStateStartValue: {r: 1, g: 1, b: 1, a: 1} + animationStateEndValue: {r: 1, g: 1, b: 1, a: 1} + - stateName: hovered + animationStateStartValue: {r: 0.92156863, g: 0.9490196, b: 1, a: 1} + animationStateEndValue: {r: 0.9215687, g: 0.9490197, b: 1, a: 1} + - stateName: hoveredPriority + animationStateStartValue: {r: 0.9215687, g: 0.9490197, b: 1, a: 1} + animationStateEndValue: {r: 0.9215687, g: 0.9490197, b: 1, a: 1} + - stateName: selected + animationStateStartValue: {r: 0.86274517, g: 0.90196085, b: 1, a: 1} + animationStateEndValue: {r: 0.7843138, g: 0.8431373, b: 1, a: 1} + - stateName: activated + animationStateStartValue: {r: 0.8627451, g: 0.9019608, b: 1, a: 1} + animationStateEndValue: {r: 0.78431374, g: 0.84313726, b: 1, a: 1} + - stateName: focused + animationStateStartValue: {r: 0.86274517, g: 0.90196085, b: 1, a: 1} + animationStateEndValue: {r: 0.86274517, g: 0.90196085, b: 1, a: 1} + m_ColorBlendMode: 0 + m_BlendAmount: 1 diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/AffordanceThemes/PinchPoint/PinchPointHighlightColor.asset.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/AffordanceThemes/PinchPoint/PinchPointHighlightColor.asset.meta new file mode 100644 index 0000000..b2c651a --- /dev/null +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/AffordanceThemes/PinchPoint/PinchPointHighlightColor.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6b0360f219436394b8519378cd55c7e3 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/AffordanceThemes/PinchPoint/PinchPointLocalTransformOffset.asset b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/AffordanceThemes/PinchPoint/PinchPointLocalTransformOffset.asset new file mode 100644 index 0000000..084c72f --- /dev/null +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/AffordanceThemes/PinchPoint/PinchPointLocalTransformOffset.asset @@ -0,0 +1,108 @@ +%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: 6f7c05e2d6a94808ac5dcf4531f19721, type: 3} + m_Name: PinchPointLocalTransformOffset + m_EditorClassIdentifier: + m_Comments: + m_ReadOnly: 1 + m_Value: + m_StateAnimationCurve: + m_UseConstant: 1 + m_ConstantValue: + 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: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_Variable: {fileID: 0} + m_List: + - stateName: disabled + animationStateStartValue: + x: 0 + y: 0 + z: 0 + animationStateEndValue: + x: 0 + y: 0 + z: 0 + - stateName: idle + animationStateStartValue: + x: 0 + y: 0 + z: 0 + animationStateEndValue: + x: 0 + y: 0 + z: 0 + - stateName: hovered + animationStateStartValue: + x: 0 + y: 0 + z: 0 + animationStateEndValue: + x: 0 + y: 0 + z: 0.0075 + - stateName: hoveredPriority + animationStateStartValue: + x: 0 + y: 0 + z: 0 + animationStateEndValue: + x: 0 + y: 0 + z: 0.0075 + - stateName: selected + animationStateStartValue: + x: 0 + y: 0 + z: 0.0075 + animationStateEndValue: + x: 0 + y: 0 + z: 0.0075 + - stateName: activated + animationStateStartValue: + x: 0 + y: 0 + z: 0 + animationStateEndValue: + x: 0 + y: 0 + z: 0 + - stateName: focused + animationStateStartValue: + x: 0 + y: 0 + z: 0 + animationStateEndValue: + x: 0 + y: 0 + z: 0 diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/AffordanceThemes/PinchPoint/PinchPointLocalTransformOffset.asset.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/AffordanceThemes/PinchPoint/PinchPointLocalTransformOffset.asset.meta new file mode 100644 index 0000000..6aeb2f3 --- /dev/null +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/AffordanceThemes/PinchPoint/PinchPointLocalTransformOffset.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2826cece951f71642a19da5a2080a27c +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/AffordanceThemes/PinchPoint/PinchPointUniformScaleScale.asset b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/AffordanceThemes/PinchPoint/PinchPointUniformScaleScale.asset new file mode 100644 index 0000000..69bc169 --- /dev/null +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/AffordanceThemes/PinchPoint/PinchPointUniformScaleScale.asset @@ -0,0 +1,66 @@ +%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: b53eb82258e249bb97cf3789c6a97dda, type: 3} + m_Name: PinchPointUniformScaleScale + m_EditorClassIdentifier: + m_Comments: + m_ReadOnly: 1 + m_Value: + m_StateAnimationCurve: + m_UseConstant: 1 + m_ConstantValue: + 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: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_Variable: {fileID: 0} + m_List: + - stateName: disabled + animationStateStartValue: 0.5 + animationStateEndValue: 0.5 + - stateName: idle + animationStateStartValue: 1 + animationStateEndValue: 1 + - stateName: hovered + animationStateStartValue: 1.15 + animationStateEndValue: 0.95 + - stateName: hoveredPriority + animationStateStartValue: 1.15 + animationStateEndValue: 0.95 + - stateName: selected + animationStateStartValue: 0.95 + animationStateEndValue: 0.95 + - stateName: activated + animationStateStartValue: 1 + animationStateEndValue: 1 + - stateName: focused + animationStateStartValue: 1 + animationStateEndValue: 1 diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/AffordanceThemes/PinchPoint/PinchPointUniformScaleScale.asset.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/AffordanceThemes/PinchPoint/PinchPointUniformScaleScale.asset.meta new file mode 100644 index 0000000..9bb6376 --- /dev/null +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/AffordanceThemes/PinchPoint/PinchPointUniformScaleScale.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d22e48f34794ab9498d082f9713c2293 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/DatumPresets.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/DatumPresets.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/DatumPresets.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/DatumPresets.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/DatumPresets/Menu Controller Follow Preset.asset b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/DatumPresets/Menu Controller Follow Preset.asset similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/DatumPresets/Menu Controller Follow Preset.asset rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/DatumPresets/Menu Controller Follow Preset.asset diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/DatumPresets/Menu Controller Follow Preset.asset.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/DatumPresets/Menu Controller Follow Preset.asset.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/DatumPresets/Menu Controller Follow Preset.asset.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/DatumPresets/Menu Controller Follow Preset.asset.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/DatumPresets/Menu Hands Follow Preset.asset b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/DatumPresets/Menu Hands Follow Preset.asset similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/DatumPresets/Menu Hands Follow Preset.asset rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/DatumPresets/Menu Hands Follow Preset.asset diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/DatumPresets/Menu Hands Follow Preset.asset.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/DatumPresets/Menu Hands Follow Preset.asset.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/DatumPresets/Menu Hands Follow Preset.asset.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/DatumPresets/Menu Hands Follow Preset.asset.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/DatumPresets/Under Watch Controller Follow Preset.asset b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/DatumPresets/Under Watch Controller Follow Preset.asset similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/DatumPresets/Under Watch Controller Follow Preset.asset rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/DatumPresets/Under Watch Controller Follow Preset.asset diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/DatumPresets/Under Watch Controller Follow Preset.asset.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/DatumPresets/Under Watch Controller Follow Preset.asset.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/DatumPresets/Under Watch Controller Follow Preset.asset.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/DatumPresets/Under Watch Controller Follow Preset.asset.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/DatumPresets/Under Watch Hands Follow Preset.asset b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/DatumPresets/Under Watch Hands Follow Preset.asset similarity index 97% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/DatumPresets/Under Watch Hands Follow Preset.asset rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/DatumPresets/Under Watch Hands Follow Preset.asset index fca5cd9..3f59549 100644 --- a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/DatumPresets/Under Watch Hands Follow Preset.asset +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/DatumPresets/Under Watch Hands Follow Preset.asset @@ -21,7 +21,7 @@ MonoBehaviour: leftHandLocalRotation: {x: 0, y: 0, z: 180} palmReferenceAxis: 4 invertAxisForRightHand: 0 - requirePalmFacingUser: 1 + requirePalmFacingUser: 0 palmFacingUserDegreeAngleThreshold: 54 requirePalmFacingUp: 1 palmFacingUpDegreeAngleThreshold: 72 diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/DatumPresets/Under Watch Hands Follow Preset.asset.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/DatumPresets/Under Watch Hands Follow Preset.asset.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/DatumPresets/Under Watch Hands Follow Preset.asset.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/DatumPresets/Under Watch Hands Follow Preset.asset.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Editor.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Editor.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Editor.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Editor.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Editor/Scripts.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Editor/Scripts.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Editor/Scripts.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Editor/Scripts.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Editor/Scripts/HandsInteractionSampleProjectValidation.cs b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Editor/Scripts/HandsInteractionSampleProjectValidation.cs similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Editor/Scripts/HandsInteractionSampleProjectValidation.cs rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Editor/Scripts/HandsInteractionSampleProjectValidation.cs diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Editor/Scripts/HandsInteractionSampleProjectValidation.cs.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Editor/Scripts/HandsInteractionSampleProjectValidation.cs.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Editor/Scripts/HandsInteractionSampleProjectValidation.cs.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Editor/Scripts/HandsInteractionSampleProjectValidation.cs.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Editor/Unity.XR.Interaction.Toolkit.Samples.Hands.Editor.asmdef b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Editor/Unity.XR.Interaction.Toolkit.Samples.Hands.Editor.asmdef similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Editor/Unity.XR.Interaction.Toolkit.Samples.Hands.Editor.asmdef rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Editor/Unity.XR.Interaction.Toolkit.Samples.Hands.Editor.asmdef diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Editor/Unity.XR.Interaction.Toolkit.Samples.Hands.Editor.asmdef.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Editor/Unity.XR.Interaction.Toolkit.Samples.Hands.Editor.asmdef.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Editor/Unity.XR.Interaction.Toolkit.Samples.Hands.Editor.asmdef.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Editor/Unity.XR.Interaction.Toolkit.Samples.Hands.Editor.asmdef.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/HandsDemoScene.unity b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoScene.unity similarity index 82% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/HandsDemoScene.unity rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoScene.unity index cf521df..0db86cb 100644 --- a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/HandsDemoScene.unity +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoScene.unity @@ -104,7 +104,7 @@ NavMeshSettings: serializedVersion: 2 m_ObjectHideFlags: 0 m_BuildSettings: - serializedVersion: 3 + serializedVersion: 2 agentTypeID: 0 agentRadius: 0.5 agentHeight: 2 @@ -117,12 +117,74 @@ NavMeshSettings: cellSize: 0.16666667 manualTileSize: 0 tileSize: 256 - buildHeightMesh: 0 + accuratePlacement: 0 maxJobWorkers: 0 preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1001 &9821838 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 2105799744} + m_Modifications: + - target: {fileID: 106093692981118498, guid: aec71f91a8da27d418aa44bd0c543f9b, type: 3} + propertyPath: m_Name + value: SimpleSocket + objectReference: {fileID: 0} + - target: {fileID: 734996079564348568, guid: aec71f91a8da27d418aa44bd0c543f9b, type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 734996079564348568, guid: aec71f91a8da27d418aa44bd0c543f9b, type: 3} + propertyPath: m_LocalPosition.x + value: 2.720022 + objectReference: {fileID: 0} + - target: {fileID: 734996079564348568, guid: aec71f91a8da27d418aa44bd0c543f9b, type: 3} + propertyPath: m_LocalPosition.y + value: -5.110141 + objectReference: {fileID: 0} + - target: {fileID: 734996079564348568, guid: aec71f91a8da27d418aa44bd0c543f9b, type: 3} + propertyPath: m_LocalPosition.z + value: -49.98017 + objectReference: {fileID: 0} + - target: {fileID: 734996079564348568, guid: aec71f91a8da27d418aa44bd0c543f9b, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7010574 + objectReference: {fileID: 0} + - target: {fileID: 734996079564348568, guid: aec71f91a8da27d418aa44bd0c543f9b, type: 3} + propertyPath: m_LocalRotation.x + value: -0.09229593 + objectReference: {fileID: 0} + - target: {fileID: 734996079564348568, guid: aec71f91a8da27d418aa44bd0c543f9b, type: 3} + propertyPath: m_LocalRotation.y + value: 0.7010574 + objectReference: {fileID: 0} + - target: {fileID: 734996079564348568, guid: aec71f91a8da27d418aa44bd0c543f9b, type: 3} + propertyPath: m_LocalRotation.z + value: -0.09229593 + objectReference: {fileID: 0} + - target: {fileID: 734996079564348568, guid: aec71f91a8da27d418aa44bd0c543f9b, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 734996079564348568, guid: aec71f91a8da27d418aa44bd0c543f9b, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 734996079564348568, guid: aec71f91a8da27d418aa44bd0c543f9b, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: aec71f91a8da27d418aa44bd0c543f9b, type: 3} +--- !u!4 &9821839 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 734996079564348568, guid: aec71f91a8da27d418aa44bd0c543f9b, type: 3} + m_PrefabInstance: {fileID: 9821838} + m_PrefabAsset: {fileID: 0} --- !u!1 &42134093 GameObject: m_ObjectHideFlags: 0 @@ -155,6 +217,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1726903308} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -210,7 +273,17 @@ SortingGroup: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: -100 - m_SortAtRoot: 0 +--- !u!114 &45925792 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 5664791683828586331, guid: cc0d6bd3aca3b5d4a986e27ce112e071, type: 3} + m_PrefabInstance: {fileID: 6183026901525796732} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &89318626 GameObject: m_ObjectHideFlags: 0 @@ -236,16 +309,17 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 89318626} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0.13052624, y: 0, z: 0, w: 0.9914449} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1120256391} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: -15, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: 25, y: 0} m_SizeDelta: {x: 350, y: 50} m_Pivot: {x: 0, y: 1} --- !u!114 &89318628 @@ -261,7 +335,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0, g: 0, b: 0, a: 1} + m_Color: {r: 0.92156863, g: 0.9490196, b: 1, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -275,7 +349,7 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 2 m_MaxSize: 40 - m_Alignment: 0 + m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 @@ -313,7 +387,6 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 123424312} - serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -0.25} m_LocalScale: {x: 1, y: 1, z: 1} @@ -322,6 +395,7 @@ Transform: - {fileID: 1120256391} - {fileID: 992345761} m_Father: {fileID: 1434975003} + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &152278406 GameObject: @@ -354,6 +428,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1887197406} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -373,7 +448,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.92156863, g: 0.9490196, b: 1, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -407,7 +482,6 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - serializedVersion: 3 m_TransformParent: {fileID: 1930256998} m_Modifications: - target: {fileID: 4455438662752596672, guid: b0c78422845bac948a9080175e57ffff, type: 3} @@ -509,7 +583,7 @@ PrefabInstance: - target: {fileID: 4455438662752596683, guid: b0c78422845bac948a9080175e57ffff, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: - objectReference: {fileID: 0} + objectReference: {fileID: 1633829042} - target: {fileID: 4455438662752596683, guid: b0c78422845bac948a9080175e57ffff, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_CallState value: 2 @@ -535,9 +609,6 @@ PrefabInstance: value: 6 objectReference: {fileID: 0} m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b0c78422845bac948a9080175e57ffff, type: 3} --- !u!224 &170632161 stripped RectTransform: @@ -568,7 +639,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &187460343 RectTransform: m_ObjectHideFlags: 0 @@ -584,6 +655,7 @@ RectTransform: - {fileID: 900557651} - {fileID: 1943824117} m_Father: {fileID: 1576716364} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 15, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -666,9 +738,7 @@ Canvas: m_OverrideSorting: 0 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 - m_VertexColorAlwaysGammaSpace: 0 m_AdditionalShaderChannelsFlag: 25 - m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 1 m_TargetDisplay: 0 @@ -677,7 +747,6 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - serializedVersion: 3 m_TransformParent: {fileID: 1648550613} m_Modifications: - target: {fileID: 4455438662752596672, guid: b0c78422845bac948a9080175e57ffff, type: 3} @@ -805,9 +874,6 @@ PrefabInstance: value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b0c78422845bac948a9080175e57ffff, type: 3} --- !u!224 &203859525 stripped RectTransform: @@ -845,6 +911,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 745358749} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -913,7 +980,7 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 246682136} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 12} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -922,10 +989,11 @@ RectTransform: - {fileID: 883783995} - {fileID: 2050916414} m_Father: {fileID: 2105827454} + 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, y: 0} + m_AnchoredPosition: {x: 0, y: -20} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &257810521 @@ -938,7 +1006,6 @@ GameObject: m_Component: - component: {fileID: 257810523} - component: {fileID: 257810522} - - component: {fileID: 257810524} m_Layer: 0 m_Name: Directional Light m_TagString: Untagged @@ -964,7 +1031,7 @@ Light: m_InnerSpotAngle: 21.80208 m_CookieSize: 10 m_Shadows: - m_Type: 2 + m_Type: 0 m_Resolution: -1 m_CustomResolution: -1 m_Strength: 1 @@ -1015,37 +1082,25 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 257810521} - serializedVersion: 2 m_LocalRotation: {x: 0.3641889, y: -0.6962201, z: 0.036887143, w: 0.6174815} 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: 1 m_LocalEulerAnglesHint: {x: 30.074001, y: -105.73701, z: -32.233} ---- !u!114 &257810524 +--- !u!114 &260197484 stripped MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 195190420571543381, guid: 6a448845c7017044e8a9f3d711cfe825, type: 3} + m_PrefabInstance: {fileID: 195190421004440613} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 257810521} + m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 3 - m_UsePipelineSettings: 1 - m_AdditionalLightsShadowResolutionTier: 2 - m_LightLayerMask: 1 - m_RenderingLayers: 1 - m_CustomShadowLayers: 0 - m_ShadowLayerMask: 1 - m_ShadowRenderingLayers: 1 - m_LightCookieSize: {x: 1, y: 1} - m_LightCookieOffset: {x: 0, y: 0} - m_SoftShadowQuality: 0 --- !u!1 &266087463 GameObject: m_ObjectHideFlags: 0 @@ -1077,6 +1132,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 246682137} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -1096,7 +1152,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0, g: 0, b: 0, a: 1} + m_Color: {r: 0.92156863, g: 0.9490196, b: 1, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -1125,6 +1181,11 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 266087463} m_CullTransparentMesh: 1 +--- !u!1 &276858880 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 195190420563360911, guid: 6a448845c7017044e8a9f3d711cfe825, type: 3} + m_PrefabInstance: {fileID: 195190421004440613} + m_PrefabAsset: {fileID: 0} --- !u!1 &293575449 GameObject: m_ObjectHideFlags: 0 @@ -1156,6 +1217,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2011190209} + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -1200,12 +1262,91 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 293575449} m_CullTransparentMesh: 1 +--- !u!1 &323906122 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 323906123} + - component: {fileID: 323906125} + - component: {fileID: 323906124} + m_Layer: 0 + m_Name: Title + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &323906123 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 323906122} + m_LocalRotation: {x: -0.13052624, y: 0, z: 0, w: 0.9914449} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2105799744} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: -15, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 25, y: 0} + m_SizeDelta: {x: 350, y: 50} + m_Pivot: {x: 0, y: 1} +--- !u!114 &323906124 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 323906122} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.92156863, g: 0.9490196, 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_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 28 + m_FontStyle: 1 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Snap Socket +--- !u!222 &323906125 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 323906122} + m_CullTransparentMesh: 1 --- !u!1001 &331857615 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - serializedVersion: 3 m_TransformParent: {fileID: 1643716050} m_Modifications: - target: {fileID: 4455438662752596672, guid: b0c78422845bac948a9080175e57ffff, type: 3} @@ -1311,7 +1452,7 @@ PrefabInstance: - target: {fileID: 4455438662752596683, guid: b0c78422845bac948a9080175e57ffff, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: - objectReference: {fileID: 0} + objectReference: {fileID: 452173682} - target: {fileID: 4455438662752596683, guid: b0c78422845bac948a9080175e57ffff, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_CallState value: 2 @@ -1337,15 +1478,23 @@ PrefabInstance: value: 9 objectReference: {fileID: 0} m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b0c78422845bac948a9080175e57ffff, type: 3} --- !u!224 &331857616 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 4455438662752596672, guid: b0c78422845bac948a9080175e57ffff, type: 3} m_PrefabInstance: {fileID: 331857615} m_PrefabAsset: {fileID: 0} +--- !u!114 &337741472 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 5715416336153000561, guid: 541ed11e270c6994ca5910042c7e04da, type: 3} + m_PrefabInstance: {fileID: 5715416335952834191} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &361856894 GameObject: m_ObjectHideFlags: 0 @@ -1380,6 +1529,7 @@ RectTransform: - {fileID: 2011190209} - {fileID: 1459892945} m_Father: {fileID: 992345761} + 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} @@ -1462,6 +1612,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2011190209} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -1506,141 +1657,41 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 375196258} m_CullTransparentMesh: 1 ---- !u!1 &418724664 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 418724665} - - component: {fileID: 418724671} - - component: {fileID: 418724670} - - component: {fileID: 418724669} - - component: {fileID: 418724668} - m_Layer: 0 - m_Name: Touch Components - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &418724665 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 418724664} - m_LocalRotation: {x: 0.13052616, y: -0, z: -0, w: 0.9914449} - m_LocalPosition: {x: 0, y: 0, z: 0.625} - m_LocalScale: {x: 0.000625, y: 0.000625, z: 0.000625} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1106546166} - - {fileID: 5006512735886375522} - - {fileID: 2048378014} - m_Father: {fileID: 1337396801} - m_LocalEulerAnglesHint: {x: 15, 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: 1.025} - m_SizeDelta: {x: 400, y: 600} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &418724668 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 418724664} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7951c64acb0fa62458bf30a60089fe2d, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreReversedGraphics: 0 - m_CheckFor2DOcclusion: 0 - m_CheckFor3DOcclusion: 0 - m_BlockingMask: - serializedVersion: 2 - m_Bits: 2147483647 - m_RaycastTriggerInteraction: 1 ---- !u!114 &418724669 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 418724664} - m_Enabled: 0 - 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!114 &418724670 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 418724664} - 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!223 &418724671 -Canvas: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 418724664} - m_Enabled: 1 - serializedVersion: 3 - m_RenderMode: 2 - m_Camera: {fileID: 1948693200} - m_PlaneDistance: 100 - m_PixelPerfect: 0 - m_ReceivesEvents: 1 - m_OverrideSorting: 0 - m_OverridePixelPerfect: 0 - m_SortingBucketNormalizedSize: 0 - m_VertexColorAlwaysGammaSpace: 0 - m_AdditionalShaderChannelsFlag: 25 - m_UpdateRectTransformForStandalone: 0 - m_SortingLayerID: 0 - m_SortingOrder: 1 - m_TargetDisplay: 0 --- !u!224 &448506027 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 195190420563360910, guid: 6a448845c7017044e8a9f3d711cfe825, type: 3} m_PrefabInstance: {fileID: 195190421004440613} m_PrefabAsset: {fileID: 0} +--- !u!114 &448506032 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 276858880} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d3cd1891521c8e143a04e7fd344a64d5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ToggleOnGraphic: {fileID: 574022040} + m_ToggleOffGraphic: {fileID: 260197484} +--- !u!114 &452173682 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 2089690465474535966, guid: cc0d6bd3aca3b5d4a986e27ce112e071, type: 3} + m_PrefabInstance: {fileID: 6183026901525796732} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &496326443 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - serializedVersion: 3 m_TransformParent: {fileID: 1434975003} m_Modifications: - target: {fileID: -8679921383154817045, guid: 365907f61b8b39a48aab9aacd4588f45, type: 3} @@ -1687,24 +1738,32 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: -7511558181221131132, guid: 365907f61b8b39a48aab9aacd4588f45, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 6c72d2d2ead00e54db4b71b27ffb03d4, type: 2} - target: {fileID: 919132149155446097, guid: 365907f61b8b39a48aab9aacd4588f45, type: 3} propertyPath: m_Name value: VirtualTabletop objectReference: {fileID: 0} m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 365907f61b8b39a48aab9aacd4588f45, type: 3} - insertIndex: -1 - addedObject: {fileID: 982772613} m_SourcePrefab: {fileID: 100100000, guid: 365907f61b8b39a48aab9aacd4588f45, type: 3} +--- !u!114 &501676794 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3504782657351738374, guid: cc0d6bd3aca3b5d4a986e27ce112e071, type: 3} + m_PrefabInstance: {fileID: 6183026901525796732} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &518872803 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - serializedVersion: 3 m_TransformParent: {fileID: 1643716050} m_Modifications: - target: {fileID: 4455438662752596672, guid: b0c78422845bac948a9080175e57ffff, type: 3} @@ -1806,7 +1865,7 @@ PrefabInstance: - target: {fileID: 4455438662752596683, guid: b0c78422845bac948a9080175e57ffff, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: - objectReference: {fileID: 0} + objectReference: {fileID: 45925792} - target: {fileID: 4455438662752596683, guid: b0c78422845bac948a9080175e57ffff, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_CallState value: 2 @@ -1832,9 +1891,6 @@ PrefabInstance: value: 7 objectReference: {fileID: 0} m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b0c78422845bac948a9080175e57ffff, type: 3} --- !u!224 &518872804 stripped RectTransform: @@ -1872,6 +1928,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1459892945} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -1947,6 +2004,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2011190209} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -1991,6 +2049,144 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 540034325} m_CullTransparentMesh: 1 +--- !u!1001 &547215372 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1337396801} + m_Modifications: + - target: {fileID: 6957000769822834732, guid: d81193b4b57486b46b4762e8b26d2de8, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6957000769822834732, guid: d81193b4b57486b46b4762e8b26d2de8, type: 3} + propertyPath: m_LocalPosition.x + value: 0.05 + objectReference: {fileID: 0} + - target: {fileID: 6957000769822834732, guid: d81193b4b57486b46b4762e8b26d2de8, type: 3} + propertyPath: m_LocalPosition.y + value: 0.842 + objectReference: {fileID: 0} + - target: {fileID: 6957000769822834732, guid: d81193b4b57486b46b4762e8b26d2de8, type: 3} + propertyPath: m_LocalPosition.z + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6957000769822834732, guid: d81193b4b57486b46b4762e8b26d2de8, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6957000769822834732, guid: d81193b4b57486b46b4762e8b26d2de8, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6957000769822834732, guid: d81193b4b57486b46b4762e8b26d2de8, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6957000769822834732, guid: d81193b4b57486b46b4762e8b26d2de8, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6957000769822834732, guid: d81193b4b57486b46b4762e8b26d2de8, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6957000769822834732, guid: d81193b4b57486b46b4762e8b26d2de8, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6957000769822834732, guid: d81193b4b57486b46b4762e8b26d2de8, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6957000769822834733, guid: d81193b4b57486b46b4762e8b26d2de8, type: 3} + propertyPath: m_Name + value: SimpleSocketShape + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: d81193b4b57486b46b4762e8b26d2de8, type: 3} +--- !u!4 &547215373 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6957000769822834732, guid: d81193b4b57486b46b4762e8b26d2de8, type: 3} + m_PrefabInstance: {fileID: 547215372} + m_PrefabAsset: {fileID: 0} +--- !u!114 &574022040 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 195190419645158932, guid: 6a448845c7017044e8a9f3d711cfe825, type: 3} + m_PrefabInstance: {fileID: 195190421004440613} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1001 &611616339 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1337110718} + m_Modifications: + - target: {fileID: 3166814444043639594, guid: e2698219e3231e94c8765d49b9dd5cff, type: 3} + propertyPath: m_Camera + value: + objectReference: {fileID: 1948693200} + - target: {fileID: 5030734266366949668, guid: e2698219e3231e94c8765d49b9dd5cff, type: 3} + propertyPath: m_Camera + value: + objectReference: {fileID: 1948693200} + - target: {fileID: 5030734267259534324, guid: e2698219e3231e94c8765d49b9dd5cff, type: 3} + propertyPath: m_Name + value: Hand Menu With Button Activation + objectReference: {fileID: 0} + - target: {fileID: 5030734267259534325, guid: e2698219e3231e94c8765d49b9dd5cff, type: 3} + propertyPath: m_RootOrder + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 5030734267259534325, guid: e2698219e3231e94c8765d49b9dd5cff, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5030734267259534325, guid: e2698219e3231e94c8765d49b9dd5cff, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5030734267259534325, guid: e2698219e3231e94c8765d49b9dd5cff, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5030734267259534325, guid: e2698219e3231e94c8765d49b9dd5cff, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5030734267259534325, guid: e2698219e3231e94c8765d49b9dd5cff, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5030734267259534325, guid: e2698219e3231e94c8765d49b9dd5cff, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5030734267259534325, guid: e2698219e3231e94c8765d49b9dd5cff, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5030734267259534325, guid: e2698219e3231e94c8765d49b9dd5cff, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5030734267259534325, guid: e2698219e3231e94c8765d49b9dd5cff, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5030734267259534325, guid: e2698219e3231e94c8765d49b9dd5cff, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: e2698219e3231e94c8765d49b9dd5cff, type: 3} --- !u!1 &659511933 GameObject: m_ObjectHideFlags: 0 @@ -2022,6 +2218,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1726903308} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -2066,12 +2263,108 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 659511933} m_CullTransparentMesh: 1 +--- !u!1 &680485292 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 680485293} + - component: {fileID: 680485296} + - component: {fileID: 680485295} + - component: {fileID: 680485294} + m_Layer: 5 + m_Name: Background Pannel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &680485293 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 680485292} + m_LocalRotation: {x: -0.13052624, y: 0, z: 0, w: 0.9914449} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2105799744} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: -15, 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: 275} + m_SizeDelta: {x: 350, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &680485294 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 680485292} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 0 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: 1 + m_FlexibleHeight: -1 + m_LayoutPriority: 2 +--- !u!114 &680485295 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 680485292} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.105882354, g: 0.105882354, b: 0.105882354, a: 0.5019608} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: affa059594145a843b81788037b4ee21, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 2 +--- !u!222 &680485296 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 680485292} + m_CullTransparentMesh: 0 --- !u!1001 &691032629 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - serializedVersion: 3 m_TransformParent: {fileID: 1434975003} m_Modifications: - target: {fileID: -8679921383154817045, guid: 171affcd2d7ddf545ae966acd2de57c2, type: 3} @@ -2159,388 +2452,12 @@ PrefabInstance: value: objectReference: {fileID: 2100000, guid: 54f7c59213ac02b4d9f00104348dbac3, type: 2} m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 171affcd2d7ddf545ae966acd2de57c2, type: 3} --- !u!224 &702756937 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 5715416335250216646, guid: 541ed11e270c6994ca5910042c7e04da, type: 3} m_PrefabInstance: {fileID: 5715416335952834191} m_PrefabAsset: {fileID: 0} ---- !u!1001 &726368547 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 88461426202479569, guid: 30194602712a0eb4980318e2379d1bb8, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 88461426202479569, guid: 30194602712a0eb4980318e2379d1bb8, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 88461426202479569, guid: 30194602712a0eb4980318e2379d1bb8, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 88461426202479569, guid: 30194602712a0eb4980318e2379d1bb8, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 88461426202479569, guid: 30194602712a0eb4980318e2379d1bb8, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 194739112717705429, guid: 30194602712a0eb4980318e2379d1bb8, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 194739112717705429, guid: 30194602712a0eb4980318e2379d1bb8, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 194739112717705429, guid: 30194602712a0eb4980318e2379d1bb8, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 811185901170350189, guid: 30194602712a0eb4980318e2379d1bb8, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 811185901170350189, guid: 30194602712a0eb4980318e2379d1bb8, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 811185901170350189, guid: 30194602712a0eb4980318e2379d1bb8, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 811185901170350189, guid: 30194602712a0eb4980318e2379d1bb8, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 811185901170350189, guid: 30194602712a0eb4980318e2379d1bb8, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1784618394731282189, guid: 30194602712a0eb4980318e2379d1bb8, type: 3} - propertyPath: m_RootOrder - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 1784618394731282189, guid: 30194602712a0eb4980318e2379d1bb8, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1784618394731282189, guid: 30194602712a0eb4980318e2379d1bb8, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1784618394731282189, guid: 30194602712a0eb4980318e2379d1bb8, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1784618394731282189, guid: 30194602712a0eb4980318e2379d1bb8, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1784618394731282189, guid: 30194602712a0eb4980318e2379d1bb8, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1784618394731282189, guid: 30194602712a0eb4980318e2379d1bb8, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1784618394731282189, guid: 30194602712a0eb4980318e2379d1bb8, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1784618394731282189, guid: 30194602712a0eb4980318e2379d1bb8, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1784618394731282189, guid: 30194602712a0eb4980318e2379d1bb8, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1784618394731282189, guid: 30194602712a0eb4980318e2379d1bb8, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1812770050835297507, guid: 30194602712a0eb4980318e2379d1bb8, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1812770050835297507, guid: 30194602712a0eb4980318e2379d1bb8, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1812770050835297507, guid: 30194602712a0eb4980318e2379d1bb8, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1812770050835297507, guid: 30194602712a0eb4980318e2379d1bb8, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1812770050835297507, guid: 30194602712a0eb4980318e2379d1bb8, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1891449222187653319, guid: 30194602712a0eb4980318e2379d1bb8, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1891449222187653319, guid: 30194602712a0eb4980318e2379d1bb8, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1891449222187653319, guid: 30194602712a0eb4980318e2379d1bb8, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1891449222187653319, guid: 30194602712a0eb4980318e2379d1bb8, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1891449222187653319, guid: 30194602712a0eb4980318e2379d1bb8, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2347193101527947858, guid: 30194602712a0eb4980318e2379d1bb8, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2347193101527947858, guid: 30194602712a0eb4980318e2379d1bb8, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2347193101527947858, guid: 30194602712a0eb4980318e2379d1bb8, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2347193101527947858, guid: 30194602712a0eb4980318e2379d1bb8, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2347193101527947858, guid: 30194602712a0eb4980318e2379d1bb8, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2673875247253160481, guid: 30194602712a0eb4980318e2379d1bb8, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2673875247253160481, guid: 30194602712a0eb4980318e2379d1bb8, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2673875247253160481, guid: 30194602712a0eb4980318e2379d1bb8, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2673875247253160481, guid: 30194602712a0eb4980318e2379d1bb8, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2673875247253160481, guid: 30194602712a0eb4980318e2379d1bb8, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3211171452836669182, guid: 30194602712a0eb4980318e2379d1bb8, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3211171452836669182, guid: 30194602712a0eb4980318e2379d1bb8, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3211171452836669182, guid: 30194602712a0eb4980318e2379d1bb8, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3211171452836669182, guid: 30194602712a0eb4980318e2379d1bb8, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3211171452836669182, guid: 30194602712a0eb4980318e2379d1bb8, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3213643906245234121, guid: 30194602712a0eb4980318e2379d1bb8, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3213643906245234121, guid: 30194602712a0eb4980318e2379d1bb8, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3213643906245234121, guid: 30194602712a0eb4980318e2379d1bb8, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3213643906245234121, guid: 30194602712a0eb4980318e2379d1bb8, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3213643906245234121, guid: 30194602712a0eb4980318e2379d1bb8, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3256471857186436353, guid: 30194602712a0eb4980318e2379d1bb8, type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3256471857484026699, guid: 30194602712a0eb4980318e2379d1bb8, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3256471857484026699, guid: 30194602712a0eb4980318e2379d1bb8, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3256471857484026699, guid: 30194602712a0eb4980318e2379d1bb8, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4637711363884648377, guid: 30194602712a0eb4980318e2379d1bb8, type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5182656994894134616, guid: 30194602712a0eb4980318e2379d1bb8, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5182656994894134616, guid: 30194602712a0eb4980318e2379d1bb8, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5182656994894134616, guid: 30194602712a0eb4980318e2379d1bb8, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5182656994894134616, guid: 30194602712a0eb4980318e2379d1bb8, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5182656994894134616, guid: 30194602712a0eb4980318e2379d1bb8, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5764884531789171377, guid: 30194602712a0eb4980318e2379d1bb8, type: 3} - propertyPath: m_Name - value: Hand Menu Setup With ScrollView Variant - objectReference: {fileID: 0} - - target: {fileID: 5791645554436083796, guid: 30194602712a0eb4980318e2379d1bb8, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5791645554436083796, guid: 30194602712a0eb4980318e2379d1bb8, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5791645554436083796, guid: 30194602712a0eb4980318e2379d1bb8, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5791645554436083796, guid: 30194602712a0eb4980318e2379d1bb8, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5791645554436083796, guid: 30194602712a0eb4980318e2379d1bb8, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6265241855250672022, guid: 30194602712a0eb4980318e2379d1bb8, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6265241855250672022, guid: 30194602712a0eb4980318e2379d1bb8, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6265241855250672022, guid: 30194602712a0eb4980318e2379d1bb8, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6265241855250672022, guid: 30194602712a0eb4980318e2379d1bb8, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6265241855250672022, guid: 30194602712a0eb4980318e2379d1bb8, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6547661054649645123, guid: 30194602712a0eb4980318e2379d1bb8, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6547661054649645123, guid: 30194602712a0eb4980318e2379d1bb8, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6547661054649645123, guid: 30194602712a0eb4980318e2379d1bb8, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6547661054649645123, guid: 30194602712a0eb4980318e2379d1bb8, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6547661054649645123, guid: 30194602712a0eb4980318e2379d1bb8, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6901408518961112064, guid: 30194602712a0eb4980318e2379d1bb8, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6901408518961112064, guid: 30194602712a0eb4980318e2379d1bb8, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6901408518961112064, guid: 30194602712a0eb4980318e2379d1bb8, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6901408518961112064, guid: 30194602712a0eb4980318e2379d1bb8, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6901408518961112064, guid: 30194602712a0eb4980318e2379d1bb8, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9152537610282432652, guid: 30194602712a0eb4980318e2379d1bb8, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9152537610282432652, guid: 30194602712a0eb4980318e2379d1bb8, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9152537610282432652, guid: 30194602712a0eb4980318e2379d1bb8, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9152537610282432652, guid: 30194602712a0eb4980318e2379d1bb8, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9152537610282432652, guid: 30194602712a0eb4980318e2379d1bb8, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 30194602712a0eb4980318e2379d1bb8, type: 3} --- !u!1 &745358748 GameObject: m_ObjectHideFlags: 0 @@ -2574,6 +2491,7 @@ RectTransform: - {fileID: 861617807} - {fileID: 1308569717} m_Father: {fileID: 361856895} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -2629,15 +2547,16 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 797091099} - serializedVersion: 2 m_LocalRotation: {x: -0, y: -0.3090171, z: -0, w: 0.95105654} m_LocalPosition: {x: 0, y: 0, z: -0.25} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 2105827454} + - {fileID: 1961794668} - {fileID: 2063322578} m_Father: {fileID: 1434975003} + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: -36, z: 0} --- !u!1 &809110995 GameObject: @@ -2670,6 +2589,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1459892945} + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -2719,108 +2639,107 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - serializedVersion: 3 m_TransformParent: {fileID: 1943824117} m_Modifications: - target: {fileID: 575213516256852194, guid: cc0d6bd3aca3b5d4a986e27ce112e071, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 575213516256852194, guid: cc0d6bd3aca3b5d4a986e27ce112e071, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 575213516256852194, guid: cc0d6bd3aca3b5d4a986e27ce112e071, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 252 objectReference: {fileID: 0} - target: {fileID: 575213516256852194, guid: cc0d6bd3aca3b5d4a986e27ce112e071, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 126 objectReference: {fileID: 0} - target: {fileID: 575213516256852194, guid: cc0d6bd3aca3b5d4a986e27ce112e071, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -432 objectReference: {fileID: 0} - target: {fileID: 2459597453263534125, guid: cc0d6bd3aca3b5d4a986e27ce112e071, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2459597453263534125, guid: cc0d6bd3aca3b5d4a986e27ce112e071, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2459597453263534125, guid: cc0d6bd3aca3b5d4a986e27ce112e071, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 252 objectReference: {fileID: 0} - target: {fileID: 2459597453263534125, guid: cc0d6bd3aca3b5d4a986e27ce112e071, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 126 objectReference: {fileID: 0} - target: {fileID: 2459597453263534125, guid: cc0d6bd3aca3b5d4a986e27ce112e071, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -97 objectReference: {fileID: 0} - target: {fileID: 3318402603881556472, guid: cc0d6bd3aca3b5d4a986e27ce112e071, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3318402603881556472, guid: cc0d6bd3aca3b5d4a986e27ce112e071, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3318402603881556472, guid: cc0d6bd3aca3b5d4a986e27ce112e071, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 252 objectReference: {fileID: 0} - target: {fileID: 3318402603881556472, guid: cc0d6bd3aca3b5d4a986e27ce112e071, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 126 objectReference: {fileID: 0} - target: {fileID: 3318402603881556472, guid: cc0d6bd3aca3b5d4a986e27ce112e071, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -499 objectReference: {fileID: 0} - target: {fileID: 4545177384989293878, guid: cc0d6bd3aca3b5d4a986e27ce112e071, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4545177384989293878, guid: cc0d6bd3aca3b5d4a986e27ce112e071, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4545177384989293878, guid: cc0d6bd3aca3b5d4a986e27ce112e071, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 252 objectReference: {fileID: 0} - target: {fileID: 4545177384989293878, guid: cc0d6bd3aca3b5d4a986e27ce112e071, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 126 objectReference: {fileID: 0} - target: {fileID: 4545177384989293878, guid: cc0d6bd3aca3b5d4a986e27ce112e071, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -231 objectReference: {fileID: 0} - target: {fileID: 6081796599383575975, guid: cc0d6bd3aca3b5d4a986e27ce112e071, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 6081796599383575975, guid: cc0d6bd3aca3b5d4a986e27ce112e071, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 6081796599383575975, guid: cc0d6bd3aca3b5d4a986e27ce112e071, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 252 objectReference: {fileID: 0} - target: {fileID: 6081796599383575975, guid: cc0d6bd3aca3b5d4a986e27ce112e071, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 126 objectReference: {fileID: 0} - target: {fileID: 6081796599383575975, guid: cc0d6bd3aca3b5d4a986e27ce112e071, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -566 objectReference: {fileID: 0} - target: {fileID: 6183026901214721044, guid: cc0d6bd3aca3b5d4a986e27ce112e071, type: 3} propertyPath: m_Name @@ -2912,104 +2831,101 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6183026902371939695, guid: cc0d6bd3aca3b5d4a986e27ce112e071, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 596 objectReference: {fileID: 0} - target: {fileID: 6183026902669923109, guid: cc0d6bd3aca3b5d4a986e27ce112e071, type: 3} propertyPath: m_AnchorMax.x - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 6183026902669923109, guid: cc0d6bd3aca3b5d4a986e27ce112e071, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 0.9999999 objectReference: {fileID: 0} - target: {fileID: 6183026902669923109, guid: cc0d6bd3aca3b5d4a986e27ce112e071, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 0.6409395 objectReference: {fileID: 0} - target: {fileID: 6371800052681497148, guid: cc0d6bd3aca3b5d4a986e27ce112e071, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 6371800052681497148, guid: cc0d6bd3aca3b5d4a986e27ce112e071, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 6371800052681497148, guid: cc0d6bd3aca3b5d4a986e27ce112e071, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 252 objectReference: {fileID: 0} - target: {fileID: 6371800052681497148, guid: cc0d6bd3aca3b5d4a986e27ce112e071, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 126 objectReference: {fileID: 0} - target: {fileID: 6371800052681497148, guid: cc0d6bd3aca3b5d4a986e27ce112e071, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -365 objectReference: {fileID: 0} - target: {fileID: 7050254453680010381, guid: cc0d6bd3aca3b5d4a986e27ce112e071, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7050254453680010381, guid: cc0d6bd3aca3b5d4a986e27ce112e071, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7050254453680010381, guid: cc0d6bd3aca3b5d4a986e27ce112e071, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 252 objectReference: {fileID: 0} - target: {fileID: 7050254453680010381, guid: cc0d6bd3aca3b5d4a986e27ce112e071, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 126 objectReference: {fileID: 0} - target: {fileID: 7050254453680010381, guid: cc0d6bd3aca3b5d4a986e27ce112e071, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -298 objectReference: {fileID: 0} - target: {fileID: 7115703732978342057, guid: cc0d6bd3aca3b5d4a986e27ce112e071, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7115703732978342057, guid: cc0d6bd3aca3b5d4a986e27ce112e071, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7115703732978342057, guid: cc0d6bd3aca3b5d4a986e27ce112e071, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 252 objectReference: {fileID: 0} - target: {fileID: 7115703732978342057, guid: cc0d6bd3aca3b5d4a986e27ce112e071, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 126 objectReference: {fileID: 0} - target: {fileID: 7115703732978342057, guid: cc0d6bd3aca3b5d4a986e27ce112e071, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -30 objectReference: {fileID: 0} - target: {fileID: 8774576546710604735, guid: cc0d6bd3aca3b5d4a986e27ce112e071, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8774576546710604735, guid: cc0d6bd3aca3b5d4a986e27ce112e071, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8774576546710604735, guid: cc0d6bd3aca3b5d4a986e27ce112e071, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 252 objectReference: {fileID: 0} - target: {fileID: 8774576546710604735, guid: cc0d6bd3aca3b5d4a986e27ce112e071, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 126 objectReference: {fileID: 0} - target: {fileID: 8774576546710604735, guid: cc0d6bd3aca3b5d4a986e27ce112e071, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -164 objectReference: {fileID: 0} m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: cc0d6bd3aca3b5d4a986e27ce112e071, type: 3} --- !u!224 &812076692 stripped RectTransform: @@ -3021,7 +2937,6 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - serializedVersion: 3 m_TransformParent: {fileID: 1648550613} m_Modifications: - target: {fileID: 4455438662752596672, guid: b0c78422845bac948a9080175e57ffff, type: 3} @@ -3123,7 +3038,7 @@ PrefabInstance: - target: {fileID: 4455438662752596683, guid: b0c78422845bac948a9080175e57ffff, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: - objectReference: {fileID: 0} + objectReference: {fileID: 1784880961} - target: {fileID: 4455438662752596683, guid: b0c78422845bac948a9080175e57ffff, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_CallState value: 2 @@ -3149,15 +3064,109 @@ PrefabInstance: value: 2 objectReference: {fileID: 0} m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b0c78422845bac948a9080175e57ffff, type: 3} --- !u!224 &820107587 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 4455438662752596672, guid: b0c78422845bac948a9080175e57ffff, type: 3} m_PrefabInstance: {fileID: 820107586} m_PrefabAsset: {fileID: 0} +--- !u!1 &852312762 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 852312763} + - component: {fileID: 852312766} + - component: {fileID: 852312765} + - component: {fileID: 852312764} + m_Layer: 5 + m_Name: Background Pannel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &852312763 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 852312762} + m_LocalRotation: {x: -0.13052624, y: 0, z: 0, w: 0.9914449} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1120256391} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: -15, 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: 275} + m_SizeDelta: {x: 350, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &852312764 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 852312762} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 0 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: 1 + m_FlexibleHeight: -1 + m_LayoutPriority: 2 +--- !u!114 &852312765 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 852312762} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.105882354, g: 0.105882354, b: 0.105882354, a: 0.5019608} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: affa059594145a843b81788037b4ee21, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 2 +--- !u!222 &852312766 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 852312762} + m_CullTransparentMesh: 0 --- !u!1 &861617806 GameObject: m_ObjectHideFlags: 0 @@ -3189,6 +3198,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 745358749} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -3233,6 +3243,103 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 861617806} m_CullTransparentMesh: 1 +--- !u!1 &871500093 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 871500094} + - component: {fileID: 871500097} + - component: {fileID: 871500096} + - component: {fileID: 871500095} + m_Layer: 5 + m_Name: Background Pannel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &871500094 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 871500093} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 20} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2105827454} + 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, y: -6} + m_SizeDelta: {x: 425, y: 450} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &871500095 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 871500093} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 0 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: 1 + m_FlexibleHeight: -1 + m_LayoutPriority: 2 +--- !u!114 &871500096 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 871500093} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.105882354, g: 0.105882354, b: 0.105882354, a: 0.5019608} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: affa059594145a843b81788037b4ee21, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 2 +--- !u!222 &871500097 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 871500093} + m_CullTransparentMesh: 0 --- !u!1 &883783994 GameObject: m_ObjectHideFlags: 0 @@ -3264,6 +3371,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 246682137} + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -3283,7 +3391,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0, g: 0, b: 0, a: 1} + m_Color: {r: 0.92156863, g: 0.9490196, b: 1, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -3345,6 +3453,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 187460343} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -3427,6 +3536,7 @@ RectTransform: - {fileID: 1930256998} - {fileID: 1643716050} m_Father: {fileID: 992345761} + 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} @@ -3478,7 +3588,6 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - serializedVersion: 3 m_TransformParent: {fileID: 1129778166} m_Modifications: - target: {fileID: 2603633290551499573, guid: f5afcb7f49afad5419049090809f5cc7, type: 3} @@ -3546,9 +3655,6 @@ PrefabInstance: value: -18.765 objectReference: {fileID: 0} m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f5afcb7f49afad5419049090809f5cc7, type: 3} --- !u!4 &938402503 stripped Transform: @@ -3560,7 +3666,6 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - serializedVersion: 3 m_TransformParent: {fileID: 1726903308} m_Modifications: - target: {fileID: 4779813318549682533, guid: 870459f1cb8d7b7428337cc5935feb67, type: 3} @@ -3569,7 +3674,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4779813318549682533, guid: 870459f1cb8d7b7428337cc5935feb67, type: 3} propertyPath: m_Pivot.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4779813318549682533, guid: 870459f1cb8d7b7428337cc5935feb67, type: 3} propertyPath: m_RootOrder @@ -3609,7 +3714,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4779813318549682533, guid: 870459f1cb8d7b7428337cc5935feb67, type: 3} propertyPath: m_LocalPosition.z - value: 0.00007599592 + value: 0.096935034 objectReference: {fileID: 0} - target: {fileID: 4779813318549682533, guid: 870459f1cb8d7b7428337cc5935feb67, type: 3} propertyPath: m_LocalRotation.w @@ -3629,11 +3734,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4779813318549682533, guid: 870459f1cb8d7b7428337cc5935feb67, type: 3} propertyPath: m_AnchoredPosition.x - value: -29.999949 + value: -29.927155 objectReference: {fileID: 0} - target: {fileID: 4779813318549682533, guid: 870459f1cb8d7b7428337cc5935feb67, type: 3} propertyPath: m_AnchoredPosition.y - value: -110.00006 + value: -169.97406 objectReference: {fileID: 0} - target: {fileID: 4779813318549682533, guid: 870459f1cb8d7b7428337cc5935feb67, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -3651,10 +3756,35 @@ PrefabInstance: propertyPath: m_Name value: Dropdown objectReference: {fileID: 0} + - target: {fileID: 4779813318549682554, guid: 870459f1cb8d7b7428337cc5935feb67, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4779813318609936197, guid: 870459f1cb8d7b7428337cc5935feb67, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4779813318609936197, guid: 870459f1cb8d7b7428337cc5935feb67, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4779813319869900771, guid: 870459f1cb8d7b7428337cc5935feb67, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4779813319869900771, guid: 870459f1cb8d7b7428337cc5935feb67, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4779813319869900771, guid: 870459f1cb8d7b7428337cc5935feb67, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4779813320191324749, guid: 870459f1cb8d7b7428337cc5935feb67, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 870459f1cb8d7b7428337cc5935feb67, type: 3} --- !u!224 &975642590 stripped RectTransform: @@ -3674,17 +3804,9 @@ MeshCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 982772612} 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: 5 + serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 8207010926609093179, guid: 365907f61b8b39a48aab9aacd4588f45, type: 3} @@ -3720,14 +3842,16 @@ RectTransform: m_LocalScale: {x: 0.000625, y: 0.000625, z: 0.000625} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 1740401301} - {fileID: 361856895} - {fileID: 929444318} m_Father: {fileID: 123424313} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 90, 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.7429} - m_SizeDelta: {x: 400, y: 400} + m_SizeDelta: {x: 225, y: 225} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &992345764 MonoBehaviour: @@ -3805,9 +3929,7 @@ Canvas: m_OverrideSorting: 0 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 - m_VertexColorAlwaysGammaSpace: 0 m_AdditionalShaderChannelsFlag: 25 - m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 1 m_TargetDisplay: 0 @@ -3816,7 +3938,6 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - serializedVersion: 3 m_TransformParent: {fileID: 1643716050} m_Modifications: - target: {fileID: 4455438662752596672, guid: b0c78422845bac948a9080175e57ffff, type: 3} @@ -3918,7 +4039,7 @@ PrefabInstance: - target: {fileID: 4455438662752596683, guid: b0c78422845bac948a9080175e57ffff, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: - objectReference: {fileID: 0} + objectReference: {fileID: 1495165417} - target: {fileID: 4455438662752596683, guid: b0c78422845bac948a9080175e57ffff, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_CallState value: 2 @@ -3944,9 +4065,6 @@ PrefabInstance: value: 8 objectReference: {fileID: 0} m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b0c78422845bac948a9080175e57ffff, type: 3} --- !u!224 &1004500091 stripped RectTransform: @@ -3984,6 +4102,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 246682137} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -4003,7 +4122,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0, g: 0, b: 0, a: 1} + m_Color: {r: 0.92156863, g: 0.9490196, b: 1, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -4032,85 +4151,25 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1007358708} m_CullTransparentMesh: 1 ---- !u!1 &1106546165 +--- !u!1 &1109258394 stripped GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 5715416335250216647, guid: 541ed11e270c6994ca5910042c7e04da, type: 3} + m_PrefabInstance: {fileID: 5715416335952834191} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1106546166} - - component: {fileID: 1106546168} - - component: {fileID: 1106546167} - m_Layer: 0 - m_Name: Title - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1106546166 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1106546165} - 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: 418724665} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 350, y: 50} - m_Pivot: {x: 0, y: 1} ---- !u!114 &1106546167 +--- !u!114 &1109258399 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1106546165} + m_GameObject: {fileID: 1109258394} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Script: {fileID: 11500000, guid: d3cd1891521c8e143a04e7fd344a64d5, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0, g: 0, b: 0, 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_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 28 - m_FontStyle: 1 - m_BestFit: 0 - m_MinSize: 2 - m_MaxSize: 40 - m_Alignment: 0 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: Touch ---- !u!222 &1106546168 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1106546165} - m_CullTransparentMesh: 1 + m_ToggleOnGraphic: {fileID: 337741472} + m_ToggleOffGraphic: {fileID: 1359436870} --- !u!1 &1109639963 GameObject: m_ObjectHideFlags: 0 @@ -4143,8 +4202,10 @@ RectTransform: m_LocalScale: {x: 0.000625, y: 0.000625, z: 0.000625} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 1874101526} - {fileID: 1618199120} m_Father: {fileID: 1972783598} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 15, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -4227,9 +4288,7 @@ Canvas: m_OverrideSorting: 0 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 - m_VertexColorAlwaysGammaSpace: 0 m_AdditionalShaderChannelsFlag: 25 - m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 1 m_TargetDisplay: 0 @@ -4329,9 +4388,7 @@ Canvas: m_OverrideSorting: 0 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 - m_VertexColorAlwaysGammaSpace: 0 m_AdditionalShaderChannelsFlag: 25 - m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 1 m_TargetDisplay: 0 @@ -4347,9 +4404,11 @@ RectTransform: m_LocalScale: {x: 0.000625, y: 0.000625, z: 0.000625} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 852312763} - {fileID: 89318627} - {fileID: 1887197406} m_Father: {fileID: 123424313} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 15, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -4379,7 +4438,6 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1129778165} - serializedVersion: 2 m_LocalRotation: {x: -0, y: -0.58778524, z: -0, w: 0.809017} m_LocalPosition: {x: 0.047972523, y: 0.773, z: 0.5700773} m_LocalScale: {x: 0.606102, y: 0.606102, z: 0.606102} @@ -4389,13 +4447,98 @@ Transform: - {fileID: 938402503} - {fileID: 1935852348} m_Father: {fileID: 1972783598} + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!4 &1159150007 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6689389171845895219, guid: a5f97d75a3184ad46aef39618607e083, type: 3} + m_PrefabInstance: {fileID: 6689389173002939780} + m_PrefabAsset: {fileID: 0} +--- !u!1 &1170633772 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1170633773} + - component: {fileID: 1170633775} + - component: {fileID: 1170633774} + m_Layer: 0 + m_Name: Title + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1170633773 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1170633772} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -0.0000019284} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1351530911} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: -0, y: 0} + m_SizeDelta: {x: 165, y: 100} + m_Pivot: {x: 0, y: 1} +--- !u!114 &1170633774 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1170633772} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.92156863, g: 0.9490196, 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_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 24 + m_FontStyle: 1 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Poke Manipulation +--- !u!222 &1170633775 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1170633772} + m_CullTransparentMesh: 1 --- !u!1001 &1189763045 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - serializedVersion: 3 m_TransformParent: {fileID: 1726903308} m_Modifications: - target: {fileID: 8969571751951368413, guid: 657321a07c3561043af55547ec4b0ed7, type: 3} @@ -4422,6 +4565,10 @@ PrefabInstance: propertyPath: m_Name value: MinMaxSlider objectReference: {fileID: 0} + - target: {fileID: 8969571752666551113, guid: 657321a07c3561043af55547ec4b0ed7, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 8969571752666551114, guid: 657321a07c3561043af55547ec4b0ed7, type: 3} propertyPath: m_Pivot.x value: 0 @@ -4507,9 +4654,6 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 657321a07c3561043af55547ec4b0ed7, type: 3} --- !u!224 &1189763046 stripped RectTransform: @@ -4540,13 +4684,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1260218105} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0.2, z: 0} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0.2, z: -0.15799998} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 0} + m_Father: {fileID: 1434975003} + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1260218107 MonoBehaviour: @@ -4564,7 +4708,9 @@ MonoBehaviour: - {fileID: 3154726581514219159} - {fileID: 938402503} - {fileID: 1935852348} + - {fileID: 547215373} m_CheckDuration: 2 + m_ObjectRoot: {fileID: 1434975003} --- !u!1 &1287234602 GameObject: m_ObjectHideFlags: 0 @@ -4590,16 +4736,17 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1287234602} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: -0.13052624, y: 0, z: 0, w: 0.9914449} + m_LocalPosition: {x: 0, y: 0, z: 10} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2105827454} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: -15, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: 25, y: 0} m_SizeDelta: {x: 350, y: 50} m_Pivot: {x: 0, y: 1} --- !u!114 &1287234604 @@ -4615,7 +4762,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0, g: 0, b: 0, a: 1} + m_Color: {r: 0.92156863, g: 0.9490196, b: 1, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -4629,7 +4776,7 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 2 m_MaxSize: 40 - m_Alignment: 0 + m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 @@ -4675,6 +4822,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 745358749} + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -4750,6 +4898,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1726903308} + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -4794,6 +4943,11 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1319938173} m_CullTransparentMesh: 1 +--- !u!4 &1337110718 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7990873191187716717, guid: 5eccbf4be2c00e94689ee8062e4e7276, type: 3} + m_PrefabInstance: {fileID: 3113582726696116334} + m_PrefabAsset: {fileID: 0} --- !u!1 &1337396800 GameObject: m_ObjectHideFlags: 0 @@ -4817,15 +4971,110 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1337396800} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: 0.58778524, z: -0, w: 0.809017} - m_LocalPosition: {x: 0, y: 0, z: -0.25} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalRotation: {x: 0.000000026041338, y: 0.5877853, z: 0.000000016295347, w: 0.80901706} + m_LocalPosition: {x: -0.000000082124764, y: 0.00000011920929, z: -0.2500001} + m_LocalScale: {x: 0.9999999, y: 1, z: 0.9999999} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 418724665} + - {fileID: 2105799744} + - {fileID: 547215373} m_Father: {fileID: 1434975003} + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 72, z: 0} +--- !u!1 &1351530910 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1351530911} + - component: {fileID: 1351530915} + - component: {fileID: 1351530914} + m_Layer: 0 + m_Name: Label + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1351530911 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1351530910} + m_LocalRotation: {x: -0, y: -0.60876137, z: -0, w: 0.7933534} + m_LocalPosition: {x: 0, y: 0, z: -0.0581} + m_LocalScale: {x: 0.0010000003, y: 0.001, z: 0.0010000003} + m_ConstrainProportionsScale: 1 + m_Children: + - {fileID: 1170633773} + m_Father: {fileID: 1576716364} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: -75, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -0.043600082, y: 0.05499983} + m_SizeDelta: {x: 165, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1351530914 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1351530910} + 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!223 &1351530915 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1351530910} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 2 + m_Camera: {fileID: 1948693200} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_AdditionalShaderChannelsFlag: 25 + m_SortingLayerID: 0 + m_SortingOrder: 1 + m_TargetDisplay: 0 +--- !u!114 &1359436870 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 5715416335971100667, guid: 541ed11e270c6994ca5910042c7e04da, type: 3} + m_PrefabInstance: {fileID: 5715416335952834191} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1373282166 GameObject: m_ObjectHideFlags: 0 @@ -4857,6 +5106,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1943824117} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -4928,9 +5178,8 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1434975002} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0.158} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0.15799998} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -4941,7 +5190,9 @@ Transform: - {fileID: 123424313} - {fileID: 1972783598} - {fileID: 1337396801} + - {fileID: 1260218106} m_Father: {fileID: 0} + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1459892944 GameObject: @@ -4976,6 +5227,7 @@ RectTransform: - {fileID: 522548468} - {fileID: 809110996} m_Father: {fileID: 361856895} + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -5008,12 +5260,22 @@ MonoBehaviour: m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 m_ReverseArrangement: 0 +--- !u!114 &1495165417 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 7452232763456472641, guid: cc0d6bd3aca3b5d4a986e27ce112e071, type: 3} + m_PrefabInstance: {fileID: 6183026901525796732} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &1542318347 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - serializedVersion: 3 m_TransformParent: {fileID: 1930256998} m_Modifications: - target: {fileID: 4455438662752596672, guid: b0c78422845bac948a9080175e57ffff, type: 3} @@ -5115,7 +5377,7 @@ PrefabInstance: - target: {fileID: 4455438662752596683, guid: b0c78422845bac948a9080175e57ffff, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: - objectReference: {fileID: 0} + objectReference: {fileID: 1607142550} - target: {fileID: 4455438662752596683, guid: b0c78422845bac948a9080175e57ffff, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_CallState value: 2 @@ -5141,9 +5403,6 @@ PrefabInstance: value: 5 objectReference: {fileID: 0} m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b0c78422845bac948a9080175e57ffff, type: 3} --- !u!224 &1542318348 stripped RectTransform: @@ -5173,15 +5432,28 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1576716363} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0.58778524, z: -0, w: 0.809017} - m_LocalPosition: {x: 0, y: 0, z: -0.25} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0.6, y: 0.75, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 187460343} + - {fileID: 1351530911} + - {fileID: 1985586552} m_Father: {fileID: 1434975003} - m_LocalEulerAnglesHint: {x: 0, y: -72, z: 0} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1607142550 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 2932259739682790196, guid: cc0d6bd3aca3b5d4a986e27ce112e071, type: 3} + m_PrefabInstance: {fileID: 6183026901525796732} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1618199119 GameObject: m_ObjectHideFlags: 0 @@ -5207,16 +5479,17 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1618199119} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0.13052624, y: 0, z: 0, w: 0.9914449} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1109639964} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: -15, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: 25, y: 0} m_SizeDelta: {x: 350, y: 50} m_Pivot: {x: 0, y: 1} --- !u!114 &1618199121 @@ -5232,7 +5505,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0, g: 0, b: 0, a: 1} + m_Color: {r: 0.92156863, g: 0.9490196, b: 1, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -5246,7 +5519,7 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 2 m_MaxSize: 40 - m_Alignment: 0 + m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 @@ -5292,6 +5565,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1943824117} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -5336,6 +5610,95 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1633600914} m_CullTransparentMesh: 0 +--- !u!114 &1633829042 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 1228319155873904005, guid: cc0d6bd3aca3b5d4a986e27ce112e071, type: 3} + m_PrefabInstance: {fileID: 6183026901525796732} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1001 &1636806581 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1985586552} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: 714a27c3372b8074d8370e2bc0cecf56, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 714a27c3372b8074d8370e2bc0cecf56, type: 3} + propertyPath: m_LocalScale.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 714a27c3372b8074d8370e2bc0cecf56, type: 3} + propertyPath: m_LocalScale.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 714a27c3372b8074d8370e2bc0cecf56, type: 3} + propertyPath: m_LocalScale.z + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 714a27c3372b8074d8370e2bc0cecf56, type: 3} + propertyPath: m_LocalPosition.x + value: 0.004 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 714a27c3372b8074d8370e2bc0cecf56, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 714a27c3372b8074d8370e2bc0cecf56, type: 3} + propertyPath: m_LocalPosition.z + value: 0.005 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 714a27c3372b8074d8370e2bc0cecf56, type: 3} + propertyPath: m_LocalRotation.w + value: 0.9999985 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 714a27c3372b8074d8370e2bc0cecf56, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 714a27c3372b8074d8370e2bc0cecf56, type: 3} + propertyPath: m_LocalRotation.y + value: 0.0017452955 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 714a27c3372b8074d8370e2bc0cecf56, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 714a27c3372b8074d8370e2bc0cecf56, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 714a27c3372b8074d8370e2bc0cecf56, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0.2 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 714a27c3372b8074d8370e2bc0cecf56, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 714a27c3372b8074d8370e2bc0cecf56, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 714a27c3372b8074d8370e2bc0cecf56, type: 3} + propertyPath: m_Name + value: Chess Board Square + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 714a27c3372b8074d8370e2bc0cecf56, type: 3} +--- !u!4 &1636806582 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 714a27c3372b8074d8370e2bc0cecf56, type: 3} + m_PrefabInstance: {fileID: 1636806581} + m_PrefabAsset: {fileID: 0} --- !u!1 &1643716049 GameObject: m_ObjectHideFlags: 0 @@ -5369,6 +5732,7 @@ RectTransform: - {fileID: 1004500091} - {fileID: 331857616} m_Father: {fileID: 929444318} + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -5434,6 +5798,7 @@ RectTransform: - {fileID: 820107587} - {fileID: 2069439979} m_Father: {fileID: 929444318} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -5502,6 +5867,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1459892945} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -5546,6 +5912,103 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1675184741} m_CullTransparentMesh: 1 +--- !u!1 &1691745543 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1691745544} + - component: {fileID: 1691745547} + - component: {fileID: 1691745546} + - component: {fileID: 1691745545} + m_Layer: 5 + m_Name: Background Pannel2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1691745544 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1691745543} + m_LocalRotation: {x: -0.13052624, y: 0, z: 0, w: 0.9914449} + m_LocalPosition: {x: 0, y: 0, z: 10} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2105827454} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: -15, 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: 275} + m_SizeDelta: {x: 350, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1691745545 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1691745543} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 0 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: 1 + m_FlexibleHeight: -1 + m_LayoutPriority: 2 +--- !u!114 &1691745546 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1691745543} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.105882354, g: 0.105882354, b: 0.105882354, a: 0.5019608} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: affa059594145a843b81788037b4ee21, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 2 +--- !u!222 &1691745547 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1691745543} + m_CullTransparentMesh: 0 --- !u!1 &1726903307 GameObject: m_ObjectHideFlags: 0 @@ -5570,7 +6033,7 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1726903307} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: -0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -5585,17 +6048,293 @@ RectTransform: - {fileID: 702756937} - {fileID: 975642590} m_Father: {fileID: 2105827454} + m_RootOrder: 4 + 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: -20} + m_SizeDelta: {x: -300, y: -500} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &1740401300 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1740401301} + - component: {fileID: 1740401303} + - component: {fileID: 1740401302} + m_Layer: 5 + m_Name: Background Back + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1740401301 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1740401300} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -0.000011920929} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 992345761} + 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: 100, y: 100} + m_SizeDelta: {x: 200, y: 200} m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1740401302 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1740401300} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.6037736, g: 0.6037736, b: 0.6037736, a: 0.12156863} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: affa059594145a843b81788037b4ee21, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 2 +--- !u!222 &1740401303 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1740401300} + m_CullTransparentMesh: 1 +--- !u!1 &1746021764 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1746021765} + - component: {fileID: 1746021767} + - component: {fileID: 1746021766} + m_Layer: 0 + m_Name: Title + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1746021765 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1746021764} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -0.0000019284} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1961794668} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: -0, y: 0} + m_SizeDelta: {x: 165, y: 100} + m_Pivot: {x: 0, y: 1} +--- !u!114 &1746021766 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1746021764} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.92156863, g: 0.9490196, 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_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 24 + m_FontStyle: 1 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Simple 3D Poke Button +--- !u!222 &1746021767 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1746021764} + m_CullTransparentMesh: 1 --- !u!4 &1765827126 stripped Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 365907f61b8b39a48aab9aacd4588f45, type: 3} m_PrefabInstance: {fileID: 496326443} m_PrefabAsset: {fileID: 0} +--- !u!114 &1784880961 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 7729528788630165396, guid: cc0d6bd3aca3b5d4a986e27ce112e071, type: 3} + m_PrefabInstance: {fileID: 6183026901525796732} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &1874101525 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1874101526} + - component: {fileID: 1874101529} + - component: {fileID: 1874101528} + - component: {fileID: 1874101527} + m_Layer: 5 + m_Name: Background Pannel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1874101526 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1874101525} + m_LocalRotation: {x: -0.13052624, y: 0, z: 0, w: 0.9914449} + m_LocalPosition: {x: 0, y: 0, z: -0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1109639964} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: -15, 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: 275} + m_SizeDelta: {x: 350, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1874101527 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1874101525} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 0 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: 1 + m_FlexibleHeight: -1 + m_LayoutPriority: 2 +--- !u!114 &1874101528 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1874101525} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.105882354, g: 0.105882354, b: 0.105882354, a: 0.5019608} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: affa059594145a843b81788037b4ee21, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 2 +--- !u!222 &1874101529 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1874101525} + m_CullTransparentMesh: 0 +--- !u!114 &1879067437 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 8535804950626849423, guid: cc0d6bd3aca3b5d4a986e27ce112e071, type: 3} + m_PrefabInstance: {fileID: 6183026901525796732} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1887197405 GameObject: m_ObjectHideFlags: 0 @@ -5631,6 +6370,7 @@ RectTransform: - {fileID: 1895556602} - {fileID: 364340073} m_Father: {fileID: 1120256391} + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -5670,7 +6410,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.105882354, g: 0.105882354, b: 0.105882354, a: 0.9019608} + m_Color: {r: 0.105882354, g: 0.105882354, b: 0.105882354, a: 0.5019608} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -5726,6 +6466,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1887197406} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -5803,6 +6544,7 @@ RectTransform: - {fileID: 1542318348} - {fileID: 170632161} m_Father: {fileID: 929444318} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -5840,7 +6582,6 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - serializedVersion: 3 m_TransformParent: {fileID: 1129778166} m_Modifications: - target: {fileID: 2603633290551499573, guid: f5afcb7f49afad5419049090809f5cc7, type: 3} @@ -5912,9 +6653,6 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f5afcb7f49afad5419049090809f5cc7, type: 3} --- !u!4 &1935852348 stripped Transform: @@ -5956,6 +6694,7 @@ RectTransform: - {fileID: 1633600915} - {fileID: 812076692} m_Father: {fileID: 187460343} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -6025,6 +6764,89 @@ Camera: m_CorrespondingSourceObject: {fileID: 7990873191231833673, guid: 5eccbf4be2c00e94689ee8062e4e7276, type: 3} m_PrefabInstance: {fileID: 3113582726696116334} m_PrefabAsset: {fileID: 0} +--- !u!1 &1961794667 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1961794668} + - component: {fileID: 1961794670} + - component: {fileID: 1961794669} + m_Layer: 0 + m_Name: Label + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1961794668 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1961794667} + m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} + m_LocalPosition: {x: 0, y: 0, z: 0.5034} + m_LocalScale: {x: 0.0005, y: 0.0005, z: 0.0005} + m_ConstrainProportionsScale: 1 + m_Children: + - {fileID: 1746021765} + m_Father: {fileID: 797091100} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0.0001, y: 0.7421} + m_SizeDelta: {x: 165, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1961794669 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1961794667} + 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!223 &1961794670 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1961794667} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 2 + m_Camera: {fileID: 1948693200} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_AdditionalShaderChannelsFlag: 25 + m_SortingLayerID: 0 + m_SortingOrder: 1 + m_TargetDisplay: 0 --- !u!1 &1972783597 GameObject: m_ObjectHideFlags: 0 @@ -6048,7 +6870,6 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1972783597} - serializedVersion: 2 m_LocalRotation: {x: -0, y: 0.309017, z: -0, w: 0.95105654} m_LocalPosition: {x: 0, y: 0, z: -0.25} m_LocalScale: {x: 1, y: 1, z: 1} @@ -6059,7 +6880,42 @@ Transform: - {fileID: 5006512735865308539} - {fileID: 1129778166} m_Father: {fileID: 1434975003} + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 36, z: 0} +--- !u!1 &1985586551 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1985586552} + m_Layer: 0 + m_Name: Board + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1985586552 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1985586551} + m_LocalRotation: {x: -0, y: 0.13052616, z: -0, w: 0.9914449} + m_LocalPosition: {x: 0.0379, y: -0.008099973, z: -0.0849} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 1 + m_Children: + - {fileID: 1636806582} + - {fileID: 1159150007} + - {fileID: 5765833378047162190} + m_Father: {fileID: 1576716364} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 15, z: 0} --- !u!1 &2011190208 GameObject: m_ObjectHideFlags: 0 @@ -6093,6 +6949,7 @@ RectTransform: - {fileID: 375196259} - {fileID: 293575450} m_Father: {fileID: 361856895} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -6156,6 +7013,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1726903308} + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -6200,88 +7058,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2024359419} m_CullTransparentMesh: 0 ---- !u!1001 &2048378013 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 418724665} - m_Modifications: - - target: {fileID: 6525631569650833182, guid: 54a010e086d816242aedcc5be9e8b1b5, type: 3} - propertyPath: m_Name - value: Disc (Blue) - objectReference: {fileID: 0} - - target: {fileID: 7280225642476438904, guid: 54a010e086d816242aedcc5be9e8b1b5, type: 3} - propertyPath: m_LocalPosition.x - value: 252 - objectReference: {fileID: 0} - - target: {fileID: 7280225642476438904, guid: 54a010e086d816242aedcc5be9e8b1b5, type: 3} - propertyPath: m_LocalPosition.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 7280225642476438904, guid: 54a010e086d816242aedcc5be9e8b1b5, type: 3} - propertyPath: m_LocalPosition.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 7842150748703565069, guid: 54a010e086d816242aedcc5be9e8b1b5, type: 3} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 7842150748703565069, guid: 54a010e086d816242aedcc5be9e8b1b5, type: 3} - propertyPath: m_LocalPosition.x - value: -125 - objectReference: {fileID: 0} - - target: {fileID: 7842150748703565069, guid: 54a010e086d816242aedcc5be9e8b1b5, type: 3} - propertyPath: m_LocalPosition.y - value: 50 - objectReference: {fileID: 0} - - target: {fileID: 7842150748703565069, guid: 54a010e086d816242aedcc5be9e8b1b5, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7842150748703565069, guid: 54a010e086d816242aedcc5be9e8b1b5, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7842150748703565069, guid: 54a010e086d816242aedcc5be9e8b1b5, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7842150748703565069, guid: 54a010e086d816242aedcc5be9e8b1b5, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7842150748703565069, guid: 54a010e086d816242aedcc5be9e8b1b5, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7842150748703565069, guid: 54a010e086d816242aedcc5be9e8b1b5, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7842150748703565069, guid: 54a010e086d816242aedcc5be9e8b1b5, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7842150748703565069, guid: 54a010e086d816242aedcc5be9e8b1b5, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9036101007884858220, guid: 54a010e086d816242aedcc5be9e8b1b5, type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: 3a84a7b91ec88714486e0c4cc9a5dc01, type: 2} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 54a010e086d816242aedcc5be9e8b1b5, type: 3} ---- !u!4 &2048378014 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 7842150748703565069, guid: 54a010e086d816242aedcc5be9e8b1b5, type: 3} - m_PrefabInstance: {fileID: 2048378013} - m_PrefabAsset: {fileID: 0} --- !u!1 &2050916413 GameObject: m_ObjectHideFlags: 0 @@ -6313,6 +7089,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 246682137} + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -6332,7 +7109,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0, g: 0, b: 0, a: 1} + m_Color: {r: 0.92156863, g: 0.9490196, b: 1, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -6373,7 +7150,6 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - serializedVersion: 3 m_TransformParent: {fileID: 1648550613} m_Modifications: - target: {fileID: 4455438662752596672, guid: b0c78422845bac948a9080175e57ffff, type: 3} @@ -6475,7 +7251,7 @@ PrefabInstance: - target: {fileID: 4455438662752596683, guid: b0c78422845bac948a9080175e57ffff, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: - objectReference: {fileID: 0} + objectReference: {fileID: 501676794} - target: {fileID: 4455438662752596683, guid: b0c78422845bac948a9080175e57ffff, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_CallState value: 2 @@ -6501,15 +7277,135 @@ PrefabInstance: value: 3 objectReference: {fileID: 0} m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b0c78422845bac948a9080175e57ffff, type: 3} --- !u!224 &2069439979 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 4455438662752596672, guid: b0c78422845bac948a9080175e57ffff, type: 3} m_PrefabInstance: {fileID: 2069439978} m_PrefabAsset: {fileID: 0} +--- !u!1 &2105799743 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2105799744} + - component: {fileID: 2105799748} + - component: {fileID: 2105799747} + - component: {fileID: 2105799746} + - component: {fileID: 2105799745} + m_Layer: 0 + m_Name: SnapSocketTitle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2105799744 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2105799743} + m_LocalRotation: {x: 0.13052616, y: 0, z: 0, w: 0.9914449} + m_LocalPosition: {x: 0, y: 0, z: 0.625} + m_LocalScale: {x: 0.00062500004, y: 0.0006249999, z: 0.00062500004} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 680485293} + - {fileID: 323906123} + - {fileID: 9821839} + m_Father: {fileID: 1337396801} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 15, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0.0403, y: 1.025} + m_SizeDelta: {x: 400, y: 600} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2105799745 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2105799743} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7951c64acb0fa62458bf30a60089fe2d, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 0 + m_CheckFor2DOcclusion: 0 + m_CheckFor3DOcclusion: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 2147483647 + m_RaycastTriggerInteraction: 1 +--- !u!114 &2105799746 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2105799743} + m_Enabled: 0 + 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!114 &2105799747 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2105799743} + 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!223 &2105799748 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2105799743} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 2 + m_Camera: {fileID: 1948693200} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_AdditionalShaderChannelsFlag: 25 + m_SortingLayerID: 0 + m_SortingOrder: 1 + m_TargetDisplay: 0 --- !u!1 &2105827453 GameObject: m_ObjectHideFlags: 0 @@ -6542,10 +7438,13 @@ RectTransform: m_LocalScale: {x: 0.000625, y: 0.000625, z: 0.000625} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 1691745544} - {fileID: 1287234603} + - {fileID: 871500094} - {fileID: 246682137} - {fileID: 1726903308} m_Father: {fileID: 797091100} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 15, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -6628,9 +7527,7 @@ Canvas: m_OverrideSorting: 0 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 - m_VertexColorAlwaysGammaSpace: 0 m_AdditionalShaderChannelsFlag: 25 - m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 1 m_TargetDisplay: 0 @@ -6639,7 +7536,6 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - serializedVersion: 3 m_TransformParent: {fileID: 1930256998} m_Modifications: - target: {fileID: 4455438662752596672, guid: b0c78422845bac948a9080175e57ffff, type: 3} @@ -6741,7 +7637,7 @@ PrefabInstance: - target: {fileID: 4455438662752596683, guid: b0c78422845bac948a9080175e57ffff, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: - objectReference: {fileID: 0} + objectReference: {fileID: 1879067437} - target: {fileID: 4455438662752596683, guid: b0c78422845bac948a9080175e57ffff, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_CallState value: 2 @@ -6767,9 +7663,6 @@ PrefabInstance: value: 4 objectReference: {fileID: 0} m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b0c78422845bac948a9080175e57ffff, type: 3} --- !u!224 &2113631881 stripped RectTransform: @@ -6781,7 +7674,6 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - serializedVersion: 3 m_TransformParent: {fileID: 1972783598} m_Modifications: - target: {fileID: 5013556786019211059, guid: d56cf1aacbea4704cac4d7983df1a0ad, type: 3} @@ -6833,18 +7725,18 @@ PrefabInstance: value: Arrow objectReference: {fileID: 0} m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: d56cf1aacbea4704cac4d7983df1a0ad, type: 3} --- !u!1001 &195190421004440613 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - serializedVersion: 3 m_TransformParent: {fileID: 1726903308} m_Modifications: + - target: {fileID: 195190420563360905, guid: 6a448845c7017044e8a9f3d711cfe825, type: 3} + propertyPath: onValueChanged.m_PersistentCalls.m_Calls.Array.size + value: 0 + objectReference: {fileID: 0} - target: {fileID: 195190420563360910, guid: 6a448845c7017044e8a9f3d711cfe825, type: 3} propertyPath: m_Pivot.x value: 0 @@ -6933,17 +7825,17 @@ PrefabInstance: propertyPath: m_Name value: Text Toggle objectReference: {fileID: 0} + - target: {fileID: 195190420563360911, guid: 6a448845c7017044e8a9f3d711cfe825, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 6a448845c7017044e8a9f3d711cfe825, type: 3} --- !u!1001 &1004097911546261873 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - serializedVersion: 3 m_TransformParent: {fileID: 1726903308} m_Modifications: - target: {fileID: 1004097911450439916, guid: 56686f82f64b0af4688a89676403a500, type: 3} @@ -7034,23 +7926,27 @@ PrefabInstance: propertyPath: m_Name value: Icon Button objectReference: {fileID: 0} + - target: {fileID: 1004097911450439917, guid: 56686f82f64b0af4688a89676403a500, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 56686f82f64b0af4688a89676403a500, type: 3} --- !u!1001 &2005650193314499417 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - serializedVersion: 3 m_TransformParent: {fileID: 1726903308} m_Modifications: - target: {fileID: 5289182684458692540, guid: e5db301629853dd4a99835fa70099d79, type: 3} propertyPath: m_Name value: TextButton objectReference: {fileID: 0} + - target: {fileID: 5289182684458692540, guid: e5db301629853dd4a99835fa70099d79, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 5289182684458692541, guid: e5db301629853dd4a99835fa70099d79, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -7136,9 +8032,6 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e5db301629853dd4a99835fa70099d79, type: 3} --- !u!224 &2005650193314499418 stripped RectTransform: @@ -7150,7 +8043,6 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - serializedVersion: 3 m_TransformParent: {fileID: 797091100} m_Modifications: - target: {fileID: 2130331530761912218, guid: d661f645c81f29b4aa596207971ae441, type: 3} @@ -7159,11 +8051,11 @@ PrefabInstance: objectReference: {fileID: 7578513822832117758} - target: {fileID: 2130331530761912220, guid: d661f645c81f29b4aa596207971ae441, type: 3} propertyPath: m_RootOrder - value: 1 + value: 2 objectReference: {fileID: 0} - target: {fileID: 2130331530761912220, guid: d661f645c81f29b4aa596207971ae441, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 2130331530761912220, guid: d661f645c81f29b4aa596207971ae441, type: 3} propertyPath: m_LocalPosition.y @@ -7171,7 +8063,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2130331530761912220, guid: d661f645c81f29b4aa596207971ae441, type: 3} propertyPath: m_LocalPosition.z - value: 0.5436 + value: 0.5693 objectReference: {fileID: 0} - target: {fileID: 2130331530761912220, guid: d661f645c81f29b4aa596207971ae441, type: 3} propertyPath: m_LocalRotation.w @@ -7209,103 +8101,42 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: d661f645c81f29b4aa596207971ae441, type: 3} ---- !u!1001 &3003441633467555695 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 418724665} - m_Modifications: - - target: {fileID: 6525631569650833182, guid: 54a010e086d816242aedcc5be9e8b1b5, type: 3} - propertyPath: m_Name - value: Disc (Yellow) - objectReference: {fileID: 0} - - target: {fileID: 7842150748703565069, guid: 54a010e086d816242aedcc5be9e8b1b5, type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7842150748703565069, guid: 54a010e086d816242aedcc5be9e8b1b5, type: 3} + - target: {fileID: 2130331532155778801, guid: d661f645c81f29b4aa596207971ae441, type: 3} propertyPath: m_LocalPosition.x - value: -125 + value: -0.00000008940697 objectReference: {fileID: 0} - - target: {fileID: 7842150748703565069, guid: 54a010e086d816242aedcc5be9e8b1b5, type: 3} + - target: {fileID: 2130331532155778801, guid: d661f645c81f29b4aa596207971ae441, type: 3} propertyPath: m_LocalPosition.y - value: 50 + value: -0.01969999 objectReference: {fileID: 0} - - target: {fileID: 7842150748703565069, guid: 54a010e086d816242aedcc5be9e8b1b5, type: 3} + - target: {fileID: 2130331532155778801, guid: d661f645c81f29b4aa596207971ae441, type: 3} propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7842150748703565069, guid: 54a010e086d816242aedcc5be9e8b1b5, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7842150748703565069, guid: 54a010e086d816242aedcc5be9e8b1b5, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7842150748703565069, guid: 54a010e086d816242aedcc5be9e8b1b5, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7842150748703565069, guid: 54a010e086d816242aedcc5be9e8b1b5, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7842150748703565069, guid: 54a010e086d816242aedcc5be9e8b1b5, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7842150748703565069, guid: 54a010e086d816242aedcc5be9e8b1b5, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7842150748703565069, guid: 54a010e086d816242aedcc5be9e8b1b5, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 + value: 0.00000011920929 objectReference: {fileID: 0} m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 54a010e086d816242aedcc5be9e8b1b5, type: 3} + m_SourcePrefab: {fileID: 100100000, guid: d661f645c81f29b4aa596207971ae441, type: 3} --- !u!1001 &3113582726696116334 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 865075385244835223, guid: 5eccbf4be2c00e94689ee8062e4e7276, type: 3} propertyPath: m_Name value: XR Interaction Hands Setup objectReference: {fileID: 0} - - target: {fileID: 2580910706292915105, guid: 5eccbf4be2c00e94689ee8062e4e7276, type: 3} - propertyPath: m_IsActive - value: 0 + - target: {fileID: 1942626908999483018, guid: 5eccbf4be2c00e94689ee8062e4e7276, type: 3} + propertyPath: m_LocalScale.x + value: 1.5 objectReference: {fileID: 0} - - target: {fileID: 4485311939507468815, guid: 5eccbf4be2c00e94689ee8062e4e7276, type: 3} - propertyPath: m_Enabled - value: 0 + - target: {fileID: 1942626908999483018, guid: 5eccbf4be2c00e94689ee8062e4e7276, type: 3} + propertyPath: m_LocalScale.y + value: 1.5 objectReference: {fileID: 0} - - target: {fileID: 4485311939507468815, guid: 5eccbf4be2c00e94689ee8062e4e7276, type: 3} - propertyPath: m_LeftController - value: - objectReference: {fileID: 0} - - target: {fileID: 4485311939507468815, guid: 5eccbf4be2c00e94689ee8062e4e7276, type: 3} - propertyPath: m_RightController - value: - objectReference: {fileID: 0} - - target: {fileID: 5224629633635038180, guid: 5eccbf4be2c00e94689ee8062e4e7276, type: 3} - propertyPath: m_IsActive - value: 0 + - target: {fileID: 1942626908999483018, guid: 5eccbf4be2c00e94689ee8062e4e7276, type: 3} + propertyPath: m_LocalScale.z + value: 1.5 objectReference: {fileID: 0} - target: {fileID: 5773256366622995465, guid: 5eccbf4be2c00e94689ee8062e4e7276, type: 3} propertyPath: m_RootOrder @@ -7351,26 +8182,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 5878849512590031469, guid: 5eccbf4be2c00e94689ee8062e4e7276, type: 3} - propertyPath: m_DebugDrawJoints - value: 1 - objectReference: {fileID: 0} - target: {fileID: 7838028093091575039, guid: 5eccbf4be2c00e94689ee8062e4e7276, type: 3} propertyPath: m_UseGravity value: 0 objectReference: {fileID: 0} - - target: {fileID: 7990873189708867121, guid: 5eccbf4be2c00e94689ee8062e4e7276, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7990873191126656718, guid: 5eccbf4be2c00e94689ee8062e4e7276, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 5eccbf4be2c00e94689ee8062e4e7276, type: 3} --- !u!4 &3154726581514219159 stripped Transform: @@ -7382,7 +8198,6 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - serializedVersion: 3 m_TransformParent: {fileID: 1972783598} m_Modifications: - target: {fileID: 5709307613756117032, guid: 531d9182cdbe93948a57bd87a1e47fdf, type: 3} @@ -7434,33 +8249,97 @@ PrefabInstance: value: -29.64 objectReference: {fileID: 0} m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 531d9182cdbe93948a57bd87a1e47fdf, type: 3} --- !u!4 &5006512735865308539 stripped Transform: m_CorrespondingSourceObject: {fileID: 5013556786019211059, guid: d56cf1aacbea4704cac4d7983df1a0ad, type: 3} m_PrefabInstance: {fileID: 65600831110779464} m_PrefabAsset: {fileID: 0} ---- !u!4 &5006512735886375522 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 7842150748703565069, guid: 54a010e086d816242aedcc5be9e8b1b5, type: 3} - m_PrefabInstance: {fileID: 3003441633467555695} - m_PrefabAsset: {fileID: 0} --- !u!4 &5006512736343635145 stripped Transform: m_CorrespondingSourceObject: {fileID: 8746220130012963387, guid: 531d9182cdbe93948a57bd87a1e47fdf, type: 3} m_PrefabInstance: {fileID: 4330884014604818162} m_PrefabAsset: {fileID: 0} +--- !u!1001 &5509715586133197775 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1985586552} + m_Modifications: + - target: {fileID: 2049748930621633664, guid: 6b7188f9e149bd64cb26cec516eb470c, type: 3} + propertyPath: m_Name + value: FlatSphereController + objectReference: {fileID: 0} + - target: {fileID: 2049748930621633665, guid: 6b7188f9e149bd64cb26cec516eb470c, type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2049748930621633665, guid: 6b7188f9e149bd64cb26cec516eb470c, type: 3} + propertyPath: m_LocalPosition.x + value: 0.0642 + objectReference: {fileID: 0} + - target: {fileID: 2049748930621633665, guid: 6b7188f9e149bd64cb26cec516eb470c, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2049748930621633665, guid: 6b7188f9e149bd64cb26cec516eb470c, type: 3} + propertyPath: m_LocalPosition.z + value: -0.0584 + objectReference: {fileID: 0} + - target: {fileID: 2049748930621633665, guid: 6b7188f9e149bd64cb26cec516eb470c, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2049748930621633665, guid: 6b7188f9e149bd64cb26cec516eb470c, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2049748930621633665, guid: 6b7188f9e149bd64cb26cec516eb470c, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2049748930621633665, guid: 6b7188f9e149bd64cb26cec516eb470c, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2049748930621633665, guid: 6b7188f9e149bd64cb26cec516eb470c, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2049748930621633665, guid: 6b7188f9e149bd64cb26cec516eb470c, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2049748930621633665, guid: 6b7188f9e149bd64cb26cec516eb470c, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 6b7188f9e149bd64cb26cec516eb470c, type: 3} --- !u!1001 &5715416335952834191 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - serializedVersion: 3 m_TransformParent: {fileID: 1726903308} m_Modifications: + - target: {fileID: 5715416334889072034, guid: 541ed11e270c6994ca5910042c7e04da, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5715416335250216645, guid: 541ed11e270c6994ca5910042c7e04da, type: 3} + propertyPath: onValueChanged.m_PersistentCalls.m_Calls.Array.size + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5715416335250216645, guid: 541ed11e270c6994ca5910042c7e04da, type: 3} + propertyPath: onValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 0} + - target: {fileID: 5715416335250216645, guid: 541ed11e270c6994ca5910042c7e04da, type: 3} + propertyPath: onValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: + objectReference: {fileID: 0} - target: {fileID: 5715416335250216646, guid: 541ed11e270c6994ca5910042c7e04da, type: 3} propertyPath: m_Pivot.x value: 0 @@ -7549,17 +8428,22 @@ PrefabInstance: propertyPath: m_Name value: Icon Toggle objectReference: {fileID: 0} + - target: {fileID: 5715416335250216647, guid: 541ed11e270c6994ca5910042c7e04da, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 541ed11e270c6994ca5910042c7e04da, type: 3} +--- !u!4 &5765833378047162190 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2049748930621633665, guid: 6b7188f9e149bd64cb26cec516eb470c, type: 3} + m_PrefabInstance: {fileID: 5509715586133197775} + m_PrefabAsset: {fileID: 0} --- !u!1001 &6089389884994424882 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - serializedVersion: 3 m_TransformParent: {fileID: 1129778166} m_Modifications: - target: {fileID: 5268460675038366902, guid: f5afcb7f49afad5419049090809f5cc7, type: 3} @@ -7611,16 +8495,12 @@ PrefabInstance: value: -18.765 objectReference: {fileID: 0} m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f5afcb7f49afad5419049090809f5cc7, type: 3} --- !u!1001 &6183026901525796732 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - serializedVersion: 3 m_TransformParent: {fileID: 1887197406} m_Modifications: - target: {fileID: 575213516256852194, guid: cc0d6bd3aca3b5d4a986e27ce112e071, type: 3} @@ -7908,10 +8788,129 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: cc0d6bd3aca3b5d4a986e27ce112e071, type: 3} +--- !u!1001 &6689389173002939780 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1985586552} + m_Modifications: + - target: {fileID: 6689389171845895218, guid: a5f97d75a3184ad46aef39618607e083, type: 3} + propertyPath: m_Name + value: PawnController + objectReference: {fileID: 0} + - target: {fileID: 6689389171845895219, guid: a5f97d75a3184ad46aef39618607e083, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6689389171845895219, guid: a5f97d75a3184ad46aef39618607e083, type: 3} + propertyPath: m_LocalPosition.x + value: 0.0649 + objectReference: {fileID: 0} + - target: {fileID: 6689389171845895219, guid: a5f97d75a3184ad46aef39618607e083, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6689389171845895219, guid: a5f97d75a3184ad46aef39618607e083, type: 3} + propertyPath: m_LocalPosition.z + value: 0.0422 + objectReference: {fileID: 0} + - target: {fileID: 6689389171845895219, guid: a5f97d75a3184ad46aef39618607e083, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6689389171845895219, guid: a5f97d75a3184ad46aef39618607e083, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6689389171845895219, guid: a5f97d75a3184ad46aef39618607e083, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6689389171845895219, guid: a5f97d75a3184ad46aef39618607e083, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6689389171845895219, guid: a5f97d75a3184ad46aef39618607e083, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6689389171845895219, guid: a5f97d75a3184ad46aef39618607e083, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6689389171845895219, guid: a5f97d75a3184ad46aef39618607e083, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: a5f97d75a3184ad46aef39618607e083, type: 3} +--- !u!1001 &7403072357405031663 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 7403072356416083904, guid: ed5fdb8d3e523e94ca6d8a239d40615a, type: 3} + propertyPath: m_Name + value: TableHandle + objectReference: {fileID: 0} + - target: {fileID: 7403072356416083930, guid: ed5fdb8d3e523e94ca6d8a239d40615a, type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 7403072356416083930, guid: ed5fdb8d3e523e94ca6d8a239d40615a, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7403072356416083930, guid: ed5fdb8d3e523e94ca6d8a239d40615a, type: 3} + propertyPath: m_LocalPosition.y + value: 0.65 + objectReference: {fileID: 0} + - target: {fileID: 7403072356416083930, guid: ed5fdb8d3e523e94ca6d8a239d40615a, type: 3} + propertyPath: m_LocalPosition.z + value: 0.35 + objectReference: {fileID: 0} + - target: {fileID: 7403072356416083930, guid: ed5fdb8d3e523e94ca6d8a239d40615a, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7403072356416083930, guid: ed5fdb8d3e523e94ca6d8a239d40615a, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7403072356416083930, guid: ed5fdb8d3e523e94ca6d8a239d40615a, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7403072356416083930, guid: ed5fdb8d3e523e94ca6d8a239d40615a, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7403072356416083930, guid: ed5fdb8d3e523e94ca6d8a239d40615a, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7403072356416083930, guid: ed5fdb8d3e523e94ca6d8a239d40615a, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7403072356416083930, guid: ed5fdb8d3e523e94ca6d8a239d40615a, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7403072357328242341, guid: ed5fdb8d3e523e94ca6d8a239d40615a, type: 3} + propertyPath: m_Camera + value: + objectReference: {fileID: 1948693200} + - target: {fileID: 7403072357431632352, guid: ed5fdb8d3e523e94ca6d8a239d40615a, type: 3} + propertyPath: m_TargetTransform + value: + objectReference: {fileID: 1434975003} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: ed5fdb8d3e523e94ca6d8a239d40615a, type: 3} --- !u!114 &7578513822832117758 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 4763085286836561808, guid: 5eccbf4be2c00e94689ee8062e4e7276, type: 3} @@ -7934,12 +8933,3 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1660057539 &9223372036854775807 -SceneRoots: - m_ObjectHideFlags: 0 - m_Roots: - - {fileID: 3113582726696116334} - - {fileID: 257810523} - - {fileID: 1434975003} - - {fileID: 726368547} - - {fileID: 1260218106} diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/HandsDemoScene.unity.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoScene.unity.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/HandsDemoScene.unity.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoScene.unity.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/HandsDemoSceneAssets.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/HandsDemoSceneAssets.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/AffordanceThemes.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/AffordanceThemes.meta new file mode 100644 index 0000000..1d88e87 --- /dev/null +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/AffordanceThemes.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e808bedb47894a9469ff90e39c886dd5 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/AffordanceThemes/AudioAffordanceTheme.asset b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/AffordanceThemes/AudioAffordanceTheme.asset new file mode 100644 index 0000000..225f698 --- /dev/null +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/AffordanceThemes/AudioAffordanceTheme.asset @@ -0,0 +1,39 @@ +%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: 6af57311f7c9446fae8acabfbbfdb412, type: 3} + m_Name: AudioAffordanceTheme + m_EditorClassIdentifier: + m_Comments: + m_ReadOnly: 1 + m_Value: + m_List: + - stateName: disabled + stateEntered: {fileID: 0} + stateExited: {fileID: 0} + - stateName: idle + stateEntered: {fileID: 0} + stateExited: {fileID: 0} + - stateName: hovered + stateEntered: {fileID: 8300000, guid: 9a6d738025ed59f4fb946bb59c20e774, type: 3} + stateExited: {fileID: 0} + - stateName: hoveredPriority + stateEntered: {fileID: 0} + stateExited: {fileID: 0} + - stateName: selected + stateEntered: {fileID: 8300000, guid: eeeda5dce5e1d344f8e2f6195f16cb38, type: 3} + stateExited: {fileID: 0} + - stateName: activated + stateEntered: {fileID: 0} + stateExited: {fileID: 0} + - stateName: focused + stateEntered: {fileID: 0} + stateExited: {fileID: 0} diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/AffordanceThemes/AudioAffordanceTheme.asset.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/AffordanceThemes/AudioAffordanceTheme.asset.meta new file mode 100644 index 0000000..7f980a2 --- /dev/null +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/AffordanceThemes/AudioAffordanceTheme.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 57def9352cdee8548bfc9ebc6a55914a +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/AffordanceThemes/CapsuleScaleTheme.asset b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/AffordanceThemes/CapsuleScaleTheme.asset new file mode 100644 index 0000000..edec4ed --- /dev/null +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/AffordanceThemes/CapsuleScaleTheme.asset @@ -0,0 +1,108 @@ +%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: 6f7c05e2d6a94808ac5dcf4531f19721, type: 3} + m_Name: CapsuleScaleTheme + m_EditorClassIdentifier: + m_Comments: + m_ReadOnly: 1 + m_Value: + m_StateAnimationCurve: + m_UseConstant: 1 + m_ConstantValue: + 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: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_Variable: {fileID: 0} + m_List: + - stateName: disabled + animationStateStartValue: + x: 0 + y: 0 + z: 0 + animationStateEndValue: + x: 0 + y: 0 + z: 0 + - stateName: idle + animationStateStartValue: + x: 0.5 + y: 0.5 + z: 0.5 + animationStateEndValue: + x: 0.5 + y: 0.5 + z: 0.5 + - stateName: hovered + animationStateStartValue: + x: 0.5 + y: 2 + z: 0.5 + animationStateEndValue: + x: 0.5 + y: 2 + z: 0.5 + - stateName: hoveredPriority + animationStateStartValue: + x: 0.5 + y: 2 + z: 0.5 + animationStateEndValue: + x: 0.5 + y: 2 + z: 0.5 + - stateName: selected + animationStateStartValue: + x: 0.5 + y: 2 + z: 0.5 + animationStateEndValue: + x: 0.5 + y: 2 + z: 0.5 + - stateName: activated + animationStateStartValue: + x: 0.5 + y: 2 + z: 0.5 + animationStateEndValue: + x: 0.5 + y: 2 + z: 0.5 + - stateName: focused + animationStateStartValue: + x: 0.5 + y: 0.5 + z: 0.5 + animationStateEndValue: + x: 0.5 + y: 0.5 + z: 0.5 diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/AffordanceThemes/CapsuleScaleTheme.asset.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/AffordanceThemes/CapsuleScaleTheme.asset.meta new file mode 100644 index 0000000..c3f5033 --- /dev/null +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/AffordanceThemes/CapsuleScaleTheme.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e5acc2ade2588d44fb53e968cd702099 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/AffordanceThemes/Chess.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/AffordanceThemes/Chess.meta new file mode 100644 index 0000000..8eddaa7 --- /dev/null +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/AffordanceThemes/Chess.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0be2a80454fcbff4a9017ce60441e58c +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/AffordanceThemes/Chess/InteractionBlendShapeAffordanceTheme.asset b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/AffordanceThemes/Chess/InteractionBlendShapeAffordanceTheme.asset new file mode 100644 index 0000000..9899f1b --- /dev/null +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/AffordanceThemes/Chess/InteractionBlendShapeAffordanceTheme.asset @@ -0,0 +1,66 @@ +%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: b53eb82258e249bb97cf3789c6a97dda, type: 3} + m_Name: InteractionBlendShapeAffordanceTheme + m_EditorClassIdentifier: + m_Comments: + m_ReadOnly: 1 + m_Value: + m_StateAnimationCurve: + m_UseConstant: 1 + m_ConstantValue: + 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: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_Variable: {fileID: 0} + m_List: + - stateName: disabled + animationStateStartValue: 0 + animationStateEndValue: 0 + - stateName: idle + animationStateStartValue: 0 + animationStateEndValue: 0 + - stateName: hovered + animationStateStartValue: 0 + animationStateEndValue: 100 + - stateName: hoveredPriority + animationStateStartValue: 0 + animationStateEndValue: 0 + - stateName: selected + animationStateStartValue: 100 + animationStateEndValue: 90 + - stateName: activated + animationStateStartValue: 0 + animationStateEndValue: 0 + - stateName: focused + animationStateStartValue: 0 + animationStateEndValue: 0 diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/AffordanceThemes/Chess/InteractionBlendShapeAffordanceTheme.asset.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/AffordanceThemes/Chess/InteractionBlendShapeAffordanceTheme.asset.meta new file mode 100644 index 0000000..cdf7c26 --- /dev/null +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/AffordanceThemes/Chess/InteractionBlendShapeAffordanceTheme.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 20eb8725b4dab864ea2bfa8ecbd4adff +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/AffordanceThemes/Chess/WhiteChessPieceColorTheme.asset b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/AffordanceThemes/Chess/WhiteChessPieceColorTheme.asset new file mode 100644 index 0000000..2eecbfb --- /dev/null +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/AffordanceThemes/Chess/WhiteChessPieceColorTheme.asset @@ -0,0 +1,68 @@ +%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: b5d80f45fb5f4418a5e84a476e517628, type: 3} + m_Name: WhiteChessPieceColorTheme + m_EditorClassIdentifier: + m_Comments: + m_ReadOnly: 1 + m_Value: + m_StateAnimationCurve: + m_UseConstant: 1 + m_ConstantValue: + 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: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_Variable: {fileID: 0} + m_List: + - stateName: disabled + animationStateStartValue: {r: 0, g: 0, b: 0, a: 0} + animationStateEndValue: {r: 0, g: 0, b: 0, a: 0} + - stateName: idle + animationStateStartValue: {r: 1, g: 1, b: 1, a: 1} + animationStateEndValue: {r: 1, g: 1, b: 1, a: 1} + - stateName: hovered + animationStateStartValue: {r: 0.92156863, g: 0.9490196, b: 1, a: 1} + animationStateEndValue: {r: 0.9215687, g: 0.9490197, b: 1, a: 1} + - stateName: hoveredPriority + animationStateStartValue: {r: 0.9215687, g: 0.9490197, b: 1, a: 1} + animationStateEndValue: {r: 0.9215687, g: 0.9490197, b: 1, a: 1} + - stateName: selected + animationStateStartValue: {r: 0.86274517, g: 0.90196085, b: 1, a: 1} + animationStateEndValue: {r: 0.7843138, g: 0.8431373, b: 1, a: 1} + - stateName: activated + animationStateStartValue: {r: 0.8627451, g: 0.9019608, b: 1, a: 1} + animationStateEndValue: {r: 0.78431374, g: 0.84313726, b: 1, a: 1} + - stateName: focused + animationStateStartValue: {r: 0.86274517, g: 0.90196085, b: 1, a: 1} + animationStateEndValue: {r: 0.86274517, g: 0.90196085, b: 1, a: 1} + m_ColorBlendMode: 0 + m_BlendAmount: 1 diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/AffordanceThemes/Chess/WhiteChessPieceColorTheme.asset.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/AffordanceThemes/Chess/WhiteChessPieceColorTheme.asset.meta new file mode 100644 index 0000000..0d14061 --- /dev/null +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/AffordanceThemes/Chess/WhiteChessPieceColorTheme.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c39d3614cd6089347a01b0743003ae34 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/AffordanceThemes/InteractionLargeScaleAffordanceTheme.asset b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/AffordanceThemes/InteractionLargeScaleAffordanceTheme.asset new file mode 100644 index 0000000..c2c8cd8 --- /dev/null +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/AffordanceThemes/InteractionLargeScaleAffordanceTheme.asset @@ -0,0 +1,66 @@ +%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: b53eb82258e249bb97cf3789c6a97dda, type: 3} + m_Name: InteractionLargeScaleAffordanceTheme + m_EditorClassIdentifier: + m_Comments: + m_ReadOnly: 1 + m_Value: + m_StateAnimationCurve: + m_UseConstant: 1 + m_ConstantValue: + 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: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_Variable: {fileID: 0} + m_List: + - stateName: disabled + animationStateStartValue: 1 + animationStateEndValue: 1 + - stateName: idle + animationStateStartValue: 1 + animationStateEndValue: 1 + - stateName: hovered + animationStateStartValue: 1.15 + animationStateEndValue: 1.25 + - stateName: hoveredPriority + animationStateStartValue: 1 + animationStateEndValue: 1 + - stateName: selected + animationStateStartValue: 1.25 + animationStateEndValue: 1.3 + - stateName: activated + animationStateStartValue: 1 + animationStateEndValue: 1 + - stateName: focused + animationStateStartValue: 1 + animationStateEndValue: 1 diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/AffordanceThemes/InteractionLargeScaleAffordanceTheme.asset.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/AffordanceThemes/InteractionLargeScaleAffordanceTheme.asset.meta new file mode 100644 index 0000000..c392094 --- /dev/null +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/AffordanceThemes/InteractionLargeScaleAffordanceTheme.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d47a7e28eb1851943b2b99ded7acba3b +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/AffordanceThemes/InteractionScaleAffordanceTheme.asset b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/AffordanceThemes/InteractionScaleAffordanceTheme.asset new file mode 100644 index 0000000..0137977 --- /dev/null +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/AffordanceThemes/InteractionScaleAffordanceTheme.asset @@ -0,0 +1,66 @@ +%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: b53eb82258e249bb97cf3789c6a97dda, type: 3} + m_Name: InteractionScaleAffordanceTheme + m_EditorClassIdentifier: + m_Comments: + m_ReadOnly: 1 + m_Value: + m_StateAnimationCurve: + m_UseConstant: 1 + m_ConstantValue: + 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: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_Variable: {fileID: 0} + m_List: + - stateName: disabled + animationStateStartValue: 1 + animationStateEndValue: 1 + - stateName: idle + animationStateStartValue: 1 + animationStateEndValue: 1 + - stateName: hovered + animationStateStartValue: 1.1 + animationStateEndValue: 1.15 + - stateName: hoveredPriority + animationStateStartValue: 1 + animationStateEndValue: 1 + - stateName: selected + animationStateStartValue: 1.15 + animationStateEndValue: 1.2 + - stateName: activated + animationStateStartValue: 1 + animationStateEndValue: 1 + - stateName: focused + animationStateStartValue: 1 + animationStateEndValue: 1 diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/AffordanceThemes/InteractionScaleAffordanceTheme.asset.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/AffordanceThemes/InteractionScaleAffordanceTheme.asset.meta new file mode 100644 index 0000000..18cb0b6 --- /dev/null +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/AffordanceThemes/InteractionScaleAffordanceTheme.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6c5f857510aad3f4c8df41fd90e934a5 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Audio.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Audio.meta new file mode 100644 index 0000000..a9b5c79 --- /dev/null +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Audio.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 71a837b47f3069c4582a87e6a15555aa +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Audio/ButtonClick.wav b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Audio/ButtonClick.wav new file mode 100644 index 0000000..4c5b153 --- /dev/null +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Audio/ButtonClick.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e23363180ce08aeffec33f8996fff6b631c2da3dc6dfb5165ba494e20771b44a +size 22052 diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Audio/ButtonClick.wav.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Audio/ButtonClick.wav.meta new file mode 100644 index 0000000..36ab295 --- /dev/null +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Audio/ButtonClick.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: eeeda5dce5e1d344f8e2f6195f16cb38 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Audio/ButtonHover.wav b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Audio/ButtonHover.wav new file mode 100644 index 0000000..03244c0 --- /dev/null +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Audio/ButtonHover.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:83ae7f7b22c7f30f75966d4c0ae69f26bd55f589030f9139878fba3bf52230ca +size 13576 diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Audio/ButtonHover.wav.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Audio/ButtonHover.wav.meta new file mode 100644 index 0000000..20959b3 --- /dev/null +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Audio/ButtonHover.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 9a6d738025ed59f4fb946bb59c20e774 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Materials.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Materials.meta similarity index 77% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Materials.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Materials.meta index 642ef3a..9a2fef0 100644 --- a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Materials.meta +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Materials.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 8a8b8915e2575ce48a7262a7aa2d6354 +guid: 4031454b2e45d3843a7beb52d8dc1c38 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/HandsDemoSceneAssets/Materials/AccentButton.mat b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Materials/AccentButton.mat similarity index 87% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/HandsDemoSceneAssets/Materials/AccentButton.mat rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Materials/AccentButton.mat index 0859442..5072ae1 100644 --- a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/HandsDemoSceneAssets/Materials/AccentButton.mat +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Materials/AccentButton.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 4 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -21,19 +21,15 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: AccentButton - m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: - RenderType: Opaque + stringTagMap: {} disabledShaderPasses: [] - m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -96,9 +92,7 @@ Material: m_Ints: [] m_Floats: - _AlphaClip: 0 - - _AlphaToMask: 0 - _Blend: 0 - - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 @@ -107,7 +101,6 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 - - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0 @@ -118,18 +111,17 @@ Material: - _Parallax: 0.02 - _QueueOffset: 0 - _ReceiveShadows: 1 - - _Smoothness: 0 + - _Smoothness: 0.5 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 - - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 - _ZWrite: 1 m_Colors: - - _BaseColor: {r: 0.7169812, g: 0.15218937, b: 0.15218937, a: 1} - - _Color: {r: 0.7169812, g: 0.15218934, b: 0.15218934, a: 1} + - _BaseColor: {r: 0.9275999, g: 0.58167726, b: 0.58167726, a: 1} + - _Color: {r: 0.7169812, g: 0.15218942, b: 0.15218942, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/HandsDemoSceneAssets/Materials/AccentButton.mat.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Materials/AccentButton.mat.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/HandsDemoSceneAssets/Materials/AccentButton.mat.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Materials/AccentButton.mat.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Materials/ChessPiece.mat b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Materials/ChessPiece.mat new file mode 100644 index 0000000..7d1afaf --- /dev/null +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Materials/ChessPiece.mat @@ -0,0 +1,128 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: ChessPiece + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_ValidKeywords: + - _GLOSSYREFLECTIONS_OFF + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + 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} + - _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} + - _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} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AlphaClip: 0 + - _Blend: 0 + - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.005 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _Surface: 0 + - _UVSec: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 0.94509804, g: 1, b: 0.5803922, a: 1} + - _Color: {r: 0.92156863, g: 0.9490196, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] +--- !u!114 &7412609096850590555 +MonoBehaviour: + m_ObjectHideFlags: 11 + 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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 4 diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Materials/ChessPiece.mat.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Materials/ChessPiece.mat.meta new file mode 100644 index 0000000..302b63c --- /dev/null +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Materials/ChessPiece.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 40808a1b89c64184e9466aaec1fd1ac1 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/HandsDemoSceneAssets/Materials/Chrome.mat b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Materials/Chrome.mat similarity index 90% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/HandsDemoSceneAssets/Materials/Chrome.mat rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Materials/Chrome.mat index 38223f0..c7748fe 100644 --- a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/HandsDemoSceneAssets/Materials/Chrome.mat +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Materials/Chrome.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 4 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -21,19 +21,15 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Chrome - m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: - RenderType: Opaque + stringTagMap: {} disabledShaderPasses: [] - m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -96,9 +92,7 @@ Material: m_Ints: [] m_Floats: - _AlphaClip: 0 - - _AlphaToMask: 0 - _Blend: 0 - - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 @@ -107,7 +101,6 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 - - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.251 @@ -118,11 +111,10 @@ Material: - _Parallax: 0.02 - _QueueOffset: 0 - _ReceiveShadows: 1 - - _Smoothness: 0.251 + - _Smoothness: 0.7 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 - - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/HandsDemoSceneAssets/Materials/Chrome.mat.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Materials/Chrome.mat.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/HandsDemoSceneAssets/Materials/Chrome.mat.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Materials/Chrome.mat.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/HandsDemoSceneAssets/Materials/Controls_Black.mat b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Materials/Controls_Black.mat similarity index 87% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/HandsDemoSceneAssets/Materials/Controls_Black.mat rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Materials/Controls_Black.mat index 1084051..f865c93 100644 --- a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/HandsDemoSceneAssets/Materials/Controls_Black.mat +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Materials/Controls_Black.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 4 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -21,19 +21,15 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Controls_Black - m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: - RenderType: Opaque + stringTagMap: {} disabledShaderPasses: [] - m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -96,9 +92,7 @@ Material: m_Ints: [] m_Floats: - _AlphaClip: 0 - - _AlphaToMask: 0 - _Blend: 0 - - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 @@ -107,7 +101,6 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 - - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0 @@ -118,18 +111,17 @@ Material: - _Parallax: 0.02 - _QueueOffset: 0 - _ReceiveShadows: 1 - - _Smoothness: 0 + - _Smoothness: 0.672 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 - - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 - _ZWrite: 1 m_Colors: - - _BaseColor: {r: 0.18460971, g: 0.18460971, b: 0.18460971, a: 1} - - _Color: {r: 0.18460968, g: 0.18460968, b: 0.18460968, a: 1} + - _BaseColor: {r: 0, g: 0, b: 0, a: 1} + - _Color: {r: 0.18460976, g: 0.18460976, b: 0.18460976, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/HandsDemoSceneAssets/Materials/Controls_Black.mat.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Materials/Controls_Black.mat.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/HandsDemoSceneAssets/Materials/Controls_Black.mat.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Materials/Controls_Black.mat.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/HandsDemoSceneAssets/Materials/FrameOutline.mat b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Materials/FrameOutline.mat similarity index 90% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/HandsDemoSceneAssets/Materials/FrameOutline.mat rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Materials/FrameOutline.mat index 7050b63..90a6dd2 100644 --- a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/HandsDemoSceneAssets/Materials/FrameOutline.mat +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Materials/FrameOutline.mat @@ -8,13 +8,10 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: FrameOutline - m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} m_ValidKeywords: - - _SURFACE_TYPE_TRANSPARENT - m_InvalidKeywords: - _ALPHABLEND_ON + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -23,8 +20,6 @@ Material: RenderType: Transparent disabledShaderPasses: - SHADOWCASTER - - DepthOnly - m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -87,9 +82,7 @@ Material: m_Ints: [] m_Floats: - _AlphaClip: 0 - - _AlphaToMask: 0 - _Blend: 0 - - _BlendModePreserveSpecular: 0 - _BumpScale: 1 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 @@ -98,7 +91,6 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 10 - - _DstBlendAlpha: 10 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 @@ -113,7 +105,6 @@ Material: - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 5 - - _SrcBlendAlpha: 1 - _Surface: 1 - _UVSec: 0 - _WorkflowMode: 1 @@ -138,4 +129,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 4 diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/HandsDemoSceneAssets/Materials/FrameOutline.mat.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Materials/FrameOutline.mat.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/HandsDemoSceneAssets/Materials/FrameOutline.mat.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Materials/FrameOutline.mat.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/HandsDemoSceneAssets/Materials/PrimitivesBlue.mat b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Materials/PrimitivesBlue.mat similarity index 85% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/HandsDemoSceneAssets/Materials/PrimitivesBlue.mat rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Materials/PrimitivesBlue.mat index 2aba379..234f275 100644 --- a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/HandsDemoSceneAssets/Materials/PrimitivesBlue.mat +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Materials/PrimitivesBlue.mat @@ -8,21 +8,16 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: PrimitivesBlue - m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} m_ValidKeywords: - - _ENVIRONMENTREFLECTIONS_OFF - m_InvalidKeywords: - _GLOSSYREFLECTIONS_OFF + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: - RenderType: Opaque + stringTagMap: {} disabledShaderPasses: [] - m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -85,9 +80,7 @@ Material: m_Ints: [] m_Floats: - _AlphaClip: 0 - - _AlphaToMask: 0 - _Blend: 0 - - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 @@ -96,8 +89,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 - - _DstBlendAlpha: 0 - - _EnvironmentReflections: 0 + - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 - _GlossyReflections: 0 @@ -107,18 +99,17 @@ Material: - _Parallax: 0.005 - _QueueOffset: 0 - _ReceiveShadows: 1 - - _Smoothness: 0 + - _Smoothness: 0.5 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 - - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 - _ZWrite: 1 m_Colors: - - _BaseColor: {r: 0.5019608, g: 0.7354437, b: 1, a: 1} - - _Color: {r: 0.5019608, g: 0.7354437, b: 1, a: 1} + - _BaseColor: {r: 0.14901961, g: 0.36862746, b: 0.78039217, a: 1} + - _Color: {r: 0.5019608, g: 0.7354438, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] @@ -134,4 +125,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 4 diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/HandsDemoSceneAssets/Materials/PrimitivesBlue.mat.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Materials/PrimitivesBlue.mat.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/HandsDemoSceneAssets/Materials/PrimitivesBlue.mat.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Materials/PrimitivesBlue.mat.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/HandsDemoSceneAssets/Materials/PrimitivesCoral.mat b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Materials/PrimitivesCoral.mat similarity index 86% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/HandsDemoSceneAssets/Materials/PrimitivesCoral.mat rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Materials/PrimitivesCoral.mat index e64b16a..b5e239b 100644 --- a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/HandsDemoSceneAssets/Materials/PrimitivesCoral.mat +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Materials/PrimitivesCoral.mat @@ -8,21 +8,16 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: PrimitivesCoral - m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} m_ValidKeywords: - - _ENVIRONMENTREFLECTIONS_OFF - m_InvalidKeywords: - _GLOSSYREFLECTIONS_OFF + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: - RenderType: Opaque + stringTagMap: {} disabledShaderPasses: [] - m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -85,9 +80,7 @@ Material: m_Ints: [] m_Floats: - _AlphaClip: 0 - - _AlphaToMask: 0 - _Blend: 0 - - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 @@ -96,8 +89,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 - - _DstBlendAlpha: 0 - - _EnvironmentReflections: 0 + - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 - _GlossyReflections: 0 @@ -107,17 +99,16 @@ Material: - _Parallax: 0.005 - _QueueOffset: 0 - _ReceiveShadows: 1 - - _Smoothness: 0 + - _Smoothness: 0.5 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 - - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 - _ZWrite: 1 m_Colors: - - _BaseColor: {r: 1, g: 0.52656007, b: 0.48627448, a: 1} + - _BaseColor: {r: 1, g: 0.69411767, b: 0.6666667, a: 1} - _Color: {r: 1, g: 0.52656007, b: 0.48627448, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} @@ -134,4 +125,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 4 diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/HandsDemoSceneAssets/Materials/PrimitivesCoral.mat.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Materials/PrimitivesCoral.mat.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/HandsDemoSceneAssets/Materials/PrimitivesCoral.mat.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Materials/PrimitivesCoral.mat.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/HandsDemoSceneAssets/Materials/PrimitivesYellow.mat b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Materials/PrimitivesYellow.mat similarity index 87% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/HandsDemoSceneAssets/Materials/PrimitivesYellow.mat rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Materials/PrimitivesYellow.mat index e310f42..ecff591 100644 --- a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/HandsDemoSceneAssets/Materials/PrimitivesYellow.mat +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Materials/PrimitivesYellow.mat @@ -8,21 +8,16 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: PrimitivesYellow - m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} m_ValidKeywords: - - _ENVIRONMENTREFLECTIONS_OFF - m_InvalidKeywords: - _GLOSSYREFLECTIONS_OFF + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: - RenderType: Opaque + stringTagMap: {} disabledShaderPasses: [] - m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -85,9 +80,7 @@ Material: m_Ints: [] m_Floats: - _AlphaClip: 0 - - _AlphaToMask: 0 - _Blend: 0 - - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 @@ -96,8 +89,7 @@ Material: - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 - - _DstBlendAlpha: 0 - - _EnvironmentReflections: 0 + - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 - _GlossyReflections: 0 @@ -107,17 +99,16 @@ Material: - _Parallax: 0.005 - _QueueOffset: 0 - _ReceiveShadows: 1 - - _Smoothness: 0 + - _Smoothness: 0.5 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 - - _SrcBlendAlpha: 1 - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 - _ZWrite: 1 m_Colors: - - _BaseColor: {r: 1, g: 0.9212777, b: 0.5019608, a: 1} + - _BaseColor: {r: 0.94509804, g: 1, b: 0.5803922, a: 1} - _Color: {r: 1, g: 0.9212777, b: 0.5019608, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} @@ -134,4 +125,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 7 + version: 4 diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/HandsDemoSceneAssets/Materials/PrimitivesYellow.mat.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Materials/PrimitivesYellow.mat.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/HandsDemoSceneAssets/Materials/PrimitivesYellow.mat.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Materials/PrimitivesYellow.mat.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Materials/Table Surface.mat b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Materials/Table Surface.mat new file mode 100644 index 0000000..aa78501 --- /dev/null +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Materials/Table Surface.mat @@ -0,0 +1,128 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Table Surface + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_ValidKeywords: + - _GLOSSYREFLECTIONS_OFF + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + 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} + - _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} + - _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} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AlphaClip: 0 + - _Blend: 0 + - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.005 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _Surface: 0 + - _UVSec: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 0.94509804, g: 1, b: 0.5803922, a: 1} + - _Color: {r: 0.60555357, g: 0.6313457, b: 0.6792453, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] +--- !u!114 &7412609096850590555 +MonoBehaviour: + m_ObjectHideFlags: 11 + 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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 4 diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Materials/Table Surface.mat.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Materials/Table Surface.mat.meta new file mode 100644 index 0000000..0a66295 --- /dev/null +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Materials/Table Surface.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6c72d2d2ead00e54db4b71b27ffb03d4 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/HandsDemoSceneAssets/Models.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Models.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/HandsDemoSceneAssets/Models.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Models.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Models/Chess.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Models/Chess.meta new file mode 100644 index 0000000..643eaf9 --- /dev/null +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Models/Chess.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e6b8fa9195b866c48b828c4de654fdd1 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Models/Chess/Chess_Board.fbx b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Models/Chess/Chess_Board.fbx new file mode 100644 index 0000000..606b9bf --- /dev/null +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Models/Chess/Chess_Board.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0f8454b1434bac42de711300d3febb22e0d86d819001effe9217f5da60cbdbc4 +size 297392 diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Models/Chess/Chess_Board.fbx.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Models/Chess/Chess_Board.fbx.meta new file mode 100644 index 0000000..73d5a69 --- /dev/null +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Models/Chess/Chess_Board.fbx.meta @@ -0,0 +1,106 @@ +fileFormatVersion: 2 +guid: 714a27c3372b8074d8370e2bc0cecf56 +ModelImporter: + serializedVersion: 21300 + internalIDToNameTable: [] + externalObjects: {} + materials: + materialImportMode: 2 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + removeConstantScaleCurves: 1 + motionNodeName: + rigImportErrors: + rigImportWarnings: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + importConstraints: 0 + animationCompression: 1 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + extraUserProperties: [] + clipAnimations: [] + isReadable: 0 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + useSRGBMaterialColor: 1 + sortHierarchyByName: 1 + importVisibility: 1 + importBlendShapes: 1 + importCameras: 1 + importLights: 1 + nodeNameCollisionStrategy: 1 + fileIdsGeneration: 2 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + keepQuads: 0 + weldVertices: 1 + bakeAxisConversion: 0 + preserveHierarchy: 0 + skinWeightsMode: 0 + maxBonesPerVertex: 4 + minBoneWeight: 0.001 + optimizeBones: 1 + meshOptimizationFlags: -1 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVMarginMethod: 1 + secondaryUVMinLightmapResolution: 40 + secondaryUVMinObjectScale: 1 + secondaryUVPackMargin: 4 + useFileScale: 1 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + normalCalculationMode: 4 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + referencedClips: [] + importAnimation: 1 + humanDescription: + serializedVersion: 3 + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + globalScale: 1 + rootMotionBoneName: + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {instanceID: 0} + autoGenerateAvatarMappingIfUnspecified: 1 + animationType: 2 + humanoidOversampling: 1 + avatarSetup: 0 + addHumanoidExtraRootOnlyWhenUsingAvatar: 1 + remapMaterialsIfMaterialImportModeIsNone: 0 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Models/Chess/Chess_Pawn.fbx b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Models/Chess/Chess_Pawn.fbx new file mode 100644 index 0000000..eb2768b --- /dev/null +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Models/Chess/Chess_Pawn.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:39942894ce9443b778c6b929c0a7dd05674f9e1237756dfa5b068523ad6da2fc +size 47952 diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Models/Chess/Chess_Pawn.fbx.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Models/Chess/Chess_Pawn.fbx.meta new file mode 100644 index 0000000..0ff09bb --- /dev/null +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Models/Chess/Chess_Pawn.fbx.meta @@ -0,0 +1,106 @@ +fileFormatVersion: 2 +guid: 45b2a246bd435f74989d22078ec2752e +ModelImporter: + serializedVersion: 21300 + internalIDToNameTable: [] + externalObjects: {} + materials: + materialImportMode: 2 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + removeConstantScaleCurves: 1 + motionNodeName: + rigImportErrors: + rigImportWarnings: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + importConstraints: 0 + animationCompression: 1 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + extraUserProperties: [] + clipAnimations: [] + isReadable: 0 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + useSRGBMaterialColor: 1 + sortHierarchyByName: 1 + importVisibility: 1 + importBlendShapes: 1 + importCameras: 1 + importLights: 1 + nodeNameCollisionStrategy: 1 + fileIdsGeneration: 2 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + keepQuads: 0 + weldVertices: 1 + bakeAxisConversion: 0 + preserveHierarchy: 0 + skinWeightsMode: 0 + maxBonesPerVertex: 4 + minBoneWeight: 0.001 + optimizeBones: 1 + meshOptimizationFlags: -1 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVMarginMethod: 1 + secondaryUVMinLightmapResolution: 40 + secondaryUVMinObjectScale: 1 + secondaryUVPackMargin: 4 + useFileScale: 1 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + normalCalculationMode: 4 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + referencedClips: [] + importAnimation: 1 + humanDescription: + serializedVersion: 3 + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + globalScale: 1 + rootMotionBoneName: + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {instanceID: 0} + autoGenerateAvatarMappingIfUnspecified: 1 + animationType: 2 + humanoidOversampling: 1 + avatarSetup: 0 + addHumanoidExtraRootOnlyWhenUsingAvatar: 1 + remapMaterialsIfMaterialImportModeIsNone: 0 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/HandsDemoSceneAssets/Models/Frame.fbx b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Models/Frame.fbx similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/HandsDemoSceneAssets/Models/Frame.fbx rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Models/Frame.fbx diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/HandsDemoSceneAssets/Models/Frame.fbx.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Models/Frame.fbx.meta similarity index 95% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/HandsDemoSceneAssets/Models/Frame.fbx.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Models/Frame.fbx.meta index be58b5a..528f7f1 100644 --- a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/HandsDemoSceneAssets/Models/Frame.fbx.meta +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Models/Frame.fbx.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 guid: 171affcd2d7ddf545ae966acd2de57c2 ModelImporter: - serializedVersion: 20300 + serializedVersion: 21300 internalIDToNameTable: [] externalObjects: {} materials: @@ -14,6 +14,7 @@ ModelImporter: bakeSimulation: 0 resampleCurves: 1 optimizeGameObjects: 0 + removeConstantScaleCurves: 0 motionNodeName: rigImportErrors: rigImportWarnings: @@ -43,6 +44,7 @@ ModelImporter: importBlendShapes: 1 importCameras: 1 importLights: 1 + nodeNameCollisionStrategy: 0 fileIdsGeneration: 2 swapUVChannels: 0 generateSecondaryUV: 0 @@ -54,6 +56,7 @@ ModelImporter: skinWeightsMode: 0 maxBonesPerVertex: 4 minBoneWeight: 0.001 + optimizeBones: 1 meshOptimizationFlags: -1 indexFormat: 0 secondaryUVAngleDistortion: 8 diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/HandsDemoSceneAssets/Models/Primitives.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Models/Primitives.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/HandsDemoSceneAssets/Models/Primitives.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Models/Primitives.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/HandsDemoSceneAssets/Models/Primitives/Cone.fbx b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Models/Primitives/Cone.fbx similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/HandsDemoSceneAssets/Models/Primitives/Cone.fbx rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Models/Primitives/Cone.fbx diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/HandsDemoSceneAssets/Models/Primitives/Cone.fbx.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Models/Primitives/Cone.fbx.meta similarity index 95% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/HandsDemoSceneAssets/Models/Primitives/Cone.fbx.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Models/Primitives/Cone.fbx.meta index 10e5a2a..293a386 100644 --- a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/HandsDemoSceneAssets/Models/Primitives/Cone.fbx.meta +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Models/Primitives/Cone.fbx.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 guid: 30ab630b2b7264c1c85cca8ce81b06c3 ModelImporter: - serializedVersion: 20300 + serializedVersion: 21300 internalIDToNameTable: [] externalObjects: {} materials: @@ -14,6 +14,7 @@ ModelImporter: bakeSimulation: 0 resampleCurves: 1 optimizeGameObjects: 0 + removeConstantScaleCurves: 0 motionNodeName: rigImportErrors: rigImportWarnings: @@ -43,6 +44,7 @@ ModelImporter: importBlendShapes: 1 importCameras: 1 importLights: 1 + nodeNameCollisionStrategy: 0 fileIdsGeneration: 1 swapUVChannels: 0 generateSecondaryUV: 0 @@ -54,6 +56,7 @@ ModelImporter: skinWeightsMode: 0 maxBonesPerVertex: 4 minBoneWeight: 0.001 + optimizeBones: 1 meshOptimizationFlags: -1 indexFormat: 0 secondaryUVAngleDistortion: 8 diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/HandsDemoSceneAssets/Models/Primitives/Cube.fbx b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Models/Primitives/Cube.fbx similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/HandsDemoSceneAssets/Models/Primitives/Cube.fbx rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Models/Primitives/Cube.fbx diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/HandsDemoSceneAssets/Models/Primitives/Cube.fbx.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Models/Primitives/Cube.fbx.meta similarity index 94% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/HandsDemoSceneAssets/Models/Primitives/Cube.fbx.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Models/Primitives/Cube.fbx.meta index e5fd92c..37c5f2a 100644 --- a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/HandsDemoSceneAssets/Models/Primitives/Cube.fbx.meta +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Models/Primitives/Cube.fbx.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: a538d0a0eef870241baefd106beee7ed +guid: b95f1879e4b00ed459451b16eb959ee1 ModelImporter: - serializedVersion: 20300 + serializedVersion: 21300 internalIDToNameTable: [] externalObjects: {} materials: @@ -14,6 +14,7 @@ ModelImporter: bakeSimulation: 0 resampleCurves: 1 optimizeGameObjects: 0 + removeConstantScaleCurves: 0 motionNodeName: rigImportErrors: rigImportWarnings: @@ -43,6 +44,7 @@ ModelImporter: importBlendShapes: 1 importCameras: 1 importLights: 1 + nodeNameCollisionStrategy: 0 fileIdsGeneration: 1 swapUVChannels: 0 generateSecondaryUV: 0 @@ -54,6 +56,7 @@ ModelImporter: skinWeightsMode: 0 maxBonesPerVertex: 4 minBoneWeight: 0.001 + optimizeBones: 1 meshOptimizationFlags: -1 indexFormat: 0 secondaryUVAngleDistortion: 8 diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/HandsDemoSceneAssets/Models/Primitives/Cylinder.fbx b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Models/Primitives/Cylinder.fbx similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/HandsDemoSceneAssets/Models/Primitives/Cylinder.fbx rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Models/Primitives/Cylinder.fbx diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/HandsDemoSceneAssets/Models/Primitives/Cylinder.fbx.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Models/Primitives/Cylinder.fbx.meta similarity index 94% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/HandsDemoSceneAssets/Models/Primitives/Cylinder.fbx.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Models/Primitives/Cylinder.fbx.meta index f5a7bba..d66f04c 100644 --- a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/HandsDemoSceneAssets/Models/Primitives/Cylinder.fbx.meta +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Models/Primitives/Cylinder.fbx.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: 2c4d16d28bbe76046b9c53dad7a8bf28 +guid: 52cf45c0e586ac64f915ed5181d82cb1 ModelImporter: - serializedVersion: 20300 + serializedVersion: 21300 internalIDToNameTable: [] externalObjects: {} materials: @@ -14,6 +14,7 @@ ModelImporter: bakeSimulation: 0 resampleCurves: 1 optimizeGameObjects: 0 + removeConstantScaleCurves: 0 motionNodeName: rigImportErrors: rigImportWarnings: @@ -43,6 +44,7 @@ ModelImporter: importBlendShapes: 1 importCameras: 1 importLights: 1 + nodeNameCollisionStrategy: 0 fileIdsGeneration: 1 swapUVChannels: 0 generateSecondaryUV: 0 @@ -54,6 +56,7 @@ ModelImporter: skinWeightsMode: 0 maxBonesPerVertex: 4 minBoneWeight: 0.001 + optimizeBones: 1 meshOptimizationFlags: -1 indexFormat: 0 secondaryUVAngleDistortion: 8 diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/HandsDemoSceneAssets/Models/Primitives/Disc.fbx b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Models/Primitives/Disc.fbx similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/HandsDemoSceneAssets/Models/Primitives/Disc.fbx rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Models/Primitives/Disc.fbx diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/HandsDemoSceneAssets/Models/Primitives/Disc.fbx.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Models/Primitives/Disc.fbx.meta similarity index 95% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/HandsDemoSceneAssets/Models/Primitives/Disc.fbx.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Models/Primitives/Disc.fbx.meta index 7cd6138..ee37592 100644 --- a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/HandsDemoSceneAssets/Models/Primitives/Disc.fbx.meta +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Models/Primitives/Disc.fbx.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 guid: c3bde1a6f623d4b569b67c73aedfebbf ModelImporter: - serializedVersion: 20300 + serializedVersion: 21300 internalIDToNameTable: [] externalObjects: {} materials: @@ -14,6 +14,7 @@ ModelImporter: bakeSimulation: 0 resampleCurves: 1 optimizeGameObjects: 0 + removeConstantScaleCurves: 0 motionNodeName: rigImportErrors: rigImportWarnings: @@ -43,6 +44,7 @@ ModelImporter: importBlendShapes: 1 importCameras: 1 importLights: 1 + nodeNameCollisionStrategy: 0 fileIdsGeneration: 1 swapUVChannels: 0 generateSecondaryUV: 0 @@ -54,6 +56,7 @@ ModelImporter: skinWeightsMode: 0 maxBonesPerVertex: 4 minBoneWeight: 0.001 + optimizeBones: 1 meshOptimizationFlags: -1 indexFormat: 0 secondaryUVAngleDistortion: 8 diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/HandsDemoSceneAssets/Models/VirtualTabletop.fbx b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Models/VirtualTabletop.fbx similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/HandsDemoSceneAssets/Models/VirtualTabletop.fbx rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Models/VirtualTabletop.fbx diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/HandsDemoSceneAssets/Models/VirtualTabletop.fbx.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Models/VirtualTabletop.fbx.meta similarity index 95% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/HandsDemoSceneAssets/Models/VirtualTabletop.fbx.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Models/VirtualTabletop.fbx.meta index 6d478dd..553c136 100644 --- a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/HandsDemoSceneAssets/Models/VirtualTabletop.fbx.meta +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Models/VirtualTabletop.fbx.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 guid: 365907f61b8b39a48aab9aacd4588f45 ModelImporter: - serializedVersion: 20300 + serializedVersion: 21300 internalIDToNameTable: [] externalObjects: {} materials: @@ -14,6 +14,7 @@ ModelImporter: bakeSimulation: 0 resampleCurves: 1 optimizeGameObjects: 0 + removeConstantScaleCurves: 0 motionNodeName: rigImportErrors: rigImportWarnings: @@ -43,6 +44,7 @@ ModelImporter: importBlendShapes: 1 importCameras: 1 importLights: 1 + nodeNameCollisionStrategy: 0 fileIdsGeneration: 2 swapUVChannels: 0 generateSecondaryUV: 0 @@ -54,6 +56,7 @@ ModelImporter: skinWeightsMode: 0 maxBonesPerVertex: 4 minBoneWeight: 0.001 + optimizeBones: 1 meshOptimizationFlags: -1 indexFormat: 0 secondaryUVAngleDistortion: 8 diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Prefabs.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Prefabs.meta similarity index 77% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Prefabs.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Prefabs.meta index e4a439e..9278e19 100644 --- a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Prefabs.meta +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Prefabs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 39bf807af06d74841a809efd1dd1d859 +guid: e4059f18edfaa9a40a3a8744bb219e6d folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/HandsDemoSceneAssets/Prefabs/Arrow.prefab b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Prefabs/Arrow.prefab similarity index 93% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/HandsDemoSceneAssets/Prefabs/Arrow.prefab rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Prefabs/Arrow.prefab index 32377fe..e8f5ff4 100644 --- a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/HandsDemoSceneAssets/Prefabs/Arrow.prefab +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Prefabs/Arrow.prefab @@ -129,7 +129,7 @@ GameObject: - component: {fileID: 4978570559794932741} - component: {fileID: 2418615375201463647} - component: {fileID: 8159150361180033376} - - component: {fileID: 7437750374825525154} + - component: {fileID: 4256384458682596258} m_Layer: 0 m_Name: Visuals m_TagString: Untagged @@ -203,8 +203,8 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!64 &7437750374825525154 -MeshCollider: +--- !u!135 &4256384458682596258 +SphereCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -213,10 +213,9 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 4 - m_Convex: 1 - m_CookingOptions: 30 - m_Mesh: {fileID: -2934717439318261032, guid: 30ab630b2b7264c1c85cca8ce81b06c3, type: 3} + serializedVersion: 2 + m_Radius: 0.006500003 + m_Center: {x: 0, y: -0.002, z: 0} --- !u!1 &8343167407413159200 GameObject: m_ObjectHideFlags: 0 @@ -379,21 +378,21 @@ MonoBehaviour: m_SnapToColliderVolume: 1 m_ReinitializeDynamicAttachEverySingleGrab: 1 m_AttachEaseInTime: 0.15 - m_MovementType: 1 + m_MovementType: 2 m_VelocityDamping: 1 m_VelocityScale: 1 m_AngularVelocityDamping: 1 m_AngularVelocityScale: 1 m_TrackPosition: 1 m_SmoothPosition: 0 - m_SmoothPositionAmount: 5 - m_TightenPosition: 0.5 + m_SmoothPositionAmount: 8 + m_TightenPosition: 0.1 m_TrackRotation: 1 m_SmoothRotation: 0 - m_SmoothRotationAmount: 5 - m_TightenRotation: 0.5 + m_SmoothRotationAmount: 8 + m_TightenRotation: 0.1 m_TrackScale: 1 - m_SmoothScale: 0 + m_SmoothScale: 1 m_SmoothScaleAmount: 8 m_TightenScale: 0.1 m_ThrowOnDetach: 0 @@ -439,10 +438,10 @@ MonoBehaviour: m_AllowOneHandedScaling: 1 m_AllowTwoHandedScaling: 1 m_OneHandedScaleSpeed: 0.5 - m_ThresholdMoveRatioForScale: 0.1 + m_ThresholdMoveRatioForScale: 0.01 m_ClampScaling: 1 m_MinimumScaleRatio: 0.25 - m_MaximumScaleRatio: 2 + m_MaximumScaleRatio: 3 m_ScaleMultiplier: 0.25 --- !u!1001 &65600831374321780 PrefabInstance: @@ -507,6 +506,10 @@ PrefabInstance: propertyPath: m_Name value: InteractionAffordance objectReference: {fileID: 0} + - target: {fileID: 7275325890891809550, guid: 9a5f820ee9c46b64294ae756b459a681, type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9a5f820ee9c46b64294ae756b459a681, type: 3} --- !u!4 &339307769875072284 stripped @@ -600,7 +603,8 @@ PrefabInstance: propertyPath: m_Name value: Cylinder objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: -6860895033569716450, guid: bf65382e5e6d14e7f8140e4204ce07e2, type: 3} m_SourcePrefab: {fileID: 100100000, guid: bf65382e5e6d14e7f8140e4204ce07e2, type: 3} --- !u!4 &4905619921565087965 stripped Transform: @@ -612,3 +616,22 @@ MeshRenderer: m_CorrespondingSourceObject: {fileID: -1504981713932161579, guid: bf65382e5e6d14e7f8140e4204ce07e2, type: 3} m_PrefabInstance: {fileID: 103292096675238855} m_PrefabAsset: {fileID: 0} +--- !u!1 &8236831428665510606 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: -927199367670048503, guid: bf65382e5e6d14e7f8140e4204ce07e2, type: 3} + m_PrefabInstance: {fileID: 103292096675238855} + m_PrefabAsset: {fileID: 0} +--- !u!136 &4477334520055318792 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8236831428665510606} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + m_Radius: 0.005500003 + m_Height: 0.0100000035 + m_Direction: 1 + m_Center: {x: 0, y: -0.001, z: 0} diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/HandsDemoSceneAssets/Prefabs/Arrow.prefab.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Prefabs/Arrow.prefab.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/HandsDemoSceneAssets/Prefabs/Arrow.prefab.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Prefabs/Arrow.prefab.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Prefabs/Chess.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Prefabs/Chess.meta new file mode 100644 index 0000000..38a973f --- /dev/null +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Prefabs/Chess.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: cc6da3b6c17dad04f924dbc96b4c8114 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Prefabs/Chess/FlatSphereController.prefab b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Prefabs/Chess/FlatSphereController.prefab new file mode 100644 index 0000000..007897f --- /dev/null +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Prefabs/Chess/FlatSphereController.prefab @@ -0,0 +1,731 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &620666007103188122 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6476401572811645552} + - component: {fileID: 2496754245709711216} + - component: {fileID: 5593996689469427263} + m_Layer: 0 + m_Name: AudioAffordance + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6476401572811645552 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 620666007103188122} + 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: 1 + m_Children: [] + m_Father: {fileID: 2049748930621633665} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!82 &2496754245709711216 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 620666007103188122} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 0} + m_PlayOnAwake: 0 + m_Volume: 1 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 0 + 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.75 + 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 &5593996689469427263 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 620666007103188122} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 186056f485a2493b80cc81571ac8cd9b, type: 3} + m_Name: + m_EditorClassIdentifier: + m_AffordanceStateProvider: {fileID: 5509715586815330615} + m_AffordanceThemeDatum: + m_UseConstant: 0 + m_ConstantValue: + m_List: + - stateName: disabled + stateEntered: {fileID: 0} + stateExited: {fileID: 0} + - stateName: idle + stateEntered: {fileID: 0} + stateExited: {fileID: 0} + - stateName: hovered + stateEntered: {fileID: 0} + stateExited: {fileID: 0} + - stateName: hoveredPriority + stateEntered: {fileID: 0} + stateExited: {fileID: 0} + - stateName: selected + stateEntered: {fileID: 0} + stateExited: {fileID: 0} + - stateName: activated + stateEntered: {fileID: 0} + stateExited: {fileID: 0} + - stateName: focused + stateEntered: {fileID: 0} + stateExited: {fileID: 0} + m_Variable: {fileID: 11400000, guid: 57def9352cdee8548bfc9ebc6a55914a, type: 2} + m_AudioSource: {fileID: 2496754245709711216} +--- !u!1 &2049748930621633664 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2049748930621633665} + - component: {fileID: 2049748930621633678} + - component: {fileID: 2049748930621633679} + - component: {fileID: 2049748930621633676} + - component: {fileID: 2049748930621633677} + - component: {fileID: 2049748930621633674} + m_Layer: 0 + m_Name: FlatSphereController + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2049748930621633665 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2049748930621633664} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.163, y: 0, z: -0.091} + m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} + m_ConstrainProportionsScale: 1 + m_Children: + - {fileID: 5509715586815330617} + - {fileID: 6476401572811645552} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &2049748930621633678 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2049748930621633664} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 0.06, y: 0.2, z: 0.06} + m_Center: {x: 0, y: -0.05, z: 0} +--- !u!54 &2049748930621633679 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2049748930621633664} + 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 &2049748930621633676 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2049748930621633664} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0ad34abafad169848a38072baa96cdb2, type: 3} + m_Name: + m_EditorClassIdentifier: + m_InteractionManager: {fileID: 0} + m_Colliders: + - {fileID: 2049748930621633678} + 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 + 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: [] + 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: [] + m_AttachTransform: {fileID: 0} + m_SecondaryAttachTransform: {fileID: 0} + m_UseDynamicAttach: 1 + m_MatchAttachPosition: 1 + m_MatchAttachRotation: 0 + m_SnapToColliderVolume: 0 + m_ReinitializeDynamicAttachEverySingleGrab: 1 + m_AttachEaseInTime: 0 + m_MovementType: 2 + m_VelocityDamping: 1 + m_VelocityScale: 1 + m_AngularVelocityDamping: 1 + m_AngularVelocityScale: 1 + m_TrackPosition: 1 + m_SmoothPosition: 1 + m_SmoothPositionAmount: 12 + m_TightenPosition: 0.1 + m_TrackRotation: 0 + m_SmoothRotation: 0 + m_SmoothRotationAmount: 8 + m_TightenRotation: 0.1 + m_TrackScale: 0 + m_SmoothScale: 0 + m_SmoothScaleAmount: 8 + m_TightenScale: 0.1 + m_ThrowOnDetach: 0 + m_ThrowSmoothingDuration: 0.25 + m_ThrowSmoothingCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_ThrowVelocityScale: 1.5 + m_ThrowAngularVelocityScale: 1 + m_ForceGravityOnDetach: 0 + m_RetainTransformParent: 1 + m_AttachPointCompatibilityMode: 0 + m_StartingSingleGrabTransformers: [] + m_StartingMultipleGrabTransformers: [] + m_AddDefaultGrabTransformers: 1 +--- !u!114 &2049748930621633677 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2049748930621633664} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0a1302d0d134fa8a2a5b3bf4aec3c20, type: 3} + m_Name: + m_EditorClassIdentifier: + m_PermittedDisplacementAxes: 5 + m_ConstrainedAxisDisplacementMode: 1 + m_TwoHandedRotationMode: 1 + m_AllowOneHandedScaling: 1 + m_AllowTwoHandedScaling: 0 + m_OneHandedScaleSpeed: 0.5 + m_ThresholdMoveRatioForScale: 0.05 + m_ClampScaling: 1 + m_MinimumScaleRatio: 0.25 + m_MaximumScaleRatio: 2 + m_ScaleMultiplier: 0.25 +--- !u!114 &2049748930621633674 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2049748930621633664} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 115f1a2a50d85cd4b9d6dad4c95622be, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Interactable: {fileID: 2049748930621633676} + m_PokeCollider: {fileID: 2049748930621633678} + m_PokeConfiguration: + m_UseConstant: 1 + m_ConstantValue: + m_PokeDirection: 5 + m_InteractionDepthOffset: 0 + m_EnablePokeAngleThreshold: 1 + m_PokeAngleThreshold: 45 + m_Variable: {fileID: 0} +--- !u!1 &5509715586815330618 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5509715586815330617} + - component: {fileID: 5509715586815330613} + - component: {fileID: 5509715586815330614} + - component: {fileID: 5509715586815330615} + - component: {fileID: 5509715586815330616} + - component: {fileID: 5509715586815330611} + - component: {fileID: 5509715586815330612} + m_Layer: 0 + m_Name: Sphere + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5509715586815330617 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5509715586815330618} + m_LocalRotation: {x: -0, y: -0.13052616, z: -0, w: 0.9914449} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.055, y: 0.025, z: 0.055} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2049748930621633665} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &5509715586815330613 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5509715586815330618} + m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &5509715586815330614 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5509715586815330618} + 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: 40808a1b89c64184e9466aaec1fd1ac1, 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 &5509715586815330615 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5509715586815330618} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 49e0a5b5ff5540f5b14dd29d46faec22, type: 3} + m_Name: + m_EditorClassIdentifier: + m_TransitionDuration: 0.125 + m_InteractableSource: {fileID: 2049748930621633676} + m_IgnoreHoverEvents: 0 + m_IgnoreHoverPriorityEvents: 1 + m_IgnoreFocusEvents: 1 + m_IgnoreSelectEvents: 0 + m_IgnoreActivateEvents: 0 + m_SelectClickAnimationMode: 0 + m_ActivateClickAnimationMode: 0 + m_ClickAnimationDuration: 0.25 + m_ClickAnimationCurve: + m_UseConstant: 1 + m_ConstantValue: + 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: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_Variable: {fileID: 0} +--- !u!114 &5509715586815330616 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5509715586815330618} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 73feefcb6c9340e188b14a48254f4b5e, type: 3} + m_Name: + m_EditorClassIdentifier: + m_AffordanceStateProvider: {fileID: 5509715586815330615} + m_ReplaceIdleStateValueWithInitialValue: 0 + m_AffordanceThemeDatum: + m_UseConstant: 0 + m_ConstantValue: + m_StateAnimationCurve: + m_UseConstant: 1 + m_ConstantValue: + 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: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_Variable: {fileID: 0} + m_List: + - stateName: disabled + animationStateStartValue: 0 + animationStateEndValue: 0 + - stateName: idle + animationStateStartValue: 0 + animationStateEndValue: 0 + - stateName: hovered + animationStateStartValue: 0 + animationStateEndValue: 0 + - stateName: hoveredPriority + animationStateStartValue: 0 + animationStateEndValue: 0 + - stateName: selected + animationStateStartValue: 0 + animationStateEndValue: 0 + - stateName: activated + animationStateStartValue: 0 + animationStateEndValue: 0 + - stateName: focused + animationStateStartValue: 0 + animationStateEndValue: 0 + m_Variable: {fileID: 11400000, guid: d47a7e28eb1851943b2b99ded7acba3b, type: 2} + m_ValueUpdated: + m_PersistentCalls: + m_Calls: [] + m_TransformToScale: {fileID: 5509715586815330617} +--- !u!114 &5509715586815330611 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5509715586815330618} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1410cbaaadf84a7aaa6459d37ad21b3a, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Renderer: {fileID: 5509715586815330614} + m_MaterialIndex: 0 +--- !u!114 &5509715586815330612 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5509715586815330618} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f86d13fca2ec430d870c0f7765ad0dde, type: 3} + m_Name: + m_EditorClassIdentifier: + m_AffordanceStateProvider: {fileID: 5509715586815330615} + m_ReplaceIdleStateValueWithInitialValue: 0 + m_AffordanceThemeDatum: + m_UseConstant: 0 + m_ConstantValue: + m_StateAnimationCurve: + m_UseConstant: 1 + m_ConstantValue: + 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: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_Variable: {fileID: 0} + m_List: + - stateName: disabled + animationStateStartValue: {r: 0, g: 0, b: 0, a: 0} + animationStateEndValue: {r: 0, g: 0, b: 0, a: 0} + - stateName: idle + animationStateStartValue: {r: 0, g: 0, b: 0, a: 0} + animationStateEndValue: {r: 0, g: 0, b: 0, a: 0} + - stateName: hovered + animationStateStartValue: {r: 0, g: 0, b: 0, a: 0} + animationStateEndValue: {r: 0, g: 0, b: 0, a: 0} + - stateName: hoveredPriority + animationStateStartValue: {r: 0, g: 0, b: 0, a: 0} + animationStateEndValue: {r: 0, g: 0, b: 0, a: 0} + - stateName: selected + animationStateStartValue: {r: 0, g: 0, b: 0, a: 0} + animationStateEndValue: {r: 0, g: 0, b: 0, a: 0} + - stateName: activated + animationStateStartValue: {r: 0, g: 0, b: 0, a: 0} + animationStateEndValue: {r: 0, g: 0, b: 0, a: 0} + - stateName: focused + animationStateStartValue: {r: 0, g: 0, b: 0, a: 0} + animationStateEndValue: {r: 0, g: 0, b: 0, a: 0} + m_ColorBlendMode: 0 + m_BlendAmount: 1 + m_Variable: {fileID: 11400000, guid: c39d3614cd6089347a01b0743003ae34, type: 2} + m_ValueUpdated: + m_PersistentCalls: + m_Calls: [] + m_MaterialPropertyBlockHelper: {fileID: 5509715586815330611} + m_ColorPropertyName: diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Prefabs/Chess/FlatSphereController.prefab.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Prefabs/Chess/FlatSphereController.prefab.meta new file mode 100644 index 0000000..eef7d0e --- /dev/null +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Prefabs/Chess/FlatSphereController.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 6b7188f9e149bd64cb26cec516eb470c +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Prefabs/Chess/PawnController.prefab b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Prefabs/Chess/PawnController.prefab new file mode 100644 index 0000000..0154a04 --- /dev/null +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Prefabs/Chess/PawnController.prefab @@ -0,0 +1,713 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1424758651557925865 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8302078025757585448} + - component: {fileID: 6570999008309782876} + - component: {fileID: 5292440013984097552} + m_Layer: 0 + m_Name: AudioAffordance + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8302078025757585448 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1424758651557925865} + 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: 6689389171845895219} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!82 &6570999008309782876 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1424758651557925865} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 0} + m_PlayOnAwake: 0 + m_Volume: 1 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 0 + 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.75 + 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 &5292440013984097552 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1424758651557925865} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 186056f485a2493b80cc81571ac8cd9b, type: 3} + m_Name: + m_EditorClassIdentifier: + m_AffordanceStateProvider: {fileID: 6689389173434678681} + m_AffordanceThemeDatum: + m_UseConstant: 0 + m_ConstantValue: + m_List: + - stateName: disabled + stateEntered: {fileID: 0} + stateExited: {fileID: 0} + - stateName: idle + stateEntered: {fileID: 0} + stateExited: {fileID: 0} + - stateName: hovered + stateEntered: {fileID: 0} + stateExited: {fileID: 0} + - stateName: hoveredPriority + stateEntered: {fileID: 0} + stateExited: {fileID: 0} + - stateName: selected + stateEntered: {fileID: 0} + stateExited: {fileID: 0} + - stateName: activated + stateEntered: {fileID: 0} + stateExited: {fileID: 0} + - stateName: focused + stateEntered: {fileID: 0} + stateExited: {fileID: 0} + m_Variable: {fileID: 11400000, guid: 57def9352cdee8548bfc9ebc6a55914a, type: 2} + m_AudioSource: {fileID: 6570999008309782876} +--- !u!1 &6689389171845895218 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6689389171845895219} + - component: {fileID: 6689389171845895228} + - component: {fileID: 6689389171845895229} + - component: {fileID: 6689389171845895230} + - component: {fileID: 6689389171845895231} + - component: {fileID: 6689389171845895224} + m_Layer: 0 + m_Name: PawnController + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6689389171845895219 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6689389171845895218} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.1369, y: 0, z: 0.0354} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 1 + m_Children: + - {fileID: 6689389173434678687} + - {fileID: 8302078025757585448} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &6689389171845895228 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6689389171845895218} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 0.03, y: 0.155, z: 0.03} + m_Center: {x: 0, y: -0.025, z: 0} +--- !u!54 &6689389171845895229 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6689389171845895218} + 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 &6689389171845895230 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6689389171845895218} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0ad34abafad169848a38072baa96cdb2, type: 3} + m_Name: + m_EditorClassIdentifier: + m_InteractionManager: {fileID: 0} + m_Colliders: + - {fileID: 6689389171845895228} + 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 + 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: [] + 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: [] + m_AttachTransform: {fileID: 0} + m_SecondaryAttachTransform: {fileID: 0} + m_UseDynamicAttach: 1 + m_MatchAttachPosition: 1 + m_MatchAttachRotation: 0 + m_SnapToColliderVolume: 0 + m_ReinitializeDynamicAttachEverySingleGrab: 1 + m_AttachEaseInTime: 0 + m_MovementType: 2 + m_VelocityDamping: 1 + m_VelocityScale: 1 + m_AngularVelocityDamping: 1 + m_AngularVelocityScale: 1 + m_TrackPosition: 1 + m_SmoothPosition: 1 + m_SmoothPositionAmount: 12 + m_TightenPosition: 0.1 + m_TrackRotation: 0 + m_SmoothRotation: 0 + m_SmoothRotationAmount: 8 + m_TightenRotation: 0.1 + m_TrackScale: 0 + m_SmoothScale: 0 + m_SmoothScaleAmount: 8 + m_TightenScale: 0.1 + m_ThrowOnDetach: 0 + m_ThrowSmoothingDuration: 0.25 + m_ThrowSmoothingCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_ThrowVelocityScale: 1.5 + m_ThrowAngularVelocityScale: 1 + m_ForceGravityOnDetach: 0 + m_RetainTransformParent: 1 + m_AttachPointCompatibilityMode: 0 + m_StartingSingleGrabTransformers: [] + m_StartingMultipleGrabTransformers: [] + m_AddDefaultGrabTransformers: 1 +--- !u!114 &6689389171845895231 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6689389171845895218} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0a1302d0d134fa8a2a5b3bf4aec3c20, type: 3} + m_Name: + m_EditorClassIdentifier: + m_PermittedDisplacementAxes: 5 + m_ConstrainedAxisDisplacementMode: 1 + m_TwoHandedRotationMode: 1 + m_AllowOneHandedScaling: 1 + m_AllowTwoHandedScaling: 0 + m_OneHandedScaleSpeed: 0.5 + m_ThresholdMoveRatioForScale: 0.05 + m_ClampScaling: 1 + m_MinimumScaleRatio: 0.25 + m_MaximumScaleRatio: 2 + m_ScaleMultiplier: 0.25 +--- !u!114 &6689389171845895224 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6689389171845895218} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 115f1a2a50d85cd4b9d6dad4c95622be, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Interactable: {fileID: 6689389171845895230} + m_PokeCollider: {fileID: 6689389171845895228} + m_PokeConfiguration: + m_UseConstant: 1 + m_ConstantValue: + m_PokeDirection: 5 + m_InteractionDepthOffset: 0 + m_EnablePokeAngleThreshold: 1 + m_PokeAngleThreshold: 45 + m_Variable: {fileID: 0} +--- !u!1 &6689389173096316706 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6689389173096316707} + - component: {fileID: 6689389173096316716} + m_Layer: 0 + m_Name: Pawn Visual + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6689389173096316707 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6689389173096316706} + 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: 6689389173434678687} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!137 &6689389173096316716 +SkinnedMeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6689389173096316706} + 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: 3 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 40808a1b89c64184e9466aaec1fd1ac1, 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 + serializedVersion: 2 + m_Quality: 0 + m_UpdateWhenOffscreen: 1 + m_SkinnedMotionVectors: 1 + m_Mesh: {fileID: -7696507639337603356, guid: 45b2a246bd435f74989d22078ec2752e, type: 3} + m_Bones: [] + m_BlendShapeWeights: + - 0 + - 0 + m_RootBone: {fileID: 0} + m_AABB: + m_Center: {x: -0.000000009313226, y: 0.026900887, z: 0} + m_Extent: {x: 0.012847318, y: 0.026900887, z: 0.0128473295} + m_DirtyAABB: 0 +--- !u!1 &6689389173443419733 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6689389173434678687} + - component: {fileID: 6689389173434678681} + - component: {fileID: 6689389173002939785} + - component: {fileID: 6689389173002939784} + - component: {fileID: 5052028028641032844} + m_Layer: 0 + m_Name: Chess Pawn + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6689389173434678687 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6689389173443419733} + 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: 6689389173096316707} + m_Father: {fileID: 6689389171845895219} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &6689389173434678681 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6689389173443419733} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 49e0a5b5ff5540f5b14dd29d46faec22, type: 3} + m_Name: + m_EditorClassIdentifier: + m_TransitionDuration: 0.125 + m_InteractableSource: {fileID: 6689389171845895230} + m_IgnoreHoverEvents: 0 + m_IgnoreHoverPriorityEvents: 1 + m_IgnoreFocusEvents: 1 + m_IgnoreSelectEvents: 0 + m_IgnoreActivateEvents: 0 + m_SelectClickAnimationMode: 0 + m_ActivateClickAnimationMode: 0 + m_ClickAnimationDuration: 0.25 + m_ClickAnimationCurve: + m_UseConstant: 1 + m_ConstantValue: + 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: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_Variable: {fileID: 0} +--- !u!114 &6689389173002939785 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6689389173443419733} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1410cbaaadf84a7aaa6459d37ad21b3a, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Renderer: {fileID: 6689389173096316716} + m_MaterialIndex: 0 +--- !u!114 &6689389173002939784 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6689389173443419733} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f86d13fca2ec430d870c0f7765ad0dde, type: 3} + m_Name: + m_EditorClassIdentifier: + m_AffordanceStateProvider: {fileID: 6689389173434678681} + m_ReplaceIdleStateValueWithInitialValue: 0 + m_AffordanceThemeDatum: + m_UseConstant: 0 + m_ConstantValue: + m_StateAnimationCurve: + m_UseConstant: 1 + m_ConstantValue: + 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: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_Variable: {fileID: 0} + m_List: + - stateName: disabled + animationStateStartValue: {r: 0, g: 0, b: 0, a: 0} + animationStateEndValue: {r: 0, g: 0, b: 0, a: 0} + - stateName: idle + animationStateStartValue: {r: 0, g: 0, b: 0, a: 0} + animationStateEndValue: {r: 0, g: 0, b: 0, a: 0} + - stateName: hovered + animationStateStartValue: {r: 0, g: 0, b: 0, a: 0} + animationStateEndValue: {r: 0, g: 0, b: 0, a: 0} + - stateName: hoveredPriority + animationStateStartValue: {r: 0, g: 0, b: 0, a: 0} + animationStateEndValue: {r: 0, g: 0, b: 0, a: 0} + - stateName: selected + animationStateStartValue: {r: 0, g: 0, b: 0, a: 0} + animationStateEndValue: {r: 0, g: 0, b: 0, a: 0} + - stateName: activated + animationStateStartValue: {r: 0, g: 0, b: 0, a: 0} + animationStateEndValue: {r: 0, g: 0, b: 0, a: 0} + - stateName: focused + animationStateStartValue: {r: 0, g: 0, b: 0, a: 0} + animationStateEndValue: {r: 0, g: 0, b: 0, a: 0} + m_ColorBlendMode: 0 + m_BlendAmount: 1 + m_Variable: {fileID: 11400000, guid: c39d3614cd6089347a01b0743003ae34, type: 2} + m_ValueUpdated: + m_PersistentCalls: + m_Calls: [] + m_MaterialPropertyBlockHelper: {fileID: 6689389173002939785} + m_ColorPropertyName: +--- !u!114 &5052028028641032844 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6689389173443419733} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 78373ff495dc8234887e0cbdc7140022, type: 3} + m_Name: + m_EditorClassIdentifier: + m_PokeFilter: {fileID: 6689389171845895224} + m_SkinnedMeshRenderer: {fileID: 6689389173096316716} + m_BlendShapeIndex: 1 + m_BlendShapeMin: 0 + m_BlendShapeMax: 100 diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Prefabs/Chess/PawnController.prefab.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Prefabs/Chess/PawnController.prefab.meta new file mode 100644 index 0000000..dda32a5 --- /dev/null +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Prefabs/Chess/PawnController.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: a5f97d75a3184ad46aef39618607e083 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/HandsDemoSceneAssets/Prefabs/Cube.prefab b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Prefabs/Cube.prefab similarity index 92% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/HandsDemoSceneAssets/Prefabs/Cube.prefab rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Prefabs/Cube.prefab index b3f4288..24ef3df 100644 --- a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/HandsDemoSceneAssets/Prefabs/Cube.prefab +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Prefabs/Cube.prefab @@ -108,6 +108,7 @@ GameObject: - component: {fileID: 9171031756790316709} - component: {fileID: 5268460675038366900} - component: {fileID: 5268460675038366903} + - component: {fileID: 1988286665728152634} m_Layer: 0 m_Name: Cube m_TagString: Untagged @@ -168,7 +169,7 @@ MonoBehaviour: m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 - m_SelectMode: 0 + m_SelectMode: 1 m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 @@ -258,21 +259,21 @@ MonoBehaviour: m_SnapToColliderVolume: 1 m_ReinitializeDynamicAttachEverySingleGrab: 1 m_AttachEaseInTime: 0.15 - m_MovementType: 2 + m_MovementType: 0 m_VelocityDamping: 1 m_VelocityScale: 1 m_AngularVelocityDamping: 1 m_AngularVelocityScale: 1 m_TrackPosition: 1 m_SmoothPosition: 0 - m_SmoothPositionAmount: 5 - m_TightenPosition: 0.5 + m_SmoothPositionAmount: 8 + m_TightenPosition: 0.1 m_TrackRotation: 1 m_SmoothRotation: 0 - m_SmoothRotationAmount: 5 - m_TightenRotation: 0.5 + m_SmoothRotationAmount: 8 + m_TightenRotation: 0.1 m_TrackScale: 1 - m_SmoothScale: 0 + m_SmoothScale: 1 m_SmoothScaleAmount: 8 m_TightenScale: 0.1 m_ThrowOnDetach: 1 @@ -300,6 +301,29 @@ MonoBehaviour: m_StartingSingleGrabTransformers: [] m_StartingMultipleGrabTransformers: [] m_AddDefaultGrabTransformers: 1 +--- !u!114 &1988286665728152634 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5268460675038366902} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0a1302d0d134fa8a2a5b3bf4aec3c20, type: 3} + m_Name: + m_EditorClassIdentifier: + m_PermittedDisplacementAxes: 7 + m_ConstrainedAxisDisplacementMode: 1 + m_TwoHandedRotationMode: 1 + m_AllowOneHandedScaling: 1 + m_AllowTwoHandedScaling: 1 + m_OneHandedScaleSpeed: 0.5 + m_ThresholdMoveRatioForScale: 0.01 + m_ClampScaling: 1 + m_MinimumScaleRatio: 0.25 + m_MaximumScaleRatio: 3 + m_ScaleMultiplier: 0.25 --- !u!1001 &6089389885339028571 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/HandsDemoSceneAssets/Prefabs/Cube.prefab.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Prefabs/Cube.prefab.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/HandsDemoSceneAssets/Prefabs/Cube.prefab.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Prefabs/Cube.prefab.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/HandsDemoSceneAssets/Prefabs/Cylinder.prefab b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Prefabs/Cylinder.prefab similarity index 96% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/HandsDemoSceneAssets/Prefabs/Cylinder.prefab rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Prefabs/Cylinder.prefab index cfef1c9..f9975b7 100644 --- a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/HandsDemoSceneAssets/Prefabs/Cylinder.prefab +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Prefabs/Cylinder.prefab @@ -11,7 +11,7 @@ GameObject: - component: {fileID: 256826899755551065} - component: {fileID: 4802184161675562276} - component: {fileID: 5677050711131360266} - - component: {fileID: 4923918447339988222} + - component: {fileID: 7407278190534771666} m_Layer: 0 m_Name: Visuals m_TagString: Untagged @@ -84,8 +84,8 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!64 &4923918447339988222 -MeshCollider: +--- !u!136 &7407278190534771666 +CapsuleCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -94,10 +94,10 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 4 - m_Convex: 1 - m_CookingOptions: 30 - m_Mesh: {fileID: -5076798556035486163, guid: bf65382e5e6d14e7f8140e4204ce07e2, type: 3} + m_Radius: 0.00575 + m_Height: 0.011 + m_Direction: 1 + m_Center: {x: -0.0000000060535967, y: -0.000000007450581, z: 0.000000028405339} --- !u!1 &5709307613756117032 GameObject: m_ObjectHideFlags: 0 @@ -260,21 +260,21 @@ MonoBehaviour: m_SnapToColliderVolume: 1 m_ReinitializeDynamicAttachEverySingleGrab: 1 m_AttachEaseInTime: 0.15 - m_MovementType: 1 + m_MovementType: 2 m_VelocityDamping: 1 m_VelocityScale: 1 m_AngularVelocityDamping: 1 m_AngularVelocityScale: 1 m_TrackPosition: 1 m_SmoothPosition: 0 - m_SmoothPositionAmount: 5 - m_TightenPosition: 0.5 + m_SmoothPositionAmount: 8 + m_TightenPosition: 0.1 m_TrackRotation: 1 m_SmoothRotation: 0 - m_SmoothRotationAmount: 5 - m_TightenRotation: 0.5 + m_SmoothRotationAmount: 8 + m_TightenRotation: 0.1 m_TrackScale: 1 - m_SmoothScale: 0 + m_SmoothScale: 1 m_SmoothScaleAmount: 8 m_TightenScale: 0.1 m_ThrowOnDetach: 0 @@ -320,10 +320,10 @@ MonoBehaviour: m_AllowOneHandedScaling: 1 m_AllowTwoHandedScaling: 1 m_OneHandedScaleSpeed: 0.5 - m_ThresholdMoveRatioForScale: 0.1 + m_ThresholdMoveRatioForScale: 0.01 m_ClampScaling: 1 m_MinimumScaleRatio: 0.25 - m_MaximumScaleRatio: 2 + m_MaximumScaleRatio: 3 m_ScaleMultiplier: 0.25 --- !u!1001 &4330884014412049023 PrefabInstance: diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/HandsDemoSceneAssets/Prefabs/Cylinder.prefab.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Prefabs/Cylinder.prefab.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/HandsDemoSceneAssets/Prefabs/Cylinder.prefab.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Prefabs/Cylinder.prefab.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/HandsDemoSceneAssets/Prefabs/Disc.prefab b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Prefabs/Disc.prefab similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/HandsDemoSceneAssets/Prefabs/Disc.prefab rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Prefabs/Disc.prefab diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/HandsDemoSceneAssets/Prefabs/Disc.prefab.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Prefabs/Disc.prefab.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/HandsDemoSceneAssets/Prefabs/Disc.prefab.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Prefabs/Disc.prefab.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/HandsDemoSceneAssets/Prefabs/PokeButton.prefab b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Prefabs/PokeButton.prefab similarity index 98% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/HandsDemoSceneAssets/Prefabs/PokeButton.prefab rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Prefabs/PokeButton.prefab index 49682d6..48ddc11 100644 --- a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/HandsDemoSceneAssets/Prefabs/PokeButton.prefab +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Prefabs/PokeButton.prefab @@ -29,6 +29,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 2130331531028021864} - {fileID: 2130331531475655813} @@ -58,6 +59,7 @@ MonoBehaviour: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 0 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -90,6 +92,18 @@ MonoBehaviour: 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: [] @@ -192,6 +206,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: -0.0164, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 6407146669795823432} - {fileID: 6407146669819355306} @@ -224,6 +239,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0.016500022, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 6407146670984646345} - {fileID: 6407146669589918088} @@ -257,6 +273,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: -0.0197, z: 0} m_LocalScale: {x: 0.06519, y: 0.07469253, z: 0.06519} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2130331530761912220} m_RootOrder: 2 diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/HandsDemoSceneAssets/Prefabs/PokeButton.prefab.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Prefabs/PokeButton.prefab.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/HandsDemoSceneAssets/Prefabs/PokeButton.prefab.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Prefabs/PokeButton.prefab.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Prefabs/SimpleSocket.prefab b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Prefabs/SimpleSocket.prefab new file mode 100644 index 0000000..c6562c0 --- /dev/null +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Prefabs/SimpleSocket.prefab @@ -0,0 +1,508 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &106093692981118498 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 734996079564348568} + - component: {fileID: 728864242803681389} + - component: {fileID: 5172308405717368139} + m_Layer: 0 + m_Name: SimpleSocket + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &734996079564348568 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 106093692981118498} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 800, y: 800, z: 800} + m_ConstrainProportionsScale: 1 + m_Children: + - {fileID: 5572517086321491450} + - {fileID: 6441652780047499728} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &728864242803681389 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 106093692981118498} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 60523e0647cc6ab43acc73cb266a32a7, 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: 5572517086321491450} + 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_ShowInteractableHoverMeshes: 0 + m_InteractableHoverMeshMaterial: {fileID: 0} + m_InteractableCantHoverMeshMaterial: {fileID: 0} + m_SocketActive: 1 + m_InteractableHoverScale: 1 + m_RecycleDelayTime: 1 + m_HoverSocketSnapping: 1 + m_SocketSnappingRadius: 0.1 + m_SocketScaleMode: 2 + m_FixedScale: {x: 1, y: 1, z: 1} + m_TargetBoundsSize: {x: 0.05, y: 0.1, z: 0.05} +--- !u!65 &5172308405717368139 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 106093692981118498} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 0.2, y: 0.3, z: 0.3} + m_Center: {x: 0, y: 0, z: 0} +--- !u!1 &992896250728694134 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6441652780047499728} + m_Layer: 0 + m_Name: Simple_Socket_Visuals + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6441652780047499728 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 992896250728694134} + 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: 2119503333954798193} + - {fileID: 136868517415886600} + - {fileID: 6690175492877764369} + - {fileID: 4250642347119713851} + m_Father: {fileID: 734996079564348568} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1010441622692718940 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6690175492877764369} + - component: {fileID: 747345456234366501} + - component: {fileID: 406981427254625433} + m_Layer: 0 + m_Name: Cube (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6690175492877764369 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1010441622692718940} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.05, y: 0.125, z: 0} + m_LocalScale: {x: 0.1, y: 0.05, z: 0.1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 6441652780047499728} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &747345456234366501 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1010441622692718940} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &406981427254625433 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1010441622692718940} + 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: f95c205049f12cc4cb5bd57dbded286c, 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 &1602715075570566562 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5572517086321491450} + m_Layer: 0 + m_Name: Attach + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5572517086321491450 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1602715075570566562} + 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: 734996079564348568} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &5427271494345311123 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 136868517415886600} + - component: {fileID: 5062548740983822529} + - component: {fileID: 6317744024979905813} + m_Layer: 0 + m_Name: Cube (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &136868517415886600 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5427271494345311123} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.05, y: 0, z: -0.1} + m_LocalScale: {x: 0.1, y: 0.3, z: 0.1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 6441652780047499728} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &5062548740983822529 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5427271494345311123} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &6317744024979905813 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5427271494345311123} + 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: f95c205049f12cc4cb5bd57dbded286c, 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 &5736995918871761936 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2119503333954798193} + - component: {fileID: 6388264563034436822} + - component: {fileID: 6390925710335525439} + m_Layer: 0 + m_Name: Cube + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2119503333954798193 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5736995918871761936} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.05, y: 0, z: 0.1} + m_LocalScale: {x: 0.1, y: 0.3, z: 0.1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 6441652780047499728} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &6388264563034436822 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5736995918871761936} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &6390925710335525439 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5736995918871761936} + 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: f95c205049f12cc4cb5bd57dbded286c, 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 &6614057041200256932 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4250642347119713851} + - component: {fileID: 747566124053762357} + - component: {fileID: 468281548969361700} + m_Layer: 0 + m_Name: Cube (3) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4250642347119713851 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6614057041200256932} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.05, y: -0.125, z: 0} + m_LocalScale: {x: 0.1, y: 0.05, z: 0.1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 6441652780047499728} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &747566124053762357 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6614057041200256932} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &468281548969361700 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6614057041200256932} + 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: f95c205049f12cc4cb5bd57dbded286c, 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} diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Prefabs/SimpleSocket.prefab.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Prefabs/SimpleSocket.prefab.meta new file mode 100644 index 0000000..020a98f --- /dev/null +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Prefabs/SimpleSocket.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: aec71f91a8da27d418aa44bd0c543f9b +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Prefabs/SimpleSocketShape.prefab b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Prefabs/SimpleSocketShape.prefab new file mode 100644 index 0000000..16e7809 --- /dev/null +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Prefabs/SimpleSocketShape.prefab @@ -0,0 +1,372 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &3277249689611702729 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3000186246023203508} + m_Layer: 0 + m_Name: Attach + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3000186246023203508 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3277249689611702729} + 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: 6957000769822834732} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &6957000769822834733 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6957000769822834732} + - component: {fileID: 6957000769822834742} + - component: {fileID: 6957000769822834743} + - component: {fileID: 6957000769822834729} + - component: {fileID: 6957000769822834730} + - component: {fileID: 2175187011753756096} + m_Layer: 0 + m_Name: SimpleSocketShape + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6957000769822834732 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6957000769822834733} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.075, y: 0.15000002, z: 0.075} + m_ConstrainProportionsScale: 1 + m_Children: + - {fileID: 3000186246023203508} + - {fileID: 129807179434452588} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &6957000769822834742 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6957000769822834733} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &6957000769822834743 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6957000769822834733} + 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: 3a84a7b91ec88714486e0c4cc9a5dc01, 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!54 &6957000769822834729 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6957000769822834733} + serializedVersion: 2 + m_Mass: 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 &6957000769822834730 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6957000769822834733} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0ad34abafad169848a38072baa96cdb2, type: 3} + m_Name: + m_EditorClassIdentifier: + m_InteractionManager: {fileID: 0} + m_Colliders: [] + m_InteractionLayerMask: + serializedVersion: 2 + m_Bits: 1 + 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: [] + 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: [] + m_AttachTransform: {fileID: 3000186246023203508} + m_SecondaryAttachTransform: {fileID: 0} + m_UseDynamicAttach: 1 + m_MatchAttachPosition: 1 + m_MatchAttachRotation: 1 + m_SnapToColliderVolume: 1 + m_ReinitializeDynamicAttachEverySingleGrab: 1 + m_AttachEaseInTime: 0.15 + m_MovementType: 2 + m_VelocityDamping: 1 + m_VelocityScale: 1 + m_AngularVelocityDamping: 1 + m_AngularVelocityScale: 1 + m_TrackPosition: 1 + m_SmoothPosition: 1 + m_SmoothPositionAmount: 5 + m_TightenPosition: 0.1 + m_TrackRotation: 1 + m_SmoothRotation: 1 + m_SmoothRotationAmount: 5 + m_TightenRotation: 0.1 + m_TrackScale: 1 + m_SmoothScale: 1 + m_SmoothScaleAmount: 5 + m_TightenScale: 0.1 + m_ThrowOnDetach: 1 + m_ThrowSmoothingDuration: 0.25 + m_ThrowSmoothingCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_ThrowVelocityScale: 1.5 + m_ThrowAngularVelocityScale: 1 + m_ForceGravityOnDetach: 0 + m_RetainTransformParent: 1 + m_AttachPointCompatibilityMode: 0 + m_StartingSingleGrabTransformers: [] + m_StartingMultipleGrabTransformers: [] + m_AddDefaultGrabTransformers: 1 +--- !u!65 &2175187011753756096 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6957000769822834733} + 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!1001 &401194151877151492 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 6957000769822834732} + m_Modifications: + - target: {fileID: 314259139610439016, guid: 9a5f820ee9c46b64294ae756b459a681, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 314259139610439016, guid: 9a5f820ee9c46b64294ae756b459a681, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 314259139610439016, guid: 9a5f820ee9c46b64294ae756b459a681, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 314259139610439016, guid: 9a5f820ee9c46b64294ae756b459a681, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 314259139610439016, guid: 9a5f820ee9c46b64294ae756b459a681, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 314259139610439016, guid: 9a5f820ee9c46b64294ae756b459a681, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 314259139610439016, guid: 9a5f820ee9c46b64294ae756b459a681, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 314259139610439016, guid: 9a5f820ee9c46b64294ae756b459a681, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 314259139610439016, guid: 9a5f820ee9c46b64294ae756b459a681, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 314259139610439016, guid: 9a5f820ee9c46b64294ae756b459a681, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 314259139610439016, guid: 9a5f820ee9c46b64294ae756b459a681, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1784108126610004015, guid: 9a5f820ee9c46b64294ae756b459a681, type: 3} + propertyPath: m_InteractableSource + value: + objectReference: {fileID: 6957000769822834730} + - target: {fileID: 4104645014554624858, guid: 9a5f820ee9c46b64294ae756b459a681, type: 3} + propertyPath: m_Renderer + value: + objectReference: {fileID: 6957000769822834743} + - target: {fileID: 4696973491166461409, guid: 9a5f820ee9c46b64294ae756b459a681, type: 3} + propertyPath: m_Name + value: InteractionAffordance + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 9a5f820ee9c46b64294ae756b459a681, type: 3} +--- !u!4 &129807179434452588 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 314259139610439016, guid: 9a5f820ee9c46b64294ae756b459a681, type: 3} + m_PrefabInstance: {fileID: 401194151877151492} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Prefabs/SimpleSocketShape.prefab.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Prefabs/SimpleSocketShape.prefab.meta new file mode 100644 index 0000000..cbd1137 --- /dev/null +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Prefabs/SimpleSocketShape.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: d81193b4b57486b46b4762e8b26d2de8 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Prefabs/TableHandle.prefab b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Prefabs/TableHandle.prefab new file mode 100644 index 0000000..82e3924 --- /dev/null +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Prefabs/TableHandle.prefab @@ -0,0 +1,1085 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &5209669283067494015 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3133794072027396999} + - component: {fileID: 8482967781085504782} + - component: {fileID: 5790058641736664295} + m_Layer: 0 + m_Name: AudioAffordance + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3133794072027396999 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5209669283067494015} + 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: 7403072356979171078} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!82 &8482967781085504782 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5209669283067494015} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 0} + m_PlayOnAwake: 0 + m_Volume: 1 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 0 + 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.75 + 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 &5790058641736664295 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5209669283067494015} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 186056f485a2493b80cc81571ac8cd9b, type: 3} + m_Name: + m_EditorClassIdentifier: + m_AffordanceStateProvider: {fileID: 7403072356979171075} + m_AffordanceThemeDatum: + m_UseConstant: 0 + m_ConstantValue: + m_List: + - stateName: disabled + stateEntered: {fileID: 0} + stateExited: {fileID: 0} + - stateName: idle + stateEntered: {fileID: 0} + stateExited: {fileID: 0} + - stateName: hovered + stateEntered: {fileID: 0} + stateExited: {fileID: 0} + - stateName: hoveredPriority + stateEntered: {fileID: 0} + stateExited: {fileID: 0} + - stateName: selected + stateEntered: {fileID: 0} + stateExited: {fileID: 0} + - stateName: activated + stateEntered: {fileID: 0} + stateExited: {fileID: 0} + - stateName: focused + stateEntered: {fileID: 0} + stateExited: {fileID: 0} + m_Variable: {fileID: 11400000, guid: 57def9352cdee8548bfc9ebc6a55914a, type: 2} + m_AudioSource: {fileID: 8482967781085504782} +--- !u!1 &7403072356348442448 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7403072356348442415} + - component: {fileID: 7403072356348442413} + - component: {fileID: 7403072356348442414} + m_Layer: 0 + m_Name: CapsuleVisual + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7403072356348442415 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7403072356348442448} + m_LocalRotation: {x: 0, y: 0, z: 0.7071068, w: 0.7071068} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.5, y: 2, z: 0.5} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7403072356416083930} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90} +--- !u!23 &7403072356348442413 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7403072356348442448} + 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: 455ef821a5429de4baeed61fa958acbc, type: 2} + - {fileID: 2100000, guid: 0b91f81225004e24ca905a5f32567d5d, 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 &7403072356348442414 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7403072356348442448} + m_Mesh: {fileID: 10208, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &7403072356416083904 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7403072356416083930} + - component: {fileID: 7403072356416083934} + - component: {fileID: 7403072356416083935} + - component: {fileID: 7403072356416083929} + - component: {fileID: 7403072356416083928} + - component: {fileID: 820650513654450291} + m_Layer: 0 + m_Name: TableHandle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7403072356416083930 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7403072356416083904} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0.65, z: 0.35} + m_LocalScale: {x: 0.05, y: 0.05, z: 0.05} + m_ConstrainProportionsScale: 1 + m_Children: + - {fileID: 7403072357328242346} + - {fileID: 7403072357431632353} + - {fileID: 7403072356979171078} + - {fileID: 7403072356348442415} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!54 &7403072356416083934 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7403072356416083904} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 0 + m_IsKinematic: 1 + m_Interpolate: 1 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!114 &7403072356416083935 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7403072356416083904} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0ad34abafad169848a38072baa96cdb2, 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: 0 + 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: [] + 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: [] + m_AttachTransform: {fileID: 0} + m_SecondaryAttachTransform: {fileID: 0} + m_UseDynamicAttach: 1 + m_MatchAttachPosition: 1 + m_MatchAttachRotation: 1 + m_SnapToColliderVolume: 0 + m_ReinitializeDynamicAttachEverySingleGrab: 1 + m_AttachEaseInTime: 0.15 + m_MovementType: 2 + m_VelocityDamping: 1 + m_VelocityScale: 1 + m_AngularVelocityDamping: 1 + m_AngularVelocityScale: 1 + m_TrackPosition: 1 + m_SmoothPosition: 1 + m_SmoothPositionAmount: 5 + m_TightenPosition: 0.1 + m_TrackRotation: 1 + m_SmoothRotation: 1 + m_SmoothRotationAmount: 2 + m_TightenRotation: 0.05 + m_TrackScale: 0 + m_SmoothScale: 0 + m_SmoothScaleAmount: 8 + m_TightenScale: 0.1 + m_ThrowOnDetach: 0 + m_ThrowSmoothingDuration: 0.25 + m_ThrowSmoothingCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_ThrowVelocityScale: 1.5 + m_ThrowAngularVelocityScale: 1 + m_ForceGravityOnDetach: 0 + m_RetainTransformParent: 1 + m_AttachPointCompatibilityMode: 0 + m_StartingSingleGrabTransformers: + - {fileID: 7403072356416083929} + - {fileID: 7403072356416083928} + m_StartingMultipleGrabTransformers: + - {fileID: 7403072356416083929} + - {fileID: 7403072356416083928} + m_AddDefaultGrabTransformers: 0 +--- !u!114 &7403072356416083929 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7403072356416083904} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0a1302d0d134fa8a2a5b3bf4aec3c20, type: 3} + m_Name: + m_EditorClassIdentifier: + m_PermittedDisplacementAxes: 7 + m_ConstrainedAxisDisplacementMode: 1 + m_TwoHandedRotationMode: 1 + m_AllowOneHandedScaling: 0 + m_AllowTwoHandedScaling: 0 + m_OneHandedScaleSpeed: 0.5 + m_ThresholdMoveRatioForScale: 0.05 + m_ClampScaling: 1 + m_MinimumScaleRatio: 0.25 + m_MaximumScaleRatio: 2 + m_ScaleMultiplier: 0.25 +--- !u!114 &7403072356416083928 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7403072356416083904} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 24386a87b5e733943809081267792754, type: 3} + m_Name: + m_EditorClassIdentifier: + m_PermittedRotationAxis: 2 +--- !u!136 &820650513654450291 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7403072356416083904} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + m_Radius: 0.25 + m_Height: 4 + m_Direction: 0 + m_Center: {x: 0, y: 0, z: 0} +--- !u!1 &7403072356979171079 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7403072356979171078} + - component: {fileID: 7403072356979171075} + - component: {fileID: 7403072356979171076} + - component: {fileID: 7403072356979171077} + - component: {fileID: 7403072356979171074} + - component: {fileID: 3331925869084700775} + m_Layer: 0 + m_Name: Affordance + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7403072356979171078 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7403072356979171079} + 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: 3133794072027396999} + m_Father: {fileID: 7403072356416083930} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &7403072356979171075 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7403072356979171079} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 49e0a5b5ff5540f5b14dd29d46faec22, type: 3} + m_Name: + m_EditorClassIdentifier: + m_TransitionDuration: 0.125 + m_InteractableSource: {fileID: 7403072356416083935} + m_IgnoreHoverEvents: 0 + m_IgnoreHoverPriorityEvents: 1 + m_IgnoreFocusEvents: 1 + m_IgnoreSelectEvents: 0 + m_IgnoreActivateEvents: 0 + m_SelectClickAnimationMode: 1 + m_ActivateClickAnimationMode: 0 + m_ClickAnimationDuration: 0.25 + m_ClickAnimationCurve: + m_UseConstant: 1 + m_ConstantValue: + 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: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_Variable: {fileID: 0} +--- !u!114 &7403072356979171076 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7403072356979171079} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1410cbaaadf84a7aaa6459d37ad21b3a, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Renderer: {fileID: 7403072356348442413} + m_MaterialIndex: 1 +--- !u!114 &7403072356979171077 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7403072356979171079} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f86d13fca2ec430d870c0f7765ad0dde, type: 3} + m_Name: + m_EditorClassIdentifier: + m_AffordanceStateProvider: {fileID: 7403072356979171075} + m_ReplaceIdleStateValueWithInitialValue: 0 + m_AffordanceThemeDatum: + m_UseConstant: 0 + m_ConstantValue: + m_StateAnimationCurve: + m_UseConstant: 1 + m_ConstantValue: + 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: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_Variable: {fileID: 0} + m_List: + - stateName: disabled + animationStateStartValue: {r: 0, g: 0, b: 0, a: 0} + animationStateEndValue: {r: 0, g: 0, b: 0, a: 0} + - stateName: idle + animationStateStartValue: {r: 0, g: 0, b: 0, a: 0} + animationStateEndValue: {r: 0, g: 0, b: 0, a: 0} + - stateName: hovered + animationStateStartValue: {r: 0, g: 0, b: 0, a: 0} + animationStateEndValue: {r: 0, g: 0, b: 0, a: 0} + - stateName: hoveredPriority + animationStateStartValue: {r: 0, g: 0, b: 0, a: 0} + animationStateEndValue: {r: 0, g: 0, b: 0, a: 0} + - stateName: selected + animationStateStartValue: {r: 0, g: 0, b: 0, a: 0} + animationStateEndValue: {r: 0, g: 0, b: 0, a: 0} + - stateName: activated + animationStateStartValue: {r: 0, g: 0, b: 0, a: 0} + animationStateEndValue: {r: 0, g: 0, b: 0, a: 0} + - stateName: focused + animationStateStartValue: {r: 0, g: 0, b: 0, a: 0} + animationStateEndValue: {r: 0, g: 0, b: 0, a: 0} + m_ColorBlendMode: 0 + m_BlendAmount: 1 + m_Variable: {fileID: 11400000, guid: 6b0360f219436394b8519378cd55c7e3, type: 2} + m_ValueUpdated: + m_PersistentCalls: + m_Calls: [] + m_MaterialPropertyBlockHelper: {fileID: 7403072356979171076} + m_ColorPropertyName: _EdgeColor +--- !u!114 &7403072356979171074 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7403072356979171079} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 629ea686265f47f082ba5732cffad1cf, type: 3} + m_Name: + m_EditorClassIdentifier: + m_AffordanceStateProvider: {fileID: 7403072356979171075} + m_ReplaceIdleStateValueWithInitialValue: 0 + m_AffordanceThemeDatum: + m_UseConstant: 0 + m_ConstantValue: + m_StateAnimationCurve: + m_UseConstant: 1 + m_ConstantValue: + 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: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_Variable: {fileID: 0} + m_List: + - stateName: disabled + animationStateStartValue: 0 + animationStateEndValue: 0 + - stateName: idle + animationStateStartValue: 0 + animationStateEndValue: 0 + - stateName: hovered + animationStateStartValue: 0 + animationStateEndValue: 0 + - stateName: hoveredPriority + animationStateStartValue: 0 + animationStateEndValue: 0 + - stateName: selected + animationStateStartValue: 0 + animationStateEndValue: 0 + - stateName: activated + animationStateStartValue: 0 + animationStateEndValue: 0 + - stateName: focused + animationStateStartValue: 0 + animationStateEndValue: 0 + m_Variable: {fileID: 11400000, guid: 2d9d4878bfb037248af1d243a0638dd0, type: 2} + m_ValueUpdated: + m_PersistentCalls: + m_Calls: [] + m_MaterialPropertyBlockHelper: {fileID: 7403072356979171076} + m_FloatPropertyName: _Power +--- !u!114 &3331925869084700775 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7403072356979171079} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 27bee223346c63f4bb2b0f85250f58b7, type: 3} + m_Name: + m_EditorClassIdentifier: + m_AffordanceStateProvider: {fileID: 7403072356979171075} + m_ReplaceIdleStateValueWithInitialValue: 0 + m_AffordanceThemeDatum: + m_UseConstant: 0 + m_ConstantValue: + m_StateAnimationCurve: + m_UseConstant: 1 + m_ConstantValue: + 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: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_Variable: {fileID: 0} + m_List: + - stateName: disabled + animationStateStartValue: + x: 0 + y: 0 + z: 0 + animationStateEndValue: + x: 0 + y: 0 + z: 0 + - stateName: idle + animationStateStartValue: + x: 0 + y: 0 + z: 0 + animationStateEndValue: + x: 0 + y: 0 + z: 0 + - stateName: hovered + animationStateStartValue: + x: 0 + y: 0 + z: 0 + animationStateEndValue: + x: 0 + y: 0 + z: 0 + - stateName: hoveredPriority + animationStateStartValue: + x: 0 + y: 0 + z: 0 + animationStateEndValue: + x: 0 + y: 0 + z: 0 + - stateName: selected + animationStateStartValue: + x: 0 + y: 0 + z: 0 + animationStateEndValue: + x: 0 + y: 0 + z: 0 + - stateName: activated + animationStateStartValue: + x: 0 + y: 0 + z: 0 + animationStateEndValue: + x: 0 + y: 0 + z: 0 + - stateName: focused + animationStateStartValue: + x: 0 + y: 0 + z: 0 + animationStateEndValue: + x: 0 + y: 0 + z: 0 + m_Variable: {fileID: 11400000, guid: e5acc2ade2588d44fb53e968cd702099, type: 2} + m_ValueUpdated: + m_PersistentCalls: + m_Calls: [] + m_TargetTransform: {fileID: 7403072356348442415} +--- !u!1 &7403072357328242347 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7403072357328242346} + - component: {fileID: 7403072357328242341} + - component: {fileID: 7403072357328242342} + m_Layer: 0 + m_Name: Label + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7403072357328242346 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7403072357328242347} + 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: 1 + m_Children: + - {fileID: 7403072357429160174} + m_Father: {fileID: 7403072356416083930} + 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.811} + m_SizeDelta: {x: 165, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!223 &7403072357328242341 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7403072357328242347} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 2 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_AdditionalShaderChannelsFlag: 25 + m_SortingLayerID: 0 + m_SortingOrder: 1 + m_TargetDisplay: 0 +--- !u!114 &7403072357328242342 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7403072357328242347} + 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!1 &7403072357429160175 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7403072357429160174} + - component: {fileID: 7403072357429160172} + - component: {fileID: 7403072357429160173} + m_Layer: 0 + m_Name: Title + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7403072357429160174 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7403072357429160175} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -0.0000019284} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7403072357328242346} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: -0, y: 0} + m_SizeDelta: {x: 165, y: 100} + m_Pivot: {x: 0, y: 1} +--- !u!222 &7403072357429160172 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7403072357429160175} + m_CullTransparentMesh: 1 +--- !u!114 &7403072357429160173 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7403072357429160175} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.92156863, g: 0.9490196, 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_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 24 + m_FontStyle: 1 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Table Handle +--- !u!1 &7403072357431632354 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7403072357431632353} + - component: {fileID: 7403072357431632352} + m_Layer: 0 + m_Name: TableOffset + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7403072357431632353 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7403072357431632354} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: -13, z: -3.8400004} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 7403072356416083930} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &7403072357431632352 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7403072357431632354} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f22671673eaaae848b70290eb3a1350c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_TargetTransform: {fileID: 0} + m_SmoothFollowSpeed: 0 diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Prefabs/TableHandle.prefab.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Prefabs/TableHandle.prefab.meta new file mode 100644 index 0000000..c53deea --- /dev/null +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Prefabs/TableHandle.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: ed5fdb8d3e523e94ca6d8a239d40615a +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/HandsDemoSceneAssets/Prefabs/UI.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Prefabs/UI.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/HandsDemoSceneAssets/Prefabs/UI.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Prefabs/UI.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Prefabs/Hand Menu Setup With ScrollView Variant.prefab b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Prefabs/UI/Hand Menu Setup With ScrollView Variant.prefab similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Prefabs/Hand Menu Setup With ScrollView Variant.prefab rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Prefabs/UI/Hand Menu Setup With ScrollView Variant.prefab diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Prefabs/Hand Menu Setup With ScrollView Variant.prefab.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Prefabs/UI/Hand Menu Setup With ScrollView Variant.prefab.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Prefabs/Hand Menu Setup With ScrollView Variant.prefab.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Prefabs/UI/Hand Menu Setup With ScrollView Variant.prefab.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Prefabs/Hand Menu With Button Activation.prefab b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Prefabs/UI/Hand Menu With Button Activation.prefab similarity index 87% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Prefabs/Hand Menu With Button Activation.prefab rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Prefabs/UI/Hand Menu With Button Activation.prefab index 6c957a1..140c507 100644 --- a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Prefabs/Hand Menu With Button Activation.prefab +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Prefabs/UI/Hand Menu With Button Activation.prefab @@ -231,7 +231,7 @@ MonoBehaviour: m_MaxFollowDistance: 0.03 m_MinToMaxDelaySeconds: 1 m_HideMenuWhenGazeDiverges: 1 - m_MenuVisibleGazeAngleDivergenceThreshold: 35 + m_MenuVisibleGazeAngleDivergenceThreshold: 30 m_AnimateMenuHideAndReveal: 1 m_RevealHideAnimationDuration: 0.1 m_HandTrackingFollowPreset: @@ -388,10 +388,10 @@ MonoBehaviour: m_PositionInput: m_UseReference: 1 m_Action: - m_Name: Position Input + m_Name: m_Type: 0 - m_ExpectedControlType: Vector3 - m_Id: 8eca31ce-af94-4489-93af-98c8dd23d3d5 + m_ExpectedControlType: + m_Id: m_Processors: m_Interactions: m_SingletonActionBindings: [] @@ -400,10 +400,10 @@ MonoBehaviour: m_RotationInput: m_UseReference: 1 m_Action: - m_Name: Rotation Input + m_Name: m_Type: 0 - m_ExpectedControlType: Quaternion - m_Id: 8683248d-dc08-4118-bced-10787ad11fb2 + m_ExpectedControlType: + m_Id: m_Processors: m_Interactions: m_SingletonActionBindings: [] @@ -439,7 +439,6 @@ MonoBehaviour: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 - m_HasMigratedActions: 1 --- !u!1 &3977197974065273168 GameObject: m_ObjectHideFlags: 0 @@ -706,7 +705,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_Sprite: {fileID: 21300000, guid: e45f8f823c093d941855bb23b53b9414, type: 3} - m_Type: 1 + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -754,7 +753,7 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5030734265712111729} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 25} + m_LocalPosition: {x: 0, y: 0, z: 20} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -831,8 +830,8 @@ RectTransform: m_GameObject: {fileID: 5030734266349821021} 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_LocalScale: {x: 0.1, y: 0.1, z: 0.1} + m_ConstrainProportionsScale: 1 m_Children: [] m_Father: {fileID: 5030734265454020860} m_RootOrder: 0 @@ -872,16 +871,16 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 20 - m_FontStyle: 1 + m_FontSize: 256 + m_FontStyle: 0 m_BestFit: 0 m_MinSize: 1 - m_MaxSize: 40 + m_MaxSize: 256 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: Menu --- !u!1 &5030734266366949667 @@ -912,9 +911,9 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5030734266366949667} m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.00062500004, y: 0.00062500004, z: 0.00062500004} - m_ConstrainProportionsScale: 0 + m_LocalPosition: {x: 0, y: 0, z: -0} + m_LocalScale: {x: 0.00046875, y: 0.00046875, z: 0.00046875} + m_ConstrainProportionsScale: 1 m_Children: - {fileID: 5030734265712111734} - {fileID: 5030734266792631115} @@ -923,7 +922,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 90, 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_AnchoredPosition: {x: 0, y: -0.01} m_SizeDelta: {x: 90, y: 90} m_Pivot: {x: 0.5, y: 0.5} --- !u!223 &5030734266366949668 @@ -1020,6 +1019,7 @@ GameObject: - component: {fileID: 5030734266792631113} - component: {fileID: 5030734266792631112} - component: {fileID: 5030734266792631116} + - component: {fileID: 5426094921606689094} m_Layer: 5 m_Name: Text Button m_TagString: Untagged @@ -1035,11 +1035,12 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5030734266792631114} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 25} + m_LocalPosition: {x: 0, y: 0, z: 20} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 5030734265454020860} + - {fileID: 8450376734766142520} m_Father: {fileID: 5030734266366949664} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1077,11 +1078,11 @@ MonoBehaviour: m_SelectOnRight: {fileID: 0} m_Transition: 1 m_Colors: - m_NormalColor: {r: 0.1254902, g: 0.5882353, b: 0.9529412, a: 1} - m_HighlightedColor: {r: 0.09411765, g: 0.4392157, b: 0.7137255, a: 1} - m_PressedColor: {r: 0.9647059, g: 0.71714544, b: 0.34509805, a: 1} - m_SelectedColor: {r: 0.1254902, g: 0.5882353, b: 0.9529412, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_NormalColor: {r: 0.1254902, g: 0.5882353, b: 0.95294124, a: 1} + m_HighlightedColor: {r: 0.09411766, g: 0.43921572, b: 0.7137255, a: 1} + m_PressedColor: {r: 0.34509805, g: 0.6901961, b: 0.96470594, a: 1} + m_SelectedColor: {r: 0.1254902, g: 0.5882353, b: 0.95294124, a: 1} + m_DisabledColor: {r: 0.7843138, g: 0.7843138, b: 0.7843138, a: 0.5019608} m_ColorMultiplier: 1 m_FadeDuration: 0.1 m_SpriteState: @@ -1175,6 +1176,103 @@ MonoBehaviour: m_EditorClassIdentifier: m_ActivationGameObject: {fileID: 1571819876068155739} m_CurrentlyActive: 0 +--- !u!114 &5426094921606689094 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5030734266792631114} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0b148fe25e99eb48b9724523833bab1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Delegates: + - eventID: 0 + callback: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 6267208404447482002} + m_TargetAssemblyTypeName: UnityEngine.AudioSource, UnityEngine + m_MethodName: set_pitch + m_Mode: 4 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 2 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - m_Target: {fileID: 6267208404447482002} + m_TargetAssemblyTypeName: UnityEngine.AudioSource, UnityEngine + m_MethodName: PlayOneShot + m_Mode: 2 + m_Arguments: + m_ObjectArgument: {fileID: 8300000, guid: 9a6d738025ed59f4fb946bb59c20e774, type: 3} + m_ObjectArgumentAssemblyTypeName: UnityEngine.AudioClip, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - eventID: 4 + callback: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 6267208404447482002} + m_TargetAssemblyTypeName: UnityEngine.AudioSource, UnityEngine + m_MethodName: set_pitch + m_Mode: 4 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 2 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - m_Target: {fileID: 6267208404447482002} + m_TargetAssemblyTypeName: UnityEngine.AudioSource, UnityEngine + m_MethodName: PlayOneShot + m_Mode: 2 + m_Arguments: + m_ObjectArgument: {fileID: 8300000, guid: eeeda5dce5e1d344f8e2f6195f16cb38, type: 3} + m_ObjectArgumentAssemblyTypeName: UnityEngine.AudioClip, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - eventID: 2 + callback: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 6267208404447482002} + m_TargetAssemblyTypeName: UnityEngine.AudioSource, UnityEngine + m_MethodName: set_pitch + m_Mode: 4 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 3 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - m_Target: {fileID: 6267208404447482002} + m_TargetAssemblyTypeName: UnityEngine.AudioSource, UnityEngine + m_MethodName: PlayOneShot + m_Mode: 2 + m_Arguments: + m_ObjectArgument: {fileID: 8300000, guid: eeeda5dce5e1d344f8e2f6195f16cb38, type: 3} + m_ObjectArgumentAssemblyTypeName: UnityEngine.AudioClip, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!1 &5030734267259534324 GameObject: m_ObjectHideFlags: 0 @@ -1260,10 +1358,10 @@ MonoBehaviour: m_PositionInput: m_UseReference: 1 m_Action: - m_Name: Position Input + m_Name: m_Type: 0 - m_ExpectedControlType: Vector3 - m_Id: 8eca31ce-af94-4489-93af-98c8dd23d3d5 + m_ExpectedControlType: + m_Id: m_Processors: m_Interactions: m_SingletonActionBindings: [] @@ -1272,10 +1370,10 @@ MonoBehaviour: m_RotationInput: m_UseReference: 1 m_Action: - m_Name: Rotation Input + m_Name: m_Type: 0 - m_ExpectedControlType: Quaternion - m_Id: 8683248d-dc08-4118-bced-10787ad11fb2 + m_ExpectedControlType: + m_Id: m_Processors: m_Interactions: m_SingletonActionBindings: [] @@ -1311,7 +1409,139 @@ MonoBehaviour: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 - m_HasMigratedActions: 1 +--- !u!1 &7016142335816606385 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8450376734766142520} + - component: {fileID: 6267208404447482002} + m_Layer: 5 + m_Name: Audio + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8450376734766142520 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7016142335816606385} + 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: 1 + m_Children: [] + m_Father: {fileID: 5030734266792631115} + 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} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!82 &6267208404447482002 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7016142335816606385} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 0} + m_PlayOnAwake: 0 + m_Volume: 1 + m_Pitch: 2 + Loop: 0 + Mute: 0 + Spatialize: 0 + 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.75 + 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 &7632328176030769678 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Prefabs/Hand Menu With Button Activation.prefab.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Prefabs/UI/Hand Menu With Button Activation.prefab.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Prefabs/Hand Menu With Button Activation.prefab.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Prefabs/UI/Hand Menu With Button Activation.prefab.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/HandsDemoSceneAssets/Prefabs/UI/Scroll View Item.prefab b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Prefabs/UI/Scroll View Item.prefab similarity index 99% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/HandsDemoSceneAssets/Prefabs/UI/Scroll View Item.prefab rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Prefabs/UI/Scroll View Item.prefab index 9c92c39..3f602bd 100644 --- a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/HandsDemoSceneAssets/Prefabs/UI/Scroll View Item.prefab +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Prefabs/UI/Scroll View Item.prefab @@ -31,7 +31,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 747562692447532203} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} @@ -59,7 +59,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.89411765, g: 0.89411765, b: 0.89411765, a: 1} + m_Color: {r: 0.92156863, g: 0.9490196, b: 1, a: 1} m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -111,9 +111,9 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 4418427761969027155} - {fileID: 4843924787467235425} - {fileID: 747562692158060085} - - {fileID: 4418427761969027155} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -173,7 +173,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Navigation: - m_Mode: 3 + m_Mode: 0 m_WrapAround: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} @@ -239,7 +239,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 747562692447532203} - m_RootOrder: 2 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -315,7 +315,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 747562692447532203} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/HandsDemoSceneAssets/Prefabs/UI/Scroll View Item.prefab.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Prefabs/UI/Scroll View Item.prefab.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/HandsDemoSceneAssets/Prefabs/UI/Scroll View Item.prefab.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Prefabs/UI/Scroll View Item.prefab.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/HandsDemoSceneAssets/Prefabs/UI/Scroll View.prefab b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Prefabs/UI/Scroll View.prefab similarity index 97% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/HandsDemoSceneAssets/Prefabs/UI/Scroll View.prefab rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Prefabs/UI/Scroll View.prefab index d97bcf1..61777b3 100644 --- a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/HandsDemoSceneAssets/Prefabs/UI/Scroll View.prefab +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Prefabs/UI/Scroll View.prefab @@ -92,7 +92,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Navigation: - m_Mode: 3 + m_Mode: 0 m_WrapAround: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} @@ -122,7 +122,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 6183026900792136173} m_HandleRect: {fileID: 6183026902669923109} m_Direction: 2 - m_Value: 0.9999998 + m_Value: 0.9999995 m_Size: 0.3590604 m_NumberOfSteps: 0 m_OnValueChanged: @@ -414,14 +414,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.89411765, g: 0.89411765, b: 0.89411765, a: 1} + m_Color: {r: 0.92156863, g: 0.9490196, 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_Sprite: {fileID: 21300000, guid: 0b562dd0a8294f54a87c02b70b052759, type: 3} + m_Sprite: {fileID: 0} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -784,6 +784,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 4843924787302882066, guid: 6ef6ed42ad21b2e44bf9d63455bfebd9, type: 3} + propertyPath: m_Group + value: + objectReference: {fileID: 6183026902371939688} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 6ef6ed42ad21b2e44bf9d63455bfebd9, type: 3} --- !u!224 &575213516256852194 stripped @@ -890,6 +894,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 4843924787302882066, guid: 6ef6ed42ad21b2e44bf9d63455bfebd9, type: 3} + propertyPath: m_Group + value: + objectReference: {fileID: 6183026902371939688} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 6ef6ed42ad21b2e44bf9d63455bfebd9, type: 3} --- !u!224 &3318402603881556472 stripped @@ -996,6 +1004,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 4843924787302882066, guid: 6ef6ed42ad21b2e44bf9d63455bfebd9, type: 3} + propertyPath: m_Group + value: + objectReference: {fileID: 6183026902371939688} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 6ef6ed42ad21b2e44bf9d63455bfebd9, type: 3} --- !u!224 &2459597453263534125 stripped @@ -1102,6 +1114,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 4843924787302882066, guid: 6ef6ed42ad21b2e44bf9d63455bfebd9, type: 3} + propertyPath: m_Group + value: + objectReference: {fileID: 6183026902371939688} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 6ef6ed42ad21b2e44bf9d63455bfebd9, type: 3} --- !u!224 &4545177384989293878 stripped @@ -1208,6 +1224,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 4843924787302882066, guid: 6ef6ed42ad21b2e44bf9d63455bfebd9, type: 3} + propertyPath: m_Group + value: + objectReference: {fileID: 6183026902371939688} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 6ef6ed42ad21b2e44bf9d63455bfebd9, type: 3} --- !u!224 &6371800052681497148 stripped @@ -1314,6 +1334,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 4843924787302882066, guid: 6ef6ed42ad21b2e44bf9d63455bfebd9, type: 3} + propertyPath: m_Group + value: + objectReference: {fileID: 6183026902371939688} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 6ef6ed42ad21b2e44bf9d63455bfebd9, type: 3} --- !u!224 &6081796599383575975 stripped @@ -1526,6 +1550,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 4843924787302882066, guid: 6ef6ed42ad21b2e44bf9d63455bfebd9, type: 3} + propertyPath: m_Group + value: + objectReference: {fileID: 6183026902371939688} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 6ef6ed42ad21b2e44bf9d63455bfebd9, type: 3} --- !u!224 &7050254453680010381 stripped @@ -1632,6 +1660,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 4843924787302882066, guid: 6ef6ed42ad21b2e44bf9d63455bfebd9, type: 3} + propertyPath: m_Group + value: + objectReference: {fileID: 6183026902371939688} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 6ef6ed42ad21b2e44bf9d63455bfebd9, type: 3} --- !u!224 &8774576546710604735 stripped diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/HandsDemoSceneAssets/Prefabs/UI/Scroll View.prefab.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Prefabs/UI/Scroll View.prefab.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/HandsDemoSceneAssets/Prefabs/UI/Scroll View.prefab.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Prefabs/UI/Scroll View.prefab.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/HandsDemoSceneAssets/Prefabs/UI/TouchPad Button.prefab b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Prefabs/UI/TouchPad Button.prefab similarity index 57% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/HandsDemoSceneAssets/Prefabs/UI/TouchPad Button.prefab rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Prefabs/UI/TouchPad Button.prefab index dad4d62..b83356d 100644 --- a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/HandsDemoSceneAssets/Prefabs/UI/TouchPad Button.prefab +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Prefabs/UI/TouchPad Button.prefab @@ -1,5 +1,138 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &4325697754847085445 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4550097850330393526} + - component: {fileID: 3245942183117002936} + m_Layer: 5 + m_Name: Audio + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4550097850330393526 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4325697754847085445} + 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: 1 + m_Children: [] + m_Father: {fileID: 4455438662752596672} + 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} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!82 &3245942183117002936 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4325697754847085445} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 0} + m_PlayOnAwake: 0 + m_Volume: 1 + m_Pitch: 2 + Loop: 0 + Mute: 0 + Spatialize: 0 + 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.75 + 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 &4455438662752596673 GameObject: m_ObjectHideFlags: 0 @@ -13,6 +146,7 @@ GameObject: - component: {fileID: 4455438662752596683} - component: {fileID: 7566063986779765728} - component: {fileID: 6843260260195551652} + - component: {fileID: 2428494541859028798} m_Layer: 5 m_Name: TouchPad Button m_TagString: Untagged @@ -33,6 +167,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 7991839960969920021} + - {fileID: 4550097850330393526} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -141,6 +276,103 @@ MonoBehaviour: m_ApplyIfChildIsTarget: 1 m_ClampToMaxDistance: 1 m_MaxDistance: 20 +--- !u!114 &2428494541859028798 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4455438662752596673} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0b148fe25e99eb48b9724523833bab1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Delegates: + - eventID: 0 + callback: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 3245942183117002936} + m_TargetAssemblyTypeName: UnityEngine.AudioSource, UnityEngine + m_MethodName: set_pitch + m_Mode: 4 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 2 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - m_Target: {fileID: 3245942183117002936} + m_TargetAssemblyTypeName: UnityEngine.AudioSource, UnityEngine + m_MethodName: PlayOneShot + m_Mode: 2 + m_Arguments: + m_ObjectArgument: {fileID: 8300000, guid: 9a6d738025ed59f4fb946bb59c20e774, type: 3} + m_ObjectArgumentAssemblyTypeName: UnityEngine.AudioClip, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - eventID: 4 + callback: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 3245942183117002936} + m_TargetAssemblyTypeName: UnityEngine.AudioSource, UnityEngine + m_MethodName: set_pitch + m_Mode: 4 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 2 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - m_Target: {fileID: 3245942183117002936} + m_TargetAssemblyTypeName: UnityEngine.AudioSource, UnityEngine + m_MethodName: PlayOneShot + m_Mode: 2 + m_Arguments: + m_ObjectArgument: {fileID: 8300000, guid: eeeda5dce5e1d344f8e2f6195f16cb38, type: 3} + m_ObjectArgumentAssemblyTypeName: UnityEngine.AudioClip, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - eventID: 2 + callback: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 3245942183117002936} + m_TargetAssemblyTypeName: UnityEngine.AudioSource, UnityEngine + m_MethodName: set_pitch + m_Mode: 4 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 3 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + - m_Target: {fileID: 3245942183117002936} + m_TargetAssemblyTypeName: UnityEngine.AudioSource, UnityEngine + m_MethodName: PlayOneShot + m_Mode: 2 + m_Arguments: + m_ObjectArgument: {fileID: 8300000, guid: eeeda5dce5e1d344f8e2f6195f16cb38, type: 3} + m_ObjectArgumentAssemblyTypeName: UnityEngine.AudioClip, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!1 &4455438663099779003 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/HandsDemoSceneAssets/Prefabs/UI/TouchPad Button.prefab.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Prefabs/UI/TouchPad Button.prefab.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/HandsDemoSceneAssets/Prefabs/UI/TouchPad Button.prefab.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Prefabs/UI/TouchPad Button.prefab.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Scripts.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Scripts.meta similarity index 77% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Scripts.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Scripts.meta index 750e5b6..b5bdd94 100644 --- a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Scripts.meta +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Scripts.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 011f1dde423d40d47ba3e024678fc7b1 +guid: 7a569e7260117d1418a7faa6fd6fda2c folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Scripts/GrabTransformerRotationAxisLock.cs b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Scripts/GrabTransformerRotationAxisLock.cs new file mode 100644 index 0000000..11d699a --- /dev/null +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Scripts/GrabTransformerRotationAxisLock.cs @@ -0,0 +1,44 @@ +using UnityEngine.XR.Interaction.Toolkit.Transformers; + +namespace UnityEngine.XR.Interaction.Toolkit.Samples.Hands +{ + /// + /// An XR grab transformer that allows for the locking of specific rotation axes. When an object is grabbed and manipulated, + /// this class ensures that rotations are only applied to the specified axes, preserving the initial rotation for the others. + /// + public class GrabTransformerRotationAxisLock : XRBaseGrabTransformer + { + [SerializeField] + [Tooltip("Defines which rotation axes are allowed when an object is grabbed. Axes not selected will maintain their initial rotation.")] + XRGeneralGrabTransformer.ManipulationAxes m_PermittedRotationAxis = XRGeneralGrabTransformer.ManipulationAxes.All; + + /// + protected override RegistrationMode registrationMode => RegistrationMode.SingleAndMultiple; + + Vector3 m_InitialEulerRotation; + + /// + public override void OnLink(XRGrabInteractable grabInteractable) + { + base.OnLink(grabInteractable); + m_InitialEulerRotation = grabInteractable.transform.rotation.eulerAngles; + } + + /// + public override void Process(XRGrabInteractable grabInteractable, XRInteractionUpdateOrder.UpdatePhase updatePhase, ref Pose targetPose, ref Vector3 localScale) + { + Vector3 newRotationEuler = targetPose.rotation.eulerAngles; + + if ((m_PermittedRotationAxis & XRGeneralGrabTransformer.ManipulationAxes.X) == 0) + newRotationEuler.x = m_InitialEulerRotation.x; + + if ((m_PermittedRotationAxis & XRGeneralGrabTransformer.ManipulationAxes.Y) == 0) + newRotationEuler.y = m_InitialEulerRotation.y; + + if ((m_PermittedRotationAxis & XRGeneralGrabTransformer.ManipulationAxes.Z) == 0) + newRotationEuler.z = m_InitialEulerRotation.z; + + targetPose.rotation = Quaternion.Euler(newRotationEuler); + } + } +} diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Scripts/GrabTransformerRotationAxisLock.cs.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Scripts/GrabTransformerRotationAxisLock.cs.meta new file mode 100644 index 0000000..bbb7e60 --- /dev/null +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Scripts/GrabTransformerRotationAxisLock.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 24386a87b5e733943809081267792754 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/HandsDemoSceneAssets/Scripts/ObjectResetPlane.cs b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Scripts/ObjectResetPlane.cs similarity index 71% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/HandsDemoSceneAssets/Scripts/ObjectResetPlane.cs rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Scripts/ObjectResetPlane.cs index 86bc488..89ee3f3 100644 --- a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/HandsDemoSceneAssets/Scripts/ObjectResetPlane.cs +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Scripts/ObjectResetPlane.cs @@ -15,6 +15,10 @@ namespace UnityEngine.XR.Interaction.Toolkit.Samples.Hands [Tooltip("How often to check if objects should be reset.")] float m_CheckDuration = 2f; + [SerializeField] + [Tooltip("The object root used to compute local positions relative to. Objects will respawn relative to their position in this transform's hierarchy.")] + Transform m_ObjectRoot = null; + readonly List m_OriginalPositions = new List(); float m_CheckTimer; @@ -28,7 +32,12 @@ namespace UnityEngine.XR.Interaction.Toolkit.Samples.Hands { if (currentTransform != null) { - m_OriginalPositions.Add(new Pose(currentTransform.position, currentTransform.rotation)); + var position = currentTransform.position; + + if (m_ObjectRoot != null) + position = m_ObjectRoot.InverseTransformPoint(currentTransform.position); + + m_OriginalPositions.Add(new Pose(position, currentTransform.rotation)); } else { @@ -60,7 +69,11 @@ namespace UnityEngine.XR.Interaction.Toolkit.Samples.Hands if (currentTransform.position.y < resetPlane) { - currentTransform.SetPositionAndRotation(m_OriginalPositions[transformIndex].position, m_OriginalPositions[transformIndex].rotation); + var originalWorldPosition = m_OriginalPositions[transformIndex].position; + if (m_ObjectRoot != null) + originalWorldPosition = m_ObjectRoot.TransformPoint(originalWorldPosition); + + currentTransform.SetPositionAndRotation(originalWorldPosition, m_OriginalPositions[transformIndex].rotation); var rigidBody = currentTransform.GetComponentInChildren(); if (rigidBody != null) diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/HandsDemoSceneAssets/Scripts/ObjectResetPlane.cs.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Scripts/ObjectResetPlane.cs.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/HandsDemoSceneAssets/Scripts/ObjectResetPlane.cs.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Scripts/ObjectResetPlane.cs.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Scripts/PokeBlendShapeAnimator.cs b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Scripts/PokeBlendShapeAnimator.cs new file mode 100644 index 0000000..877775a --- /dev/null +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Scripts/PokeBlendShapeAnimator.cs @@ -0,0 +1,104 @@ +using Unity.XR.CoreUtils.Bindings; +using UnityEngine.XR.Interaction.Toolkit.AffordanceSystem.State; +using UnityEngine.XR.Interaction.Toolkit.Filtering; +using UnityEngine.XR.Interaction.Toolkit.Utilities.Tweenables.Primitives; + +namespace UnityEngine.XR.Interaction.Toolkit.Samples.Hands +{ + /// + /// Animates a blend shape on a SkinnedMeshRenderer based on the interaction strength of a poke. + /// + public class PokeBlendShapeAnimator : MonoBehaviour + { + [SerializeField] + [Tooltip("The PokeFilter to use to determine the interaction strength.")] + XRPokeFilter m_PokeFilter; + + [SerializeField] + [Tooltip("The SkinnedMeshRenderer to animate.")] + SkinnedMeshRenderer m_SkinnedMeshRenderer; + + [SerializeField] + [Tooltip("The index of the blend shape to animate.")] + int m_BlendShapeIndex; + + [SerializeField] + [Tooltip("The minimum blend shape value.")] + float m_BlendShapeMin; + + [SerializeField] + [Tooltip("The maximum blend shape value.")] + float m_BlendShapeMax = 100f; + + readonly BindingsGroup m_BindingsGroup = new BindingsGroup(); + + IXRHoverInteractable m_HoverInteractable; + IXRInteractionStrengthInteractable m_InteractionStrengthInteractable; + readonly FloatTweenableVariable m_TweenableVariable = new FloatTweenableVariable(); + + float m_TweenTarget; + + /// + /// See . + /// + void OnEnable() + { + if (m_PokeFilter == null || m_SkinnedMeshRenderer == null) + { + enabled = false; + return; + } + + m_HoverInteractable = m_PokeFilter.GetComponent(); + m_InteractionStrengthInteractable = m_PokeFilter.GetComponent(); + + m_BindingsGroup.AddBinding(m_PokeFilter.pokeStateData.Subscribe(data => + { + var blendShapeValue = Mathf.Lerp(m_BlendShapeMin, m_BlendShapeMax, data.interactionStrength); + m_TweenTarget = blendShapeValue; + })); + + m_BindingsGroup.AddBinding(m_TweenableVariable.SubscribeAndUpdate(newValue => + { + m_SkinnedMeshRenderer.SetBlendShapeWeight(m_BlendShapeIndex, newValue); + })); + } + + /// + /// See . + /// + void OnDisable() + { + m_BindingsGroup.Clear(); + } + + /// + /// See . + /// + void Update() + { + m_TweenableVariable.HandleTween(Time.deltaTime * 16f); + if (m_HoverInteractable.interactorsHovering.Count == 0) + return; + + var pokeInteractorStrength = 0f; + var largestNonPokeInteractorStrength = 0f; + for (var index = 0; index < m_HoverInteractable.interactorsHovering.Count; ++index) + { + var interactor = m_HoverInteractable.interactorsHovering[index]; + var interactionStrength = m_InteractionStrengthInteractable.GetInteractionStrength(interactor); + var isPokeProvider = interactor is IPokeStateDataProvider; + if (isPokeProvider) + { + pokeInteractorStrength = interactionStrength; + } + else + { + largestNonPokeInteractorStrength = Mathf.Max(largestNonPokeInteractorStrength, interactionStrength); + } + } + + m_TweenableVariable.target = pokeInteractorStrength > largestNonPokeInteractorStrength ? m_TweenTarget : 0f; + } + } +} diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Scripts/PokeBlendShapeAnimator.cs.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Scripts/PokeBlendShapeAnimator.cs.meta new file mode 100644 index 0000000..e160a29 --- /dev/null +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Scripts/PokeBlendShapeAnimator.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 78373ff495dc8234887e0cbdc7140022 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/HandsDemoSceneAssets/Scripts/ToggleGameObject.cs b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Scripts/ToggleGameObject.cs similarity index 54% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/HandsDemoSceneAssets/Scripts/ToggleGameObject.cs rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Scripts/ToggleGameObject.cs index 41250a0..25ec305 100644 --- a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/HandsDemoSceneAssets/Scripts/ToggleGameObject.cs +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Scripts/ToggleGameObject.cs @@ -1,12 +1,17 @@ -using UnityEngine; - -namespace UnityEngine.XR.Interaction.Toolkit.Samples +namespace UnityEngine.XR.Interaction.Toolkit.Samples.Hands { + /// + /// Toggles the active state of a GameObject. + /// public class ToggleGameObject : MonoBehaviour { [SerializeField] + [Tooltip("The GameObject to toggle the active state for.")] GameObject m_ActivationGameObject; + /// + /// The GameObject to toggle the active state for. + /// public GameObject activationGameObject { get => m_ActivationGameObject; @@ -14,8 +19,12 @@ namespace UnityEngine.XR.Interaction.Toolkit.Samples } [SerializeField] - bool m_CurrentlyActive = false; - + [Tooltip("Whether the GameObject is currently active.")] + bool m_CurrentlyActive; + + /// + /// Whether the GameObject is currently active. + /// public bool currentlyActive { get => m_CurrentlyActive; @@ -26,6 +35,9 @@ namespace UnityEngine.XR.Interaction.Toolkit.Samples } } + /// + /// Toggles the active state of the GameObject. + /// public void ToggleActiveState() { m_CurrentlyActive = !m_CurrentlyActive; diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/HandsDemoSceneAssets/Scripts/ToggleGameObject.cs.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Scripts/ToggleGameObject.cs.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/HandsDemoSceneAssets/Scripts/ToggleGameObject.cs.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Scripts/ToggleGameObject.cs.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Scripts/ToggleGraphicToggler.cs b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Scripts/ToggleGraphicToggler.cs new file mode 100644 index 0000000..7096bcf --- /dev/null +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Scripts/ToggleGraphicToggler.cs @@ -0,0 +1,55 @@ +using UnityEngine.UI; + +namespace UnityEngine.XR.Interaction.Toolkit.Samples.Hands +{ + /// + /// Toggles between two graphic objects based on the state of a toggle. + /// + [RequireComponent(typeof(Toggle))] + public class ToggleGraphicToggler : MonoBehaviour + { + [SerializeField] + [Tooltip("Graphic object representing the toggle on position.")] + Graphic m_ToggleOnGraphic; + + [SerializeField] + [Tooltip("Graphic object representing the toggle off position.")] + Graphic m_ToggleOffGraphic; + + Toggle m_TargetToggle; + + /// + /// See . + /// + void Awake() + { + m_TargetToggle = GetComponent(); + } + + /// + /// See . + /// + void OnEnable() + { + m_TargetToggle.onValueChanged.AddListener(OnToggleValueChanged); + } + + /// + /// See . + /// + void OnDisable() + { + m_TargetToggle.onValueChanged.RemoveListener(OnToggleValueChanged); + } + + void OnToggleValueChanged(bool isOn) + { + if (isOn) + m_TargetToggle.targetGraphic = m_ToggleOnGraphic; + else + m_TargetToggle.targetGraphic = m_ToggleOffGraphic; + + m_ToggleOnGraphic.gameObject.SetActive(isOn); + } + } +} diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Scripts/ToggleGraphicToggler.cs.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Scripts/ToggleGraphicToggler.cs.meta new file mode 100644 index 0000000..7eec9a8 --- /dev/null +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Scripts/ToggleGraphicToggler.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: d3cd1891521c8e143a04e7fd344a64d5 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Scripts/TransformSync.cs b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Scripts/TransformSync.cs new file mode 100644 index 0000000..2d647bc --- /dev/null +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Scripts/TransformSync.cs @@ -0,0 +1,101 @@ +using System; +using UnityEngine.XR.Interaction.Toolkit.Utilities.Tweenables.Primitives; + +namespace UnityEngine.XR.Interaction.Toolkit.Samples.Hands +{ + /// + /// Class used to sync the transform of a target game object with this one. + /// + public class TransformSync : MonoBehaviour + { + [SerializeField] + [Tooltip("Transform to apply this transform's data to.")] + Transform m_TargetTransform; + + [SerializeField] + [Range(0f, 30f)] + [Tooltip("Set to 0 for no smoothing. Higher values indicate more smoothing.")] + float m_SmoothFollowSpeed = 8f; + + Rigidbody m_Rigidbody; + + bool m_HasTransform; + bool m_HasRigidbody; + + Transform m_ThisTransform; + + readonly Vector3TweenableVariable m_PositionTweenable = new Vector3TweenableVariable(); + readonly QuaternionTweenableVariable m_RotationTweenable = new QuaternionTweenableVariable(); + + /// + /// See . + /// + void OnValidate() + { + if (m_TargetTransform != null) + { + transform.localPosition = transform.parent == null + ? m_TargetTransform.position + : transform.parent.InverseTransformPoint(m_TargetTransform.position); + } + } + + /// + /// See . + /// + void Awake() + { + m_ThisTransform = transform; + } + + /// + /// See . + /// + void OnEnable() + { + if (m_TargetTransform == null) + { + enabled = false; + return; + } + m_HasTransform = true; + + if (m_TargetTransform.TryGetComponent(out Rigidbody rigidBodyComponent)) + { + m_Rigidbody = rigidBodyComponent; + m_HasRigidbody = true; + } + + m_PositionTweenable.Value = m_ThisTransform.position; + m_RotationTweenable.Value = m_ThisTransform.rotation; + } + + /// + /// See . + /// + void Update() + { + m_PositionTweenable.target = m_ThisTransform.position; + m_RotationTweenable.target = m_ThisTransform.rotation; + + var tweenTarget = m_SmoothFollowSpeed > 0f ? m_SmoothFollowSpeed * Time.deltaTime : 1f; + m_PositionTweenable.HandleTween(tweenTarget); + m_RotationTweenable.HandleTween(tweenTarget); + + if (!m_HasRigidbody && m_HasTransform) + m_TargetTransform.SetPositionAndRotation(m_PositionTweenable.Value, m_RotationTweenable.Value); + } + + /// + /// See . + /// + void FixedUpdate() + { + if (!m_HasRigidbody) + return; + + m_Rigidbody.MovePosition(m_PositionTweenable.Value); + m_Rigidbody.MoveRotation(m_RotationTweenable.Value); + } + } +} diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Scripts/TransformSync.cs.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Scripts/TransformSync.cs.meta new file mode 100644 index 0000000..d55db4c --- /dev/null +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Scripts/TransformSync.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: f22671673eaaae848b70290eb3a1350c +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Scripts/Vector3ScaleAffordanceReceiver.cs b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Scripts/Vector3ScaleAffordanceReceiver.cs new file mode 100644 index 0000000..127ab21 --- /dev/null +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Scripts/Vector3ScaleAffordanceReceiver.cs @@ -0,0 +1,31 @@ +using Unity.Mathematics; +using UnityEngine.XR.Interaction.Toolkit.AffordanceSystem.Receiver.Primitives; + +namespace UnityEngine.XR.Interaction.Toolkit.Samples.Hands +{ + /// + /// Affordance receiver applying a Vector3 (Float3) affordance theme to a Transform local scale. + /// Broadcasts new affordance value with Unity Event. + /// + public class Vector3ScaleAffordanceReceiver : Vector3AffordanceReceiver + { + [SerializeField] + [Tooltip("The transform to apply the scale value to.")] + Transform m_TargetTransform; + + /// + protected override void OnEnable() + { + base.OnEnable(); + if (m_TargetTransform == null) + m_TargetTransform = transform; + } + + /// + protected override void OnAffordanceValueUpdated(float3 newValue) + { + base.OnAffordanceValueUpdated(newValue); + m_TargetTransform.localScale = newValue; + } + } +} diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Scripts/Vector3ScaleAffordanceReceiver.cs.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Scripts/Vector3ScaleAffordanceReceiver.cs.meta new file mode 100644 index 0000000..c56261b --- /dev/null +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Scripts/Vector3ScaleAffordanceReceiver.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 27bee223346c63f4bb2b0f85250f58b7 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/HandsDemoSceneAssets/Materials.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Materials.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/HandsDemoSceneAssets/Materials.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Materials.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Materials/DepthOnly.mat b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Materials/DepthOnly.mat similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Materials/DepthOnly.mat rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Materials/DepthOnly.mat diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Materials/DepthOnly.mat.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Materials/DepthOnly.mat.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Materials/DepthOnly.mat.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Materials/DepthOnly.mat.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Materials/RimLight.mat b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Materials/RimLight.mat new file mode 100644 index 0000000..5cfe35a --- /dev/null +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Materials/RimLight.mat @@ -0,0 +1,165 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-8678394163387868965 +MonoBehaviour: + m_ObjectHideFlags: 11 + 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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 7 +--- !u!114 &-3392432240476276898 +MonoBehaviour: + m_ObjectHideFlags: 11 + 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: 639247ca83abc874e893eb93af2b5e44, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 0 +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: RimLight + m_Shader: {fileID: -6465566751694194690, guid: 4ff4bf42ffc12e34a9c53b2f216f5442, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - _BUILTIN_SURFACE_TYPE_TRANSPARENT + - _SURFACE_TYPE_TRANSPARENT + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 1 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 3002 + stringTagMap: + RenderType: Transparent + disabledShaderPasses: + - SHADOWCASTER + - DepthOnly + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + 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} + - _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} + - _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} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _BUILTIN_AlphaClip: 0 + - _BUILTIN_Blend: 0 + - _BUILTIN_CullMode: 2 + - _BUILTIN_DstBlend: 10 + - _BUILTIN_QueueControl: 1 + - _BUILTIN_QueueOffset: 0 + - _BUILTIN_SrcBlend: 5 + - _BUILTIN_Surface: 1 + - _BUILTIN_ZTest: 4 + - _BUILTIN_ZWrite: 0 + - _BUILTIN_ZWriteControl: 0 + - _Blend: 0 + - _BumpScale: 1 + - _CastShadows: 0 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 10 + - _EnvironmentReflections: 1 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.005 + - _Power: 4 + - _QueueControl: 0 + - _QueueOffset: 2 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 5 + - _Surface: 1 + - _WorkflowMode: 1 + - _ZTest: 4 + - _ZWrite: 0 + - _ZWriteControl: 0 + m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EdgeColor: {r: 1, g: 1, b: 1, a: 0} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _MainColor: {r: 0, g: 0, b: 0, a: 0.7254902} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Materials/RimLight.mat.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Materials/RimLight.mat.meta new file mode 100644 index 0000000..d1c24e0 --- /dev/null +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Materials/RimLight.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0b91f81225004e24ca905a5f32567d5d +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Materials/Unity_Hand_Dark.mat b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Materials/Unity_Hand_Dark.mat similarity index 97% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Materials/Unity_Hand_Dark.mat rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Materials/Unity_Hand_Dark.mat index cb10035..9a5c0bc 100644 --- a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Materials/Unity_Hand_Dark.mat +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Materials/Unity_Hand_Dark.mat @@ -35,12 +35,10 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Unity_Hand_Dark m_Shader: {fileID: -6465566751694194690, guid: 89a6790c28795dd4987bb267c3d05338, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _BUILTIN_SURFACE_TYPE_TRANSPARENT + m_InvalidKeywords: - _SURFACE_TYPE_TRANSPARENT - m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -49,7 +47,6 @@ Material: RenderType: Transparent disabledShaderPasses: - DepthOnly - m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -91,7 +88,6 @@ Material: - Vector1_69b40c1ee2e1422cbfcae389f53b36a9: 1 - Vector1_8671db567d5d4784b29e8ff511bd8f1e: 1 - _AlphaClip: 0 - - _AlphaToMask: 0 - _BUILTIN_AlphaClip: 0 - _BUILTIN_Blend: 0 - _BUILTIN_CullMode: 2 diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Materials/Unity_Hand_Dark.mat.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Materials/Unity_Hand_Dark.mat.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Materials/Unity_Hand_Dark.mat.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Materials/Unity_Hand_Dark.mat.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Materials/Unity_Hand_Light.mat b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Materials/Unity_Hand_Light.mat similarity index 97% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Materials/Unity_Hand_Light.mat rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Materials/Unity_Hand_Light.mat index efe4339..7023838 100644 --- a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Materials/Unity_Hand_Light.mat +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Materials/Unity_Hand_Light.mat @@ -35,12 +35,10 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Unity_Hand_Light m_Shader: {fileID: -6465566751694194690, guid: 89a6790c28795dd4987bb267c3d05338, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _BUILTIN_SURFACE_TYPE_TRANSPARENT + m_InvalidKeywords: - _SURFACE_TYPE_TRANSPARENT - m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -49,7 +47,6 @@ Material: RenderType: Transparent disabledShaderPasses: - DepthOnly - m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -91,7 +88,6 @@ Material: - Vector1_69b40c1ee2e1422cbfcae389f53b36a9: 1 - Vector1_8671db567d5d4784b29e8ff511bd8f1e: 1 - _AlphaClip: 0 - - _AlphaToMask: 0 - _BUILTIN_AlphaClip: 0 - _BUILTIN_Blend: 0 - _BUILTIN_CullMode: 2 diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Materials/Unity_Hand_Light.mat.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Materials/Unity_Hand_Light.mat.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Materials/Unity_Hand_Light.mat.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Materials/Unity_Hand_Light.mat.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Materials/Unity_Hand_Medium.mat b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Materials/Unity_Hand_Medium.mat similarity index 97% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Materials/Unity_Hand_Medium.mat rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Materials/Unity_Hand_Medium.mat index bdc1183..806670b 100644 --- a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Materials/Unity_Hand_Medium.mat +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Materials/Unity_Hand_Medium.mat @@ -22,12 +22,10 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Unity_Hand_Medium m_Shader: {fileID: -6465566751694194690, guid: 89a6790c28795dd4987bb267c3d05338, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _BUILTIN_SURFACE_TYPE_TRANSPARENT + m_InvalidKeywords: - _SURFACE_TYPE_TRANSPARENT - m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -36,7 +34,6 @@ Material: RenderType: Transparent disabledShaderPasses: - DepthOnly - m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -86,7 +83,6 @@ Material: - Vector1_69b40c1ee2e1422cbfcae389f53b36a9: 1 - Vector1_8671db567d5d4784b29e8ff511bd8f1e: 1 - _AlphaClip: 0 - - _AlphaToMask: 0 - _BUILTIN_AlphaClip: 0 - _BUILTIN_Blend: 0 - _BUILTIN_CullMode: 2 diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Materials/Unity_Hand_Medium.mat.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Materials/Unity_Hand_Medium.mat.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Materials/Unity_Hand_Medium.mat.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Materials/Unity_Hand_Medium.mat.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Models.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Models.meta new file mode 100644 index 0000000..03daa0e --- /dev/null +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Models.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: afa9af25bc870b04ebcb8d9f9b33703c +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Models/Pinch_Pointer_LOD0.fbx b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Models/Pinch_Pointer_LOD0.fbx new file mode 100644 index 0000000..c9ef698 --- /dev/null +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Models/Pinch_Pointer_LOD0.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0901b06d0d7c847adcec991922ba1bdcf124656c4d39eb678224d43367cef4c8 +size 36156 diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Models/Pinch_Pointer_LOD0.fbx.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Models/Pinch_Pointer_LOD0.fbx.meta new file mode 100644 index 0000000..c9adfee --- /dev/null +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Models/Pinch_Pointer_LOD0.fbx.meta @@ -0,0 +1,106 @@ +fileFormatVersion: 2 +guid: e053b8fbc416ba349b4a58a26410bba2 +ModelImporter: + serializedVersion: 21300 + internalIDToNameTable: [] + externalObjects: {} + materials: + materialImportMode: 2 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + removeConstantScaleCurves: 1 + motionNodeName: + rigImportErrors: + rigImportWarnings: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + importConstraints: 0 + animationCompression: 1 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + extraUserProperties: [] + clipAnimations: [] + isReadable: 0 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + useSRGBMaterialColor: 1 + sortHierarchyByName: 1 + importVisibility: 1 + importBlendShapes: 1 + importCameras: 1 + importLights: 1 + nodeNameCollisionStrategy: 1 + fileIdsGeneration: 2 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + keepQuads: 0 + weldVertices: 1 + bakeAxisConversion: 0 + preserveHierarchy: 0 + skinWeightsMode: 0 + maxBonesPerVertex: 4 + minBoneWeight: 0.001 + optimizeBones: 1 + meshOptimizationFlags: -1 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVMarginMethod: 1 + secondaryUVMinLightmapResolution: 40 + secondaryUVMinObjectScale: 1 + secondaryUVPackMargin: 4 + useFileScale: 1 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + normalCalculationMode: 4 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + referencedClips: [] + importAnimation: 1 + humanDescription: + serializedVersion: 3 + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + globalScale: 1 + rootMotionBoneName: + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {instanceID: 0} + autoGenerateAvatarMappingIfUnspecified: 1 + animationType: 2 + humanoidOversampling: 1 + avatarSetup: 0 + addHumanoidExtraRootOnlyWhenUsingAvatar: 1 + remapMaterialsIfMaterialImportModeIsNone: 0 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/HandsDemoSceneAssets/Prefabs.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Prefabs.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/HandsDemoSceneAssets/Prefabs.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Prefabs.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Prefabs/Affordances.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Prefabs/Affordances.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Prefabs/Affordances.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Prefabs/Affordances.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Prefabs/Affordances/Hand Direct Interactor Affordances.prefab b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Prefabs/Affordances/Hand Direct Interactor Affordances.prefab similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Prefabs/Affordances/Hand Direct Interactor Affordances.prefab rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Prefabs/Affordances/Hand Direct Interactor Affordances.prefab diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Prefabs/Affordances/Hand Direct Interactor Affordances.prefab.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Prefabs/Affordances/Hand Direct Interactor Affordances.prefab.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Prefabs/Affordances/Hand Direct Interactor Affordances.prefab.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Prefabs/Affordances/Hand Direct Interactor Affordances.prefab.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Prefabs/Affordances/Hand Poke Interactor Affordances.prefab b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Prefabs/Affordances/Hand Poke Interactor Affordances.prefab similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Prefabs/Affordances/Hand Poke Interactor Affordances.prefab rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Prefabs/Affordances/Hand Poke Interactor Affordances.prefab diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Prefabs/Affordances/Hand Poke Interactor Affordances.prefab.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Prefabs/Affordances/Hand Poke Interactor Affordances.prefab.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Prefabs/Affordances/Hand Poke Interactor Affordances.prefab.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Prefabs/Affordances/Hand Poke Interactor Affordances.prefab.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Prefabs/Affordances/Hand Ray Interactor Affordances.prefab b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Prefabs/Affordances/Hand Ray Interactor Affordances.prefab similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Prefabs/Affordances/Hand Ray Interactor Affordances.prefab rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Prefabs/Affordances/Hand Ray Interactor Affordances.prefab diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Prefabs/Affordances/Hand Ray Interactor Affordances.prefab.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Prefabs/Affordances/Hand Ray Interactor Affordances.prefab.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Prefabs/Affordances/Hand Ray Interactor Affordances.prefab.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Prefabs/Affordances/Hand Ray Interactor Affordances.prefab.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Prefabs/Hand Menu Setup.prefab b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Prefabs/Hand Menu Setup.prefab similarity index 92% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Prefabs/Hand Menu Setup.prefab rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Prefabs/Hand Menu Setup.prefab index 3e0a358..526a062 100644 --- a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Prefabs/Hand Menu Setup.prefab +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Prefabs/Hand Menu Setup.prefab @@ -27,6 +27,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 4785593887994352529} - {fileID: 6560354495274216278} @@ -61,10 +62,10 @@ MonoBehaviour: m_HandTrackingFollowPreset: m_UseConstant: 0 m_ConstantValue: - rightLocalPosition: {x: 0, y: 0, z: 0} - leftLocalPosition: {x: 0, y: 0, z: 0} - rightLocalRotation: {x: 0, y: 0, z: 0} - leftLocalRotation: {x: 0, y: 0, z: 0} + rightHandLocalPosition: {x: 0, y: 0, z: 0} + leftHandLocalPosition: {x: 0, y: 0, z: 0} + rightHandLocalRotation: {x: 0, y: 0, z: 0} + leftHandLocalRotation: {x: 0, y: 0, z: 0} palmReferenceAxis: 0 invertAxisForRightHand: 0 requirePalmFacingUser: 0 @@ -73,6 +74,7 @@ MonoBehaviour: palmFacingUpDegreeAngleThreshold: 0 snapToGaze: 0 snapToGazeAngleThreshold: 0 + hideDelaySeconds: 0.25 allowSmoothing: 1 followLowerSmoothingValue: 12 followUpperSmoothingValue: 16 @@ -80,10 +82,10 @@ MonoBehaviour: m_ControllerFollowPreset: m_UseConstant: 0 m_ConstantValue: - rightLocalPosition: {x: 0, y: 0, z: 0} - leftLocalPosition: {x: 0, y: 0, z: 0} - rightLocalRotation: {x: 0, y: 0, z: 0} - leftLocalRotation: {x: 0, y: 0, z: 0} + rightHandLocalPosition: {x: 0, y: 0, z: 0} + leftHandLocalPosition: {x: 0, y: 0, z: 0} + rightHandLocalRotation: {x: 0, y: 0, z: 0} + leftHandLocalRotation: {x: 0, y: 0, z: 0} palmReferenceAxis: 0 invertAxisForRightHand: 0 requirePalmFacingUser: 0 @@ -92,6 +94,7 @@ MonoBehaviour: palmFacingUpDegreeAngleThreshold: 0 snapToGaze: 0 snapToGazeAngleThreshold: 0 + hideDelaySeconds: 0.25 allowSmoothing: 1 followLowerSmoothingValue: 12 followUpperSmoothingValue: 16 @@ -123,6 +126,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5909398001603780732} m_RootOrder: 0 @@ -153,8 +157,7 @@ MonoBehaviour: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 - m_Reference: {fileID: -2024308242397127297, guid: c348712bda248c246b8c49b3db54643f, - type: 3} + m_Reference: {fileID: -2024308242397127297, guid: c348712bda248c246b8c49b3db54643f, type: 3} m_RotationInput: m_UseReference: 1 m_Action: @@ -166,8 +169,7 @@ MonoBehaviour: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 - m_Reference: {fileID: 8248158260566104461, guid: c348712bda248c246b8c49b3db54643f, - type: 3} + m_Reference: {fileID: 8248158260566104461, guid: c348712bda248c246b8c49b3db54643f, type: 3} m_TrackingStateInput: m_UseReference: 1 m_Action: @@ -179,8 +181,7 @@ MonoBehaviour: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 - m_Reference: {fileID: 684395432459739428, guid: c348712bda248c246b8c49b3db54643f, - type: 3} + m_Reference: {fileID: 684395432459739428, guid: c348712bda248c246b8c49b3db54643f, type: 3} m_PositionAction: m_Name: m_Type: 0 @@ -199,7 +200,6 @@ MonoBehaviour: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 - m_HasMigratedActions: 1 --- !u!1 &3457113661323325636 GameObject: m_ObjectHideFlags: 0 @@ -226,6 +226,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5909398001603780732} m_RootOrder: 2 @@ -257,6 +258,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5909398001603780732} m_RootOrder: 1 @@ -287,8 +289,7 @@ MonoBehaviour: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 - m_Reference: {fileID: -3326005586356538449, guid: c348712bda248c246b8c49b3db54643f, - type: 3} + m_Reference: {fileID: -3326005586356538449, guid: c348712bda248c246b8c49b3db54643f, type: 3} m_RotationInput: m_UseReference: 1 m_Action: @@ -300,8 +301,7 @@ MonoBehaviour: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 - m_Reference: {fileID: 5101698808175986029, guid: c348712bda248c246b8c49b3db54643f, - type: 3} + m_Reference: {fileID: 5101698808175986029, guid: c348712bda248c246b8c49b3db54643f, type: 3} m_TrackingStateInput: m_UseReference: 1 m_Action: @@ -313,8 +313,7 @@ MonoBehaviour: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 - m_Reference: {fileID: -1277054153949319361, guid: c348712bda248c246b8c49b3db54643f, - type: 3} + m_Reference: {fileID: -1277054153949319361, guid: c348712bda248c246b8c49b3db54643f, type: 3} m_PositionAction: m_Name: m_Type: 0 @@ -333,4 +332,3 @@ MonoBehaviour: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 - m_HasMigratedActions: 1 diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Prefabs/Hand Menu Setup.prefab.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Prefabs/Hand Menu Setup.prefab.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Prefabs/Hand Menu Setup.prefab.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Prefabs/Hand Menu Setup.prefab.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Prefabs/InteractionAffordance.prefab b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Prefabs/InteractionAffordance.prefab similarity index 57% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Prefabs/InteractionAffordance.prefab rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Prefabs/InteractionAffordance.prefab index 649f09a..23d30fa 100644 --- a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Prefabs/InteractionAffordance.prefab +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Prefabs/InteractionAffordance.prefab @@ -1,5 +1,174 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &2313441362174852961 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7275325890891809550} + - component: {fileID: 60592885034133540} + - component: {fileID: 3600643431587687517} + m_Layer: 0 + m_Name: AudioAffordance + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7275325890891809550 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2313441362174852961} + 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: 314259139610439016} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!82 &60592885034133540 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2313441362174852961} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 0} + m_PlayOnAwake: 0 + m_Volume: 1 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 0 + 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.75 + 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 &3600643431587687517 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2313441362174852961} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 186056f485a2493b80cc81571ac8cd9b, type: 3} + m_Name: + m_EditorClassIdentifier: + m_AffordanceStateProvider: {fileID: 1784108126610004015} + m_AffordanceThemeDatum: + m_UseConstant: 0 + m_ConstantValue: + m_List: + - stateName: disabled + stateEntered: {fileID: 0} + stateExited: {fileID: 0} + - stateName: idle + stateEntered: {fileID: 0} + stateExited: {fileID: 0} + - stateName: hovered + stateEntered: {fileID: 0} + stateExited: {fileID: 0} + - stateName: hoveredPriority + stateEntered: {fileID: 0} + stateExited: {fileID: 0} + - stateName: selected + stateEntered: {fileID: 0} + stateExited: {fileID: 0} + - stateName: activated + stateEntered: {fileID: 0} + stateExited: {fileID: 0} + - stateName: focused + stateEntered: {fileID: 0} + stateExited: {fileID: 0} + m_Variable: {fileID: 11400000, guid: 57def9352cdee8548bfc9ebc6a55914a, type: 2} + m_AudioSource: {fileID: 60592885034133540} --- !u!1 &4696973491166461409 GameObject: m_ObjectHideFlags: 0 @@ -27,8 +196,10 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1112359677375758233} + - {fileID: 7275325890891809550} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -48,6 +219,7 @@ MonoBehaviour: m_InteractableSource: {fileID: 0} m_IgnoreHoverEvents: 0 m_IgnoreHoverPriorityEvents: 1 + m_IgnoreFocusEvents: 1 m_IgnoreSelectEvents: 0 m_IgnoreActivateEvents: 0 m_SelectClickAnimationMode: 1 @@ -108,6 +280,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 314259139610439016} m_RootOrder: 0 diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Prefabs/InteractionAffordance.prefab.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Prefabs/InteractionAffordance.prefab.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Prefabs/InteractionAffordance.prefab.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Prefabs/InteractionAffordance.prefab.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Prefabs/Left Hand Interaction Visual.prefab b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Prefabs/Left Hand Interaction Visual.prefab similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Prefabs/Left Hand Interaction Visual.prefab rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Prefabs/Left Hand Interaction Visual.prefab diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Prefabs/Left Hand Interaction Visual.prefab.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Prefabs/Left Hand Interaction Visual.prefab.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Prefabs/Left Hand Interaction Visual.prefab.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Prefabs/Left Hand Interaction Visual.prefab.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Prefabs/Pinch Point Stabilized.prefab b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Prefabs/Pinch Point Stabilized.prefab new file mode 100644 index 0000000..6e01e99 --- /dev/null +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Prefabs/Pinch Point Stabilized.prefab @@ -0,0 +1,701 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &2181396665701132182 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1517203009072151852} + - component: {fileID: 6379762978650309333} + - component: {fileID: 1538976526839647015} + - component: {fileID: 3733241858151303650} + - component: {fileID: 2873834594852043269} + - component: {fileID: 7090018163761373624} + - component: {fileID: 8002132081376868790} + - component: {fileID: 8232174397725000580} + - component: {fileID: 9205766622909133630} + m_Layer: 0 + m_Name: Pinch Visual + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1517203009072151852 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2181396665701132182} + 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: 1 + m_Children: [] + m_Father: {fileID: 7962545760240945814} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} +--- !u!137 &6379762978650309333 +SkinnedMeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2181396665701132182} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 1 + m_DynamicOccludee: 0 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 3 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 455ef821a5429de4baeed61fa958acbc, type: 2} + - {fileID: 2100000, guid: 0b91f81225004e24ca905a5f32567d5d, 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 + serializedVersion: 2 + m_Quality: 0 + m_UpdateWhenOffscreen: 1 + m_SkinnedMotionVectors: 1 + m_Mesh: {fileID: -5120762275383614272, guid: e053b8fbc416ba349b4a58a26410bba2, type: 3} + m_Bones: [] + m_BlendShapeWeights: + - 0 + m_RootBone: {fileID: 0} + m_AABB: + m_Center: {x: 0, y: 0.009045093, z: 0} + m_Extent: {x: 0.0077457884, y: 0.016694028, z: 0.0077457884} + m_DirtyAABB: 0 +--- !u!114 &1538976526839647015 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2181396665701132182} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 434cd70b6a5740cca11da2a0417cf0ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_AffordanceStateProvider: {fileID: 3941121930630195656} + m_ReplaceIdleStateValueWithInitialValue: 0 + m_AffordanceThemeDatum: + m_UseConstant: 0 + m_ConstantValue: + m_StateAnimationCurve: + m_UseConstant: 1 + m_ConstantValue: + 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: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_Variable: {fileID: 0} + m_List: + - stateName: disabled + animationStateStartValue: 0 + animationStateEndValue: 0 + - stateName: idle + animationStateStartValue: 0 + animationStateEndValue: 0 + - stateName: hovered + animationStateStartValue: 0 + animationStateEndValue: 0 + - stateName: hoveredPriority + animationStateStartValue: 0 + animationStateEndValue: 0 + - stateName: selected + animationStateStartValue: 0 + animationStateEndValue: 0 + - stateName: activated + animationStateStartValue: 0 + animationStateEndValue: 0 + - stateName: focused + animationStateStartValue: 0 + animationStateEndValue: 0 + m_Variable: {fileID: 11400000, guid: fbf5c74e21f572740881de5634f1ce9c, type: 2} + m_ValueUpdated: + m_PersistentCalls: + m_Calls: [] + m_SkinnedMeshRenderer: {fileID: 6379762978650309333} + m_BlendShapeIndex: 0 +--- !u!114 &3733241858151303650 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2181396665701132182} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1410cbaaadf84a7aaa6459d37ad21b3a, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Renderer: {fileID: 6379762978650309333} + m_MaterialIndex: 1 +--- !u!114 &2873834594852043269 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2181396665701132182} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f86d13fca2ec430d870c0f7765ad0dde, type: 3} + m_Name: + m_EditorClassIdentifier: + m_AffordanceStateProvider: {fileID: 3941121930630195656} + m_ReplaceIdleStateValueWithInitialValue: 0 + m_AffordanceThemeDatum: + m_UseConstant: 0 + m_ConstantValue: + m_StateAnimationCurve: + m_UseConstant: 1 + m_ConstantValue: + 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: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_Variable: {fileID: 0} + m_List: + - stateName: disabled + animationStateStartValue: {r: 0, g: 0, b: 0, a: 0} + animationStateEndValue: {r: 0, g: 0, b: 0, a: 0} + - stateName: idle + animationStateStartValue: {r: 0, g: 0, b: 0, a: 0} + animationStateEndValue: {r: 0, g: 0, b: 0, a: 0} + - stateName: hovered + animationStateStartValue: {r: 0, g: 0, b: 0, a: 0} + animationStateEndValue: {r: 0, g: 0, b: 0, a: 0} + - stateName: hoveredPriority + animationStateStartValue: {r: 0, g: 0, b: 0, a: 0} + animationStateEndValue: {r: 0, g: 0, b: 0, a: 0} + - stateName: selected + animationStateStartValue: {r: 0, g: 0, b: 0, a: 0} + animationStateEndValue: {r: 0, g: 0, b: 0, a: 0} + - stateName: activated + animationStateStartValue: {r: 0, g: 0, b: 0, a: 0} + animationStateEndValue: {r: 0, g: 0, b: 0, a: 0} + - stateName: focused + animationStateStartValue: {r: 0, g: 0, b: 0, a: 0} + animationStateEndValue: {r: 0, g: 0, b: 0, a: 0} + m_ColorBlendMode: 0 + m_BlendAmount: 1 + m_Variable: {fileID: 11400000, guid: 1468864c36cbf39428681b1f0d9ef149, type: 2} + m_ValueUpdated: + m_PersistentCalls: + m_Calls: [] + m_MaterialPropertyBlockHelper: {fileID: 3733241858151303650} + m_ColorPropertyName: _MainColor +--- !u!114 &7090018163761373624 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2181396665701132182} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f86d13fca2ec430d870c0f7765ad0dde, type: 3} + m_Name: + m_EditorClassIdentifier: + m_AffordanceStateProvider: {fileID: 3941121930630195656} + m_ReplaceIdleStateValueWithInitialValue: 0 + m_AffordanceThemeDatum: + m_UseConstant: 0 + m_ConstantValue: + m_StateAnimationCurve: + m_UseConstant: 1 + m_ConstantValue: + 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: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_Variable: {fileID: 0} + m_List: + - stateName: disabled + animationStateStartValue: {r: 0, g: 0, b: 0, a: 0} + animationStateEndValue: {r: 0, g: 0, b: 0, a: 0} + - stateName: idle + animationStateStartValue: {r: 0, g: 0, b: 0, a: 0} + animationStateEndValue: {r: 0, g: 0, b: 0, a: 0} + - stateName: hovered + animationStateStartValue: {r: 0, g: 0, b: 0, a: 0} + animationStateEndValue: {r: 0, g: 0, b: 0, a: 0} + - stateName: hoveredPriority + animationStateStartValue: {r: 0, g: 0, b: 0, a: 0} + animationStateEndValue: {r: 0, g: 0, b: 0, a: 0} + - stateName: selected + animationStateStartValue: {r: 0, g: 0, b: 0, a: 0} + animationStateEndValue: {r: 0, g: 0, b: 0, a: 0} + - stateName: activated + animationStateStartValue: {r: 0, g: 0, b: 0, a: 0} + animationStateEndValue: {r: 0, g: 0, b: 0, a: 0} + - stateName: focused + animationStateStartValue: {r: 0, g: 0, b: 0, a: 0} + animationStateEndValue: {r: 0, g: 0, b: 0, a: 0} + m_ColorBlendMode: 0 + m_BlendAmount: 1 + m_Variable: {fileID: 11400000, guid: 6b0360f219436394b8519378cd55c7e3, type: 2} + m_ValueUpdated: + m_PersistentCalls: + m_Calls: [] + m_MaterialPropertyBlockHelper: {fileID: 3733241858151303650} + m_ColorPropertyName: _EdgeColor +--- !u!114 &8002132081376868790 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2181396665701132182} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 629ea686265f47f082ba5732cffad1cf, type: 3} + m_Name: + m_EditorClassIdentifier: + m_AffordanceStateProvider: {fileID: 3941121930630195656} + m_ReplaceIdleStateValueWithInitialValue: 0 + m_AffordanceThemeDatum: + m_UseConstant: 0 + m_ConstantValue: + m_StateAnimationCurve: + m_UseConstant: 1 + m_ConstantValue: + 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: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_Variable: {fileID: 0} + m_List: + - stateName: disabled + animationStateStartValue: 0 + animationStateEndValue: 0 + - stateName: idle + animationStateStartValue: 0 + animationStateEndValue: 0 + - stateName: hovered + animationStateStartValue: 0 + animationStateEndValue: 0 + - stateName: hoveredPriority + animationStateStartValue: 0 + animationStateEndValue: 0 + - stateName: selected + animationStateStartValue: 0 + animationStateEndValue: 0 + - stateName: activated + animationStateStartValue: 0 + animationStateEndValue: 0 + - stateName: focused + animationStateStartValue: 0 + animationStateEndValue: 0 + m_Variable: {fileID: 11400000, guid: 2d9d4878bfb037248af1d243a0638dd0, type: 2} + m_ValueUpdated: + m_PersistentCalls: + m_Calls: [] + m_MaterialPropertyBlockHelper: {fileID: 3733241858151303650} + m_FloatPropertyName: _Power +--- !u!114 &8232174397725000580 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2181396665701132182} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 865d01d2834c9cb4caa8f2c901104c2d, type: 3} + m_Name: + m_EditorClassIdentifier: + m_AffordanceStateProvider: {fileID: 0} + m_ReplaceIdleStateValueWithInitialValue: 0 + m_AffordanceThemeDatum: + m_UseConstant: 0 + m_ConstantValue: + m_StateAnimationCurve: + m_UseConstant: 1 + m_ConstantValue: + 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: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_Variable: {fileID: 0} + m_List: + - stateName: disabled + animationStateStartValue: + x: 0 + y: 0 + z: 0 + animationStateEndValue: + x: 0 + y: 0 + z: 0 + - stateName: idle + animationStateStartValue: + x: 0 + y: 0 + z: 0 + animationStateEndValue: + x: 0 + y: 0 + z: 0 + - stateName: hovered + animationStateStartValue: + x: 0 + y: 0 + z: 0 + animationStateEndValue: + x: 0 + y: 0 + z: 0 + - stateName: hoveredPriority + animationStateStartValue: + x: 0 + y: 0 + z: 0 + animationStateEndValue: + x: 0 + y: 0 + z: 0 + - stateName: selected + animationStateStartValue: + x: 0 + y: 0 + z: 0 + animationStateEndValue: + x: 0 + y: 0 + z: 0 + - stateName: activated + animationStateStartValue: + x: 0 + y: 0 + z: 0 + animationStateEndValue: + x: 0 + y: 0 + z: 0 + - stateName: focused + animationStateStartValue: + x: 0 + y: 0 + z: 0 + animationStateEndValue: + x: 0 + y: 0 + z: 0 + m_Variable: {fileID: 11400000, guid: 2826cece951f71642a19da5a2080a27c, type: 2} + m_ValueUpdated: + m_PersistentCalls: + m_Calls: [] + m_TransformToTranslate: {fileID: 1517203009072151852} +--- !u!114 &9205766622909133630 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2181396665701132182} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 73feefcb6c9340e188b14a48254f4b5e, type: 3} + m_Name: + m_EditorClassIdentifier: + m_AffordanceStateProvider: {fileID: 3941121930630195656} + m_ReplaceIdleStateValueWithInitialValue: 0 + m_AffordanceThemeDatum: + m_UseConstant: 0 + m_ConstantValue: + m_StateAnimationCurve: + m_UseConstant: 1 + m_ConstantValue: + 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: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_Variable: {fileID: 0} + m_List: + - stateName: disabled + animationStateStartValue: 0 + animationStateEndValue: 0 + - stateName: idle + animationStateStartValue: 0 + animationStateEndValue: 0 + - stateName: hovered + animationStateStartValue: 0 + animationStateEndValue: 0 + - stateName: hoveredPriority + animationStateStartValue: 0 + animationStateEndValue: 0 + - stateName: selected + animationStateStartValue: 0 + animationStateEndValue: 0 + - stateName: activated + animationStateStartValue: 0 + animationStateEndValue: 0 + - stateName: focused + animationStateStartValue: 0 + animationStateEndValue: 0 + m_Variable: {fileID: 11400000, guid: d22e48f34794ab9498d082f9713c2293, type: 2} + m_ValueUpdated: + m_PersistentCalls: + m_Calls: [] + m_TransformToScale: {fileID: 1517203009072151852} +--- !u!1 &3369527167708781622 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7962545760240945814} + - component: {fileID: 6603267092101694357} + - component: {fileID: 3941121930630195656} + - component: {fileID: 868360655280004538} + m_Layer: 0 + m_Name: Pinch Point Stabilized + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7962545760240945814 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3369527167708781622} + 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: 1 + m_Children: + - {fileID: 1517203009072151852} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &6603267092101694357 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3369527167708781622} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8693657abb5062a40a80ba3cb86ef181, type: 3} + m_Name: + m_EditorClassIdentifier: + m_XRHandTrackingEvents: {fileID: 0} + m_TargetRotation: {fileID: 0} + m_RayInteractor: {fileID: 0} + m_RotationSmoothingSpeed: 12 +--- !u!114 &3941121930630195656 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3369527167708781622} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c83f12c537584f51b92c01f10d7090c0, type: 3} + m_Name: + m_EditorClassIdentifier: + m_TransitionDuration: 0.125 + m_InteractorSource: {fileID: 0} + m_IgnoreHoverEvents: 0 + m_IgnoreSelectEvents: 0 + m_IgnoreActivateEvents: 1 + m_IgnoreUGUIHover: 0 + m_IgnoreUGUISelect: 0 + m_IgnoreXRInteractionEvents: 0 + m_SelectClickAnimationMode: 0 + m_ActivateClickAnimationMode: 0 + m_ClickAnimationDuration: 0.25 + m_ClickAnimationCurve: + m_UseConstant: 1 + m_ConstantValue: + 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: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_Variable: {fileID: 0} +--- !u!114 &868360655280004538 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3369527167708781622} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2e989a75b2954bdab01ca618a30d5de6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Interactor: {fileID: 0} + m_ObjectToHide: {fileID: 2181396665701132182} diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Prefabs/Pinch Point Stabilized.prefab.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Prefabs/Pinch Point Stabilized.prefab.meta new file mode 100644 index 0000000..4187b23 --- /dev/null +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Prefabs/Pinch Point Stabilized.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 88b12c0ca81d9a34eac32a1e1bd19b1c +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Prefabs/Right Hand Interaction Visual.prefab b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Prefabs/Right Hand Interaction Visual.prefab similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Prefabs/Right Hand Interaction Visual.prefab rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Prefabs/Right Hand Interaction Visual.prefab diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Prefabs/Right Hand Interaction Visual.prefab.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Prefabs/Right Hand Interaction Visual.prefab.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Prefabs/Right Hand Interaction Visual.prefab.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Prefabs/Right Hand Interaction Visual.prefab.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Prefabs/XR Interaction Hands Setup.prefab b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Prefabs/XR Interaction Hands Setup.prefab similarity index 97% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Prefabs/XR Interaction Hands Setup.prefab rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Prefabs/XR Interaction Hands Setup.prefab index b399f42..e31c902 100644 --- a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Prefabs/XR Interaction Hands Setup.prefab +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Prefabs/XR Interaction Hands Setup.prefab @@ -26,6 +26,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 4763085287912399982} - {fileID: 4763085286836561809} @@ -61,6 +62,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5773256366622995465} m_RootOrder: 1 @@ -107,6 +109,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5773256366622995465} m_RootOrder: 2 @@ -138,11 +141,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ab68ce6587aab0146b8dabefbd806791, type: 3} m_Name: m_EditorClassIdentifier: + m_SendPointerHoverToParent: 1 m_ClickSpeed: 0.3 m_MoveDeadzone: 0.6 m_RepeatDelay: 0.5 m_RepeatRate: 0.1 m_TrackedDeviceDragThresholdMultiplier: 2 + m_TrackedScrollDeltaMultiplier: 5 m_ActiveInputMode: 1 m_MaxTrackedDeviceRaycastDistance: 1000 m_EnableXRInput: 1 @@ -190,6 +195,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5773256366622995465} m_RootOrder: 0 diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Prefabs/XR Interaction Hands Setup.prefab.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Prefabs/XR Interaction Hands Setup.prefab.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Prefabs/XR Interaction Hands Setup.prefab.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Prefabs/XR Interaction Hands Setup.prefab.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Prefabs/XR Origin Hands (XR Rig).prefab b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Prefabs/XR Origin Hands (XR Rig).prefab similarity index 89% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Prefabs/XR Origin Hands (XR Rig).prefab rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Prefabs/XR Origin Hands (XR Rig).prefab index 88ab5f9..9fbf8f9 100644 --- a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Prefabs/XR Origin Hands (XR Rig).prefab +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Prefabs/XR Origin Hands (XR Rig).prefab @@ -171,10 +171,10 @@ MonoBehaviour: m_PositionInput: m_UseReference: 1 m_Action: - m_Name: Position Input + m_Name: m_Type: 0 m_ExpectedControlType: - m_Id: ca01fc97-0e39-4036-b931-98dfbffd202d + m_Id: m_Processors: m_Interactions: m_SingletonActionBindings: [] @@ -183,10 +183,10 @@ MonoBehaviour: m_RotationInput: m_UseReference: 1 m_Action: - m_Name: Rotation Input + m_Name: m_Type: 0 m_ExpectedControlType: - m_Id: 5a3ee5b1-dfd9-4e4b-8ba9-f45db67beb28 + m_Id: m_Processors: m_Interactions: m_SingletonActionBindings: [] @@ -222,7 +222,6 @@ MonoBehaviour: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 - m_HasMigratedActions: 1 --- !u!1 &1648469353267697591 GameObject: m_ObjectHideFlags: 0 @@ -311,6 +310,7 @@ Transform: - {fileID: 8323729308341992084} - {fileID: 5480585174247187439} - {fileID: 1388835480394543327} + - {fileID: 4894638449106479503} - {fileID: 2062385652673493497} m_Father: {fileID: 657184242161839408} m_RootOrder: 8 @@ -333,7 +333,10 @@ MonoBehaviour: - {fileID: 8209797214075343310} - {fileID: 8574486981646720036} - {fileID: 825434954720726026} - m_StartingInteractionOverridesMap: [] + m_StartingInteractionOverridesMap: + - groupMember: {fileID: 8209797214075343310} + overrideGroupMembers: + - {fileID: 8574486981646720036} --- !u!114 &664256707558583388 MonoBehaviour: m_ObjectHideFlags: 0 @@ -688,6 +691,52 @@ MonoBehaviour: m_UseLocalSpace: 1 m_AngleStabilization: 5 m_PositionStabilization: 0.03 +--- !u!1 &4605643766788160351 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 657172139978056025} + - component: {fileID: 4353042875904107839} + m_Layer: 0 + m_Name: Hands Smoothing Post Processor + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &657172139978056025 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4605643766788160351} + 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: 1 + m_Children: [] + m_Father: {fileID: 2218496723442559053} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &4353042875904107839 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4605643766788160351} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bc6980b6cb3b4f12b6b75074e4ef59f3, type: 3} + m_Name: + m_EditorClassIdentifier: + m_FilterMinCutoff: 0.1 + m_FilterBeta: 0.2 --- !u!1 &5885254045885060483 GameObject: m_ObjectHideFlags: 0 @@ -856,10 +905,10 @@ MonoBehaviour: m_PositionInput: m_UseReference: 1 m_Action: - m_Name: Position Input + m_Name: m_Type: 0 m_ExpectedControlType: - m_Id: f8277e89-eb90-4cd2-909a-174d39fbf1d3 + m_Id: m_Processors: m_Interactions: m_SingletonActionBindings: [] @@ -868,10 +917,10 @@ MonoBehaviour: m_RotationInput: m_UseReference: 1 m_Action: - m_Name: Rotation Input + m_Name: m_Type: 0 m_ExpectedControlType: - m_Id: ac537ea7-ea86-4f57-af1c-286a5b81dde3 + m_Id: m_Processors: m_Interactions: m_SingletonActionBindings: [] @@ -907,7 +956,6 @@ MonoBehaviour: m_Interactions: m_SingletonActionBindings: [] m_Flags: 0 - m_HasMigratedActions: 1 --- !u!1 &6355494128053973299 GameObject: m_ObjectHideFlags: 0 @@ -946,6 +994,7 @@ Transform: - {fileID: 2816440813717858226} - {fileID: 7201011967548035520} - {fileID: 8008812968308354104} + - {fileID: 1176872742605197438} - {fileID: 4399806423645351520} m_Father: {fileID: 657184242161839408} m_RootOrder: 7 @@ -968,7 +1017,10 @@ MonoBehaviour: - {fileID: 6237049687586235588} - {fileID: 9034274667510444962} - {fileID: 5543534632417482985} - m_StartingInteractionOverridesMap: [] + m_StartingInteractionOverridesMap: + - groupMember: {fileID: 6237049687586235588} + overrideGroupMembers: + - {fileID: 9034274667510444962} --- !u!114 &3518443110171711630 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1455,6 +1507,11 @@ Transform: m_CorrespondingSourceObject: {fileID: 1680501587, guid: f6336ac4ac8b4d34bc5072418cdc62a0, type: 3} m_PrefabInstance: {fileID: 657184243840976483} m_PrefabAsset: {fileID: 0} +--- !u!4 &2218496723442559053 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1717954561962503726, guid: f6336ac4ac8b4d34bc5072418cdc62a0, type: 3} + m_PrefabInstance: {fileID: 657184243840976483} + m_PrefabAsset: {fileID: 0} --- !u!1001 &3110923438699430545 PrefabInstance: m_ObjectHideFlags: 0 @@ -1472,7 +1529,7 @@ PrefabInstance: objectReference: {fileID: 5543534632417482985} - target: {fileID: 1595251472046566641, guid: ffd656bf2a3ba3d41b1e4a94b81b7c85, type: 3} propertyPath: m_RootOrder - value: 6 + value: 7 objectReference: {fileID: 0} - target: {fileID: 1595251472046566641, guid: ffd656bf2a3ba3d41b1e4a94b81b7c85, type: 3} propertyPath: m_LocalPosition.x @@ -1543,13 +1600,24 @@ MonoBehaviour: m_EditorClassIdentifier: m_PokeInteractorObject: {fileID: 6237049687586235588} m_PokeStrengthSnapThreshold: 0.01 - m_SmoothingAmount: 16 + m_SmoothingAmount: 24 m_FixedOffset: 0.005 --- !u!4 &4399806423645351520 stripped Transform: m_CorrespondingSourceObject: {fileID: 1595251472046566641, guid: ffd656bf2a3ba3d41b1e4a94b81b7c85, type: 3} m_PrefabInstance: {fileID: 3110923438699430545} m_PrefabAsset: {fileID: 0} +--- !u!114 &6540358451509188026 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 8207877637699278635, guid: ffd656bf2a3ba3d41b1e4a94b81b7c85, type: 3} + m_PrefabInstance: {fileID: 3110923438699430545} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3910408762165081306} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b5b9cf54c47f40ee9c3eb30ea8eb89b9, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &3134485598015230918 PrefabInstance: m_ObjectHideFlags: 0 @@ -1563,16 +1631,20 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4924506573850889901, guid: ad818c36731146e994540a1896ad8f24, type: 3} propertyPath: m_LineWidth - value: 0.007 + value: 0.0035 + objectReference: {fileID: 0} + - target: {fileID: 4924506573850889901, guid: ad818c36731146e994540a1896ad8f24, type: 3} + propertyPath: m_MinLineLength + value: 0.1 objectReference: {fileID: 0} - target: {fileID: 4924506573850889901, guid: ad818c36731146e994540a1896ad8f24, type: 3} propertyPath: m_LineOriginOffset - value: 0.03 + value: 0.0375 objectReference: {fileID: 0} - target: {fileID: 4924506573850889901, guid: ad818c36731146e994540a1896ad8f24, type: 3} propertyPath: m_LineOriginTransform value: - objectReference: {fileID: 8847029981464006006} + objectReference: {fileID: 1176872742605197438} - target: {fileID: 5888765399538998960, guid: ad818c36731146e994540a1896ad8f24, type: 3} propertyPath: m_RootOrder value: 2 @@ -1874,6 +1946,92 @@ Transform: m_CorrespondingSourceObject: {fileID: 5888765399538998960, guid: ad818c36731146e994540a1896ad8f24, type: 3} m_PrefabInstance: {fileID: 3134485598015230918} m_PrefabAsset: {fileID: 0} +--- !u!1001 &3273442460117869337 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 6311120899289156754} + m_Modifications: + - target: {fileID: 868360655280004538, guid: 88b12c0ca81d9a34eac32a1e1bd19b1c, type: 3} + propertyPath: m_Interactor + value: + objectReference: {fileID: 825434954720726026} + - target: {fileID: 3369527167708781622, guid: 88b12c0ca81d9a34eac32a1e1bd19b1c, type: 3} + propertyPath: m_Name + value: Pinch Point Stabilized + objectReference: {fileID: 0} + - target: {fileID: 3901091180161469564, guid: 88b12c0ca81d9a34eac32a1e1bd19b1c, type: 3} + propertyPath: m_InteractorSource + value: + objectReference: {fileID: 825434954720726026} + - target: {fileID: 3941121930630195656, guid: 88b12c0ca81d9a34eac32a1e1bd19b1c, type: 3} + propertyPath: m_InteractorSource + value: + objectReference: {fileID: 825434954720726026} + - target: {fileID: 6603267092101694357, guid: 88b12c0ca81d9a34eac32a1e1bd19b1c, type: 3} + propertyPath: m_RayInteractor + value: + objectReference: {fileID: 825434954720726026} + - target: {fileID: 6603267092101694357, guid: 88b12c0ca81d9a34eac32a1e1bd19b1c, type: 3} + propertyPath: m_TargetRotation + value: + objectReference: {fileID: 1388835480394543327} + - target: {fileID: 6603267092101694357, guid: 88b12c0ca81d9a34eac32a1e1bd19b1c, type: 3} + propertyPath: m_XRHandTrackingEvents + value: + objectReference: {fileID: 1576675058413778859} + - target: {fileID: 7962545760240945814, guid: 88b12c0ca81d9a34eac32a1e1bd19b1c, type: 3} + propertyPath: m_RootOrder + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 7962545760240945814, guid: 88b12c0ca81d9a34eac32a1e1bd19b1c, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7962545760240945814, guid: 88b12c0ca81d9a34eac32a1e1bd19b1c, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7962545760240945814, guid: 88b12c0ca81d9a34eac32a1e1bd19b1c, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7962545760240945814, guid: 88b12c0ca81d9a34eac32a1e1bd19b1c, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7962545760240945814, guid: 88b12c0ca81d9a34eac32a1e1bd19b1c, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7962545760240945814, guid: 88b12c0ca81d9a34eac32a1e1bd19b1c, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7962545760240945814, guid: 88b12c0ca81d9a34eac32a1e1bd19b1c, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7962545760240945814, guid: 88b12c0ca81d9a34eac32a1e1bd19b1c, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7962545760240945814, guid: 88b12c0ca81d9a34eac32a1e1bd19b1c, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7962545760240945814, guid: 88b12c0ca81d9a34eac32a1e1bd19b1c, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 88b12c0ca81d9a34eac32a1e1bd19b1c, type: 3} +--- !u!4 &4894638449106479503 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7962545760240945814, guid: 88b12c0ca81d9a34eac32a1e1bd19b1c, type: 3} + m_PrefabInstance: {fileID: 3273442460117869337} + m_PrefabAsset: {fileID: 0} --- !u!1001 &3587470959140778710 PrefabInstance: m_ObjectHideFlags: 0 @@ -1891,7 +2049,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3266887667944164143, guid: 89e80c47615e4f043926d66492d3ca5f, type: 3} propertyPath: m_RootOrder - value: 6 + value: 7 objectReference: {fileID: 0} - target: {fileID: 3266887667944164143, guid: 89e80c47615e4f043926d66492d3ca5f, type: 3} propertyPath: m_LocalPosition.x @@ -1943,6 +2101,17 @@ PrefabInstance: objectReference: {fileID: 8209797214075343310} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 89e80c47615e4f043926d66492d3ca5f, type: 3} +--- !u!114 &1576675058413778859 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 2605394267117782397, guid: 89e80c47615e4f043926d66492d3ca5f, type: 3} + m_PrefabInstance: {fileID: 3587470959140778710} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1717209007007425347} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b5b9cf54c47f40ee9c3eb30ea8eb89b9, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1717209007007425347 stripped GameObject: m_CorrespondingSourceObject: {fileID: 2746493918707896725, guid: 89e80c47615e4f043926d66492d3ca5f, type: 3} @@ -1962,7 +2131,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_PokeInteractorObject: {fileID: 8209797214075343310} m_PokeStrengthSnapThreshold: 0.01 - m_SmoothingAmount: 16 + m_SmoothingAmount: 24 m_FixedOffset: 0.005 --- !u!4 &2062385652673493497 stripped Transform: @@ -1982,16 +2151,20 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4924506573850889901, guid: ad818c36731146e994540a1896ad8f24, type: 3} propertyPath: m_LineWidth - value: 0.007 + value: 0.0035 + objectReference: {fileID: 0} + - target: {fileID: 4924506573850889901, guid: ad818c36731146e994540a1896ad8f24, type: 3} + propertyPath: m_MinLineLength + value: 0.1 objectReference: {fileID: 0} - target: {fileID: 4924506573850889901, guid: ad818c36731146e994540a1896ad8f24, type: 3} propertyPath: m_LineOriginOffset - value: 0.03 + value: 0.0375 objectReference: {fileID: 0} - target: {fileID: 4924506573850889901, guid: ad818c36731146e994540a1896ad8f24, type: 3} propertyPath: m_LineOriginTransform value: - objectReference: {fileID: 4421665336645163413} + objectReference: {fileID: 4894638449106479503} - target: {fileID: 5888765399538998960, guid: ad818c36731146e994540a1896ad8f24, type: 3} propertyPath: m_RootOrder value: 2 @@ -2306,7 +2479,7 @@ PrefabInstance: objectReference: {fileID: 7201011967548035520} - target: {fileID: 6059725000919627127, guid: 2fd3e07afe5b461490fb8e314976b1b0, type: 3} propertyPath: m_Radius - value: 0.035 + value: 0.1 objectReference: {fileID: 0} - target: {fileID: 6189354538098044173, guid: 2fd3e07afe5b461490fb8e314976b1b0, type: 3} propertyPath: m_RootOrder @@ -2605,6 +2778,92 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4253f32900bcc4d499d675566142ded0, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1001 &9139407454820817640 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 5878492368827077393} + m_Modifications: + - target: {fileID: 868360655280004538, guid: 88b12c0ca81d9a34eac32a1e1bd19b1c, type: 3} + propertyPath: m_Interactor + value: + objectReference: {fileID: 5543534632417482985} + - target: {fileID: 3369527167708781622, guid: 88b12c0ca81d9a34eac32a1e1bd19b1c, type: 3} + propertyPath: m_Name + value: Pinch Point Stabilized + objectReference: {fileID: 0} + - target: {fileID: 3901091180161469564, guid: 88b12c0ca81d9a34eac32a1e1bd19b1c, type: 3} + propertyPath: m_InteractorSource + value: + objectReference: {fileID: 5543534632417482985} + - target: {fileID: 3941121930630195656, guid: 88b12c0ca81d9a34eac32a1e1bd19b1c, type: 3} + propertyPath: m_InteractorSource + value: + objectReference: {fileID: 5543534632417482985} + - target: {fileID: 6603267092101694357, guid: 88b12c0ca81d9a34eac32a1e1bd19b1c, type: 3} + propertyPath: m_RayInteractor + value: + objectReference: {fileID: 5543534632417482985} + - target: {fileID: 6603267092101694357, guid: 88b12c0ca81d9a34eac32a1e1bd19b1c, type: 3} + propertyPath: m_TargetRotation + value: + objectReference: {fileID: 8008812968308354104} + - target: {fileID: 6603267092101694357, guid: 88b12c0ca81d9a34eac32a1e1bd19b1c, type: 3} + propertyPath: m_XRHandTrackingEvents + value: + objectReference: {fileID: 6540358451509188026} + - target: {fileID: 7962545760240945814, guid: 88b12c0ca81d9a34eac32a1e1bd19b1c, type: 3} + propertyPath: m_RootOrder + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 7962545760240945814, guid: 88b12c0ca81d9a34eac32a1e1bd19b1c, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7962545760240945814, guid: 88b12c0ca81d9a34eac32a1e1bd19b1c, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7962545760240945814, guid: 88b12c0ca81d9a34eac32a1e1bd19b1c, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7962545760240945814, guid: 88b12c0ca81d9a34eac32a1e1bd19b1c, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7962545760240945814, guid: 88b12c0ca81d9a34eac32a1e1bd19b1c, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7962545760240945814, guid: 88b12c0ca81d9a34eac32a1e1bd19b1c, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7962545760240945814, guid: 88b12c0ca81d9a34eac32a1e1bd19b1c, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7962545760240945814, guid: 88b12c0ca81d9a34eac32a1e1bd19b1c, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7962545760240945814, guid: 88b12c0ca81d9a34eac32a1e1bd19b1c, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7962545760240945814, guid: 88b12c0ca81d9a34eac32a1e1bd19b1c, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 88b12c0ca81d9a34eac32a1e1bd19b1c, type: 3} +--- !u!4 &1176872742605197438 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7962545760240945814, guid: 88b12c0ca81d9a34eac32a1e1bd19b1c, type: 3} + m_PrefabInstance: {fileID: 9139407454820817640} + m_PrefabAsset: {fileID: 0} --- !u!1001 &9207063593856425830 PrefabInstance: m_ObjectHideFlags: 0 @@ -2618,7 +2877,7 @@ PrefabInstance: objectReference: {fileID: 5480585174247187439} - target: {fileID: 6059725000919627127, guid: 2fd3e07afe5b461490fb8e314976b1b0, type: 3} propertyPath: m_Radius - value: 0.035 + value: 0.1 objectReference: {fileID: 0} - target: {fileID: 6189354538098044173, guid: 2fd3e07afe5b461490fb8e314976b1b0, type: 3} propertyPath: m_RootOrder diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Prefabs/XR Origin Hands (XR Rig).prefab.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Prefabs/XR Origin Hands (XR Rig).prefab.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Prefabs/XR Origin Hands (XR Rig).prefab.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Prefabs/XR Origin Hands (XR Rig).prefab.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/HandsDemoSceneAssets/Scripts.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Scripts.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/HandsDemoSceneAssets/Scripts.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Scripts.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Scripts/HandsOneEuroFilterPostProcessor.cs b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Scripts/HandsOneEuroFilterPostProcessor.cs new file mode 100644 index 0000000..f46c2c6 --- /dev/null +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Scripts/HandsOneEuroFilterPostProcessor.cs @@ -0,0 +1,137 @@ +#if XR_HANDS_1_2_OR_NEWER +using System.Collections.Generic; +using UnityEngine.XR.Hands; +using UnityEngine.XR.Hands.Processing; +#endif + +namespace UnityEngine.XR.Interaction.Toolkit.Samples.Hands +{ + /// + /// A post processor for XR hand tracking data, using the One Euro filter to smooth hand positions. + /// +#if XR_HANDS_1_2_OR_NEWER + public class HandsOneEuroFilterPostProcessor : MonoBehaviour, IXRHandProcessor +#else + public class HandsOneEuroFilterPostProcessor : MonoBehaviour +#endif + { + [SerializeField] + [Tooltip("Smoothing amount at low speeds.")] + float m_FilterMinCutoff = 0.1f; + + [SerializeField] + [Tooltip("Filter's responsiveness to speed changes.")] + float m_FilterBeta = 0.2f; + +#if XR_HANDS_1_2_OR_NEWER + /// + public int callbackOrder => 0; + + readonly OneEuroFilterVector3 m_LeftHandFilter = new OneEuroFilterVector3(Vector3.zero); + readonly OneEuroFilterVector3 m_RightHandFilter = new OneEuroFilterVector3(Vector3.zero); + + bool m_WasLeftHandTrackedLastFrame; + bool m_WasRightHandTrackedLastFrame; + + XRHandSubsystem m_Subsystem; + static readonly List s_SubsystemsReuse = new List(); +#endif + +#if XR_HANDS_1_2_OR_NEWER + /// + /// See . + /// + void OnDisable() + { + if (m_Subsystem != null) + { + m_Subsystem.UnregisterProcessor(this); + m_Subsystem = null; + } + } + + /// + /// See . + /// + void Update() + { + if (m_Subsystem != null && m_Subsystem.running) + return; + + SubsystemManager.GetSubsystems(s_SubsystemsReuse); + var foundRunningHandSubsystem = false; + for (var i = 0; i < s_SubsystemsReuse.Count; ++i) + { + var handSubsystem = s_SubsystemsReuse[i]; + if (handSubsystem.running) + { + m_Subsystem?.UnregisterProcessor(this); + m_Subsystem = handSubsystem; + foundRunningHandSubsystem = true; + break; + } + } + + if (!foundRunningHandSubsystem) + return; + + m_WasLeftHandTrackedLastFrame = false; + m_WasRightHandTrackedLastFrame = false; + m_Subsystem.RegisterProcessor(this); + } + + /// + public void ProcessJoints(XRHandSubsystem subsystem, XRHandSubsystem.UpdateSuccessFlags successFlags, XRHandSubsystem.UpdateType updateType) + { + var leftHand = subsystem.leftHand; + if (leftHand.isTracked) + { + var leftHandPose = leftHand.rootPose; + if (!m_WasLeftHandTrackedLastFrame) + { + m_LeftHandFilter.Initialize(leftHandPose.position); + } + else + { + var newLeftPosition = m_LeftHandFilter.Filter(leftHandPose.position, Time.deltaTime, m_FilterMinCutoff, m_FilterBeta); + var newLeftPose = new Pose(newLeftPosition, leftHandPose.rotation); + + leftHand.SetRootPose(newLeftPose); + subsystem.SetCorrespondingHand(leftHand); + } + } + + m_WasLeftHandTrackedLastFrame = leftHand.isTracked; + + var rightHand = subsystem.rightHand; + if (rightHand.isTracked) + { + var rightHandPose = rightHand.rootPose; + if (!m_WasRightHandTrackedLastFrame) + { + m_RightHandFilter.Initialize(rightHandPose.position); + } + else + { + var newRightPosition = m_RightHandFilter.Filter(rightHandPose.position, Time.deltaTime, m_FilterMinCutoff, m_FilterBeta); + var newRightPose = new Pose(newRightPosition, rightHandPose.rotation); + + rightHand.SetRootPose(newRightPose); + subsystem.SetCorrespondingHand(rightHand); + } + } + + m_WasRightHandTrackedLastFrame = rightHand.isTracked; + } +#else + /// + /// See . + /// + void Awake() + { + Debug.LogWarning("HandsOneEuroFilterPostProcessor requires XR Hands (com.unity.xr.hands) 1.2.0 or newer. Disabling component.", this); + enabled = false; + } +#endif + } +} \ No newline at end of file diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Scripts/HandsOneEuroFilterPostProcessor.cs.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Scripts/HandsOneEuroFilterPostProcessor.cs.meta new file mode 100644 index 0000000..73b2b27 --- /dev/null +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Scripts/HandsOneEuroFilterPostProcessor.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: bc6980b6cb3b4f12b6b75074e4ef59f3 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Scripts/HideObjectWhenRayInteractorBlocked.cs b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Scripts/HideObjectWhenRayInteractorBlocked.cs new file mode 100644 index 0000000..c088408 --- /dev/null +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Scripts/HideObjectWhenRayInteractorBlocked.cs @@ -0,0 +1,33 @@ +namespace UnityEngine.XR.Interaction.Toolkit.Samples.Hands +{ + /// + /// Hides the specified GameObject when the associated XRRayInteractor is blocked by an interaction within its group. + /// + public class HideObjectWhenRayInteractorBlocked : MonoBehaviour + { + [SerializeField] + [Tooltip("The XRRayInteractor that this component monitors for blockages.")] + XRRayInteractor m_Interactor; + + [SerializeField] + [Tooltip("The GameObject to hide when the XRRayInteractor is blocked.")] + GameObject m_ObjectToHide; + + /// + /// See . + /// + void OnEnable() + { + if (m_Interactor == null || m_ObjectToHide == null) + enabled = false; + } + + /// + /// See . + /// + void Update() + { + m_ObjectToHide.SetActive(m_Interactor.isActiveAndEnabled && !m_Interactor.IsBlockedByInteractionWithinGroup()); + } + } +} \ No newline at end of file diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Scripts/HideObjectWhenRayInteractorBlocked.cs.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Scripts/HideObjectWhenRayInteractorBlocked.cs.meta new file mode 100644 index 0000000..7413c99 --- /dev/null +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Scripts/HideObjectWhenRayInteractorBlocked.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 2e989a75b2954bdab01ca618a30d5de6 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Scripts/LocalPositionOffsetAffordanceReceiver.cs b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Scripts/LocalPositionOffsetAffordanceReceiver.cs new file mode 100644 index 0000000..8eedbd6 --- /dev/null +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Scripts/LocalPositionOffsetAffordanceReceiver.cs @@ -0,0 +1,71 @@ +using Unity.Mathematics; +using UnityEngine.XR.Interaction.Toolkit.AffordanceSystem.Receiver.Primitives; + +namespace UnityEngine.XR.Interaction.Toolkit.Samples.Hands +{ + /// + /// Affordance receiver applying a Vector3 (Float3) affordance theme to a Transform local position. + /// Broadcasts new affordance value with Unity Event. + /// + [AddComponentMenu("Affordance System/Receiver/Transformation/Local Position Offset Affordance Receiver", 12)] + public class LocalPositionOffsetAffordanceReceiver : Vector3AffordanceReceiver + { + [SerializeField] + [Tooltip("Transform on which to apply a local translation value.")] + Transform m_TransformToTranslate; + + /// + /// Transform on which to apply a local translation value. + /// + public Transform transformToTranslate + { + get => m_TransformToTranslate; + set + { + m_TransformToTranslate = value; + m_HasTransformToTranslate = m_TransformToTranslate != null; + } + } + + bool m_HasTransformToTranslate; + float3 m_InitialOffset = float3.zero; + + /// + protected override void OnEnable() + { + base.OnEnable(); + m_HasTransformToTranslate = m_TransformToTranslate != null; + } + + /// + protected override float3 GetCurrentValueForCapture() + { + if (m_HasTransformToTranslate) + { + m_InitialOffset = m_TransformToTranslate.localPosition; + } + + return float3.zero; + } + + /// + protected override void OnAffordanceValueUpdated(float3 newValue) + { + if (m_HasTransformToTranslate) + { + m_TransformToTranslate.localPosition = m_InitialOffset + newValue; + } + + base.OnAffordanceValueUpdated(newValue); + } + + /// + /// See . + /// + void OnValidate() + { + if (m_TransformToTranslate == null) + m_TransformToTranslate = transform; + } + } +} diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Scripts/LocalPositionOffsetAffordanceReceiver.cs.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Scripts/LocalPositionOffsetAffordanceReceiver.cs.meta new file mode 100644 index 0000000..03d9955 --- /dev/null +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Scripts/LocalPositionOffsetAffordanceReceiver.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 865d01d2834c9cb4caa8f2c901104c2d +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Scripts/MetaSystemGestureDetector.cs b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Scripts/MetaSystemGestureDetector.cs similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Scripts/MetaSystemGestureDetector.cs rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Scripts/MetaSystemGestureDetector.cs diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Scripts/MetaSystemGestureDetector.cs.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Scripts/MetaSystemGestureDetector.cs.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Scripts/MetaSystemGestureDetector.cs.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Scripts/MetaSystemGestureDetector.cs.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Scripts/OneEuroFilterVector3.cs b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Scripts/OneEuroFilterVector3.cs new file mode 100644 index 0000000..2e0643c --- /dev/null +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Scripts/OneEuroFilterVector3.cs @@ -0,0 +1,126 @@ +using UnityEngine.XR.Interaction.Toolkit.Utilities; + +namespace UnityEngine.XR.Interaction.Toolkit.Samples.Hands +{ + /// + /// Provides a means to smooth jittery signals. + /// This filter is particularly effective for small and rapid movements, + /// making it useful for applications like motion tracking or gesture recognition. + /// + /// + /// The filtering process relies on two main parameters: minCutoff and beta. + /// + /// + /// minCutoff + /// primarily influences the smoothing at low speeds. + /// + /// + /// beta + /// determines the filter's responsiveness to speed changes. + /// + /// + /// + public class OneEuroFilterVector3 + { + Vector3 m_LastRawValue; + Vector3 m_LastFilteredValue; + readonly float m_MinCutoff; + readonly float m_Beta; + + /// + /// Initializes a new instance of the with specified cutoff and beta values. + /// + /// The initial raw value for the filter. + /// The minimum cutoff value for the filter. Default is 0.1f. + /// The beta value for the filter. Default is 0.02f. + /// + /// Filter parameters: + /// + /// + /// + /// + /// Controls the amount of smoothing at low speeds. A smaller value will introduce + /// more smoothing and potential lag, helping to reduce low-frequency jitter. A larger value + /// may feel more responsive but can let through more jitter. It's advised to start with a + /// value around 0.1 for masking jitter in movements of about 1 cm. + /// + /// + /// + /// + /// + /// Determines the filter's adjustment to speed changes. A smaller value provides consistent + /// smoothing, while a larger one introduces more aggressive adjustments for speed changes, offering + /// responsive filtering at high speeds. A starting value of 0.02 is recommended, but fine-tuning + /// might be necessary based on specific use cases. + /// + /// + /// + /// + /// + public OneEuroFilterVector3(Vector3 initialRawValue, float minCutoff = 0.1f, float beta = 0.02f) + { + m_LastRawValue = initialRawValue; + m_LastFilteredValue = initialRawValue; + m_MinCutoff = minCutoff; + m_Beta = beta; + } + + /// + /// Resets the initial raw value. Useful to recover from tracking loss. + /// + /// Raw value to reset filtering basis to. + public void Initialize(Vector3 initialRawValue) + { + m_LastRawValue = initialRawValue; + m_LastFilteredValue = initialRawValue; + } + + /// + /// Filters the given rawValue using the internal minCutoff and beta parameters. + /// + /// The raw value to be filtered. + /// The time since the last filter update. + /// The filtered value. + public Vector3 Filter(Vector3 rawValue, float deltaTime) + { + return Filter(rawValue, deltaTime, m_MinCutoff, m_Beta); + } + + /// + /// Filters the given rawValue using provided minCutoff and beta parameters. + /// This method computes the speed of change in the signal and dynamically adjusts the amount of smoothing + /// based on the speed and the provided minCutoff and beta values. + /// + /// The raw value to be filtered. + /// The time since the last filter update. + /// The minimum cutoff value for the filter. Influences the amount of smoothing at low speeds. + /// Determines the filter's adjustment to speed changes, influencing its responsiveness. + /// The filtered value. + public Vector3 Filter(Vector3 rawValue, float deltaTime, float minCutoff, float beta) + { + // Calculate speed as a Vector3 + Vector3 speed = (rawValue - m_LastRawValue) / deltaTime; + + // Compute cutoffs for x, y, and z + Vector3 cutoffs = new Vector3(minCutoff, minCutoff, minCutoff); + Vector3 betaValues = new Vector3(beta, beta, beta); + + // Incorporate speed into the cutoffs + Vector3 combinedCutoffs = cutoffs + Vector3.Scale(betaValues, speed); + + // Compute alpha for x, y, and z + BurstMathUtility.FastSafeDivide(Vector3.one, Vector3.one + combinedCutoffs, out Vector3 alpha); + + Vector3 rawFiltered = Vector3.Scale(alpha, rawValue); + Vector3 lastFiltered = Vector3.Scale(Vector3.one - alpha, m_LastFilteredValue); + + // Calculate the final filtered value + Vector3 filteredValue = rawFiltered + lastFiltered; + + m_LastRawValue = rawValue; + m_LastFilteredValue = filteredValue; + + return filteredValue; + } + } +} diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Scripts/OneEuroFilterVector3.cs.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Scripts/OneEuroFilterVector3.cs.meta new file mode 100644 index 0000000..c5cfc42 --- /dev/null +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Scripts/OneEuroFilterVector3.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 8cf24614c456bc04c9adb820d19e35c5 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Scripts/PinchPointFollow.cs b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Scripts/PinchPointFollow.cs new file mode 100644 index 0000000..6cf7b37 --- /dev/null +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Scripts/PinchPointFollow.cs @@ -0,0 +1,112 @@ +#if XR_HANDS_1_2_OR_NEWER +using Unity.XR.CoreUtils; +using Unity.XR.CoreUtils.Bindings; +using UnityEngine.XR.Hands; +using UnityEngine.XR.Interaction.Toolkit.Utilities.Tweenables.Primitives; +#endif + +namespace UnityEngine.XR.Interaction.Toolkit.Samples.Hands +{ + /// + /// A class that follows the pinch point between the thumb and index finger using XR Hand Tracking. + /// It updates its position to the midpoint between the thumb and index tip while optionally adjusting its rotation + /// to look at a specified target. The rotation towards the target can also be smoothly interpolated over time. + /// + public class PinchPointFollow : MonoBehaviour + { + [SerializeField] + [Tooltip("The XR Hand Tracking Events component that will be used to subscribe to hand tracking events.")] +#if XR_HANDS_1_2_OR_NEWER + XRHandTrackingEvents m_XRHandTrackingEvents; +#else + Object m_XRHandTrackingEvents; +#endif + + [SerializeField] + [Tooltip("The transform to match the rotation of.")] + Transform m_TargetRotation; + + [SerializeField] + [Tooltip("The transform will use the XRRayInteractor endpoint position to calculate the transform rotation.")] + XRRayInteractor m_RayInteractor; + + [SerializeField] + [Tooltip("How fast to match rotation (0 means no rotation smoothing.)")] + [Range(0f, 32f)] + float m_RotationSmoothingSpeed = 12f; + +#if XR_HANDS_1_2_OR_NEWER + bool m_HasRayInteractor; + bool m_HasTargetRotationTransform; + + OneEuroFilterVector3 m_OneEuroFilterVector3; + readonly QuaternionTweenableVariable m_QuaternionTweenableVariable = new QuaternionTweenableVariable(); + readonly BindingsGroup m_BindingsGroup = new BindingsGroup(); +#endif + + /// + /// See . + /// + void OnEnable() + { +#if XR_HANDS_1_2_OR_NEWER + if (m_XRHandTrackingEvents != null) + m_XRHandTrackingEvents.jointsUpdated.AddListener(OnJointsUpdated); + + m_OneEuroFilterVector3 = new OneEuroFilterVector3(transform.localPosition); + m_HasRayInteractor = m_RayInteractor != null; + m_HasTargetRotationTransform = m_TargetRotation != null; + m_BindingsGroup.AddBinding(m_QuaternionTweenableVariable.Subscribe(newValue => transform.rotation = newValue)); +#else + Debug.LogWarning("PinchPointFollow requires XR Hands (com.unity.xr.hands) 1.2.0 or newer. Disabling component.", this); + enabled = false; +#endif + } + + /// + /// See . + /// + void OnDisable() + { +#if XR_HANDS_1_2_OR_NEWER + m_BindingsGroup.Clear(); + if (m_XRHandTrackingEvents != null) + m_XRHandTrackingEvents.jointsUpdated.RemoveListener(OnJointsUpdated); +#endif + } + +#if XR_HANDS_1_2_OR_NEWER + void OnJointsUpdated(XRHandJointsUpdatedEventArgs args) + { + var thumbTip = args.hand.GetJoint(XRHandJointID.ThumbTip); + if (!thumbTip.TryGetPose(out var thumbTipPose)) + return; + + var indexTip = args.hand.GetJoint(XRHandJointID.IndexTip); + if (!indexTip.TryGetPose(out var indexTipPose)) + return; + + var targetPos = Vector3.Lerp(thumbTipPose.position, indexTipPose.position, 0.5f); + var filteredTargetPos = m_OneEuroFilterVector3.Filter(targetPos, Time.deltaTime); + + // Hand pose data is in local space relative to the xr origin. + transform.localPosition = filteredTargetPos; + + if (m_HasTargetRotationTransform && m_HasRayInteractor) + { + // Given that the ray endpoint is in worldspace, we need to use the worldspace transform of this point to determine the target rotation. + // This allows us to keep orientation consistent when moving the xr origin for locomotion. + var targetDir = (m_RayInteractor.rayEndPoint - transform.position).normalized; + var targetRot = Quaternion.LookRotation(targetDir); + + // If there aren't any major swings in rotation, follow the target rotation. + if (Vector3.Dot(m_TargetRotation.forward, targetDir) > 0.5f) + m_QuaternionTweenableVariable.target = targetRot; + } + + var tweenTarget = m_RotationSmoothingSpeed > 0f ? m_RotationSmoothingSpeed * Time.deltaTime : 1f; + m_QuaternionTweenableVariable.HandleTween(tweenTarget); + } +#endif + } +} diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Scripts/PinchPointFollow.cs.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Scripts/PinchPointFollow.cs.meta new file mode 100644 index 0000000..3e39de3 --- /dev/null +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Scripts/PinchPointFollow.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 8693657abb5062a40a80ba3cb86ef181 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Scripts/PokeGestureDetector.cs b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Scripts/PokeGestureDetector.cs similarity index 99% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Scripts/PokeGestureDetector.cs rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Scripts/PokeGestureDetector.cs index e041a95..29e0c72 100644 --- a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Scripts/PokeGestureDetector.cs +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Scripts/PokeGestureDetector.cs @@ -197,4 +197,4 @@ namespace UnityEngine.XR.Interaction.Toolkit.Samples.Hands } #endif } -} \ No newline at end of file +} diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Scripts/PokeGestureDetector.cs.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Scripts/PokeGestureDetector.cs.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Scripts/PokeGestureDetector.cs.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Scripts/PokeGestureDetector.cs.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Shaders.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Shaders.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Shaders.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Shaders.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Shaders/DepthOnly.shader b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Shaders/DepthOnly.shader similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Shaders/DepthOnly.shader rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Shaders/DepthOnly.shader diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Shaders/DepthOnly.shader.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Shaders/DepthOnly.shader.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Shaders/DepthOnly.shader.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Shaders/DepthOnly.shader.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Shaders/RimLight.shadergraph b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Shaders/RimLight.shadergraph new file mode 100644 index 0000000..d082eb0 --- /dev/null +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Shaders/RimLight.shadergraph @@ -0,0 +1,1191 @@ +{ + "m_SGVersion": 3, + "m_Type": "UnityEditor.ShaderGraph.GraphData", + "m_ObjectId": "d507a2b68a194cacb4c8b62c7f4e5e72", + "m_Properties": [ + { + "m_Id": "955641a6bbfa49beb23e3dd9fbb4c9c8" + }, + { + "m_Id": "cca03c3dcfd64292846075c3d1c50022" + }, + { + "m_Id": "dc070148fa7f467b99e9f1922b6558a4" + } + ], + "m_Keywords": [], + "m_Dropdowns": [], + "m_CategoryData": [ + { + "m_Id": "70d91adefb3d426e8ccfc57edd86c917" + } + ], + "m_Nodes": [ + { + "m_Id": "5ceeed517ff94176b31c1c976413c721" + }, + { + "m_Id": "d4e389164dd848d79fb9fba68c328820" + }, + { + "m_Id": "0cf1ffa448d646d5b1c94385ab286d0d" + }, + { + "m_Id": "ea94811bffad44d281b643aaf7fcb968" + }, + { + "m_Id": "281aea6a4b434164a84f831fea4b4bb1" + }, + { + "m_Id": "a1b2c45b4f7146a78e360c7011b7d7af" + }, + { + "m_Id": "3af70668a94b4adcacae08068095b11d" + }, + { + "m_Id": "c1a789cd49d040bca49892ef5355b014" + }, + { + "m_Id": "ce9cb4978b704df48372fcec36805d90" + }, + { + "m_Id": "dbdcc843e21440ca9f7b2092328b152d" + }, + { + "m_Id": "2a378b84075a4e57a434b46d07d92a43" + }, + { + "m_Id": "8a9882f11e4d49afa27791b660b0ac21" + } + ], + "m_GroupDatas": [], + "m_StickyNoteDatas": [], + "m_Edges": [ + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "2a378b84075a4e57a434b46d07d92a43" + }, + "m_SlotId": 4 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "281aea6a4b434164a84f831fea4b4bb1" + }, + "m_SlotId": 0 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "3af70668a94b4adcacae08068095b11d" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "a1b2c45b4f7146a78e360c7011b7d7af" + }, + "m_SlotId": 388273844 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "a1b2c45b4f7146a78e360c7011b7d7af" + }, + "m_SlotId": 1 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "ea94811bffad44d281b643aaf7fcb968" + }, + "m_SlotId": 0 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "c1a789cd49d040bca49892ef5355b014" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "a1b2c45b4f7146a78e360c7011b7d7af" + }, + "m_SlotId": 1369637604 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "ce9cb4978b704df48372fcec36805d90" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "a1b2c45b4f7146a78e360c7011b7d7af" + }, + "m_SlotId": 585579156 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "dbdcc843e21440ca9f7b2092328b152d" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "2a378b84075a4e57a434b46d07d92a43" + }, + "m_SlotId": 0 + } + } + ], + "m_VertexContext": { + "m_Position": { + "x": 273.33331298828127, + "y": 34.666656494140628 + }, + "m_Blocks": [ + { + "m_Id": "5ceeed517ff94176b31c1c976413c721" + }, + { + "m_Id": "d4e389164dd848d79fb9fba68c328820" + }, + { + "m_Id": "0cf1ffa448d646d5b1c94385ab286d0d" + } + ] + }, + "m_FragmentContext": { + "m_Position": { + "x": 273.33331298828127, + "y": 234.66668701171876 + }, + "m_Blocks": [ + { + "m_Id": "ea94811bffad44d281b643aaf7fcb968" + }, + { + "m_Id": "281aea6a4b434164a84f831fea4b4bb1" + }, + { + "m_Id": "8a9882f11e4d49afa27791b660b0ac21" + } + ] + }, + "m_PreviewData": { + "serializedMesh": { + "m_SerializedMesh": "{\"mesh\":{\"instanceID\":0}}", + "m_Guid": "" + }, + "preventRotation": false + }, + "m_Path": "Shader Graphs", + "m_GraphPrecision": 1, + "m_PreviewMode": 2, + "m_OutputNode": { + "m_Id": "" + }, + "m_ActiveTargets": [ + { + "m_Id": "1c30cf4de3904ae58c308fa32a06bdd6" + }, + { + "m_Id": "15af2ebb74d045cd93fdc56a91ca4c5c" + } + ] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.TangentMaterialSlot", + "m_ObjectId": "016adcf5af0947ba9b80bd4195393bf2", + "m_Id": 0, + "m_DisplayName": "Tangent", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Tangent", + "m_StageCapability": 1, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_Labels": [], + "m_Space": 0 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.NormalMaterialSlot", + "m_ObjectId": "074d63f88bab4227bcdb1e924a9dca07", + "m_Id": 0, + "m_DisplayName": "Normal", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Normal", + "m_StageCapability": 1, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_Labels": [], + "m_Space": 0 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "0c1fb89360d1419d83b7c9fafed359e9", + "m_Id": 0, + "m_DisplayName": "Power", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "0cf1ffa448d646d5b1c94385ab286d0d", + "m_Group": { + "m_Id": "" + }, + "m_Name": "VertexDescription.Tangent", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "016adcf5af0947ba9b80bd4195393bf2" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "VertexDescription.Tangent" +} + +{ + "m_SGVersion": 1, + "m_Type": "UnityEditor.Rendering.Universal.ShaderGraph.UniversalTarget", + "m_ObjectId": "15af2ebb74d045cd93fdc56a91ca4c5c", + "m_ActiveSubTarget": { + "m_Id": "27a15476cf624e6a9243022d3a0d4e31" + }, + "m_AllowMaterialOverride": true, + "m_SurfaceType": 1, + "m_ZTestMode": 4, + "m_ZWriteControl": 0, + "m_AlphaMode": 0, + "m_RenderFace": 2, + "m_AlphaClip": false, + "m_CastShadows": false, + "m_ReceiveShadows": true, + "m_CustomEditorGUI": "", + "m_SupportVFX": false +} + +{ + "m_SGVersion": 2, + "m_Type": "UnityEditor.Rendering.BuiltIn.ShaderGraph.BuiltInTarget", + "m_ObjectId": "1c30cf4de3904ae58c308fa32a06bdd6", + "m_ActiveSubTarget": { + "m_Id": "fdf1c8370c304f57ac875081260fc06e" + }, + "m_AllowMaterialOverride": true, + "m_SurfaceType": 1, + "m_ZWriteControl": 0, + "m_ZTestMode": 4, + "m_AlphaMode": 0, + "m_RenderFace": 2, + "m_AlphaClip": false, + "m_CustomEditorGUI": "" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "22378bfaed104aaf8d87efb2497e7be3", + "m_Id": 0, + "m_DisplayName": "In", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "In", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.Rendering.Universal.ShaderGraph.UniversalUnlitSubTarget", + "m_ObjectId": "27a15476cf624e6a9243022d3a0d4e31" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "281aea6a4b434164a84f831fea4b4bb1", + "m_Group": { + "m_Id": "" + }, + "m_Name": "SurfaceDescription.Alpha", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "cb3a14d585374becba90c2e9ecdc2a60" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "SurfaceDescription.Alpha" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.SplitNode", + "m_ObjectId": "2a378b84075a4e57a434b46d07d92a43", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Split", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -16.666685104370118, + "y": 640.0, + "width": 120.66668701171875, + "height": 150.6666259765625 + } + }, + "m_Slots": [ + { + "m_Id": "22378bfaed104aaf8d87efb2497e7be3" + }, + { + "m_Id": "8f62caeeaa6f4cbea814d3305852b2e0" + }, + { + "m_Id": "76cd836a5759434c829dcfd8bbe247cf" + }, + { + "m_Id": "413be9f87022477f8932258b04035eaa" + }, + { + "m_Id": "5a0137fd8e0d411eba6c7ac4aa32eeb9" + } + ], + "synonyms": [ + "separate" + ], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PropertyNode", + "m_ObjectId": "3af70668a94b4adcacae08068095b11d", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Property", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -334.6666564941406, + "y": 350.0000305175781, + "width": 131.3332977294922, + "height": 36.000030517578128 + } + }, + "m_Slots": [ + { + "m_Id": "ef41ed6f11ec4f79bde0022678d6990b" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Property": { + "m_Id": "cca03c3dcfd64292846075c3d1c50022" + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "413be9f87022477f8932258b04035eaa", + "m_Id": 3, + "m_DisplayName": "B", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "B", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "44f36b19e19a4b88854f2fd3132dd9fe", + "m_Id": 585579156, + "m_DisplayName": "Power", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Vector1_65e2a85457434808843afef2fe2e87a4", + "m_StageCapability": 3, + "m_Value": 5.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "5a0137fd8e0d411eba6c7ac4aa32eeb9", + "m_Id": 4, + "m_DisplayName": "A", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "A", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "5ceeed517ff94176b31c1c976413c721", + "m_Group": { + "m_Id": "" + }, + "m_Name": "VertexDescription.Position", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "91c061b47e234432bb085f9e763e0083" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "VertexDescription.Position" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "60e6bead4312448695fdd5d651e7c8e9", + "m_Id": 0, + "m_DisplayName": "Alpha Clip Threshold", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "AlphaClipThreshold", + "m_StageCapability": 2, + "m_Value": 0.5, + "m_DefaultValue": 0.5, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot", + "m_ObjectId": "7019981f94b84e8fbd6c335934e7ebc6", + "m_Id": 1, + "m_DisplayName": "Out_Vector4", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "OutVector4", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.CategoryData", + "m_ObjectId": "70d91adefb3d426e8ccfc57edd86c917", + "m_Name": "", + "m_ChildObjectList": [ + { + "m_Id": "955641a6bbfa49beb23e3dd9fbb4c9c8" + }, + { + "m_Id": "cca03c3dcfd64292846075c3d1c50022" + }, + { + "m_Id": "dc070148fa7f467b99e9f1922b6558a4" + } + ] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "76cd836a5759434c829dcfd8bbe247cf", + "m_Id": 2, + "m_DisplayName": "G", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "G", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot", + "m_ObjectId": "7eeb5a66d7b349119852dd586128931b", + "m_Id": 1369637604, + "m_DisplayName": "EdgeColor", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Vector4_16fda35adb4d4d2494a2b1894693a25c", + "m_StageCapability": 3, + "m_Value": { + "x": 1.0, + "y": 1.0, + "z": 1.0, + "w": 0.5 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot", + "m_ObjectId": "88ac377d02bf46b69d3d8f4db4170c60", + "m_Id": 0, + "m_DisplayName": "MainColor", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "8a9882f11e4d49afa27791b660b0ac21", + "m_Group": { + "m_Id": "" + }, + "m_Name": "SurfaceDescription.AlphaClipThreshold", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "60e6bead4312448695fdd5d651e7c8e9" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "SurfaceDescription.AlphaClipThreshold" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "8f62caeeaa6f4cbea814d3305852b2e0", + "m_Id": 1, + "m_DisplayName": "R", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "R", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PositionMaterialSlot", + "m_ObjectId": "91c061b47e234432bb085f9e763e0083", + "m_Id": 0, + "m_DisplayName": "Position", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Position", + "m_StageCapability": 1, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_Labels": [], + "m_Space": 0 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.ColorRGBMaterialSlot", + "m_ObjectId": "92f2f713e5fe4579991dfc7e6ba6425e", + "m_Id": 0, + "m_DisplayName": "Base Color", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "BaseColor", + "m_StageCapability": 2, + "m_Value": { + "x": 0.5, + "y": 0.5, + "z": 0.5 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_Labels": [], + "m_ColorMode": 0, + "m_DefaultColor": { + "r": 0.5, + "g": 0.5, + "b": 0.5, + "a": 1.0 + } +} + +{ + "m_SGVersion": 1, + "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", + "m_ObjectId": "955641a6bbfa49beb23e3dd9fbb4c9c8", + "m_Guid": { + "m_GuidSerialized": "399bb8b8-8447-4274-b8cd-7d5c9be709a0" + }, + "m_Name": "Power", + "m_DefaultRefNameVersion": 1, + "m_RefNameGeneratedByDisplayName": "Power", + "m_DefaultReferenceName": "_Power", + "m_OverrideReferenceName": "", + "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", + "m_Precision": 0, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, + "m_Hidden": false, + "m_Value": 5.0, + "m_FloatType": 0, + "m_RangeValues": { + "x": 0.0, + "y": 1.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.SubGraphNode", + "m_ObjectId": "a1b2c45b4f7146a78e360c7011b7d7af", + "m_Group": { + "m_Id": "" + }, + "m_Name": "EdgeHighlight", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -170.6666717529297, + "y": 234.66664123535157, + "width": 225.33331298828126, + "height": 328.0 + } + }, + "m_Slots": [ + { + "m_Id": "44f36b19e19a4b88854f2fd3132dd9fe" + }, + { + "m_Id": "7eeb5a66d7b349119852dd586128931b" + }, + { + "m_Id": "e0391b37f9194583a6bb95c07166b47e" + }, + { + "m_Id": "7019981f94b84e8fbd6c335934e7ebc6" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedSubGraph": "{\n \"subGraph\": {\n \"fileID\": -5475051401550479605,\n \"guid\": \"3167e2a6e0f4099428078b1f37bd6322\",\n \"type\": 3\n }\n}", + "m_PropertyGuids": [ + "fd0a4bf6-b300-4e65-a3eb-da5ec12952cf", + "d2464835-3bbc-4d61-b15c-b807dc2d3cc9", + "26a47553-de8e-4ba3-bb38-9b50d205b82a" + ], + "m_PropertyIds": [ + 585579156, + 1369637604, + 388273844 + ], + "m_Dropdowns": [], + "m_DropdownSelectedEntries": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PropertyNode", + "m_ObjectId": "c1a789cd49d040bca49892ef5355b014", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Property", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -383.3333435058594, + "y": 301.3333740234375, + "width": 133.33335876464845, + "height": 35.999969482421878 + } + }, + "m_Slots": [ + { + "m_Id": "dfaf30cc8ef84b5e94152fdacac2a9d5" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Property": { + "m_Id": "dc070148fa7f467b99e9f1922b6558a4" + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "cb3a14d585374becba90c2e9ecdc2a60", + "m_Id": 0, + "m_DisplayName": "Alpha", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Alpha", + "m_StageCapability": 2, + "m_Value": 1.0, + "m_DefaultValue": 1.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 3, + "m_Type": "UnityEditor.ShaderGraph.Internal.ColorShaderProperty", + "m_ObjectId": "cca03c3dcfd64292846075c3d1c50022", + "m_Guid": { + "m_GuidSerialized": "3016da81-8154-4851-844b-db3802ba78bc" + }, + "m_Name": "MainColor", + "m_DefaultRefNameVersion": 1, + "m_RefNameGeneratedByDisplayName": "MainColor", + "m_DefaultReferenceName": "_MainColor", + "m_OverrideReferenceName": "", + "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", + "m_Precision": 0, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, + "m_Hidden": false, + "m_Value": { + "r": 0.0, + "g": 0.0, + "b": 0.0, + "a": 0.501960813999176 + }, + "isMainColor": true, + "m_ColorMode": 0 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PropertyNode", + "m_ObjectId": "ce9cb4978b704df48372fcec36805d90", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Property", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -360.0, + "y": 234.6666717529297, + "width": 110.00001525878906, + "height": 36.00001525878906 + } + }, + "m_Slots": [ + { + "m_Id": "0c1fb89360d1419d83b7c9fafed359e9" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Property": { + "m_Id": "955641a6bbfa49beb23e3dd9fbb4c9c8" + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "d4e389164dd848d79fb9fba68c328820", + "m_Group": { + "m_Id": "" + }, + "m_Name": "VertexDescription.Normal", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "074d63f88bab4227bcdb1e924a9dca07" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "VertexDescription.Normal" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PropertyNode", + "m_ObjectId": "dbdcc843e21440ca9f7b2092328b152d", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Property", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -190.00001525878907, + "y": 630.6666259765625, + "width": 131.33334350585938, + "height": 35.99993896484375 + } + }, + "m_Slots": [ + { + "m_Id": "88ac377d02bf46b69d3d8f4db4170c60" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Property": { + "m_Id": "cca03c3dcfd64292846075c3d1c50022" + } +} + +{ + "m_SGVersion": 3, + "m_Type": "UnityEditor.ShaderGraph.Internal.ColorShaderProperty", + "m_ObjectId": "dc070148fa7f467b99e9f1922b6558a4", + "m_Guid": { + "m_GuidSerialized": "4d910a2e-27dd-4eea-be1c-81b32f3806b9" + }, + "m_Name": "EdgeColor", + "m_DefaultRefNameVersion": 1, + "m_RefNameGeneratedByDisplayName": "EdgeColor", + "m_DefaultReferenceName": "_EdgeColor", + "m_OverrideReferenceName": "", + "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", + "m_Precision": 0, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, + "m_Hidden": false, + "m_Value": { + "r": 1.0, + "g": 1.0, + "b": 1.0, + "a": 0.0 + }, + "isMainColor": false, + "m_ColorMode": 0 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot", + "m_ObjectId": "dfaf30cc8ef84b5e94152fdacac2a9d5", + "m_Id": 0, + "m_DisplayName": "EdgeColor", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot", + "m_ObjectId": "e0391b37f9194583a6bb95c07166b47e", + "m_Id": 388273844, + "m_DisplayName": "MainColor", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Vector4_e7ec15d738174e87be7ed213307bd8ff", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.5 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "ea94811bffad44d281b643aaf7fcb968", + "m_Group": { + "m_Id": "" + }, + "m_Name": "SurfaceDescription.BaseColor", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "92f2f713e5fe4579991dfc7e6ba6425e" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "SurfaceDescription.BaseColor" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot", + "m_ObjectId": "ef41ed6f11ec4f79bde0022678d6990b", + "m_Id": 0, + "m_DisplayName": "MainColor", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.Rendering.BuiltIn.ShaderGraph.BuiltInUnlitSubTarget", + "m_ObjectId": "fdf1c8370c304f57ac875081260fc06e" +} + diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Shaders/RimLight.shadergraph.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Shaders/RimLight.shadergraph.meta new file mode 100644 index 0000000..247fb8f --- /dev/null +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Shaders/RimLight.shadergraph.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 4ff4bf42ffc12e34a9c53b2f216f5442 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 625f186215c104763be7675aa2d941aa, type: 3} diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Shaders/Subgraphs.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Shaders/Subgraphs.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Shaders/Subgraphs.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Shaders/Subgraphs.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Shaders/Subgraphs/AllFingerHighlights.shadersubgraph b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Shaders/Subgraphs/AllFingerHighlights.shadersubgraph similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Shaders/Subgraphs/AllFingerHighlights.shadersubgraph rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Shaders/Subgraphs/AllFingerHighlights.shadersubgraph diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Shaders/Subgraphs/AllFingerHighlights.shadersubgraph.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Shaders/Subgraphs/AllFingerHighlights.shadersubgraph.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Shaders/Subgraphs/AllFingerHighlights.shadersubgraph.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Shaders/Subgraphs/AllFingerHighlights.shadersubgraph.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Shaders/Subgraphs/EdgeHighlight.shadersubgraph b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Shaders/Subgraphs/EdgeHighlight.shadersubgraph similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Shaders/Subgraphs/EdgeHighlight.shadersubgraph rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Shaders/Subgraphs/EdgeHighlight.shadersubgraph diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Shaders/Subgraphs/EdgeHighlight.shadersubgraph.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Shaders/Subgraphs/EdgeHighlight.shadersubgraph.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Shaders/Subgraphs/EdgeHighlight.shadersubgraph.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Shaders/Subgraphs/EdgeHighlight.shadersubgraph.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Shaders/Subgraphs/FadeFromCenter.shadersubgraph b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Shaders/Subgraphs/FadeFromCenter.shadersubgraph similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Shaders/Subgraphs/FadeFromCenter.shadersubgraph rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Shaders/Subgraphs/FadeFromCenter.shadersubgraph diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Shaders/Subgraphs/FadeFromCenter.shadersubgraph.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Shaders/Subgraphs/FadeFromCenter.shadersubgraph.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Shaders/Subgraphs/FadeFromCenter.shadersubgraph.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Shaders/Subgraphs/FadeFromCenter.shadersubgraph.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Shaders/Subgraphs/FadeFromCenterWithNoise.shadersubgraph b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Shaders/Subgraphs/FadeFromCenterWithNoise.shadersubgraph similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Shaders/Subgraphs/FadeFromCenterWithNoise.shadersubgraph rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Shaders/Subgraphs/FadeFromCenterWithNoise.shadersubgraph diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Shaders/Subgraphs/FadeFromCenterWithNoise.shadersubgraph.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Shaders/Subgraphs/FadeFromCenterWithNoise.shadersubgraph.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Shaders/Subgraphs/FadeFromCenterWithNoise.shadersubgraph.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Shaders/Subgraphs/FadeFromCenterWithNoise.shadersubgraph.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Shaders/Subgraphs/OneFingerHighlight.shadersubgraph b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Shaders/Subgraphs/OneFingerHighlight.shadersubgraph similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Shaders/Subgraphs/OneFingerHighlight.shadersubgraph rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Shaders/Subgraphs/OneFingerHighlight.shadersubgraph diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Shaders/Subgraphs/OneFingerHighlight.shadersubgraph.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Shaders/Subgraphs/OneFingerHighlight.shadersubgraph.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Shaders/Subgraphs/OneFingerHighlight.shadersubgraph.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Shaders/Subgraphs/OneFingerHighlight.shadersubgraph.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Shaders/Unity_Hand.shadergraph b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Shaders/Unity_Hand.shadergraph similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Shaders/Unity_Hand.shadergraph rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Shaders/Unity_Hand.shadergraph diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Shaders/Unity_Hand.shadergraph.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Shaders/Unity_Hand.shadergraph.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Shaders/Unity_Hand.shadergraph.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Shaders/Unity_Hand.shadergraph.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Shaders/Unity_Hand_HDR.shadergraph b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Shaders/Unity_Hand_HDR.shadergraph similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Shaders/Unity_Hand_HDR.shadergraph rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Shaders/Unity_Hand_HDR.shadergraph diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Shaders/Unity_Hand_HDR.shadergraph.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Shaders/Unity_Hand_HDR.shadergraph.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Shaders/Unity_Hand_HDR.shadergraph.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Shaders/Unity_Hand_HDR.shadergraph.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Shaders/Unity_Hand_Noise.shadergraph b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Shaders/Unity_Hand_Noise.shadergraph similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Shaders/Unity_Hand_Noise.shadergraph rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Shaders/Unity_Hand_Noise.shadergraph diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Shaders/Unity_Hand_Noise.shadergraph.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Shaders/Unity_Hand_Noise.shadergraph.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Shaders/Unity_Hand_Noise.shadergraph.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Shaders/Unity_Hand_Noise.shadergraph.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Shaders/Unity_Hand_Noise_HDR.shadergraph b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Shaders/Unity_Hand_Noise_HDR.shadergraph similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Shaders/Unity_Hand_Noise_HDR.shadergraph rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Shaders/Unity_Hand_Noise_HDR.shadergraph diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Shaders/Unity_Hand_Noise_HDR.shadergraph.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Shaders/Unity_Hand_Noise_HDR.shadergraph.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Shaders/Unity_Hand_Noise_HDR.shadergraph.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Shaders/Unity_Hand_Noise_HDR.shadergraph.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Textures.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Textures.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Textures.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Textures.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Textures/CombinedFingerIndexHighlight.png b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Textures/CombinedFingerIndexHighlight.png similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Textures/CombinedFingerIndexHighlight.png rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Textures/CombinedFingerIndexHighlight.png diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Textures/CombinedFingerIndexHighlight.png.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Textures/CombinedFingerIndexHighlight.png.meta similarity index 88% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Textures/CombinedFingerIndexHighlight.png.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Textures/CombinedFingerIndexHighlight.png.meta index 8154f44..e65b2e7 100644 --- a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Textures/CombinedFingerIndexHighlight.png.meta +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Textures/CombinedFingerIndexHighlight.png.meta @@ -24,6 +24,7 @@ TextureImporter: streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -100,6 +101,18 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] @@ -113,6 +126,7 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: {} spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Unity.XR.Interaction.Toolkit.Samples.Hands.asmdef b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Unity.XR.Interaction.Toolkit.Samples.Hands.asmdef similarity index 64% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Unity.XR.Interaction.Toolkit.Samples.Hands.asmdef rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Unity.XR.Interaction.Toolkit.Samples.Hands.asmdef index f41ba4a..904f8a3 100644 --- a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Unity.XR.Interaction.Toolkit.Samples.Hands.asmdef +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Unity.XR.Interaction.Toolkit.Samples.Hands.asmdef @@ -2,10 +2,11 @@ "name": "Unity.XR.Interaction.Toolkit.Samples.Hands", "rootNamespace": "", "references": [ - "GUID:75469ad4d38634e559750d17036d5f7c", - "GUID:dc960734dc080426fa6612f1c5fe95f3", - "GUID:ce522b6ed64c8be4c989a1d26d0e3275", - "GUID:fe685ec1767f73d42b749ea8045bfe43" + "Unity.InputSystem", + "Unity.Mathematics", + "Unity.XR.CoreUtils", + "Unity.XR.Hands", + "Unity.XR.Interaction.Toolkit" ], "includePlatforms": [], "excludePlatforms": [], @@ -19,6 +20,11 @@ "name": "com.unity.xr.hands", "expression": "1.1.0", "define": "XR_HANDS_1_1_OR_NEWER" + }, + { + "name": "com.unity.xr.hands", + "expression": "1.2.1", + "define": "XR_HANDS_1_2_OR_NEWER" } ], "noEngineReferences": false diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Unity.XR.Interaction.Toolkit.Samples.Hands.asmdef.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Unity.XR.Interaction.Toolkit.Samples.Hands.asmdef.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Hands Interaction Demo/Unity.XR.Interaction.Toolkit.Samples.Hands.asmdef.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Unity.XR.Interaction.Toolkit.Samples.Hands.asmdef.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets.meta similarity index 77% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets.meta index c8d9c03..08532b8 100644 --- a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets.meta +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 06de5cb60776fc14a9d9233b10aec522 +guid: 002c389965ae7684194c3eff0a6924e9 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/.sample.json b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/.sample.json similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/.sample.json rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/.sample.json diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoScene.unity b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoScene.unity similarity index 99% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoScene.unity rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoScene.unity index a0916b5..76e4e47 100644 --- a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoScene.unity +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoScene.unity @@ -3346,10 +3346,6 @@ PrefabInstance: propertyPath: m_Name value: XR Interaction Setup objectReference: {fileID: 0} - - target: {fileID: 7313654230448209575, guid: 895f6f3c2d334633b5800312285058d2, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - target: {fileID: 7696548424635294051, guid: 895f6f3c2d334633b5800312285058d2, type: 3} propertyPath: m_LocalPosition.y value: 0.125 diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoScene.unity.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoScene.unity.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoScene.unity.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoScene.unity.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/AffordanceThemes.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/AffordanceThemes.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/AffordanceThemes.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/AffordanceThemes.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/AffordanceThemes/InteractionColorAffordanceTheme.asset b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/AffordanceThemes/InteractionColorAffordanceTheme.asset similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/AffordanceThemes/InteractionColorAffordanceTheme.asset rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/AffordanceThemes/InteractionColorAffordanceTheme.asset diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/AffordanceThemes/InteractionColorAffordanceTheme.asset.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/AffordanceThemes/InteractionColorAffordanceTheme.asset.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/AffordanceThemes/InteractionColorAffordanceTheme.asset.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/AffordanceThemes/InteractionColorAffordanceTheme.asset.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Audio.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Audio.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Audio.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Audio.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Audio/Button Pop.wav b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Audio/Button Pop.wav similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Audio/Button Pop.wav rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Audio/Button Pop.wav diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Audio/Button Pop.wav.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Audio/Button Pop.wav.meta similarity index 85% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Audio/Button Pop.wav.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Audio/Button Pop.wav.meta index 17b0347..e65394b 100644 --- a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Audio/Button Pop.wav.meta +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Audio/Button Pop.wav.meta @@ -2,19 +2,18 @@ fileFormatVersion: 2 guid: 16fba6d30ed741d4a9fdd6e79ee2f3ac AudioImporter: externalObjects: {} - serializedVersion: 7 + serializedVersion: 6 defaultSettings: - serializedVersion: 2 loadType: 0 sampleRateSetting: 0 sampleRateOverride: 44100 compressionFormat: 1 quality: 1 conversionMode: 0 - preloadAudioData: 1 platformSettingOverrides: {} forceToMono: 0 normalize: 1 + preloadAudioData: 1 loadInBackground: 0 ambisonic: 0 3D: 1 diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Models.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Models.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Models.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Models.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Models/Primitive_Pyramid.fbx b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Models/Primitive_Pyramid.fbx similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Models/Primitive_Pyramid.fbx rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Models/Primitive_Pyramid.fbx diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Models/Primitive_Pyramid.fbx.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Models/Primitive_Pyramid.fbx.meta similarity index 95% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Models/Primitive_Pyramid.fbx.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Models/Primitive_Pyramid.fbx.meta index 8d5e409..1f0141a 100644 --- a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Models/Primitive_Pyramid.fbx.meta +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Models/Primitive_Pyramid.fbx.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 guid: 63e02ddb08ce42da868504e1333d48ae ModelImporter: - serializedVersion: 22200 + serializedVersion: 21300 internalIDToNameTable: [] externalObjects: {} materials: @@ -40,7 +40,6 @@ ModelImporter: addColliders: 0 useSRGBMaterialColor: 1 sortHierarchyByName: 1 - importPhysicalCameras: 1 importVisibility: 1 importBlendShapes: 1 importCameras: 1 @@ -68,7 +67,6 @@ ModelImporter: secondaryUVMinObjectScale: 1 secondaryUVPackMargin: 4 useFileScale: 1 - strictVertexDataChecks: 0 tangentSpace: normalSmoothAngle: 60 normalImportMode: 0 @@ -101,7 +99,6 @@ ModelImporter: humanoidOversampling: 1 avatarSetup: 0 addHumanoidExtraRootOnlyWhenUsingAvatar: 1 - importBlendShapeDeformPercent: 0 remapMaterialsIfMaterialImportModeIsNone: 1 additionalBone: 0 userData: diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Models/Primitive_Torus.fbx b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Models/Primitive_Torus.fbx similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Models/Primitive_Torus.fbx rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Models/Primitive_Torus.fbx diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Models/Primitive_Torus.fbx.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Models/Primitive_Torus.fbx.meta similarity index 95% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Models/Primitive_Torus.fbx.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Models/Primitive_Torus.fbx.meta index a64f439..835af0b 100644 --- a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Models/Primitive_Torus.fbx.meta +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Models/Primitive_Torus.fbx.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 guid: f077c919501a44778a0c2edb6eb1a54a ModelImporter: - serializedVersion: 22200 + serializedVersion: 21300 internalIDToNameTable: [] externalObjects: {} materials: @@ -40,7 +40,6 @@ ModelImporter: addColliders: 0 useSRGBMaterialColor: 1 sortHierarchyByName: 1 - importPhysicalCameras: 1 importVisibility: 1 importBlendShapes: 1 importCameras: 1 @@ -68,7 +67,6 @@ ModelImporter: secondaryUVMinObjectScale: 1 secondaryUVPackMargin: 4 useFileScale: 1 - strictVertexDataChecks: 0 tangentSpace: normalSmoothAngle: 60 normalImportMode: 0 @@ -101,7 +99,6 @@ ModelImporter: humanoidOversampling: 1 avatarSetup: 0 addHumanoidExtraRootOnlyWhenUsingAvatar: 1 - importBlendShapeDeformPercent: 0 remapMaterialsIfMaterialImportModeIsNone: 1 additionalBone: 0 userData: diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Models/PushButton.fbx b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Models/PushButton.fbx similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Models/PushButton.fbx rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Models/PushButton.fbx diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Models/PushButton.fbx.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Models/PushButton.fbx.meta similarity index 95% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Models/PushButton.fbx.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Models/PushButton.fbx.meta index 8220c9e..a1880ba 100644 --- a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Models/PushButton.fbx.meta +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Models/PushButton.fbx.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 guid: 7ab6f3b0fd1a6ba41b2a47766c16613f ModelImporter: - serializedVersion: 22200 + serializedVersion: 21300 internalIDToNameTable: [] externalObjects: {} materials: @@ -40,7 +40,6 @@ ModelImporter: addColliders: 0 useSRGBMaterialColor: 1 sortHierarchyByName: 1 - importPhysicalCameras: 1 importVisibility: 1 importBlendShapes: 1 importCameras: 1 @@ -68,7 +67,6 @@ ModelImporter: secondaryUVMinObjectScale: 1 secondaryUVPackMargin: 4 useFileScale: 1 - strictVertexDataChecks: 0 tangentSpace: normalSmoothAngle: 60 normalImportMode: 0 @@ -101,7 +99,6 @@ ModelImporter: humanoidOversampling: 1 avatarSetup: 0 addHumanoidExtraRootOnlyWhenUsingAvatar: 0 - importBlendShapeDeformPercent: 0 remapMaterialsIfMaterialImportModeIsNone: 1 additionalBone: 0 userData: diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Prefabs.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Prefabs.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Prefabs.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Prefabs.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Prefabs/Climb.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Prefabs/Climb.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Prefabs/Climb.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Prefabs/Climb.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Prefabs/Climb/Climb Sample.prefab b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Prefabs/Climb/Climb Sample.prefab similarity index 96% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Prefabs/Climb/Climb Sample.prefab rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Prefabs/Climb/Climb Sample.prefab index 6b2ba6b..23107d2 100644 --- a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Prefabs/Climb/Climb Sample.prefab +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Prefabs/Climb/Climb Sample.prefab @@ -23,7 +23,6 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3953970342314940650} - serializedVersion: 2 m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} m_LocalPosition: {x: -3.75, y: 0.125, z: 2.5} m_LocalScale: {x: 1, y: 1, z: 1} @@ -33,13 +32,13 @@ Transform: - {fileID: 1002461780314896473} - {fileID: 3953970341132373934} m_Father: {fileID: 0} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} --- !u!1001 &3953970341125123640 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - serializedVersion: 3 m_TransformParent: {fileID: 3953970342314940649} m_Modifications: - target: {fileID: 4223635557334411916, guid: b3830b3b2f190ee46a9c88433e985221, type: 3} @@ -91,9 +90,6 @@ PrefabInstance: value: Ladder objectReference: {fileID: 0} m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b3830b3b2f190ee46a9c88433e985221, type: 3} --- !u!4 &883283023377794228 stripped Transform: @@ -105,7 +101,6 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - serializedVersion: 3 m_TransformParent: {fileID: 3953970342314940649} m_Modifications: - target: {fileID: 2455711654808853570, guid: beb4e2871579447497fe41dfb108e2cd, type: 3} @@ -173,9 +168,6 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: beb4e2871579447497fe41dfb108e2cd, type: 3} --- !u!4 &1002461780314896473 stripped Transform: @@ -187,7 +179,6 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - serializedVersion: 3 m_TransformParent: {fileID: 3953970342314940649} m_Modifications: - target: {fileID: 7585962579481558136, guid: a0ea40bd139aedc43b0e8374d6139437, type: 3} @@ -243,9 +234,6 @@ PrefabInstance: value: objectReference: {fileID: 0} m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a0ea40bd139aedc43b0e8374d6139437, type: 3} --- !u!4 &3953970341132373934 stripped Transform: diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Prefabs/Climb/Climb Sample.prefab.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Prefabs/Climb/Climb Sample.prefab.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Prefabs/Climb/Climb Sample.prefab.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Prefabs/Climb/Climb Sample.prefab.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Prefabs/Climb/Climbing Wall.prefab b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Prefabs/Climb/Climbing Wall.prefab similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Prefabs/Climb/Climbing Wall.prefab rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Prefabs/Climb/Climbing Wall.prefab diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Prefabs/Climb/Climbing Wall.prefab.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Prefabs/Climb/Climbing Wall.prefab.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Prefabs/Climb/Climbing Wall.prefab.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Prefabs/Climb/Climbing Wall.prefab.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Prefabs/Climb/Ladder.prefab b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Prefabs/Climb/Ladder.prefab similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Prefabs/Climb/Ladder.prefab rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Prefabs/Climb/Ladder.prefab diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Prefabs/Climb/Ladder.prefab.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Prefabs/Climb/Ladder.prefab.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Prefabs/Climb/Ladder.prefab.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Prefabs/Climb/Ladder.prefab.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Prefabs/Interactables Sample.prefab b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Prefabs/Interactables Sample.prefab similarity index 96% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Prefabs/Interactables Sample.prefab rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Prefabs/Interactables Sample.prefab index 3fa45f1..50a362c 100644 --- a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Prefabs/Interactables Sample.prefab +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Prefabs/Interactables Sample.prefab @@ -23,7 +23,6 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1060243933316379515} - serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 1.5} m_LocalScale: {x: 1, y: 1, z: 1} @@ -33,13 +32,13 @@ Transform: - {fileID: 5178052650083227069} - {fileID: 1084091470699946729} m_Father: {fileID: 0} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &428719407853335821 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - serializedVersion: 3 m_TransformParent: {fileID: 2991896912978869755} m_Modifications: - target: {fileID: 4769098102207602864, guid: 2ed984a58a974166bf92c82a74380454, type: 3} @@ -91,9 +90,6 @@ PrefabInstance: value: Interactable Instant Pyramid objectReference: {fileID: 0} m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 2ed984a58a974166bf92c82a74380454, type: 3} --- !u!4 &5178052650083227069 stripped Transform: @@ -105,7 +101,6 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - serializedVersion: 3 m_TransformParent: {fileID: 2991896912978869755} m_Modifications: - target: {fileID: 7517549319329480229, guid: 521327bdbcb341f782d36f02cab76cb0, type: 3} @@ -157,9 +152,6 @@ PrefabInstance: value: Interactable Kinematic Torus objectReference: {fileID: 0} m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 521327bdbcb341f782d36f02cab76cb0, type: 3} --- !u!4 &6559198441471240595 stripped Transform: @@ -171,7 +163,6 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - serializedVersion: 3 m_TransformParent: {fileID: 2991896912978869755} m_Modifications: - target: {fileID: 4257412417454173056, guid: d5615d616019430d9c2e8727e71c97fb, type: 3} @@ -223,9 +214,6 @@ PrefabInstance: value: Interactable Velocity Tracked Wedge objectReference: {fileID: 0} m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: d5615d616019430d9c2e8727e71c97fb, type: 3} --- !u!4 &1084091470699946729 stripped Transform: diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Prefabs/Interactables Sample.prefab.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Prefabs/Interactables Sample.prefab.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Prefabs/Interactables Sample.prefab.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Prefabs/Interactables Sample.prefab.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Prefabs/Interactables.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Prefabs/Interactables.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Prefabs/Interactables.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Prefabs/Interactables.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Prefabs/Interactables/Interactable Instant Pyramid.prefab b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Prefabs/Interactables/Interactable Instant Pyramid.prefab similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Prefabs/Interactables/Interactable Instant Pyramid.prefab rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Prefabs/Interactables/Interactable Instant Pyramid.prefab diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Prefabs/Interactables/Interactable Instant Pyramid.prefab.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Prefabs/Interactables/Interactable Instant Pyramid.prefab.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Prefabs/Interactables/Interactable Instant Pyramid.prefab.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Prefabs/Interactables/Interactable Instant Pyramid.prefab.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Prefabs/Interactables/Interactable Kinematic Torus.prefab b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Prefabs/Interactables/Interactable Kinematic Torus.prefab similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Prefabs/Interactables/Interactable Kinematic Torus.prefab rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Prefabs/Interactables/Interactable Kinematic Torus.prefab diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Prefabs/Interactables/Interactable Kinematic Torus.prefab.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Prefabs/Interactables/Interactable Kinematic Torus.prefab.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Prefabs/Interactables/Interactable Kinematic Torus.prefab.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Prefabs/Interactables/Interactable Kinematic Torus.prefab.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Prefabs/Interactables/Interactable Simple Cube.prefab b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Prefabs/Interactables/Interactable Simple Cube.prefab similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Prefabs/Interactables/Interactable Simple Cube.prefab rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Prefabs/Interactables/Interactable Simple Cube.prefab diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Prefabs/Interactables/Interactable Simple Cube.prefab.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Prefabs/Interactables/Interactable Simple Cube.prefab.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Prefabs/Interactables/Interactable Simple Cube.prefab.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Prefabs/Interactables/Interactable Simple Cube.prefab.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Prefabs/Interactables/Interactable Velocity Tracked Wedge.prefab b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Prefabs/Interactables/Interactable Velocity Tracked Wedge.prefab similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Prefabs/Interactables/Interactable Velocity Tracked Wedge.prefab rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Prefabs/Interactables/Interactable Velocity Tracked Wedge.prefab diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Prefabs/Interactables/Interactable Velocity Tracked Wedge.prefab.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Prefabs/Interactables/Interactable Velocity Tracked Wedge.prefab.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Prefabs/Interactables/Interactable Velocity Tracked Wedge.prefab.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Prefabs/Interactables/Interactable Velocity Tracked Wedge.prefab.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Prefabs/Interactables/Interaction Affordance.prefab b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Prefabs/Interactables/Interaction Affordance.prefab similarity index 99% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Prefabs/Interactables/Interaction Affordance.prefab rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Prefabs/Interactables/Interaction Affordance.prefab index 3dd2ad9..8ac8cbc 100644 --- a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Prefabs/Interactables/Interaction Affordance.prefab +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Prefabs/Interactables/Interaction Affordance.prefab @@ -24,7 +24,6 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3774509235512974894} - 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,6 +31,7 @@ Transform: m_Children: - {fileID: 1868228307608861978} m_Father: {fileID: 0} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &8634317094661461186 MonoBehaviour: @@ -107,13 +107,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4896237787779704601} - 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: 5258331117553129771} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &7396278978564332023 MonoBehaviour: diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Prefabs/Interactables/Interaction Affordance.prefab.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Prefabs/Interactables/Interaction Affordance.prefab.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Prefabs/Interactables/Interaction Affordance.prefab.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Prefabs/Interactables/Interaction Affordance.prefab.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Prefabs/Interactables/Push Button.prefab b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Prefabs/Interactables/Push Button.prefab similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Prefabs/Interactables/Push Button.prefab rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Prefabs/Interactables/Push Button.prefab diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Prefabs/Interactables/Push Button.prefab.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Prefabs/Interactables/Push Button.prefab.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Prefabs/Interactables/Push Button.prefab.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Prefabs/Interactables/Push Button.prefab.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Prefabs/Teleport.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Prefabs/Teleport.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Prefabs/Teleport.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Prefabs/Teleport.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Prefabs/Teleport/Snapping Teleport Anchor.prefab b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Prefabs/Teleport/Snapping Teleport Anchor.prefab similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Prefabs/Teleport/Snapping Teleport Anchor.prefab rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Prefabs/Teleport/Snapping Teleport Anchor.prefab diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Prefabs/Teleport/Snapping Teleport Anchor.prefab.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Prefabs/Teleport/Snapping Teleport Anchor.prefab.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Prefabs/Teleport/Snapping Teleport Anchor.prefab.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Prefabs/Teleport/Snapping Teleport Anchor.prefab.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Prefabs/Teleport/Teleport Anchor.prefab b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Prefabs/Teleport/Teleport Anchor.prefab similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Prefabs/Teleport/Teleport Anchor.prefab rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Prefabs/Teleport/Teleport Anchor.prefab diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Prefabs/Teleport/Teleport Anchor.prefab.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Prefabs/Teleport/Teleport Anchor.prefab.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Prefabs/Teleport/Teleport Anchor.prefab.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Prefabs/Teleport/Teleport Anchor.prefab.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Prefabs/Teleport/Teleport Area.prefab b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Prefabs/Teleport/Teleport Area.prefab similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Prefabs/Teleport/Teleport Area.prefab rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Prefabs/Teleport/Teleport Area.prefab diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Prefabs/Teleport/Teleport Area.prefab.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Prefabs/Teleport/Teleport Area.prefab.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Prefabs/Teleport/Teleport Area.prefab.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Prefabs/Teleport/Teleport Area.prefab.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Prefabs/Teleportation Environment.prefab b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Prefabs/Teleportation Environment.prefab similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Prefabs/Teleportation Environment.prefab rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Prefabs/Teleportation Environment.prefab diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Prefabs/Teleportation Environment.prefab.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Prefabs/Teleportation Environment.prefab.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Prefabs/Teleportation Environment.prefab.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Prefabs/Teleportation Environment.prefab.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Prefabs/UI Sample.prefab b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Prefabs/UI Sample.prefab similarity index 98% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Prefabs/UI Sample.prefab rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Prefabs/UI Sample.prefab index 09d448b..d1d46ef 100644 --- a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Prefabs/UI Sample.prefab +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Prefabs/UI Sample.prefab @@ -37,6 +37,7 @@ RectTransform: - {fileID: 8180815009888545700} - {fileID: 5849765080480587862} 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} @@ -60,9 +61,7 @@ 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 @@ -156,7 +155,6 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - serializedVersion: 3 m_TransformParent: {fileID: 4015128326712939851} m_Modifications: - target: {fileID: 500849797049712309, guid: 0cbc0856f0fb8d84a81be5dea463c369, type: 3} @@ -344,9 +342,6 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 0cbc0856f0fb8d84a81be5dea463c369, type: 3} --- !u!224 &5849765080480587862 stripped RectTransform: @@ -358,7 +353,6 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - serializedVersion: 3 m_TransformParent: {fileID: 4015128326712939851} m_Modifications: - target: {fileID: 781630661673262082, guid: c24a7635b5761984d81cf6c4aac26e0d, type: 3} @@ -446,9 +440,6 @@ PrefabInstance: value: ModalSingleButton objectReference: {fileID: 0} m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c24a7635b5761984d81cf6c4aac26e0d, type: 3} --- !u!224 &4422659091188657070 stripped RectTransform: @@ -460,7 +451,6 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - serializedVersion: 3 m_TransformParent: {fileID: 4015128326712939851} m_Modifications: - target: {fileID: 975326512693904576, guid: 7bbb1960bab3e75459304488d8d1ffba, type: 3} @@ -774,9 +764,6 @@ PrefabInstance: m_RemovedComponents: - {fileID: 7122483372802297286, guid: 7bbb1960bab3e75459304488d8d1ffba, type: 3} - {fileID: 3667051746007278438, guid: 7bbb1960bab3e75459304488d8d1ffba, type: 3} - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7bbb1960bab3e75459304488d8d1ffba, type: 3} --- !u!224 &8180815009888545700 stripped RectTransform: diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Prefabs/UI Sample.prefab.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Prefabs/UI Sample.prefab.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Prefabs/UI Sample.prefab.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Prefabs/UI Sample.prefab.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Prefabs/UI.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Prefabs/UI.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Prefabs/UI.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Prefabs/UI.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Prefabs/UI/Dropdown.prefab b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Prefabs/UI/Dropdown.prefab similarity index 99% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Prefabs/UI/Dropdown.prefab rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Prefabs/UI/Dropdown.prefab index fb990db..cd24bdb 100644 --- a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Prefabs/UI/Dropdown.prefab +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Prefabs/UI/Dropdown.prefab @@ -94,7 +94,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Navigation: - m_Mode: 3 + m_Mode: 0 m_WrapAround: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} @@ -306,7 +306,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Navigation: - m_Mode: 3 + m_Mode: 0 m_WrapAround: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} @@ -755,7 +755,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Navigation: - m_Mode: 3 + m_Mode: 0 m_WrapAround: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Prefabs/UI/Dropdown.prefab.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Prefabs/UI/Dropdown.prefab.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Prefabs/UI/Dropdown.prefab.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Prefabs/UI/Dropdown.prefab.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Prefabs/UI/Icon Button.prefab b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Prefabs/UI/Icon Button.prefab similarity index 99% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Prefabs/UI/Icon Button.prefab rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Prefabs/UI/Icon Button.prefab index b526022..2bdb819 100644 --- a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Prefabs/UI/Icon Button.prefab +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Prefabs/UI/Icon Button.prefab @@ -34,6 +34,7 @@ RectTransform: m_Children: - {fileID: 1004097913474769433} 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} @@ -171,6 +172,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1004097913474769433} + 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} @@ -246,6 +248,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1004097913474769433} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -324,6 +327,7 @@ RectTransform: - {fileID: 1004097912527195992} - {fileID: 1004097911869307694} m_Father: {fileID: 1004097911450439916} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Prefabs/UI/Icon Button.prefab.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Prefabs/UI/Icon Button.prefab.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Prefabs/UI/Icon Button.prefab.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Prefabs/UI/Icon Button.prefab.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Prefabs/UI/Icon Toggle.prefab b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Prefabs/UI/Icon Toggle.prefab similarity index 99% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Prefabs/UI/Icon Toggle.prefab rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Prefabs/UI/Icon Toggle.prefab index 907f831..2f564a9 100644 --- a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Prefabs/UI/Icon Toggle.prefab +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Prefabs/UI/Icon Toggle.prefab @@ -31,6 +31,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5715416335474355518} + 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} @@ -109,6 +110,7 @@ RectTransform: m_Children: - {fileID: 5715416335474355518} 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} @@ -128,7 +130,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Navigation: - m_Mode: 3 + m_Mode: 0 m_WrapAround: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} @@ -263,6 +265,7 @@ RectTransform: - {fileID: 5715416336153000562} - {fileID: 5715416334889072033} m_Father: {fileID: 5715416335250216646} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -300,6 +303,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5715416335474355518} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -375,6 +379,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5715416335474355518} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Prefabs/UI/Icon Toggle.prefab.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Prefabs/UI/Icon Toggle.prefab.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Prefabs/UI/Icon Toggle.prefab.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Prefabs/UI/Icon Toggle.prefab.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Prefabs/UI/Interactive Controls.prefab b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Prefabs/UI/Interactive Controls.prefab similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Prefabs/UI/Interactive Controls.prefab rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Prefabs/UI/Interactive Controls.prefab diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Prefabs/UI/Interactive Controls.prefab.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Prefabs/UI/Interactive Controls.prefab.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Prefabs/UI/Interactive Controls.prefab.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Prefabs/UI/Interactive Controls.prefab.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Prefabs/UI/MinMaxSlider.prefab b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Prefabs/UI/MinMaxSlider.prefab similarity index 99% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Prefabs/UI/MinMaxSlider.prefab rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Prefabs/UI/MinMaxSlider.prefab index fbb116f..a7b464e 100644 --- a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Prefabs/UI/MinMaxSlider.prefab +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Prefabs/UI/MinMaxSlider.prefab @@ -31,6 +31,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8969571752666551114} + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -108,6 +109,7 @@ RectTransform: m_Children: - {fileID: 8969571751951368413} m_Father: {fileID: 8969571752666551114} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -195,6 +197,7 @@ RectTransform: m_Children: - {fileID: 8969571752320557268} m_Father: {fileID: 8969571752666551114} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -232,6 +235,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8969571751466764124} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -307,6 +311,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8969571751541263788} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -384,6 +389,7 @@ RectTransform: - {fileID: 8969571751541263788} - {fileID: 1411994965502096185} 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} @@ -403,7 +409,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Navigation: - m_Mode: 3 + m_Mode: 0 m_WrapAround: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Prefabs/UI/MinMaxSlider.prefab.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Prefabs/UI/MinMaxSlider.prefab.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Prefabs/UI/MinMaxSlider.prefab.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Prefabs/UI/MinMaxSlider.prefab.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Prefabs/UI/ModalSingleButton.prefab b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Prefabs/UI/ModalSingleButton.prefab similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Prefabs/UI/ModalSingleButton.prefab rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Prefabs/UI/ModalSingleButton.prefab diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Prefabs/UI/ModalSingleButton.prefab.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Prefabs/UI/ModalSingleButton.prefab.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Prefabs/UI/ModalSingleButton.prefab.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Prefabs/UI/ModalSingleButton.prefab.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Prefabs/UI/Scroll UI Sample.prefab b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Prefabs/UI/Scroll UI Sample.prefab similarity index 99% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Prefabs/UI/Scroll UI Sample.prefab rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Prefabs/UI/Scroll UI Sample.prefab index f1c6974..e57372f 100644 --- a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Prefabs/UI/Scroll UI Sample.prefab +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Prefabs/UI/Scroll UI Sample.prefab @@ -31,6 +31,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8747907324888668265} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -119,6 +120,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8747907325324488007} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -196,6 +198,7 @@ RectTransform: m_Children: - {fileID: 1358160809937143452} m_Father: {fileID: 8747907325768000811} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -286,6 +289,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8747907326218408609} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -361,6 +365,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8747907326224632397} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -436,6 +441,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8747907325689103684} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -514,6 +520,7 @@ RectTransform: - {fileID: 8747907324863920239} - {fileID: 8747907326620743393} m_Father: {fileID: 8747907325722657838} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -641,6 +648,7 @@ RectTransform: - {fileID: 8747907325252089051} - {fileID: 8747907326401285888} m_Father: {fileID: 8747907325722657838} + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} @@ -769,6 +777,7 @@ RectTransform: - {fileID: 8747907325324488007} - {fileID: 8747907325689103684} m_Father: {fileID: 8747907326224632397} + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -866,6 +875,7 @@ RectTransform: m_Children: - {fileID: 8747907324888668265} m_Father: {fileID: 8747907325722657838} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -954,6 +964,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8747907326526105401} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -1030,6 +1041,7 @@ RectTransform: m_Children: - {fileID: 8747907324966354089} m_Father: {fileID: 8747907326620743393} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -1109,6 +1121,7 @@ RectTransform: - {fileID: 8747907325091541477} - {fileID: 8747907325722657838} 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} @@ -1203,6 +1216,7 @@ RectTransform: m_Children: - {fileID: 8747907326526105401} m_Father: {fileID: 8747907325689103684} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -1241,6 +1255,7 @@ RectTransform: m_Children: - {fileID: 8747907325788499339} m_Father: {fileID: 8747907326401285888} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -1315,6 +1330,7 @@ RectTransform: m_Children: - {fileID: 8747907326218408609} m_Father: {fileID: 8747907325324488007} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -1352,6 +1368,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8747907326224632397} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Prefabs/UI/Scroll UI Sample.prefab.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Prefabs/UI/Scroll UI Sample.prefab.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Prefabs/UI/Scroll UI Sample.prefab.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Prefabs/UI/Scroll UI Sample.prefab.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Prefabs/UI/Text Toggle.prefab b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Prefabs/UI/Text Toggle.prefab similarity index 99% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Prefabs/UI/Text Toggle.prefab rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Prefabs/UI/Text Toggle.prefab index 0236c89..39035de 100644 --- a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Prefabs/UI/Text Toggle.prefab +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Prefabs/UI/Text Toggle.prefab @@ -31,6 +31,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 195190421305919396} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -106,6 +107,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 195190421305919396} + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -185,6 +187,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 195190421305919396} + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -263,6 +266,7 @@ RectTransform: m_Children: - {fileID: 195190421305919396} 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} @@ -290,7 +294,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Navigation: - m_Mode: 3 + m_Mode: 0 m_WrapAround: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} @@ -416,6 +420,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 195190421305919396} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -493,6 +498,7 @@ RectTransform: - {fileID: 195190420188018985} - {fileID: 195190419895452204} m_Father: {fileID: 195190420563360910} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Prefabs/UI/Text Toggle.prefab.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Prefabs/UI/Text Toggle.prefab.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Prefabs/UI/Text Toggle.prefab.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Prefabs/UI/Text Toggle.prefab.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Prefabs/UI/TextButton.prefab b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Prefabs/UI/TextButton.prefab similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Prefabs/UI/TextButton.prefab rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Prefabs/UI/TextButton.prefab diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Prefabs/UI/TextButton.prefab.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Prefabs/UI/TextButton.prefab.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Prefabs/UI/TextButton.prefab.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Prefabs/UI/TextButton.prefab.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Scripts.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Scripts.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Scripts.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Scripts.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Scripts/IncrementUIText.cs b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Scripts/IncrementUIText.cs similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Scripts/IncrementUIText.cs rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Scripts/IncrementUIText.cs diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Scripts/IncrementUIText.cs.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Scripts/IncrementUIText.cs.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Scripts/IncrementUIText.cs.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Scripts/IncrementUIText.cs.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Sprites.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Sprites.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Sprites.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Sprites.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Sprites/Asset.png b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Sprites/Asset.png similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Sprites/Asset.png rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Sprites/Asset.png diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Sprites/Asset.png.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Sprites/Asset.png.meta similarity index 93% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Sprites/Asset.png.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Sprites/Asset.png.meta index 48c8f3e..336c19b 100644 --- a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Sprites/Asset.png.meta +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Sprites/Asset.png.meta @@ -20,12 +20,11 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 - flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 - ignoreMipmapLimit: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -64,7 +63,6 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 - swizzle: 50462976 cookieLightType: 1 platformSettings: - serializedVersion: 3 @@ -77,7 +75,6 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 - ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 @@ -90,7 +87,6 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 - ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 @@ -103,7 +99,6 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 - ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 @@ -116,7 +111,6 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 - ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: @@ -133,8 +127,9 @@ TextureImporter: weights: [] secondaryTextures: [] nameFileIdTable: {} - mipmapLimitGroupName: + spritePackingTag: pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Sprites/Checkmark.png b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Sprites/Checkmark.png similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Sprites/Checkmark.png rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Sprites/Checkmark.png diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Sprites/Checkmark.png.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Sprites/Checkmark.png.meta similarity index 93% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Sprites/Checkmark.png.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Sprites/Checkmark.png.meta index 1a9d534..5e46a3f 100644 --- a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Sprites/Checkmark.png.meta +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Sprites/Checkmark.png.meta @@ -20,12 +20,11 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 - flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 - ignoreMipmapLimit: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -64,7 +63,6 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 - swizzle: 50462976 cookieLightType: 1 platformSettings: - serializedVersion: 3 @@ -77,7 +75,6 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 - ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 @@ -90,7 +87,6 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 - ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 @@ -103,7 +99,6 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 - ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 @@ -116,7 +111,6 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 - ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: @@ -133,8 +127,9 @@ TextureImporter: weights: [] secondaryTextures: [] nameFileIdTable: {} - mipmapLimitGroupName: + spritePackingTag: pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Sprites/Circle_60x60_Horizontal.png b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Sprites/Circle_60x60_Horizontal.png similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Sprites/Circle_60x60_Horizontal.png rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Sprites/Circle_60x60_Horizontal.png diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Sprites/Circle_60x60_Horizontal.png.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Sprites/Circle_60x60_Horizontal.png.meta similarity index 93% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Sprites/Circle_60x60_Horizontal.png.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Sprites/Circle_60x60_Horizontal.png.meta index 1a7d6c7..b87b43d 100644 --- a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Sprites/Circle_60x60_Horizontal.png.meta +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Sprites/Circle_60x60_Horizontal.png.meta @@ -20,12 +20,11 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 - flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 - ignoreMipmapLimit: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -64,7 +63,6 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 - swizzle: 50462976 cookieLightType: 1 platformSettings: - serializedVersion: 3 @@ -77,7 +75,6 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 - ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 @@ -90,7 +87,6 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 - ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 @@ -103,7 +99,6 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 - ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 @@ -116,7 +111,6 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 - ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: @@ -133,8 +127,9 @@ TextureImporter: weights: [] secondaryTextures: [] nameFileIdTable: {} - mipmapLimitGroupName: + spritePackingTag: pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Sprites/Forward.png b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Sprites/Forward.png similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Sprites/Forward.png rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Sprites/Forward.png diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Sprites/Forward.png.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Sprites/Forward.png.meta similarity index 93% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Sprites/Forward.png.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Sprites/Forward.png.meta index 31593ff..5a7e070 100644 --- a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Sprites/Forward.png.meta +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Sprites/Forward.png.meta @@ -20,12 +20,11 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 - flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 - ignoreMipmapLimit: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -64,7 +63,6 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 - swizzle: 50462976 cookieLightType: 1 platformSettings: - serializedVersion: 3 @@ -77,7 +75,6 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 - ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 @@ -90,7 +87,6 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 - ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 @@ -103,7 +99,6 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 - ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 @@ -116,7 +111,6 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 - ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: @@ -133,8 +127,9 @@ TextureImporter: weights: [] secondaryTextures: [] nameFileIdTable: {} - mipmapLimitGroupName: + spritePackingTag: pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Sprites/Round Radius 4 Outline.png b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Sprites/Round Radius 4 Outline.png similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Sprites/Round Radius 4 Outline.png rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Sprites/Round Radius 4 Outline.png diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Sprites/Round Radius 4 Outline.png.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Sprites/Round Radius 4 Outline.png.meta similarity index 93% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Sprites/Round Radius 4 Outline.png.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Sprites/Round Radius 4 Outline.png.meta index d972e14..0c2f224 100644 --- a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Sprites/Round Radius 4 Outline.png.meta +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Sprites/Round Radius 4 Outline.png.meta @@ -20,12 +20,11 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 - flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 - ignoreMipmapLimit: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -64,7 +63,6 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 - swizzle: 50462976 cookieLightType: 1 platformSettings: - serializedVersion: 3 @@ -77,7 +75,6 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 - ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 @@ -90,7 +87,6 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 - ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 @@ -103,7 +99,6 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 - ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 @@ -116,7 +111,6 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 - ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 @@ -129,7 +123,6 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 - ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: @@ -146,8 +139,9 @@ TextureImporter: weights: [] secondaryTextures: [] nameFileIdTable: {} - mipmapLimitGroupName: + spritePackingTag: pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Sprites/Round Radius 4.png b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Sprites/Round Radius 4.png similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Sprites/Round Radius 4.png rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Sprites/Round Radius 4.png diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Sprites/Round Radius 4.png.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Sprites/Round Radius 4.png.meta similarity index 93% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Sprites/Round Radius 4.png.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Sprites/Round Radius 4.png.meta index a7b5b28..8732693 100644 --- a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/DemoSceneAssets/Sprites/Round Radius 4.png.meta +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Sprites/Round Radius 4.png.meta @@ -20,12 +20,11 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 - flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 - ignoreMipmapLimit: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -64,7 +63,6 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 - swizzle: 50462976 cookieLightType: 1 platformSettings: - serializedVersion: 3 @@ -77,7 +75,6 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 - ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 @@ -90,7 +87,6 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 - ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 @@ -103,7 +99,6 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 - ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 @@ -116,7 +111,6 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 - ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 @@ -129,7 +123,6 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 - ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: @@ -146,8 +139,9 @@ TextureImporter: weights: [] secondaryTextures: [] nameFileIdTable: {} - mipmapLimitGroupName: + spritePackingTag: pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Editor.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Editor.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Editor.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Editor.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Editor/Scripts.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Editor/Scripts.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Editor/Scripts.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Editor/Scripts.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Editor/Scripts/StarterAssetsSampleProjectValidation.cs b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Editor/Scripts/StarterAssetsSampleProjectValidation.cs similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Editor/Scripts/StarterAssetsSampleProjectValidation.cs rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Editor/Scripts/StarterAssetsSampleProjectValidation.cs diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Editor/Scripts/StarterAssetsSampleProjectValidation.cs.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Editor/Scripts/StarterAssetsSampleProjectValidation.cs.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Editor/Scripts/StarterAssetsSampleProjectValidation.cs.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Editor/Scripts/StarterAssetsSampleProjectValidation.cs.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Editor/Unity.XR.Interaction.Toolkit.Samples.StarterAssets.Editor.asmdef b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Editor/Unity.XR.Interaction.Toolkit.Samples.StarterAssets.Editor.asmdef similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Editor/Unity.XR.Interaction.Toolkit.Samples.StarterAssets.Editor.asmdef rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Editor/Unity.XR.Interaction.Toolkit.Samples.StarterAssets.Editor.asmdef diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Editor/Unity.XR.Interaction.Toolkit.Samples.StarterAssets.Editor.asmdef.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Editor/Unity.XR.Interaction.Toolkit.Samples.StarterAssets.Editor.asmdef.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Editor/Unity.XR.Interaction.Toolkit.Samples.StarterAssets.Editor.asmdef.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Editor/Unity.XR.Interaction.Toolkit.Samples.StarterAssets.Editor.asmdef.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Models.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Models.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Models.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Models.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Models/Primitive_Cylinder.fbx b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Models/Primitive_Cylinder.fbx similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Models/Primitive_Cylinder.fbx rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Models/Primitive_Cylinder.fbx diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Models/Primitive_Cylinder.fbx.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Models/Primitive_Cylinder.fbx.meta similarity index 95% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Models/Primitive_Cylinder.fbx.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Models/Primitive_Cylinder.fbx.meta index 65a83a1..5f30725 100644 --- a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Models/Primitive_Cylinder.fbx.meta +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Models/Primitive_Cylinder.fbx.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 guid: 9e1dc1c14313460d872de39e35129b39 ModelImporter: - serializedVersion: 22200 + serializedVersion: 21300 internalIDToNameTable: [] externalObjects: {} materials: @@ -40,7 +40,6 @@ ModelImporter: addColliders: 0 useSRGBMaterialColor: 1 sortHierarchyByName: 1 - importPhysicalCameras: 1 importVisibility: 1 importBlendShapes: 1 importCameras: 1 @@ -68,7 +67,6 @@ ModelImporter: secondaryUVMinObjectScale: 1 secondaryUVPackMargin: 4 useFileScale: 1 - strictVertexDataChecks: 0 tangentSpace: normalSmoothAngle: 60 normalImportMode: 0 @@ -101,7 +99,6 @@ ModelImporter: humanoidOversampling: 1 avatarSetup: 0 addHumanoidExtraRootOnlyWhenUsingAvatar: 0 - importBlendShapeDeformPercent: 0 remapMaterialsIfMaterialImportModeIsNone: 1 additionalBone: 0 userData: diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Models/Primitive_Wedge.fbx b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Models/Primitive_Wedge.fbx similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Models/Primitive_Wedge.fbx rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Models/Primitive_Wedge.fbx diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Models/Primitive_Wedge.fbx.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Models/Primitive_Wedge.fbx.meta similarity index 95% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Models/Primitive_Wedge.fbx.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Models/Primitive_Wedge.fbx.meta index 7c76429..dfbe932 100644 --- a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Models/Primitive_Wedge.fbx.meta +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Models/Primitive_Wedge.fbx.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 guid: ab3a79eba4de4be0ad5fead9fb858190 ModelImporter: - serializedVersion: 22200 + serializedVersion: 21300 internalIDToNameTable: [] externalObjects: {} materials: @@ -40,7 +40,6 @@ ModelImporter: addColliders: 0 useSRGBMaterialColor: 1 sortHierarchyByName: 1 - importPhysicalCameras: 1 importVisibility: 1 importBlendShapes: 1 importCameras: 1 @@ -68,7 +67,6 @@ ModelImporter: secondaryUVMinObjectScale: 1 secondaryUVPackMargin: 4 useFileScale: 1 - strictVertexDataChecks: 0 tangentSpace: normalSmoothAngle: 60 normalImportMode: 0 @@ -101,7 +99,6 @@ ModelImporter: humanoidOversampling: 1 avatarSetup: 0 addHumanoidExtraRootOnlyWhenUsingAvatar: 1 - importBlendShapeDeformPercent: 0 remapMaterialsIfMaterialImportModeIsNone: 1 additionalBone: 0 userData: diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Models/Reticle_Torus.fbx b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Models/Reticle_Torus.fbx similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Models/Reticle_Torus.fbx rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Models/Reticle_Torus.fbx diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Models/Reticle_Torus.fbx.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Models/Reticle_Torus.fbx.meta similarity index 95% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Models/Reticle_Torus.fbx.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Models/Reticle_Torus.fbx.meta index 307829b..a0f3bf0 100644 --- a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Models/Reticle_Torus.fbx.meta +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Models/Reticle_Torus.fbx.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 guid: be2911572dc3afa448d24b4e97edc5f1 ModelImporter: - serializedVersion: 22200 + serializedVersion: 21300 internalIDToNameTable: [] externalObjects: {} materials: @@ -40,7 +40,6 @@ ModelImporter: addColliders: 0 useSRGBMaterialColor: 1 sortHierarchyByName: 1 - importPhysicalCameras: 1 importVisibility: 1 importBlendShapes: 1 importCameras: 1 @@ -68,7 +67,6 @@ ModelImporter: secondaryUVMinObjectScale: 1 secondaryUVPackMargin: 4 useFileScale: 1 - strictVertexDataChecks: 0 tangentSpace: normalSmoothAngle: 60 normalImportMode: 0 @@ -101,7 +99,6 @@ ModelImporter: humanoidOversampling: 1 avatarSetup: 0 addHumanoidExtraRootOnlyWhenUsingAvatar: 1 - importBlendShapeDeformPercent: 0 remapMaterialsIfMaterialImportModeIsNone: 1 additionalBone: 0 userData: diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Models/XRControllerLeft.fbx b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Models/XRControllerLeft.fbx similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Models/XRControllerLeft.fbx rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Models/XRControllerLeft.fbx diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Models/XRControllerLeft.fbx.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Models/XRControllerLeft.fbx.meta similarity index 95% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Models/XRControllerLeft.fbx.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Models/XRControllerLeft.fbx.meta index aacde25..178f375 100644 --- a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Models/XRControllerLeft.fbx.meta +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Models/XRControllerLeft.fbx.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 guid: be3083a5f26d4e859d594ecbe632f87e ModelImporter: - serializedVersion: 22200 + serializedVersion: 21300 internalIDToNameTable: [] externalObjects: {} materials: @@ -40,7 +40,6 @@ ModelImporter: addColliders: 0 useSRGBMaterialColor: 1 sortHierarchyByName: 1 - importPhysicalCameras: 1 importVisibility: 1 importBlendShapes: 1 importCameras: 1 @@ -68,7 +67,6 @@ ModelImporter: secondaryUVMinObjectScale: 1 secondaryUVPackMargin: 4 useFileScale: 1 - strictVertexDataChecks: 0 tangentSpace: normalSmoothAngle: 60 normalImportMode: 0 @@ -101,7 +99,6 @@ ModelImporter: humanoidOversampling: 1 avatarSetup: 0 addHumanoidExtraRootOnlyWhenUsingAvatar: 0 - importBlendShapeDeformPercent: 0 remapMaterialsIfMaterialImportModeIsNone: 1 additionalBone: 0 userData: diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Models/XRControllerRight.fbx b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Models/XRControllerRight.fbx similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Models/XRControllerRight.fbx rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Models/XRControllerRight.fbx diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Models/XRControllerRight.fbx.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Models/XRControllerRight.fbx.meta similarity index 95% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Models/XRControllerRight.fbx.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Models/XRControllerRight.fbx.meta index dd29642..f882b2a 100644 --- a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Models/XRControllerRight.fbx.meta +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Models/XRControllerRight.fbx.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 guid: 11cd62256b1d470f922b2c8e6446cc77 ModelImporter: - serializedVersion: 22200 + serializedVersion: 21300 internalIDToNameTable: [] externalObjects: {} materials: @@ -40,7 +40,6 @@ ModelImporter: addColliders: 0 useSRGBMaterialColor: 1 sortHierarchyByName: 1 - importPhysicalCameras: 1 importVisibility: 1 importBlendShapes: 1 importCameras: 1 @@ -68,7 +67,6 @@ ModelImporter: secondaryUVMinObjectScale: 1 secondaryUVPackMargin: 4 useFileScale: 1 - strictVertexDataChecks: 0 tangentSpace: normalSmoothAngle: 60 normalImportMode: 0 @@ -101,7 +99,6 @@ ModelImporter: humanoidOversampling: 1 avatarSetup: 0 addHumanoidExtraRootOnlyWhenUsingAvatar: 0 - importBlendShapeDeformPercent: 0 remapMaterialsIfMaterialImportModeIsNone: 1 additionalBone: 0 userData: diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Prefabs.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Prefabs.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Prefabs.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Prefabs.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Prefabs/Controllers.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Prefabs/Controllers.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Prefabs/Controllers.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Prefabs/Controllers.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Prefabs/Controllers/XR Controller Left.prefab b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Prefabs/Controllers/XR Controller Left.prefab similarity index 98% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Prefabs/Controllers/XR Controller Left.prefab rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Prefabs/Controllers/XR Controller Left.prefab index 359e9a4..e0a8077 100644 --- a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Prefabs/Controllers/XR Controller Left.prefab +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Prefabs/Controllers/XR Controller Left.prefab @@ -25,13 +25,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1591450736581743243} - serializedVersion: 2 m_LocalRotation: {x: 0.000000021855694, y: 0, z: -0, w: 1} m_LocalPosition: {x: 0, y: -0.0000135928385, z: -0.0049661375} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8270855663187062767} + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &3948495021522208145 MeshFilter: @@ -108,13 +108,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2833903026367321022} - serializedVersion: 2 m_LocalRotation: {x: 0.000000059604645, y: -0.000000030733645, z: -0.000000028871002, w: 1} m_LocalPosition: {x: -0.007821825, y: 0.0009400594, z: 0.006571072} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8173916776436821938} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &5546920259920998435 MeshFilter: @@ -191,13 +191,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2920996176376820429} - serializedVersion: 2 m_LocalRotation: {x: 0.000000059604645, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0.008775876, y: -0.002558912, z: -0.0074315914} m_LocalScale: {x: 1.342947, y: 1.342947, z: 1.342947} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8173916776436821938} + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &1311942897710075639 MeshFilter: @@ -274,13 +274,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3355591549739262786} - serializedVersion: 2 m_LocalRotation: {x: 0.000000021855694, y: 3.2567517e-16, z: 0.000000014901159, w: 1} m_LocalPosition: {x: 0, y: -0.013359987, z: -0.018506905} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8270855663187062767} + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &3629011562858007340 MeshFilter: @@ -357,13 +357,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4045590804765120743} - serializedVersion: 2 m_LocalRotation: {x: 0.000000059604645, y: 0, z: -0, w: 1} m_LocalPosition: {x: 0.008775877, y: 0.00152745, z: -0.0074315914} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8173916776436821938} + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &6190287511479189489 MeshFilter: @@ -438,7 +438,6 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5350001822289929954} - serializedVersion: 2 m_LocalRotation: {x: 0.000000021855694, y: 0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -449,6 +448,7 @@ Transform: - {fileID: 5551125943416818270} - {fileID: 4409659463910318501} m_Father: {fileID: 8270855663187062767} + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &6048850322503762846 GameObject: @@ -475,13 +475,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6048850322503762846} - serializedVersion: 2 m_LocalRotation: {x: 0.18379451, y: -0.0000000859335, z: 0.000000016067826, w: 0.9829647} m_LocalPosition: {x: 0, y: -0.0032368493, z: 0.024549427} m_LocalScale: {x: 1.01935, y: 1.01935, z: 1.01935} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8270855663187062767} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &6989809552187391942 MeshFilter: @@ -558,13 +558,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6877554675875058235} - serializedVersion: 2 m_LocalRotation: {x: 0.000000059604645, y: -0.000000030733645, z: -0.000000028871002, w: 1} m_LocalPosition: {x: -0.011533444, y: 0.0009400594, z: -0.007045295} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8173916776436821938} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &2046265684884497959 MeshFilter: @@ -641,13 +641,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8103503810883324120} - serializedVersion: 2 m_LocalRotation: {x: 0.000000021855694, 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: 8270855663187062767} + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &7013576290909491880 MeshFilter: @@ -724,13 +724,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8443930452699679086} - serializedVersion: 2 m_LocalRotation: {x: 0.000000021668717, y: -0.1305262, z: 0.0000000028527405, w: 0.9914449} m_LocalPosition: {x: -0.012636564, y: -0.028556997, z: 0.027326612} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8270855663187062767} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &7720275433028147840 MeshFilter: @@ -805,7 +805,6 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8758423527188247893} - serializedVersion: 2 m_LocalRotation: {x: 0, y: 1, z: 0, w: 0} m_LocalPosition: {x: 0, y: 0, z: -0.05} m_LocalScale: {x: 1, y: 1, z: 1} @@ -818,4 +817,5 @@ Transform: - {fileID: 7656785331879846650} - {fileID: 8173916776436821938} m_Father: {fileID: 0} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Prefabs/Controllers/XR Controller Left.prefab.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Prefabs/Controllers/XR Controller Left.prefab.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Prefabs/Controllers/XR Controller Left.prefab.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Prefabs/Controllers/XR Controller Left.prefab.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Prefabs/Controllers/XR Controller Right.prefab b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Prefabs/Controllers/XR Controller Right.prefab similarity index 98% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Prefabs/Controllers/XR Controller Right.prefab rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Prefabs/Controllers/XR Controller Right.prefab index 26cc61a..a9d8ba6 100644 --- a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Prefabs/Controllers/XR Controller Right.prefab +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Prefabs/Controllers/XR Controller Right.prefab @@ -23,7 +23,6 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 631318195828040478} - serializedVersion: 2 m_LocalRotation: {x: 0.000000021855694, y: 0, z: -0, w: 1} m_LocalPosition: {x: -0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -34,6 +33,7 @@ Transform: - {fileID: 1149664065565101986} - {fileID: 9209759161381479513} m_Father: {fileID: 3475118261464492563} + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1228417906145134178 GameObject: @@ -60,13 +60,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1228417906145134178} - serializedVersion: 2 m_LocalRotation: {x: 0.17364818, y: -0.00000008609464, z: 0.000000015180808, w: 0.9848078} m_LocalPosition: {x: -0.0000000071777, y: -0.0032408535, z: 0.024560427} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3475118261464492563} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &2593272954759969338 MeshFilter: @@ -143,13 +143,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2129104537058187207} - serializedVersion: 2 m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0.011533444, y: 0.0009400594, z: -0.007045295} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3716161019320855118} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &6816243177344082907 MeshFilter: @@ -226,13 +226,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3641317572183526692} - serializedVersion: 2 m_LocalRotation: {x: 0.000000021855694, 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: 3475118261464492563} + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &2569541872588003156 MeshFilter: @@ -309,13 +309,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4022625689426332818} - serializedVersion: 2 m_LocalRotation: {x: -0.70441604, y: 0.061628427, z: 0.061628427, w: 0.7044161} m_LocalPosition: {x: 0.012636564, y: -0.028556997, z: 0.027326612} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3475118261464492563} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &3016865672996839292 MeshFilter: @@ -390,7 +390,6 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4283425761326543017} - serializedVersion: 2 m_LocalRotation: {x: 0, y: 1, z: 0, w: 0} m_LocalPosition: {x: 0, y: 0, z: -0.05} m_LocalScale: {x: 1, y: 1, z: 1} @@ -403,6 +402,7 @@ Transform: - {fileID: 2936275983042619142} - {fileID: 3716161019320855118} m_Father: {fileID: 0} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &6118169511635425143 GameObject: @@ -429,13 +429,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6118169511635425143} - serializedVersion: 2 m_LocalRotation: {x: 0.000000021855694, y: 0, z: -0, w: 1} m_LocalPosition: {x: 2.2105108e-10, y: -0.0000135928385, z: -0.0049661375} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3475118261464492563} + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &8373948243224051821 MeshFilter: @@ -512,13 +512,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7325642504921798210} - serializedVersion: 2 m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0.007821825, y: 0.0009400594, z: 0.006571072} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3716161019320855118} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &1010913343161546207 MeshFilter: @@ -595,13 +595,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7670919110547240753} - serializedVersion: 2 m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.008775876, y: -0.002558912, z: -0.0074315914} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3716161019320855118} + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &5821210241915783947 MeshFilter: @@ -678,13 +678,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7812784923275191998} - serializedVersion: 2 m_LocalRotation: {x: 0.000000021855694, y: 0, z: -0, w: 1} m_LocalPosition: {x: -5.559989e-10, y: -0.013359987, z: -0.018506905} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3475118261464492563} + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &8115825213372190416 MeshFilter: @@ -761,13 +761,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8852161128374344987} - serializedVersion: 2 m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.008775877, y: 0.00152745, z: -0.0074315914} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3716161019320855118} + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &1663432946110593549 MeshFilter: diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Prefabs/Controllers/XR Controller Right.prefab.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Prefabs/Controllers/XR Controller Right.prefab.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Prefabs/Controllers/XR Controller Right.prefab.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Prefabs/Controllers/XR Controller Right.prefab.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Prefabs/Interactors.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Prefabs/Interactors.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Prefabs/Interactors.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Prefabs/Interactors.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Prefabs/Interactors/Direct Interactor.prefab b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Prefabs/Interactors/Direct Interactor.prefab similarity index 95% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Prefabs/Interactors/Direct Interactor.prefab rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Prefabs/Interactors/Direct Interactor.prefab index 92713bd..c994d2b 100644 --- a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Prefabs/Interactors/Direct Interactor.prefab +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Prefabs/Interactors/Direct Interactor.prefab @@ -25,13 +25,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8841706926471734270} - 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 &664489801923019586 MonoBehaviour: @@ -131,16 +131,8 @@ SphereCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8841706926471734270} 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: 3 - m_Radius: 0.2 + serializedVersion: 2 + m_Radius: 0.1 m_Center: {x: 0, y: 0, z: 0} diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Prefabs/Interactors/Direct Interactor.prefab.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Prefabs/Interactors/Direct Interactor.prefab.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Prefabs/Interactors/Direct Interactor.prefab.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Prefabs/Interactors/Direct Interactor.prefab.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Prefabs/Interactors/Gaze Interactor.prefab b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Prefabs/Interactors/Gaze Interactor.prefab similarity index 99% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Prefabs/Interactors/Gaze Interactor.prefab rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Prefabs/Interactors/Gaze Interactor.prefab index 1d04e25..0c4a61a 100644 --- a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Prefabs/Interactors/Gaze Interactor.prefab +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Prefabs/Interactors/Gaze Interactor.prefab @@ -147,6 +147,7 @@ MonoBehaviour: m_AutoDeselect: 1 m_TimeToAutoDeselect: 0.25 m_EnableUIInteraction: 1 + m_BlockUIOnInteractableSelection: 1 m_AllowAnchorControl: 1 m_UseForceGrab: 1 m_RotateSpeed: 180 diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Prefabs/Interactors/Gaze Interactor.prefab.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Prefabs/Interactors/Gaze Interactor.prefab.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Prefabs/Interactors/Gaze Interactor.prefab.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Prefabs/Interactors/Gaze Interactor.prefab.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Prefabs/Interactors/Poke Interactor.prefab b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Prefabs/Interactors/Poke Interactor.prefab similarity index 99% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Prefabs/Interactors/Poke Interactor.prefab rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Prefabs/Interactors/Poke Interactor.prefab index a38a49e..617ac45 100644 --- a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Prefabs/Interactors/Poke Interactor.prefab +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Prefabs/Interactors/Poke Interactor.prefab @@ -25,7 +25,6 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1096232077998711156} - serializedVersion: 2 m_LocalRotation: {x: 0.043619405, y: 0, z: 0, w: 0.9990483} m_LocalPosition: {x: 0, y: -0.01, z: 0.025} m_LocalScale: {x: 0.01, y: 0.01, z: 0.01} @@ -33,6 +32,7 @@ Transform: m_Children: - {fileID: 3652727254930583670} m_Father: {fileID: 780270278251679399} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 5, y: 0, z: 0} --- !u!33 &5061549556326891251 MeshFilter: @@ -108,7 +108,6 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4125421792874400280} - 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} @@ -116,6 +115,7 @@ Transform: m_Children: - {fileID: 8259524632637961923} m_Father: {fileID: 0} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &2417358720014700305 MonoBehaviour: @@ -209,13 +209,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7700498066419981941} - serializedVersion: 2 m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} m_LocalPosition: {x: 0, y: -0.1, z: -4} m_LocalScale: {x: 0.5, y: 3.6, z: 0.5} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8259524632637961923} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} --- !u!33 &6633174523433423063 MeshFilter: diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Prefabs/Interactors/Poke Interactor.prefab.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Prefabs/Interactors/Poke Interactor.prefab.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Prefabs/Interactors/Poke Interactor.prefab.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Prefabs/Interactors/Poke Interactor.prefab.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Prefabs/Interactors/Ray Interactor.prefab b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Prefabs/Interactors/Ray Interactor.prefab similarity index 99% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Prefabs/Interactors/Ray Interactor.prefab rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Prefabs/Interactors/Ray Interactor.prefab index 818d5cf..4dc0669 100644 --- a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Prefabs/Interactors/Ray Interactor.prefab +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Prefabs/Interactors/Ray Interactor.prefab @@ -135,8 +135,8 @@ MonoBehaviour: m_ControlPointHeight: 5 m_SampleFrequency: 60 m_HitDetectionType: 2 - m_SphereCastRadius: 0.1 - m_ConeCastAngle: 6 + m_SphereCastRadius: 0.0125 + m_ConeCastAngle: 3 m_RaycastMask: serializedVersion: 2 m_Bits: 2147483681 @@ -148,6 +148,7 @@ MonoBehaviour: m_AutoDeselect: 0 m_TimeToAutoDeselect: 1 m_EnableUIInteraction: 1 + m_BlockUIOnInteractableSelection: 1 m_AllowAnchorControl: 1 m_UseForceGrab: 0 m_RotateSpeed: 180 diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Prefabs/Interactors/Ray Interactor.prefab.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Prefabs/Interactors/Ray Interactor.prefab.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Prefabs/Interactors/Ray Interactor.prefab.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Prefabs/Interactors/Ray Interactor.prefab.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Prefabs/Interactors/Teleport Interactor.prefab b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Prefabs/Interactors/Teleport Interactor.prefab similarity index 99% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Prefabs/Interactors/Teleport Interactor.prefab rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Prefabs/Interactors/Teleport Interactor.prefab index 3e9da55..37d9bf8 100644 --- a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Prefabs/Interactors/Teleport Interactor.prefab +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Prefabs/Interactors/Teleport Interactor.prefab @@ -148,6 +148,7 @@ MonoBehaviour: m_AutoDeselect: 0 m_TimeToAutoDeselect: 1 m_EnableUIInteraction: 0 + m_BlockUIOnInteractableSelection: 1 m_AllowAnchorControl: 1 m_UseForceGrab: 0 m_RotateSpeed: 180 diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Prefabs/Interactors/Teleport Interactor.prefab.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Prefabs/Interactors/Teleport Interactor.prefab.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Prefabs/Interactors/Teleport Interactor.prefab.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Prefabs/Interactors/Teleport Interactor.prefab.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Prefabs/Teleport.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Prefabs/Teleport.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Prefabs/Teleport.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Prefabs/Teleport.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Prefabs/Teleport/Blocking Teleport Reticle.prefab b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Prefabs/Teleport/Blocking Teleport Reticle.prefab similarity index 98% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Prefabs/Teleport/Blocking Teleport Reticle.prefab rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Prefabs/Teleport/Blocking Teleport Reticle.prefab index 2947ce8..0be2a4a 100644 --- a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Prefabs/Teleport/Blocking Teleport Reticle.prefab +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Prefabs/Teleport/Blocking Teleport Reticle.prefab @@ -23,7 +23,6 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3177232254315139758} - 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,6 +32,7 @@ Transform: - {fileID: 778375324165619322} - {fileID: 7987415996582467311} m_Father: {fileID: 0} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &4078087813272782827 GameObject: @@ -59,13 +59,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4078087813272782827} - serializedVersion: 2 m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} m_LocalPosition: {x: -0, y: 0.02, z: 0} m_LocalScale: {x: 0.5, y: 0.5, z: 0.1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2563787388445243513} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} --- !u!33 &323217367318794996 MeshFilter: @@ -142,13 +142,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4758630291384489580} - serializedVersion: 2 m_LocalRotation: {x: 0, y: 0.38268343, z: 0, w: 0.92387956} m_LocalPosition: {x: 0, y: 0.02, z: 0} m_LocalScale: {x: 0.045, y: 0.01, z: 0.42} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2563787388445243513} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 45, z: 0} --- !u!33 &2927918565195676834 MeshFilter: @@ -225,13 +225,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7695955595699998785} - serializedVersion: 2 m_LocalRotation: {x: 0, y: -0.38268343, z: 0, w: 0.92387956} m_LocalPosition: {x: 0, y: 0.02, z: 0} m_LocalScale: {x: 0.045, y: 0.01, z: 0.42} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2563787388445243513} + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: -45, z: 0} --- !u!33 &2013048276783952217 MeshFilter: diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Prefabs/Teleport/Blocking Teleport Reticle.prefab.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Prefabs/Teleport/Blocking Teleport Reticle.prefab.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Prefabs/Teleport/Blocking Teleport Reticle.prefab.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Prefabs/Teleport/Blocking Teleport Reticle.prefab.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Prefabs/Teleport/Directional Teleport Reticle.prefab b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Prefabs/Teleport/Directional Teleport Reticle.prefab similarity index 96% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Prefabs/Teleport/Directional Teleport Reticle.prefab rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Prefabs/Teleport/Directional Teleport Reticle.prefab index 2ef3f37..21191af 100644 --- a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Prefabs/Teleport/Directional Teleport Reticle.prefab +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Prefabs/Teleport/Directional Teleport Reticle.prefab @@ -23,7 +23,6 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8748868027195207512} - 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,13 +31,13 @@ Transform: - {fileID: 7034613628462190461} - {fileID: 8604691383457356503} m_Father: {fileID: 0} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &7355872082156136598 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - serializedVersion: 3 m_TransformParent: {fileID: 8568544637412148623} m_Modifications: - target: {fileID: -8679921383154817045, guid: be2911572dc3afa448d24b4e97edc5f1, type: 3} @@ -102,9 +101,6 @@ PrefabInstance: value: Reticle_Torus objectReference: {fileID: 0} m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: be2911572dc3afa448d24b4e97edc5f1, type: 3} --- !u!4 &7034613628462190461 stripped Transform: @@ -116,7 +112,6 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - serializedVersion: 3 m_TransformParent: {fileID: 8568544637412148623} m_Modifications: - target: {fileID: -8679921383154817045, guid: ab3a79eba4de4be0ad5fead9fb858190, type: 3} @@ -180,9 +175,6 @@ PrefabInstance: value: Primitive_Wedge objectReference: {fileID: 0} m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: ab3a79eba4de4be0ad5fead9fb858190, type: 3} --- !u!4 &8604691383457356503 stripped Transform: diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Prefabs/Teleport/Directional Teleport Reticle.prefab.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Prefabs/Teleport/Directional Teleport Reticle.prefab.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Prefabs/Teleport/Directional Teleport Reticle.prefab.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Prefabs/Teleport/Directional Teleport Reticle.prefab.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Prefabs/XR Interaction Setup.prefab b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Prefabs/XR Interaction Setup.prefab similarity index 95% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Prefabs/XR Interaction Setup.prefab rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Prefabs/XR Interaction Setup.prefab index 085f978..cfc174c 100644 --- a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Prefabs/XR Interaction Setup.prefab +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Prefabs/XR Interaction Setup.prefab @@ -11,7 +11,6 @@ GameObject: - component: {fileID: 3127728406573987373} - component: {fileID: 3127728406573987372} - component: {fileID: 3127728406573987374} - - component: {fileID: 8646833452026761747} m_Layer: 0 m_Name: EventSystem m_TagString: Untagged @@ -26,13 +25,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3127728406573987378} - 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: 4134505312059479865} + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &3127728406573987372 MonoBehaviour: @@ -88,21 +87,6 @@ MonoBehaviour: m_VerticalAxis: Vertical m_SubmitButton: Submit m_CancelButton: Cancel ---- !u!114 &8646833452026761747 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3127728406573987378} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 245cbddba11cba14f806daae3c70ad68, type: 3} - m_Name: - m_EditorClassIdentifier: - m_RayPositionIgnoreAngle: 45 - m_RayFacingIgnoreAngle: 75 - m_RayPositionIgnoreDistance: 25 --- !u!1 &3127728407087826087 GameObject: m_ObjectHideFlags: 0 @@ -127,13 +111,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3127728407087826087} - 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: 4134505312059479865} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &3127728407087826080 MonoBehaviour: @@ -173,13 +157,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3127728408163665756} - 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: 4134505312059479865} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &3127728408163665757 MonoBehaviour: @@ -218,7 +202,6 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7313654230448209575} - 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} @@ -229,13 +212,13 @@ Transform: - {fileID: 3127728406573987373} - {fileID: 7696548424635294051} m_Father: {fileID: 0} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &2181405618368934381 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - serializedVersion: 3 m_TransformParent: {fileID: 9014170783809206335} m_Modifications: - target: {fileID: 8429981633443581377, guid: 6c8af5c8012f01440af6cb2bc3eb987c, type: 3} @@ -244,7 +227,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8429981633443581382, guid: 6c8af5c8012f01440af6cb2bc3eb987c, type: 3} propertyPath: m_RootOrder - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8429981633443581382, guid: 6c8af5c8012f01440af6cb2bc3eb987c, type: 3} propertyPath: m_LocalPosition.x @@ -451,21 +434,12 @@ PrefabInstance: value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 6c8af5c8012f01440af6cb2bc3eb987c, type: 3} ---- !u!4 &7690080512698956843 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 8429981633443581382, guid: 6c8af5c8012f01440af6cb2bc3eb987c, type: 3} - m_PrefabInstance: {fileID: 2181405618368934381} - m_PrefabAsset: {fileID: 0} --- !u!1001 &9014170785273859917 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - serializedVersion: 3 m_TransformParent: {fileID: 4134505312059479865} m_Modifications: - target: {fileID: 1717954561962503725, guid: f6336ac4ac8b4d34bc5072418cdc62a0, type: 3} @@ -517,12 +491,6 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: - - targetCorrespondingSourceObject: {fileID: 1767192434, guid: f6336ac4ac8b4d34bc5072418cdc62a0, type: 3} - insertIndex: -1 - addedObject: {fileID: 7690080512698956843} - m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f6336ac4ac8b4d34bc5072418cdc62a0, type: 3} --- !u!114 &2728902658200667494 stripped MonoBehaviour: diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Prefabs/XR Interaction Setup.prefab.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Prefabs/XR Interaction Setup.prefab.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Prefabs/XR Interaction Setup.prefab.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Prefabs/XR Interaction Setup.prefab.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Prefabs/XR Origin (XR Rig).prefab b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Prefabs/XR Origin (XR Rig).prefab similarity index 99% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Prefabs/XR Origin (XR Rig).prefab rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Prefabs/XR Origin (XR Rig).prefab index 760d0e8..2c1baf4 100644 --- a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Prefabs/XR Origin (XR Rig).prefab +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Prefabs/XR Origin (XR Rig).prefab @@ -878,7 +878,6 @@ MonoBehaviour: m_Action: Rotation m_Flags: 0 m_Flags: 0 - m_HasMigratedActions: 1 --- !u!1 &58445280694286476 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Prefabs/XR Origin (XR Rig).prefab.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Prefabs/XR Origin (XR Rig).prefab.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Prefabs/XR Origin (XR Rig).prefab.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Prefabs/XR Origin (XR Rig).prefab.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Presets.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Presets.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Presets.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Presets.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Presets/XRI Default Continuous Move.preset b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Presets/XRI Default Continuous Move.preset similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Presets/XRI Default Continuous Move.preset rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Presets/XRI Default Continuous Move.preset diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Presets/XRI Default Continuous Move.preset.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Presets/XRI Default Continuous Move.preset.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Presets/XRI Default Continuous Move.preset.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Presets/XRI Default Continuous Move.preset.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Presets/XRI Default Continuous Turn.preset b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Presets/XRI Default Continuous Turn.preset similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Presets/XRI Default Continuous Turn.preset rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Presets/XRI Default Continuous Turn.preset diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Presets/XRI Default Continuous Turn.preset.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Presets/XRI Default Continuous Turn.preset.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Presets/XRI Default Continuous Turn.preset.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Presets/XRI Default Continuous Turn.preset.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Presets/XRI Default Gaze Controller.preset b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Presets/XRI Default Gaze Controller.preset similarity index 89% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Presets/XRI Default Gaze Controller.preset rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Presets/XRI Default Gaze Controller.preset index 3e8c5a8..975cede 100644 --- a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Presets/XRI Default Gaze Controller.preset +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Presets/XRI Default Gaze Controller.preset @@ -660,6 +660,86 @@ Preset: propertyPath: m_TranslateAnchorAction.m_Reference value: objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_ScaleToggleAction.m_UseReference + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_ScaleToggleAction.m_Action.m_Name + value: Scale Toggle + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_ScaleToggleAction.m_Action.m_Type + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_ScaleToggleAction.m_Action.m_ExpectedControlType + value: + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_ScaleToggleAction.m_Action.m_Id + value: c491f7d4-d5f5-485e-8ebe-d323ea5e8eee + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_ScaleToggleAction.m_Action.m_Processors + value: + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_ScaleToggleAction.m_Action.m_Interactions + value: + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_ScaleToggleAction.m_Action.m_SingletonActionBindings.Array.size + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_ScaleToggleAction.m_Action.m_Flags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_ScaleToggleAction.m_Reference + value: + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_ScaleDeltaAction.m_UseReference + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_ScaleDeltaAction.m_Action.m_Name + value: Scale Delta + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_ScaleDeltaAction.m_Action.m_Type + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_ScaleDeltaAction.m_Action.m_ExpectedControlType + value: Vector2 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_ScaleDeltaAction.m_Action.m_Id + value: 702606e7-26dd-4ff2-8e26-59078e8cafee + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_ScaleDeltaAction.m_Action.m_Processors + value: + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_ScaleDeltaAction.m_Action.m_Interactions + value: + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_ScaleDeltaAction.m_Action.m_SingletonActionBindings.Array.size + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_ScaleDeltaAction.m_Action.m_Flags + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_ScaleDeltaAction.m_Reference + value: + objectReference: {fileID: 0} - target: {fileID: 0} propertyPath: m_ButtonPressPoint value: 0.5 diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Presets/XRI Default Gaze Controller.preset.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Presets/XRI Default Gaze Controller.preset.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Presets/XRI Default Gaze Controller.preset.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Presets/XRI Default Gaze Controller.preset.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Presets/XRI Default Left ActionBasedControllerManager.preset b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Presets/XRI Default Left ActionBasedControllerManager.preset similarity index 94% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Presets/XRI Default Left ActionBasedControllerManager.preset rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Presets/XRI Default Left ActionBasedControllerManager.preset index 1046b6f..5166a01 100644 --- a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Presets/XRI Default Left ActionBasedControllerManager.preset +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Presets/XRI Default Left ActionBasedControllerManager.preset @@ -76,4 +76,8 @@ Preset: propertyPath: m_UIScrollingEnabled value: 1 objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_RayInteractorChanged.m_PersistentCalls.m_Calls.Array.size + value: 0 + objectReference: {fileID: 0} m_ExcludedProperties: [] diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Presets/XRI Default Left ActionBasedControllerManager.preset.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Presets/XRI Default Left ActionBasedControllerManager.preset.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Presets/XRI Default Left ActionBasedControllerManager.preset.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Presets/XRI Default Left ActionBasedControllerManager.preset.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Presets/XRI Default Left Controller.preset b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Presets/XRI Default Left Controller.preset similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Presets/XRI Default Left Controller.preset rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Presets/XRI Default Left Controller.preset diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Presets/XRI Default Left Controller.preset.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Presets/XRI Default Left Controller.preset.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Presets/XRI Default Left Controller.preset.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Presets/XRI Default Left Controller.preset.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Presets/XRI Default Left Grab Move.preset b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Presets/XRI Default Left Grab Move.preset similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Presets/XRI Default Left Grab Move.preset rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Presets/XRI Default Left Grab Move.preset diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Presets/XRI Default Left Grab Move.preset.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Presets/XRI Default Left Grab Move.preset.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Presets/XRI Default Left Grab Move.preset.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Presets/XRI Default Left Grab Move.preset.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Presets/XRI Default Right ActionBasedControllerManager.preset b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Presets/XRI Default Right ActionBasedControllerManager.preset similarity index 94% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Presets/XRI Default Right ActionBasedControllerManager.preset rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Presets/XRI Default Right ActionBasedControllerManager.preset index e027554..2a7a521 100644 --- a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Presets/XRI Default Right ActionBasedControllerManager.preset +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Presets/XRI Default Right ActionBasedControllerManager.preset @@ -76,4 +76,8 @@ Preset: propertyPath: m_UIScrollingEnabled value: 1 objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_RayInteractorChanged.m_PersistentCalls.m_Calls.Array.size + value: 0 + objectReference: {fileID: 0} m_ExcludedProperties: [] diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Presets/XRI Default Right ActionBasedControllerManager.preset.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Presets/XRI Default Right ActionBasedControllerManager.preset.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Presets/XRI Default Right ActionBasedControllerManager.preset.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Presets/XRI Default Right ActionBasedControllerManager.preset.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Presets/XRI Default Right Controller.preset b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Presets/XRI Default Right Controller.preset similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Presets/XRI Default Right Controller.preset rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Presets/XRI Default Right Controller.preset diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Presets/XRI Default Right Controller.preset.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Presets/XRI Default Right Controller.preset.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Presets/XRI Default Right Controller.preset.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Presets/XRI Default Right Controller.preset.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Presets/XRI Default Right Grab Move.preset b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Presets/XRI Default Right Grab Move.preset similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Presets/XRI Default Right Grab Move.preset rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Presets/XRI Default Right Grab Move.preset diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Presets/XRI Default Right Grab Move.preset.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Presets/XRI Default Right Grab Move.preset.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Presets/XRI Default Right Grab Move.preset.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Presets/XRI Default Right Grab Move.preset.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Presets/XRI Default Snap Turn.preset b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Presets/XRI Default Snap Turn.preset similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Presets/XRI Default Snap Turn.preset rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Presets/XRI Default Snap Turn.preset diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Presets/XRI Default Snap Turn.preset.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Presets/XRI Default Snap Turn.preset.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Presets/XRI Default Snap Turn.preset.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Presets/XRI Default Snap Turn.preset.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Presets/XRI Default XR Screen Space Controller.preset b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Presets/XRI Default XR Screen Space Controller.preset similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Presets/XRI Default XR Screen Space Controller.preset rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Presets/XRI Default XR Screen Space Controller.preset diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Presets/XRI Default XR Screen Space Controller.preset.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Presets/XRI Default XR Screen Space Controller.preset.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Presets/XRI Default XR Screen Space Controller.preset.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Presets/XRI Default XR Screen Space Controller.preset.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Presets/XRI Default XR UI Input Module.preset b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Presets/XRI Default XR UI Input Module.preset similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Presets/XRI Default XR UI Input Module.preset rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Presets/XRI Default XR UI Input Module.preset diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Presets/XRI Default XR UI Input Module.preset.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Presets/XRI Default XR UI Input Module.preset.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Presets/XRI Default XR UI Input Module.preset.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Presets/XRI Default XR UI Input Module.preset.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Scripts.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Scripts.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Scripts.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Scripts.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Scripts/ActionBasedControllerManager.cs b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Scripts/ActionBasedControllerManager.cs similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Scripts/ActionBasedControllerManager.cs rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Scripts/ActionBasedControllerManager.cs diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Scripts/ActionBasedControllerManager.cs.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Scripts/ActionBasedControllerManager.cs.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Scripts/ActionBasedControllerManager.cs.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Scripts/ActionBasedControllerManager.cs.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Scripts/DestroySelf.cs b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Scripts/DestroySelf.cs similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Scripts/DestroySelf.cs rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Scripts/DestroySelf.cs diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Scripts/DestroySelf.cs.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Scripts/DestroySelf.cs.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Scripts/DestroySelf.cs.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Scripts/DestroySelf.cs.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Scripts/DynamicMoveProvider.cs b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Scripts/DynamicMoveProvider.cs similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Scripts/DynamicMoveProvider.cs rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Scripts/DynamicMoveProvider.cs diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Scripts/DynamicMoveProvider.cs.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Scripts/DynamicMoveProvider.cs.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Scripts/DynamicMoveProvider.cs.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Scripts/DynamicMoveProvider.cs.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Scripts/GazeInputManager.cs b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Scripts/GazeInputManager.cs similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Scripts/GazeInputManager.cs rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Scripts/GazeInputManager.cs diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Scripts/GazeInputManager.cs.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Scripts/GazeInputManager.cs.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Scripts/GazeInputManager.cs.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Scripts/GazeInputManager.cs.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Scripts/ObjectSpawner.cs b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Scripts/ObjectSpawner.cs similarity index 97% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Scripts/ObjectSpawner.cs rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Scripts/ObjectSpawner.cs index 7fa2e87..485e34a 100644 --- a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Scripts/ObjectSpawner.cs +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Scripts/ObjectSpawner.cs @@ -219,9 +219,8 @@ namespace UnityEngine.XR.Interaction.Toolkit.Samples.StarterAssets if (m_ApplyRandomAngleAtSpawn) { - var projectedAngle = Vector3.SignedAngle(Vector3.forward, projectedForward, spawnNormal); var randomRotation = Random.Range(-m_SpawnAngleRange, m_SpawnAngleRange); - newObject.transform.Rotate(Vector3.up, projectedAngle + randomRotation); + newObject.transform.Rotate(Vector3.up, randomRotation); } if (m_SpawnVisualizationPrefab != null) diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Scripts/ObjectSpawner.cs.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Scripts/ObjectSpawner.cs.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Scripts/ObjectSpawner.cs.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Scripts/ObjectSpawner.cs.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Scripts/XRPokeFollowAffordance.cs b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Scripts/XRPokeFollowAffordance.cs similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Scripts/XRPokeFollowAffordance.cs rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Scripts/XRPokeFollowAffordance.cs diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Scripts/XRPokeFollowAffordance.cs.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Scripts/XRPokeFollowAffordance.cs.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Scripts/XRPokeFollowAffordance.cs.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Scripts/XRPokeFollowAffordance.cs.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Tunneling Vignette.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Tunneling Vignette.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Tunneling Vignette.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Tunneling Vignette.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Tunneling Vignette/TunnelingVignette.mat b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Tunneling Vignette/TunnelingVignette.mat similarity index 98% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Tunneling Vignette/TunnelingVignette.mat rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Tunneling Vignette/TunnelingVignette.mat index 925d5b1..b4cb0c6 100644 --- a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Tunneling Vignette/TunnelingVignette.mat +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Tunneling Vignette/TunnelingVignette.mat @@ -9,8 +9,6 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: TunnelingVignette m_Shader: {fileID: 4800000, guid: e51b4af1e50be764e8de46e07d4e3f3f, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] m_InvalidKeywords: - _WINDQUALITY_NONE @@ -20,7 +18,6 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] - m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Tunneling Vignette/TunnelingVignette.mat.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Tunneling Vignette/TunnelingVignette.mat.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Tunneling Vignette/TunnelingVignette.mat.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Tunneling Vignette/TunnelingVignette.mat.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Tunneling Vignette/TunnelingVignette.prefab b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Tunneling Vignette/TunnelingVignette.prefab similarity index 98% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Tunneling Vignette/TunnelingVignette.prefab rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Tunneling Vignette/TunnelingVignette.prefab index 7c3b556..7899549 100644 --- a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Tunneling Vignette/TunnelingVignette.prefab +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Tunneling Vignette/TunnelingVignette.prefab @@ -27,13 +27,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8429981633443581377} - 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!23 &8429981633443581380 MeshRenderer: @@ -129,4 +129,3 @@ SortingGroup: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 30010 - m_SortAtRoot: 0 diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Tunneling Vignette/TunnelingVignette.prefab.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Tunneling Vignette/TunnelingVignette.prefab.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Tunneling Vignette/TunnelingVignette.prefab.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Tunneling Vignette/TunnelingVignette.prefab.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Tunneling Vignette/TunnelingVignette.shader b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Tunneling Vignette/TunnelingVignette.shader similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Tunneling Vignette/TunnelingVignette.shader rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Tunneling Vignette/TunnelingVignette.shader diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Tunneling Vignette/TunnelingVignette.shader.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Tunneling Vignette/TunnelingVignette.shader.meta similarity index 88% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Tunneling Vignette/TunnelingVignette.shader.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Tunneling Vignette/TunnelingVignette.shader.meta index 1b250d1..e6d6927 100644 --- a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Tunneling Vignette/TunnelingVignette.shader.meta +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Tunneling Vignette/TunnelingVignette.shader.meta @@ -4,6 +4,7 @@ ShaderImporter: externalObjects: {} defaultTextures: [] nonModifiableTextures: [] + preprocessorOverride: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Tunneling Vignette/TunnelingVignetteHemisphere.fbx b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Tunneling Vignette/TunnelingVignetteHemisphere.fbx similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Tunneling Vignette/TunnelingVignetteHemisphere.fbx rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Tunneling Vignette/TunnelingVignetteHemisphere.fbx diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Tunneling Vignette/TunnelingVignetteHemisphere.fbx.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Tunneling Vignette/TunnelingVignetteHemisphere.fbx.meta similarity index 95% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Tunneling Vignette/TunnelingVignetteHemisphere.fbx.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Tunneling Vignette/TunnelingVignetteHemisphere.fbx.meta index af207df..124d84c 100644 --- a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Tunneling Vignette/TunnelingVignetteHemisphere.fbx.meta +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Tunneling Vignette/TunnelingVignetteHemisphere.fbx.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 guid: 5833e680dc0f7ae47aec6b4286570484 ModelImporter: - serializedVersion: 22200 + serializedVersion: 21300 internalIDToNameTable: [] externalObjects: {} materials: @@ -40,7 +40,6 @@ ModelImporter: addColliders: 0 useSRGBMaterialColor: 1 sortHierarchyByName: 1 - importPhysicalCameras: 1 importVisibility: 1 importBlendShapes: 1 importCameras: 1 @@ -68,7 +67,6 @@ ModelImporter: secondaryUVMinObjectScale: 1 secondaryUVPackMargin: 4 useFileScale: 1 - strictVertexDataChecks: 0 tangentSpace: normalSmoothAngle: 60 normalImportMode: 0 @@ -101,7 +99,6 @@ ModelImporter: humanoidOversampling: 1 avatarSetup: 0 addHumanoidExtraRootOnlyWhenUsingAvatar: 1 - importBlendShapeDeformPercent: 0 remapMaterialsIfMaterialImportModeIsNone: 0 additionalBone: 0 userData: diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Tunneling Vignette/TunnelingVignetteSG.shadergraph b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Tunneling Vignette/TunnelingVignetteSG.shadergraph similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Tunneling Vignette/TunnelingVignetteSG.shadergraph rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Tunneling Vignette/TunnelingVignetteSG.shadergraph diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Tunneling Vignette/TunnelingVignetteSG.shadergraph.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Tunneling Vignette/TunnelingVignetteSG.shadergraph.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Tunneling Vignette/TunnelingVignetteSG.shadergraph.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Tunneling Vignette/TunnelingVignetteSG.shadergraph.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Unity.XR.Interaction.Toolkit.Samples.StarterAssets.asmdef b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Unity.XR.Interaction.Toolkit.Samples.StarterAssets.asmdef similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Unity.XR.Interaction.Toolkit.Samples.StarterAssets.asmdef rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Unity.XR.Interaction.Toolkit.Samples.StarterAssets.asmdef diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Unity.XR.Interaction.Toolkit.Samples.StarterAssets.asmdef.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Unity.XR.Interaction.Toolkit.Samples.StarterAssets.asmdef.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/Unity.XR.Interaction.Toolkit.Samples.StarterAssets.asmdef.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Unity.XR.Interaction.Toolkit.Samples.StarterAssets.asmdef.meta diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/XRI Default Input Actions.inputactions b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/XRI Default Input Actions.inputactions similarity index 96% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/XRI Default Input Actions.inputactions rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/XRI Default Input Actions.inputactions index 117b675..2370410 100644 --- a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/XRI Default Input Actions.inputactions +++ b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/XRI Default Input Actions.inputactions @@ -425,6 +425,24 @@ "processors": "", "interactions": "", "initialStateCheck": true + }, + { + "name": "Grip Position", + "type": "Value", + "id": "e1240870-ef45-4f3e-8110-ff1b9049c4ca", + "expectedControlType": "Vector3", + "processors": "", + "interactions": "", + "initialStateCheck": true + }, + { + "name": "Grip Rotation", + "type": "Value", + "id": "41873a55-b316-4dbe-96e6-93477eef5e47", + "expectedControlType": "Quaternion", + "processors": "", + "interactions": "", + "initialStateCheck": true } ], "bindings": [ @@ -636,6 +654,28 @@ "action": "Aim Flags", "isComposite": false, "isPartOfComposite": false + }, + { + "name": "", + "id": "21a4b6f9-1ebe-434f-b572-066a77b04c48", + "path": "{LeftHand}/gripPosition", + "interactions": "", + "processors": "", + "groups": "Generic XR Controller", + "action": "Grip Position", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "3c1f9e74-aba4-41d6-b519-90ed563be5d7", + "path": "{LeftHand}/gripRotation", + "interactions": "", + "processors": "", + "groups": "Generic XR Controller", + "action": "Grip Rotation", + "isComposite": false, + "isPartOfComposite": false } ] }, @@ -1181,6 +1221,24 @@ "processors": "", "interactions": "", "initialStateCheck": true + }, + { + "name": "Grip Position", + "type": "Value", + "id": "defe4495-ba8f-4958-b2fb-98d889e45ac5", + "expectedControlType": "Vector3", + "processors": "", + "interactions": "", + "initialStateCheck": true + }, + { + "name": "Grip Rotation", + "type": "Value", + "id": "6bc56065-b0db-4265-8cef-5c7d4f40128a", + "expectedControlType": "Quaternion", + "processors": "", + "interactions": "", + "initialStateCheck": true } ], "bindings": [ @@ -1392,6 +1450,28 @@ "action": "Aim Flags", "isComposite": false, "isPartOfComposite": false + }, + { + "name": "", + "id": "efcaf94e-8faa-439e-983b-c65f79c3b743", + "path": "{RightHand}/gripPosition", + "interactions": "", + "processors": "", + "groups": "Generic XR Controller", + "action": "Grip Position", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "70a747b6-46e8-4d3b-aaec-20bcab8f1dd7", + "path": "{RightHand}/gripRotation", + "interactions": "", + "processors": "", + "groups": "Generic XR Controller", + "action": "Grip Rotation", + "isComposite": false, + "isPartOfComposite": false } ] }, @@ -1938,7 +2018,7 @@ { "name": "", "id": "05c1e38e-79dd-41cb-95d5-74f42e65d92f", - "path": "/touch*/position", + "path": "/position", "interactions": "", "processors": "", "groups": "", @@ -2290,7 +2370,7 @@ { "name": "", "id": "198e6869-709e-448d-96d4-27186c9d56e6", - "path": "/touch*/click", + "path": "/Press", "interactions": "", "processors": "", "groups": "", diff --git a/Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/XRI Default Input Actions.inputactions.meta b/Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/XRI Default Input Actions.inputactions.meta similarity index 100% rename from Assets/Samples/XR Interaction Toolkit/2.5.0/Starter Assets/XRI Default Input Actions.inputactions.meta rename to Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/XRI Default Input Actions.inputactions.meta