Ver código fonte

New User scripts

Axel Nordh 3 anos atrás
pai
commit
a06f4d3a9f

+ 46 - 3
Assets/Scenes/MenuScene.unity

@@ -207,6 +207,50 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &1270681219
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1270681221}
+  - component: {fileID: 1270681220}
+  m_Layer: 0
+  m_Name: NewGameController
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &1270681220
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1270681219}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 911f725a19ea7114fa6733dc550a3f7e, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!4 &1270681221
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1270681219}
+  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: 1775112288}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1454060745
 GameObject:
   m_ObjectHideFlags: 0
@@ -236,8 +280,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: a4b49e87c1008ec41be36a542eecfcf8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  questionURL: http://nordh.xyz:8088/Questions.php?
-  categoriesURL: http://nordh.xyz:8088/Categories.php?
   statusText: {fileID: 0}
 --- !u!4 &1454060747
 Transform:
@@ -295,7 +337,8 @@ Transform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children: []
+  m_Children:
+  - {fileID: 1270681221}
   m_Father: {fileID: 0}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

+ 11 - 0
Assets/Scripts/Database/Category.cs

@@ -8,10 +8,21 @@ public class Category
     public string name;
     public int id;
 
+    public int questionCount;
+
     public override string ToString()
     {
         return name + " id " + id;
     }
+
+    public int GetQuestionCount()
+    {
+        return questionCount;
+    }
+    public void SetQuestionCount(int value)
+    {
+        questionCount = value;
+    }
 }
 [Serializable]
 public class CategoryList

+ 58 - 8
Assets/Scripts/Database/DatabaseController.cs

@@ -12,17 +12,32 @@ public class DatabaseController : MonoBehaviour
     private string secretKey = "TheNarKampenSecretKey";
     private string questionURL = "http://nordh.xyz:8088/Questions.php?";
     private string categoriesURL = "http://nordh.xyz:8088/Categories.php";
+    private string questionCountURL = "http://nordh.xyz:8088/QuestionCount.php";
+    private string checkUsernameTakenURL = "http://nordh.xyz:8088/CheckUsername.php";
+    private string insertUserURL = "http://nordh.xyz:8088/InsertUser.php";
 
     public Text statusText;
 
-    CategoryList categories;
+    private CategoryList categories;
+
+    public CategoryList Categories { get { return categories; } set { categories = value; } }
+
+    public static DatabaseController Instance { get; private set; }
 
     private void Awake()
     {
         StartCoroutine(getCategories());
+        if (Instance != null && Instance != this)
+        {
+            Destroy(this);
+        }
+        else
+        {
+            Instance = this;
+        }
     }
 
-    private IEnumerator getCategories()
+    public IEnumerator getCategories()
     {
         UnityWebRequest request = UnityWebRequest.Get(categoriesURL);
 
@@ -48,20 +63,20 @@ public class DatabaseController : MonoBehaviour
         }
     }
 
-    public IEnumerator getQuestion()
+    public IEnumerator GetRandomQuestion()
     {
         Question question = new Question();
 
-        WWW getQuestion = new WWW(questionURL);
-        yield return getQuestion;
+        UnityWebRequest request = new UnityWebRequest(questionURL);
+        yield return request.SendWebRequest();
 
-        if (getQuestion.error != null)
+        if (request.error != null)
         {
-            print("There was an error getting question: " + getQuestion.error);
+            print("There was an error getting question: " + request.downloadHandler.error);
         }
         else
         {
-            statusText.text = getQuestion.text;
+            statusText.text = request.downloadHandler.text;
         }
     }
 
@@ -84,4 +99,39 @@ public class DatabaseController : MonoBehaviour
 
         return hashString.PadLeft(32, '0');
     }
+
+    public bool CheckUsername(string username)
+    {
+        WWWForm form = new WWWForm();
+        form.AddField("username", username);
+
+        UnityWebRequest request = UnityWebRequest.Post(checkUsernameTakenURL, form);
+
+        request.SendWebRequest();
+
+        if (request.downloadHandler.text == "true")
+        {
+            return true;
+        }
+        else
+        {
+            return false;
+        }
+    }
+
+    internal void InsertUser(string username, string userId)
+    {
+        WWWForm form = new WWWForm();
+        form.AddField("username", username);
+        form.AddField("token", userId);
+
+        UnityWebRequest request = UnityWebRequest.Post(insertUserURL, form);
+
+        request.SendWebRequest();
+
+        if (request.error != null)
+        {
+            Debug.Log("Something went wrong with local user register... " + request.downloadHandler.error);
+        }
+    }
 }

+ 12 - 1
Assets/Scripts/LoginManager.cs

@@ -26,7 +26,7 @@ public class LoginManager : MonoBehaviour
     private FirebaseUser user;
     VisualElement loginPanel;
     VisualElement registerPanel;
-
+    private TextField registerUsernameTextField;
     VisualElement root;
 
     private void Awake()
@@ -55,6 +55,7 @@ public class LoginManager : MonoBehaviour
         loginPanel = root.Q<VisualElement>("LoginPanel");
         registerPanel = root.Q<VisualElement>("RegisterPanel");
 
+        registerUsernameTextField = root.Q<TextField>("RegisterUsernameTextField");
         registerEmailTextField = root.Q<TextField>("RegisterEmailTextField");
         registerPasswordTextField = root.Q<TextField>("RegisterPasswordTextField");
         registerPasswordConfirmTextField = root.Q<TextField>("RegisterPasswordConfirmTextField");
