more UI updates

My project/Assets/App/Core/AppUtils.cs

+public static class AppUtils
+{
+    public static string RankToArabic(string rank)
+    {
+        return rank switch
+        {
+            "Normal" => "مبتدأ",
+            "Geek" => "هاوي",
+            "Master" => "محترف",
+            "Olympian" => "اسطوري",
+            _ => rank
+        };
+    }
+}

My project/Assets/App/Core/AppUtils.cs.meta

+fileFormatVersion: 2
+guid: 8a686f3114df1e14c96efa43bc5a360f
\ No newline at end of file

My project/Assets/App/Infrastructure/Activity/ActivityService.cs

@@ -51,6 +51,26 @@ public class ActivityService : Singleton<ActivityService>
         }
     }
 
+    public async UniTask LoadLatest5Activies()
+    {
+        try
+        {
+            var activities = await supabase.From<Activity>()
+                .Order("created_at", Supabase.Postgrest.Constants.Ordering.Descending)
+                .Limit(5)
+                .Get();
+
+            foreach (var activity in activities.Models)
+            {
+                OnNewActivityReceived?.Invoke(activity);
+            }
+        }
+        catch (Exception e)
+        {
+            Debug.LogError($"[ActivityService] Error loading activities: {e.Message}");
+        }
+    }
+
     public void Dispose()
     {
         _channel?.Unsubscribe();

My project/Assets/App/Infrastructure/Auth/SupabaseAuthentication.cs

 using System;
 using Cysharp.Threading.Tasks;
 using OneOf;
-using Supabase.Gotrue;
 using Supabase.Gotrue.Exceptions;
 using UnityEngine;
 
 public class SupabaseAuthentication : MonoBehaviour
 {
-    [SerializeField] private SupabaseManager supabaseManager;
+    private SupabaseManager supabaseManager;
 
     public static SupabaseAuthentication Instance { private set; get; }
 
@@ -16,6 +15,7 @@ public class SupabaseAuthentication : MonoBehaviour
     void Awake()
     {
         Instance = this;
+        supabaseManager = SupabaseManager.Instance;
     }
 
     public async UniTask<OneOf<Success, string>> LogIn(string username, string password)
@@ -42,13 +42,13 @@ public class SupabaseAuthentication : MonoBehaviour
 
     }
 
-    public async UniTask<OneOf<Success, string>> SignUp(string email, string password, string displayName)
+    public async UniTask<OneOf<Success, string>> SignUp(string email, string password, string displayName, string fullName)
     {
         try
         {
             IsLoading = true;
             await supabaseManager.Supabase()!.Auth.SignUp(email, password);
-            var userProfile = await UserService.Instance.CreateUserProfile(displayName);
+            var userProfile = await UserService.Instance.CreateUserProfile(displayName, fullName, email);
             userProfile.Switch((_) => { }, (error) =>
             {
                 Debug.LogError(error);

My project/Assets/App/Infrastructure/User/UserService.cs

@@ -35,6 +35,8 @@ public class UserService : Singleton<UserService>
 
     public async UniTask<OneOf<UserResult, ErrorResult>> CreateUserProfile(
         string displayName,
+        string fullname,
+        string email,
         string? avatarUrl = null)
     {
         try
@@ -43,6 +45,8 @@ public class UserService : Singleton<UserService>
             {
                 DisplayName = displayName,
                 AvatarUrl = avatarUrl,
+                FullName = fullname,
+                Email = email,
                 Rank = "normal",
                 Points = 0,
                 CreatedAt = DateTime.UtcNow,

My project/Assets/App/Models/UserModel.cs

@@ -2,7 +2,6 @@ using System;
 using Supabase.Postgrest.Attributes;
 using Supabase.Postgrest.Models;
 
-using System.Text.Json.Serialization;
 using Newtonsoft.Json;
 
 
@@ -17,6 +16,14 @@ public class User : BaseModel
     [JsonProperty("display_name")]
     public string DisplayName { get; set; }
 
+    [Column("full_name")]
+    [JsonProperty("full_name")]
+    public string FullName { get; set; }
+
+    [Column("email")]
+    [JsonProperty("email")]
+    public string Email { get; set; }
+
     [Column("avatar_url")]
     [JsonProperty("avatar_url")]
     public string? AvatarUrl { get; set; }
@@ -37,3 +44,4 @@ public class User : BaseModel
     [JsonProperty("updated_at")]
     public DateTime UpdatedAt { get; set; }
 }
+

My project/Assets/App/Testing/SupabaseTester.cs

@@ -11,12 +11,6 @@ public class SupabaseTester : MonoBehaviour
         supabaseAuthentication.LogIn("test@gmail.com", "test098");
     }
 
-    [ContextMenu("Sign Up")]
-    public void SignUp()
-    {
-        supabaseAuthentication.SignUp("hello@gmail.com", "test098", "p0wer");
-    }
-
     [ContextMenu("Finish Game")]
     public void FinishGame()
     {

My project/Assets/App/UI/CreateAcountUI.cs

@@ -43,11 +43,11 @@ public class CreateAcountUI : MonoBehaviour
         string password = passwordInputField.text;
         print(email);
         print(password);
-        var SignUp = await SupabaseAuthentication.Instance.SignUp(email, password, displayName);
-        SignUp.Switch(
-          (_) => { },
-          (string error) => { messageText.text = error; }
-          );
+        // var SignUp = await SupabaseAuthentication.Instance.SignUp(email, password, displayName);
+        // SignUp.Switch(
+        //   (_) => { },
+        //   (string error) => { messageText.text = error; }
+        //   );
     }
     public void Show()
     {

My project/Assets/App/UI/HomeController.cs

 using System.Linq;
+using Cysharp.Threading.Tasks;
+using DG.Tweening;
 using UnityEngine;
 using UnityEngine.UIElements;
 
@@ -10,28 +12,63 @@ public class HomeController : MonoBehaviour
     private Label xp;
     private Label rank;
 
+    private Label nameMenuPanel;
+    private Label xpMenuPanel;
+    private Label rankMenuPanel;
+
     private CustomProgressBar xpProgressBar;
     private ScrollView activityScrollView;
 
+    private Button logoutButton;
+
+    private VisualElement menuPanel;
+
     void Awake()
     {
         var root = mainMenuDocument.rootVisualElement.Q("Home");
+        menuPanel = mainMenuDocument.rootVisualElement.Q("MenuPanel");
+
         name = root.Q<Label>("Name");
         rank = root.Q<Label>("Rank");
         xp = root.Q<Label>("Xp");
 
+        nameMenuPanel = menuPanel.Q<Label>("Name");
+        rankMenuPanel = menuPanel.Q<Label>("Rank");
+        xpMenuPanel = menuPanel.Q<Label>("Xp");
+
+        logoutButton = mainMenuDocument.rootVisualElement.Q<Button>("Logout");
         xpProgressBar = root.Q<CustomProgressBar>("ProgressBar");
         activityScrollView = mainMenuDocument.rootVisualElement.Q("LiveBar").Children().First() as ScrollView;
 
+        logoutButton.clicked += () =>
+        {
+            SupabaseAuthentication.Instance.LogOut();
+        };
+
         UserService.Instance.OnUserChange += OnUserChange;
         ActivityService.Instance.OnNewActivityReceived += OnNewActivityReceived;
     }
 
     private async void Start()
     {
-        UserService.Instance.LoadCurrentUser();
+        OnUserChange(UserService.Instance.CurrentUser);
         ActivityService.Instance.Initialize();
+        ActivityService.Instance.LoadLatest5Activies();
+
+        FakeActivity();
+    }
+
+    public async UniTask FakeActivity()
+    {
+        while (true)
+        {
+            await UniTask.Delay(2000);
+            var ran = Random.Range(0, 100);
+
+            OnNewActivityReceived(new Activity { Message = $"لقد حصلت على {ran} نقطة خبرة!" });
+        }
     }
+
     public void show()
     {
         gameObject.SetActive(true);
@@ -46,14 +83,22 @@ public class HomeController : MonoBehaviour
     {
         name.text = user.DisplayName;
         xp.text = user.Points.ToString();
-        rank.text = user.Rank.ToString();
+        rank.text = AppUtils.RankToArabic(user.Rank);
+
+        nameMenuPanel.text = user.DisplayName;
+        xpMenuPanel.text = user.Points.ToString();
+        rankMenuPanel.text = AppUtils.RankToArabic(user.Rank);
 
         xpProgressBar.Value = user.Points / 5000f;
     }
 
     private void OnNewActivityReceived(Activity activity)
     {
-        var entry = new Label($"{activity.Message}");
-        activityScrollView.Add(entry);
+        var name = activity.Message.Split(" ")[0];
+        var label = new Label($"<color=#FED700>{name}</color> {activity.Message[name.Length..]}");
+
+        var oldHighvalue = activityScrollView.horizontalScroller.highValue;
+        activityScrollView.Add(label);
+
     }
 }

My project/Assets/App/UI/LeaderboardController.cs

@@ -29,12 +29,16 @@ public class LeaderboardController : MonoBehaviour
         result.Switch(
             (List<LeaderboardPlayerModel> players) =>
             {
-                foreach (var player in players)
+                for (int i = 0; i < players.Count; i++)
                 {
+                    if (i < 3)
+                        ApplyTopThree(i, players[i]);
+
+                    var player = players[i];
                     var entry = new CustomLeaderboardSlot
                     {
                         PlayerName = player.DisplayName,
-                        Rank = player.Rank,
+                        Rank = AppUtils.RankToArabic(player.Rank),
                         XP = player.Points.ToString(),
                         Index = player.Position.ToString(),
                         IsOwner = player.Id == UserService.Instance.CurrentUser?.Id
@@ -50,4 +54,35 @@ public class LeaderboardController : MonoBehaviour
             }
         );
     }
+
+    private void ApplyTopThree(int index, LeaderboardPlayerModel player)
+    {
+        var root = leaderboardDocument.rootVisualElement;
+
+        Label name;
+        Label xp;
+
+        switch (index)
+        {
+            case 0:
+                name = root.Q<Label>("FirstName");
+                xp = root.Q<Label>("FirstXp");
+                break;
+            case 1:
+                name = root.Q<Label>("SecondName");
+                xp = root.Q<Label>("SecondXp");
+                break;
+            case 2:
+                name = root.Q<Label>("ThirdName");
+                xp = root.Q<Label>("ThirdXp");
+                break;
+            default:
+                return;
+        }
+
+        name.text = player.DisplayName;
+        xp.text = player.Points.ToString();
+    }
 }
+
+

My project/Assets/App/UI/LoginController.cs

 using UnityEngine;
-using UnityEngine.SceneManagement;
 using UnityEngine.UIElements;
 
 public class LoginController : MonoBehaviour
 {
     [SerializeField] private UIDocument uIDocument;
-    [SerializeField] private TextField emailInputField;
-    [SerializeField] private TextField passwordInputField;
-    [SerializeField] private Button loginButton;
+    private TextField emailInputField;
+    private TextField passwordInputField;
+    private Button loginButton;
+
+    private VisualElement loginRoot;
+    private VisualElement registerRoot;
 
     private void OnEnable()
     {
-        var root = uIDocument.rootVisualElement;
-        emailInputField = root.Q<TextField>("LoginEmail");
-        passwordInputField = root.Q<TextField>("LoginPassword");
-        loginButton = root.Q<Button>("Login");
+        loginRoot = uIDocument.rootVisualElement.Q("ContantPanel");
+        registerRoot = uIDocument.rootVisualElement.Q("RegisterPanel");
+
+        emailInputField = loginRoot.Q<TextField>("LoginEmail");
+        passwordInputField = loginRoot.Q<TextField>("LoginPassword");
+        loginButton = loginRoot.Q<Button>("Login");
 
         loginButton.clicked += Login;
     }
@@ -37,10 +41,6 @@ public class LoginController : MonoBehaviour
 
     }
 
-    public void LoadMainMenu()
-    {
-        SceneManager.LoadScene("MainMenu");
-    }
 
     public void Show()
     {

My project/Assets/App/UI/ProfileController.cs

@@ -21,12 +21,13 @@ public class ProfileController : MonoBehaviour
         xpProgressBar = root.Q<CustomProgressBar>("ProgressBar");
 
         UserService.Instance.OnUserChange += OnUserChange;
+        OnUserChange(UserService.Instance.CurrentUser);
     }
 
     private void OnUserChange(User user)
     {
         name.text = user.DisplayName;
-        rank.text = user.Rank;
+        rank.text = AppUtils.RankToArabic(user.Rank);
         xp.text = user.Points.ToString();
 
         xpProgressBar.Value = user.Points / 5000f;

My project/Assets/App/UI/SceneSwitcherHelpers.cs

+using UnityEngine;
+using UnityEngine.SceneManagement;
+
+public class SceneSwitcherHelpers : MonoBehaviour
+{
+    public void LoadMainMenu()
+    {
+        LoadMainMenuAsync();
+    }
+
+    public async void LoadMainMenuAsync()
+    {
+        await UserService.Instance.LoadCurrentUser();
+        SceneManager.LoadScene("MainMenu");
+    }
+
+    public void LoadLogin()
+    {
+        SceneManager.LoadScene("Login");
+    }
+}

My project/Assets/App/UI/SceneSwitcherHelpers.cs.meta

+fileFormatVersion: 2
+guid: e8c8bd5f339c3203d84f2c7279a64eb0
\ No newline at end of file

My project/Assets/AppUI/Scenes/Login.unity

@@ -129,6 +129,7 @@ GameObject:
   m_Component:
   - component: {fileID: 232732870}
   - component: {fileID: 232732869}
+  - component: {fileID: 232732871}
   m_Layer: 0
   m_Name: SupabaseListener
   m_TagString: Untagged
@@ -152,8 +153,8 @@ MonoBehaviour:
   LoggedIn:
     m_PersistentCalls:
       m_Calls:
-      - m_Target: {fileID: 1746642442}
-        m_TargetAssemblyTypeName: LoginController, Assembly-CSharp
+      - m_Target: {fileID: 232732871}
+        m_TargetAssemblyTypeName: SceneSwitcherHelpers, Assembly-CSharp
         m_MethodName: LoadMainMenu
         m_Mode: 1
         m_Arguments:
@@ -166,7 +167,19 @@ MonoBehaviour:
         m_CallState: 2
   LoggedOut:
     m_PersistentCalls:
-      m_Calls: []
+      m_Calls:
+      - m_Target: {fileID: 232732871}
+        m_TargetAssemblyTypeName: SceneSwitcherHelpers, Assembly-CSharp
+        m_MethodName: LoadLogin
+        m_Mode: 1
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
 --- !u!4 &232732870
 Transform:
   m_ObjectHideFlags: 0
@@ -182,6 +195,18 @@ Transform:
   m_Children: []
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &232732871
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 232732868}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e8c8bd5f339c3203d84f2c7279a64eb0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: Assembly-CSharp::SceneSwitcherHelpers
 --- !u!1 &414692743
 GameObject:
   m_ObjectHideFlags: 0
@@ -429,7 +454,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 740bc2dc1ba97be68adb58313f40de23, type: 3}
   m_Name: 
   m_EditorClassIdentifier: Assembly-CSharp::SupabaseAuthentication
-  supabaseManager: {fileID: 689087718}
 --- !u!1 &1707671416
 GameObject:
   m_ObjectHideFlags: 0

My project/Assets/AppUI/UIToolkit/USS/Style.uss

@@ -317,9 +317,9 @@
     -unity-font-definition: url("project://database/Assets/ALArcade/Hakwaty%20Font/TS%20Hakwaty%20Bold.otf?fileID=12800000&guid=3fd066470b6b5214a844c6c22bfaa0a4&type=3#TS Hakwaty Bold");
     font-size: 19px;
     margin-top: 0;
-    margin-right: 0;
+    margin-right: 40px;
     margin-bottom: 0;
-    margin-left: 0;
+    margin-left: 40px;
     padding-top: 0;
     padding-right: 0;
     padding-bottom: 0;
@@ -330,7 +330,7 @@
 }
 
 #LiveBar #ScrollView #unity-content-and-vertical-scroll-container > #unity-content-viewport #unity-content-container {
-    flex-direction: row-reverse;
+    flex-direction: row;
 }
 
 .button-icon {

My project/Assets/Prefabs/CS/Canvas.prefab

@@ -269,6 +269,7 @@ MonoBehaviour:
   _timerUpdateText: {fileID: 8731479965789433114}
   _optionsContainer: {fileID: 5542623615299663718}
   _restartButton: {fileID: 79392514635604134}
+  _returnToHomeButton: {fileID: 2926549481658228636}
   _timerSlider: {fileID: 184801896867340239}
   _pointsContainer: {fileID: 1868296225662172060}
   _activePointColor: {r: 0.99607843, g: 0.84313726, b: 0, a: 1}
@@ -1041,6 +1042,127 @@ MonoBehaviour:
     y: 0
     width: 1
     height: 1
+--- !u!1 &2594602309801970266
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6061577813995498726}
+  - component: {fileID: 6248097764973839878}
+  - component: {fileID: 1691609292258223013}
+  - component: {fileID: 2926549481658228636}
+  m_Layer: 0
+  m_Name: ReturnToHome
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6061577813995498726
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2594602309801970266}
+  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: 6711991403260254169}
+  m_Father: {fileID: 625702886984310365}
+  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: -317}
+  m_SizeDelta: {x: 361.5802, y: 85.0291}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &6248097764973839878
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2594602309801970266}
+  m_CullTransparentMesh: 1
+--- !u!114 &1691609292258223013
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2594602309801970266}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Image
+  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: b94ad4425888548039a8c69d289a39d6, type: 3}
+  m_Type: 1
+  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!114 &2926549481658228636
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2594602309801970266}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Button
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    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_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    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_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 1691609292258223013}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &2703158917148171757
 GameObject:
   m_ObjectHideFlags: 0
