From 66ccb98f61f96cfbc36746d7fb5b7bf769fe71ad Mon Sep 17 00:00:00 2001 From: kookiekenobi Date: Mon, 3 Feb 2025 03:27:16 +0800 Subject: [PATCH] game: fixed pen socket orientation --- SSLR/Assets/Scenes/ShannonPlayground.unity | 312 +++++++++--------- .../Resources/InteractionLayerSettings.asset | 2 +- 2 files changed, 151 insertions(+), 163 deletions(-) diff --git a/SSLR/Assets/Scenes/ShannonPlayground.unity b/SSLR/Assets/Scenes/ShannonPlayground.unity index 693cde6..ef7deaf 100644 --- a/SSLR/Assets/Scenes/ShannonPlayground.unity +++ b/SSLR/Assets/Scenes/ShannonPlayground.unity @@ -633,158 +633,6 @@ MonoBehaviour: m_Teleporting: m_PersistentCalls: m_Calls: [] ---- !u!1 &1641917767 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1641917772} - - component: {fileID: 1641917771} - - component: {fileID: 1641917770} - - component: {fileID: 1641917769} - - component: {fileID: 1641917768} - m_Layer: 0 - m_Name: Pen Socket - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1641917768 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1641917767} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 60523e0647cc6ab43acc73cb266a32a7, type: 3} - m_Name: - m_EditorClassIdentifier: - m_InteractionManager: {fileID: 0} - m_InteractionLayers: - m_Bits: 4294967295 - m_Handedness: 0 - m_AttachTransform: {fileID: 0} - m_KeepSelectedTargetValid: 1 - m_DisableVisualsWhenBlockedInGroup: 1 - m_StartingSelectedInteractable: {fileID: 0} - m_StartingTargetFilter: {fileID: 0} - m_HoverEntered: - m_PersistentCalls: - m_Calls: [] - m_HoverExited: - m_PersistentCalls: - m_Calls: [] - m_SelectEntered: - m_PersistentCalls: - m_Calls: [] - m_SelectExited: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_ShowInteractableHoverMeshes: 1 - m_InteractableHoverMeshMaterial: {fileID: 2100000, guid: 5838023c4bfa28943bd0abd3e3020361, type: 2} - m_InteractableCantHoverMeshMaterial: {fileID: 2100000, guid: 91da77b385f3c274da60c626a8acfa24, type: 2} - m_SocketActive: 1 - m_InteractableHoverScale: 1 - m_RecycleDelayTime: 1 - m_HoverSocketSnapping: 0 - m_SocketSnappingRadius: 0.1 - m_SocketScaleMode: 0 - m_FixedScale: {x: 1, y: 1, z: 1} - m_TargetBoundsSize: {x: 1, y: 1, z: 1} ---- !u!65 &1641917769 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1641917767} - 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_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} ---- !u!23 &1641917770 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1641917767} - m_Enabled: 0 - 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: 31321ba15b8f8eb4c954353edc038b1d, 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 &1641917771 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1641917767} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!4 &1641917772 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1641917767} - serializedVersion: 2 - m_LocalRotation: {x: -0.02352272, y: -0.95332426, z: -0.07706093, w: 0.2910005} - m_LocalPosition: {x: 0.012703812, y: 0.0789671, z: 0.017824044} - m_LocalScale: {x: 0.02167456, y: 0.15403818, z: 0.021674559} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 848737917} - m_LocalEulerAnglesHint: {x: -9.243, y: 0, z: 0} --- !u!1 &1816561448 GameObject: m_ObjectHideFlags: 0 @@ -1172,41 +1020,45 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 848737917} m_Modifications: + - target: {fileID: 5725484808141255921, guid: 65cb60c253ed6c74884e8c05d75f2513, type: 3} + propertyPath: m_InteractionLayers.m_Bits + value: 5 + objectReference: {fileID: 0} - target: {fileID: 5926797553057248265, guid: 65cb60c253ed6c74884e8c05d75f2513, type: 3} propertyPath: m_Name value: Pen objectReference: {fileID: 0} - target: {fileID: 6416475349266329267, guid: 65cb60c253ed6c74884e8c05d75f2513, type: 3} propertyPath: m_LocalScale.x - value: 0.016181547 + value: 0.016181558 objectReference: {fileID: 0} - target: {fileID: 6416475349266329267, guid: 65cb60c253ed6c74884e8c05d75f2513, type: 3} propertyPath: m_LocalScale.y - value: 0.016181543 + value: 0.016181557 objectReference: {fileID: 0} - target: {fileID: 6416475349266329267, guid: 65cb60c253ed6c74884e8c05d75f2513, type: 3} propertyPath: m_LocalScale.z - value: 0.016181547 + value: 0.01618155 objectReference: {fileID: 0} - target: {fileID: 6416475349266329267, guid: 65cb60c253ed6c74884e8c05d75f2513, type: 3} propertyPath: m_LocalPosition.x - value: 0.015741402 + value: 0.015200002 objectReference: {fileID: 0} - target: {fileID: 6416475349266329267, guid: 65cb60c253ed6c74884e8c05d75f2513, type: 3} propertyPath: m_LocalPosition.y - value: 0.08031061 + value: 0.080500014 objectReference: {fileID: 0} - target: {fileID: 6416475349266329267, guid: 65cb60c253ed6c74884e8c05d75f2513, type: 3} propertyPath: m_LocalPosition.z - value: 0.01855556 + value: 0.0178 objectReference: {fileID: 0} - target: {fileID: 6416475349266329267, guid: 65cb60c253ed6c74884e8c05d75f2513, type: 3} propertyPath: m_LocalRotation.w - value: -0.58837265 + value: -0.5883726 objectReference: {fileID: 0} - target: {fileID: 6416475349266329267, guid: 65cb60c253ed6c74884e8c05d75f2513, type: 3} propertyPath: m_LocalRotation.x - value: -0.75404453 + value: -0.7540445 objectReference: {fileID: 0} - target: {fileID: 6416475349266329267, guid: 65cb60c253ed6c74884e8c05d75f2513, type: 3} propertyPath: m_LocalRotation.y @@ -1214,7 +1066,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6416475349266329267, guid: 65cb60c253ed6c74884e8c05d75f2513, type: 3} propertyPath: m_LocalRotation.z - value: 0.23017071 + value: 0.23017068 objectReference: {fileID: 0} - target: {fileID: 6416475349266329267, guid: 65cb60c253ed6c74884e8c05d75f2513, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -1228,11 +1080,42 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 180 objectReference: {fileID: 0} + - target: {fileID: 8171089824764247888, guid: 65cb60c253ed6c74884e8c05d75f2513, type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 65cb60c253ed6c74884e8c05d75f2513, type: 3} +--- !u!54 &1915945080101222146 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5926797553305359599} + serializedVersion: 4 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 + m_UseGravity: 0 + m_IsKinematic: 1 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 --- !u!1001 &4810991490977426793 PrefabInstance: m_ObjectHideFlags: 0 @@ -1285,6 +1168,10 @@ PrefabInstance: propertyPath: m_Name value: Mug_With_Tools objectReference: {fileID: 0} + - target: {fileID: 1841405841138988885, guid: 034e45868894ce545ab9c964d1953542, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 1841405841138988885, guid: 034e45868894ce545ab9c964d1953542, type: 3} propertyPath: m_StaticEditorFlags value: 2147483647 @@ -1297,9 +1184,110 @@ PrefabInstance: addedObject: {fileID: 374148869} - targetCorrespondingSourceObject: {fileID: 1352817630416432623, guid: 034e45868894ce545ab9c964d1953542, type: 3} insertIndex: -1 - addedObject: {fileID: 1641917772} + addedObject: {fileID: 6416475350068088405} m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 034e45868894ce545ab9c964d1953542, type: 3} +--- !u!1 &5926797553305359599 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6416475350068088405} + - component: {fileID: 1915945080101222146} + - component: {fileID: 6416475350068088406} + - component: {fileID: 6416475350068088407} + m_Layer: 0 + m_Name: Pen Socket + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6416475350068088405 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5926797553305359599} + serializedVersion: 2 + m_LocalRotation: {x: -0.75228006, y: -0.18028778, z: 0.22963211, w: -0.59062684} + m_LocalPosition: {x: 0.0108, y: 0.0455, z: 0.0114} + m_LocalScale: {x: 0.01618156, y: 0.016181555, z: 0.016181555} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 848737917} + m_LocalEulerAnglesHint: {x: 76.272, y: 0, z: 180} +--- !u!65 &6416475350068088406 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5926797553305359599} + 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_Size: {x: 1, y: 1, z: 10.170982} + m_Center: {x: 6.393689e-17, y: -0.000000044203517, z: 0.04537381} +--- !u!114 &6416475350068088407 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5926797553305359599} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 60523e0647cc6ab43acc73cb266a32a7, type: 3} + m_Name: + m_EditorClassIdentifier: + m_InteractionManager: {fileID: 0} + m_InteractionLayers: + m_Bits: 4 + m_Handedness: 0 + m_AttachTransform: {fileID: 0} + m_KeepSelectedTargetValid: 1 + m_DisableVisualsWhenBlockedInGroup: 1 + m_StartingSelectedInteractable: {fileID: 0} + m_StartingTargetFilter: {fileID: 0} + m_HoverEntered: + m_PersistentCalls: + m_Calls: [] + m_HoverExited: + m_PersistentCalls: + m_Calls: [] + m_SelectEntered: + m_PersistentCalls: + m_Calls: [] + m_SelectExited: + m_PersistentCalls: + m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_ShowInteractableHoverMeshes: 1 + m_InteractableHoverMeshMaterial: {fileID: 2100000, guid: 5838023c4bfa28943bd0abd3e3020361, type: 2} + m_InteractableCantHoverMeshMaterial: {fileID: 2100000, guid: 91da77b385f3c274da60c626a8acfa24, type: 2} + m_SocketActive: 1 + m_InteractableHoverScale: 1 + m_RecycleDelayTime: 1 + m_HoverSocketSnapping: 0 + m_SocketSnappingRadius: 0.1 + m_SocketScaleMode: 0 + m_FixedScale: {x: 1, y: 1, z: 1} + m_TargetBoundsSize: {x: 1, y: 1, z: 1} --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 diff --git a/SSLR/Assets/XRI/Settings/Resources/InteractionLayerSettings.asset b/SSLR/Assets/XRI/Settings/Resources/InteractionLayerSettings.asset index 6d1971b..34be4ad 100644 --- a/SSLR/Assets/XRI/Settings/Resources/InteractionLayerSettings.asset +++ b/SSLR/Assets/XRI/Settings/Resources/InteractionLayerSettings.asset @@ -15,7 +15,7 @@ MonoBehaviour: m_LayerNames: - Default - Paper - - + - Pen - - -