@@ -99,6 +100,10 @@ public class LoginManager : MonoBehaviour
 
     private IEnumerator Register(string email, string password, string passwordConfirm)
     {
+        if (registerUsernameTextField.text == "" || registerUsernameTextField.text.Equals("Username"))
+        {
+            registerWarningText.text = "Missing username";
+        }
         if (email == "" || email.Equals("Email"))
         {
             registerWarningText.text = "Missing email";
@@ -107,8 +112,13 @@ public class LoginManager : MonoBehaviour
         {
             registerWarningText.text = "Passwords does not match!";
         }
+        else if (DatabaseController.Instance.CheckUsername(registerUsernameTextField.text))
+        {
+            registerWarningText.text = "Username is taken, choose another one";
+        }
         else
         {
+
             var RegisterTask = auth.CreateUserWithEmailAndPasswordAsync(email, password);
 
             yield return new WaitUntil(predicate: () => RegisterTask.IsCompleted);
@@ -155,6 +165,7 @@ public class LoginManager : MonoBehaviour
                     }
                     else
                     {
+                        DatabaseController.Instance.InsertUser(registerUsernameTextField.text, user.UserId);
                         registerWarningText.text = "";
                         SceneManager.LoadScene("MenuScene");
                     }

+ 9 - 1
Assets/Scripts/MainScene/TabsController.cs

@@ -7,13 +7,18 @@ using UnityEngine.UIElements;
 public class TabsController : MonoBehaviour
 {
     VisualElement root;
-
     private void OnEnable()
     {
         UIDocument menu = GetComponent<UIDocument>();
         root = menu.rootVisualElement;
 
         GetAllTabButtons().ForEach(RegisterButtonCallbacks);
+        GetAllTabContents().ForEach(SetupContentRoot);
+    }
+
+    private void SetupContentRoot(VisualElement element)
+    {
+        BroadcastMessage("SetupTabContentRoot", element);
     }
 
     private void RegisterButtonCallbacks(Button b)
@@ -27,6 +32,8 @@ public class TabsController : MonoBehaviour
         VisualElement tabContent = GetAllTabContents().Where((VisualElement tabContent) => tabContent.name.Contains(b.name[..^3])).First();
 
         SetTabVisible(tabContent);
+
+        BroadcastMessage("TabSelected", tabContent);
     }
 
     private void SetTabVisible(VisualElement tabToActivate)
@@ -37,6 +44,7 @@ public class TabsController : MonoBehaviour
         tabToActivate.style.display = DisplayStyle.Flex;
     }
 
+
     private UQueryBuilder<VisualElement> GetAllTabContents()
     {
         return root.Query<VisualElement>(className: "tabContent");

+ 92 - 0
Assets/Scripts/MainScene/TabsControllers/NewGameScript.cs

@@ -0,0 +1,92 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using UnityEngine;
+using UnityEngine.UIElements;
+
+public class NewGameScript : MonoBehaviour
+{
+    Foldout foldout;
+    private VisualElement root;
+    readonly string tabContentName = "NewGameContent";
+    SliderInt WinConditionSlider;
+
+    readonly List<Category> selectedCategories = new List<Category>();
+
+    public void SetupTabContentRoot(VisualElement e)
+    {
+        if (tabContentName == e.name)
+        {
+            root = e;
+            foldout = root.Q<Foldout>("CategoryFoldout");
+            foldout.value = false;
+
+            WinConditionSlider = root.Q<SliderInt>("WinConditionSlider");
+            WinConditionSlider.RegisterValueChangedCallback(x => WinConditionSlider.label = x.newValue.ToString());
+        }
+    }
+
+    public void PopulateCategories()
+    {
+        Debug.Log("Populating categories");
+        selectedCategories.Clear();
+        foreach (Category c in DatabaseController.Instance.Categories.list)
+        {
+            Toggle categoryToggle = new Toggle();
+            categoryToggle.text = c.name + "(" + c.questionCount + ")";
+            categoryToggle.value = true;
+            categoryToggle.style.backgroundColor = ConvertColor(c.r, c.g, c.b, c.a);
+            categoryToggle.AddToClassList("categoryToggle");
+            categoryToggle.RegisterCallback<ClickEvent>(CategorySelectionChange);
+            if (!foldout.contentContainer.Children().Any(e => e.name == c.name))
+            {
+                foldout.Add(categoryToggle);
+            }
+
+            selectedCategories.Add(c);
+        }
+
+        foldout.text = "Kategorier (Alla " + GetSelectedQuestionCount() + ")";
+    }
+
+    private Color ConvertColor(int r, int g, int b, int a)
+    {
+        return new Color(r / 255f, g / 255f, b / 255f, a / 255f);
+    }
+
+    private void CategorySelectionChange(ClickEvent evt)
+    {
+        Toggle toggle = evt.currentTarget as Toggle;
+
+        if (!toggle.value)
+        {
+            selectedCategories.Remove(selectedCategories.Find(c => c.name == toggle.text[..toggle.text.IndexOf('(')]));
+            foldout.text = "Kategorier (urval " + GetSelectedQuestionCount() + ")";
+        }
+        else
+        {
+            selectedCategories.Add(DatabaseController.Instance.Categories.list.Find(c => c.name == toggle.text[..toggle.text.IndexOf('(')]));
+            if (foldout.contentContainer.Children().Cast<Toggle>().All(t => t.value))
+            {
+                foldout.text = "Kategorier (Alla " + GetSelectedQuestionCount() + ")";
+            }
+        }
+    }
+
+    private int GetSelectedQuestionCount()
+    {
+        int sum = 0;
+        selectedCategories.ForEach(c => sum += c.questionCount);
+        return sum;
+    }
+
+    public void TabSelected(VisualElement element)
+    {
+        if (tabContentName == element.name)
+        {
+            PopulateCategories();
+        }
+    }
+
+}

+ 1 - 0
Assets/UIDocument/LoginUIDocument.uxml

@@ -13,6 +13,7 @@
         </ui:VisualElement>
         <ui:VisualElement name="RegisterPanel" style="overflow: visible; visibility: visible; display: none; position: relative; justify-content: center; align-items: center;">
             <ui:Label text="Register" display-tooltip-when-elided="true" style="height: 34px; width: 314px; align-items: center; justify-content: center; position: relative; font-size: 24px; -unity-text-align: middle-center;" />
+            <ui:TextField picking-mode="Ignore" value="filler text" text="Username" name="RegisterUsernameTextField" style="width: 200px; min-height: 25px;" />
             <ui:TextField picking-mode="Ignore" value="filler text" text="Email" name="RegisterEmailTextField" style="width: 200px; min-height: 25px;" />
             <ui:TextField picking-mode="Ignore" value="Password" text="Password" password="true" name="RegisterPasswordTextField" style="width: 200px; min-height: 25px;" />
             <ui:TextField picking-mode="Ignore" value="Password confirm" text="PasswordConfirm" password="true" name="RegisterPasswordConfirmTextField" style="width: 200px; min-height: 25px;" />

+ 32 - 0
Assets/UIDocument/MenuScene/TabContentDocuemnts/NewGameContent.uss

@@ -0,0 +1,32 @@
+.unity-foldout__toggle:hover {
+    color: rgb(58, 255, 0);
+}
+
+.unity-foldout__toggle:focus {
+    color: rgb(27,27,27);
+}
+
+.unity-foldout__toggle__label:focus {
+    color: rgb(27,27,27);
+}
+
+/* .unity-foldout__toggle__label:visited {
+    color: rgb(27,27,27);
+} */
+
+.unity-foldout__toggle > .unity-toggle__input:focus > .unity-label {
+    color: rgb(27,27,27);
+}
+
+.categoryToggle > .unity-toggle__label:hover {
+    -unity-text-outline-color: rgb(255, 255, 255);
+    color: rgb(255, 0, 12);
+}
+
+.categoryToggle > .unity-toggle__label:focus {
+    color: rgb(0, 8, 255);
+}
+
+.unity-slider-int__label {
+    color: rgb(27,27,27);
+}

+ 19 - 1
Assets/UIDocument/MenuScene/TabContentDocuemnts/NewGameDocument.uxml

@@ -1,4 +1,22 @@
 <ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" xsi="http://www.w3.org/2001/XMLSchema-instance" engine="UnityEngine.UIElements" editor="UnityEditor.UIElements" noNamespaceSchemaLocation="../../../../UIElementsSchema/UIElements.xsd" editor-extension-mode="False">
+    <Style src="project://database/Assets/UIDocument/MenuScene/TabContentDocuemnts/NewGameContent.uss?fileID=7433441132597879392&amp;guid=91712c3572b6b414b9d74838393de250&amp;type=3#NewGameContent" />
     <ui:Label text="New Game" display-tooltip-when-elided="true" style="align-items: center; justify-content: center; -unity-text-align: upper-center; font-size: 30px;" />
-    <ui:VisualElement style="flex-grow: 1;" />
+    <ui:VisualElement name="VisualElement" style="flex-grow: 0; flex-direction: column; flex-basis: auto;">
+        <ui:VisualElement name="SettingsPanelCategories" style="flex-direction: row; height: auto; flex-grow: 1;">
+            <ui:VisualElement style="width: 50%; flex-grow: 1;">
+                <ui:Label text="Valda kategorier" display-tooltip-when-elided="true" name="KategoriText" />
+            </ui:VisualElement>
+            <ui:VisualElement style="width: 50%; flex-grow: 1;">
+                <ui:Foldout text="Kategorier (alla)" name="CategoryFoldout" style="flex-grow: 1;" />
+            </ui:VisualElement>
+        </ui:VisualElement>
+        <ui:VisualElement name="SettingsPanelWinCondition" style="flex-direction: row; height: 55px; flex-grow: 1;">
+            <ui:VisualElement style="width: 50%;">
+                <ui:Label text="Antal rätt för att vinna" display-tooltip-when-elided="true" name="EndGoalText" />
+            </ui:VisualElement>
+            <ui:VisualElement style="width: 50%;">
+                <ui:SliderInt picking-mode="Ignore" label="10" value="10" high-value="25" name="WinConditionSlider" low-value="5" show-input-field="false" />
+            </ui:VisualElement>
+        </ui:VisualElement>
+    </ui:VisualElement>
 </ui:UXML>

+ 4 - 4
Assets/UIDocument/MenuScene/TabbedMenu.uxml

@@ -7,10 +7,10 @@
         <ui:Button text="Done Games" display-tooltip-when-elided="true" name="DoneGamesTab" class="tabButton" />
     </ui:VisualElement>
     <ui:VisualElement name="tabContent" style="flex-grow: 1; flex-shrink: 1;">
-        <ui:VisualElement name="ActiveGamesContent" class="tabContent" style="display: flex; flex-grow: 1; background-color: rgb(255, 0, 0);" />
-        <ui:VisualElement name="NewGameContent" class="tabContent" style="display: none; flex-grow: 1; background-color: rgb(23, 224, 22);">
-            <ui:Instance template="NewGameDocument" name="NewGameDocument" style="flex-grow: 1;" />
+        <ui:VisualElement name="ActiveGamesContent" class="tabContent" style="display: flex; flex-grow: 1; background-color: rgba(56, 56, 56, 0);" />
+        <ui:VisualElement name="NewGameContent" class="tabContent" style="display: none; flex-grow: 1; background-color: rgba(56, 56, 56, 0);">
+            <ui:Instance template="NewGameDocument" name="NewGameDocument" class="tabContentDocument" style="flex-grow: 1; display: flex;" />
         </ui:VisualElement>
-        <ui:VisualElement name="DoneGamesContent" class="tabContent" style="display: none; flex-grow: 1; background-color: rgb(0, 26, 255);" />
+        <ui:VisualElement name="DoneGamesContent" class="tabContent" style="display: none; flex-grow: 1; background-color: rgba(56, 56, 56, 0);" />
     </ui:VisualElement>
 </ui:UXML>

+ 0 - 1
Logs/shadercompiler-UnityShaderCompiler.exe0.log

@@ -1,4 +1,3 @@
 Base path: 'F:/Unity/2021.3.9f1/Editor/Data', plugins path 'F:/Unity/2021.3.9f1/Editor/Data/PlaybackEngines'
 Cmd: initializeCompiler
 
-Cmd: shutdown

+ 4 - 1
ServerFiles/Categories.php

@@ -18,7 +18,10 @@ try {
     echo '<h1>An error har occured. </h1><pre>', $e->getMessage(), '</pre>';
 }
 
-$sth = $dbh->query("SELECT * FROM Category");
+$sth = $dbh->query("SELECT c.*, count(qtc.categoryId) as questionCount " .
+"FROM Category c INNER JOIN QuestionToCategory qtc ON qtc.categoryId = c.id " .
+"GROUP BY c.id;");
+
 $sth->setFetchMode(PDO::FETCH_ASSOC);
 
 $result = $sth->fetchAll();

+ 34 - 0
ServerFiles/CheckUsername.php

@@ -0,0 +1,34 @@
+<?
+$HOST = 'nordh.xyz';
+$USERNAME = 'narKampen';
+$PASSWORD = '9Bq.6[AcTc2ADwN-';
+$DATABASE = 'narKampen';
+$PORT = '3306';
+
+$secretKey = 'TheNarKampenSecretKey';
+
+try {
+    $dbh = new PDO(
+        'mysql:host=' . $HOST . ';dbname=' . $DATABASE,
+        $USERNAME,
+        $PASSWORD
+    );
+} catch (PDOException $e) {
+    echo '<h1>An error har occured. </h1><pre>', $e->getMessage(), '</pre>';
+}
+
+$sth = $dbh->prepare('SELECT * FROM User WHERE username = :username');
+try {
+    $sth->execute($_GET);
+} catch (Exception $e) {
+    echo "<h1>An error has occured. </h1><pre>", $e->getMessage(), '</pre>';
+}
+$sth->setFetchMode(PDO::FETCH_ASSOC);
+
+$result = $sth->fetchAll();
+
+if (count($result) > 0) {
+    echo true;
+} else {
+    echo false;
+}

+ 24 - 0
ServerFiles/InsertUser.php

@@ -0,0 +1,24 @@
+<?php
+
+$HOST = 'nordh.xyz';
+$USERNAME = 'narKampen';
+$PASSWORD = '9Bq.6[AcTc2ADwN-';
+$DATABASE = 'narKampen';
+$PORT = '3306';
+
+$secretKey = 'TheNarKampenSecretKey';
+
+try {
+    $dbh = new PDO(
+        'mysql:host=' . $HOST . ';dbname=' . $DATABASE,
+        $USERNAME,
+        $PASSWORD
+    );
+} catch (PDOException $e) {
+    echo '<h1>An error har occured. </h1><pre>', $e->getMessage(), '</pre>';
+}
+
+$sth = $dbh->prepare('INSERT INTO User (username, token) VALUES (:username, :token)');
+
+$sth->execute($_GET);
+

+ 2 - 2
UserSettings/EditorUserSettings.asset

@@ -6,10 +6,10 @@ EditorUserSettings:
   serializedVersion: 4
   m_ConfigSettings:
     RecentlyUsedSceneGuid-0:
-      value: 515250075c0c595e5f5a5e71122159444e4e4a2f7a7d7f602f284d66b4b76661
+      value: 5504525303020d5e095f557549210c44124f1a2f297d76677d7b4b30e6b9636f
       flags: 0
     RecentlyUsedSceneGuid-1:
-      value: 5504525303020d5e095f557549210c44124f1a2f297d76677d7b4b30e6b9636f
+      value: 515250075c0c595e5f5a5e71122159444e4e4a2f7a7d7f602f284d66b4b76661
       flags: 0
     vcSharedLogLevel:
       value: 0d5e400f0650

+ 124 - 124
UserSettings/Layouts/CurrentMaximizeLayout.dwlt

@@ -24,7 +24,7 @@ MonoBehaviour:
   m_MinSize: {x: 300, y: 200}
   m_MaxSize: {x: 24288, y: 16192}
   vertical: 0
-  controlID: 21
+  controlID: 737
 --- !u!114 &2
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -33,92 +33,26 @@ MonoBehaviour:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 0}
   m_Enabled: 1
-  m_EditorHideFlags: 1
-  m_Script: {fileID: 12015, guid: 0000000000000000e000000000000000, type: 0}
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 13999, guid: 0000000000000000e000000000000000, type: 0}
   m_Name: 
   m_EditorClassIdentifier: 
   m_MinSize: {x: 200, y: 200}
   m_MaxSize: {x: 4000, y: 4000}
   m_TitleContent:
