diff --git a/Assets/Desert/Runtime/Button.cs b/Assets/Desert/Runtime/Button.cs index 7674636..7ccd7d1 100644 --- a/Assets/Desert/Runtime/Button.cs +++ b/Assets/Desert/Runtime/Button.cs @@ -35,7 +35,7 @@ namespace EscapeRoomEngine.Desert.Runtime public event ButtonEventHandler ButtonEvent; [ShowNativeProperty] - private bool Active + protected bool Active { get => _active; set @@ -51,7 +51,7 @@ namespace EscapeRoomEngine.Desert.Runtime } [ShowNativeProperty] - private bool Pressed + protected bool Pressed { get => _pressed; set diff --git a/Assets/Desert/Runtime/Puzzle A/SymbolButton.cs b/Assets/Desert/Runtime/Puzzle A/SymbolButton.cs index 01b6ba6..4d0e8b4 100644 --- a/Assets/Desert/Runtime/Puzzle A/SymbolButton.cs +++ b/Assets/Desert/Runtime/Puzzle A/SymbolButton.cs @@ -24,14 +24,16 @@ namespace EscapeRoomEngine.Desert.Runtime.Puzzle_A { base.Start(); - ButtonEvent += (_, type) => + ButtonEvent += (_, _) => { - var color = type switch + var color = theme.puzzleColor; + if (!Active) { - ButtonEventType.Pressed => theme.activeColor, - ButtonEventType.Deactivated => theme.solvedColor, - _ => theme.puzzleColor - }; + color = theme.solvedColor; + } else if (Pressed) + { + color = theme.activeColor; + } _material.SetColor(FresnelColor, color); _material.SetColor(Color, color);