diff --git a/Client/Assets/Editor/Config/LubanConfigGenerate.cs b/Client/Assets/Editor/Config/LubanConfigGenerate.cs
index 51fa148..ca87467 100644
--- a/Client/Assets/Editor/Config/LubanConfigGenerate.cs
+++ b/Client/Assets/Editor/Config/LubanConfigGenerate.cs
@@ -1,45 +1,45 @@
-using UnityEngine;
-using System.Diagnostics;
-using System.IO;
-using AlicizaX.Editor.Extension;
-
-public static class LubanConfigGenerate
-{
-    [EditorToolFunction("Config/打表")]
-    static void GenerateLubanConfig()
-    {
-        ExecuteBatch("gen_code_bin_to_client_en.bat");
-        ExecuteBatch("gen_code_bin_to_client_zh.bat");
-        ExecuteBatch("gen_code_bin_to_client_jp.bat");
-    }
-
-    static void ExecuteBatch(string fileName)
-    {
-        // 构建正确路径：向上退两层到工程目录的父级，再进入Data/Config
-        string configPath = Path.GetFullPath(
-            Path.Combine(Application.dataPath, "..", "..", "Data", "Config")
-        );
-
-        ProcessStartInfo psi = new ProcessStartInfo()
-        {
-            FileName = fileName,
-            WorkingDirectory = configPath,
-            UseShellExecute = true,
-            CreateNoWindow = false,
-            WindowStyle = ProcessWindowStyle.Normal
-        };
-
-        try
-        {
-            using (Process process = Process.Start(psi))
-            {
-                process.WaitForExit(); // 等待执行完成（可选）
-                UnityEngine.Debug.Log($"已执行 {fileName}");
-            }
-        }
-        catch (System.Exception e)
-        {
-            UnityEngine.Debug.LogError($"执行失败：{e.Message}");
-        }
-    }
-}
+// using UnityEngine;
+// using System.Diagnostics;
+// using System.IO;
+// using AlicizaX.Editor.Extension;
+//
+// public static class LubanConfigGenerate
+// {
+//     [EditorToolFunction("Config/打表")]
+//     static void GenerateLubanConfig()
+//     {
+//         ExecuteBatch("gen_code_bin_to_client_en.bat");
+//         ExecuteBatch("gen_code_bin_to_client_zh.bat");
+//         ExecuteBatch("gen_code_bin_to_client_jp.bat");
+//     }
+//
+//     static void ExecuteBatch(string fileName)
+//     {
+//         // 构建正确路径：向上退两层到工程目录的父级，再进入Data/Config
+//         string configPath = Path.GetFullPath(
+//             Path.Combine(Application.dataPath, "..", "..", "Data", "Config")
+//         );
+//
+//         ProcessStartInfo psi = new ProcessStartInfo()
+//         {
+//             FileName = fileName,
+//             WorkingDirectory = configPath,
+//             UseShellExecute = true,
+//             CreateNoWindow = false,
+//             WindowStyle = ProcessWindowStyle.Normal
+//         };
+//
+//         try
+//         {
+//             using (Process process = Process.Start(psi))
+//             {
+//                 process.WaitForExit(); // 等待执行完成（可选）
+//                 UnityEngine.Debug.Log($"已执行 {fileName}");
+//             }
+//         }
+//         catch (System.Exception e)
+//         {
+//             UnityEngine.Debug.LogError($"执行失败：{e.Message}");
+//         }
+//     }
+// }
diff --git a/Client/Assets/Editor/Jenkins/JenkinsBuildCLI.cs b/Client/Assets/Editor/Jenkins/JenkinsBuildCLI.cs
index 4a4964d..eaa0887 100644
--- a/Client/Assets/Editor/Jenkins/JenkinsBuildCLI.cs
+++ b/Client/Assets/Editor/Jenkins/JenkinsBuildCLI.cs
@@ -1,71 +1,71 @@
-using System.IO;
-using AlicizaX.Editor.Extension;
-using AlicizaX;
-using AlicizaX.Debugger.Runtime;
-using UnityEditor;
-using UnityEngine;
-using YooAsset;
-using YooAsset.Editor;
-
-namespace BuildCLI
-{
-    public static class JenkinsBuildCLI
-    {
-        static string[] scenePath = new[] { "Assets/Scenes/Main.unity" };
-
-        [EditorToolFunction("Build/离线/EXE")]
-        public static void TestBuildExe()
-        {
-            AppBuildParameter parameter = new AppBuildParameter();
-            parameter.DevelopBuild = false;
-            parameter.ShowDebugWnd = DebuggerActiveWindowType.AlwaysOpen;
-            parameter.OutPutPath = "../Build";
-            parameter.FileName = "AlicizaX.exe";
-            parameter.Scenes = scenePath;
-            parameter.BuildTarget = BuildTarget.StandaloneWindows;
-            parameter.ResMode = (int)EPlayMode.OfflinePlayMode;
-            parameter.FullScreenMode = FullScreenMode.Windowed;
-            parameter.WindowedScreenSize = new Vector2Int(1280, 720);
-            parameter.Language = "ChineseSimplified";
-            AppBuildHelper.BuildApplication(parameter);
-        }
-
-        [EditorToolFunction("Build/离线/AB")]
-        public static void BuildOfflineRes()
-        {
-            ResourceBuildParameter buildParameter = new ResourceBuildParameter();
-            buildParameter.ResourceBuildTarget = BuildTarget.StandaloneWindows;
-            buildParameter.UseDefaultPackageVersion = true;
-            buildParameter.OutputPath = "../Bundle";
-            buildParameter.BuildMode = ResourceBuildMode.Offline;
-            ResourceBuildHelper.BuildResourcePackage(buildParameter);
-        }
-
-        [EditorToolFunction("Build/在线/EXE")]
-        public static void TestBuildOnlineExe()
-        {
-            AppBuildParameter parameter = new AppBuildParameter();
-            parameter.DevelopBuild = false;
-            parameter.ShowDebugWnd = DebuggerActiveWindowType.AlwaysOpen;
-            parameter.OutPutPath = "../Build";
-            parameter.FileName = "SAOK.exe";
-            parameter.Scenes = scenePath;
-            parameter.BuildTarget = BuildTarget.StandaloneWindows;
-            parameter.ResMode = (int)EPlayMode.HostPlayMode;
-            parameter.Language = "ChineseSimplified";
-            AppBuildHelper.BuildApplication(parameter);
-        }
-
-        [EditorToolFunction("Build/在线/AB")]
-        public static void TestBuildRes()
-        {
-            ResourceBuildParameter buildParameter = new ResourceBuildParameter();
-            buildParameter.ResourceBuildTarget = BuildTarget.StandaloneWindows;
-            buildParameter.UseDefaultPackageVersion = true;
-            buildParameter.OutputPath = "../Bundle";
-            buildParameter.BuildMode = ResourceBuildMode.Online;
-            buildParameter.EncryptionServiceType = string.Empty;
-            ResourceBuildHelper.BuildResourcePackage(buildParameter);
-        }
-    }
-}
+// using System.IO;
+// using AlicizaX.Editor.Extension;
+// using AlicizaX;
+// using AlicizaX.Debugger.Runtime;
+// using UnityEditor;
+// using UnityEngine;
+// using YooAsset;
+// using YooAsset.Editor;
+//
+// namespace BuildCLI
+// {
+//     public static class JenkinsBuildCLI
+//     {
+//         static string[] scenePath = new[] { "Assets/Scenes/Main.unity" };
+//
+//         [EditorToolFunction("Build/离线/EXE")]
+//         public static void TestBuildExe()
+//         {
+//             AppBuildParameter parameter = new AppBuildParameter();
+//             parameter.DevelopBuild = false;
+//             parameter.ShowDebugWnd = DebuggerActiveWindowType.AlwaysOpen;
+//             parameter.OutPutPath = "../Build";
+//             parameter.FileName = "AlicizaX.exe";
+//             parameter.Scenes = scenePath;
+//             parameter.BuildTarget = BuildTarget.StandaloneWindows;
+//             parameter.ResMode = (int)EPlayMode.OfflinePlayMode;
+//             parameter.FullScreenMode = FullScreenMode.Windowed;
+//             parameter.WindowedScreenSize = new Vector2Int(1280, 720);
+//             parameter.Language = "ChineseSimplified";
+//             AppBuildHelper.BuildApplication(parameter);
+//         }
+//
+//         [EditorToolFunction("Build/离线/AB")]
+//         public static void BuildOfflineRes()
+//         {
+//             ResourceBuildParameter buildParameter = new ResourceBuildParameter();
+//             buildParameter.ResourceBuildTarget = BuildTarget.StandaloneWindows;
+//             buildParameter.UseDefaultPackageVersion = true;
+//             buildParameter.OutputPath = "../Bundle";
+//             buildParameter.BuildMode = ResourceBuildMode.Offline;
+//             ResourceBuildHelper.BuildResourcePackage(buildParameter);
+//         }
+//
+//         [EditorToolFunction("Build/在线/EXE")]
+//         public static void TestBuildOnlineExe()
+//         {
+//             AppBuildParameter parameter = new AppBuildParameter();
+//             parameter.DevelopBuild = false;
+//             parameter.ShowDebugWnd = DebuggerActiveWindowType.AlwaysOpen;
+//             parameter.OutPutPath = "../Build";
+//             parameter.FileName = "SAOK.exe";
+//             parameter.Scenes = scenePath;
+//             parameter.BuildTarget = BuildTarget.StandaloneWindows;
+//             parameter.ResMode = (int)EPlayMode.HostPlayMode;
+//             parameter.Language = "ChineseSimplified";
+//             AppBuildHelper.BuildApplication(parameter);
+//         }
+//
+//         [EditorToolFunction("Build/在线/AB")]
+//         public static void TestBuildRes()
+//         {
+//             ResourceBuildParameter buildParameter = new ResourceBuildParameter();
+//             buildParameter.ResourceBuildTarget = BuildTarget.StandaloneWindows;
+//             buildParameter.UseDefaultPackageVersion = true;
+//             buildParameter.OutputPath = "../Bundle";
+//             buildParameter.BuildMode = ResourceBuildMode.Online;
+//             buildParameter.EncryptionServiceType = string.Empty;
+//             ResourceBuildHelper.BuildResourcePackage(buildParameter);
+//         }
+//     }
+// }
diff --git a/Client/Assets/Plugins/OM/Animora/Demos/Demo 3/Demo3Button.cs b/Client/Assets/Plugins/OM/Animora/Demos/Demo 3/Demo3Button.cs
index aed1da3..37a5178 100644
--- a/Client/Assets/Plugins/OM/Animora/Demos/Demo 3/Demo3Button.cs	
+++ b/Client/Assets/Plugins/OM/Animora/Demos/Demo 3/Demo3Button.cs	
@@ -15,7 +15,7 @@ namespace OM.Animora.Demos
         {
             clickAnimation?.StopAnimation();
             releaseAnimation?.StopAnimation();
-            
+
             hoverAnimation?.PlayAnimation();
         }
 