@@ -1277,6 +1399,100 @@ MonoBehaviour:
   m_PreserveNumbers: 1
   m_FixTags: 1
   m_ForceRTL: 1
+--- !u!1 &2745728593025828598
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6711991403260254169}
+  - component: {fileID: 7992696965235257111}
+  - component: {fileID: 81883892740772949}
+  m_Layer: 0
+  m_Name: BtnTxt
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6711991403260254169
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2745728593025828598}
+  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: 6061577813995498726}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0, y: 0}
+--- !u!222 &7992696965235257111
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2745728593025828598}
+  m_CullTransparentMesh: 1
+--- !u!114 &81883892740772949
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2745728593025828598}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: beaa34cb0e58d624bb3a264b28600785, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: LightSide.UniText::LightSide.UniText
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.1882353, g: 0.1882353, b: 0.8156863, a: 1}
+  m_RaycastTarget: 0
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  text: "\u0627\u0644\u0631\u062C\u0648\u0639"
+  fontStack: {fileID: 11400000, guid: 0029e5efb4c7a12f1ac9136de794e6dc, type: 2}
+  appearance: {fileID: 11400000, guid: 3a559cf5d653f05ea807e1be5655df92, type: 2}
+  fontSize: 40
+  baseDirection: 2
+  wordWrap: 1
+  horizontalAlignment: 1
+  verticalAlignment: 1
+  overEdge: 0
+  underEdge: 0
+  leadingDistribution: 0
+  autoSize: 0
+  minFontSize: 10
+  maxFontSize: 72
+  modRegisters:
+    items: []
+  modRegisterConfigs:
+    items: []
+  highlighter:
+    rid: 8615661501950984685
+  references:
+    version: 2
+    RefIds:
+    - rid: 8615661501950984685
+      type: {class: DefaultTextHighlighter, ns: LightSide, asm: LightSide.UniText}
+      data:
+        clickColor: {r: 0.2, g: 0.5, b: 1, a: 0.6}
+        fadeDuration: 0.25
+        hoverColor: {r: 0.2, g: 0.5, b: 1, a: 0.1}
 --- !u!1 &3190950786820414927
 GameObject:
   m_ObjectHideFlags: 0
