From d1270a55650fb006b0324789a87998585cca737a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=A6=E8=AF=AD?= <zhaoyingjiexc@163.com>
Date: Thu, 24 Oct 2024 16:49:10 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E5=9C=BA=E6=99=AF=E5=B7=A5?=
 =?UTF-8?q?=E5=85=B7=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Editor/Tools/SceneEditor/SceneEditor.cs   | 147 ++++----
 .../Editor/Tools/SceneEditor/SceneEditor.uss  |   5 -
 .../Tools/SceneEditor/SceneEditor.uss.meta    |  11 -
 .../Editor/Tools/SceneEditor/SceneEditor.uxml |   8 -
 .../Tools/SceneEditor/SceneEditor.uxml.meta   |  10 -
 .../Resources/ES3/ES3GlobalReferences.asset   |   5 +-
 client/UserSettings/EditorUserSettings.asset  |  10 +-
 client/UserSettings/Layouts/default-2022.dwlt | 320 ++++++++++--------
 8 files changed, 258 insertions(+), 258 deletions(-)
 delete mode 100644 client/Assets/Ether/Editor/Tools/SceneEditor/SceneEditor.uss
 delete mode 100644 client/Assets/Ether/Editor/Tools/SceneEditor/SceneEditor.uss.meta
 delete mode 100644 client/Assets/Ether/Editor/Tools/SceneEditor/SceneEditor.uxml
 delete mode 100644 client/Assets/Ether/Editor/Tools/SceneEditor/SceneEditor.uxml.meta

diff --git a/client/Assets/Ether/Editor/Tools/SceneEditor/SceneEditor.cs b/client/Assets/Ether/Editor/Tools/SceneEditor/SceneEditor.cs
index c074308..8a7abca 100644
--- a/client/Assets/Ether/Editor/Tools/SceneEditor/SceneEditor.cs
+++ b/client/Assets/Ether/Editor/Tools/SceneEditor/SceneEditor.cs
@@ -1,6 +1,9 @@
 
 using Ether;
+using Sirenix.OdinInspector;
+using Sirenix.OdinInspector.Editor;
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -8,74 +11,85 @@ using UnityEditor;
 using UnityEditor.SceneManagement;
 using UnityEditor.ShortcutManagement;
 using UnityEngine;
-using UnityEngine.UIElements;
 
-public class SceneEditor : EditorWindow
+public class SceneEditor : OdinEditorWindow
 {
-    [SerializeField]
-    private VisualTreeAsset m_VisualTreeAsset = default;
-
-    [SerializeField]
-    private StyleSheet styleSheet = default;
-
-    static SceneEditor instance;
 
     [MenuItem("工具/场景/场景设置")]
     [Shortcut("场景设置", KeyCode.F6)]
-    public static void ShowExample()
+    private static void OpenWindow()
     {
-        if (instance == null)
+        var window = GetWindow<SceneEditor>();
+        window.titleContent = new GUIContent("场景设置");
+        window.Show();
+    }
+
+    protected override void OnEnable()
+    {
+        bootScenePath = JumpSceneEditor.SceneExists("Boot");
+        SetDropdown();
+    }
+
+    Dictionary<string, string> sceneDic = new Dictionary<string, string>();
+
+    private static string bootScenePath;
+    private string bootBtnName = "运行游戏";
+
+    [Button("$bootBtnName", ButtonSizes.Large), PropertyOrder(3)]
+    public void BootBtnAction()
+    {
+        JumpSceneEditor.JumpBootScene();
+    }
+
+    [ValueDropdown("dropDownSceneList"), PropertyOrder(1), LabelText("选择场景")]
+    public string selectSceneName;
+
+    [Button("跳转场景", ButtonSizes.Large), PropertyOrder(2)]
+    public void JumpSceneAction()
+    {
+        if (string.IsNullOrEmpty(selectSceneName))
         {
-            instance = GetWindow<SceneEditor>();
-            instance.titleContent = new GUIContent("场景设置");
+            return;
         }
-        else
+
+        string scenePath = sceneDic[selectSceneName];
+
+        SceneAsset asset = AssetDatabase.LoadAssetAtPath<SceneAsset>(scenePath);
+
+        EditorUtility.FocusProjectWindow();
+        EditorGUIUtility.PingObject(asset);
+        Selection.activeObject = asset;
+
+        if (EditorSceneManager.GetActiveScene().path != scenePath)
         {
-            instance.Close();
-            instance = null;
+            EditorSceneManager.OpenScene(scenePath, OpenSceneMode.Single);
         }
     }
 
-    VisualElement root;
+    private List<string> dropDownSceneList = new List<string>();
 
-    string bootScenePath;
-    Button bootBtn;
-    DropdownField cutSceneDropDown;
-    Dictionary<string, string> sceneDic = new Dictionary<string, string>();
-
-    public void CreateGUI()
+    private void Update()
     {
-        root = rootVisualElement;
-
-        m_VisualTreeAsset.CloneTree(root);
-        root.styleSheets.Add(styleSheet);
-
-        bootScenePath = JumpSceneEditor.SceneExists("Boot");
-
-        bootBtn = root.Q<VisualElement>("Root").Q<Button>("BootBtn");
-        bootBtn.clicked += () =>
+        if (!Application.isPlaying)
         {
-            JumpSceneEditor.JumpBootScene();
-        };
-
-        Button selectSceneBtn = root.Q<VisualElement>("Root").Q<Button>("SelectSceneBtn");
-        selectSceneBtn.clicked += () =>
+            // 打开或激活场景
+            if (EditorSceneManager.GetActiveScene().path != bootScenePath)
+            {
+                bootBtnName = "返回Boot场景";
+            }
+            else
+            {
+                bootBtnName = "运行游戏";
+            }
+        }
+        else
         {
-            SceneAsset asset = AssetDatabase.LoadAssetAtPath<SceneAsset>(sceneDic[cutSceneDropDown.value]);
-
-            EditorUtility.FocusProjectWindow();
-            EditorGUIUtility.PingObject(asset);
-            Selection.activeObject = asset;
-        };
-
-        SetDropdown();
+            bootBtnName = "退出游戏";
+        }
     }
 
     private void SetDropdown()
     {
-        cutSceneDropDown = root.Q<VisualElement>("Root").Q<DropdownField>("CutSceneDropDown");
-
-        int showIndex = 0;
         var scenes = EditorBuildSettings.scenes;
         //初始化数组
         string[] sceneNames = new string[scenes.Length];
@@ -87,44 +101,13 @@ public class SceneEditor : EditorWindow
             string sceneName = Path.GetFileNameWithoutExtension(path);
             sceneDic.Add(sceneName, path);
 
+            dropDownSceneList.Add(sceneName);
+
             sceneNames[i] = sceneName;
             if (Path.GetFileNameWithoutExtension(EditorSceneManager.GetActiveScene().path) == sceneName)
             {
-                showIndex = i;
+                selectSceneName = sceneName;
             }
         }
