diff --git a/Assets/Resources/Prefabs/Facts/Circle.prefab b/Assets/Resources/Prefabs/Facts/Circle.prefab index 1c1dea241d42cd5631bb79f055e3ba6b4c0abfcd..beadc168a32739fd95954fd0d5f9892d44663d87 100644 --- a/Assets/Resources/Prefabs/Facts/Circle.prefab +++ b/Assets/Resources/Prefabs/Facts/Circle.prefab @@ -96,7 +96,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 405087c38b8537e43bcc99727c5325ec, type: 3} m_Name: m_EditorClassIdentifier: - midPoint: {x: 0, y: 0, z: 0} radius: 1 sideCount: 500 circleMesh: {fileID: 3164742056485930267} @@ -239,10 +238,10 @@ MeshCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6262947649539239553} m_Material: {fileID: 0} - m_IsTrigger: 1 + m_IsTrigger: 0 m_Enabled: 1 serializedVersion: 4 - m_Convex: 1 + m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 0} --- !u!1 &6839596689016440457 @@ -254,6 +253,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3390467403729316765} + - component: {fileID: 1812690906255965161} m_Layer: 15 m_Name: Circle m_TagString: Selectable @@ -277,3 +277,18 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1812690906255965161 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6839596689016440457} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 405087c38b8537e43bcc99727c5325ec, type: 3} + m_Name: + m_EditorClassIdentifier: + radius: 1 + sideCount: 500 + circleMesh: {fileID: 7167210412035754299} diff --git a/Assets/ScriptableObjects/PointerDataContainerGadgetInit.asset b/Assets/ScriptableObjects/PointerDataContainerGadgetInit.asset index 472254abae41b1f8e57a3494e837e35a8c284148..4c7c37fb1bd43df95fe76bc3628eaa9c2d05ddab 100644 --- a/Assets/ScriptableObjects/PointerDataContainerGadgetInit.asset +++ b/Assets/ScriptableObjects/PointerDataContainerGadgetInit.asset @@ -20,7 +20,7 @@ MonoBehaviour: ButtonIndx: 1 IgnoreLayerMask: serializedVersion: 2 - m_Bits: 24066 + m_Bits: 7682 SecondaryLayerMask: serializedVersion: 2 m_Bits: 0 diff --git a/ProjectSettings/Packages/com.unity.probuilder/Settings.json b/ProjectSettings/Packages/com.unity.probuilder/Settings.json index 67d846e6efd8edc004a72e952269f029598016b8..cc0de85265115d243d05c2bf41cfeaf2fa698535 100644 --- a/ProjectSettings/Packages/com.unity.probuilder/Settings.json +++ b/ProjectSettings/Packages/com.unity.probuilder/Settings.json @@ -33,6 +33,11 @@ "key": "lightmapping.autoUnwrapLightmapUV", "value": "{\"m_Value\":true}" }, + { + "type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", + "key": "editor.autoRecalculateCollisions", + "value": "{\"m_Value\":false}" + }, { "type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", "key": "experimental.enabled",