@@ -23,15 +23,16 @@ namespace OM.Animora.Demos
         {
             hoverAnimation?.StopAnimation();
             clickAnimation?.StopAnimation();
-            
+
             releaseAnimation?.PlayAnimation();
+
         }
 
         public void OnPointerClick(PointerEventData eventData)
         {
             hoverAnimation?.StopAnimation();
             releaseAnimation?.StopAnimation();
-            
+
             clickAnimation?.PlayAnimation();
         }
     }
diff --git a/Client/Assets/Plugins/OM/Animora/Editor/Core/AnimoraPlayerEditor.cs b/Client/Assets/Plugins/OM/Animora/Editor/Core/AnimoraPlayerEditor.cs
index 97d60d3..1611b95 100644
--- a/Client/Assets/Plugins/OM/Animora/Editor/Core/AnimoraPlayerEditor.cs
+++ b/Client/Assets/Plugins/OM/Animora/Editor/Core/AnimoraPlayerEditor.cs
@@ -117,9 +117,9 @@ namespace OM.Animora.Editor
                     field.style.marginBottom = 5;
                     continue;
                 }
-                
+
                 foldoutGroup.AddToContent(field);
-                
+
                 if (property.name == "playerUniqueID")
                 {
                     var helpBox = new HelpBox();
@@ -248,6 +248,7 @@ namespace OM.Animora.Editor
         private static List<Type> GetAllClipsFromAssembly()
         {
             return AppDomain.CurrentDomain.GetAssemblies()
+                .Where(t=>!t.FullName.Contains("Odin"))
                 .SelectMany(s => s.GetTypes())
                 .Where(t => typeof(AnimoraClip).IsAssignableFrom(t) && !t.IsInterface && !t.IsAbstract)
                 .ToList();
diff --git a/Client/Assets/Scripts/Hotfix/GameLogic/TestUIMono.cs b/Client/Assets/Scripts/Hotfix/GameLogic/TestUIMono.cs
index 8f30452..1b7d64a 100644
--- a/Client/Assets/Scripts/Hotfix/GameLogic/TestUIMono.cs
+++ b/Client/Assets/Scripts/Hotfix/GameLogic/TestUIMono.cs
@@ -1,22 +1,33 @@
-using System.Collections;
-using System.Collections.Generic;
 using UnityEngine;
+using UnityEngine.InputSystem;
+using UnityEngine.InputSystem.LowLevel;
 
-public class TestUIMono : MonoBehaviour
+public class NewInputSystemControllerEvents : MonoBehaviour
 {
-    [Sirenix.OdinInspector.Button]
-    public void ShowUI()
+    private void OnEnable()
     {
-        GameApp.UI.ShowUI<UILoadUpdate>();
+        InputSystem.onDeviceChange += OnDeviceChanged;
     }
-    [Sirenix.OdinInspector.Button]
-    public void CloseUI()
+
+    private void OnDisable()
     {
-        GameApp.UI.CloseUI<UILoadUpdate>();
+        InputSystem.onDeviceChange -= OnDeviceChanged;
     }
-    [Sirenix.OdinInspector.Button]
-    public void ForceCloseUI()
+
+    private void OnDeviceChanged(InputDevice device, InputDeviceChange change)
     {
-        GameApp.UI.CloseUI<UILoadUpdate>(true);
+        // 只关心游戏手柄
+        if (device is Gamepad)
+        {
+            switch (change)
+            {
+                case InputDeviceChange.Added:
+                    Debug.Log($"手柄已连接: {device.displayName}");
+                    break;
+                case InputDeviceChange.Removed:
+                    Debug.Log($"手柄已断开: {device.displayName}");
+                    break;
+            }
+        }
     }
 }
diff --git a/Client/Assets/Test.meta b/Client/Assets/Test.meta
deleted file mode 100644
index b652967..0000000
--- a/Client/Assets/Test.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 4025b873a159f75468339766a444fb0b
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Client/Assets/Test/GameBase.dll.bytes b/Client/Assets/Test/GameBase.dll.bytes
deleted file mode 100644
index a64de2a..0000000
Binary files a/Client/Assets/Test/GameBase.dll.bytes and /dev/null differ
diff --git a/Client/Assets/Test/GameBase.dll.bytes.meta b/Client/Assets/Test/GameBase.dll.bytes.meta
deleted file mode 100644
index fdd62e5..0000000
--- a/Client/Assets/Test/GameBase.dll.bytes.meta
+++ /dev/null
@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 01521bb4cc77d5845b437a3f9c31a223
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Client/Assets/Test/GameBase.pdb.bytes b/Client/Assets/Test/GameBase.pdb.bytes
deleted file mode 100644
index 678bceb..0000000
Binary files a/Client/Assets/Test/GameBase.pdb.bytes and /dev/null differ
diff --git a/Client/Assets/Test/GameBase.pdb.bytes.meta b/Client/Assets/Test/GameBase.pdb.bytes.meta
deleted file mode 100644
index b42c774..0000000
--- a/Client/Assets/Test/GameBase.pdb.bytes.meta
+++ /dev/null
@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 5e7e3af5205c28a4e880fe29616a369b
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Client/Assets/Test/GameLib.dll.bytes b/Client/Assets/Test/GameLib.dll.bytes
deleted file mode 100644
index a64aaf5..0000000
Binary files a/Client/Assets/Test/GameLib.dll.bytes and /dev/null differ
diff --git a/Client/Assets/Test/GameLib.dll.bytes.meta b/Client/Assets/Test/GameLib.dll.bytes.meta
deleted file mode 100644
index 55e13bc..0000000
--- a/Client/Assets/Test/GameLib.dll.bytes.meta
+++ /dev/null
@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 2fd69364c386ccf4c9583fa369bda920
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Client/Assets/Test/GameLib.pdb.bytes b/Client/Assets/Test/GameLib.pdb.bytes
deleted file mode 100644
index 6cf7627..0000000
Binary files a/Client/Assets/Test/GameLib.pdb.bytes and /dev/null differ
diff --git a/Client/Assets/Test/GameLib.pdb.bytes.meta b/Client/Assets/Test/GameLib.pdb.bytes.meta
deleted file mode 100644
index 7d166aa..0000000
--- a/Client/Assets/Test/GameLib.pdb.bytes.meta
+++ /dev/null
@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: dd6dc3322dbc30141b84af8c3483c087
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Client/Assets/Test/GameLogic.dll.bytes b/Client/Assets/Test/GameLogic.dll.bytes
deleted file mode 100644
index c22254e..0000000
Binary files a/Client/Assets/Test/GameLogic.dll.bytes and /dev/null differ
diff --git a/Client/Assets/Test/GameLogic.dll.bytes.meta b/Client/Assets/Test/GameLogic.dll.bytes.meta
deleted file mode 100644
index 9b97fec..0000000
--- a/Client/Assets/Test/GameLogic.dll.bytes.meta
+++ /dev/null
@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 086c9a47d8ecc0e4a839c266ebe693a0
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Client/Assets/Test/GameLogic.pdb.bytes b/Client/Assets/Test/GameLogic.pdb.bytes
deleted file mode 100644
index 992df92..0000000
Binary files a/Client/Assets/Test/GameLogic.pdb.bytes and /dev/null differ
diff --git a/Client/Assets/Test/GameLogic.pdb.bytes.meta b/Client/Assets/Test/GameLogic.pdb.bytes.meta
deleted file mode 100644
index a3bb4d8..0000000
--- a/Client/Assets/Test/GameLogic.pdb.bytes.meta
+++ /dev/null
@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: e6cf84ef7c70e874f948c8c55d882ef0
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Client/Assets/Test/GameProto.dll.bytes b/Client/Assets/Test/GameProto.dll.bytes
deleted file mode 100644
index 64e6dbf..0000000
Binary files a/Client/Assets/Test/GameProto.dll.bytes and /dev/null differ
diff --git a/Client/Assets/Test/GameProto.dll.bytes.meta b/Client/Assets/Test/GameProto.dll.bytes.meta
deleted file mode 100644
index 52aa807..0000000
--- a/Client/Assets/Test/GameProto.dll.bytes.meta
+++ /dev/null
@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 13c303c321c795544a66242210c0c62b
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Client/Assets/Test/GameProto.pdb.bytes b/Client/Assets/Test/GameProto.pdb.bytes
deleted file mode 100644
index a4f6a85..0000000
Binary files a/Client/Assets/Test/GameProto.pdb.bytes and /dev/null differ
diff --git a/Client/Assets/Test/GameProto.pdb.bytes.meta b/Client/Assets/Test/GameProto.pdb.bytes.meta
deleted file mode 100644
index eae7f4b..0000000
--- a/Client/Assets/Test/GameProto.pdb.bytes.meta
+++ /dev/null
@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 8475613a7f1b2944a9ca8fcac385e9ae
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Client/Bundles/StandaloneWindows/DefaultPackage/Simulate/DefaultPackage_Simulate.bytes b/Client/Bundles/StandaloneWindows/DefaultPackage/Simulate/DefaultPackage_Simulate.bytes
index 3883fc8..df7b908 100644
Binary files a/Client/Bundles/StandaloneWindows/DefaultPackage/Simulate/DefaultPackage_Simulate.bytes and b/Client/Bundles/StandaloneWindows/DefaultPackage/Simulate/DefaultPackage_Simulate.bytes differ
diff --git a/Client/Bundles/StandaloneWindows/DefaultPackage/Simulate/DefaultPackage_Simulate.hash b/Client/Bundles/StandaloneWindows/DefaultPackage/Simulate/DefaultPackage_Simulate.hash
index 41e7126..ba6364a 100644
--- a/Client/Bundles/StandaloneWindows/DefaultPackage/Simulate/DefaultPackage_Simulate.hash
+++ b/Client/Bundles/StandaloneWindows/DefaultPackage/Simulate/DefaultPackage_Simulate.hash
@@ -1 +1 @@
-61aca583
\ No newline at end of file
+70bf86ea
\ No newline at end of file
diff --git a/Client/Bundles/StandaloneWindows/DefaultPackage/Simulate/DefaultPackage_Simulate.json b/Client/Bundles/StandaloneWindows/DefaultPackage/Simulate/DefaultPackage_Simulate.json
index 001ec14..31ac0f2 100644
--- a/Client/Bundles/StandaloneWindows/DefaultPackage/Simulate/DefaultPackage_Simulate.json
+++ b/Client/Bundles/StandaloneWindows/DefaultPackage/Simulate/DefaultPackage_Simulate.json
@@ -10,7 +10,7 @@
     "BuildPipeline": "EditorSimulateBuildPipeline",
     "PackageName": "DefaultPackage",
     "PackageVersion": "Simulate",
-    "PackageNote": "2025/11/17 16:47:28",
+    "PackageNote": "2025/11/17 16:58:36",
     "AssetList": [
         {
             "Address": "A1",
diff --git a/Client/Packages/com.alicizax.unity.editor.extension b/Client/Packages/com.alicizax.unity.editor.extension
index d124be0..d68d1a6 160000
--- a/Client/Packages/com.alicizax.unity.editor.extension
+++ b/Client/Packages/com.alicizax.unity.editor.extension
@@ -1 +1 @@
-Subproject commit d124be0855fb459853b8dac3f9e2d7bf123b03d8
+Subproject commit d68d1a6d013f0dfd56689a23fbbe0d1dd15bf35d
diff --git a/Client/Packages/com.alicizax.unity.framework b/Client/Packages/com.alicizax.unity.framework
index de62954..f43eb73 160000
--- a/Client/Packages/com.alicizax.unity.framework
+++ b/Client/Packages/com.alicizax.unity.framework
@@ -1 +1 @@
-Subproject commit de6295476535d0f9d075b5b5e6f1592514fba229
+Subproject commit f43eb7344e5b93ab631dfebccce1eba0923d41aa
diff --git a/Client/Packages/com.alicizax.unity.packagemanager b/Client/Packages/com.alicizax.unity.packagemanager
index e228240..64e2e1f 160000
--- a/Client/Packages/com.alicizax.unity.packagemanager
+++ b/Client/Packages/com.alicizax.unity.packagemanager
@@ -1 +1 @@
-Subproject commit e22824021265cb1d45e3aab7207579c3eed559e4
+Subproject commit 64e2e1f8c2e166e2cc298d40d4b66377c5ba96a6
diff --git a/Client/Packages/manifest.json b/Client/Packages/manifest.json
index 0d4371f..17dd49a 100644
--- a/Client/Packages/manifest.json
+++ b/Client/Packages/manifest.json
@@ -4,7 +4,6 @@
     "com.code-philosophy.hybridclr": "https://gitee.com/focus-creative-games/hybridclr_unity.git",
     "com.code-philosophy.luban": "http://101.34.252.46:3000/yuliuren/luban_unity.git",
     "com.kyrylokuzyk.primetween": "http://101.34.252.46:3000/AlicizaX/com.alicizax.kyrylokuzyk.primetween.git",
-    "com.unity.editorcoroutines": "1.0.0",
     "com.unity.ide.rider": "3.0.34",
     "com.unity.ide.visualstudio": "2.0.23",
     "com.unity.inputsystem": "1.13.1",
diff --git a/Client/Packages/packages-lock.json b/Client/Packages/packages-lock.json
index a0a1997..1cd7b73 100644
--- a/Client/Packages/packages-lock.json
+++ b/Client/Packages/packages-lock.json
@@ -23,9 +23,7 @@
       "version": "file:com.alicizax.unity.editor.extension",
       "depth": 0,
       "source": "embedded",
-      "dependencies": {
-        "com.unity.serialization": "3.1.2"
-      }
+      "dependencies": {}
     },
     "com.alicizax.unity.entry": {
       "version": "file:com.alicizax.unity.entry",
@@ -103,28 +101,16 @@
       },
       "url": "https://packages.unity.cn"
     },
-    "com.unity.collections": {
-      "version": "2.4.2",
-      "depth": 2,
-      "source": "registry",
-      "dependencies": {
-        "com.unity.burst": "1.8.13",
-        "com.unity.nuget.mono-cecil": "1.11.4",
-        "com.unity.test-framework": "1.4.3",
-        "com.unity.test-framework.performance": "3.0.3"
-      },
-      "url": "https://packages.unity.cn"
-    },
     "com.unity.editorcoroutines": {
       "version": "1.0.0",
-      "depth": 0,
+      "depth": 1,
       "source": "registry",
       "dependencies": {},
       "url": "https://packages.unity.cn"
     },
     "com.unity.ext.nunit": {
-      "version": "2.0.3",
-      "depth": 4,
+      "version": "1.0.6",
+      "depth": 1,
       "source": "registry",
       "dependencies": {},
       "url": "https://packages.unity.cn"
@@ -163,13 +149,6 @@
       "dependencies": {},
       "url": "https://packages.unity.cn"
     },
-    "com.unity.nuget.mono-cecil": {
-      "version": "1.11.4",
-      "depth": 3,
-      "source": "registry",
-      "dependencies": {},
-      "url": "https://packages.unity.cn"
-    },
     "com.unity.nuget.newtonsoft-json": {
       "version": "3.2.1",
       "depth": 0,
@@ -222,16 +201,6 @@
       "dependencies": {},
       "url": "https://packages.unity.cn"
     },
-    "com.unity.serialization": {
-      "version": "3.1.2",
-      "depth": 1,
-      "source": "registry",
-      "dependencies": {
-        "com.unity.collections": "2.4.2",
-        "com.unity.burst": "1.7.2"
-      },
-      "url": "https://packages.unity.cn"
-    },
     "com.unity.shadergraph": {
       "version": "14.0.11",
       "depth": 1,
@@ -242,26 +211,16 @@
       }
     },
     "com.unity.test-framework": {
-      "version": "1.4.3",
-      "depth": 3,
+      "version": "1.1.33",
+      "depth": 1,
       "source": "registry",
       "dependencies": {
-        "com.unity.ext.nunit": "2.0.3",
+        "com.unity.ext.nunit": "1.0.6",
         "com.unity.modules.imgui": "1.0.0",
         "com.unity.modules.jsonserialize": "1.0.0"
       },
       "url": "https://packages.unity.cn"
     },
-    "com.unity.test-framework.performance": {
-      "version": "3.0.3",
-      "depth": 3,
-      "source": "registry",
-      "dependencies": {
-        "com.unity.test-framework": "1.1.31",
-        "com.unity.modules.jsonserialize": "1.0.0"
-      },
-      "url": "https://packages.unity.cn"
-    },
     "com.unity.textmeshpro": {
       "version": "3.0.9",
       "depth": 0,
diff --git a/Client/UserSettings/EditorUserSettings.asset b/Client/UserSettings/EditorUserSettings.asset
index fa8d297..4bed5b5 100644
--- a/Client/UserSettings/EditorUserSettings.asset
+++ b/Client/UserSettings/EditorUserSettings.asset
@@ -9,32 +9,32 @@ EditorUserSettings:
       value: 18134705175a055722080a3115371d4a0d55006876786860616b0471b8b07a68ffab74f9ee2a3a30300cea1a11320d0beb1a0c25f7060f494b4cc80018eb09361fc211cb1f862d19c51d19dcc413d6ade0d8ddfcddf9f4d9d29195fcfde6ebeae6f0a9c9afa6f8c5b89ff7a1aacececac4eba4d7c9d28bda
       flags: 0
     RecentlyUsedSceneGuid-0:
-      value: 0154555f01030b02095c5f7746760d44434f407f2d7f76317d784d61b1e6313c
-      flags: 0
-    RecentlyUsedSceneGuid-1:
-      value: 0004045001000a0b0e0f5f7449775d1146154f29787825652e784563e6b53669
-      flags: 0
-    RecentlyUsedSceneGuid-2:
-      value: 5a52050453545b59545f082143770d464e4f497c7c2e27672e2d1b35b2e4606c
-      flags: 0
-    RecentlyUsedSceneGuid-3:
-      value: 5202055155065d0c0f0d597246770f45104f402e7f297e672f2d4d6abab2366b
-      flags: 0
-    RecentlyUsedSceneGuid-4:
-      value: 5204045351045a025b5b542345770b45404f41787e7c25677c2f4563b7e26568
-      flags: 0
-    RecentlyUsedSceneGuid-5:
-      value: 0505045406565e080c59097440205d4444164f727d7d76367d7d1c63e3b9646d
-      flags: 0
-    RecentlyUsedSceneGuid-6:
       value: 5001560504060c590f5b0f7245725a44404f1d7c297e2233787e4a36b5e4666b
       flags: 0
-    RecentlyUsedSceneGuid-7:
+    RecentlyUsedSceneGuid-1:
       value: 5150560751510a0a5d58557541715b44121648737b7e27677d2a4b61e7b06068
       flags: 0
-    RecentlyUsedSceneGuid-8:
+    RecentlyUsedSceneGuid-2:
       value: 5a07065703500c59585e0e7748770d44444f4a737d2d7f35787d4f63e0b26668
       flags: 0
+    RecentlyUsedSceneGuid-3:
+      value: 55000051065150035b5f5e7042770c41441641292a7f24657c7a1b35b7b9603a
+      flags: 0
+    RecentlyUsedSceneGuid-4:
+      value: 065050035c035d5d590f082344775d13154e4a792e297369752c1867e1e3636d
+      flags: 0
+    RecentlyUsedSceneGuid-5:
+      value: 5b55075f56030d590b5d5574127707474f4f487b2d7d7f362c2c4564e1b5603e
+      flags: 0
+    RecentlyUsedSceneGuid-6:
+      value: 0200010555015e0a5e5f0d2341775b15414f4a7f787d22367b2d4967b4b6623c
+      flags: 0
+    RecentlyUsedSceneGuid-7:
+      value: 500803525d0d0f585e0a5c7046770615174e1c2c282c71347d2b4a32bbe56168
+      flags: 0
+    RecentlyUsedSceneGuid-8:
+      value: 07570502540759090e59587047775c48414f1b7d757924687d714432e6b93561
+      flags: 0
     RecentlyUsedSceneGuid-9:
       value: 50500404540c580d0f0b5e7543725b44424f4c7a7b7c7734747e4f36e4b1676d
       flags: 0
diff --git a/Client/UserSettings/Layouts/default-2022.dwlt b/Client/UserSettings/Layouts/default-2022.dwlt
index ea8434a..c643e14 100644
--- a/Client/UserSettings/Layouts/default-2022.dwlt
+++ b/Client/UserSettings/Layouts/default-2022.dwlt
@@ -19,7 +19,7 @@ MonoBehaviour:
     width: 1920
     height: 997
   m_ShowMode: 4
-  m_Title: Inspector
+  m_Title: Project
   m_RootView: {fileID: 4}
   m_MinSize: {x: 875, y: 300}
   m_MaxSize: {x: 10000, y: 10000}
@@ -41,10 +41,10 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 349
-    width: 310
+    width: 384
     height: 598
-  m_MinSize: {x: 50, y: 50}
-  m_MaxSize: {x: 4000, y: 4000}
+  m_MinSize: {x: 51, y: 71}
+  m_MaxSize: {x: 4001, y: 4021}
   m_ActualView: {fileID: 14}
   m_Panes:
   - {fileID: 14}
@@ -69,7 +69,7 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 310
+    width: 384
     height: 947
   m_MinSize: {x: 100, y: 100}
   m_MaxSize: {x: 8096, y: 16192}
@@ -173,7 +173,7 @@ MonoBehaviour:
   m_MinSize: {x: 400, y: 100}
   m_MaxSize: {x: 32384, y: 16192}
   vertical: 0
-  controlID: 159
+  controlID: 144
   draggingID: 0
 --- !u!114 &8
 MonoBehaviour:
@@ -192,10 +192,10 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 310
+    width: 384
     height: 349
-  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: 16}
   m_Panes:
   - {fileID: 15}
@@ -219,14 +219,14 @@ MonoBehaviour:
   - {fileID: 11}
   m_Position:
     serializedVersion: 2
-    x: 310
+    x: 384
     y: 0
-    width: 214
+    width: 349
     height: 947
   m_MinSize: {x: 100, y: 100}
   m_MaxSize: {x: 8096, y: 16192}
   vertical: 1
-  controlID: 71
+  controlID: 70
   draggingID: 0
 --- !u!114 &10
 MonoBehaviour:
@@ -245,10 +245,10 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 214
+    width: 349
     height: 454
-  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: 17}
   m_Panes:
   - {fileID: 17}