-
-        cutSceneDropDown.choices = sceneNames.ToList();
-        cutSceneDropDown.index = showIndex;
-        cutSceneDropDown.RegisterValueChangedCallback(evt =>
-        {
-            string sceneName = evt.newValue;
-            EditorSceneManager.OpenScene(sceneDic[sceneName], OpenSceneMode.Single);
-        });
-    }
-
-    private void OnGUI()
-    {
-        if (string.IsNullOrEmpty(bootScenePath) || bootBtn == null)
-        {
-            return;
-        }
-
-        if (!Application.isPlaying)
-        {
-            // 打开或激活场景
-            if (EditorSceneManager.GetActiveScene().path != bootScenePath)
-            {
-                bootBtn.text = "返回Boot场景";
-            }
-            else
-            {
-                bootBtn.text = "运行游戏";
-            }
-        }
-        else
-        {
-            bootBtn.text = "退出游戏";
-        }
     }
 }
diff --git a/client/Assets/Ether/Editor/Tools/SceneEditor/SceneEditor.uss b/client/Assets/Ether/Editor/Tools/SceneEditor/SceneEditor.uss
deleted file mode 100644
index 218263a..0000000
--- a/client/Assets/Ether/Editor/Tools/SceneEditor/SceneEditor.uss
+++ /dev/null
@@ -1,5 +0,0 @@
-.custom-label {
-    font-size: 20px;
-    -unity-font-style: bold;
-    color: rgb(68, 138, 255);
-}
\ No newline at end of file
diff --git a/client/Assets/Ether/Editor/Tools/SceneEditor/SceneEditor.uss.meta b/client/Assets/Ether/Editor/Tools/SceneEditor/SceneEditor.uss.meta
deleted file mode 100644
index fa57ea5..0000000
--- a/client/Assets/Ether/Editor/Tools/SceneEditor/SceneEditor.uss.meta
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: f03517f3eb081dd49b93d060d345d3c6
-ScriptedImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 2
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
-  script: {fileID: 12385, guid: 0000000000000000e000000000000000, type: 0}
-  disableValidation: 0
diff --git a/client/Assets/Ether/Editor/Tools/SceneEditor/SceneEditor.uxml b/client/Assets/Ether/Editor/Tools/SceneEditor/SceneEditor.uxml
deleted file mode 100644
index 9e9285c..0000000
--- a/client/Assets/Ether/Editor/Tools/SceneEditor/SceneEditor.uxml
+++ /dev/null
@@ -1,8 +0,0 @@
-<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="True">
-    <Style src="project://database/Assets/Ether/Editor/Tools/SceneEditor/SceneEditor.uss?fileID=7433441132597879392&amp;guid=f03517f3eb081dd49b93d060d345d3c6&amp;type=3#SceneEditor" />
-    <ui:VisualElement name="Root" style="flex-grow: 1;">
-        <ui:Button text="返回Boot场景" parse-escape-sequences="true" display-tooltip-when-elided="true" name="BootBtn" style="height: 55px; -unity-font-definition: initial; -unity-font: resource(&apos;Font/AlimamaDongFangDaKai&apos;); font-size: 24px; padding-top: 10px; padding-right: 10px; padding-bottom: 10px; padding-left: 10px; margin-top: 10px; margin-right: 10px; margin-bottom: 10px; margin-left: 10px;" />
-        <ui:Button text="选择当前场景资源" parse-escape-sequences="true" display-tooltip-when-elided="true" name="SelectSceneBtn" style="height: 36px; -unity-font-definition: initial; -unity-font: resource(&apos;Font/AlimamaDongFangDaKai&apos;); font-size: 20px; padding-top: 10px; padding-right: 10px; padding-bottom: 10px; padding-left: 10px; margin-top: 10px; margin-right: 10px; margin-bottom: 10px; margin-left: 10px;" />
-        <ui:DropdownField label="切换场景" index="-1" choices="System.Collections.Generic.List`1[System.String]" name="CutSceneDropDown" style="height: 68px; align-self: auto; align-items: center; justify-content: flex-start; -unity-font: resource(&apos;Font/AlimamaDongFangDaKai&apos;); -unity-font-definition: initial; font-size: 24px; margin-right: 12px; margin-left: 13px;" />
-    </ui:VisualElement>
-</ui:UXML>
diff --git a/client/Assets/Ether/Editor/Tools/SceneEditor/SceneEditor.uxml.meta b/client/Assets/Ether/Editor/Tools/SceneEditor/SceneEditor.uxml.meta
deleted file mode 100644
index cfca640..0000000
--- a/client/Assets/Ether/Editor/Tools/SceneEditor/SceneEditor.uxml.meta
+++ /dev/null
@@ -1,10 +0,0 @@
-fileFormatVersion: 2
-guid: 4979e78cf344b5e458b3012c2fac286c
-ScriptedImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 2
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
-  script: {fileID: 13804, guid: 0000000000000000e000000000000000, type: 0}
diff --git a/client/Assets/Plugins/Easy Save 3/Resources/ES3/ES3GlobalReferences.asset b/client/Assets/Plugins/Easy Save 3/Resources/ES3/ES3GlobalReferences.asset
index f4e4387..391300a 100644
--- a/client/Assets/Plugins/Easy Save 3/Resources/ES3/ES3GlobalReferences.asset	
+++ b/client/Assets/Plugins/Easy Save 3/Resources/ES3/ES3GlobalReferences.asset	
@@ -449,4 +449,7 @@ MonoBehaviour:
     - {fileID: 8301237417598839803, guid: 0ebe8a92216c64e4da431cc8ec8366b0, type: 3}
     - {fileID: 8534031891596393965, guid: 0ebe8a92216c64e4da431cc8ec8366b0, type: 3}
     - {fileID: 3556720633068807756, guid: 0ebe8a92216c64e4da431cc8ec8366b0, type: 3}
-    _Values: 5337fb48ba082f4c11da0277d9afca7edd7b5efceef80727e387642fb5503d06682bd2536d6caf50e27d054df1dabd62d362220ad1fe5b4dd20890cda9a8005df33fe6687a9065682199130e729def7895d8ef46b1dab61aea7cbe563ea127283a17a609b254103becde2445c0b04258583792a3187b68486828d5db4638563c3fc4b876bc06d53fc8b35ad2b5705938c69a5089cb34be4b7f115e7680cb0a4ce3b977a1034eb51fa8fc8664117feb6e01cb08d748b7900e9e1ea5806706dd7405d661b4ab5e5235590b7edfd2fb0b53c80735ccfd696e64b779c0dd0bc978512705a1c4e2c93d5fe2c181c2c64ec35d45c66a241e3041716dd34732a6b98e01cbd5afbfeb312b053d1dcbb8111980158f100aa834627e4e801055f30791b7341e456a049e475a770f909ec304057d79ada23f483cc8ca68a89fc00479e1f3312a0028a97c7a4b2a6c819aa3c3ba497973315f552eff8f180fd25cff8755fd1011962244d1d95b638f4099a91e4ca23e6ae3a9ef7e20e402b5d008a7cfecc425fcf5080c775dd4384c2a712b5ae01c3bc1829056e9b44c5820c42d7dafd45d5adcc628f903af460cf08fc4576ef0a36bee44e64d5c6e3b46574f134ccfa976207934f9def7eac0113c84477978a3c70f6899906bed0ffd6d751eafac3d6d2447e85c2f5c167d9c0384d511d727c2cd05e9dd4c96c61df268c873abe96692b05757716de38c950616027318e701d9b938ecb4951bb9ba0d366ac7258a2985691686682e9830b1917de563993936da6a10468c034e026b62639dc8b2ac456fbf7723d09295f7ad97624613ff1c54476d705d14449c821b131a07cbfc67fee538755cdde99ab82be6680a5f6ae99581481c36224f312a22f407428870d44ed09b2b4b74c0765dd2b877ece7cd246af8b57fd2f15730ba12193938f8e7660277c15242bf5b938578430c391e5a3a632fb61ad82900ced1cb051b7217f8c22ab3374c83b49d7fd2ad83627cd647659343dc08bf32c2d38870dc75bb3f059c7005377919f242e732c912295962b558ec95502ec6107ea38af52b12d928c592a8e6f27e0dc07d8686c33b0b20982cea2534624f9134d75f8693ee2239cff0f5fb807f3f55334a2c17caa776b3767c0e37bf135bc67502740f93f75eafa04cb6d3460f60196c3f597e8e665a23b1ec03ef03a57a446b458e7d0cb1172ba87d767df1a36d9ae3d95b009325360fa897c07ffa4d54052d06c17461220bbaf1802a8b0f6825c2ce9fd80ffe2b31d1caceff9721320657a9839a1db2693492aa1edd5882c558622b6b535eaca0471cb1fb55dd68bd17fd7eacb11eb85573bf4d8ffabf8ba54519801c4aa39a042eb094595704ae26148381f1f3bd803b0f3d58ae6b7306af7169480d973327703234d0382ce97e8411277b7d417c980367460d88fb486fa2551c183fb24342b85b11bf278db968f8412c62bc0877910b014d7452269e75e95b728e4801be36546933d9513bc0912023ebb830194c652175f3c199300f6e4264d6cb0047b1faff6248d9c3af1db83e226a8aeda95afd570c932cf20362dba53a6a12ee736e972b1ab892d073a171583b8376c6848099092dddf34a7bf70300247ffe182fa6b291014af80f37d21c9503852d86d9a22abb021d1b5062e1a6124b6e540b5ca7d76b2e1b3b328757beff0677b100da75263956b91b4cc203f3e35d193c3581efc6a353c357be66f733ab5e1c4aeb2fa637d5471bb516c2232d310d1f8fa193f481f63d5653181e67d25e12c6aade4dde120451127d9ca5dd65776bda4eb7986de8956554adda521fb7e048570488ce0b7eec316b0d5a8ee264e445cb84f8b58af77f22eb875f7412a88f365ee4fbe1ee4577593be82c608e0782489320889abe2abe5f7b991c7be087e114646fd00297fca81004ae0e8cdc204f0d0ba7e2f220f477765ea59aabd604874c0717c3fdd884df6a88886093c6b4c45bb6f17977952cca6f08a55b0d9d02c608355b85c45c513570884c7ba8550b3c12960a0a1a75f049331ecc0acdd62e32793fa7a295d0000006e26d7792f7ab9245eeae1ed7a4fcb9581b026aad68a741690b114160e092e4044de14fbc5a3a8e166f7f8b7effe078348d946e883e6c4446ccc6a2e25a30e93ce5d5b6a08124795daf8309cfc3ab5679130308122790ba14532d96ac61dfba3cb1403cef4fcffe4d8b9f7cb63d38233cc5b151be74e5eb3aa4ba393fccbd2126fc0cfca62fe90f2ab9e025e1f4ea9025333bbd5b95f4ad6ede1f5c7887c0e301de18b37e04d89113092d0ba01a81aa391dbc2fb6e7512632dcc9fa81aab5332410e2ea21b5973076ac33aa42444bdb21679763d3485ad74f55fcfc69d508ac3aa024a7efd4778b76cf42f87835c7b66e709235368eb4882223daa28b53508471468e532ab47f0a6d66564e9c6ca58c14863b08a2927fdf62deceb0f52aeaae700baa148b6f6ef70e7938631afddb717ca3cc576426e1e81cba378d4f3ea9525b78bf8e07f80cc2215c41200f6b433e45d720a54fd113b7217a79f2f38ec9d330ba0773223a66de286ed1c4e99b4196058ceed11e38e59f39d2a75d920706af5f5941576339d09f7a65cfef3aa09aea0a1750273e3e2a4a62efead736424b5675c6c6cc8fa925ac21e6f52161bb7f4f1e03ce210c79e6a66ebf2e9b1f9f95b50ab83ed2b8e8d08d26534da4626ebaa6741f3cd7513b60735393c5b2273e343f4f4116aa7dac96353242fbba2c4143ff0389270062be64cf56cc7f25231d65e81df2abdda7efd6387807a51040a646114f3a5060e8cc236e23b8ac4ed28eeeeb24139c1eed21a6f35ea087a4e7ab70507b6fd65e6ec5d0ea313cb9ee438866e90a91342d0a27242d1e44be48457f877747a52cbf9ab3a615424e12d6246ac9183a6366881f61a55d49a93fb2841930b04b41a6e7b52584be15e014a7c505ad767ba60ea7e50f97a900308a0d8b0c6fd67ec221e2c3e163141944ca435d7429d65602736c8650c93332515aac9c4e0dd43f7b03fbfa51f49a2db774c76eaf8db8178a8b7c7900b5aa3ff08288c669a111629f6f52722d54496a9a45d1f20176a046f3f4c242bc68b13b8a347326357b1e76aedd2746ada665774911898664ed33036499d5b4e24f6c73beb52e8a969c562d28de1cb7bee4532ec29242bf76f5043e8550928aa329142ffc7cf00e3a548e54bc5c5e86d07b447fb2de17b32a1b2b043c486e34fb31f3183ef89c42dbbbb57f380db2490200bd10a77e6b400ac70e2f15f43742cb0c8729f39b370acf82ec0afe4ec2031277fc795ab5cbde56d77a65a28f2d16d9f60c06ba76e8554b787a71e227ec21719860438d62a2c43236523f108e7589acb72c7c25a800905102d16165bf51f7adaa8f3877a0e1439e80ea3951ddf265d724317c32505015b6bf576450970e4284aa712f052f091e31323e36d91d7d8e5f1f5d50a3aa7a1168eb46681cd457e4d528371bae88e84a929b3320da960b5e4ef3b13108c93ec0b664c6053a10c494ae2493614f0a835f9e7bea2bae8465b761771e1a07922b1defd50b0673d613ba276b2409d0203eff29e03c0ff783f2232fe0a83d95764439c6aac92bfa2f7b7056b2b419122e745391a40071f02ea94021220d33365b5c733fb81d6cdb50027c3573e0517eaf76d3b6eaf219c94f6dbe5127015e10c3b2db2e5216043257656553540603ba8f7628657e4f55cd54df43c3b8ec44a6ea49630169264237ac5d1056050a1cf1fdd616875c7b087c2620e04af4974329a0a57d4c248c0c8c314b119418943d615da7f686e7273a7093212b0f15322fa7e9955af25d5507feaea1d92eb27a742fe126c2b3d4a159f2488d81562866563e8097849eeb6f58ecd72bfa2ce1195889e51444f8c9e514f571774150345a3f9128845ad1f35f47c9afde3f214119299102e43777eefa6d2e16f575b2abce4d2953589906e3d04fa8e7e991bb2c074149763f1a4fd9a579c268f8bdb31bb55ce9195bed35873b6f8ddc05fe83b8e7010fb32b3c6cb4fd505220a4912471fc3c64ba862a770a882f4e51738c2c590a79b0063398b90e3762172b412aa495f671c85f7e7ffc7c1e1fa5484266925aef4fc51558617bdca8587d7d2eca2202cc296bd0ba54f8477838b2362d5e9fbb801361a8289676b23815b825027e4e54fd57eb93043d6065a90b716f50ba50b6473f8aab1db48a9d673f39c8cb3516cc004aeb101815ad1eff2fe1fad1166cefb344d5ca15cd3aa28f43114bc44284000f2214311b813b226b6c55122d7033ae2c2784f0f51f1d327a497f2bfc9ea542541e587e08dc21a4ed2b1aaa732f14011f43b06cdcdb239b2604d2088593680fca19b205564b6549cd0cb9213c4f19be3419b395e93d4c0a994357040a191e5ac20a21a61fe5a7955705c6166bbb2789e26fcd66b4baf8c4395648516eb08735585670eb9d6e9de31940322e865109a79f128e8d0e19e73d7a444259e9eae728d07160bcb8e93ebcb24e800a14d9b574a00ff08021fa263e6e5366e2b1f7cd04285a01070db3114a2c4bc1a2660daeac0649faf9fa6707d64b612c0c845c0bba817be3b9dbbc8254215a53d5bac8a57c024623980e3901709e2b445320e13077a805df14d40b2eb6384e1a5413311b82bc58f6e490d4b141dd2cc3367ab0bff8fd2a71c9d04807848c3d758cdf800624c01b4f9df49dc52c564dcdb0d9d7dbf3cd1ecd41873c3524c363df47968b3336427bc4db45dcaf129f62201e14b85d641868a6024c3a627c19739fa841816935e5696f5d1400adf16e201f16e3e9f0f4fa4239aa26bb7819164bb0ef0528fbcacf23aa71ffb9a90d3f7ba1e0fd35f118af59c1a380b34cee7b7920ab8b641df5f8149e45f1a9b702d008
+    - {fileID: 2800000, guid: 2fd6421f253b4ef1a19526541f9ffc0c, type: 3}
+    - {fileID: 2800000, guid: ec7c645d93308c04d8840982af12101e, type: 3}
+    - {fileID: 2800000, guid: ee148e281f3c41c5b4ff5f8a5afe5a6c, type: 3}
+    _Values: 5337fb48ba082f4c11da0277d9afca7edd7b5efceef80727e387642fb5503d06682bd2536d6caf50e27d054df1dabd62d362220ad1fe5b4dd20890cda9a8005df33fe6687a9065682199130e729def7895d8ef46b1dab61aea7cbe563ea127283a17a609b254103becde2445c0b04258583792a3187b68486828d5db4638563c3fc4b876bc06d53fc8b35ad2b5705938c69a5089cb34be4b7f115e7680cb0a4ce3b977a1034eb51fa8fc8664117feb6e01cb08d748b7900e9e1ea5806706dd7405d661b4ab5e5235590b7edfd2fb0b53c80735ccfd696e64b779c0dd0bc978512705a1c4e2c93d5fe2c181c2c64ec35d45c66a241e3041716dd34732a6b98e01cbd5afbfeb312b053d1dcbb8111980158f100aa834627e4e801055f30791b7341e456a049e475a770f909ec304057d79ada23f483cc8ca68a89fc00479e1f3312a0028a97c7a4b2a6c819aa3c3ba497973315f552eff8f180fd25cff8755fd1011962244d1d95b638f4099a91e4ca23e6ae3a9ef7e20e402b5d008a7cfecc425fcf5080c775dd4384c2a712b5ae01c3bc1829056e9b44c5820c42d7dafd45d5adcc628f903af460cf08fc4576ef0a36bee44e64d5c6e3b46574f134ccfa976207934f9def7eac0113c84477978a3c70f6899906bed0ffd6d751eafac3d6d2447e85c2f5c167d9c0384d511d727c2cd05e9dd4c96c61df268c873abe96692b05757716de38c950616027318e701d9b938ecb4951bb9ba0d366ac7258a2985691686682e9830b1917de563993936da6a10468c034e026b62639dc8b2ac456fbf7723d09295f7ad97624613ff1c54476d705d14449c821b131a07cbfc67fee538755cdde99ab82be6680a5f6ae99581481c36224f312a22f407428870d44ed09b2b4b74c0765dd2b877ece7cd246af8b57fd2f15730ba12193938f8e7660277c15242bf5b938578430c391e5a3a632fb61ad82900ced1cb051b7217f8c22ab3374c83b49d7fd2ad83627cd647659343dc08bf32c2d38870dc75bb3f059c7005377919f242e732c912295962b558ec95502ec6107ea38af52b12d928c592a8e6f27e0dc07d8686c33b0b20982cea2534624f9134d75f8693ee2239cff0f5fb807f3f55334a2c17caa776b3767c0e37bf135bc67502740f93f75eafa04cb6d3460f60196c3f597e8e665a23b1ec03ef03a57a446b458e7d0cb1172ba87d767df1a36d9ae3d95b009325360fa897c07ffa4d54052d06c17461220bbaf1802a8b0f6825c2ce9fd80ffe2b31d1caceff9721320657a9839a1db2693492aa1edd5882c558622b6b535eaca0471cb1fb55dd68bd17fd7eacb11eb85573bf4d8ffabf8ba54519801c4aa39a042eb094595704ae26148381f1f3bd803b0f3d58ae6b7306af7169480d973327703234d0382ce97e8411277b7d417c980367460d88fb486fa2551c183fb24342b85b11bf278db968f8412c62bc0877910b014d7452269e75e95b728e4801be36546933d9513bc0912023ebb830194c652175f3c199300f6e4264d6cb0047b1faff6248d9c3af1db83e226a8aeda95afd570c932cf20362dba53a6a12ee736e972b1ab892d073a171583b8376c6848099092dddf34a7bf70300247ffe182fa6b291014af80f37d21c9503852d86d9a22abb021d1b5062e1a6124b6e540b5ca7d76b2e1b3b328757beff0677b100da75263956b91b4cc203f3e35d193c3581efc6a353c357be66f733ab5e1c4aeb2fa637d5471bb516c2232d310d1f8fa193f481f63d5653181e67d25e12c6aade4dde120451127d9ca5dd65776bda4eb7986de8956554adda521fb7e048570488ce0b7eec316b0d5a8ee264e445cb84f8b58af77f22eb875f7412a88f365ee4fbe1ee4577593be82c608e0782489320889abe2abe5f7b991c7be087e114646fd00297fca81004ae0e8cdc204f0d0ba7e2f220f477765ea59aabd604874c0717c3fdd884df6a88886093c6b4c45bb6f17977952cca6f08a55b0d9d02c608355b85c45c513570884c7ba8550b3c12960a0a1a75f049331ecc0acdd62e32793fa7a295d0000006e26d7792f7ab9245eeae1ed7a4fcb9581b026aad68a741690b114160e092e4044de14fbc5a3a8e166f7f8b7effe078348d946e883e6c4446ccc6a2e25a30e93ce5d5b6a08124795daf8309cfc3ab5679130308122790ba14532d96ac61dfba3cb1403cef4fcffe4d8b9f7cb63d38233cc5b151be74e5eb3aa4ba393fccbd2126fc0cfca62fe90f2ab9e025e1f4ea9025333bbd5b95f4ad6ede1f5c7887c0e301de18b37e04d89113092d0ba01a81aa391dbc2fb6e7512632dcc9fa81aab5332410e2ea21b5973076ac33aa42444bdb21679763d3485ad74f55fcfc69d508ac3aa024a7efd4778b76cf42f87835c7b66e709235368eb4882223daa28b53508471468e532ab47f0a6d66564e9c6ca58c14863b08a2927fdf62deceb0f52aeaae700baa148b6f6ef70e7938631afddb717ca3cc576426e1e81cba378d4f3ea9525b78bf8e07f80cc2215c41200f6b433e45d720a54fd113b7217a79f2f38ec9d330ba0773223a66de286ed1c4e99b4196058ceed11e38e59f39d2a75d920706af5f5941576339d09f7a65cfef3aa09aea0a1750273e3e2a4a62efead736424b5675c6c6cc8fa925ac21e6f52161bb7f4f1e03ce210c79e6a66ebf2e9b1f9f95b50ab83ed2b8e8d08d26534da4626ebaa6741f3cd7513b60735393c5b2273e343f4f4116aa7dac96353242fbba2c4143ff0389270062be64cf56cc7f25231d65e81df2abdda7efd6387807a51040a646114f3a5060e8cc236e23b8ac4ed28eeeeb24139c1eed21a6f35ea087a4e7ab70507b6fd65e6ec5d0ea313cb9ee438866e90a91342d0a27242d1e44be48457f877747a52cbf9ab3a615424e12d6246ac9183a6366881f61a55d49a93fb2841930b04b41a6e7b52584be15e014a7c505ad767ba60ea7e50f97a900308a0d8b0c6fd67ec221e2c3e163141944ca435d7429d65602736c8650c93332515aac9c4e0dd43f7b03fbfa51f49a2db774c76eaf8db8178a8b7c7900b5aa3ff08288c669a111629f6f52722d54496a9a45d1f20176a046f3f4c242bc68b13b8a347326357b1e76aedd2746ada665774911898664ed33036499d5b4e24f6c73beb52e8a969c562d28de1cb7bee4532ec29242bf76f5043e8550928aa329142ffc7cf00e3a548e54bc5c5e86d07b447fb2de17b32a1b2b043c486e34fb31f3183ef89c42dbbbb57f380db2490200bd10a77e6b400ac70e2f15f43742cb0c8729f39b370acf82ec0afe4ec2031277fc795ab5cbde56d77a65a28f2d16d9f60c06ba76e8554b787a71e227ec21719860438d62a2c43236523f108e7589acb72c7c25a800905102d16165bf51f7adaa8f3877a0e1439e80ea3951ddf265d724317c32505015b6bf576450970e4284aa712f052f091e31323e36d91d7d8e5f1f5d50a3aa7a1168eb46681cd457e4d528371bae88e84a929b3320da960b5e4ef3b13108c93ec0b664c6053a10c494ae2493614f0a835f9e7bea2bae8465b761771e1a07922b1defd50b0673d613ba276b2409d0203eff29e03c0ff783f2232fe0a83d95764439c6aac92bfa2f7b7056b2b419122e745391a40071f02ea94021220d33365b5c733fb81d6cdb50027c3573e0517eaf76d3b6eaf219c94f6dbe5127015e10c3b2db2e5216043257656553540603ba8f7628657e4f55cd54df43c3b8ec44a6ea49630169264237ac5d1056050a1cf1fdd616875c7b087c2620e04af4974329a0a57d4c248c0c8c314b119418943d615da7f686e7273a7093212b0f15322fa7e9955af25d5507feaea1d92eb27a742fe126c2b3d4a159f2488d81562866563e8097849eeb6f58ecd72bfa2ce1195889e51444f8c9e514f571774150345a3f9128845ad1f35f47c9afde3f214119299102e43777eefa6d2e16f575b2abce4d2953589906e3d04fa8e7e991bb2c074149763f1a4fd9a579c268f8bdb31bb55ce9195bed35873b6f8ddc05fe83b8e7010fb32b3c6cb4fd505220a4912471fc3c64ba862a770a882f4e51738c2c590a79b0063398b90e3762172b412aa495f671c85f7e7ffc7c1e1fa5484266925aef4fc51558617bdca8587d7d2eca2202cc296bd0ba54f8477838b2362d5e9fbb801361a8289676b23815b825027e4e54fd57eb93043d6065a90b716f50ba50b6473f8aab1db48a9d673f39c8cb3516cc004aeb101815ad1eff2fe1fad1166cefb344d5ca15cd3aa28f43114bc44284000f2214311b813b226b6c55122d7033ae2c2784f0f51f1d327a497f2bfc9ea542541e587e08dc21a4ed2b1aaa732f14011f43b06cdcdb239b2604d2088593680fca19b205564b6549cd0cb9213c4f19be3419b395e93d4c0a994357040a191e5ac20a21a61fe5a7955705c6166bbb2789e26fcd66b4baf8c4395648516eb08735585670eb9d6e9de31940322e865109a79f128e8d0e19e73d7a444259e9eae728d07160bcb8e93ebcb24e800a14d9b574a00ff08021fa263e6e5366e2b1f7cd04285a01070db3114a2c4bc1a2660daeac0649faf9fa6707d64b612c0c845c0bba817be3b9dbbc8254215a53d5bac8a57c024623980e3901709e2b445320e13077a805df14d40b2eb6384e1a5413311b82bc58f6e490d4b141dd2cc3367ab0bff8fd2a71c9d04807848c3d758cdf800624c01b4f9df49dc52c564dcdb0d9d7dbf3cd1ecd41873c3524c363df47968b3336427bc4db45dcaf129f62201e14b85d641868a6024c3a627c19739fa841816935e5696f5d1400adf16e201f16e3e9f0f4fa4239aa26bb7819164bb0ef0528fbcacf23aa71ffb9a90d3f7ba1e0fd35f118af59c1a380b34cee7b7920ab8b641df5f8149e45f1a9b702d008c6c01a27a9f35d3fa7dd2eb14caea3793a9b02fa4854f423
diff --git a/client/UserSettings/EditorUserSettings.asset b/client/UserSettings/EditorUserSettings.asset
index 63f9551..1df6b35 100644
--- a/client/UserSettings/EditorUserSettings.asset
+++ b/client/UserSettings/EditorUserSettings.asset
@@ -21,17 +21,17 @@ EditorUserSettings:
       value: 0155555103560a585d0a5a7216260644124e4c7e2f7c7e6575784b35e7e2316d
       flags: 0
     RecentlyUsedSceneGuid-5:
