Merge commit 'e7f8693f' into SamWorkset

Assets/_PROJECT/Components/NewHandPresence/Prefabs/Scripts/Floor Button Visualizer.cs

@@ -7,9 +7,7 @@ public class FloorButtonVisualizer : MonoBehaviour
 {
     public Sprite InactiveSprite;
     public Sprite ActiveSprite;
-    public float FloorUpperCoordiantes;
+    public bool ActiveState;
-    public float FloorLowerCoordiantes;
-    private bool activeState = true;
     private Image buttonImage;
     // Start is called before the first frame update
     void Start()
@@ -17,25 +15,16 @@ public class FloorButtonVisualizer : MonoBehaviour
         buttonImage = gameObject.GetComponent<Image>();
     }
 
-    // Update is called once per frame
+    public void Activate()
-    void Update()
     {
-        float height = gameObject.transform.position.y;
+        this.ActiveState = true;
-        if (height < FloorUpperCoordiantes && height > FloorLowerCoordiantes)
-        {
-            if (!activeState) { 
-                activeState = true;
         buttonImage.sprite = ActiveSprite;
+        //Debug.Log("Floorbutton of " + gameObject.name + " activated");
     }
-            
+    public void Deactivate()
-        }
-        else
     {
-            if (activeState)
+        this.ActiveState = false;
-            {
-                activeState = false;
         buttonImage.sprite = InactiveSprite;
-            }
+        //Debug.Log("Floorbutton of " + gameObject.name + " deactivated");
-        }
     }
 }

Assets/_PROJECT/Components/NewHandPresence/Prefabs/Scripts/Menu Teleport Button.cs

@@ -3,6 +3,7 @@ using System.Collections;
 using System.Collections.Generic;
 using Unity.XR.CoreUtils;
 using UnityEngine;
+using UnityEngine.Rendering;
 using UnityEngine.UI;
 using UnityEngine.XR.Interaction.Toolkit;
 
@@ -25,19 +26,37 @@ public class MenuTeleportButton : MonoBehaviour
         button.onClick.AddListener(TeleportPlayer);
 
         TeleportLocation[] locations = FindObjectsOfType<TeleportLocation>(); // Fetches all teleport locations from scene.
-        Debug.Log("The amount of teleport locations is " + locations.Length);
+        //Debug.Log("The amount of teleport locations is " + locations.Length);
         foreach (TeleportLocation location in locations) // Finds the target.
         {
             if (location.Name.Equals(TargetName))
             {
                 target = location;
-                Debug.Log("Teleport target of " + target.Name + " found.");
+                //Debug.Log("Teleport target of " + target.Name + " found.");
             }
         }
+        if (target == null) Debug.Log("Teleport target of " + TargetName + " not found.");
     }
 
-    void Update()
+    public void SetStateSelected()
     {
+        if (button != null)
+        {
+            if (HoverSprite != null)
+            {
+                button.targetGraphic.GetComponent<Image>().sprite = HoverSprite;
+            }
+        }
+    }
+    public void SetStateDefault()
+    {
+        // Refresh the button state.
+        button.interactable = false;
+        button.interactable = true;
+        if (NormalSprite != null) 
+        { 
+            button.targetGraphic.GetComponent<Image>().sprite = NormalSprite;
+        }
     
     }
     public void SetStateDefault()
@@ -47,16 +66,27 @@ public class MenuTeleportButton : MonoBehaviour
     }
 
 
-
     private void TeleportPlayer()
     {
-        Debug.Log("Teleport button clicked");
+        //Debug.Log("Teleport button clicked");
+
         if (target != null && Player != null && Player.Camera != null)
         {
-            // Teleport the XR Origin to the specified coordinates.
             Player.transform.position = target.transform.position;
-            Player.Camera.transform.rotation = target.transform.rotation;
 
+            // Calculate the rotation offset needed for the player
+            Vector3 targetEulerAngles = target.transform.rotation.eulerAngles;
+            Vector3 currentCameraEulerAngles = Player.Camera.transform.rotation.eulerAngles;
+
+            // Determine the rotation delta around the Y-axis
+            float rotationDeltaY = targetEulerAngles.y - currentCameraEulerAngles.y;
+
+            // Apply the rotation delta to the XR Origin
+            Player.transform.Rotate(0, rotationDeltaY, 0, Space.World);
+
+            // Refresh the button state.
+            button.interactable = false;
+            button.interactable = true;
         }
     }
 }

Assets/_PROJECT/Components/NewHandPresence/Prefabs/Scripts/Menu.cs

@@ -3,6 +3,7 @@ using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.InputSystem;
+using UnityEngine.InputSystem.LowLevel;
 using UnityEngine.UI;
 
 public class Menu : MonoBehaviour
