menu meh

ed7a7169 · radow · 053e2ef4 · ed7a7169 · ed7a7169 · ed7a7169
Commit ed7a7169 authored Dec 13, 2021 by radow
--- a/marmelade/Assets/OwnButton.cs
+++ b/marmelade/Assets/OwnButton.cs
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.EventSystems;
+using UnityEngine.UI;
+using TMPro;
+
+public class OwnButton : MonoBehaviour, IPointerEnterHandler, IPointerExitHandler, ISelectHandler, IDeselectHandler
+{
+    bool selected;
+    bool isHovering;
+    bool dirty, doAudio;
+
+    AudioSource auds;
+    Image buttonImage;
+    TextColorSwap textSwap;
+    Outline outline;
+    TextMeshProUGUI text;
+
+    public Color highlightColor, regularColor;
+    public bool swapSprites;
+    public Sprite highlightsprite, regularSprite;
+
+    private void Start()
+    {
+        auds = GetComponent<AudioSource>();
+        buttonImage= GetComponent<Image>();
+        textSwap = GetComponentInChildren<TextColorSwap>();
+        outline = GetComponent<Outline>();
+        text = GetComponentInChildren<TextMeshProUGUI>();
+    }
+
+
+    public void OnDeselect(BaseEventData eventData)
+    {
+        if (selected) dirty = true;
+        selected = false;
+    }
+
+    public void OnPointerEnter(PointerEventData eventData)
+    {
+        if (!isHovering) dirty = true;
+        isHovering = true;
+        doAudio = true;
+    }
+
+    public void OnPointerExit(PointerEventData eventData)
+    {
+        if (isHovering) dirty = true;
+        isHovering = false;
+    }
+
+    public void OnSelect(BaseEventData eventData)
+    {
+        if (!selected) dirty = true;
+        selected = true;
+        doAudio = true;
+    }
+
+    private void Update()
+    {
+        if (dirty)
+        {
+            outline.enabled = selected||isHovering;
+            outline.effectDistance = selected ? new Vector2(4,-4) : new Vector2(2,-2);
+            buttonImage.color = (isHovering||selected) ? highlightColor : regularColor;
+            text.fontStyle = isHovering ? FontStyles.Bold : FontStyles.Normal;
+            if (isHovering || selected) textSwap.Select();
+            else textSwap.DeSelect();
+            if (doAudio) auds.Play();
+            if (swapSprites) buttonImage.sprite = (isHovering || selected) ? highlightsprite : regularSprite;
+            dirty = false;
+            doAudio = false;
+        }
+    }
+}
--- a/marmelade/Assets/OwnButton.cs.meta
+++ b/marmelade/Assets/OwnButton.cs.meta
+fileFormatVersion: 2
+guid: dd9ff46c84a897c4aa31962f40a21d27
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/marmelade/Assets/Prefabs/UI.prefab
+++ b/marmelade/Assets/Prefabs/UI.prefab
--- a/marmelade/Assets/Scenes/Menu.unity
+++ b/marmelade/Assets/Scenes/Menu.unity
@@ -352,7 +352,7 @@ PrefabInstance:
    m_Modifications:
    - target: {fileID: -8679921383154817045, guid: 8f5787659f313ae4bbfde2c02976b14c, type: 3}
      propertyPath: m_RootOrder
-      value: 30
+      value: 31
      objectReference: {fileID: 0}
    - target: {fileID: -8679921383154817045, guid: 8f5787659f313ae4bbfde2c02976b14c, type: 3}
      propertyPath: m_LocalPosition.x
@@ -455,7 +455,7 @@ Transform:
  m_Children:
  - {fileID: 446549754}
  m_Father: {fileID: 0}
-  m_RootOrder: 5
+  m_RootOrder: 7
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &65300544
 MonoBehaviour:
@@ -858,7 +858,7 @@ Transform:
  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 13
+  m_RootOrder: 14
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &145214431
 MonoBehaviour:
@@ -915,7 +915,7 @@ Transform:
  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 9
+  m_RootOrder: 10
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &209632195
 GameObject:
@@ -1551,12 +1551,12 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 358096553}
  m_LocalRotation: {x: -0, y: -0.70710665, z: -0, w: 0.70710695}
-  m_LocalPosition: {x: 1.41957, y: 1.954, z: -2.9949312}
+  m_LocalPosition: {x: 1.42, y: 1.954, z: -3.424}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 21
+  m_RootOrder: 22
  m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0}
 --- !u!4 &386273617 stripped
 Transform:
