From 2c6c865850c6fc0b7f7d12f8e8fdf3b65ccc3740 Mon Sep 17 00:00:00 2001 From: Toomas Tamm Date: Sun, 28 Mar 2021 20:17:03 +0300 Subject: [PATCH] Fix smaller doors on floor 2, add attach points to breakout paddles, reduce ease time on breakout paddles. --- .../Doors/Static_Indoor_Door Boxes.prefab | 8 +- .../XR/Breakout/Paddle.prefab | 39 ++++- Assets/Scenes/Main_scene.unity | 143 +++++++++++++----- ProjectSettings/ProjectSettings.asset | 6 +- 4 files changed, 147 insertions(+), 49 deletions(-) diff --git a/Assets/Objects (Prefabs)/Doors/Static_Indoor_Door Boxes.prefab b/Assets/Objects (Prefabs)/Doors/Static_Indoor_Door Boxes.prefab index 92fdb382..f9541ae2 100644 --- a/Assets/Objects (Prefabs)/Doors/Static_Indoor_Door Boxes.prefab +++ b/Assets/Objects (Prefabs)/Doors/Static_Indoor_Door Boxes.prefab @@ -240,7 +240,7 @@ GameObject: - component: {fileID: 5387078823007685487} - component: {fileID: 5489778872027128264} - component: {fileID: 6408273259403567560} - m_Layer: 0 + m_Layer: 31 m_Name: Knob m_TagString: Untagged m_Icon: {fileID: 0} @@ -338,7 +338,7 @@ GameObject: - component: {fileID: 7178853457829565571} - component: {fileID: 181338834508885938} - component: {fileID: 8650006953091811217} - m_Layer: 0 + m_Layer: 31 m_Name: Static_Indoor_Door Boxes m_TagString: Untagged m_Icon: {fileID: 0} @@ -515,7 +515,7 @@ HingeJoint: m_Anchor: {x: -0.5, y: 0, z: 0} m_Axis: {x: 0, y: -0.4, z: 0} m_AutoConfigureConnectedAnchor: 1 - m_ConnectedAnchor: {x: 0.44997528, y: -0.0012344348, z: -0.213007} + m_ConnectedAnchor: {x: 0.44998422, y: -0.0012344602, z: -0.21300958} m_UseSpring: 0 m_Spring: spring: 0 @@ -634,7 +634,7 @@ Rigidbody: m_Drag: 0 m_AngularDrag: 0.05 m_UseGravity: 0 - m_IsKinematic: 0 + m_IsKinematic: 1 m_Interpolate: 0 m_Constraints: 0 m_CollisionDetection: 0 diff --git a/Assets/Objects (Prefabs)/XR/Breakout/Paddle.prefab b/Assets/Objects (Prefabs)/XR/Breakout/Paddle.prefab index ac901628..7049eb73 100644 --- a/Assets/Objects (Prefabs)/XR/Breakout/Paddle.prefab +++ b/Assets/Objects (Prefabs)/XR/Breakout/Paddle.prefab @@ -170,14 +170,15 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 683641811316564867} - m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -153.767, y: 19.684, z: -23.389} m_LocalScale: {x: 0.02, y: 0.15, z: 0.02} m_Children: - {fileID: 683641809410680631} + - {fileID: 3156447394226617116} m_Father: {fileID: 683641810726029904} m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &683641811316564879 MeshFilter: m_ObjectHideFlags: 0 @@ -289,8 +290,8 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_CustomReticle: {fileID: 0} - m_AttachTransform: {fileID: 0} - m_AttachEaseInTime: 0.15 + m_AttachTransform: {fileID: 3156447394226617116} + m_AttachEaseInTime: 0 m_MovementType: 1 m_TrackPosition: 1 m_SmoothPosition: 0 @@ -347,3 +348,33 @@ BoxCollider: serializedVersion: 2 m_Size: {x: 1.0000002, y: 1, z: 1.0000002} m_Center: {x: 0, y: -0.0000038146973, z: 0.00012207031} +--- !u!1 &8476444150611154670 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3156447394226617116} + m_Layer: 0 + m_Name: Attach + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3156447394226617116 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8476444150611154670} + m_LocalRotation: {x: -0.5, y: 0.5, z: 0.5, w: 0.5} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 683641811316564866} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: -90, y: 90, z: 0} diff --git a/Assets/Scenes/Main_scene.unity b/Assets/Scenes/Main_scene.unity index e09525f7..cd8ad67b 100644 --- a/Assets/Scenes/Main_scene.unity +++ b/Assets/Scenes/Main_scene.unity @@ -11448,7 +11448,7 @@ PrefabInstance: - target: {fileID: 1425203164796196698, guid: 188c51d053f839b4fb7ca0abdafbae43, type: 3} propertyPath: m_RootOrder - value: 60 + value: 61 objectReference: {fileID: 0} - target: {fileID: 1425203164796196698, guid: 188c51d053f839b4fb7ca0abdafbae43, type: 3} @@ -63482,7 +63482,7 @@ PrefabInstance: - target: {fileID: 2389456291377549788, guid: c7190c7182dc47944b0a50b8b43c2a0a, type: 3} propertyPath: m_RootOrder - value: 57 + value: 58 objectReference: {fileID: 0} - target: {fileID: 2389456291377549788, guid: c7190c7182dc47944b0a50b8b43c2a0a, type: 3} @@ -98328,7 +98328,7 @@ PrefabInstance: - target: {fileID: 2389456291377549788, guid: c7190c7182dc47944b0a50b8b43c2a0a, type: 3} propertyPath: m_RootOrder - value: 51 + value: 52 objectReference: {fileID: 0} - target: {fileID: 2389456291377549788, guid: c7190c7182dc47944b0a50b8b43c2a0a, type: 3} @@ -99411,7 +99411,7 @@ PrefabInstance: - target: {fileID: 3427346275064232622, guid: 834794d00f37ed64fa23f9a468342c2e, type: 3} propertyPath: m_RootOrder - value: 48 + value: 49 objectReference: {fileID: 0} - target: {fileID: 3427346275064232622, guid: 834794d00f37ed64fa23f9a468342c2e, type: 3} @@ -99463,21 +99463,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 270 objectReference: {fileID: 0} - - target: {fileID: 8650006953091811217, guid: 834794d00f37ed64fa23f9a468342c2e, - type: 3} - propertyPath: m_ConnectedAnchor.x - value: 0.44998422 - objectReference: {fileID: 0} - - target: {fileID: 8650006953091811217, guid: 834794d00f37ed64fa23f9a468342c2e, - type: 3} - propertyPath: m_ConnectedAnchor.y - value: -0.0012344602 - objectReference: {fileID: 0} - - target: {fileID: 8650006953091811217, guid: 834794d00f37ed64fa23f9a468342c2e, - type: 3} - propertyPath: m_ConnectedAnchor.z - value: -0.21300958 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 834794d00f37ed64fa23f9a468342c2e, type: 3} --- !u!4 &377209723 stripped @@ -236581,7 +236566,7 @@ PrefabInstance: - target: {fileID: 2389456291377549788, guid: c7190c7182dc47944b0a50b8b43c2a0a, type: 3} propertyPath: m_RootOrder - value: 52 + value: 53 objectReference: {fileID: 0} - target: {fileID: 2389456291377549788, guid: c7190c7182dc47944b0a50b8b43c2a0a, type: 3} @@ -238767,12 +238752,12 @@ PrefabInstance: - target: {fileID: 683641810726029904, guid: b3aa1fd769428e5478861349062a763b, type: 3} propertyPath: m_LocalPosition.x - value: 176.99866 + value: 176.913 objectReference: {fileID: 0} - target: {fileID: 683641810726029904, guid: b3aa1fd769428e5478861349062a763b, type: 3} propertyPath: m_LocalPosition.y - value: -15.076772 + value: -15.23 objectReference: {fileID: 0} - target: {fileID: 683641810726029904, guid: b3aa1fd769428e5478861349062a763b, type: 3} @@ -238819,6 +238804,31 @@ PrefabInstance: propertyPath: m_Name value: Paddle (1) objectReference: {fileID: 0} + - target: {fileID: 683641811316564866, guid: b3aa1fd769428e5478861349062a763b, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 683641811316564866, guid: b3aa1fd769428e5478861349062a763b, + type: 3} + propertyPath: m_LocalRotation.x + value: -0.5 + objectReference: {fileID: 0} + - target: {fileID: 683641811316564866, guid: b3aa1fd769428e5478861349062a763b, + type: 3} + propertyPath: m_LocalRotation.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 683641811316564866, guid: b3aa1fd769428e5478861349062a763b, + type: 3} + propertyPath: m_LocalRotation.z + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 683641811316564866, guid: b3aa1fd769428e5478861349062a763b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -90 + objectReference: {fileID: 0} - target: {fileID: 683641811316564878, guid: b3aa1fd769428e5478861349062a763b, type: 3} propertyPath: m_InteractionManager @@ -250598,7 +250608,7 @@ PrefabInstance: - target: {fileID: 2389456291377549788, guid: c7190c7182dc47944b0a50b8b43c2a0a, type: 3} propertyPath: m_RootOrder - value: 58 + value: 59 objectReference: {fileID: 0} - target: {fileID: 2389456291377549788, guid: c7190c7182dc47944b0a50b8b43c2a0a, type: 3} @@ -322236,7 +322246,7 @@ PrefabInstance: - target: {fileID: 2389456291377549788, guid: c7190c7182dc47944b0a50b8b43c2a0a, type: 3} propertyPath: m_RootOrder - value: 54 + value: 55 objectReference: {fileID: 0} - target: {fileID: 2389456291377549788, guid: c7190c7182dc47944b0a50b8b43c2a0a, type: 3} @@ -362672,7 +362682,7 @@ PrefabInstance: - target: {fileID: 3427346275064232622, guid: 834794d00f37ed64fa23f9a468342c2e, type: 3} propertyPath: m_RootOrder - value: 49 + value: 50 objectReference: {fileID: 0} - target: {fileID: 3427346275064232622, guid: 834794d00f37ed64fa23f9a468342c2e, type: 3} @@ -432755,7 +432765,7 @@ PrefabInstance: - target: {fileID: 2389456291377549788, guid: c7190c7182dc47944b0a50b8b43c2a0a, type: 3} propertyPath: m_RootOrder - value: 56 + value: 57 objectReference: {fileID: 0} - target: {fileID: 2389456291377549788, guid: c7190c7182dc47944b0a50b8b43c2a0a, type: 3} @@ -434147,6 +434157,21 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 270 objectReference: {fileID: 0} + - target: {fileID: 8650006953091811217, guid: 834794d00f37ed64fa23f9a468342c2e, + type: 3} + propertyPath: m_ConnectedAnchor.x + value: 0.44997528 + objectReference: {fileID: 0} + - target: {fileID: 8650006953091811217, guid: 834794d00f37ed64fa23f9a468342c2e, + type: 3} + propertyPath: m_ConnectedAnchor.y + value: -0.0012344348 + objectReference: {fileID: 0} + - target: {fileID: 8650006953091811217, guid: 834794d00f37ed64fa23f9a468342c2e, + type: 3} + propertyPath: m_ConnectedAnchor.z + value: -0.213007 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 834794d00f37ed64fa23f9a468342c2e, type: 3} --- !u!4 &1622256139 stripped @@ -442104,32 +442129,32 @@ PrefabInstance: - target: {fileID: 2389456291377549788, guid: c7190c7182dc47944b0a50b8b43c2a0a, type: 3} propertyPath: m_RootOrder - value: 61 + value: 48 objectReference: {fileID: 0} - target: {fileID: 2389456291377549788, guid: c7190c7182dc47944b0a50b8b43c2a0a, type: 3} propertyPath: m_LocalPosition.x - value: 15.264 + value: 15.263998 objectReference: {fileID: 0} - target: {fileID: 2389456291377549788, guid: c7190c7182dc47944b0a50b8b43c2a0a, type: 3} propertyPath: m_LocalPosition.y - value: -41.505 + value: -41.505016 objectReference: {fileID: 0} - target: {fileID: 2389456291377549788, guid: c7190c7182dc47944b0a50b8b43c2a0a, type: 3} propertyPath: m_LocalPosition.z - value: 5.513 + value: 5.5130005 objectReference: {fileID: 0} - target: {fileID: 2389456291377549788, guid: c7190c7182dc47944b0a50b8b43c2a0a, type: 3} propertyPath: m_LocalRotation.w - value: -0.5606097 + value: -0.56060964 objectReference: {fileID: 0} - target: {fileID: 2389456291377549788, guid: c7190c7182dc47944b0a50b8b43c2a0a, type: 3} propertyPath: m_LocalRotation.x - value: -0.5606097 + value: -0.56060964 objectReference: {fileID: 0} - target: {fileID: 2389456291377549788, guid: c7190c7182dc47944b0a50b8b43c2a0a, type: 3} @@ -504748,7 +504773,7 @@ PrefabInstance: - target: {fileID: 2389456291377549788, guid: c7190c7182dc47944b0a50b8b43c2a0a, type: 3} propertyPath: m_RootOrder - value: 59 + value: 60 objectReference: {fileID: 0} - target: {fileID: 2389456291377549788, guid: c7190c7182dc47944b0a50b8b43c2a0a, type: 3} @@ -513454,7 +513479,7 @@ PrefabInstance: - target: {fileID: 1425203164796196698, guid: 188c51d053f839b4fb7ca0abdafbae43, type: 3} propertyPath: m_RootOrder - value: 53 + value: 54 objectReference: {fileID: 0} - target: {fileID: 1425203164796196698, guid: 188c51d053f839b4fb7ca0abdafbae43, type: 3} @@ -523488,7 +523513,7 @@ PrefabInstance: - target: {fileID: 3427346275064232622, guid: 834794d00f37ed64fa23f9a468342c2e, type: 3} propertyPath: m_RootOrder - value: 50 + value: 51 objectReference: {fileID: 0} - target: {fileID: 3427346275064232622, guid: 834794d00f37ed64fa23f9a468342c2e, type: 3} @@ -525293,7 +525318,7 @@ PrefabInstance: - target: {fileID: 2389456291377549788, guid: c7190c7182dc47944b0a50b8b43c2a0a, type: 3} propertyPath: m_RootOrder - value: 55 + value: 56 objectReference: {fileID: 0} - target: {fileID: 2389456291377549788, guid: c7190c7182dc47944b0a50b8b43c2a0a, type: 3} @@ -546019,6 +546044,7 @@ Transform: - {fileID: 1907523914} - {fileID: 1815272796} - {fileID: 2116249393} + - {fileID: 1653124220} - {fileID: 377209723} - {fileID: 1357013324} - {fileID: 1955566234} @@ -546032,7 +546058,6 @@ Transform: - {fileID: 942789810} - {fileID: 1887170817} - {fileID: 50294729} - - {fileID: 1653124220} - {fileID: 161699558} - {fileID: 1755535131} - {fileID: 1650875689} @@ -575635,12 +575660,12 @@ PrefabInstance: - target: {fileID: 683641810726029904, guid: b3aa1fd769428e5478861349062a763b, type: 3} propertyPath: m_LocalPosition.x - value: 176.99866 + value: 176.913 objectReference: {fileID: 0} - target: {fileID: 683641810726029904, guid: b3aa1fd769428e5478861349062a763b, type: 3} propertyPath: m_LocalPosition.y - value: -15.076772 + value: -15.23 objectReference: {fileID: 0} - target: {fileID: 683641810726029904, guid: b3aa1fd769428e5478861349062a763b, type: 3} @@ -575687,6 +575712,46 @@ PrefabInstance: propertyPath: m_Name value: Paddle objectReference: {fileID: 0} + - target: {fileID: 683641811316564866, guid: b3aa1fd769428e5478861349062a763b, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 683641811316564866, guid: b3aa1fd769428e5478861349062a763b, + type: 3} + propertyPath: m_LocalRotation.x + value: -0.5 + objectReference: {fileID: 0} + - target: {fileID: 683641811316564866, guid: b3aa1fd769428e5478861349062a763b, + type: 3} + propertyPath: m_LocalRotation.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 683641811316564866, guid: b3aa1fd769428e5478861349062a763b, + type: 3} + propertyPath: m_LocalRotation.z + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 683641811316564866, guid: b3aa1fd769428e5478861349062a763b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -90 + objectReference: {fileID: 0} + - target: {fileID: 683641811316564866, guid: b3aa1fd769428e5478861349062a763b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 683641811316564866, guid: b3aa1fd769428e5478861349062a763b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 683641811316564878, guid: b3aa1fd769428e5478861349062a763b, + type: 3} + propertyPath: m_AttachTransform + value: + objectReference: {fileID: 0} - target: {fileID: 683641811316564878, guid: b3aa1fd769428e5478861349062a763b, type: 3} propertyPath: m_InteractionManager diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 02305e18..0432789f 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -130,8 +130,6 @@ PlayerSettings: bundleVersion: 1 preloadedAssets: - {fileID: 11400000, guid: b40a5c3e37c60d84b9d76e740e9817b1, type: 2} - - {fileID: -7799501270668957653, guid: 69fe7bdb426f5d54f964f41edab8336b, type: 2} - - {fileID: -4566111125232350401, guid: d9074d96c7fe25647ade97e2758ce11d, type: 2} metroInputSource: 0 wsaTransparentSwapchain: 0 m_HolographicPauseOnTrackingLoss: 1 @@ -381,6 +379,7 @@ PlayerSettings: switchTitleNames_12: switchTitleNames_13: switchTitleNames_14: + switchTitleNames_15: switchPublisherNames_0: switchPublisherNames_1: switchPublisherNames_2: @@ -396,6 +395,7 @@ PlayerSettings: switchPublisherNames_12: switchPublisherNames_13: switchPublisherNames_14: + switchPublisherNames_15: switchIcons_0: {fileID: 0} switchIcons_1: {fileID: 0} switchIcons_2: {fileID: 0} @@ -411,6 +411,7 @@ PlayerSettings: switchIcons_12: {fileID: 0} switchIcons_13: {fileID: 0} switchIcons_14: {fileID: 0} + switchIcons_15: {fileID: 0} switchSmallIcons_0: {fileID: 0} switchSmallIcons_1: {fileID: 0} switchSmallIcons_2: {fileID: 0} @@ -426,6 +427,7 @@ PlayerSettings: switchSmallIcons_12: {fileID: 0} switchSmallIcons_13: {fileID: 0} switchSmallIcons_14: {fileID: 0} + switchSmallIcons_15: {fileID: 0} switchManualHTML: switchAccessibleURLs: switchLegalInformation: