diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index a35c7c2..c143af8 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -358,6 +358,40 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 185435514} m_CullTransparentMesh: 1 +--- !u!1 &303443604 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 5360703793236804447, guid: bfe47c8c98918254086591539306d4fa, type: 3} + m_PrefabInstance: {fileID: 5360703793485496321} + m_PrefabAsset: {fileID: 0} +--- !u!65 &303443608 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 303443604} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!54 &303443609 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 303443604} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 1 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 126 + m_CollisionDetection: 0 --- !u!1 &705507993 GameObject: m_ObjectHideFlags: 0 @@ -1130,6 +1164,24 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 3f1735c997ccb39408dfa8bf3790319f, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &1921511996 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 5360703793539700797, guid: bfe47c8c98918254086591539306d4fa, type: 3} + m_PrefabInstance: {fileID: 5360703793485496321} + m_PrefabAsset: {fileID: 0} +--- !u!65 &1921511998 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1921511996} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} --- !u!1001 &5360703793485496321 PrefabInstance: m_ObjectHideFlags: 0 @@ -1185,7 +1237,9 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 5360703794841841446, guid: bfe47c8c98918254086591539306d4fa, type: 3} + - {fileID: 5360703794001325738, guid: bfe47c8c98918254086591539306d4fa, type: 3} m_SourcePrefab: {fileID: 100100000, guid: bfe47c8c98918254086591539306d4fa, type: 3} --- !u!1001 &7029954222161724659 PrefabInstance: diff --git a/Assets/Scripts/Building/BuildingBlueprint.cs b/Assets/Scripts/Building/BuildingBlueprint.cs index f7a9c26..0e6c30f 100644 --- a/Assets/Scripts/Building/BuildingBlueprint.cs +++ b/Assets/Scripts/Building/BuildingBlueprint.cs @@ -31,6 +31,7 @@ public class BuildingBlueprint : MonoBehaviour //COLLISION if (isColliding) { + Debug.Log("Collision"); MeshRenderer[] mr = gameObject.GetComponent().FindChildByTag("Blueprint").GetComponentsInChildren(); foreach (MeshRenderer r in mr) { @@ -111,17 +112,17 @@ public class BuildingBlueprint : MonoBehaviour } //Collision - public void OnCollisionEnter(Collision c) + public void OnTriggerEnter(Collider other) { isColliding = true; Debug.Log("Colliding True"); } - public void OnCollisionStay(Collision c) + public void OnTriggerStay(Collider other) { isColliding = true; Debug.Log("Colliding True"); } - public void OnCollisionExit(Collision c) + public void OnTriggerExit(Collider other) { isColliding = false; Debug.Log("Colliding False"); diff --git a/Assets/Scripts/Building/TestHouse.prefab b/Assets/Scripts/Building/TestHouse.prefab index bd76228..d75616d 100644 --- a/Assets/Scripts/Building/TestHouse.prefab +++ b/Assets/Scripts/Building/TestHouse.prefab @@ -283,6 +283,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5360703793539700796} + - component: {fileID: 1517405387498435762} m_Layer: 9 m_Name: HouseBlueprint m_TagString: Blueprint @@ -306,6 +307,19 @@ Transform: m_Father: {fileID: 5360703794841841444} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &1517405387498435762 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5360703793539700797} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 92.57468, y: 48.040638, z: 29.317003} + m_Center: {x: -4.6876817, y: 0.38128814, z: -0.8356206} --- !u!1 &5360703794001325736 GameObject: m_ObjectHideFlags: 0 @@ -316,6 +330,7 @@ GameObject: m_Component: - component: {fileID: 5360703794001325739} - component: {fileID: 5360703794001325738} + - component: {fileID: 3042064361800759033} m_Layer: 0 m_Name: House m_TagString: Building @@ -355,6 +370,19 @@ Rigidbody: m_Interpolate: 0 m_Constraints: 126 m_CollisionDetection: 0 +--- !u!65 &3042064361800759033 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5360703794001325736} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 80, y: 40, z: 30} + m_Center: {x: 0, y: 0, z: 0} --- !u!1 &5360703794841841442 GameObject: m_ObjectHideFlags: 0 @@ -365,7 +393,6 @@ GameObject: m_Component: - component: {fileID: 5360703794841841444} - component: {fileID: 5360703794841841445} - - component: {fileID: 5360703794841841446} m_Layer: 0 m_Name: TestHouse m_TagString: Building @@ -406,19 +433,6 @@ MonoBehaviour: blueprintMat: {fileID: 2100000, guid: 78d3985cb7b88204b930cd05567c0c61, type: 2} collisionMat: {fileID: 2100000, guid: a1e8fb1ea637c0e45bed70dd7d1feaab, type: 2} buildingType: 0 ---- !u!65 &5360703794841841446 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5360703794841841442} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} --- !u!1 &5360703794877200714 GameObject: m_ObjectHideFlags: 0