From 4ad82fe68475454c7a09638a38c3415d0ca6d357 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Gro=C3=9F?= Date: Sat, 12 Jun 2021 14:18:38 +0200 Subject: [PATCH] Add node interactions --- Assets/DirectionPaddle.cs | 7 +++++++ Assets/Models/Mainzkraut.unity | 6 +++++- Assets/Scripts/Network/Node.cs | 15 ++++++++++++--- Assets/Scripts/Network/Switch.cs | 2 +- 4 files changed, 25 insertions(+), 5 deletions(-) diff --git a/Assets/DirectionPaddle.cs b/Assets/DirectionPaddle.cs index 6c460f2..7d7f6a0 100644 --- a/Assets/DirectionPaddle.cs +++ b/Assets/DirectionPaddle.cs @@ -8,4 +8,11 @@ public class DirectionPaddle : MonoBehaviour { gameObject.SetActive(!gameObject.activeSelf); } + + public void InteractNode() + { + this.GetComponent().enabled = !this.GetComponent().enabled; + this.GetComponent().enabled = !this.GetComponent().enabled; + + } } diff --git a/Assets/Models/Mainzkraut.unity b/Assets/Models/Mainzkraut.unity index ca02e90..74b91a8 100644 --- a/Assets/Models/Mainzkraut.unity +++ b/Assets/Models/Mainzkraut.unity @@ -1057,6 +1057,10 @@ PrefabInstance: propertyPath: connections.Array.data[1] value: objectReference: {fileID: 1143571366} + - target: {fileID: 6314262857863842719, guid: cd2709ce625391747b56d49b13717da0, type: 3} + propertyPath: connections.Array.data[3] + value: + objectReference: {fileID: 1643453143} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: cd2709ce625391747b56d49b13717da0, type: 3} --- !u!4 &852901939 stripped @@ -1995,7 +1999,7 @@ GameObject: - component: {fileID: 1643453144} - component: {fileID: 1643453148} m_Layer: 0 - m_Name: Conveyer (6) + m_Name: Conveyor Paddle m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 diff --git a/Assets/Scripts/Network/Node.cs b/Assets/Scripts/Network/Node.cs index ed16c7b..92f2432 100644 --- a/Assets/Scripts/Network/Node.cs +++ b/Assets/Scripts/Network/Node.cs @@ -34,8 +34,17 @@ public class Node : MonoBehaviour public void MoveToDirection(Direction dir) { - connections[(int)dir].GetComponent().SetActiveNode(); - UI.SetActive(false); - isActive = false; + Node nodeComp = connections[(int)dir].GetComponent(); + if (nodeComp) + { + nodeComp.SetActiveNode(); + UI.SetActive(false); + isActive = false; + } else + { + connections[(int)dir].SendMessage("InteractNode"); + } + + } } diff --git a/Assets/Scripts/Network/Switch.cs b/Assets/Scripts/Network/Switch.cs index c3ca150..5111f85 100644 --- a/Assets/Scripts/Network/Switch.cs +++ b/Assets/Scripts/Network/Switch.cs @@ -33,7 +33,7 @@ public class Switch : MonoBehaviour if (Keyboard.current.eKey.wasPressedThisFrame) { gameManager.SetActiveCamera(1); - debugNode.SetActiveNode(); + debugNode.SendMessage("SetActiveNode", debugNode.GetComponent()); } } }