@@ -10,19 +11,29 @@ public class Menu : MonoBehaviour
     public GameObject MenuRotator;
     public GameObject Floor1Panel;
     public GameObject Floor2Panel;
-    public Button Floor1Button;
+    public FloorButtonVisualizer Floor1Button;
-    public Button Floor2Button;
+    public FloorButtonVisualizer Floor2Button;
     public Camera Camera;
-    public Image Playericon;
+    public Image PlayericonFloor1;
+    public Image PlayericonFloor2;
+    public GameObject PlayericonFloor1Parent;
+    public GameObject PlayericonFloor2Parent;
+
     public InputActionReference openMenuAction;
     private Canvas canvas;
 
-    public Vector2 rotatedPlayerPos = new Vector2();
+    // Values for setting the position of the player marker. Do not touch them without great cause.
-    public float worldToMapAngle = 130.0f;
+    private Vector2 rotatedPlayerPos = new Vector2();
-    public Vector2 VR_P1 = new Vector2(-77.4f, 10.1f); // - 71.2f (alumine punkt)
+    private float worldToMapAngle = 130.0f;
-    public Vector2 VR_P2 = new Vector2(95.7f, -82.8f);
+    private Vector2 VR_P1 = new Vector2(-77.4f, 10.1f); // - 71.2f (alumine punkt)
-    public Vector2 IMG_P1 = new Vector2(-387.2f, 193.1f); // 
+    private Vector2 VR_P2 = new Vector2(95.7f, -82.8f);
-    public Vector2 IMG_P2 = new Vector2(389.7f, -221.4f); // 
+    private Vector2 IMG_P1 = new Vector2(-387.2f, 193.1f); // 
+    private Vector2 IMG_P2 = new Vector2(389.7f, -221.4f); // 
+
+    protected static float cameraToMapIconRotationOffset = -50;
+    private float floor2UpperLimit = 9;
+    private float floorsMidpointLimit = 2.5f;
+    private float floor1LowerLimit = -5;
 
     private void Awake()
     {
@@ -52,8 +63,8 @@ public class Menu : MonoBehaviour
     // Start is called before the first frame update
     void Start()
     {
-        Floor1Button.onClick.AddListener(DisplayFloor1);
+        Floor1Button.GetComponent<Button>().onClick.AddListener(DisplayFloor1);
-        Floor2Button.onClick.AddListener(DisplayFloor2);
+        Floor2Button.GetComponent<Button>().onClick.AddListener(DisplayFloor2);
         DisplayFloor2();
     }
     private void DisplayFloor1()
@@ -61,13 +72,39 @@ public class Menu : MonoBehaviour
         //Debug.Log("Dispaling floor 1");
         Floor1Panel.gameObject.SetActive(true);
         Floor2Panel.gameObject.SetActive(false);
+
+        Button buttonComponent = Floor1Button.GetComponent<Button>();
+
+        // Refresh the state of the button.
+        buttonComponent.interactable = false;
+        buttonComponent.interactable = true;
     }
     private void DisplayFloor2()
     {
         //Debug.Log("Dispaling floor 2");
         Floor1Panel.gameObject.SetActive(false);
         Floor2Panel.gameObject.SetActive(true);
+
+        Button buttonComponent = Floor2Button.GetComponent<Button>();
+
+        // Refresh the state of the button.
+        buttonComponent.interactable = false;
+        buttonComponent.interactable = true;
     }
+    private int DeterminePlayerCurrentFloor()
+    {
+        float yPos = gameObject.transform.position.y;
+        if (yPos > floorsMidpointLimit && yPos < floor2UpperLimit) // Floor 2
+        {
+            return 2;
+        }
+        if (yPos > floor1LowerLimit && yPos <= floorsMidpointLimit) // Floor 1
+        {
+            return 1;
+        }
+        return -1; // If the player should not be on the map
+    }
+
     private void OnDeviceChange(InputDevice device, InputDeviceChange change) // To avoid bugs with controllers disconnecting.
     {
         switch (change)
@@ -94,6 +131,81 @@ public class Menu : MonoBehaviour
             }
         }
         