@@ -271,10 +271,10 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 454
-    width: 214
+    width: 349
     height: 493
-  m_MinSize: {x: 100, y: 100}
-  m_MaxSize: {x: 4000, y: 4000}
+  m_MinSize: {x: 102, y: 121}
+  m_MaxSize: {x: 4002, y: 4021}
   m_ActualView: {fileID: 18}
   m_Panes:
   - {fileID: 18}
@@ -295,9 +295,9 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 524
+    x: 733
     y: 0
-    width: 718
+    width: 542
     height: 947
   m_MinSize: {x: 232, y: 271}
   m_MaxSize: {x: 10002, y: 10021}
@@ -321,12 +321,12 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 1242
+    x: 1275
     y: 0
-    width: 678
+    width: 645
     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: 20}
   m_Panes:
   - {fileID: 20}
@@ -353,8 +353,8 @@ MonoBehaviour:
   m_Pos:
     serializedVersion: 2
     x: 0
-    y: 422
-    width: 309
+    y: 368
+    width: 383
     height: 577
   m_SerializedDataModeController:
     m_DataMode: 0
@@ -408,10 +408,10 @@ MonoBehaviour:
       serializedVersion: 2
       x: 0
       y: 21
-      width: 309
+      width: 383
       height: 556
-    m_Scale: {x: 0.1609375, y: 0.1609375}
-    m_Translation: {x: 154.5, y: 278}
+    m_Scale: {x: 0.19947916, y: 0.19947916}
+    m_Translation: {x: 191.5, y: 278}
     m_MarginLeft: 0
     m_MarginRight: 0
     m_MarginTop: 0
@@ -419,12 +419,12 @@ MonoBehaviour:
     m_LastShownAreaInsideMargins:
       serializedVersion: 2
       x: -960
-      y: -1727.3787
+      y: -1393.6293
       width: 1920
-      height: 3454.7573
+      height: 2787.2585
     m_MinimalGUI: 1
-  m_defaultScale: 0.1609375
-  m_LastWindowPixelSize: {x: 309, y: 577}
+  m_defaultScale: 0.19947916
+  m_LastWindowPixelSize: {x: 383, y: 577}
   m_ClearInEditMode: 1
   m_NoCameraWarning: 1
   m_LowResolutionForAspectRatios: 01000000000000000000
@@ -521,8 +521,8 @@ MonoBehaviour:
   m_Pos:
     serializedVersion: 2
     x: 0
-    y: 73
-    width: 309
+    y: 19
+    width: 383
     height: 328
   m_SerializedDataModeController:
     m_DataMode: 0
@@ -1038,9 +1038,9 @@ MonoBehaviour:
   m_PlayAudio: 0
   m_AudioPlay: 0
   m_Position:
-    m_Target: {x: 1000, y: 1000, z: 100}
+    m_Target: {x: 1003.35834, y: 1000.82605, z: 72.74349}
     speed: 2
-    m_Value: {x: 1000, y: 1000, z: 100}
+    m_Value: {x: 1003.35834, y: 1000.82605, z: 72.74349}
   m_RenderMode: 0
   m_CameraMode:
     drawMode: 0
