From 66bce4014e1f8a4671a1f18d4cf91523f5111123 Mon Sep 17 00:00:00 2001 From: kookiekenobi Date: Fri, 31 Jan 2025 18:53:44 +0800 Subject: [PATCH] game: paper interaction pt2 trying to fix grab interaction - removed rigibody --- SSLR/Assets/Scenes/LiviPlayground.unity | 183 +----------------------- SSLR/Assets/Scripts/NPCBehaviour.cs | 2 +- 2 files changed, 5 insertions(+), 180 deletions(-) diff --git a/SSLR/Assets/Scenes/LiviPlayground.unity b/SSLR/Assets/Scenes/LiviPlayground.unity index 0d26ea1..a23f67e 100644 --- a/SSLR/Assets/Scenes/LiviPlayground.unity +++ b/SSLR/Assets/Scenes/LiviPlayground.unity @@ -511,7 +511,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!65 &418120323 BoxCollider: m_ObjectHideFlags: 0 @@ -1270,9 +1270,6 @@ GameObject: - component: {fileID: 1179830392} - component: {fileID: 1179830391} - component: {fileID: 1179830390} - - component: {fileID: 1179830395} - - component: {fileID: 1179830394} - - component: {fileID: 1179830393} m_Layer: 0 m_Name: Paper m_TagString: Untagged @@ -1366,178 +1363,6 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1179830388} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!114 &1179830393 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1179830388} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d0a1302d0d134fa8a2a5b3bf4aec3c20, type: 3} - m_Name: - m_EditorClassIdentifier: - m_PermittedDisplacementAxes: -1 - 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 &1179830394 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1179830388} - 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_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_AttachTransform: {fileID: 0} - m_SecondaryAttachTransform: {fileID: 0} - m_UseDynamicAttach: 0 - 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: 0 - m_SmoothPositionAmount: 8 - m_TightenPosition: 0.1 - m_TrackRotation: 1 - m_SmoothRotation: 0 - m_SmoothRotationAmount: 8 - m_TightenRotation: 0.1 - m_TrackScale: 1 - m_SmoothScale: 0 - m_SmoothScaleAmount: 8 - 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_StartingSingleGrabTransformers: [] - m_StartingMultipleGrabTransformers: [] - m_AddDefaultGrabTransformers: 1 - m_FarAttachMode: 0 ---- !u!54 &1179830395 -Rigidbody: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1179830388} - 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!1 &1227598780 GameObject: m_ObjectHideFlags: 0 @@ -2270,7 +2095,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!114 &1627151198 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2647,7 +2472,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!114 &2043314902 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2938,7 +2763,6 @@ SceneRoots: - {fileID: 756192408} - {fileID: 2092139010} - {fileID: 1249617921} - - {fileID: 418120326} - {fileID: 624452552} - {fileID: 1230849065} - {fileID: 2107051480} @@ -2946,5 +2770,6 @@ SceneRoots: - {fileID: 711059150} - {fileID: 1400559515} - {fileID: 1298003772} + - {fileID: 418120326} - {fileID: 2043314906} - {fileID: 1627151202} diff --git a/SSLR/Assets/Scripts/NPCBehaviour.cs b/SSLR/Assets/Scripts/NPCBehaviour.cs index 03a2059..489b2f9 100644 --- a/SSLR/Assets/Scripts/NPCBehaviour.cs +++ b/SSLR/Assets/Scripts/NPCBehaviour.cs @@ -41,7 +41,7 @@ public class NPCBehaviour : MonoBehaviour { if (npcMoveScript.inFrontOfPlayer == true) { - //paperObject.SetActive(true); + paperObject.SetActive(true); navigationTxtBubble.SetActive(true); } }