@@ -3261,6 +3477,7 @@ RectTransform:
   - {fileID: 2826639575804227870}
   - {fileID: 8683914301551969062}
   - {fileID: 6937818374193420450}
+  - {fileID: 6061577813995498726}
   m_Father: {fileID: 6699056385477313718}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}

My project/Assets/Prefabs/CS/UniTextFonts_Custom.asset

@@ -14,7 +14,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: LightSide.UniText::UniTextFonts
   fonts:
     items:
-    - {fileID: 11400000, guid: b2d1fbf54c0a1bfbfaf71b0acac52952, type: 2}
+    - {fileID: 11400000, guid: 7ab70884c4dcdaae98e11950506c4a9e, type: 2}
     - {fileID: 11400000, guid: 9f194bcdf6b582b4c8731cdfe455216c, type: 2}
     - {fileID: 11400000, guid: ba7f77151d6fb404894958d3fe0b30c7, type: 2}
   fallbackStack: {fileID: 0}

My project/Assets/ScienceStreet/CS/Scripts/CsUIManager.cs

@@ -11,6 +11,7 @@ namespace com.al_arcade.cs
     using System.Linq;
     using LightSide;
     using shared;
+    using UnityEngine.SceneManagement;
 
     public class CsUIManager : MonoBehaviour
     {
@@ -28,11 +29,13 @@ namespace com.al_arcade.cs
 
         [SerializeField] protected Transform _optionsContainer;
         [SerializeField] protected Button _restartButton;
+        [SerializeField] protected Button _returnToHomeButton;
         [SerializeField] protected Slider _timerSlider;
         [SerializeField] protected Transform _pointsContainer;
         [SerializeField] protected Color _activePointColor, _inactivePointColor;
         [SerializeField] protected RawImage _speaker;
         [SerializeField] protected Transform _slash;
+
         private Color _timerDefaultColor;
 
 
@@ -61,6 +64,11 @@ namespace com.al_arcade.cs
                 CsGameManager.Instance.StartGame();
             });
 
