跳转场景工具修改

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("场景设置");
-            instance = GetWindow<SceneEditor>();
+        window.Show();
-            instance.titleContent = new GUIContent("场景设置");
-        }
-        else
-        {
-            instance.Close();
-            instance = null;
-        }
     }
 
-    VisualElement root;
+    protected override void OnEnable()
+    {
+        bootScenePath = JumpSceneEditor.SceneExists("Boot");
+        SetDropdown();
+    }
 
-    string bootScenePath;
-    Button bootBtn;
-    DropdownField cutSceneDropDown;
     Dictionary<string, string> sceneDic = new Dictionary<string, string>();
 
-    public void CreateGUI()
+    private static string bootScenePath;
-    {
+    private string bootBtnName = "运行游戏";
-        root = rootVisualElement;
 
-        m_VisualTreeAsset.CloneTree(root);
+    [Button("$bootBtnName", ButtonSizes.Large), PropertyOrder(3)]
-        root.styleSheets.Add(styleSheet);
+    public void BootBtnAction()
-
-        bootScenePath = JumpSceneEditor.SceneExists("Boot");
-
-        bootBtn = root.Q<VisualElement>("Root").Q<Button>("BootBtn");
-        bootBtn.clicked += () =>
     {
         JumpSceneEditor.JumpBootScene();
-        };
+    }
 
-        Button selectSceneBtn = root.Q<VisualElement>("Root").Q<Button>("SelectSceneBtn");
+    [ValueDropdown("dropDownSceneList"), PropertyOrder(1), LabelText("选择场景")]
-        selectSceneBtn.clicked += () =>
+    public string selectSceneName;
+
+    [Button("跳转场景", ButtonSizes.Large), PropertyOrder(2)]
+    public void JumpSceneAction()
     {
-            SceneAsset asset = AssetDatabase.LoadAssetAtPath<SceneAsset>(sceneDic[cutSceneDropDown.value]);
+        if (string.IsNullOrEmpty(selectSceneName))
+        {
+            return;
+        }
+
+        string scenePath = sceneDic[selectSceneName];
+
+        SceneAsset asset = AssetDatabase.LoadAssetAtPath<SceneAsset>(scenePath);
 
         EditorUtility.FocusProjectWindow();
         EditorGUIUtility.PingObject(asset);
         Selection.activeObject = asset;
-        };
 
-        SetDropdown();
+        if (EditorSceneManager.GetActiveScene().path != scenePath)
+        {
+            EditorSceneManager.OpenScene(scenePath, OpenSceneMode.Single);
+        }
+    }
+
+    private List<string> dropDownSceneList = new List<string>();
+
+    private void Update()
+    {
+        if (!Application.isPlaying)
+        {
+            // 打开或激活场景
+            if (EditorSceneManager.GetActiveScene().path != bootScenePath)
+            {
+                bootBtnName = "返回Boot场景";
+            }
+            else
+            {
+                bootBtnName = "运行游戏";
+            }
+        }
+        else
+        {
+            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 = "退出游戏";
-        }
     }
 }

client/Assets/Ether/Editor/Tools/SceneEditor/SceneEditor.uss

@@ -1,5 +0,0 @@
-.custom-label {
-    font-size: 20px;
-    -unity-font-style: bold;
-    color: rgb(68, 138, 255);
-}

client/Assets/Ether/Editor/Tools/SceneEditor/SceneEditor.uss.meta

@@ -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

client/Assets/Ether/Editor/Tools/SceneEditor/SceneEditor.uxml

@@ -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>

client/Assets/Ether/Editor/Tools/SceneEditor/SceneEditor.uxml.meta

@@ -1,10 +0,0 @@
-fileFormatVersion: 2
-guid: 4979e78cf344b5e458b3012c2fac286c
-ScriptedImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 2
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
-  script: {fileID: 13804, guid: 0000000000000000e000000000000000, type: 0}

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

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
+    width: 1920
-    height: 1357
+    height: 997
   m_ShowMode: 4
