From 70da01664978548b10aac87325ef9dfe8d664d0c Mon Sep 17 00:00:00 2001 From: milan Date: Sun, 20 Nov 2022 12:53:49 +0100 Subject: [PATCH] change terminal light name to not override internal name --- .../Assets}/Modules/Puzzle A/Prefabs/Terminal.prefab | 2 +- Assets/Desert/Runtime/Puzzle A/Terminal.cs | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) rename Assets/{Escape Room Engine/Desert => Desert/Assets}/Modules/Puzzle A/Prefabs/Terminal.prefab (99%) diff --git a/Assets/Escape Room Engine/Desert/Modules/Puzzle A/Prefabs/Terminal.prefab b/Assets/Desert/Assets/Modules/Puzzle A/Prefabs/Terminal.prefab similarity index 99% rename from Assets/Escape Room Engine/Desert/Modules/Puzzle A/Prefabs/Terminal.prefab rename to Assets/Desert/Assets/Modules/Puzzle A/Prefabs/Terminal.prefab index 0319e98..459ca88 100644 --- a/Assets/Escape Room Engine/Desert/Modules/Puzzle A/Prefabs/Terminal.prefab +++ b/Assets/Desert/Assets/Modules/Puzzle A/Prefabs/Terminal.prefab @@ -328,7 +328,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: theme: {fileID: 11400000, guid: 568d9a7d70f3edb4cb6db66a0010f105, type: 2} - light: {fileID: 7019057833946340774} + terminalLight: {fileID: 7019057833946340774} symbols: - {fileID: 7205539446313206328} - {fileID: 7137138753029999131} diff --git a/Assets/Desert/Runtime/Puzzle A/Terminal.cs b/Assets/Desert/Runtime/Puzzle A/Terminal.cs index 97c80f1..82228e4 100644 --- a/Assets/Desert/Runtime/Puzzle A/Terminal.cs +++ b/Assets/Desert/Runtime/Puzzle A/Terminal.cs @@ -11,7 +11,7 @@ namespace EscapeRoomEngine.Desert.Runtime.Puzzle_A { private static readonly int LightFlash = Animator.StringToHash("Light Flash"); - [BoxGroup("Internal")] [Required] public Emission light; + [BoxGroup("Internal")] [Required] public Emission terminalLight; [BoxGroup("Internal")] public List symbols; private Animator _animator; @@ -28,15 +28,15 @@ namespace EscapeRoomEngine.Desert.Runtime.Puzzle_A switch (type) { case PuzzleEventType.Restarted: - light.color = theme.puzzleColor; + terminalLight.color = theme.puzzleColor; symbols.ForEach(symbol => symbol.Enable()); break; case PuzzleEventType.Solved: - light.color = theme.solvedColor; + terminalLight.color = theme.solvedColor; symbols.ForEach(symbol => symbol.Disable()); break; case PuzzleEventType.WrongInput: - light.color = theme.puzzleColor; + terminalLight.color = theme.puzzleColor; _animator.SetTrigger(LightFlash); break; default: @@ -49,12 +49,12 @@ namespace EscapeRoomEngine.Desert.Runtime.Puzzle_A public void TurnOnRingLight() { - light.active = true; + terminalLight.active = true; } public void TurnOffRingLight() { - light.active = false; + terminalLight.active = false; } } } \ No newline at end of file