@@ -1693,7 +1693,7 @@ Transform:
  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 19
+  m_RootOrder: 20
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &462853556
 GameObject:
@@ -2082,7 +2082,7 @@ PrefabInstance:
    m_Modifications:
    - target: {fileID: -8679921383154817045, guid: 24627dd205d44c44d8463b87eb80ece6, type: 3}
      propertyPath: m_RootOrder
-      value: 4
+      value: 5
      objectReference: {fileID: 0}
    - target: {fileID: -8679921383154817045, guid: 24627dd205d44c44d8463b87eb80ece6, type: 3}
      propertyPath: m_LocalPosition.x
@@ -2341,12 +2341,12 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 589727804}
  m_LocalRotation: {x: -0, y: -0.70710665, z: -0, w: 0.70710695}
-  m_LocalPosition: {x: 1.4195697, y: 1.954, z: -2.9949312}
+  m_LocalPosition: {x: 1.4199997, y: 1.954, z: -3.424}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 24
+  m_RootOrder: 25
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &599975241 stripped
 GameObject:
@@ -2527,7 +2527,7 @@ Transform:
  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 22
+  m_RootOrder: 23
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &683428108
 MonoBehaviour:
@@ -2732,7 +2732,7 @@ Transform:
  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 20
+  m_RootOrder: 21
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &801350832
 GameObject:
@@ -2763,7 +2763,7 @@ Transform:
  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 23
+  m_RootOrder: 24
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1001 &803472470
 PrefabInstance:
@@ -2913,7 +2913,7 @@ Transform:
  m_Children:
  - {fileID: 1763281062}
  m_Father: {fileID: 0}
-  m_RootOrder: 16
+  m_RootOrder: 17
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &815993468
 MonoBehaviour:
@@ -3005,7 +3005,7 @@ PrefabInstance:
    m_Modifications:
    - target: {fileID: -8679921383154817045, guid: 24627dd205d44c44d8463b87eb80ece6, type: 3}
      propertyPath: m_RootOrder
-      value: 17
+      value: 18
      objectReference: {fileID: 0}
    - target: {fileID: -8679921383154817045, guid: 24627dd205d44c44d8463b87eb80ece6, type: 3}
      propertyPath: m_LocalScale.x
@@ -3106,7 +3106,7 @@ PrefabInstance:
    m_Modifications:
    - target: {fileID: -8679921383154817045, guid: 8f5787659f313ae4bbfde2c02976b14c, type: 3}
      propertyPath: m_RootOrder
-      value: 7
+      value: 8
      objectReference: {fileID: 0}
    - target: {fileID: -8679921383154817045, guid: 8f5787659f313ae4bbfde2c02976b14c, type: 3}
      propertyPath: m_LocalPosition.x
@@ -3156,6 +3156,10 @@ PrefabInstance:
      propertyPath: m_Name
      value: walkway_T
      objectReference: {fileID: 0}
+    - target: {fileID: 919132149155446097, guid: 8f5787659f313ae4bbfde2c02976b14c, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: 8f5787659f313ae4bbfde2c02976b14c, type: 3}
 --- !u!4 &850418770 stripped
@@ -3172,7 +3176,7 @@ PrefabInstance:
    m_Modifications:
    - target: {fileID: -8679921383154817045, guid: 8f5787659f313ae4bbfde2c02976b14c, type: 3}
      propertyPath: m_RootOrder
-      value: 29
+      value: 30
      objectReference: {fileID: 0}
    - target: {fileID: -8679921383154817045, guid: 8f5787659f313ae4bbfde2c02976b14c, type: 3}
      propertyPath: m_LocalPosition.x
@@ -3429,7 +3433,7 @@ Transform:
  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 26
+  m_RootOrder: 28
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1001 &948351166
 PrefabInstance:
@@ -4323,7 +4327,7 @@ Transform:
  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 3
+  m_RootOrder: 4
  m_LocalEulerAnglesHint: {x: 89.585, y: -90.001, z: -90.001}
 --- !u!1001 &1091454095
 PrefabInstance:
@@ -4334,7 +4338,7 @@ PrefabInstance:
    m_Modifications:
    - target: {fileID: -8679921383154817045, guid: 8f5787659f313ae4bbfde2c02976b14c, type: 3}
      propertyPath: m_RootOrder