-    m_Text: Game
-    m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000, type: 0}
+    m_Text: UI Builder
+    m_Image: {fileID: 8683992553321208622, guid: 0000000000000000d000000000000000, type: 0}
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 363
+    x: 369
     y: 73
-    width: 1101
+    width: 1139
     height: 653
   m_ViewDataDictionary: {fileID: 0}
   m_OverlayCanvas:
     m_LastAppliedPresetName: Default
     m_SaveData: []
-  m_SerializedViewNames:
-  - UnityEditor.DeviceSimulation.SimulatorWindow
-  m_SerializedViewValues:
-  - F:\Unity\Projects\NarKampenTake2\Library\PlayModeViewStates\337ae414f98c07b4397ed4c9b73ed138
-  m_PlayModeViewName: GameView
-  m_ShowGizmos: 0
-  m_TargetDisplay: 0
-  m_ClearColor: {r: 0, g: 0, b: 0, a: 0}
-  m_TargetSize: {x: 1101, y: 632}
-  m_TextureFilterMode: 0
-  m_TextureHideFlags: 61
-  m_RenderIMGUI: 1
-  m_EnterPlayModeBehavior: 0
-  m_UseMipMap: 0
-  m_VSyncEnabled: 0
-  m_Gizmos: 0
-  m_Stats: 0
-  m_SelectedSizes: 00000000000000000000000000000000000000000000000000000000000000000000000000000000
-  m_ZoomArea:
-    m_HRangeLocked: 0
-    m_VRangeLocked: 0
-    hZoomLockedByDefault: 0
-    vZoomLockedByDefault: 0
-    m_HBaseRangeMin: -550.5
-    m_HBaseRangeMax: 550.5
-    m_VBaseRangeMin: -316
-    m_VBaseRangeMax: 316
-    m_HAllowExceedBaseRangeMin: 1
-    m_HAllowExceedBaseRangeMax: 1
-    m_VAllowExceedBaseRangeMin: 1
-    m_VAllowExceedBaseRangeMax: 1
-    m_ScaleWithWindow: 0
-    m_HSlider: 0
-    m_VSlider: 0
-    m_IgnoreScrollWheelUntilClicked: 0
-    m_EnableMouseInput: 1
-    m_EnableSliderZoomHorizontal: 0
-    m_EnableSliderZoomVertical: 0
-    m_UniformScale: 1
-    m_UpDirection: 1
-    m_DrawArea:
-      serializedVersion: 2
-      x: 0
-      y: 21
-      width: 1101
-      height: 632
-    m_Scale: {x: 1, y: 1}
-    m_Translation: {x: 550.5, y: 316}
-    m_MarginLeft: 0
-    m_MarginRight: 0
-    m_MarginTop: 0
-    m_MarginBottom: 0
-    m_LastShownAreaInsideMargins:
-      serializedVersion: 2
-      x: -550.5
-      y: -316
-      width: 1101
-      height: 632
-    m_MinimalGUI: 1
-  m_defaultScale: 1
-  m_LastWindowPixelSize: {x: 1101, y: 653}
-  m_ClearInEditMode: 1
-  m_NoCameraWarning: 1
-  m_LowResolutionForAspectRatios: 01000000000000000000
-  m_XRRenderMode: 0
-  m_RenderTexture: {fileID: 0}
 --- !u!114 &3
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -138,12 +72,12 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 1466
+    width: 1510
     height: 947
   m_MinSize: {x: 200, y: 200}
   m_MaxSize: {x: 16192, y: 16192}
   vertical: 1