-      value: 510707045d065f580c0d5b2447730944474e4a7e2e71726978794a31b3b3326b
-      flags: 0
-    RecentlyUsedSceneGuid-6:
       value: 020502515c500a0e5d5c5f2014710f4444164a2f7a2a7e31292b4b67e7e6353e
       flags: 0
-    RecentlyUsedSceneGuid-7:
+    RecentlyUsedSceneGuid-6:
       value: 0007035757040a5e0e580e2447775b44451640797c7c23327b2a1932b0b3676c
       flags: 0
-    RecentlyUsedSceneGuid-8:
+    RecentlyUsedSceneGuid-7:
       value: 07020c0707010d0c0e585a7a16770a4440154e2f2a7d72687e7d4466bbb46568
       flags: 0
+    RecentlyUsedSceneGuid-8:
+      value: 510707045d065f580c0d5b2447730944474e4a7e2e71726978794a31b3b3326b
+      flags: 0
     RecentlyUsedSceneGuid-9:
       value: 515250075c0c595e5f5a5e71122159444e4e4a2f7a7d7f602f284d66b4b76661
       flags: 0
diff --git a/client/UserSettings/Layouts/default-2022.dwlt b/client/UserSettings/Layouts/default-2022.dwlt
index 623a618..7a37fb2 100644
--- a/client/UserSettings/Layouts/default-2022.dwlt
+++ b/client/UserSettings/Layouts/default-2022.dwlt
@@ -1,6 +1,30 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
 --- !u!114 &1