-      value: 28
+      value: 29
      objectReference: {fileID: 0}
    - target: {fileID: -8679921383154817045, guid: 8f5787659f313ae4bbfde2c02976b14c, type: 3}
      propertyPath: m_LocalPosition.x
@@ -4438,7 +4442,7 @@ Transform:
  - {fileID: 1614652991}
  - {fileID: 1274728675}
  m_Father: {fileID: 0}
-  m_RootOrder: 18
+  m_RootOrder: 19
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1001 &1110680756
 PrefabInstance:
@@ -4688,7 +4692,7 @@ Transform:
  m_Children:
  - {fileID: 1189510752}
  m_Father: {fileID: 0}
-  m_RootOrder: 34
+  m_RootOrder: 35
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1001 &1153616952
 PrefabInstance:
@@ -4960,7 +4964,7 @@ PrefabInstance:
    m_Modifications:
    - target: {fileID: -8679921383154817045, guid: 8f5787659f313ae4bbfde2c02976b14c, type: 3}
      propertyPath: m_RootOrder
-      value: 32
+      value: 33
      objectReference: {fileID: 0}
    - target: {fileID: -8679921383154817045, guid: 8f5787659f313ae4bbfde2c02976b14c, type: 3}
      propertyPath: m_LocalPosition.x
@@ -5134,7 +5138,7 @@ PrefabInstance:
    m_Modifications:
    - target: {fileID: -8679921383154817045, guid: 8f5787659f313ae4bbfde2c02976b14c, type: 3}
      propertyPath: m_RootOrder
-      value: 33
+      value: 34
      objectReference: {fileID: 0}
    - target: {fileID: -8679921383154817045, guid: 8f5787659f313ae4bbfde2c02976b14c, type: 3}
      propertyPath: m_LocalPosition.x
@@ -6636,7 +6640,7 @@ PrefabInstance:
    m_Modifications:
    - target: {fileID: 421800774695512858, guid: f1d59c4d3635dbd4891f81eb56821a62, type: 3}
      propertyPath: m_RootOrder
-      value: 2
+      value: 3
      objectReference: {fileID: 0}
    - target: {fileID: 421800774695512858, guid: f1d59c4d3635dbd4891f81eb56821a62, type: 3}
      propertyPath: m_LocalPosition.x
@@ -7085,7 +7089,7 @@ Transform:
  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 25
+  m_RootOrder: 26
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1001 &1588180248
 PrefabInstance:
@@ -7153,7 +7157,7 @@ PrefabInstance:
    m_Modifications:
    - target: {fileID: -8679921383154817045, guid: 8f5787659f313ae4bbfde2c02976b14c, type: 3}
      propertyPath: m_RootOrder
-      value: 31
+      value: 32
      objectReference: {fileID: 0}
    - target: {fileID: -8679921383154817045, guid: 8f5787659f313ae4bbfde2c02976b14c, type: 3}
      propertyPath: m_LocalPosition.x
@@ -7348,7 +7352,7 @@ Transform:
  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 10
+  m_RootOrder: 11
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1001 &1723046070
 PrefabInstance:
@@ -7724,7 +7728,7 @@ PrefabInstance:
    m_Modifications:
    - target: {fileID: -8679921383154817045, guid: 38e90f16798dafa44aa8b67607542ade, type: 3}
      propertyPath: m_RootOrder
-      value: 1
+      value: 2
      objectReference: {fileID: 0}
    - target: {fileID: -8679921383154817045, guid: 38e90f16798dafa44aa8b67607542ade, type: 3}
      propertyPath: m_LocalPosition.x
@@ -7852,7 +7856,7 @@ Transform:
  - {fileID: 314787653}
  - {fileID: 1473849177}
  m_Father: {fileID: 0}
-  m_RootOrder: 11
+  m_RootOrder: 13
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1001 &1858483443
 PrefabInstance:
@@ -8298,7 +8302,7 @@ Transform:
  m_Children:
  - {fileID: 1220739170}
  m_Father: {fileID: 0}
-  m_RootOrder: 35
+  m_RootOrder: 36
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1914152441 stripped
 GameObject:
@@ -8886,6 +8890,63 @@ MonoBehaviour:
  unlitMat: {fileID: 2100000, guid: 9905161beaf1427479abbed5253510fe, type: 2}
  isLit: 1
  mr: {fileID: 0}