-  controlID: 22
+  controlID: 738
 --- !u!114 &4
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -163,12 +97,12 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 1466
+    width: 1510
     height: 674
   m_MinSize: {x: 200, y: 100}
   m_MaxSize: {x: 16192, y: 8096}
   vertical: 0
-  controlID: 23
+  controlID: 739
 --- !u!114 &5
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -186,7 +120,7 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 363
+    width: 369
     height: 674
   m_MinSize: {x: 201, y: 221}
   m_MaxSize: {x: 4001, y: 4021}
@@ -217,7 +151,7 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 73
-    width: 362
+    width: 368
     height: 653
   m_ViewDataDictionary: {fileID: 0}
   m_OverlayCanvas:
@@ -226,23 +160,23 @@ MonoBehaviour:
   m_SceneHierarchy:
     m_TreeViewState:
       scrollPos: {x: 0, y: 0}
-      m_SelectedIDs: 58600000
+      m_SelectedIDs: 
       m_LastClickedID: 0
       m_ExpandedIDs: 28fbffff
       m_RenameOverlay:
         m_UserAcceptedRename: 0
-        m_Name: MenuSceneDocument
-        m_OriginalName: MenuSceneDocument
+        m_Name: 
+        m_OriginalName: 
         m_EditFieldRect:
           serializedVersion: 2
           x: 0
           y: 0
           width: 0
           height: 0