+MonoBehaviour:
+  m_ObjectHideFlags: 52
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 12004, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_PixelRect:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 0
+    height: 6
+  m_ShowMode: 0
+  m_Title: 
+  m_RootView: {fileID: 3}
+  m_MinSize: {x: 0, y: 0}
+  m_MaxSize: {x: 0, y: 0}
+  m_Maximized: 0
+--- !u!114 &2
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -14,17 +38,41 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_PixelRect:
     serializedVersion: 2
-    x: 0
+    x: -1920
     y: 43
-    width: 3440
-    height: 1357
+    width: 1920
+    height: 997
   m_ShowMode: 4
-  m_Title: Project
-  m_RootView: {fileID: 2}
+  m_Title: Inspector
+  m_RootView: {fileID: 4}
   m_MinSize: {x: 875, y: 300}
   m_MaxSize: {x: 10000, y: 10000}
   m_Maximized: 1
---- !u!114 &2
+--- !u!114 &3
+MonoBehaviour:
+  m_ObjectHideFlags: 52
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Children: []
+  m_Position:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 0
+    height: 0
+  m_MinSize: {x: 0, y: 0}
+  m_MaxSize: {x: 0, y: 0}
+  vertical: 0
+  controlID: 0
+  draggingID: 0
+--- !u!114 &4
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -37,22 +85,22 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
-  - {fileID: 3}
   - {fileID: 5}