+            _returnToHomeButton.onClick.AddListener(() =>
+            {
+                SceneManager.LoadScene("MainMenu");
+            });
+
             isMusicOn = true;
         }
 

My project/UserSettings/EditorUserSettings.asset

@@ -21,16 +21,16 @@ EditorUserSettings:
       value: 0003525055055d020e0b0a7216755d444215417e787d27362e2f4866b2e1323e
       flags: 0
     RecentlyUsedSceneGuid-4:
-      value: 5701055506000a030f5c542744260844404f4d73797975367c2c1e6ab7e2653d
+      value: 5305515503010a0e0f580977147208444e151a78787b726775711931bbe1613e
       flags: 0
     RecentlyUsedSceneGuid-5:
-      value: 5305515503010a0e0f580977147208444e151a78787b726775711931bbe1613e
+      value: 5304575f5c0c51035d5a5e771271594417154e7c2d7b70647b7b4c35bbe1646d
       flags: 0
     RecentlyUsedSceneGuid-6:
-      value: 5304575f5c0c51035d5a5e771271594417154e7c2d7b70647b7b4c35bbe1646d
+      value: 0752035101010f0c54595b2046760e44134e4e7a7f7d71677c2c4836b7b4633e
       flags: 0
     RecentlyUsedSceneGuid-7:
-      value: 0752035101010f0c54595b2046760e44134e4e7a7f7d71677c2c4836b7b4633e
+      value: 5701055506000a030f5c542744260844404f4d73797975367c2c1e6ab7e2653d
       flags: 0
     RecentlyUsedSceneGuid-8:
       value: 52080c51560d5f03580b5e7242700c4446164f7d2e7f77612c281f32e0b8603d

My project/UserSettings/Layouts/CurrentMaximizeLayout.dwlt

@@ -24,7 +24,7 @@ MonoBehaviour:
   m_MinSize: {x: 300, y: 112}
   m_MaxSize: {x: 24288, y: 16192}
   vertical: 0
-  controlID: 8197
+  controlID: 14859
   draggingID: 0
 --- !u!114 &2
 MonoBehaviour:
@@ -97,7 +97,7 @@ MonoBehaviour:
     m_HSlider: 0
     m_VSlider: 0
     m_IgnoreScrollWheelUntilClicked: 0
-    m_EnableMouseInput: 0
+    m_EnableMouseInput: 1
     m_EnableSliderZoomHorizontal: 0
     m_EnableSliderZoomVertical: 0
     m_UniformScale: 1
@@ -153,7 +153,7 @@ MonoBehaviour:
   m_MinSize: {x: 200, y: 112}
   m_MaxSize: {x: 16192, y: 16192}
   vertical: 1