-        m_UserData: 24564
+        m_UserData: 0
         m_IsWaitingForDelay: 0
         m_IsRenaming: 0
-        m_OriginalEventType: 0
+        m_OriginalEventType: 11
         m_IsRenamingFilename: 0
         m_ClientGUIView: {fileID: 5}
       m_SearchString: 
@@ -262,24 +196,24 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 1
   m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: GameView
+  m_Name: Builder
   m_EditorClassIdentifier: 
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 363
+    x: 369
     y: 0
-    width: 1103
+    width: 1141
     height: 674
-  m_MinSize: {x: 200, y: 200}
-  m_MaxSize: {x: 4000, y: 4000}
+  m_MinSize: {x: 202, y: 221}
+  m_MaxSize: {x: 4002, y: 4021}
   m_ActualView: {fileID: 2}
   m_Panes:
   - {fileID: 8}
-  - {fileID: 9}
   - {fileID: 2}
-  m_Selected: 2
-  m_LastSelected: 1
+  - {fileID: 9}
+  m_Selected: 1
+  m_LastSelected: 2
 --- !u!114 &8
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -615,26 +549,92 @@ MonoBehaviour:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 0}
   m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 13999, guid: 0000000000000000e000000000000000, type: 0}
+  m_EditorHideFlags: 1
+  m_Script: {fileID: 12015, guid: 0000000000000000e000000000000000, type: 0}
   m_Name: 
   m_EditorClassIdentifier: 
   m_MinSize: {x: 200, y: 200}
   m_MaxSize: {x: 4000, y: 4000}
   m_TitleContent:
-    m_Text: UI Builder
-    m_Image: {fileID: 8683992553321208622, guid: 0000000000000000d000000000000000, type: 0}
+    m_Text: Game
+    m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000, type: 0}
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 363
+    x: 369
     y: 73
-    width: 1101
+    width: 1139
     height: 653
   m_ViewDataDictionary: {fileID: 0}
   m_OverlayCanvas:
     m_LastAppliedPresetName: Default
     m_SaveData: []
