From 27de478cdffe30ee86f33a99d98931ab4b212664 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tobias=20Sch=C3=B6ner?= <tobias.stonehead@gmail.com>
Date: Wed, 26 Oct 2022 15:03:21 +0200
Subject: [PATCH] fix: SnapZones for Ring and Circle work correctly
---
Assets/Resources/Prefabs/Facts/Circle.prefab | 21 ++++++++++++++++---
.../PointerDataContainerGadgetInit.asset | 2 +-
.../com.unity.probuilder/Settings.json | 5 +++++
3 files changed, 24 insertions(+), 4 deletions(-)
diff --git a/Assets/Resources/Prefabs/Facts/Circle.prefab b/Assets/Resources/Prefabs/Facts/Circle.prefab
index 1c1dea24..beadc168 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 472254ab..4c7c37fb 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 67d846e6..cc0de852 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",
--
GitLab