-  controlID: 8198
+  controlID: 14860
   draggingID: 0
 --- !u!114 &4
 MonoBehaviour:
@@ -179,7 +179,7 @@ MonoBehaviour:
   m_MinSize: {x: 200, y: 56}
   m_MaxSize: {x: 16192, y: 8096}
   vertical: 0
-  controlID: 8199
+  controlID: 14861
   draggingID: 0
 --- !u!114 &5
 MonoBehaviour:
@@ -253,43 +253,31 @@ MonoBehaviour:
       m_LastClickedID:
         m_Data: 0
       m_ExpandedIDs:
-      - m_Data: -35018
-      - m_Data: -34754
-      - m_Data: -33834
-      - m_Data: -33598
-      - m_Data: -32484
-      - m_Data: -22008
-      - m_Data: -21544
-      - m_Data: -14382
-      - m_Data: -13636
-      - m_Data: -11440
-      - m_Data: -9338
-      - m_Data: -9128
-      - m_Data: -6144
-      - m_Data: -5192
-      - m_Data: -4966
-      - m_Data: -3018
-      - m_Data: -1342
+      - m_Data: -71546
+      - m_Data: -68228
+      - m_Data: -44434
+      - m_Data: -44200
+      - m_Data: -43538
+      - m_Data: -38984
+      - m_Data: -37594
+      - m_Data: -37584
+      - m_Data: -37574
+      - m_Data: -32768
+      - m_Data: -22248
+      - m_Data: -16466
+      - m_Data: -8816
+      - m_Data: -1344
       - m_Data: -12
-      - m_Data: 56188
-      - m_Data: 56206
-      - m_Data: 56210
-      - m_Data: 58072
-      - m_Data: 58082
-      - m_Data: 58096
-      - m_Data: 58462
-      - m_Data: 58466
-      - m_Data: 58492
-      - m_Data: 58502
-      - m_Data: 58958
-      - m_Data: 58968
-      - m_Data: 58988
-      - m_Data: 62456
-      - m_Data: 62476
-      - m_Data: 63974
-      - m_Data: 64000
-      - m_Data: 64600
-      - m_Data: 64632
+      - m_Data: 58532
+      - m_Data: 58540
+      - m_Data: 58550
+      - m_Data: 58582
+      - m_Data: 62798
+      - m_Data: 71130
+      - m_Data: 75232
+      - m_Data: 75264
+      - m_Data: 76034
+      - m_Data: 76064
       m_RenameOverlay:
         m_UserAcceptedRename: 0
         m_Name: 
@@ -334,8 +322,8 @@ MonoBehaviour:
     y: 0
     width: 1099
     height: 632
-  m_MinSize: {x: 200, y: 200}
-  m_MaxSize: {x: 4000, y: 4000}
+  m_MinSize: {x: 202, y: 226}
+  m_MaxSize: {x: 4002, y: 4026}
   m_ActualView: {fileID: 2}
   m_Panes:
   - {fileID: 8}