-  - {fileID: 4}
+  - {fileID: 7}
+  - {fileID: 6}
   m_Position:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 3440
-    height: 1357
+    width: 1920
+    height: 997
   m_MinSize: {x: 875, y: 300}
   m_MaxSize: {x: 10000, y: 10000}
   m_UseTopView: 1
   m_TopViewHeight: 30
   m_UseBottomView: 1
   m_BottomViewHeight: 20
---- !u!114 &3
+--- !u!114 &5
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -69,12 +117,12 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 3440
+    width: 1920
     height: 30
   m_MinSize: {x: 0, y: 0}
   m_MaxSize: {x: 0, y: 0}
   m_LastLoadedLayoutName: 
---- !u!114 &4
+--- !u!114 &6
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -90,12 +138,12 @@ MonoBehaviour:
   m_Position:
     serializedVersion: 2
     x: 0
-    y: 1337
-    width: 3440
+    y: 977
+    width: 1920
     height: 20
   m_MinSize: {x: 0, y: 0}
   m_MaxSize: {x: 0, y: 0}
---- !u!114 &5
+--- !u!114 &7
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -108,21 +156,21 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
-  - {fileID: 6}
-  - {fileID: 13}
-  - {fileID: 14}
+  - {fileID: 8}
+  - {fileID: 15}
+  - {fileID: 16}
   m_Position:
     serializedVersion: 2
     x: 0
     y: 30
-    width: 3440
-    height: 1307
+    width: 1920
+    height: 947
   m_MinSize: {x: 400, y: 100}
   m_MaxSize: {x: 32384, y: 16192}
   vertical: 0
-  controlID: 51
+  controlID: 184
   draggingID: 0
---- !u!114 &6
+--- !u!114 &8
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -135,20 +183,20 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
-  - {fileID: 7}
-  - {fileID: 10}
+  - {fileID: 9}
+  - {fileID: 12}
   m_Position:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 1897
-    height: 1307
+    width: 1059
+    height: 947
   m_MinSize: {x: 200, y: 100}
   m_MaxSize: {x: 16192, y: 16192}
   vertical: 0
-  controlID: 52
+  controlID: 27
   draggingID: 0
---- !u!114 &7
+--- !u!114 &9
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -161,20 +209,20 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
-  - {fileID: 8}
-  - {fileID: 9}
+  - {fileID: 10}
+  - {fileID: 11}
   m_Position:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 1459
-    height: 1307
+    width: 754
+    height: 947
   m_MinSize: {x: 100, y: 100}
   m_MaxSize: {x: 8096, y: 16192}
   vertical: 1
   controlID: 28
   draggingID: 0