@@ -1090,9 +1090,9 @@ MonoBehaviour:
     speed: 2
     m_Value: {x: 0, y: 0, z: 0, w: 1}
   m_Size:
-    m_Target: 10.198668
+    m_Target: 8.634334
     speed: 2
-    m_Value: 10.198668
+    m_Value: 8.634334
   m_Ortho:
     m_Target: 1
     speed: 2
@@ -1137,9 +1137,9 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 310
+    x: 384
     y: 73
-    width: 212
+    width: 347
     height: 433
   m_SerializedDataModeController:
     m_DataMode: 0
@@ -1156,7 +1156,7 @@ MonoBehaviour:
       scrollPos: {x: 0, y: 0}
       m_SelectedIDs: 
       m_LastClickedID: 0
-      m_ExpandedIDs: 22fbffff
+      m_ExpandedIDs: 1eddffff20ddffff00e9ffff2ee9ffff30e9ffff32eaffff80edffff76f3ffff9cf3ffff28f9ffff22fbffffea8400006085000072850000e6870000008800000a8800001a880000228800003e88000048880000528800005c880000
       m_RenameOverlay:
         m_UserAcceptedRename: 0
         m_Name: 
@@ -1200,9 +1200,9 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 310
+    x: 384
     y: 527
-    width: 212
+    width: 347
     height: 472
   m_SerializedDataModeController:
     m_DataMode: 0
@@ -1234,9 +1234,9 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 524
+    x: 733
     y: 73