+  m_SerializedViewNames:
+  - UnityEditor.DeviceSimulation.SimulatorWindow
+  m_SerializedViewValues:
+  - F:\Unity\Projects\NarKampenTake2\Library\PlayModeViewStates\337ae414f98c07b4397ed4c9b73ed138
+  m_PlayModeViewName: GameView
+  m_ShowGizmos: 0
+  m_TargetDisplay: 0
+  m_ClearColor: {r: 0, g: 0, b: 0, a: 0}
+  m_TargetSize: {x: 1139, y: 632}
+  m_TextureFilterMode: 0
+  m_TextureHideFlags: 61
+  m_RenderIMGUI: 1
+  m_EnterPlayModeBehavior: 0
+  m_UseMipMap: 0
+  m_VSyncEnabled: 0
+  m_Gizmos: 0
+  m_Stats: 0
+  m_SelectedSizes: 00000000000000000000000000000000000000000000000000000000000000000000000000000000
+  m_ZoomArea:
+    m_HRangeLocked: 0
+    m_VRangeLocked: 0
+    hZoomLockedByDefault: 0
+    vZoomLockedByDefault: 0
+    m_HBaseRangeMin: -569.5
+    m_HBaseRangeMax: 569.5
+    m_VBaseRangeMin: -316
+    m_VBaseRangeMax: 316
+    m_HAllowExceedBaseRangeMin: 1
+    m_HAllowExceedBaseRangeMax: 1
+    m_VAllowExceedBaseRangeMin: 1
+    m_VAllowExceedBaseRangeMax: 1
+    m_ScaleWithWindow: 0
+    m_HSlider: 0
+    m_VSlider: 0
+    m_IgnoreScrollWheelUntilClicked: 0
+    m_EnableMouseInput: 1
+    m_EnableSliderZoomHorizontal: 0
+    m_EnableSliderZoomVertical: 0
+    m_UniformScale: 1
+    m_UpDirection: 1
+    m_DrawArea:
+      serializedVersion: 2
+      x: 0
+      y: 21
+      width: 1139
+      height: 632
+    m_Scale: {x: 1, y: 1}
+    m_Translation: {x: 569.5, y: 316}
+    m_MarginLeft: 0
+    m_MarginRight: 0
+    m_MarginTop: 0
+    m_MarginBottom: 0
+    m_LastShownAreaInsideMargins:
+      serializedVersion: 2
+      x: -569.5
+      y: -316
+      width: 1139
+      height: 632
+    m_MinimalGUI: 1
+  m_defaultScale: 1
+  m_LastWindowPixelSize: {x: 1139, y: 653}
+  m_ClearInEditMode: 1
+  m_NoCameraWarning: 1
+  m_LowResolutionForAspectRatios: 01000000000000000000
+  m_XRRenderMode: 0
+  m_RenderTexture: {fileID: 0}
 --- !u!114 &10
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -654,12 +654,12 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 674
-    width: 1466
+    width: 1510
     height: 273
   m_MinSize: {x: 200, y: 100}
   m_MaxSize: {x: 16192, y: 8096}
   vertical: 0
-  controlID: 106
+  controlID: 827
 --- !u!114 &11
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -677,10 +677,10 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 584
+    width: 598
     height: 273
-  m_MinSize: {x: 100, y: 100}
-  m_MaxSize: {x: 4000, y: 4000}
+  m_MinSize: {x: 101, y: 121}
+  m_MaxSize: {x: 4001, y: 4021}
   m_ActualView: {fileID: 12}
   m_Panes:
   - {fileID: 12}
@@ -708,7 +708,7 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 747
-    width: 583
+    width: 597
     height: 252
   m_ViewDataDictionary: {fileID: 0}
   m_OverlayCanvas:
@@ -729,9 +729,9 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 584
+    x: 598
     y: 0
-    width: 882
+    width: 912
     height: 273
   m_MinSize: {x: 232, y: 271}
   m_MaxSize: {x: 10002, y: 10021}
@@ -760,9 +760,9 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 584
+    x: 598
     y: 747
-    width: 880
+    width: 910
     height: 252
   m_ViewDataDictionary: {fileID: 0}
   m_OverlayCanvas:
@@ -781,22 +781,22 @@ MonoBehaviour:
     m_SkipHidden: 0
     m_SearchArea: 1
     m_Folders:
-    - Assets/UIDocument/MenuScene
+    - Assets/UIDocument/MenuScene/TabContentDocuemnts
     m_Globs: []
     m_OriginalText: 
   m_ViewMode: 1
   m_StartGridSize: 64
   m_LastFolders:
-  - Assets/UIDocument/MenuScene
+  - Assets/UIDocument/MenuScene/TabContentDocuemnts
   m_LastFoldersGridSize: -1
   m_LastProjectPath: F:\Unity\Projects\NarKampenTake2
   m_LockTracker:
     m_IsLocked: 0
   m_FolderTreeState:
-    scrollPos: {x: 0, y: 28}
-    m_SelectedIDs: fa600000
-    m_LastClickedID: 24826
-    m_ExpandedIDs: 00000000d4600000d6600000d8600000da600000dc600000f2600000f8600000
+    scrollPos: {x: 0, y: 60}
+    m_SelectedIDs: 24610000
+    m_LastClickedID: 24868
+    m_ExpandedIDs: 00000000886000008a6000008c6000008e600000906000009260000094600000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -824,7 +824,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: 00000000d4600000d6600000d8600000da600000dc600000
+    m_ExpandedIDs: 00000000886000008a6000008c6000008e600000906000009260000094600000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -849,9 +849,9 @@ MonoBehaviour:
       m_Icon: {fileID: 0}
       m_ResourceFile: 
   m_ListAreaState:
-    m_SelectedInstanceIDs: 58600000
-    m_LastClickedInstanceID: 24664
-    m_HadKeyboardFocusLastEvent: 1
+    m_SelectedInstanceIDs: 
+    m_LastClickedInstanceID: 0
+    m_HadKeyboardFocusLastEvent: 0
     m_ExpandedInstanceIDs: c6230000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
@@ -895,12 +895,12 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 1466
+    x: 1510
     y: 0
-    width: 454
+    width: 410
     height: 947
-  m_MinSize: {x: 275, y: 50}
-  m_MaxSize: {x: 4000, y: 4000}
+  m_MinSize: {x: 276, y: 71}
+  m_MaxSize: {x: 4001, y: 4021}
   m_ActualView: {fileID: 16}
   m_Panes:
   - {fileID: 16}
@@ -926,9 +926,9 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1466
+    x: 1510
     y: 73