---- !u!114 &8
+--- !u!114 &10
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -191,16 +239,16 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 1459
-    height: 564
+    width: 754
+    height: 409
   m_MinSize: {x: 201, y: 221}
   m_MaxSize: {x: 4001, y: 4021}
-  m_ActualView: {fileID: 16}
+  m_ActualView: {fileID: 18}
   m_Panes:
-  - {fileID: 16}
+  - {fileID: 18}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &9
+--- !u!114 &11
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -216,17 +264,17 @@ MonoBehaviour:
   m_Position:
     serializedVersion: 2
     x: 0
-    y: 564
-    width: 1459
-    height: 743
+    y: 409
+    width: 754
+    height: 538
   m_MinSize: {x: 201, y: 221}
   m_MaxSize: {x: 4001, y: 4021}
-  m_ActualView: {fileID: 15}
+  m_ActualView: {fileID: 17}
   m_Panes:
-  - {fileID: 15}
+  - {fileID: 17}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &10
+--- !u!114 &12
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -239,20 +287,20 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
-  - {fileID: 11}
-  - {fileID: 12}
+  - {fileID: 13}
+  - {fileID: 14}
   m_Position:
     serializedVersion: 2
-    x: 1459
+    x: 754
     y: 0
-    width: 438
-    height: 1307
+    width: 305
+    height: 947
   m_MinSize: {x: 100, y: 100}
   m_MaxSize: {x: 8096, y: 16192}
   vertical: 1
-  controlID: 53
+  controlID: 80
   draggingID: 0
---- !u!114 &11
+--- !u!114 &13
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -269,16 +317,16 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 438
-    height: 569
+    width: 305
+    height: 412
   m_MinSize: {x: 200, y: 200}
   m_MaxSize: {x: 4000, y: 4000}
-  m_ActualView: {fileID: 17}
+  m_ActualView: {fileID: 19}
   m_Panes:
-  - {fileID: 17}
+  - {fileID: 19}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &12
+--- !u!114 &14
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -294,17 +342,17 @@ MonoBehaviour:
   m_Position:
     serializedVersion: 2
     x: 0
-    y: 569
-    width: 438
-    height: 738
-  m_MinSize: {x: 102, y: 121}
-  m_MaxSize: {x: 4002, y: 4021}
-  m_ActualView: {fileID: 18}
+    y: 412
+    width: 305
+    height: 535
+  m_MinSize: {x: 100, y: 100}
+  m_MaxSize: {x: 4000, y: 4000}
+  m_ActualView: {fileID: 20}
   m_Panes:
-  - {fileID: 18}
+  - {fileID: 20}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &13
+--- !u!114 &15
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -319,18 +367,18 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 1897
+    x: 1059
     y: 0
-    width: 1103
-    height: 1307
+    width: 485
+    height: 947
   m_MinSize: {x: 232, y: 271}
   m_MaxSize: {x: 10002, y: 10021}
-  m_ActualView: {fileID: 19}
+  m_ActualView: {fileID: 21}
   m_Panes:
-  - {fileID: 19}
+  - {fileID: 21}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &14
+--- !u!114 &16
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -345,18 +393,18 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 3000
+    x: 1544
     y: 0
-    width: 440
-    height: 1307
-  m_MinSize: {x: 275, y: 50}
-  m_MaxSize: {x: 4000, y: 4000}
-  m_ActualView: {fileID: 20}
+    width: 376
+    height: 947
+  m_MinSize: {x: 276, y: 71}
+  m_MaxSize: {x: 4001, y: 4021}
+  m_ActualView: {fileID: 22}
   m_Panes:
-  - {fileID: 20}
+  - {fileID: 22}
   m_Selected: 0
   m_LastSelected: 1
---- !u!114 &15
+--- !u!114 &17
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -376,10 +424,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 0
-    y: 637
-    width: 1458
-    height: 722
+    x: -1920
+    y: 482
+    width: 753
+    height: 517
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -432,29 +480,29 @@ MonoBehaviour:
       serializedVersion: 2
       x: 0
       y: 21
-      width: 1458
-      height: 701
-    m_Scale: {x: 0.649074, y: 0.6490741}
-    m_Translation: {x: 729, y: 350.5}
+      width: 753
+      height: 496
+    m_Scale: {x: 0.3921875, y: 0.3921875}
+    m_Translation: {x: 376.5, y: 248}
     m_MarginLeft: 0
     m_MarginRight: 0
     m_MarginTop: 0
     m_MarginBottom: 0
     m_LastShownAreaInsideMargins:
       serializedVersion: 2
-      x: -1123.1384
-      y: -540
-      width: 2246.2769
-      height: 1080
+      x: -960
+      y: -632.3506
+      width: 1920
+      height: 1264.7012
     m_MinimalGUI: 1
-  m_defaultScale: 0.6490741
-  m_LastWindowPixelSize: {x: 1458, y: 722}
+  m_defaultScale: 0.3921875
+  m_LastWindowPixelSize: {x: 753, y: 517}
   m_ClearInEditMode: 1
   m_NoCameraWarning: 1
   m_LowResolutionForAspectRatios: 01000000000000000000
   m_XRRenderMode: 0
   m_RenderTexture: {fileID: 0}
---- !u!114 &16
+--- !u!114 &18
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -474,10 +522,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 0
+    x: -1920
     y: 73
-    width: 1458
-    height: 543
+    width: 753
+    height: 388
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -810,9 +858,9 @@ MonoBehaviour:
   m_PlayAudio: 0
   m_AudioPlay: 0
   m_Position:
-    m_Target: {x: 27.290947, y: 14.158419, z: -0.28821033}
+    m_Target: {x: 890.2315, y: 541.27246, z: 0.80458146}
     speed: 2
-    m_Value: {x: 0, y: 0, z: 0}
+    m_Value: {x: 890.2315, y: 541.27246, z: 0.80458146}
   m_RenderMode: 0
   m_CameraMode:
     drawMode: 0
@@ -862,9 +910,9 @@ MonoBehaviour:
     speed: 2
     m_Value: {x: 0, y: 0, z: 0, w: 1}
   m_Size:
-    m_Target: 29.738848
+    m_Target: 22.619549
     speed: 2
-    m_Value: 1.4142135
+    m_Value: 22.619549
   m_Ortho:
     m_Target: 1
     speed: 2
@@ -889,7 +937,7 @@ MonoBehaviour:
   m_SceneVisActive: 1
   m_LastLockedObject: {fileID: 0}
   m_ViewIsLockedToObject: 0
---- !u!114 &17
+--- !u!114 &19
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -909,10 +957,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1459
+    x: -1166
     y: 73
-    width: 436
-    height: 548
+    width: 303
+    height: 391
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -928,7 +976,7 @@ MonoBehaviour:
       scrollPos: {x: 0, y: 0}
       m_SelectedIDs: 
       m_LastClickedID: 0
