diff --git a/Assets/XRI_Examples/Physics/Prefabs/Door_Locked.prefab b/Assets/XRI_Examples/Physics/Prefabs/Door_Locked.prefab index c96870b1aa..672fe54e23 100644 --- a/Assets/XRI_Examples/Physics/Prefabs/Door_Locked.prefab +++ b/Assets/XRI_Examples/Physics/Prefabs/Door_Locked.prefab @@ -23,14 +23,15 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2288154136080491452} + 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: 8529621359413494977} - {fileID: 7128215835568584494} m_Father: {fileID: 1796825035687215763} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2408536400181763333 GameObject: @@ -58,13 +59,14 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2408536400181763333} + serializedVersion: 2 m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1.0723841, y: 1.0723841, z: 0.89632857} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1852475965401993393} m_Father: {fileID: 188490433769314898} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} --- !u!33 &8469026427829435307 MeshFilter: @@ -85,6 +87,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -123,9 +126,17 @@ SphereCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2408536400181763333} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 1 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Radius: 0.05 m_Center: {x: 0, y: 0, z: 0} --- !u!1 &2622468464475284830 @@ -155,12 +166,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2622468464475284830} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0.8046115, y: -0.12842178, z: 0.045024384} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7128215835568584494} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!135 &2773685490717348230 SphereCollider: @@ -170,9 +182,17 @@ SphereCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2622468464475284830} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Radius: 0.125 m_Center: {x: 0, y: 0, z: 0} --- !u!54 &7093011556962616050 @@ -182,10 +202,21 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2622468464475284830} - serializedVersion: 2 + serializedVersion: 4 m_Mass: 1 m_Drag: 0 m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 m_UseGravity: 0 m_IsKinematic: 0 m_Interpolate: 0 @@ -255,14 +286,15 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3011703022337180090} + serializedVersion: 2 m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} m_LocalPosition: {x: -0.8046115, y: -0.12842178, z: 0.045024384} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 4817053430441133614} - {fileID: 2629589184955760735} m_Father: {fileID: 7128215835568584494} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} --- !u!114 &3299885152402928898 MonoBehaviour: @@ -278,13 +310,11 @@ MonoBehaviour: 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 @@ -330,8 +360,8 @@ MonoBehaviour: m_PersistentCalls: m_Calls: - m_Target: {fileID: 3299885152402928898} - m_TargetAssemblyTypeName: - m_MethodName: set_Value + m_TargetAssemblyTypeName: UnityEngine.XR.Content.Interaction.XRKnob, Unity.XR.Content.Interaction + m_MethodName: set_value m_Mode: 4 m_Arguments: m_ObjectArgument: {fileID: 0} @@ -353,42 +383,27 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_OnLastHoverExited: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_OnHoverEntered: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnHoverExited: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectEntered: - m_PersistentCalls: - m_Calls: [] - m_OnSelectExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectCanceled: - m_PersistentCalls: - m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] m_Handle: {fileID: 4817053430441133614} m_Value: 1 m_ClampedMotion: 1 @@ -435,13 +450,14 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3081021950665055244} + 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: 4514011908836934630} m_Father: {fileID: 5301896374067530598} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &3449286181070959477 GameObject: @@ -468,13 +484,14 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3449286181070959477} + serializedVersion: 2 m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.8046829, y: 0.101663776, z: 0.07564333} m_LocalScale: {x: 1.0723841, y: 1.0723841, z: 0.89632857} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 622122095747888433} m_Father: {fileID: 7128215835568584494} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &7379060450533812592 MeshFilter: @@ -495,6 +512,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -548,13 +566,14 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3758504546335403502} + 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: 6923536531993460658} m_Father: {fileID: 8509782302514732279} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &4414846825475710180 GameObject: @@ -579,12 +598,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4414846825475710180} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -1, z: -0, w: 0.0000029504295} m_LocalPosition: {x: 0, y: 0, z: 0.08629999} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 622122095747888433} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &5319416733037820165 GameObject: @@ -610,13 +630,14 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5319416733037820165} + 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: 1480268917419768070} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1992393634709716444 MonoBehaviour: @@ -639,6 +660,7 @@ MonoBehaviour: m_KeyLockValue: 0.9 m_KeyUnlockValue: 0.1 m_KeyPullDistance: 0.3 + m_startLocked: 1 m_OnLock: m_PersistentCalls: m_Calls: [] @@ -670,12 +692,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5522806321038702288} + 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: 8082708554007086909} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!82 &434023527950134719 AudioSource: @@ -837,12 +860,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6446723328625168114} + 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: 8082708554007086909} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &8577135497434317191 MonoBehaviour: @@ -1038,14 +1062,15 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6824770567609431110} + 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: 7034586119669135149} - {fileID: 5031349253646615088} m_Father: {fileID: 8509782302514732279} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1693714824111561370 MonoBehaviour: @@ -1063,6 +1088,7 @@ MonoBehaviour: m_InteractableSource: {fileID: 3299885152402928898} m_IgnoreHoverEvents: 0 m_IgnoreHoverPriorityEvents: 0 + m_IgnoreFocusEvents: 1 m_IgnoreSelectEvents: 1 m_IgnoreActivateEvents: 0 m_SelectClickAnimationMode: 1 @@ -1120,13 +1146,14 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7025650377286697919} + 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: 280364757277687654} m_Father: {fileID: 33419902033746666} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1938328786324727194 MonoBehaviour: @@ -1141,11 +1168,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_InteractionManager: {fileID: 0} - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 4294967295 m_InteractionLayers: m_Bits: 4294967295 + m_Handedness: 0 m_AttachTransform: {fileID: 280364757277687654} m_KeepSelectedTargetValid: 1 m_DisableVisualsWhenBlockedInGroup: 1 @@ -1177,24 +1202,17 @@ MonoBehaviour: m_Calls: [] m_StartingHoverFilters: [] m_StartingSelectFilters: [] - m_OnHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnSelectEntered: - m_PersistentCalls: - m_Calls: [] - m_OnSelectExited: - m_PersistentCalls: - m_Calls: [] m_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} m_Lock: m_RequiredKeys: - {fileID: 11400000, guid: 3e433f91841e5d14ba4db9710832675a, type: 2} @@ -1206,9 +1224,17 @@ SphereCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7025650377286697919} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 1 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Radius: 0.05 m_Center: {x: 0, y: 0, z: 0} --- !u!1 &7307938702395324619 @@ -1239,16 +1265,17 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7307938702395324619} + serializedVersion: 2 m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0.45987198, y: 1.1354514, z: -0.045049734} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 8509782302514732279} - {fileID: 5301896374067530598} - {fileID: 33419902033746666} - {fileID: 8291455771666871373} m_Father: {fileID: 1480268917419768070} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &3918514349596566204 MeshFilter: @@ -1269,6 +1296,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1307,10 +1335,21 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7307938702395324619} - serializedVersion: 2 + serializedVersion: 4 m_Mass: 22 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: 0 m_Interpolate: 0 @@ -1324,11 +1363,19 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7307938702395324619} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 - m_Size: {x: 0.95252883, y: 2.1083562, z: 0.11805646} - m_Center: {x: -0.38185894, y: 0.016093016, z: 0.00021080486} + serializedVersion: 3 + m_Size: {x: 1, y: 2.05, z: 0.1} + m_Center: {x: -0.5, y: -0.05, z: 0.05} --- !u!59 &6506544725693368079 HingeJoint: m_ObjectHideFlags: 0 @@ -1341,7 +1388,8 @@ HingeJoint: m_Anchor: {x: 0, y: 1.0702711, z: 0} m_Axis: {x: 0, y: 1, z: 0} m_AutoConfigureConnectedAnchor: 1 - m_ConnectedAnchor: {x: 0.45987198, y: 2.2057226, z: -0.045049734} + m_ConnectedAnchor: {x: -2.1450486, y: 2.4535427, z: -1.459872} + serializedVersion: 2 m_UseSpring: 1 m_Spring: spring: 10 @@ -1353,6 +1401,8 @@ HingeJoint: force: 0 freeSpin: 0 m_UseLimits: 1 + m_ExtendedLimits: 0 + m_UseAcceleration: 0 m_Limits: min: -90 max: 90 @@ -1390,12 +1440,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7803757493882187037} + 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: 2629589184955760735} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &2660694981089486200 MonoBehaviour: @@ -1507,12 +1558,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7863861215541608227} + 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: 1480268917419768070} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &8076169190775739982 MeshFilter: @@ -1533,6 +1585,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1591,12 +1644,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7974651063430930546} + serializedVersion: 2 m_LocalRotation: {x: -0.7071068, y: -0, z: -0, w: 0.7071068} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4817053430441133614} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &647154205478192358 MeshFilter: @@ -1617,6 +1671,7 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1655,8 +1710,17 @@ CapsuleCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7974651063430930546} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 + serializedVersion: 2 m_Radius: 0.025 m_Height: 0.2 m_Direction: 0 @@ -1686,14 +1750,15 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8084261320235020126} + serializedVersion: 2 m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} m_LocalPosition: {x: -0.8046829, y: 0.10166383, z: 0.07564333} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 188490433769314898} - {fileID: 8082708554007086909} m_Father: {fileID: 7128215835568584494} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} --- !u!114 &2663060695244963656 MonoBehaviour: @@ -1708,14 +1773,13 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_InteractionManager: {fileID: 0} - m_Colliders: [] - m_InteractionLayerMask: - serializedVersion: 2 - m_Bits: 1 + m_Colliders: + - {fileID: 7511428691069467265} m_InteractionLayers: m_Bits: 1 m_DistanceCalculationMode: 1 m_SelectMode: 0 + m_FocusMode: 1 m_CustomReticle: {fileID: 0} m_AllowGazeInteraction: 0 m_AllowGazeSelect: 0 @@ -1772,54 +1836,27 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - - m_Target: {fileID: 2663060695244963656} - m_TargetAssemblyTypeName: - m_MethodName: set_Value - m_Mode: 4 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0.5 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 - m_Activated: - m_PersistentCalls: - m_Calls: [] - m_Deactivated: - m_PersistentCalls: - m_Calls: [] - m_StartingHoverFilters: [] - m_StartingSelectFilters: [] - m_StartingInteractionStrengthFilters: [] - m_OnFirstHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnLastHoverExited: - m_PersistentCalls: - m_Calls: [] - m_OnHoverEntered: - m_PersistentCalls: - m_Calls: [] - m_OnHoverExited: + m_FirstFocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectEntered: + m_LastFocusExited: m_PersistentCalls: m_Calls: [] - m_OnSelectExited: + m_FocusEntered: m_PersistentCalls: m_Calls: [] - m_OnSelectCanceled: + m_FocusExited: m_PersistentCalls: m_Calls: [] - m_OnActivate: + m_Activated: m_PersistentCalls: m_Calls: [] - m_OnDeactivate: + m_Deactivated: m_PersistentCalls: m_Calls: [] + m_StartingHoverFilters: [] + m_StartingSelectFilters: [] + m_StartingInteractionStrengthFilters: [] m_Handle: {fileID: 188490433769314898} m_Value: 0.5 m_ClampedMotion: 1 @@ -1851,9 +1888,17 @@ SphereCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8084261320235020126} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 1 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Radius: 0.05 m_Center: {x: 0, y: 0, z: 0} --- !u!1 &8658425348784354978 @@ -1880,14 +1925,15 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8658425348784354978} + 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: 3669465674789590246} - {fileID: 4247033485635184543} m_Father: {fileID: 5301896374067530598} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &2824501212802966721 MonoBehaviour: @@ -1905,6 +1951,7 @@ MonoBehaviour: m_InteractableSource: {fileID: 2663060695244963656} m_IgnoreHoverEvents: 0 m_IgnoreHoverPriorityEvents: 0 + m_IgnoreFocusEvents: 1 m_IgnoreSelectEvents: 1 m_IgnoreActivateEvents: 0 m_SelectClickAnimationMode: 1 @@ -1962,12 +2009,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8951968135628852726} + 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: 2629589184955760735} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!82 &3918348642427455443 AudioSource: @@ -2107,6 +2155,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4514011908836934630} m_Modifications: - target: {fileID: -8679921383154817045, guid: e966bff0ad273cd4393f6f88b68e3ea1, type: 3} @@ -2158,14 +2207,46 @@ PrefabInstance: value: DoorKey objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: e966bff0ad273cd4393f6f88b68e3ea1, type: 3} + insertIndex: -1 + addedObject: {fileID: 7511428691069467265} m_SourcePrefab: {fileID: 100100000, guid: e966bff0ad273cd4393f6f88b68e3ea1, type: 3} ---- !u!4 &1852475965401993393 stripped -Transform: - m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: e966bff0ad273cd4393f6f88b68e3ea1, type: 3} - m_PrefabInstance: {fileID: 2179716304318068570} - m_PrefabAsset: {fileID: 0} --- !u!23 &720151321870855134 stripped MeshRenderer: m_CorrespondingSourceObject: {fileID: -7511558181221131132, guid: e966bff0ad273cd4393f6f88b68e3ea1, type: 3} m_PrefabInstance: {fileID: 2179716304318068570} m_PrefabAsset: {fileID: 0} +--- !u!1 &1368673998301055499 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: e966bff0ad273cd4393f6f88b68e3ea1, type: 3} + m_PrefabInstance: {fileID: 2179716304318068570} + m_PrefabAsset: {fileID: 0} +--- !u!135 &7511428691069467265 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1368673998301055499} + 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: 3 + m_Radius: 0.06535783 + m_Center: {x: 0.0000001268927, y: 0.00000011920929, z: -0.037853353} +--- !u!4 &1852475965401993393 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: e966bff0ad273cd4393f6f88b68e3ea1, type: 3} + m_PrefabInstance: {fileID: 2179716304318068570} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/XRI_Examples/Physics/Scripts/Door.cs b/Assets/XRI_Examples/Physics/Scripts/Door.cs index 4f821bd896..17cacbff3b 100644 --- a/Assets/XRI_Examples/Physics/Scripts/Door.cs +++ b/Assets/XRI_Examples/Physics/Scripts/Door.cs @@ -35,6 +35,9 @@ public class Door : MonoBehaviour [SerializeField] float m_KeyPullDistance = 0.1f; + [SerializeField] + bool m_startLocked = true; + [SerializeField] [Tooltip("Events to fire when the door is locked.")] UnityEvent m_OnLock = new UnityEvent(); @@ -48,6 +51,7 @@ public class Door : MonoBehaviour bool m_Closed = false; float m_LastHandleValue = 1.0f; + bool m_Locked = false; GameObject m_KeySocket; @@ -75,6 +79,7 @@ void Start() m_DoorJoint.limits = m_ClosedDoorLimits; m_KeyKnob.SetActive(false); m_Closed = true; + m_Locked = m_startLocked; } void Update() @@ -145,6 +150,9 @@ public void KeyDropUpdate(SelectEnterEventArgs args) public void KeyUpdate(float keyValue) { + + Vector3 keyKnobChildEulerAngles = m_KeyKnob.transform.GetChild(0).localEulerAngles; + m_KeySocket.transform.parent.localRotation = Quaternion.Euler(keyKnobChildEulerAngles.x, keyKnobChildEulerAngles.z, keyKnobChildEulerAngles.y); if (!m_Locked && keyValue > m_KeyLockValue) { m_Locked = true; diff --git a/Assets/XRI_Examples/Scenes/Station_09_Physics_Isolated.unity b/Assets/XRI_Examples/Scenes/Station_09_Physics_Isolated.unity index 648c4ae5c1..bcf6e2183f 100644 --- a/Assets/XRI_Examples/Scenes/Station_09_Physics_Isolated.unity +++ b/Assets/XRI_Examples/Scenes/Station_09_Physics_Isolated.unity @@ -104,7 +104,7 @@ NavMeshSettings: serializedVersion: 2 m_ObjectHideFlags: 0 m_BuildSettings: - serializedVersion: 2 + serializedVersion: 3 agentTypeID: 0 agentRadius: 0.5 agentHeight: 2 @@ -117,7 +117,7 @@ NavMeshSettings: cellSize: 0.16666667 manualTileSize: 0 tileSize: 256 - accuratePlacement: 0 + buildHeightMesh: 0 maxJobWorkers: 0 preserveTilesOutsideBounds: 0 debug: @@ -146,21 +146,23 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 28924830} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 382772282} - {fileID: 763276400} - {fileID: 1469814822} m_Father: {fileID: 0} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} --- !u!1001 &247697866 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 763276400} m_Modifications: - target: {fileID: 3622177212092079325, guid: 2967c4c1619c42c45abe25baea2b56d5, type: 3} @@ -212,6 +214,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 2967c4c1619c42c45abe25baea2b56d5, type: 3} --- !u!4 &247697867 stripped Transform: @@ -228,6 +233,7 @@ GameObject: m_Component: - component: {fileID: 257810523} - component: {fileID: 257810522} + - component: {fileID: 257810524} m_Layer: 0 m_Name: Directional Light m_TagString: Untagged @@ -304,13 +310,37 @@ 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 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 257810521} + 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!1 &382772281 GameObject: m_ObjectHideFlags: 0 @@ -334,22 +364,24 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 382772281} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 1.9110005, y: 0.25, z: 1.3060002} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 945407682} - {fileID: 1174740028} - {fileID: 1357846674} - {fileID: 582619577} m_Father: {fileID: 28924831} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &428832078 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 1961357302541379663, guid: ad7927123279f3049b38329cd8836f7c, type: 3} @@ -401,18 +433,26 @@ PrefabInstance: value: Post-process Volume objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: ad7927123279f3049b38329cd8836f7c, type: 3} --- !u!1001 &456301157 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1469814822} m_Modifications: - target: {fileID: 784072565763923235, guid: 52b0efbba0ab54548af1006d60566fe1, type: 3} propertyPath: m_Name value: DoorKey objectReference: {fileID: 0} + - target: {fileID: 2567042671315214137, guid: 52b0efbba0ab54548af1006d60566fe1, type: 3} + propertyPath: m_ExcludeLayers.m_Bits + value: 268435456 + objectReference: {fileID: 0} - target: {fileID: 3241471165601854204, guid: 52b0efbba0ab54548af1006d60566fe1, type: 3} propertyPath: m_RootOrder value: 1 @@ -458,6 +498,9 @@ PrefabInstance: value: 90.00001 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 52b0efbba0ab54548af1006d60566fe1, type: 3} --- !u!4 &456301158 stripped Transform: @@ -469,6 +512,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 382772282} m_Modifications: - target: {fileID: 4257412417454173056, guid: ed79eaa9dbed71a46b42588537c577a7, type: 3} @@ -540,6 +584,12 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 4257412417454173071, guid: ed79eaa9dbed71a46b42588537c577a7, type: 3} + insertIndex: -1 + addedObject: {fileID: 582619579} m_SourcePrefab: {fileID: 100100000, guid: ed79eaa9dbed71a46b42588537c577a7, type: 3} --- !u!4 &582619577 stripped Transform: @@ -564,6 +614,7 @@ HingeJoint: m_Axis: {x: 1, y: 0, z: 0} m_AutoConfigureConnectedAnchor: 1 m_ConnectedAnchor: {x: 0.011139741, y: 0.4999999, z: 1.06636} + serializedVersion: 2 m_UseSpring: 0 m_Spring: spring: 0 @@ -575,6 +626,8 @@ HingeJoint: force: 0 freeSpin: 0 m_UseLimits: 0 + m_ExtendedLimits: 0 + m_UseAcceleration: 0 m_Limits: min: 0 max: 0 @@ -610,20 +663,22 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 763276399} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 2.5650003, y: 0.5, z: -0.32700014} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1231285138} - {fileID: 247697867} m_Father: {fileID: 28924831} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &945407679 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 382772282} m_Modifications: - target: {fileID: 4257412417454173056, guid: ed79eaa9dbed71a46b42588537c577a7, type: 3} @@ -695,6 +750,12 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 4257412417454173071, guid: ed79eaa9dbed71a46b42588537c577a7, type: 3} + insertIndex: -1 + addedObject: {fileID: 945407683} m_SourcePrefab: {fileID: 100100000, guid: ed79eaa9dbed71a46b42588537c577a7, type: 3} --- !u!54 &945407680 stripped Rigidbody: @@ -740,6 +801,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 382772282} m_Modifications: - target: {fileID: 4257412417454173056, guid: ed79eaa9dbed71a46b42588537c577a7, type: 3} @@ -811,6 +873,12 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 4257412417454173071, guid: ed79eaa9dbed71a46b42588537c577a7, type: 3} + insertIndex: -1 + addedObject: {fileID: 1174740030} m_SourcePrefab: {fileID: 100100000, guid: ed79eaa9dbed71a46b42588537c577a7, type: 3} --- !u!4 &1174740028 stripped Transform: @@ -851,6 +919,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 763276400} m_Modifications: - target: {fileID: 1458097890417193949, guid: 224ab99c12567b94a8a7fad519daf55b, type: 3} @@ -918,6 +987,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 224ab99c12567b94a8a7fad519daf55b, type: 3} --- !u!4 &1231285138 stripped Transform: @@ -929,6 +1001,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 382772282} m_Modifications: - target: {fileID: 4257412417454173056, guid: ed79eaa9dbed71a46b42588537c577a7, type: 3} @@ -1000,6 +1073,12 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 4257412417454173071, guid: ed79eaa9dbed71a46b42588537c577a7, type: 3} + insertIndex: -1 + addedObject: {fileID: 1357846675} m_SourcePrefab: {fileID: 100100000, guid: ed79eaa9dbed71a46b42588537c577a7, type: 3} --- !u!54 &1357846672 stripped Rigidbody: @@ -1045,6 +1124,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1469814822} m_Modifications: - target: {fileID: 1458097890417193949, guid: 224ab99c12567b94a8a7fad519daf55b, type: 3} @@ -1112,6 +1192,9 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 224ab99c12567b94a8a7fad519daf55b, type: 3} --- !u!4 &1366493153 stripped Transform: @@ -1141,24 +1224,42 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1469814821} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0.25, z: -2.1} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1366493153} - {fileID: 456301158} - {fileID: 4242004909418449712} - {fileID: 1369166587909091451} m_Father: {fileID: 28924831} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1757989774 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 366349417295850675, guid: 4e660da2419d1614198b2c073ddf863d, type: 3} + propertyPath: m_BackGroundColor.a + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 366349417295850675, guid: 4e660da2419d1614198b2c073ddf863d, type: 3} + propertyPath: m_BackGroundColor.b + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 366349417295850675, guid: 4e660da2419d1614198b2c073ddf863d, type: 3} + propertyPath: m_BackGroundColor.g + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 366349417295850675, guid: 4e660da2419d1614198b2c073ddf863d, type: 3} + propertyPath: m_BackGroundColor.r + value: 0 + objectReference: {fileID: 0} - target: {fileID: 963534865920503432, guid: 4e660da2419d1614198b2c073ddf863d, type: 3} propertyPath: m_RenderPostProcessing value: 1 @@ -1244,12 +1345,16 @@ PrefabInstance: value: -90 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4e660da2419d1614198b2c073ddf863d, type: 3} --- !u!1001 &2095142570 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 4397421237340684924, guid: 622cb0379a16df4429156f67d79662e4, type: 3} @@ -1309,18 +1414,18 @@ PrefabInstance: value: objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 622cb0379a16df4429156f67d79662e4, type: 3} --- !u!1001 &1369166587909091450 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1469814822} m_Modifications: - - target: {fileID: 1796825035687215763, guid: 8b799fb37a52aaa49a29e4cd5358345e, type: 3} - propertyPath: m_RootOrder - value: 3 - objectReference: {fileID: 0} - target: {fileID: 1796825035687215763, guid: 8b799fb37a52aaa49a29e4cd5358345e, type: 3} propertyPath: m_LocalPosition.x value: 1 @@ -1365,19 +1470,10 @@ PrefabInstance: propertyPath: m_Name value: DoorLocked objectReference: {fileID: 0} - - target: {fileID: 6506544725693368079, guid: 8b799fb37a52aaa49a29e4cd5358345e, type: 3} - propertyPath: m_ConnectedAnchor.x - value: -2.1450486 - objectReference: {fileID: 0} - - target: {fileID: 6506544725693368079, guid: 8b799fb37a52aaa49a29e4cd5358345e, type: 3} - propertyPath: m_ConnectedAnchor.y - value: 2.4535427 - objectReference: {fileID: 0} - - target: {fileID: 6506544725693368079, guid: 8b799fb37a52aaa49a29e4cd5358345e, type: 3} - propertyPath: m_ConnectedAnchor.z - value: -1.459872 - objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 8b799fb37a52aaa49a29e4cd5358345e, type: 3} --- !u!4 &1369166587909091451 stripped Transform: @@ -1389,6 +1485,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1469814822} m_Modifications: - target: {fileID: 1308265130741877079, guid: ef8968d3811b4f9448c64ac756317715, type: 3} @@ -1452,9 +1549,21 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: ef8968d3811b4f9448c64ac756317715, type: 3} --- !u!4 &4242004909418449712 stripped Transform: m_CorrespondingSourceObject: {fileID: 6950633952934208882, guid: ef8968d3811b4f9448c64ac756317715, type: 3} m_PrefabInstance: {fileID: 4242004909418449711} m_PrefabAsset: {fileID: 0} +--- !u!1660057539 &9223372036854775807 +SceneRoots: + m_ObjectHideFlags: 0 + m_Roots: + - {fileID: 1757989774} + - {fileID: 257810523} + - {fileID: 2095142570} + - {fileID: 28924831} + - {fileID: 428832078}