-    width: 453
+    width: 409
     height: 926
   m_ViewDataDictionary: {fileID: 0}
   m_OverlayCanvas:

+ 94 - 94
UserSettings/Layouts/default-2021.dwlt

@@ -119,7 +119,7 @@ MonoBehaviour:
   m_MinSize: {x: 300, y: 200}
   m_MaxSize: {x: 24288, y: 16192}
   vertical: 0
-  controlID: 103
+  controlID: 55
 --- !u!114 &6
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -144,7 +144,7 @@ MonoBehaviour:
   m_MinSize: {x: 200, y: 200}
   m_MaxSize: {x: 16192, y: 16192}
   vertical: 1
-  controlID: 22
+  controlID: 142
 --- !u!114 &7
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -169,7 +169,7 @@ MonoBehaviour:
   m_MinSize: {x: 200, y: 100}
   m_MaxSize: {x: 16192, y: 8096}
   vertical: 0
-  controlID: 23
+  controlID: 143
 --- !u!114 &8
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -189,8 +189,8 @@ MonoBehaviour:
     y: 0
     width: 369
     height: 674
-  m_MinSize: {x: 200, y: 200}
-  m_MaxSize: {x: 4000, y: 4000}
+  m_MinSize: {x: 201, y: 221}
+  m_MaxSize: {x: 4001, y: 4021}
   m_ActualView: {fileID: 15}
   m_Panes:
   - {fileID: 15}
@@ -215,13 +215,13 @@ MonoBehaviour:
     y: 0
     width: 1141
     height: 674
-  m_MinSize: {x: 202, y: 221}
-  m_MaxSize: {x: 4002, y: 4021}
-  m_ActualView: {fileID: 14}
+  m_MinSize: {x: 200, y: 200}
+  m_MaxSize: {x: 4000, y: 4000}
+  m_ActualView: {fileID: 17}
   m_Panes:
   - {fileID: 16}
-  - {fileID: 17}
   - {fileID: 14}
+  - {fileID: 17}
   m_Selected: 2
   m_LastSelected: 1
 --- !u!114 &10
@@ -248,7 +248,7 @@ MonoBehaviour:
   m_MinSize: {x: 200, y: 100}
   m_MaxSize: {x: 16192, y: 8096}
   vertical: 0
-  controlID: 110
+  controlID: 89
 --- !u!114 &11
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -335,15 +335,15 @@ MonoBehaviour:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 0}
   m_Enabled: 1
-  m_EditorHideFlags: 1
-  m_Script: {fileID: 12015, guid: 0000000000000000e000000000000000, type: 0}
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 13999, guid: 0000000000000000e000000000000000, type: 0}
   m_Name: 
   m_EditorClassIdentifier: 
   m_MinSize: {x: 200, y: 200}
   m_MaxSize: {x: 4000, y: 4000}
   m_TitleContent:
-    m_Text: Game
-    m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000, type: 0}
+    m_Text: UI Builder
+    m_Image: {fileID: 8683992553321208622, guid: 0000000000000000d000000000000000, type: 0}
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
@@ -355,72 +355,6 @@ MonoBehaviour:
   m_OverlayCanvas:
     m_LastAppliedPresetName: Default
     m_SaveData: []
-  m_SerializedViewNames:
-  - UnityEditor.DeviceSimulation.SimulatorWindow
-  m_SerializedViewValues:
-  - F:\Unity\Projects\NarKampenTake2\Library\PlayModeViewStates\337ae414f98c07b4397ed4c9b73ed138
-  m_PlayModeViewName: GameView
-  m_ShowGizmos: 0
-  m_TargetDisplay: 0
-  m_ClearColor: {r: 0, g: 0, b: 0, a: 0}
-  m_TargetSize: {x: 1139, y: 632}
-  m_TextureFilterMode: 0
-  m_TextureHideFlags: 61
-  m_RenderIMGUI: 1
-  m_EnterPlayModeBehavior: 0
-  m_UseMipMap: 0
-  m_VSyncEnabled: 0
-  m_Gizmos: 0
-  m_Stats: 0
-  m_SelectedSizes: 00000000000000000000000000000000000000000000000000000000000000000000000000000000
-  m_ZoomArea:
-    m_HRangeLocked: 0
-    m_VRangeLocked: 0
-    hZoomLockedByDefault: 0
-    vZoomLockedByDefault: 0
-    m_HBaseRangeMin: -569.5
-    m_HBaseRangeMax: 569.5
-    m_VBaseRangeMin: -316
-    m_VBaseRangeMax: 316
-    m_HAllowExceedBaseRangeMin: 1
-    m_HAllowExceedBaseRangeMax: 1
-    m_VAllowExceedBaseRangeMin: 1
-    m_VAllowExceedBaseRangeMax: 1
-    m_ScaleWithWindow: 0
-    m_HSlider: 0
-    m_VSlider: 0
-    m_IgnoreScrollWheelUntilClicked: 0
-    m_EnableMouseInput: 1
-    m_EnableSliderZoomHorizontal: 0
-    m_EnableSliderZoomVertical: 0
-    m_UniformScale: 1
-    m_UpDirection: 1
-    m_DrawArea:
-      serializedVersion: 2
-      x: 0
-      y: 21
-      width: 1139
-      height: 632
-    m_Scale: {x: 1, y: 1}
-    m_Translation: {x: 569.5, y: 316}
-    m_MarginLeft: 0
-    m_MarginRight: 0
-    m_MarginTop: 0
-    m_MarginBottom: 0
-    m_LastShownAreaInsideMargins:
-      serializedVersion: 2
-      x: -569.5
-      y: -316
-      width: 1139
-      height: 632
-    m_MinimalGUI: 1
-  m_defaultScale: 1
-  m_LastWindowPixelSize: {x: 1139, y: 653}
-  m_ClearInEditMode: 1
-  m_NoCameraWarning: 1
-  m_LowResolutionForAspectRatios: 01000000000000000000
-  m_XRRenderMode: 0
-  m_RenderTexture: {fileID: 0}
 --- !u!114 &15
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -452,9 +386,9 @@ MonoBehaviour:
   m_SceneHierarchy:
     m_TreeViewState:
       scrollPos: {x: 0, y: 0}
