diff --git a/Game/Assets/Scenes/isaac interaction.unity b/Game/Assets/Scenes/isaac interaction.unity index bbf3b04..beb0f45 100644 --- a/Game/Assets/Scenes/isaac interaction.unity +++ b/Game/Assets/Scenes/isaac interaction.unity @@ -249,26 +249,14 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 404463057} - - component: {fileID: 404463056} + - component: {fileID: 404463058} m_Layer: 0 - m_Name: GameObject + m_Name: socketinteractor m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!114 &404463056 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 404463055} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: b3d5a817584b84da0a08814feb482587, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!4 &404463057 Transform: m_ObjectHideFlags: 0 @@ -281,11 +269,55 @@ Transform: m_LocalPosition: {x: 1.0842775, y: 2.2751348, z: 15.25} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1733613457} - - {fileID: 767160750} + m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &404463058 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 404463055} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 60523e0647cc6ab43acc73cb266a32a7, type: 3} + m_Name: + m_EditorClassIdentifier: + m_InteractionManager: {fileID: 756192407} + 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: 0} + m_InteractableCantHoverMeshMaterial: {fileID: 0} + 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!1001 &441087506 PrefabInstance: m_ObjectHideFlags: 0 @@ -421,9 +453,10 @@ GameObject: - component: {fileID: 767160754} - component: {fileID: 767160753} - component: {fileID: 767160752} - - component: {fileID: 767160751} + - component: {fileID: 767160756} + - component: {fileID: 767160755} m_Layer: 0 - m_Name: Cube + m_Name: rubbish m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -438,35 +471,12 @@ Transform: m_GameObject: {fileID: 767160749} 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_LocalPosition: {x: 0.481, y: 0.283, z: 15.25} + m_LocalScale: {x: 0.11612, y: 0.11612, z: 0.11612} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 404463057} + m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &767160751 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 767160749} - 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!65 &767160752 BoxCollider: m_ObjectHideFlags: 0 @@ -538,6 +548,320 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 767160749} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!114 &767160755 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 767160749} + 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: 0 + 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 &767160756 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 767160749} + serializedVersion: 4 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 + m_UseGravity: 1 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!1 &1109685135 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1109685140} + - component: {fileID: 1109685139} + - component: {fileID: 1109685138} + - component: {fileID: 1109685137} + - component: {fileID: 1109685141} + - component: {fileID: 1109685142} + m_Layer: 0 + m_Name: bin + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!65 &1109685137 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1109685135} + 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.0306611, z: 1} + m_Center: {x: 0, y: 0.015330523, z: 0} +--- !u!23 &1109685138 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1109685135} + 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: 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 &1109685139 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1109685135} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!4 &1109685140 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1109685135} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 1.0842775, y: 0.127, z: 15.25} + m_LocalScale: {x: 0.31941, y: 0.31941, z: 0.31941} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1109685141 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1109685135} + 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: 0} + m_InteractableCantHoverMeshMaterial: {fileID: 0} + 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!114 &1109685142 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1109685135} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b3d5a817584b84da0a08814feb482587, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1249617917 GameObject: m_ObjectHideFlags: 0 @@ -726,106 +1050,6 @@ MonoBehaviour: m_Teleporting: m_PersistentCalls: m_Calls: [] ---- !u!1 &1733613456 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1733613457} - - component: {fileID: 1733613459} - - component: {fileID: 1733613458} - m_Layer: 0 - m_Name: Socket Interactor - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1733613457 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1733613456} - 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: 404463057} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1733613458 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1733613456} - 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: 0} - m_InteractableCantHoverMeshMaterial: {fileID: 0} - 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!135 &1733613459 -SphereCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1733613456} - 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.1 - m_Center: {x: 0, y: 0, z: 0} --- !u!1 &2092139007 GameObject: m_ObjectHideFlags: 0 @@ -921,4 +1145,6 @@ SceneRoots: - {fileID: 756192408} - {fileID: 2092139010} - {fileID: 1249617921} + - {fileID: 767160750} + - {fileID: 1109685140} - {fileID: 404463057} diff --git a/Game/Assets/Scripts/socket.cs b/Game/Assets/Scripts/socket.cs index 3068cc7..dec2484 100644 --- a/Game/Assets/Scripts/socket.cs +++ b/Game/Assets/Scripts/socket.cs @@ -1,38 +1,46 @@ -using System.Collections; -using System.Collections.Generic; using UnityEngine; using UnityEngine.XR.Interaction.Toolkit; -using UnityEngine.XR.Interaction.Toolkit.Interactables; -using UnityEngine.XR.Interaction.Toolkit.Interactors; -public class Socket : MonoBehaviour +public class RubbishBin : MonoBehaviour { - private XRSocketInteractor socket; + private UnityEngine.XR.Interaction.Toolkit.Interactors.XRSocketInteractor socket; private void Start() { - socket = GetComponent(); - socket.selectEntered.AddListener(OnObjectPlaced); + socket = GetComponent(); + + if (socket == null) + { + Debug.LogError("XRSocketInteractor component is missing from the rubbish bin!"); + return; + } + + socket.selectEntered.AddListener(OnTrashPlaced); } - private void OnObjectPlaced(SelectEnterEventArgs args) + private void OnTrashPlaced(SelectEnterEventArgs args) { - XRBaseInteractable interactable = (XRBaseInteractable)args.interactableObject; - if (interactable != null) - { - Debug.Log($"Object {interactable.gameObject.name} placed in socket!"); + UnityEngine.XR.Interaction.Toolkit.Interactables.XRBaseInteractable trash = (UnityEngine.XR.Interaction.Toolkit.Interactables.XRBaseInteractable)args.interactableObject; - // Example: Add haptic feedback to controllers - if (args.interactorObject is XRBaseInputInteractor controller) + if (trash != null) + { + Debug.Log($"{trash.gameObject.name} was placed in the rubbish bin and destroyed."); + Destroy(trash.gameObject); + + // Add haptic feedback if using a VR controller + if (args.interactorObject is UnityEngine.XR.Interaction.Toolkit.Interactors.XRBaseInputInteractor controller) { - controller.SendHapticImpulse(0.5f, 0.2f); + controller.SendHapticImpulse(0.7f, 0.2f); } } } private void OnDestroy() { - socket.selectEntered.RemoveListener(OnObjectPlaced); + if (socket != null) + { + socket.selectEntered.RemoveListener(OnTrashPlaced); + } } } diff --git a/Game/ProjectSettings/EditorBuildSettings.asset b/Game/ProjectSettings/EditorBuildSettings.asset index 71f0614..8e85f39 100644 --- a/Game/ProjectSettings/EditorBuildSettings.asset +++ b/Game/ProjectSettings/EditorBuildSettings.asset @@ -11,6 +11,12 @@ EditorBuildSettings: - enabled: 1 path: Assets/Scenes/calling scene.unity guid: 48cde6b0ab9794ada98c7371a0e98e40 + - enabled: 1 + path: Assets/Scenes/Wai Lam's interaction.unity + guid: 66fe0e94fa29b1f4fb504e90cf59f1a2 + - enabled: 1 + path: Assets/Scenes/isaac interaction.unity + guid: 0918c8f89e6184c5caed264887eabbb4 m_configObjects: Unity.XR.Oculus.Settings: {fileID: 11400000, guid: bfa1182bd221b4ca89619141f66f1260, type: 2} Unity.XR.WindowsMR.Settings: {fileID: 11400000, guid: dc5a169419fa04987b057f65238cf3ba, type: 2} diff --git a/Game/ProjectSettings/Packages/com.unity.probuilder/Settings.json b/Game/ProjectSettings/Packages/com.unity.probuilder/Settings.json index 8450620..fe711c5 100644 --- a/Game/ProjectSettings/Packages/com.unity.probuilder/Settings.json +++ b/Game/ProjectSettings/Packages/com.unity.probuilder/Settings.json @@ -106,6 +106,11 @@ "key": "UVEditor.showPreviewMaterial", "value": "{\"m_Value\":true}" }, + { + "type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", + "key": "editor.stripProBuilderScriptsOnBuild", + "value": "{\"m_Value\":true}" + }, { "type": "UnityEngine.ProBuilder.SelectionModifierBehavior, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", "key": "editor.rectSelectModifier", @@ -151,11 +156,6 @@ "key": "ShapeBuilder.LastPivotLocation", "value": "{\"m_Value\":1}" }, - { - "type": "System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", - "key": "SubdivideEdges.subdivisions", - "value": "{\"m_Value\":1}" - }, { "type": "UnityEngine.ProBuilder.PivotLocation, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", "key": "mesh.newShapePivotLocation", @@ -169,7 +169,7 @@ { "type": "UnityEngine.Vector3, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", "key": "ShapeBuilder.LastSize", - "value": "{\"m_Value\":{\"x\":-7.964871406555176,\"y\":0.0,\"z\":-1.6318359375}}" + "value": "{\"m_Value\":{\"x\":0.197540283203125,\"y\":0.015741348266601564,\"z\":0.1954345703125}}" }, { "type": "UnityEngine.Quaternion, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", @@ -231,21 +231,6 @@ "key": "ShapeBuilder.Plane", "value": "{}" }, - { - "type": "UnityEngine.ProBuilder.Shapes.Shape, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", - "key": "ShapeBuilder.Cone", - "value": "{}" - }, - { - "type": "UnityEngine.ProBuilder.Shapes.Shape, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", - "key": "ShapeBuilder.Arch", - "value": "{}" - }, - { - "type": "UnityEngine.ProBuilder.Shapes.Shape, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", - "key": "ShapeBuilder.Prism", - "value": "{}" - }, { "type": "UnityEngine.ProBuilder.ExtrudeMethod, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", "key": "editor.extrudeMethod", diff --git a/Game/ProjectSettings/TagManager.asset b/Game/ProjectSettings/TagManager.asset index 277bbe6..f86203b 100644 --- a/Game/ProjectSettings/TagManager.asset +++ b/Game/ProjectSettings/TagManager.asset @@ -6,6 +6,7 @@ TagManager: tags: - Anchor - TrashBin + - Destroyable layers: - Default - TransparentFX