-      m_ExpandedIDs: bc45ffff0846ffff9e49ffffac49ffff0c4affff64f4ffff74790000d0790000
+      m_ExpandedIDs: 6ab3ffff00e7fffff4faffff78750000d4750000
       m_RenameOverlay:
         m_UserAcceptedRename: 0
         m_Name: 
@@ -944,7 +992,7 @@ MonoBehaviour:
         m_IsRenaming: 0
         m_OriginalEventType: 11
         m_IsRenamingFilename: 0
-        m_ClientGUIView: {fileID: 11}
+        m_ClientGUIView: {fileID: 13}
       m_SearchString: 
     m_ExpandedScenes: []
     m_CurrenRootInstanceID: 0
@@ -952,7 +1000,7 @@ MonoBehaviour:
       m_IsLocked: 0
     m_CurrentSortingName: TransformSorting
   m_WindowGUID: 4c969a2b90040154d917609493e03593
---- !u!114 &18
+--- !u!114 &20
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -972,10 +1020,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1459
-    y: 642
-    width: 436
-    height: 717
+    x: -1166
+    y: 485
+    width: 303
+    height: 514
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -986,7 +1034,7 @@ MonoBehaviour:
     m_LastAppliedPresetName: Default
     m_SaveData: []
     m_OverlaysVisible: 1
---- !u!114 &19
+--- !u!114 &21
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1006,10 +1054,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1897
+    x: -861
     y: 73
-    width: 1101
-    height: 1286
+    width: 483
+    height: 926
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -1031,7 +1079,7 @@ MonoBehaviour:
     m_SkipHidden: 0
     m_SearchArea: 1
     m_Folders:
-    - Assets/Resources/Art/UI/Menu
+    - Assets/Ether/Editor/Frames
     m_Globs: []
     m_OriginalText: 
     m_ImportLogFlags: 0
@@ -1039,16 +1087,16 @@ MonoBehaviour:
   m_ViewMode: 1
   m_StartGridSize: 16
   m_LastFolders:
-  - Assets/Resources/Art/UI/Menu
+  - Assets/Ether/Editor/Frames
   m_LastFoldersGridSize: 16
-  m_LastProjectPath: E:\Andy\IndieGame\client
+  m_LastProjectPath: D:\Andy\IndieGame\client
   m_LockTracker:
     m_IsLocked: 0
   m_FolderTreeState:
-    scrollPos: {x: 0, y: 660}
-    m_SelectedIDs: 086d0000
-    m_LastClickedID: 27912
-    m_ExpandedIDs: 00000000d46c0000dc6c0000e06c0000e86c0000ec6c0000167a0000187a00001a7a00001c7a00001e7a0000207a0000227a0000247a0000267a0000287a00002a7a00002c7a00002e7a0000307a0000327a0000367a0000387a00003a7a00003c7a00003e7a0000407a0000447a0000827c00008a7c0000d27c0000c68d0000cecf0000d0cf0000d2cf000060d10000ccd8000000ca9a3b
+    scrollPos: {x: 0, y: 60}
+    m_SelectedIDs: 24810000
+    m_LastClickedID: 33060
+    m_ExpandedIDs: 00000000e4770000e6770000e8770000ea770000ec770000ee770000f0770000f2770000f4770000f6770000f8770000fa770000fc770000fe770000007800000278000004780000087800000a7800000c7800000e78000010780000127800001478000016780000187800001a7800001c7800001e78000020780000227800002478000026780000287800002a7800002c7800002e78000030780000327800003478000036780000387800003a7800003c7800003e78000040780000427800004478000046780000487800004a7800004c7800004e78000050780000527800005478000056780000587b00003681000000ca9a3b
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -1064,7 +1112,7 @@ MonoBehaviour:
       m_IsRenaming: 0
       m_OriginalEventType: 11
       m_IsRenamingFilename: 1
-      m_ClientGUIView: {fileID: 13}
+      m_ClientGUIView: {fileID: 15}
     m_SearchString: 
     m_CreateAssetUtility:
       m_EndAction: {fileID: 0}
@@ -1076,7 +1124,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: 00000000167a0000187a00001a7a00001c7a00001e7a0000207a0000227a0000247a0000267a0000287a00002a7a00002c7a00002e7a0000307a0000327a0000347a0000367a0000387a00003a7a00003c7a00003e7a0000407a0000427a0000447a0000467a0000
+    m_ExpandedIDs: 00000000e4770000e6770000e8770000ea770000ec770000ee770000f0770000f2770000f4770000f6770000f8770000fa770000fc770000fe77000000780000027800000478000006780000087800000a7800000c7800000e78000010780000127800001478000016780000187800001a7800001c7800001e78000020780000227800002478000026780000287800002a7800002c7800002e78000030780000327800003478000036780000387800003a7800003c7800003e78000040780000427800004478000046780000487800004a7800004c7800004e78000050780000527800005478000056780000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -1107,20 +1155,20 @@ MonoBehaviour:
     m_ExpandedInstanceIDs: c6230000ea160200066600000000000032730000ac6c00003e73000036c6ffff5889fffff669000084ecffff14ceffff18baffff46b1ffff82adffff4ca4ffff989dffff729bffffee96ffff8e94ffff1692ffff428fffff6488ffff3c84ffff6681ffffb67fffff4a75ffff9a71ffff6269ffff4265ffffb25fffffbc9bfdff7e96fdff32690000fcf1ffff00e0ffffce760000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
-      m_Name: 
-      m_OriginalName: 
+      m_Name: FrameEditorWindow
+      m_OriginalName: FrameEditorWindow
       m_EditFieldRect:
         serializedVersion: 2
         x: 0
         y: 0
         width: 0
         height: 0
-      m_UserData: 0
+      m_UserData: 45080
       m_IsWaitingForDelay: 0
       m_IsRenaming: 0
-      m_OriginalEventType: 11
+      m_OriginalEventType: 0
       m_IsRenamingFilename: 1
-      m_ClientGUIView: {fileID: 13}
+      m_ClientGUIView: {fileID: 15}
     m_CreateAssetUtility:
       m_EndAction: {fileID: 0}
       m_InstanceID: 0
@@ -1131,8 +1179,8 @@ MonoBehaviour:
     m_ScrollPosition: {x: 0, y: 0}
     m_GridSize: 16
   m_SkipHiddenPackages: 0
-  m_DirectoriesAreaWidth: 560
---- !u!114 &20
+  m_DirectoriesAreaWidth: 235
+--- !u!114 &22
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1152,10 +1200,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 3000
+    x: -376
     y: 73
-    width: 439
-    height: 1286
+    width: 375
+    height: 926
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -1169,7 +1217,7 @@ MonoBehaviour:
   m_ObjectsLockedBeforeSerialization: []
   m_InstanceIDsLockedBeforeSerialization: 
   m_PreviewResizer:
-    m_CachedPref: 380
+    m_CachedPref: 298
     m_ControlHash: -371814159
     m_PrefName: Preview_InspectorPreview
   m_LastInspectedObjectInstanceID: -1