@@ -951,9 +939,9 @@ MonoBehaviour:
   m_AudioPlay: 0
   m_DebugDrawModesUseInteractiveLightBakingData: 0
   m_Position:
-    m_Target: {x: 632.0484, y: 1166.8389, z: -2.3196595}
+    m_Target: {x: 0, y: 0, z: 0}
     speed: 2
-    m_Value: {x: 632.0484, y: 1166.8389, z: -2.3196595}
+    m_Value: {x: 0, y: 0, z: 0}
   m_RenderMode: 0
   m_CameraMode:
     drawMode: 0
@@ -1003,9 +991,9 @@ MonoBehaviour:
     speed: 2
     m_Value: {x: 0, y: 0, z: 0, w: 1}
   m_Size:
-    m_Target: 311.54352
+    m_Target: 0.8660254
     speed: 2
-    m_Value: 311.54352
+    m_Value: 0.8660254
   m_Ortho:
     m_Target: 1
     speed: 2
@@ -1049,7 +1037,7 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 1
   m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: ProjectBrowser
+  m_Name: ConsoleWindow
   m_EditorClassIdentifier: 
   m_Children: []
   m_Position:
@@ -1058,16 +1046,16 @@ MonoBehaviour:
     y: 632
     width: 1454
     height: 351
-  m_MinSize: {x: 231, y: 276}
-  m_MaxSize: {x: 10001, y: 10026}
-  m_ActualView: {fileID: 10}
+  m_MinSize: {x: 101, y: 126}
+  m_MaxSize: {x: 4001, y: 4026}
+  m_ActualView: {fileID: 11}
   m_Panes:
   - {fileID: 10}
   - {fileID: 11}
   - {fileID: 12}
   - {fileID: 13}
-  m_Selected: 0
-  m_LastSelected: 1
+  m_Selected: 1
+  m_LastSelected: 0
 --- !u!114 &10
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -1117,7 +1105,7 @@ MonoBehaviour:
     m_SkipHidden: 0
     m_SearchArea: 1
     m_Folders:
-    - Assets/App/UI
+    - Assets/AppUI/UIToolkit/UXML
     m_Globs: []
     m_ProductIds: 
     m_AnyWithAssetOrigin: 0
@@ -1127,7 +1115,7 @@ MonoBehaviour:
   m_ViewMode: 1
   m_StartGridSize: 96
   m_LastFolders:
-  - Assets/App/UI
+  - Assets/AppUI/UIToolkit/UXML
   m_LastFoldersGridSize: 96
   m_LastProjectPath: /home/p0wer/development/ssbookminigames/My project
   m_LockTracker:
@@ -1136,15 +1124,14 @@ MonoBehaviour:
   m_FolderTreeState:
     scrollPos: {x: 0, y: 79}
     m_SelectedIDs:
-    - m_Data: 58130
+    - m_Data: 58354
     m_LastClickedID:
-      m_Data: 58130
+      m_Data: 58354
     m_ExpandedIDs:
     - m_Data: 0
-    - m_Data: 56322
-    - m_Data: 56682
-    - m_Data: 56684
-    - m_Data: 57236
+    - m_Data: 56354
+    - m_Data: 58152
+    - m_Data: 58348
     - m_Data: 1000000000
     - m_Data: 2147483647
     m_RenameOverlay:
@@ -1179,7 +1166,7 @@ MonoBehaviour:
       m_Data: 0
     m_ExpandedIDs:
     - m_Data: 0
-    - m_Data: 56322
+    - m_Data: 56354
     - m_Data: 1000000000
     - m_Data: 2147483647
     m_RenameOverlay:
@@ -1211,11 +1198,12 @@ MonoBehaviour:
     m_SelectedInstanceIDs:
     - m_Data: 31262
     m_LastClickedInstanceID: 31262
-    m_HadKeyboardFocusLastEvent: 1
+    m_HadKeyboardFocusLastEvent: 0
     m_ExpandedInstanceIDs:
     - m_Data: 46526
     - m_Data: 61214
     - m_Data: 54106
+    - m_Data: 59494
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -1398,8 +1386,8 @@ MonoBehaviour:
     y: 0
     width: 450
     height: 983
-  m_MinSize: {x: 276, y: 76}
-  m_MaxSize: {x: 4001, y: 4026}
+  m_MinSize: {x: 275, y: 50}
+  m_MaxSize: {x: 4000, y: 4000}
   m_ActualView: {fileID: 15}
   m_Panes:
   - {fileID: 15}

My project/UserSettings/Layouts/default-6000.dwlt