-    width: 716
+    width: 540
     height: 926
   m_SerializedDataModeController:
     m_DataMode: 0
@@ -1258,7 +1258,8 @@ MonoBehaviour:
     m_ShowAllHits: 0
     m_SkipHidden: 0
     m_SearchArea: 1
-    m_Folders: []
+    m_Folders:
+    - Packages/com.alicizax.unity.editor.extension/Editor/Toolbar
     m_Globs: []
     m_OriginalText: 
     m_ImportLogFlags: 0
@@ -1274,7 +1275,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: e48c0000
     m_LastClickedID: 36068
-    m_ExpandedIDs: 000000007a280000ee800000f0800000f2800000f4800000f6800000f8800000fa800000fc800000fe80000000810000028100000481000006810000088100000a8100000c8100000e81000010810000128100001481000016810000188100001a8100001c8100001e81000020810000228100002481000026810000288100002a8100002c8100002e81000030810000328100003481000036810000388100003a8100003c8100003e81000040810000428100004481000046810000488100004a8100004c8100004e81000050810000528100005481000056810000588100005a8100005c8100005e81000060810000628100006481000066810000688100006a8100006c8100006e81000070810000728100007481000076810000788100007a8100007c8100007e81000080810000828100008481000086810000888100008a8100008c8100008e81000090810000928100009481000096810000988100009a8100009c8100009e810000a0810000a2810000a4810000a6810000a8810000aa810000ac810000ae810000b0810000b2810000b4810000b6810000b8810000ba810000bc810000be810000c0810000c2810000c4810000c6810000c8810000ca810000cc810000ce810000d0810000d2810000d4810000d6810000d8810000da810000dc810000de810000e0810000e2810000e4810000e6810000e8810000ea810000ec810000ee810000f0810000f2810000f4810000f6810000f8810000fa810000fc810000fe81000000820000028200000482000006820000088200000a8200000c8200000e82000010820000128200001482000016820000188200001a8200001c8200001e82000020820000228200002482000026820000288200002a8200002c8200002e82000030820000328200003482000036820000388200003a8200003c8200003e82000040820000428200004482000046820000488200004a8200004c8200004e82000050820000528200005482000056820000588200005a8200005c8200005e820000608200006282000064820000
+    m_ExpandedIDs: 000000009c8200009e820000a0820000a2820000a4820000a6820000a8820000aa820000ac820000ae820000b0820000b2820000b4820000b6820000b8820000ba820000bc820000be820000c0820000c2820000c4820000c6820000c8820000ca820000cc820000ce820000d0820000d2820000d4820000d6820000d8820000da820000dc820000de820000e0820000e2820000e4820000e6820000e8820000ea820000ec820000ee820000f0820000f2820000f4820000f6820000f8820000fa820000fc820000fe82000000830000028300000483000006830000088300000a8300000c8300000e83000010830000128300001483000016830000188300001a8300001c8300001e83000020830000228300002483000026830000288300002a8300002c8300002e83000030830000328300003483000036830000388300003a8300003c8300003e83000040830000428300004483000046830000488300004a8300004c8300004e83000050830000528300005483000056830000588300005a8300005c8300005e83000060830000628300006483000066830000688300006a8300006c8300006e83000070830000728300007483000076830000788300007a8300007c8300007e83000080830000828300008483000086830000888300008a8300008c8300008e83000090830000928300009483000096830000988300009a8300009c8300009e830000a0830000a2830000a4830000a6830000a8830000aa830000ac830000ae830000b0830000b2830000b4830000b6830000b8830000ba830000bc830000be830000c0830000c2830000c4830000c6830000c8830000ca830000cc830000ce830000d0830000d2830000d4830000d6830000d8830000da830000dc830000de830000e0830000e2830000e4830000e6830000e8830000ea830000ec830000ee830000f0830000f2830000f4830000f6830000f8830000fa830000fc830000fe83000000840000028400000484000006840000088400000a8400000c8400000e8400001084000012840000148400001684000018840000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -1302,21 +1303,21 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: ffffffff00000000ee800000f0800000f2800000f4800000f6800000f8800000fa800000fc800000fe80000000810000028100000481000006810000088100000a8100000c8100000e81000010810000128100001481000016810000188100001c8100001e81000020810000228100002481000026810000288100002a8100002c8100002e81000030810000328100003481000036810000388100003a8100003c8100003e810000428100004481000046810000488100004a8100004c8100004e81000050810000528100005481000056810000588100005a8100005c8100005e81000060810000628100006481000066810000688100006a8100006c8100006e81000070810000728100007481000076810000788100007a8100007c8100007e81000080810000828100008481000086810000888100008a8100008c8100008e81000090810000928100009481000096810000988100009a8100009c8100009e810000a0810000a2810000a4810000a6810000a8810000aa810000ac810000ae810000b0810000b2810000b4810000b6810000b8810000ba810000bc810000be810000c0810000c2810000c4810000c6810000c8810000ca810000cc810000ce810000d0810000d2810000d4810000d6810000d8810000da810000dc810000de810000e0810000e2810000e4810000e6810000e8810000ea810000ec810000ee810000f0810000f2810000f4810000f6810000f8810000fa810000fc810000fe81000000820000028200000482000006820000088200000a8200000c8200000e82000010820000128200001482000016820000188200001a8200001c8200001e82000020820000228200002482000026820000288200002a8200002c8200002e82000030820000328200003482000036820000388200003a8200003c8200003e82000040820000428200004482000046820000488200004a8200004c8200004e82000050820000568200005a8200005c8200005e8200006282000070820000c6820000d2820000ec8200000a8400006a86000074860000768600007a8600007c860000ffffff7f
+    m_ExpandedIDs: ffffffff000000009c8200009e820000a0820000a2820000a4820000a6820000a8820000aa820000ac820000b0820000b2820000b4820000b8820000ba820000be820000c0820000c2820000c4820000c6820000c8820000ca820000cc820000ce820000d0820000d2820000d4820000d6820000d8820000da820000dc820000de820000e0820000e2820000e4820000e6820000e8820000ea820000ec820000ee820000f0820000f2820000f4820000f6820000f8820000fa820000fc820000fe820000008300000283000006830000088300000a8300000c8300000e83000010830000128300001483000016830000188300001a8300001c8300001e83000020830000228300002483000026830000288300002a8300002c8300002e83000030830000328300003483000036830000388300003a8300003c8300003e83000040830000428300004483000046830000488300004a8300004c8300004e83000050830000528300005483000056830000588300005a8300005c8300005e83000060830000628300006483000066830000688300006a8300006c8300006e83000070830000728300007483000076830000788300007a8300007c8300007e83000080830000828300008483000086830000888300008a8300008c8300008e83000090830000928300009483000096830000988300009a8300009c8300009e830000a0830000a2830000a4830000a6830000a8830000aa830000ac830000ae830000b0830000b2830000b4830000b6830000b8830000ba830000bc830000be830000c0830000c2830000c4830000c6830000c8830000ca830000cc830000ce830000d0830000d2830000d4830000d6830000d8830000da830000dc830000de830000e0830000e2830000e4830000e6830000e8830000ea830000ec830000ee830000f0830000f2830000f4830000f6830000f8830000fa830000fc830000fe830000008400000284000004840000088400000a8400000e840000108400001484000016840000928400009a840000a0840000a6840000ae840000b0840000b2840000b4840000b6840000b8840000ea880000ec880000f8880000fa880000d6890000e6890000e8890000ee890000248a0000268a0000ffffff7f
     m_RenameOverlay:
       m_UserAcceptedRename: 0
-      m_Name: BuildParameter
-      m_OriginalName: BuildParameter
+      m_Name: 
+      m_OriginalName: 
       m_EditFieldRect:
         serializedVersion: 2
         x: 0
         y: 0
         width: 0
         height: 0