+--- !u!1001 &1980047385
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: -8679921383154817045, guid: f5ef14b9ec655344990b4154050d7380, type: 3}
+      propertyPath: m_RootOrder
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: f5ef14b9ec655344990b4154050d7380, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0.7265125
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: f5ef14b9ec655344990b4154050d7380, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 1.7262127
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: f5ef14b9ec655344990b4154050d7380, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: -2.614414
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: f5ef14b9ec655344990b4154050d7380, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.70710665
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: f5ef14b9ec655344990b4154050d7380, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -1.323489e-23
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: f5ef14b9ec655344990b4154050d7380, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0.70710695
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: f5ef14b9ec655344990b4154050d7380, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 8.659562e-17
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: f5ef14b9ec655344990b4154050d7380, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: f5ef14b9ec655344990b4154050d7380, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: -270
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: f5ef14b9ec655344990b4154050d7380, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 919132149155446097, guid: f5ef14b9ec655344990b4154050d7380, type: 3}
+      propertyPath: m_Name
+      value: walkway_T_door
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: f5ef14b9ec655344990b4154050d7380, type: 3}
 --- !u!4 &1982417299 stripped
 Transform:
  m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 6d8d94e7e29c2164ba81f1ea490157e4, type: 3}
@@ -8935,11 +8996,11 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 3685575245661785991, guid: 2cca9696502b69f4eb7c3fd6576ab75e, type: 3}
      propertyPath: m_RootOrder
-      value: 14
+      value: 16
      objectReference: {fileID: 0}
    - target: {fileID: 3685575245661785991, guid: 2cca9696502b69f4eb7c3fd6576ab75e, type: 3}
      propertyPath: m_LocalPosition.x
-      value: -0.032
+      value: -0.031313412
      objectReference: {fileID: 0}
    - target: {fileID: 3685575245661785991, guid: 2cca9696502b69f4eb7c3fd6576ab75e, type: 3}
      propertyPath: m_LocalPosition.y
@@ -8947,7 +9008,7 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 3685575245661785991, guid: 2cca9696502b69f4eb7c3fd6576ab75e, type: 3}
      propertyPath: m_LocalPosition.z
-      value: -1.741
+      value: -2.1483474
      objectReference: {fileID: 0}
    - target: {fileID: 3685575245661785991, guid: 2cca9696502b69f4eb7c3fd6576ab75e, type: 3}
      propertyPath: m_LocalRotation.w
@@ -9854,6 +9915,10 @@ PrefabInstance:
      propertyPath: m_AnchoredPosition.x
      value: 58.7
      objectReference: {fileID: 0}
+    - target: {fileID: 1556710228, guid: 6cbd62c30b39a9545a47f56696b6522b, type: 3}
+      propertyPath: m_Transition
+      value: 0
+      objectReference: {fileID: 0}
    - target: {fileID: 1678646551, guid: 6cbd62c30b39a9545a47f56696b6522b, type: 3}
      propertyPath: m_Delegates.Array.data[0].callback.m_PersistentCalls.m_Calls.Array.size
      value: 3
@@ -9898,6 +9963,86 @@ PrefabInstance:
      propertyPath: m_AnchoredPosition.x
      value: 52.7
      objectReference: {fileID: 0}