@@ -16,7 +16,7 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 1904
+    width: 948
     height: 1039
   m_ShowMode: 4
   m_Title: Console
@@ -44,7 +44,7 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 1904
+    width: 948
     height: 1039
   m_MinSize: {x: 875, y: 300}
   m_MaxSize: {x: 10000, y: 10000}
@@ -69,7 +69,7 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 1904
+    width: 948
     height: 36
   m_MinSize: {x: 50, y: 50}
   m_MaxSize: {x: 4000, y: 4000}
@@ -91,7 +91,7 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 1019
-    width: 1904
+    width: 948
     height: 20
   m_MinSize: {x: 0, y: 0}
   m_MaxSize: {x: 0, y: 0}
@@ -114,7 +114,7 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 36
-    width: 1904
+    width: 948
     height: 983
   m_MinSize: {x: 300, y: 112}
   m_MaxSize: {x: 24288, y: 16192}
@@ -140,7 +140,7 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 1454
+    width: 724
     height: 983
   m_MinSize: {x: 200, y: 112}
   m_MaxSize: {x: 16192, y: 16192}
@@ -166,7 +166,7 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 1454
+    width: 724
     height: 632
   m_MinSize: {x: 200, y: 56}
   m_MaxSize: {x: 16192, y: 8096}
@@ -190,7 +190,7 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 355
+    width: 177
     height: 632
   m_MinSize: {x: 201, y: 226}
   m_MaxSize: {x: 4001, y: 4026}
@@ -214,9 +214,9 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 355
+    x: 177
     y: 0
-    width: 1099
+    width: 547
     height: 632
   m_MinSize: {x: 202, y: 226}
   m_MaxSize: {x: 4002, y: 4026}
@@ -243,7 +243,7 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 632
-    width: 1454
+    width: 724
     height: 351
   m_MinSize: {x: 101, y: 126}
   m_MaxSize: {x: 4001, y: 4026}
@@ -270,9 +270,9 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 1454
+    x: 724
     y: 0
-    width: 450
+    width: 224
     height: 983
   m_MinSize: {x: 276, y: 76}
   m_MaxSize: {x: 4001, y: 4026}
@@ -303,8 +303,8 @@ MonoBehaviour:
   m_Pos:
     serializedVersion: 2
     x: 0
-    y: 25
-    width: 1904
+    y: 0
+    width: 948
     height: 36
   m_SerializedDataModeController:
     m_DataMode: 0
@@ -582,9 +582,9 @@ MonoBehaviour:
     m_TextWithWhitespace: "Game\u200B"
   m_Pos:
     serializedVersion: 2
-    x: 355
-    y: 61
-    width: 1097
+    x: 178
+    y: 24
+    width: 545
     height: 606
   m_SerializedDataModeController:
     m_DataMode: 0
@@ -686,8 +686,8 @@ MonoBehaviour:
   m_Pos:
     serializedVersion: 2
     x: 0
-    y: 61
-    width: 354
+    y: 24
+    width: 176
     height: 606
   m_SerializedDataModeController:
     m_DataMode: 0
@@ -705,8 +705,7 @@ MonoBehaviour:
   m_SceneHierarchy:
     m_TreeViewState:
       scrollPos: {x: 0, y: 0}
-      m_SelectedIDs:
-      - m_Data: 31262
+      m_SelectedIDs: []
       m_LastClickedID:
         m_Data: 0
       m_ExpandedIDs:
@@ -1542,10 +1541,7 @@ MonoBehaviour:
       m_Data: 58130
     m_ExpandedIDs:
     - m_Data: 0
-    - m_Data: 56322
-    - m_Data: 56682
-    - m_Data: 1000000000
-    - m_Data: 2147483647
+    - m_Data: 56354
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -1578,9 +1574,7 @@ MonoBehaviour:
       m_Data: 0
     m_ExpandedIDs:
     - m_Data: 0
-    - m_Data: 56322
-    - m_Data: 1000000000
-    - m_Data: 2147483647
+    - m_Data: 56354
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -1666,8 +1660,8 @@ MonoBehaviour:
   m_Pos:
     serializedVersion: 2
     x: 0
-    y: 693
-    width: 1453
+    y: 656
+    width: 723
     height: 325
   m_SerializedDataModeController:
     m_DataMode: 0
@@ -1799,9 +1793,9 @@ MonoBehaviour:
     m_TextWithWhitespace: "Inspector\u200B"
   m_Pos:
     serializedVersion: 2
-    x: 1454
-    y: 61
-    width: 449
+    x: 725
+    y: 24
+    width: 223
     height: 957
   m_SerializedDataModeController:
     m_DataMode: 0