-      m_UserData: 13586
+      m_UserData: 0
       m_IsWaitingForDelay: 0
       m_IsRenaming: 0
-      m_OriginalEventType: 0
+      m_OriginalEventType: 11
       m_IsRenamingFilename: 1
       m_ClientGUIView: {fileID: 12}
     m_SearchString: 
@@ -1378,9 +1379,9 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1242
+    x: 1275
     y: 73
-    width: 677
+    width: 644
     height: 926
   m_SerializedDataModeController:
     m_DataMode: 0
@@ -1395,11 +1396,11 @@ MonoBehaviour:
   m_ObjectsLockedBeforeSerialization: []
   m_InstanceIDsLockedBeforeSerialization: 
   m_PreviewResizer:
-    m_CachedPref: 161
+    m_CachedPref: 469
     m_ControlHash: 1412526313
     m_PrefName: Preview_InspectorPreview
   m_LastInspectedObjectInstanceID: -1
-  m_LastVerticalScrollValue: 0
+  m_LastVerticalScrollValue: 271
   m_GlobalObjectId: 
   m_InspectorMode: 0
   m_LockTracker:
diff --git a/Client/UserSettings/unity-toolbar-extender-ui-toolkit/overrides/overrides.json b/Client/UserSettings/unity-toolbar-extender-ui-toolkit/overrides/overrides.json
index b81cba8..2fdf21c 100644
--- a/Client/UserSettings/unity-toolbar-extender-ui-toolkit/overrides/overrides.json
+++ b/Client/UserSettings/unity-toolbar-extender-ui-toolkit/overrides/overrides.json
@@ -1,167 +1 @@
-{
-    "AccountDropdown": {
-        "$type": "Paps.UnityToolbarExtenderUIToolkit.UserSettingsFileMainToolbarElementOverrideRepository+SerializableOverride, Paps.UnityToolbarExtenderUIToolkit",
-        "ElementId": "AccountDropdown",
-        "Visible": false
-    },
-    "CloudButton": {
-        "$type": "Paps.UnityToolbarExtenderUIToolkit.UserSettingsFileMainToolbarElementOverrideRepository+SerializableOverride, Paps.UnityToolbarExtenderUIToolkit",
-        "ElementId": "CloudButton",
-        "Visible": false
-    },
-    "FrameStepButton": {
-        "$type": "Paps.UnityToolbarExtenderUIToolkit.UserSettingsFileMainToolbarElementOverrideRepository+SerializableOverride, Paps.UnityToolbarExtenderUIToolkit",
-        "ElementId": "FrameStepButton",
-        "Visible": true
-    },
-    "SliderSubgroup": {
-        "$type": "Paps.UnityToolbarExtenderUIToolkit.UserSettingsFileMainToolbarElementOverrideRepository+SerializableOverride, Paps.UnityToolbarExtenderUIToolkit",
-        "ElementId": "SliderSubgroup",
-        "Visible": false
-    },
-    "UnityTypesElementsGroup": {
-        "$type": "Paps.UnityToolbarExtenderUIToolkit.UserSettingsFileMainToolbarElementOverrideRepository+SerializableOverride, Paps.UnityToolbarExtenderUIToolkit",
-        "ElementId": "UnityTypesElementsGroup",
-        "Visible": false
-    },
-    "SampleRootGroup": {
-        "$type": "Paps.UnityToolbarExtenderUIToolkit.UserSettingsFileMainToolbarElementOverrideRepository+SerializableOverride, Paps.UnityToolbarExtenderUIToolkit",
-        "ElementId": "SampleRootGroup",
-        "Visible": false
-    },
-    "SampleGroupWithSubgroups": {
-        "$type": "Paps.UnityToolbarExtenderUIToolkit.UserSettingsFileMainToolbarElementOverrideRepository+SerializableOverride, Paps.UnityToolbarExtenderUIToolkit",
-        "ElementId": "SampleGroupWithSubgroups",
-        "Visible": true
-    },
-    "ElementsWithSerialization": {
-        "$type": "Paps.UnityToolbarExtenderUIToolkit.UserSettingsFileMainToolbarElementOverrideRepository+SerializableOverride, Paps.UnityToolbarExtenderUIToolkit",
-        "ElementId": "ElementsWithSerialization",
-        "Visible": false
-    },
-    "DropdownWithSubWindowSubgroup": {
-        "$type": "Paps.UnityToolbarExtenderUIToolkit.UserSettingsFileMainToolbarElementOverrideRepository+SerializableOverride, Paps.UnityToolbarExtenderUIToolkit",
-        "ElementId": "DropdownWithSubWindowSubgroup",
-        "Visible": false
-    },
-    "DropdownFieldSubgroup": {
-        "$type": "Paps.UnityToolbarExtenderUIToolkit.UserSettingsFileMainToolbarElementOverrideRepository+SerializableOverride, Paps.UnityToolbarExtenderUIToolkit",
-        "ElementId": "DropdownFieldSubgroup",
-        "Visible": false
-    },
-    "ButtonSubgroup": {
-        "$type": "Paps.UnityToolbarExtenderUIToolkit.UserSettingsFileMainToolbarElementOverrideRepository+SerializableOverride, Paps.UnityToolbarExtenderUIToolkit",
-        "ElementId": "ButtonSubgroup",
-        "Visible": true
-    },
-    "VersionControlButton": {
-        "$type": "Paps.UnityToolbarExtenderUIToolkit.UserSettingsFileMainToolbarElementOverrideRepository+SerializableOverride, Paps.UnityToolbarExtenderUIToolkit",
-        "ElementId": "VersionControlButton",
-        "Visible": false
-    },
-    "StoreButton": {
-        "$type": "Paps.UnityToolbarExtenderUIToolkit.UserSettingsFileMainToolbarElementOverrideRepository+SerializableOverride, Paps.UnityToolbarExtenderUIToolkit",
-        "ElementId": "StoreButton",
-        "Visible": false
-    },
-    "LayoutDropdown": {
-        "$type": "Paps.UnityToolbarExtenderUIToolkit.UserSettingsFileMainToolbarElementOverrideRepository+SerializableOverride, Paps.UnityToolbarExtenderUIToolkit",
-        "ElementId": "LayoutDropdown",
-        "Visible": true
-    },
-    "SampleButton": {
-        "$type": "Paps.UnityToolbarExtenderUIToolkit.UserSettingsFileMainToolbarElementOverrideRepository+SerializableOverride, Paps.UnityToolbarExtenderUIToolkit",
-        "ElementId": "SampleButton",
-        "Visible": false
-    },
-    "SampleButtonToggle": {
-        "$type": "Paps.UnityToolbarExtenderUIToolkit.UserSettingsFileMainToolbarElementOverrideRepository+SerializableOverride, Paps.UnityToolbarExtenderUIToolkit",
-        "ElementId": "SampleButtonToggle",
-        "Visible": false
-    },
-    "SampleButtonWithIcon": {
-        "$type": "Paps.UnityToolbarExtenderUIToolkit.UserSettingsFileMainToolbarElementOverrideRepository+SerializableOverride, Paps.UnityToolbarExtenderUIToolkit",
-        "ElementId": "SampleButtonWithIcon",
-        "Visible": true
-    },
-    "SampleEnumField": {
-        "$type": "Paps.UnityToolbarExtenderUIToolkit.UserSettingsFileMainToolbarElementOverrideRepository+SerializableOverride, Paps.UnityToolbarExtenderUIToolkit",
-        "ElementId": "SampleEnumField",
-        "Visible": false
-    },
-    "SampleDropdownField": {
-        "$type": "Paps.UnityToolbarExtenderUIToolkit.UserSettingsFileMainToolbarElementOverrideRepository+SerializableOverride, Paps.UnityToolbarExtenderUIToolkit",
-        "ElementId": "SampleDropdownField",
-        "Visible": true
-    },
-    "SampleEnumFlagsField": {
-        "$type": "Paps.UnityToolbarExtenderUIToolkit.UserSettingsFileMainToolbarElementOverrideRepository+SerializableOverride, Paps.UnityToolbarExtenderUIToolkit",
-        "ElementId": "SampleEnumFlagsField",
-        "Visible": false
-    },
-    "SampleFloatField": {
-        "$type": "Paps.UnityToolbarExtenderUIToolkit.UserSettingsFileMainToolbarElementOverrideRepository+SerializableOverride, Paps.UnityToolbarExtenderUIToolkit",
-        "ElementId": "SampleFloatField",
-        "Visible": false
-    },
-    "SampleIMGUIContainer": {
-        "$type": "Paps.UnityToolbarExtenderUIToolkit.UserSettingsFileMainToolbarElementOverrideRepository+SerializableOverride, Paps.UnityToolbarExtenderUIToolkit",
-        "ElementId": "SampleIMGUIContainer",
-        "Visible": true
-    },
-    "SampleIntegerField": {
-        "$type": "Paps.UnityToolbarExtenderUIToolkit.UserSettingsFileMainToolbarElementOverrideRepository+SerializableOverride, Paps.UnityToolbarExtenderUIToolkit",
-        "ElementId": "SampleIntegerField",
-        "Visible": false
-    },
-    "SampleSlider": {
-        "$type": "Paps.UnityToolbarExtenderUIToolkit.UserSettingsFileMainToolbarElementOverrideRepository+SerializableOverride, Paps.UnityToolbarExtenderUIToolkit",
-        "ElementId": "SampleSlider",
-        "Visible": false
-    },
-    "SampleTextField": {
-        "$type": "Paps.UnityToolbarExtenderUIToolkit.UserSettingsFileMainToolbarElementOverrideRepository+SerializableOverride, Paps.UnityToolbarExtenderUIToolkit",
-        "ElementId": "SampleTextField",
-        "Visible": false
-    },
-    "ModesDropdown": {
-        "$type": "Paps.UnityToolbarExtenderUIToolkit.UserSettingsFileMainToolbarElementOverrideRepository+SerializableOverride, Paps.UnityToolbarExtenderUIToolkit",
-        "ElementId": "ModesDropdown",
-        "Visible": true
-    },
-    "MultiplayerRoleDropdown": {
-        "$type": "Paps.UnityToolbarExtenderUIToolkit.UserSettingsFileMainToolbarElementOverrideRepository+SerializableOverride, Paps.UnityToolbarExtenderUIToolkit",
-        "ElementId": "MultiplayerRoleDropdown",
-        "Visible": false
-    },
-    "PreviewPackagesInUseDropdown": {
-        "$type": "Paps.UnityToolbarExtenderUIToolkit.UserSettingsFileMainToolbarElementOverrideRepository+SerializableOverride, Paps.UnityToolbarExtenderUIToolkit",
-        "ElementId": "PreviewPackagesInUseDropdown",
-        "Visible": false
-    },
-    "SearchButton": {
-        "$type": "Paps.UnityToolbarExtenderUIToolkit.UserSettingsFileMainToolbarElementOverrideRepository+SerializableOverride, Paps.UnityToolbarExtenderUIToolkit",
-        "ElementId": "SearchButton",
-        "Visible": true
-    },
-    "UndoButton": {
-        "$type": "Paps.UnityToolbarExtenderUIToolkit.UserSettingsFileMainToolbarElementOverrideRepository+SerializableOverride, Paps.UnityToolbarExtenderUIToolkit",
-        "ElementId": "UndoButton",
-        "Visible": true
-    },
-    "ToolbarProductCaption": {
-        "$type": "Paps.UnityToolbarExtenderUIToolkit.UserSettingsFileMainToolbarElementOverrideRepository+SerializableOverride, Paps.UnityToolbarExtenderUIToolkit",
-        "ElementId": "ToolbarProductCaption",
-        "Visible": false
-    },
-    "ButtonInGroup1": {
-        "$type": "Paps.UnityToolbarExtenderUIToolkit.UserSettingsFileMainToolbarElementOverrideRepository+SerializableOverride, Paps.UnityToolbarExtenderUIToolkit",
-        "ElementId": "ButtonInGroup1",
-        "Visible": true
-    },
-    "PlayButton": {
-        "$type": "Paps.UnityToolbarExtenderUIToolkit.UserSettingsFileMainToolbarElementOverrideRepository+SerializableOverride, Paps.UnityToolbarExtenderUIToolkit",
-        "ElementId": "PlayButton",
-        "Visible": true
-    }
-}
\ No newline at end of file
+{"AccountDropdown":{"ElementId":"AccountDropdown","Visible":false},"CloudButton":{"ElementId":"CloudButton","Visible":false},"FrameStepButton":{"ElementId":"FrameStepButton","Visible":true},"SliderSubgroup":{"ElementId":"SliderSubgroup","Visible":false},"UnityTypesElementsGroup":{"ElementId":"UnityTypesElementsGroup","Visible":false},"SampleRootGroup":{"ElementId":"SampleRootGroup","Visible":false},"SampleGroupWithSubgroups":{"ElementId":"SampleGroupWithSubgroups","Visible":true},"ElementsWithSerialization":{"ElementId":"ElementsWithSerialization","Visible":false},"DropdownWithSubWindowSubgroup":{"ElementId":"DropdownWithSubWindowSubgroup","Visible":false},"DropdownFieldSubgroup":{"ElementId":"DropdownFieldSubgroup","Visible":false},"ButtonSubgroup":{"ElementId":"ButtonSubgroup","Visible":true},"VersionControlButton":{"ElementId":"VersionControlButton","Visible":false},"StoreButton":{"ElementId":"StoreButton","Visible":false},"LayoutDropdown":{"ElementId":"LayoutDropdown","Visible":true},"SampleButton":{"ElementId":"SampleButton","Visible":false},"SampleButtonToggle":{"ElementId":"SampleButtonToggle","Visible":false},"SampleButtonWithIcon":{"ElementId":"SampleButtonWithIcon","Visible":true},"SampleEnumField":{"ElementId":"SampleEnumField","Visible":false},"SampleDropdownField":{"ElementId":"SampleDropdownField","Visible":true},"SampleEnumFlagsField":{"ElementId":"SampleEnumFlagsField","Visible":false},"SampleFloatField":{"ElementId":"SampleFloatField","Visible":false},"SampleIMGUIContainer":{"ElementId":"SampleIMGUIContainer","Visible":true},"SampleIntegerField":{"ElementId":"SampleIntegerField","Visible":false},"SampleSlider":{"ElementId":"SampleSlider","Visible":false},"SampleTextField":{"ElementId":"SampleTextField","Visible":false},"ModesDropdown":{"ElementId":"ModesDropdown","Visible":true},"MultiplayerRoleDropdown":{"ElementId":"MultiplayerRoleDropdown","Visible":false},"PreviewPackagesInUseDropdown":{"ElementId":"PreviewPackagesInUseDropdown","Visible":false},"SearchButton":{"ElementId":"SearchButton","Visible":true},"UndoButton":{"ElementId":"UndoButton","Visible":true},"ToolbarProductCaption":{"ElementId":"ToolbarProductCaption","Visible":false},"ButtonInGroup1":{"ElementId":"ButtonInGroup1","Visible":true},"PlayButton":{"ElementId":"PlayButton","Visible":true}}
\ No newline at end of file