From 594de91135f7207082c92d325a0f240788284e46 Mon Sep 17 00:00:00 2001 From: Antoine H Date: Thu, 3 Dec 2020 15:41:30 +0100 Subject: [PATCH] Utilisation layer-mask (Optionnel) pour les interactions --- Assets/Scenes/Tests/SampleScene.unity | 4 ++-- Assets/Scripts/Tavernkeeper_controller.cs | 6 +++--- ProjectSettings/TagManager.asset | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Assets/Scenes/Tests/SampleScene.unity b/Assets/Scenes/Tests/SampleScene.unity index 7a3be70..c4e7292 100644 --- a/Assets/Scenes/Tests/SampleScene.unity +++ b/Assets/Scenes/Tests/SampleScene.unity @@ -136,7 +136,7 @@ GameObject: - component: {fileID: 107140167} - component: {fileID: 107140166} - component: {fileID: 107140169} - m_Layer: 0 + m_Layer: 8 m_Name: Oldman m_TagString: Client m_Icon: {fileID: 0} @@ -348,7 +348,7 @@ GameObject: - component: {fileID: 698542427} - component: {fileID: 698542426} - component: {fileID: 698542425} - m_Layer: 0 + m_Layer: 8 m_Name: Chicken m_TagString: Grabable m_Icon: {fileID: 0} diff --git a/Assets/Scripts/Tavernkeeper_controller.cs b/Assets/Scripts/Tavernkeeper_controller.cs index 22e9e8f..efb8903 100644 --- a/Assets/Scripts/Tavernkeeper_controller.cs +++ b/Assets/Scripts/Tavernkeeper_controller.cs @@ -81,8 +81,8 @@ public class Tavernkeeper_controller : MonoBehaviour void handAction(string hand) { - // Test collision of ray from tavernkeeper center (A verifier) at action_dist unit distance - RaycastHit2D hit = Physics2D.Raycast(rigidbody2d.position + Vector2.up * 0.2f, lookDirection, action_dist); + // Test collision of ray from tavernkeeper center (A verifier) at action_dist unit distance on Interactions layer + RaycastHit2D hit = Physics2D.Raycast(rigidbody2d.position + Vector2.up * 0.2f, lookDirection, action_dist, LayerMask.GetMask("Interactions")); if (hit.collider != null) { GameObject hit_object = hit.collider.gameObject; @@ -92,7 +92,7 @@ public class Tavernkeeper_controller : MonoBehaviour //Empty hand : try grab grabable object if(hand_container[hand] is null) { - if(hit_object.tag == "Grabable") //by tag or with parent-name ? + if(hit_object.tag == "Grabable") //by tag, layer-mask or with parent-name ? { // hit_object.transform.SetParent(transform); // hit_object.transform.localPosition = new Vector2(-0.2f,0.2f); diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index 4fd05a1..2926ddf 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -15,7 +15,7 @@ TagManager: - UI - - - - + - Interactions - - -