-  m_Title: Project
+  m_Title: Inspector
-  m_RootView: {fileID: 2}
+  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
+    width: 1920
-    height: 1357
+    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
+    y: 977
-    width: 3440
+    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: 8}
-  - {fileID: 13}
+  - {fileID: 15}
-  - {fileID: 14}
+  - {fileID: 16}
   m_Position:
     serializedVersion: 2
     x: 0
     y: 30
-    width: 3440
+    width: 1920
-    height: 1307
+    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: 9}
-  - {fileID: 10}
+  - {fileID: 12}
   m_Position:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 1897
+    width: 1059
-    height: 1307
+    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: 10}
-  - {fileID: 9}
+  - {fileID: 11}
   m_Position:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 1459
+    width: 754
-    height: 1307
+    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
+    width: 754
-    height: 564
+    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
+    y: 409
-    width: 1459
+    width: 754
-    height: 743
+    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: 13}
-  - {fileID: 12}
+  - {fileID: 14}
   m_Position:
     serializedVersion: 2
-    x: 1459
+    x: 754
     y: 0
-    width: 438
+    width: 305
-    height: 1307
+    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
+    width: 305
-    height: 569
+    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
+    y: 412
-    width: 438
+    width: 305
-    height: 738
+    height: 535
-  m_MinSize: {x: 102, y: 121}
+  m_MinSize: {x: 100, y: 100}
-  m_MaxSize: {x: 4002, y: 4021}
+  m_MaxSize: {x: 4000, y: 4000}
-  m_ActualView: {fileID: 18}
+  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
+    width: 485
-    height: 1307
+    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
+    width: 376
-    height: 1307
+    height: 947
-  m_MinSize: {x: 275, y: 50}
+  m_MinSize: {x: 276, y: 71}
-  m_MaxSize: {x: 4000, y: 4000}
+  m_MaxSize: {x: 4001, y: 4021}
-  m_ActualView: {fileID: 20}
+  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
+    x: -1920
-    y: 637
+    y: 482
-    width: 1458
+    width: 753
-    height: 722
+    height: 517
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -432,29 +480,29 @@ MonoBehaviour:
       serializedVersion: 2
       x: 0
       y: 21
-      width: 1458
+      width: 753
-      height: 701
+      height: 496
-    m_Scale: {x: 0.649074, y: 0.6490741}
+    m_Scale: {x: 0.3921875, y: 0.3921875}
-    m_Translation: {x: 729, y: 350.5}
+    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
+      x: -960
-      y: -540
+      y: -632.3506
-      width: 2246.2769
+      width: 1920
-      height: 1080
+      height: 1264.7012
     m_MinimalGUI: 1
-  m_defaultScale: 0.6490741
+  m_defaultScale: 0.3921875
-  m_LastWindowPixelSize: {x: 1458, y: 722}
+  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
+    width: 753
-    height: 543
+    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
+    width: 303
-    height: 548
+    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
+    x: -1166
-    y: 642
+    y: 485
-    width: 436
+    width: 303
-    height: 717
+    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
+    width: 483
-    height: 1286
+    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}
+    scrollPos: {x: 0, y: 60}
-    m_SelectedIDs: 086d0000
+    m_SelectedIDs: 24810000
-    m_LastClickedID: 27912
+    m_LastClickedID: 33060
-    m_ExpandedIDs: 00000000d46c0000dc6c0000e06c0000e86c0000ec6c0000167a0000187a00001a7a00001c7a00001e7a0000207a0000227a0000247a0000267a0000287a00002a7a00002c7a00002e7a0000307a0000327a0000367a0000387a00003a7a00003c7a00003e7a0000407a0000447a0000827c00008a7c0000d27c0000c68d0000cecf0000d0cf0000d2cf000060d10000ccd8000000ca9a3b
+    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_Name: FrameEditorWindow
-      m_OriginalName: 
+      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
+  m_DirectoriesAreaWidth: 235
---- !u!114 &20
+--- !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
+    width: 375
-    height: 1286
+    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