-      m_SelectedIDs: 
+      m_SelectedIDs: 32600000
       m_LastClickedID: 0
-      m_ExpandedIDs: 20fbffff
+      m_ExpandedIDs: 28fbffff
       m_RenameOverlay:
         m_UserAcceptedRename: 0
         m_Name: 
@@ -813,15 +747,15 @@ MonoBehaviour:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 0}
   m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 13999, guid: 0000000000000000e000000000000000, type: 0}
+  m_EditorHideFlags: 1
+  m_Script: {fileID: 12015, guid: 0000000000000000e000000000000000, type: 0}
   m_Name: 
   m_EditorClassIdentifier: 
   m_MinSize: {x: 200, y: 200}
   m_MaxSize: {x: 4000, y: 4000}
   m_TitleContent:
-    m_Text: UI Builder
-    m_Image: {fileID: 8683992553321208622, guid: 0000000000000000d000000000000000, type: 0}
+    m_Text: Game
+    m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000, type: 0}
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
@@ -833,6 +767,72 @@ MonoBehaviour:
   m_OverlayCanvas:
     m_LastAppliedPresetName: Default
     m_SaveData: []
+  m_SerializedViewNames:
+  - UnityEditor.DeviceSimulation.SimulatorWindow
+  m_SerializedViewValues:
+  - F:\Unity\Projects\NarKampenTake2\Library\PlayModeViewStates\337ae414f98c07b4397ed4c9b73ed138
+  m_PlayModeViewName: GameView
+  m_ShowGizmos: 0
+  m_TargetDisplay: 0
+  m_ClearColor: {r: 0, g: 0, b: 0, a: 0}
+  m_TargetSize: {x: 1139, y: 632}
+  m_TextureFilterMode: 0
+  m_TextureHideFlags: 61
+  m_RenderIMGUI: 1
+  m_EnterPlayModeBehavior: 0
+  m_UseMipMap: 0
+  m_VSyncEnabled: 0
+  m_Gizmos: 0
+  m_Stats: 0
+  m_SelectedSizes: 00000000000000000000000000000000000000000000000000000000000000000000000000000000
+  m_ZoomArea:
+    m_HRangeLocked: 0
+    m_VRangeLocked: 0
+    hZoomLockedByDefault: 0
+    vZoomLockedByDefault: 0
+    m_HBaseRangeMin: -569.5
+    m_HBaseRangeMax: 569.5
+    m_VBaseRangeMin: -316
+    m_VBaseRangeMax: 316
+    m_HAllowExceedBaseRangeMin: 1
+    m_HAllowExceedBaseRangeMax: 1
+    m_VAllowExceedBaseRangeMin: 1
+    m_VAllowExceedBaseRangeMax: 1
+    m_ScaleWithWindow: 0
+    m_HSlider: 0
+    m_VSlider: 0
+    m_IgnoreScrollWheelUntilClicked: 0
+    m_EnableMouseInput: 1
+    m_EnableSliderZoomHorizontal: 0
+    m_EnableSliderZoomVertical: 0
+    m_UniformScale: 1
+    m_UpDirection: 1
+    m_DrawArea:
+      serializedVersion: 2
+      x: 0
+      y: 21
+      width: 1139
+      height: 632
+    m_Scale: {x: 1, y: 1}
+    m_Translation: {x: 569.5, y: 316}
+    m_MarginLeft: 0
+    m_MarginRight: 0
+    m_MarginTop: 0
+    m_MarginBottom: 0
+    m_LastShownAreaInsideMargins:
+      serializedVersion: 2
+      x: -569.5
+      y: -316
+      width: 1139
+      height: 632
+    m_MinimalGUI: 1
+  m_defaultScale: 1
+  m_LastWindowPixelSize: {x: 1139, y: 653}
+  m_ClearInEditMode: 1
+  m_NoCameraWarning: 1
+  m_LowResolutionForAspectRatios: 01000000000000000000
+  m_XRRenderMode: 0
+  m_RenderTexture: {fileID: 0}
 --- !u!114 &18
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -902,22 +902,22 @@ MonoBehaviour:
     m_SkipHidden: 0
     m_SearchArea: 1
     m_Folders:
-    - Assets/Scripts/Database
+    - Assets/UIDocument/MenuScene/TabContentDocuemnts
     m_Globs: []
     m_OriginalText: 
   m_ViewMode: 1
   m_StartGridSize: 64
   m_LastFolders:
-  - Assets/Scripts/Database
+  - Assets/UIDocument/MenuScene/TabContentDocuemnts
   m_LastFoldersGridSize: -1
   m_LastProjectPath: F:\Unity\Projects\NarKampenTake2
   m_LockTracker:
     m_IsLocked: 0
   m_FolderTreeState:
-    scrollPos: {x: 0, y: 28}
-    m_SelectedIDs: 14610000
-    m_LastClickedID: 24852
-    m_ExpandedIDs: 00000000f86000000c610000
+    scrollPos: {x: 0, y: 76}
+    m_SelectedIDs: 26610000
+    m_LastClickedID: 24870
+    m_ExpandedIDs: 00000000fe60000000610000026100000461000006610000086100000a61000020610000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -945,7 +945,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: 00000000f8600000
+    m_ExpandedIDs: 00000000fe60000000610000026100000461000006610000086100000a610000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -972,7 +972,7 @@ MonoBehaviour:
   m_ListAreaState:
     m_SelectedInstanceIDs: 
     m_LastClickedInstanceID: 0
-    m_HadKeyboardFocusLastEvent: 0
+    m_HadKeyboardFocusLastEvent: 1
     m_ExpandedInstanceIDs: c6230000
     m_RenameOverlay:
       m_UserAcceptedRename: 0