+    - target: {fileID: 522905487053439883, guid: 6cbd62c30b39a9545a47f56696b6522b, type: 3}
+      propertyPath: regularColor.a
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 1739124711201542328, guid: 6cbd62c30b39a9545a47f56696b6522b, type: 3}
+      propertyPath: m_Transition
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3205941120919958102, guid: 6cbd62c30b39a9545a47f56696b6522b, type: 3}
+      propertyPath: regularColor.a
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3205941120919958102, guid: 6cbd62c30b39a9545a47f56696b6522b, type: 3}
+      propertyPath: regularColor.b
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3205941120919958102, guid: 6cbd62c30b39a9545a47f56696b6522b, type: 3}
+      propertyPath: regularColor.g
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3205941120919958102, guid: 6cbd62c30b39a9545a47f56696b6522b, type: 3}
+      propertyPath: regularColor.r
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3205941120919958102, guid: 6cbd62c30b39a9545a47f56696b6522b, type: 3}
+      propertyPath: highlightColor.a
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4942916348061984748, guid: 6cbd62c30b39a9545a47f56696b6522b, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: -205
+      objectReference: {fileID: 0}
+    - target: {fileID: 5868671607994688421, guid: 6cbd62c30b39a9545a47f56696b6522b, type: 3}
+      propertyPath: regularColor.a
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5868671607994688421, guid: 6cbd62c30b39a9545a47f56696b6522b, type: 3}
+      propertyPath: regularColor.b
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5868671607994688421, guid: 6cbd62c30b39a9545a47f56696b6522b, type: 3}
+      propertyPath: regularColor.g
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5868671607994688421, guid: 6cbd62c30b39a9545a47f56696b6522b, type: 3}
+      propertyPath: regularColor.r
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5868671607994688421, guid: 6cbd62c30b39a9545a47f56696b6522b, type: 3}
+      propertyPath: highlightColor.a
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6933641529643813916, guid: 6cbd62c30b39a9545a47f56696b6522b, type: 3}
+      propertyPath: regularColor.a
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6933641529643813916, guid: 6cbd62c30b39a9545a47f56696b6522b, type: 3}
+      propertyPath: regularColor.b
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6933641529643813916, guid: 6cbd62c30b39a9545a47f56696b6522b, type: 3}
+      propertyPath: regularColor.g
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6933641529643813916, guid: 6cbd62c30b39a9545a47f56696b6522b, type: 3}
+      propertyPath: regularColor.r
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6933641529643813916, guid: 6cbd62c30b39a9545a47f56696b6522b, type: 3}
+      propertyPath: highlightColor.a
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7266732220191892718, guid: 6cbd62c30b39a9545a47f56696b6522b, type: 3}
+      propertyPath: m_EffectDistance.x
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 7266732220191892718, guid: 6cbd62c30b39a9545a47f56696b6522b, type: 3}
+      propertyPath: m_EffectDistance.y
+      value: -4
+      objectReference: {fileID: 0}
    - target: {fileID: 7309086473167014770, guid: 6cbd62c30b39a9545a47f56696b6522b, type: 3}
      propertyPath: m_Pivot.x
      value: 0
@@ -9908,7 +10053,7 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 7309086473167014770, guid: 6cbd62c30b39a9545a47f56696b6522b, type: 3}
      propertyPath: m_RootOrder
-      value: 8
+      value: 9
      objectReference: {fileID: 0}
    - target: {fileID: 7309086473167014770, guid: 6cbd62c30b39a9545a47f56696b6522b, type: 3}
      propertyPath: m_AnchorMax.x
@@ -9986,7 +10131,32 @@ PrefabInstance:
      propertyPath: m_Name
      value: UI
      objectReference: {fileID: 0}
-    m_RemovedComponents: []
+    - target: {fileID: 7905201836556087782, guid: 6cbd62c30b39a9545a47f56696b6522b, type: 3}
+      propertyPath: regularColor.b
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7905201836556087782, guid: 6cbd62c30b39a9545a47f56696b6522b, type: 3}
+      propertyPath: regularColor.g
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7905201836556087782, guid: 6cbd62c30b39a9545a47f56696b6522b, type: 3}
+      propertyPath: regularColor.r
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7905201836556087782, guid: 6cbd62c30b39a9545a47f56696b6522b, type: 3}
+      propertyPath: highlightColor.b
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7905201836556087782, guid: 6cbd62c30b39a9545a47f56696b6522b, type: 3}
+      propertyPath: highlightColor.g
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7905201836556087782, guid: 6cbd62c30b39a9545a47f56696b6522b, type: 3}
+      propertyPath: highlightColor.r
+      value: 1
+      objectReference: {fileID: 0}
+    m_RemovedComponents:
+    - {fileID: 0}
  m_SourcePrefab: {fileID: 100100000, guid: 6cbd62c30b39a9545a47f56696b6522b, type: 3}
 --- !u!1 &7309086472921592636 stripped
 GameObject:

--- a/marmelade/Assets/Scripts/Menu.cs
+++ b/marmelade/Assets/Scripts/Menu.cs
@@ -21,7 +21,7 @@ public class Menu : MonoBehaviour
    public GameObject settingsMain, settingsGraphics, settingsAudio, settingsControls;
    public GameObject menuWrapper, mainMenuGO, settingsGO, creditsGO, controlsGO, quitGO;
    public GameObject playButton, creditButton, continueButton, helpButton;
-    public TextColorSwap gameplayButton;
+    public Button gameplayButton, noButton;
    public Ease ease;
    public float duration = 3f;

@@ -62,7 +62,7 @@ public class Menu : MonoBehaviour