+        UpdatePlayerIconPosition();
+        UpdatePlayerIconRotation();
+        UpdateActveFloor();
+
+
+
+    }
+    private void UpdatePlayerIconRotation()
+    {
+        float cameraRotationY = -Camera.transform.eulerAngles.y;
+        float iconRotation = cameraRotationY + cameraToMapIconRotationOffset;
+        if (PlayericonFloor1Parent.activeSelf)
+        {
+            PlayericonFloor1.transform.rotation = Quaternion.Euler(transform.eulerAngles.x, transform.eulerAngles.y, iconRotation);
+        }
+        if (PlayericonFloor2Parent.activeSelf)
+        {
+            PlayericonFloor2.transform.rotation = Quaternion.Euler(transform.eulerAngles.x, transform.eulerAngles.y, iconRotation);
+        }
+    }
+    private void UpdateActveFloor()
+    {
+        int playerCurrentFloor = DeterminePlayerCurrentFloor();
+        //Debug.Log("Player current floor is " + playerCurrentFloor);
+        switch (playerCurrentFloor)
+        {
+            case 1:
+                if (!Floor1Button.ActiveState)
+                {
+                    //Debug.Log("Activating floor 1 Button.");
+                    Floor1Button.Activate();
+                    Floor2Button.Deactivate();
+                }
+                if (!PlayericonFloor1Parent.activeSelf)
+                {
+                    PlayericonFloor1Parent.SetActive(true);
+                    PlayericonFloor2Parent.SetActive(false);
+                }
+                break;
+            case 2:
+                if (!Floor2Button.ActiveState)
+                {
+                    //Debug.Log("Activating floor 2 Button.");
+                    Floor1Button.Deactivate();
+                    Floor2Button.Activate();
+                }
+                if (!PlayericonFloor2Parent.activeSelf)
+                {
+                    Debug.Log("PlayericonFloor2Parent is inactive");
+                    PlayericonFloor1Parent.SetActive(false);
+                    PlayericonFloor2Parent.SetActive(true);
+                    Debug.Log(PlayericonFloor2Parent.activeSelf);
+                }
+                break;
+            default:
+                if (PlayericonFloor1Parent.activeSelf || PlayericonFloor2Parent.activeSelf) 
+                {
+                    //Debug.Log("Deactivating floor Buttons.");
+                    Floor1Button.Deactivate();
+                    Floor2Button.Deactivate();
+                }
+                if (PlayericonFloor1.enabled || PlayericonFloor2.enabled)
+                {
+                    PlayericonFloor1Parent.SetActive(false);
+                    PlayericonFloor2Parent.SetActive(false);
+                }
+                break;
+
+        }
+
+    }
+
+
+    private void UpdatePlayerIconPosition()
+    {
         float worldToMapAngleRad = worldToMapAngle * Mathf.Deg2Rad;
 
         //Vector2 VR_Player = new Vector2(transform.position.x, transform.position.z);
@@ -121,7 +233,14 @@ public class Menu : MonoBehaviour
         Vector2 IMG_L = IMG_P2 - IMG_P1;
 
         Vector2 IMG_Player = (VR_Player - VR_P1) / VR_L * IMG_L + IMG_P1;
-        Playericon.GetComponent<RectTransform>().anchoredPosition = IMG_Player;
+        if (PlayericonFloor1Parent.activeSelf)
+        {
+            PlayericonFloor1.GetComponent<RectTransform>().anchoredPosition = IMG_Player;
+        }
+        if (PlayericonFloor2Parent.activeSelf)
+        {
+            PlayericonFloor2.GetComponent<RectTransform>().anchoredPosition = IMG_Player;
+        }
 
         /*
         float VR_X = transform.position.x;
@@ -142,14 +261,13 @@ public class Menu : MonoBehaviour
         //Playericon.transform.position.Set(IMG_X,0,0);
         //Playericon.GetComponent<RectTransform>().anchoredPosition = new Vector2(IMG_X, IMG_Y);
         //Debug.Log(IMG_X + " vs " + Playericon.GetComponent<RectTransform>().anchoredPosition.x);
-        
     }
     private void OnDestroy()
     {
         openMenuAction.action.Disable();
         openMenuAction.action.performed -= ToggleMenu;
         InputSystem.onDeviceChange -= OnDeviceChange;
-        Floor1Button.onClick.RemoveListener(DisplayFloor1);
+        Floor1Button.GetComponent<Button>().onClick.RemoveListener(DisplayFloor1);
-        Floor2Button.onClick.RemoveListener(DisplayFloor2);
+        Floor2Button.GetComponent<Button>().onClick.RemoveListener(DisplayFloor2);
     }
 }

Assets/_PROJECT/Components/NewHandPresence/Prefabs/Teleport Button.prefab

@@ -97,7 +97,7 @@ MonoBehaviour:
     m_SelectOnDown: {fileID: 0}
     m_SelectOnLeft: {fileID: 0}
     m_SelectOnRight: {fileID: 0}
-  m_Transition: 1
+  m_Transition: 2
   m_Colors:
     m_NormalColor: {r: 1, g: 1, b: 1, a: 0.78431374}
     m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
@@ -136,6 +136,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   NormalSprite: {fileID: 0}
   HoverSprite: {fileID: 0}
-  TeleportCoordinates: {fileID: 0}
+  TargetName: 
   LeftXRInteractor: {fileID: 0}
   RightXRInteractor: {fileID: 0}
+  Player: {fileID: 0}

Assets/_PROJECT/Components/NewHandPresence/Prefabs/XR Origin.prefab

@@ -12,7 +12,7 @@ GameObject:
   - component: {fileID: 1865875317547819479}
   - component: {fileID: 7554133574101087666}
   m_Layer: 5
-  m_Name: PlayerIcon
+  m_Name: Player Icon Circle
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -26,17 +26,18 @@ RectTransform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 293094293084247706}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalPosition: {x: 0, y: 0, z: -0.00003311369}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 1
-  m_Children: []
+  m_Children:
-  m_Father: {fileID: 2286496909341254318}
+  - {fileID: 9121855117153263295}
+  m_Father: {fileID: 5949257944611421401}
   m_RootOrder: -1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 44.7, y: 193.1}
-  m_SizeDelta: {x: 42, y: 56}
+  m_SizeDelta: {x: 23.7, y: 23.7}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1865875317547819479
 CanvasRenderer:
@@ -66,7 +67,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 6b8ab27b55ad74b4486c0b0796a8b71a, type: 3}
+  m_Sprite: {fileID: 21300000, guid: b3d75537053a96f4299df3da167c81e2, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -104,7 +105,7 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 376943209297833013}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: 0.30070576, y: 0, z: 0, w: 0.953717}
   m_LocalPosition: {x: 0, y: 0, z: 0.477}
   m_LocalScale: {x: 0.006, y: 0.006, z: 0.006}
   m_ConstrainProportionsScale: 1
@@ -115,7 +116,7 @@ RectTransform:
   - {fileID: 4447651966996774730}
   m_Father: {fileID: 6069118670574361160}
   m_RootOrder: -1
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_LocalEulerAnglesHint: {x: 35, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: -0.476}
@@ -217,18 +218,15 @@ MonoBehaviour:
   MenuRotator: {fileID: 3157981483957254299}
   Floor1Panel: {fileID: 6183141652583042830}
   Floor2Panel: {fileID: 1266300925333121652}
-  Floor1Button: {fileID: 197382758204393945}
+  Floor1Button: {fileID: 8407657931267471577}
-  Floor2Button: {fileID: 1448037452301758654}
+  Floor2Button: {fileID: 3056892156696718464}
   Camera: {fileID: 4084005301371912866}
-  Playericon: {fileID: 7554133574101087666}
+  PlayericonFloor1: {fileID: 7099915174830070238}
+  PlayericonFloor2: {fileID: 7554133574101087666}
+  PlayericonFloor1Parent: {fileID: 8144600077522330704}
+  PlayericonFloor2Parent: {fileID: 3922359959326010239}
   openMenuAction: {fileID: 2462937694456473221, guid: c348712bda248c246b8c49b3db54643f,
     type: 3}
-  rotatedPlayerPos: {x: 0, y: 0}
-  worldToMapAngle: 130
-  VR_P1: {x: -77.4, y: 10.1}
-  VR_P2: {x: 95.7, y: -82.8}
-  IMG_P1: {x: -387.2, y: 193.1}
-  IMG_P2: {x: 389.7, y: -221.4}
 --- !u!1 &916340287994646858
 GameObject:
   m_ObjectHideFlags: 0
@@ -241,6 +239,7 @@ GameObject:
   - component: {fileID: 2260340697406480061}
   - component: {fileID: 4126484334133781733}
   - component: {fileID: 7229210520247497862}
+  - component: {fileID: 4682670891357688467}
   m_Layer: 0
   m_Name: XR Origin
   m_TagString: Player
@@ -324,6 +323,23 @@ CharacterController:
   m_SkinWidth: 0.08
   m_MinMoveDistance: 0.001
   m_Center: {x: 0, y: 1, z: 0}
+--- !u!114 &4682670891357688467
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 916340287994646858}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 10d4b92fb83665e409f8d654c0a3295c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  buttons:
+  - {fileID: 6985164072915422491}
+  - {fileID: 5861557227681292572}
+  - {fileID: 8032053745934150659}
+  - {fileID: 1557304905219974776}
 --- !u!1 &1266300925333121652
 GameObject:
   m_ObjectHideFlags: 0
@@ -357,7 +373,7 @@ RectTransform:
   - {fileID: 3390741014404965967}
   - {fileID: 1234458613257710416}
   - {fileID: 7767182468573667627}
-  - {fileID: 7671159951557272092}
+  - {fileID: 5949257944611421401}
   m_Father: {fileID: 8926252137617804769}
   m_RootOrder: -1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -917,20 +933,21 @@ MonoBehaviour:
     m_SelectOnDown: {fileID: 0}
     m_SelectOnLeft: {fileID: 0}
     m_SelectOnRight: {fileID: 0}
-  m_Transition: 1
+  m_Transition: 2
   m_Colors:
     m_NormalColor: {r: 1, g: 1, b: 1, a: 0.78431374}
     m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
-    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.78431374}
-    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 0.78431374}
     m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
     m_ColorMultiplier: 1
     m_FadeDuration: 0.1
   m_SpriteState:
-    m_HighlightedSprite: {fileID: 0}
+    m_HighlightedSprite: {fileID: 21300000, guid: a326fec7863120242883585a6e834883,
-    m_PressedSprite: {fileID: 0}
+      type: 3}
-    m_SelectedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 21300000, guid: 28748e86c9a1f0c4694006461434eca7, type: 3}
-    m_DisabledSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 21300000, guid: a326fec7863120242883585a6e834883, type: 3}
+    m_DisabledSprite: {fileID: 21300000, guid: 28748e86c9a1f0c4694006461434eca7, type: 3}
   m_AnimationTriggers:
     m_NormalTrigger: Normal
     m_HighlightedTrigger: Highlighted
@@ -956,8 +973,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   InactiveSprite: {fileID: 21300000, guid: 28748e86c9a1f0c4694006461434eca7, type: 3}
   ActiveSprite: {fileID: 21300000, guid: a84b9455a04a3ca459595ecb5810fb98, type: 3}
-  FloorUpperCoordiantes: 9
+  ActiveState: 1
-  FloorLowerCoordiantes: 2.5
 --- !u!1 &3157981483957254299
 GameObject:
   m_ObjectHideFlags: 0
@@ -990,6 +1006,119 @@ Transform:
   m_Father: {fileID: 3709686872142068626}
   m_RootOrder: -1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &3922359959326010239
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5949257944611421401}
+  m_Layer: 5
+  m_Name: Player Icon Floor 2
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5949257944611421401
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3922359959326010239}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 7671159951557272092}
+  m_Father: {fileID: 2286496909341254318}
+  m_RootOrder: -1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 100, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!1 &4114709347790140545
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 9121855117153263295}
+  - component: {fileID: 6061136478837893949}
+  - component: {fileID: 6930821247591090600}
+  m_Layer: 5
+  m_Name: Player Icon Cone
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &9121855117153263295
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4114709347790140545}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0.000016556845}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 7671159951557272092}
+  m_RootOrder: -1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: -19.999985}
+  m_SizeDelta: {x: 41.6, y: 45.3}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &6061136478837893949
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4114709347790140545}
+  m_CullTransparentMesh: 1
+--- !u!114 &6930821247591090600
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4114709347790140545}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: 93f5777f7ea9ea848b00266cb1468b7d, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
 --- !u!1 &4710558926844447380
 GameObject:
   m_ObjectHideFlags: 0
@@ -1503,20 +1632,21 @@ MonoBehaviour:
     m_SelectOnDown: {fileID: 0}
     m_SelectOnLeft: {fileID: 0}
     m_SelectOnRight: {fileID: 0}
-  m_Transition: 1
+  m_Transition: 2
   m_Colors:
     m_NormalColor: {r: 1, g: 1, b: 1, a: 0.78431374}
     m_HighlightedColor: {r: 0.9811321, g: 0.9811321, b: 0.9811321, a: 1}
-    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.78431374}
-    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 0.78431374}
     m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
     m_ColorMultiplier: 1
     m_FadeDuration: 0.1
   m_SpriteState:
-    m_HighlightedSprite: {fileID: 0}
+    m_HighlightedSprite: {fileID: 21300000, guid: 02c3320f89a8e02449c205468d013fe9,
-    m_PressedSprite: {fileID: 0}
+      type: 3}
-    m_SelectedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 21300000, guid: 9b9161f51c7cdb84eba98c454b3f542c, type: 3}
-    m_DisabledSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 21300000, guid: 02c3320f89a8e02449c205468d013fe9, type: 3}
+    m_DisabledSprite: {fileID: 21300000, guid: 9b9161f51c7cdb84eba98c454b3f542c, type: 3}
   m_AnimationTriggers:
     m_NormalTrigger: Normal
     m_HighlightedTrigger: Highlighted
@@ -1542,8 +1672,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   InactiveSprite: {fileID: 21300000, guid: 9b9161f51c7cdb84eba98c454b3f542c, type: 3}
   ActiveSprite: {fileID: 21300000, guid: 594b1f27343305e4e99551b5fb8a1b76, type: 3}
-  FloorUpperCoordiantes: 2.5
+  ActiveState: 0
-  FloorLowerCoordiantes: -5
 --- !u!1 &5421964159393926360
 GameObject:
   m_ObjectHideFlags: 0
@@ -2493,6 +2622,7 @@ RectTransform:
   m_ConstrainProportionsScale: 1
   m_Children:
   - {fileID: 2208578517960247880}
+  - {fileID: 3557555899079469361}
   m_Father: {fileID: 8926252137617804769}
   m_RootOrder: -1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -2823,6 +2953,196 @@ Transform:
   m_Father: {fileID: 3709686872142068626}
   m_RootOrder: -1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &7603441950071117850
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 337797409301469750}
+  - component: {fileID: 8425332141923522174}
+  - component: {fileID: 2196501470157181984}
+  m_Layer: 5
+  m_Name: Player Icon Cone
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &337797409301469750
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7603441950071117850}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 6366066205184113352}
+  m_RootOrder: -1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: -20}
+  m_SizeDelta: {x: 41.6, y: 45.3}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8425332141923522174
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7603441950071117850}
+  m_CullTransparentMesh: 1
+--- !u!114 &2196501470157181984
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7603441950071117850}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: 93f5777f7ea9ea848b00266cb1468b7d, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!1 &8144600077522330704
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3557555899079469361}
+  m_Layer: 5
+  m_Name: Player Icon Floor 1
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &3557555899079469361
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8144600077522330704}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 6366066205184113352}
+  m_Father: {fileID: 3763610396705951423}
+  m_RootOrder: -1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 100, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!1 &8471228528169707056
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6366066205184113352}
+  - component: {fileID: 1391916596120446200}
+  - component: {fileID: 7099915174830070238}
+  m_Layer: 5
+  m_Name: Player Icon Circle
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6366066205184113352
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8471228528169707056}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: -0.00003311369}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 1
+  m_Children:
+  - {fileID: 337797409301469750}
+  m_Father: {fileID: 3557555899079469361}
+  m_RootOrder: -1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 44.7, y: 193.10002}
+  m_SizeDelta: {x: 23.7, y: 23.7}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1391916596120446200
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8471228528169707056}
+  m_CullTransparentMesh: 1
+--- !u!114 &7099915174830070238
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8471228528169707056}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: b3d75537053a96f4299df3da167c81e2, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
 --- !u!1001 &1900123415858056044
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -2836,11 +3156,50 @@ PrefabInstance:
       propertyPath: m_TargetGraphic
       value: 
       objectReference: {fileID: 8003636106045926841}
+    - target: {fileID: 2420913116824796466, guid: f2ade1e8dce12be43ab14956a6244406,
+        type: 3}
+      propertyPath: m_Colors.m_PressedColor.a
+      value: 0.78431374
+      objectReference: {fileID: 0}
     - target: {fileID: 2420913116824796466, guid: f2ade1e8dce12be43ab14956a6244406,
         type: 3}
       propertyPath: m_Colors.m_DisabledColor.a
       value: 0.78431374
       objectReference: {fileID: 0}
+    - target: {fileID: 2420913116824796466, guid: f2ade1e8dce12be43ab14956a6244406,
+        type: 3}
+      propertyPath: m_Colors.m_SelectedColor.a
+      value: 0.78431374
+      objectReference: {fileID: 0}
+    - target: {fileID: 2420913116824796466, guid: f2ade1e8dce12be43ab14956a6244406,
+        type: 3}
+      propertyPath: m_Colors.m_HighlightedColor.a
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2420913116824796466, guid: f2ade1e8dce12be43ab14956a6244406,
+        type: 3}
+      propertyPath: m_SpriteState.m_PressedSprite
+      value: 
+      objectReference: {fileID: 21300000, guid: 221f87ac18875804182161153998fb9f,
+        type: 3}
+    - target: {fileID: 2420913116824796466, guid: f2ade1e8dce12be43ab14956a6244406,
+        type: 3}
+      propertyPath: m_SpriteState.m_DisabledSprite
+      value: 
+      objectReference: {fileID: 21300000, guid: 221f87ac18875804182161153998fb9f,
+        type: 3}
+    - target: {fileID: 2420913116824796466, guid: f2ade1e8dce12be43ab14956a6244406,
+        type: 3}
+      propertyPath: m_SpriteState.m_SelectedSprite
+      value: 
+      objectReference: {fileID: 21300000, guid: 50a077641946fcb48b05e51ec4936afc,
+        type: 3}
+    - target: {fileID: 2420913116824796466, guid: f2ade1e8dce12be43ab14956a6244406,
+        type: 3}
+      propertyPath: m_SpriteState.m_HighlightedSprite
+      value: 
+      objectReference: {fileID: 21300000, guid: 50a077641946fcb48b05e51ec4936afc,
+        type: 3}
     - target: {fileID: 3841795681097067811, guid: f2ade1e8dce12be43ab14956a6244406,
         type: 3}
       propertyPath: m_Pivot.x
@@ -3015,6 +3374,18 @@ RectTransform:
     type: 3}
   m_PrefabInstance: {fileID: 1900123415858056044}
   m_PrefabAsset: {fileID: 0}
+--- !u!114 &5861557227681292572 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 5406280067121556080, guid: f2ade1e8dce12be43ab14956a6244406,
+    type: 3}
+  m_PrefabInstance: {fileID: 1900123415858056044}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 7a0fe998040c9bb4a9e7a67b111a2a1f, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!114 &8003636106045926841 stripped
 MonoBehaviour:
   m_CorrespondingSourceObject: {fileID: 8452192790917719765, guid: f2ade1e8dce12be43ab14956a6244406,
@@ -3045,6 +3416,40 @@ PrefabInstance:
       propertyPath: m_TargetGraphic
       value: 
       objectReference: {fileID: 5853933838417961126}
+    - target: {fileID: 2420913116824796466, guid: f2ade1e8dce12be43ab14956a6244406,
+        type: 3}
+      propertyPath: m_Colors.m_PressedColor.a
+      value: 0.78431374
+      objectReference: {fileID: 0}
+    - target: {fileID: 2420913116824796466, guid: f2ade1e8dce12be43ab14956a6244406,
+        type: 3}
+      propertyPath: m_Colors.m_SelectedColor.a
+      value: 0.78431374
+      objectReference: {fileID: 0}
+    - target: {fileID: 2420913116824796466, guid: f2ade1e8dce12be43ab14956a6244406,
+        type: 3}
+      propertyPath: m_SpriteState.m_PressedSprite
+      value: 
+      objectReference: {fileID: 21300000, guid: 99dc98e1d0f075c479d030725ab58951,
+        type: 3}
+    - target: {fileID: 2420913116824796466, guid: f2ade1e8dce12be43ab14956a6244406,
+        type: 3}
+      propertyPath: m_SpriteState.m_DisabledSprite
+      value: 
+      objectReference: {fileID: 21300000, guid: 99dc98e1d0f075c479d030725ab58951,
+        type: 3}
+    - target: {fileID: 2420913116824796466, guid: f2ade1e8dce12be43ab14956a6244406,
+        type: 3}
+      propertyPath: m_SpriteState.m_SelectedSprite
+      value: 
+      objectReference: {fileID: 21300000, guid: 3a0164307b0fe584998139896e61c306,
+        type: 3}
+    - target: {fileID: 2420913116824796466, guid: f2ade1e8dce12be43ab14956a6244406,
+        type: 3}
+      propertyPath: m_SpriteState.m_HighlightedSprite
+      value: 
+      objectReference: {fileID: 21300000, guid: 3a0164307b0fe584998139896e61c306,
+        type: 3}
     - target: {fileID: 3841795681097067811, guid: f2ade1e8dce12be43ab14956a6244406,
         type: 3}
       propertyPath: m_Pivot.x
@@ -3231,6 +3636,18 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+--- !u!114 &8032053745934150659 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 5406280067121556080, guid: f2ade1e8dce12be43ab14956a6244406,
+    type: 3}
+  m_PrefabInstance: {fileID: 2625986986486138483}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 7a0fe998040c9bb4a9e7a67b111a2a1f, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1001 &3167929003025622891
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -3244,6 +3661,45 @@ PrefabInstance:
       propertyPath: m_TargetGraphic
       value: 
       objectReference: {fileID: 6825915704898437566}
+    - target: {fileID: 2420913116824796466, guid: f2ade1e8dce12be43ab14956a6244406,
+        type: 3}
+      propertyPath: m_Colors.m_PressedColor.a
+      value: 0.78431374
+      objectReference: {fileID: 0}
+    - target: {fileID: 2420913116824796466, guid: f2ade1e8dce12be43ab14956a6244406,
+        type: 3}
+      propertyPath: m_Colors.m_DisabledColor.a
+      value: 0.78431374
+      objectReference: {fileID: 0}
+    - target: {fileID: 2420913116824796466, guid: f2ade1e8dce12be43ab14956a6244406,
+        type: 3}
+      propertyPath: m_Colors.m_SelectedColor.a
+      value: 0.78431374
+      objectReference: {fileID: 0}
+    - target: {fileID: 2420913116824796466, guid: f2ade1e8dce12be43ab14956a6244406,
+        type: 3}
+      propertyPath: m_SpriteState.m_PressedSprite
+      value: 
+      objectReference: {fileID: 21300000, guid: ca322b23f07a3394bbc8602a7b5df553,
+        type: 3}
+    - target: {fileID: 2420913116824796466, guid: f2ade1e8dce12be43ab14956a6244406,
+        type: 3}
+      propertyPath: m_SpriteState.m_DisabledSprite
+      value: 
+      objectReference: {fileID: 21300000, guid: ca322b23f07a3394bbc8602a7b5df553,
+        type: 3}
+    - target: {fileID: 2420913116824796466, guid: f2ade1e8dce12be43ab14956a6244406,
+        type: 3}
+      propertyPath: m_SpriteState.m_SelectedSprite
+      value: 
+      objectReference: {fileID: 21300000, guid: 2b4ef46078797d040b0c1cfa06680f13,
+        type: 3}
+    - target: {fileID: 2420913116824796466, guid: f2ade1e8dce12be43ab14956a6244406,
+        type: 3}
+      propertyPath: m_SpriteState.m_HighlightedSprite
+      value: 
+      objectReference: {fileID: 21300000, guid: 2b4ef46078797d040b0c1cfa06680f13,
+        type: 3}
     - target: {fileID: 3841795681097067811, guid: f2ade1e8dce12be43ab14956a6244406,
         type: 3}
       propertyPath: m_Pivot.x
@@ -3430,6 +3886,18 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+--- !u!114 &6985164072915422491 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 5406280067121556080, guid: f2ade1e8dce12be43ab14956a6244406,
+    type: 3}
+  m_PrefabInstance: {fileID: 3167929003025622891}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 7a0fe998040c9bb4a9e7a67b111a2a1f, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1001 &4739271935568907160
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -3542,11 +4010,50 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 2286496909341254318}
     m_Modifications:
+    - target: {fileID: 2420913116824796466, guid: f2ade1e8dce12be43ab14956a6244406,
+        type: 3}
+      propertyPath: m_Transition
+      value: 2
+      objectReference: {fileID: 0}
     - target: {fileID: 2420913116824796466, guid: f2ade1e8dce12be43ab14956a6244406,
         type: 3}
       propertyPath: m_TargetGraphic
       value: 
       objectReference: {fileID: 3158825521900858077}
+    - target: {fileID: 2420913116824796466, guid: f2ade1e8dce12be43ab14956a6244406,
+        type: 3}
+      propertyPath: m_Colors.m_PressedColor.a
+      value: 0.78431374
+      objectReference: {fileID: 0}
+    - target: {fileID: 2420913116824796466, guid: f2ade1e8dce12be43ab14956a6244406,
+        type: 3}
+      propertyPath: m_Colors.m_SelectedColor.a
+      value: 0.78431374
+      objectReference: {fileID: 0}
+    - target: {fileID: 2420913116824796466, guid: f2ade1e8dce12be43ab14956a6244406,
+        type: 3}
+      propertyPath: m_SpriteState.m_PressedSprite
+      value: 
+      objectReference: {fileID: 21300000, guid: 44f5d863b7c29dc4fb366a6eeabff058,
+        type: 3}
+    - target: {fileID: 2420913116824796466, guid: f2ade1e8dce12be43ab14956a6244406,
+        type: 3}
+      propertyPath: m_SpriteState.m_DisabledSprite
+      value: 
+      objectReference: {fileID: 21300000, guid: 44f5d863b7c29dc4fb366a6eeabff058,
+        type: 3}
+    - target: {fileID: 2420913116824796466, guid: f2ade1e8dce12be43ab14956a6244406,
+        type: 3}
+      propertyPath: m_SpriteState.m_SelectedSprite
+      value: 
+      objectReference: {fileID: 21300000, guid: e072c60d8e142fe4e80e4c525141c7fb,
+        type: 3}
+    - target: {fileID: 2420913116824796466, guid: f2ade1e8dce12be43ab14956a6244406,
+        type: 3}
+      propertyPath: m_SpriteState.m_HighlightedSprite
+      value: 
+      objectReference: {fileID: 21300000, guid: e072c60d8e142fe4e80e4c525141c7fb,
+        type: 3}
     - target: {fileID: 3841795681097067811, guid: f2ade1e8dce12be43ab14956a6244406,
         type: 3}
       propertyPath: m_Pivot.x
@@ -3645,7 +4152,7 @@ PrefabInstance:
     - target: {fileID: 3841795681097067811, guid: f2ade1e8dce12be43ab14956a6244406,
         type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: -47
+      value: -34.2
       objectReference: {fileID: 0}
     - target: {fileID: 3841795681097067811, guid: f2ade1e8dce12be43ab14956a6244406,
         type: 3}
@@ -3715,6 +4222,18 @@ PrefabInstance:
     m_AddedGameObjects: []
     m_AddedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: f2ade1e8dce12be43ab14956a6244406, type: 3}
+--- !u!114 &1557304905219974776 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 5406280067121556080, guid: f2ade1e8dce12be43ab14956a6244406,
+    type: 3}
+  m_PrefabInstance: {fileID: 6816866112812223496}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 7a0fe998040c9bb4a9e7a67b111a2a1f, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!114 &3158825521900858077 stripped
 MonoBehaviour:
   m_CorrespondingSourceObject: {fileID: 8452192790917719765, guid: f2ade1e8dce12be43ab14956a6244406,