1

2025-11-05 19:32:22 +08:00 · 2025-11-05 19:32:22 +08:00 · a52399112d
commit a52399112d
parent 673767228e
11 changed files with 154 additions and 119 deletions
--- a/Client/Assets/Art/Atlas/Atlas_bg.spriteatlasv2
+++ b/Client/Assets/Art/Atlas/Atlas_bg.spriteatlasv2
@ -18,5 +18,6 @@ SpriteAtlasAsset:
    - {fileID: 21300000, guid: c85435c2e44fba84aa4be72463b4848a, type: 3}
    - {fileID: 21300000, guid: 7e8d3e1227cf0e349b1ec2314405ece9, type: 3}
    - {fileID: 21300000, guid: f1a9b3e844ba0514bb068e4586261e57, type: 3}
+    - {fileID: 21300000, guid: 6869fc80122cb044baa3653a39fb5ef7, type: 3}
  m_IsVariant: 0
  m_ScriptablePacker: {fileID: 0}
--- a/Client/Assets/Art/Atlas/Atlas_icon.spriteatlasv2
+++ b/Client/Assets/Art/Atlas/Atlas_icon.spriteatlasv2
@ -11,7 +11,6 @@ SpriteAtlasAsset:
  m_MasterAtlas: {fileID: 0}
  m_ImporterData:
    packables:
-    - {fileID: 21300000, guid: 6869fc80122cb044baa3653a39fb5ef7, type: 3}
    - {fileID: 21300000, guid: a2a575f6955103f4790d548f79c02f87, type: 3}
    - {fileID: 21300000, guid: fc7a3113730e6294f9356e3313ec8c29, type: 3}
    - {fileID: 21300000, guid: 2edb4f8554e42ad4ab2c363984b1779a, type: 3}
--- a/Client/Assets/Scenes/Desingn.unity
+++ b/Client/Assets/Scenes/Desingn.unity
@ -230,6 +230,9 @@ PrefabInstance:
    - targetCorrespondingSourceObject: {fileID: 7611974172231861040, guid: 48513b07f7f7f364b863b27de9a3f5e2, type: 3}
      insertIndex: -1
      addedObject: {fileID: 630692318}
+    - targetCorrespondingSourceObject: {fileID: 7611974172231861040, guid: 48513b07f7f7f364b863b27de9a3f5e2, type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 335553191}
    - targetCorrespondingSourceObject: {fileID: 7611974172231861040, guid: 48513b07f7f7f364b863b27de9a3f5e2, type: 3}
      insertIndex: -1
      addedObject: {fileID: 2069737132}
@ -242,9 +245,6 @@ PrefabInstance:
    - targetCorrespondingSourceObject: {fileID: 7611974172231861040, guid: 48513b07f7f7f364b863b27de9a3f5e2, type: 3}
      insertIndex: -1
      addedObject: {fileID: 199957137}
-    - targetCorrespondingSourceObject: {fileID: 7611974172231861040, guid: 48513b07f7f7f364b863b27de9a3f5e2, type: 3}
-      insertIndex: -1
-      addedObject: {fileID: 335553191}
    m_AddedComponents:
    - targetCorrespondingSourceObject: {fileID: 2463889675848662058, guid: 48513b07f7f7f364b863b27de9a3f5e2, type: 3}
      insertIndex: -1
@ -337,12 +337,22 @@ MonoBehaviour:
  m_UXGroup: {fileID: 125612304}
  hoverAudioClip: {fileID: 0}
  clickAudioClip: {fileID: 0}
-  _hotKeyRefrence: {fileID: 0}
-  _hotkeyPressType: 0
-  m_SelectionState: 0
  m_OnValueChanged:
    m_PersistentCalls:
-      m_Calls: []
+      m_Calls:
+      - m_Target: {fileID: 727435696}
+        m_TargetAssemblyTypeName: TestMono, GameLogic
+        m_MethodName: Print
+        m_Mode: 3
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 4
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
+  m_SelectionState: 0
 --- !u!95 &199957136
 Animator:
  serializedVersion: 7
@ -769,7 +779,7 @@ GameObject:
  - component: {fileID: 335553193}
  - component: {fileID: 335553192}
  m_Layer: 5
-  m_Name: Btn@test (6)
+  m_Name: right
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
@ -873,12 +883,10 @@ MonoBehaviour:
  m_UXGroup: {fileID: 125612304}
  hoverAudioClip: {fileID: 0}
  clickAudioClip: {fileID: 0}
-  _hotKeyRefrence: {fileID: 0}
-  _hotkeyPressType: 0
-  m_SelectionState: 0
  m_OnValueChanged:
    m_PersistentCalls:
      m_Calls: []
+  m_SelectionState: 0
 --- !u!1 &561161494
 GameObject:
  m_ObjectHideFlags: 0
@ -940,12 +948,22 @@ MonoBehaviour:
  m_UXGroup: {fileID: 125612304}
  hoverAudioClip: {fileID: 0}
  clickAudioClip: {fileID: 0}
-  _hotKeyRefrence: {fileID: 0}
-  _hotkeyPressType: 0
-  m_SelectionState: 0
  m_OnValueChanged:
    m_PersistentCalls:
-      m_Calls: []
+      m_Calls:
+      - m_Target: {fileID: 727435696}
+        m_TargetAssemblyTypeName: TestMono, GameLogic
+        m_MethodName: Print
+        m_Mode: 3
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 3
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
+  m_SelectionState: 0
 --- !u!95 &561161496
 Animator:
  serializedVersion: 7
@ -1137,7 +1155,7 @@ GameObject:
  - component: {fileID: 630692320}
  - component: {fileID: 630692319}
  m_Layer: 5
-  m_Name: Btn@test (5)
+  m_Name: left
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
@ -1241,12 +1259,10 @@ MonoBehaviour:
  m_UXGroup: {fileID: 125612304}
  hoverAudioClip: {fileID: 0}
  clickAudioClip: {fileID: 0}
-  _hotKeyRefrence: {fileID: 0}
-  _hotkeyPressType: 0
-  m_SelectionState: 0
  m_OnValueChanged:
    m_PersistentCalls:
      m_Calls: []
+  m_SelectionState: 0
 --- !u!1 &727435695
 GameObject:
  m_ObjectHideFlags: 0
@ -1276,7 +1292,8 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: f09b695799b281842af084a0cb741bdd, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  _button: {fileID: 630692320}
+  _button: {fileID: 2069737134}
+  interactable: 1
 --- !u!4 &727435697
 Transform:
  m_ObjectHideFlags: 0
@ -1740,12 +1757,22 @@ MonoBehaviour:
  m_UXGroup: {fileID: 125612304}
  hoverAudioClip: {fileID: 0}
  clickAudioClip: {fileID: 0}
-  _hotKeyRefrence: {fileID: 0}
-  _hotkeyPressType: 0
-  m_SelectionState: 0
  m_OnValueChanged:
    m_PersistentCalls:
-      m_Calls: []
+      m_Calls:
+      - m_Target: {fileID: 727435696}
+        m_TargetAssemblyTypeName: TestMono, GameLogic
+        m_MethodName: Print
+        m_Mode: 3
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 2
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
+  m_SelectionState: 0
 --- !u!95 &1134568825
 Animator:
  serializedVersion: 7
@ -2713,12 +2740,22 @@ MonoBehaviour:
  m_UXGroup: {fileID: 125612304}
  hoverAudioClip: {fileID: 0}
  clickAudioClip: {fileID: 0}
-  _hotKeyRefrence: {fileID: 0}
-  _hotkeyPressType: 0
-  m_SelectionState: 0
  m_OnValueChanged:
    m_PersistentCalls:
-      m_Calls: []
+      m_Calls:
+      - m_Target: {fileID: 727435696}
+        m_TargetAssemblyTypeName: TestMono, GameLogic
+        m_MethodName: Print
+        m_Mode: 3
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 1
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
+  m_SelectionState: 0
 --- !u!1 &2129144262
 GameObject:
  m_ObjectHideFlags: 0
--- a/Client/Assets/Scripts/Hotfix/GameLogic/TestMono.cs
+++ b/Client/Assets/Scripts/Hotfix/GameLogic/TestMono.cs
@ -1,23 +1,26 @@
-// using System;
-// using Cysharp.Threading.Tasks;
-// using Hotfix.GameLogic.TestWindow;
-// using UnityEditor;
-// using UnityEngine;
-// using UnityEngine.Profiling;
-// using UnityEngine.UI;
-//
-//
-// public class TestMono : MonoBehaviour
-// {
-//     public Action callBack;
-//     public UXButton _button;
-//     public bool interactable;
-//     public Selectable aa;
-//     private void OnGUI()
-//     {
-//         if (GUILayout.Button("HideUI"))
-//         {
-//             _button.Interactable = interactable;
-//         }
-//     }
-// }
+using System;
+using Cysharp.Threading.Tasks;
+using Hotfix.GameLogic.TestWindow;
+using UnityEditor;
+using UnityEngine;
+using UnityEngine.Profiling;
+using UnityEngine.UI;
+
+
+public class TestMono : MonoBehaviour
+{
+    public Action callBack;
+    public UXButton _button;
+    public bool interactable;
+
+    [Sirenix.OdinInspector.Button]
+    public void Test()
+    {
+        _button.Selected = interactable;
+    }
+
+    public void Print(int index)
+    {
+        Debug.Log("Index");
+    }
+}
--- a/Client/Assets/Scripts/Startup/Procedure/PatchUpdater/ProcedureLoadAssembly.cs
+++ b/Client/Assets/Scripts/Startup/Procedure/PatchUpdater/ProcedureLoadAssembly.cs
@ -3,15 +3,18 @@ using System.Collections.Generic;
 using System.IO;
 using System.Reflection;
 using AlicizaX;
-using HybridCLR;
 using UnityEngine;
 using YooAsset;

+#if ENABLE_HYBRIDCLR
+using HybridCLR;
+#endif
+
 namespace Unity.Startup.Procedure
 {
    public sealed class ProcedureLoadAssembly : StateBase<UpdateProcedureState>
    {
-        // private bool m_enableAddressable = true;
+#if ENABLE_HYBRIDCLR
        private int m_LoadAssetCount;
        private int m_LoadMetadataAssetCount;
        private int m_FailureAssetCount;
@ -24,9 +27,17 @@ namespace Unity.Startup.Procedure
 #pragma warning restore CS0414
        private Assembly m_MainLogicAssembly;
        private List<Assembly> m_HotfixAssemblys;
+#endif
+

        protected override void OnEnter()
        {
+#if !ENABLE_HYBRIDCLR
+            SwitchState(UpdateProcedureState.ProcedureUpdateFinishState);
+            return;
+#endif
+
+#if ENABLE_HYBRIDCLR
            Log.Info(" ProcedureLoadAssembly OnEnter");
            m_LoadAssemblyComplete = false;
            m_HotfixAssemblys = new List<Assembly>();
@ -62,8 +73,10 @@ namespace Unity.Startup.Procedure
            {
                m_LoadAssemblyComplete = true;
            }
+#endif
        }

+#if ENABLE_HYBRIDCLR

        protected override void OnUpdate(float deltaTime)
        {
@ -224,13 +237,11 @@ namespace Unity.Startup.Procedure
                byte[] dllBytes = textAsset.bytes;
                fixed (byte* ptr = dllBytes)
                {
-#if ENABLE_HYBRIDCLR
                    // 加载assembly对应的dll，会自动为它hook。一旦Aot泛型函数的native函数不存在，用解释器版本代码
                    HomologousImageMode mode = HomologousImageMode.SuperSet;
                    LoadImageErrorCode err =
-                        (LoadImageErrorCode)HybridCLR.RuntimeApi.LoadMetadataForAOTAssembly(dllBytes, mode);
+                        (LoadImageErrorCode)RuntimeApi.LoadMetadataForAOTAssembly(dllBytes, mode);
                    Log.Info($"LoadMetadataForAOTAssembly:{assetName}. mode:{mode} ret:{err}");
-#endif
                }
            }
            catch (Exception e)
@ -246,5 +257,6 @@ namespace Unity.Startup.Procedure

            GameApp.Resource.UnloadAsset(textAsset);
        }
+#endif
    }
 }
--- a/Client/Assets/Test/GameLogic.dll.bytes
+++ b/Client/Assets/Test/GameLogic.dll.bytes
--- a/Client/Assets/Test/GameLogic.pdb.bytes
+++ b/Client/Assets/Test/GameLogic.pdb.bytes
--- a/Client/Packages/com.alicizax.unity.editor.extension
+++ b/Client/Packages/com.alicizax.unity.editor.extension
@ -1 +1 @@
-Subproject commit 5369ced5eb756dc021702b516fa74d20f58d1a15
+Subproject commit 7eccb391e9f762da41195a4cb940d02ed348e2e2
--- a/Client/Packages/com.alicizax.unity.tuyoogame.yooasset
+++ b/Client/Packages/com.alicizax.unity.tuyoogame.yooasset
@ -1 +1 @@
-Subproject commit f2c6c14db4c9cbe2251821e2e8bb5d308378f2cf
+Subproject commit 9c0d5f99d6837259e69839ba959e76d06132248b
--- a/Client/Packages/com.alicizax.unity.ui.extension
+++ b/Client/Packages/com.alicizax.unity.ui.extension
@ -1 +1 @@
-Subproject commit 761b7b1827f69021dab54fdfd5780ff8c3766069
+Subproject commit f71b5c3c7cead38ef428d058c7145ac461bdd92d
--- a/Client/UserSettings/Layouts/default-6000.dwlt
+++ b/Client/UserSettings/Layouts/default-6000.dwlt
@ -121,7 +121,7 @@ MonoBehaviour:
  m_MinSize: {x: 400, y: 100}
  m_MaxSize: {x: 32384, y: 16192}
  vertical: 0
-  controlID: 115
+  controlID: 135
  draggingID: 0
 --- !u!114 &6
 MonoBehaviour:
@ -140,7 +140,7 @@ MonoBehaviour:
    serializedVersion: 2
    x: 0
    y: 0
-    width: 207
+    width: 242
    height: 941
  m_MinSize: {x: 201, y: 226}
  m_MaxSize: {x: 4001, y: 4026}
@ -167,9 +167,9 @@ MonoBehaviour:
  - {fileID: 9}
  m_Position:
    serializedVersion: 2
-    x: 207
+    x: 242
    y: 0
-    width: 330
+    width: 290
    height: 941
  m_MinSize: {x: 100, y: 100}
  m_MaxSize: {x: 8096, y: 16192}
@ -193,7 +193,7 @@ MonoBehaviour:
    serializedVersion: 2
    x: 0
    y: 0
-    width: 330
+    width: 290
    height: 363
  m_MinSize: {x: 202, y: 226}
  m_MaxSize: {x: 4002, y: 4026}
@ -219,7 +219,7 @@ MonoBehaviour:
    serializedVersion: 2
    x: 0
    y: 363
-    width: 330
+    width: 290
    height: 578
  m_MinSize: {x: 102, y: 126}
  m_MaxSize: {x: 4002, y: 4026}
@ -244,9 +244,9 @@ MonoBehaviour:
  m_Children: []
  m_Position:
    serializedVersion: 2
-    x: 537
+    x: 532
    y: 0
-    width: 494
+    width: 736
    height: 941
  m_MinSize: {x: 232, y: 276}
  m_MaxSize: {x: 10002, y: 10026}
@ -270,9 +270,9 @@ MonoBehaviour:
  m_Children: []
  m_Position:
    serializedVersion: 2
-    x: 1031
+    x: 1268
    y: 0
-    width: 889
+    width: 652
    height: 941
  m_MinSize: {x: 276, y: 76}
  m_MaxSize: {x: 4001, y: 4026}
@ -302,9 +302,9 @@ MonoBehaviour:
    m_TextWithWhitespace: "Game\u200B"
  m_Pos:
    serializedVersion: 2
-    x: 288
+    x: 242
    y: 442
-    width: 330
+    width: 456
    height: 552
  m_SerializedDataModeController:
    m_DataMode: 0
@ -323,7 +323,7 @@ MonoBehaviour:
  m_ShowGizmos: 0
  m_TargetDisplay: 0
  m_ClearColor: {r: 0, g: 0, b: 0, a: 0}
-  m_TargetSize: {x: 330, y: 186}
+  m_TargetSize: {x: 456, y: 256}
  m_TextureFilterMode: 0
  m_TextureHideFlags: 61
  m_RenderIMGUI: 1
@ -338,10 +338,10 @@ MonoBehaviour:
    m_VRangeLocked: 0
    hZoomLockedByDefault: 0
    vZoomLockedByDefault: 0
-    m_HBaseRangeMin: -165
-    m_HBaseRangeMax: 165
-    m_VBaseRangeMin: -93
-    m_VBaseRangeMax: 93
+    m_HBaseRangeMin: -228
+    m_HBaseRangeMax: 228
+    m_VBaseRangeMin: -128
+    m_VBaseRangeMax: 128
    m_HAllowExceedBaseRangeMin: 1
    m_HAllowExceedBaseRangeMax: 1
    m_VAllowExceedBaseRangeMin: 1
@ -359,23 +359,23 @@ MonoBehaviour:
      serializedVersion: 2
      x: 0
      y: 21
-      width: 330
+      width: 456
      height: 531
    m_Scale: {x: 1, y: 1}
-    m_Translation: {x: 165, y: 265.5}
+    m_Translation: {x: 228, y: 265.5}
    m_MarginLeft: 0
    m_MarginRight: 0
    m_MarginTop: 0
    m_MarginBottom: 0
    m_LastShownAreaInsideMargins:
      serializedVersion: 2
-      x: -165
+      x: -228
      y: -265.5
-      width: 330
+      width: 456
      height: 531
    m_MinimalGUI: 1
  m_defaultScale: 1
-  m_LastWindowPixelSize: {x: 330, y: 552}
+  m_LastWindowPixelSize: {x: 456, y: 552}
  m_ClearInEditMode: 1
  m_NoCameraWarning: 1
  m_LowResolutionForAspectRatios: 01000000000000000000
@ -419,33 +419,16 @@ MonoBehaviour:
    m_OverlaysVisible: 1
  m_ViewTransforms:
    m_KeySerializationHelper:
-    - {fileID: 6688734232031279982, guid: c103b1c0b339fe14eb5e4fea21d45a67, type: 2}
    - {fileID: 528180310289601023, guid: 75db14477f59de44b96f358d16e02e73, type: 2}
    m_ValueSerializationHelper:
-    - e00: 0.40013176
+    - e00: 1
      e01: 0
      e02: 0
-      e03: -79.50656
+      e03: 0
      e10: 0
-      e11: 0.40013176
+      e11: 1
      e12: 0
-      e13: 357.45914
-      e20: 0
-      e21: 0
-      e22: 1
-      e23: 0
-      e30: 0
-      e31: 0
-      e32: 0
-      e33: 1
-    - e00: 0.18947369
-      e01: 0
-      e02: 0
-      e03: 5.526306
-      e10: 0
-      e11: 0.18947369
-      e12: 0
-      e13: 408.63162
+      e13: 0
      e20: 0
      e21: 0
      e22: 1
@ -493,7 +476,7 @@ MonoBehaviour:
    serializedVersion: 2
    x: 0
    y: 24
-    width: 206
+    width: 241
    height: 915
  m_SerializedDataModeController:
    m_DataMode: 0
@ -1063,9 +1046,9 @@ MonoBehaviour:
  m_AudioPlay: 0
  m_DebugDrawModesUseInteractiveLightBakingData: 0
  m_Position:
-    m_Target: {x: 1002.05444, y: 1001.2913, z: 1185.5541}
+    m_Target: {x: 997.2073, y: 999.3342, z: 100}
    speed: 2
-    m_Value: {x: 999.3253, y: 998.40814, z: 453.51715}
+    m_Value: {x: 997.2073, y: 999.3342, z: 100}
  m_RenderMode: 0
  m_CameraMode:
    drawMode: 0
@ -1115,9 +1098,9 @@ MonoBehaviour:
    speed: 2
    m_Value: {x: 0, y: 0, z: 0, w: 1}
  m_Size:
-    m_Target: 4.259371
+    m_Target: 0.6538925
    speed: 2
-    m_Value: 1.8243366
+    m_Value: 0.6538925
  m_Ortho:
    m_Target: 1
    speed: 2
@ -1171,7 +1154,7 @@ MonoBehaviour:
    serializedVersion: 2
    x: 1
    y: 24
-    width: 328
+    width: 288
    height: 337
  m_SerializedDataModeController:
    m_DataMode: 0
@ -1189,7 +1172,7 @@ MonoBehaviour:
      scrollPos: {x: 0, y: 0}
      m_SelectedIDs: 
      m_LastClickedID: 0
-      m_ExpandedIDs: a4fbfeffd85cffffe05cffff005dffff025dffff329bffff429bffff4a9bffff4c9bfffff6faffff82cb0000
+      m_ExpandedIDs: 88eeffffa4efffffacefffffccefffffceeffffff4fafffff6faffff
      m_RenameOverlay:
        m_UserAcceptedRename: 0
        m_Name: 
@ -1237,7 +1220,7 @@ MonoBehaviour:
    serializedVersion: 2
    x: 1
    y: 387
-    width: 328
+    width: 288
    height: 552
  m_SerializedDataModeController:
    m_DataMode: 0
@ -1271,9 +1254,9 @@ MonoBehaviour:
    m_TextWithWhitespace: "Project\u200B"
  m_Pos:
    serializedVersion: 2
-    x: 538
+    x: 533
    y: 24
-    width: 492
+    width: 734
    height: 915
  m_SerializedDataModeController:
    m_DataMode: 0
@ -1297,7 +1280,7 @@ MonoBehaviour:
    m_SkipHidden: 0
    m_SearchArea: 1
    m_Folders:
-    - Assets/Localization
+    - Packages/com.alicizax.unity.ui.extension/Runtime/UXComponent/Hotkey
    m_Globs: []
    m_ProductIds: 
    m_AnyWithAssetOrigin: 0
@ -1315,7 +1298,7 @@ MonoBehaviour:
    scrollPos: {x: 0, y: 0}
    m_SelectedIDs: e48c0000
    m_LastClickedID: 36068
-    m_ExpandedIDs: 00000000b2bf00004cc200004ec2000050c2000052c2000054c2000056c2000058c200005ac200005cc200005ec2000060c2000062c2000064c2000066c2000068c200006ac200006cc200006ec2000070c2000072c2000074c2000076c2000078c200007ac200007cc200007ec2000080c2000082c2000084c2000086c2000088c200008ac200008cc200008ec2000090c2000092c2000094c2000096c2000098c200009ac200009cc200009ec20000a0c20000a2c20000a4c20000a6c20000a8c20000aac20000acc20000aec20000b0c20000b2c20000b4c20000b6c20000b8c20000bac20000bcc20000bec20000c0c20000c2c20000c4c20000c6c20000c8c20000cac20000ccc20000cec20000d0c20000d2c20000d4c20000d6c20000d8c20000dac20000dcc20000dec20000e0c20000e2c20000e4c20000e6c20000e8c20000eac20000ecc20000eec20000f0c20000f2c20000f4c20000f6c20000f8c20000fac20000fcc20000fec2000000c3000002c3000004c3000006c3000008c300000ac300000cc300000ec3000010c3000012c3000014c3000016c3000018c300001ac300001cc300001ec3000020c3000022c3000024c3000026c3000028c300002ac300002cc300002ec3000030c3000032c3000034c3000036c3000038c300003ac300003cc300003ec3000040c3000042c3000044c3000046c3000048c300004ac300004cc300004ec3000050c3000052c3000054c3000056c3000058c300005ac300005cc300005ec3000060c3000062c3000064c3000066c3000068c300006ac300006cc300006ec3000070c3000072c3000074c3000076c3000078c300007ac300007cc300007ec3000080c3000082c30000
+    m_ExpandedIDs: 0000000082bf0000e8c10000eac10000ecc10000eec10000f0c10000f2c10000f4c10000f6c10000f8c10000fac10000fcc10000fec1000000c2000002c2000004c2000006c2000008c200000ac200000cc200000ec2000010c2000012c2000014c2000016c2000018c200001ac200001cc200001ec2000020c2000022c2000024c2000026c2000028c200002ac200002cc200002ec2000030c2000032c2000034c2000036c2000038c200003ac200003cc200003ec2000040c2000042c2000044c2000046c2000048c200004ac200004cc200004ec2000050c2000052c2000054c2000056c2000058c200005ac200005cc200005ec2000060c2000062c2000064c2000066c2000068c200006ac200006cc200006ec2000070c2000072c2000074c2000076c2000078c200007ac200007cc200007ec2000080c2000082c2000084c2000086c2000088c200008ac200008cc200008ec2000090c2000092c2000094c2000096c2000098c200009ac200009cc200009ec20000a0c20000a2c20000a4c20000a6c20000a8c20000aac20000acc20000aec20000b0c20000b2c20000b4c20000b6c20000b8c20000bac20000bcc20000bec20000c0c20000c2c20000c4c20000c6c20000c8c20000cac20000ccc20000cec20000d0c20000d2c20000d4c20000d6c20000d8c20000dac20000dcc20000dec20000e0c20000e2c20000e4c20000e6c20000e8c20000eac20000ecc20000eec20000f0c20000f2c20000f4c20000f6c20000f8c20000fac20000fcc20000fec2000000c3000002c3000004c3000006c3000008c300000ac300000cc300000ec3000010c3000012c3000014c3000016c3000018c300001ac300001cc300001ec3000020c3000022c3000024c3000026c3000028c300002ac300002cc300002ec30000
    m_RenameOverlay:
      m_UserAcceptedRename: 0
      m_Name: 
@ -1341,10 +1324,10 @@ MonoBehaviour:
      m_Icon: {fileID: 0}
      m_ResourceFile: 
  m_AssetTreeState:
-    scrollPos: {x: 0, y: 0}
+    scrollPos: {x: 0, y: 2595}
    m_SelectedIDs: 
    m_LastClickedID: 0
-    m_ExpandedIDs: 00000000b2bf00004cc200004ec2000050c2000052c2000054c2000056c2000058c200005ac200005cc200005ec2000060c2000062c2000064c2000066c2000068c200006ac200006cc200006ec2000070c2000072c2000074c2000076c2000078c200007ac200007cc200007ec2000080c2000082c2000084c2000086c2000088c200008ac200008cc200008ec2000090c2000092c2000094c2000096c2000098c200009ac200009cc200009ec20000a0c20000a2c20000a4c20000a6c20000a8c20000aac20000acc20000aec20000b0c20000b2c20000b4c20000b6c20000b8c20000bac20000bcc20000bec20000c0c20000c2c20000c4c20000c6c20000c8c20000cac20000ccc20000cec20000d0c20000d2c20000d4c20000d6c20000d8c20000dac20000dcc20000dec20000e0c20000e2c20000e4c20000e6c20000e8c20000eac20000ecc20000eec20000f0c20000f2c20000f4c20000f6c20000f8c20000fac20000fcc20000fec2000000c3000002c3000004c3000006c3000008c300000ac300000cc300000ec3000010c3000012c3000014c3000016c3000018c300001ac300001cc300001ec3000020c3000022c3000024c3000026c3000028c300002ac300002cc300002ec3000030c3000032c3000034c3000036c3000038c300003ac300003cc300003ec3000040c3000042c3000044c3000046c3000048c300004ac300004cc300004ec3000050c3000052c3000054c3000056c3000058c300005ac300005cc300005ec3000060c3000062c3000064c3000066c3000068c300006ac300006cc300006ec3000070c3000072c3000074c3000076c3000078c300007ac300007cc300007ec3000080c3000082c30000
+    m_ExpandedIDs: 0000000082bf0000e8c10000eac10000ecc10000eec10000f0c10000f2c10000f4c10000f6c10000f8c10000fac10000fcc10000fec1000000c2000002c2000004c2000006c2000008c200000ac200000cc200000ec2000010c2000012c2000014c2000016c2000018c200001ac200001cc200001ec2000020c2000022c2000024c2000026c2000028c200002ac200002cc200002ec2000030c2000032c2000034c2000036c2000038c200003ac200003cc200003ec2000040c2000042c2000044c2000046c2000048c200004ac200004cc200004ec2000050c2000052c2000054c2000056c2000058c200005ac200005cc200005ec2000060c2000062c2000064c2000066c2000068c200006ac200006cc200006ec2000070c2000072c2000074c2000076c2000078c200007ac200007cc200007ec2000080c2000082c2000084c2000086c2000088c200008ac200008cc200008ec2000090c2000092c2000094c2000096c2000098c200009ac200009cc200009ec20000a0c20000a2c20000a4c20000a6c20000a8c20000aac20000acc20000aec20000b0c20000b2c20000b4c20000b6c20000b8c20000bac20000bcc20000bec20000c0c20000c2c20000c4c20000c6c20000c8c20000cac20000ccc20000cec20000d0c20000d2c20000d4c20000d6c20000d8c20000dac20000dcc20000dec20000e0c20000e2c20000e4c20000e6c20000e8c20000eac20000ecc20000eec20000f0c20000f2c20000f4c20000f6c20000f8c20000fac20000fcc20000fec2000000c3000002c3000004c3000006c3000008c300000ac300000cc300000ec3000010c3000012c3000014c3000016c3000018c300001ac300001cc300001ec3000020c3000022c3000024c3000026c3000028c300002ac300002cc300002ec30000
    m_RenameOverlay:
      m_UserAcceptedRename: 0
      m_Name: 
@ -1423,9 +1406,9 @@ MonoBehaviour:
    m_TextWithWhitespace: "Inspector\u200B"
  m_Pos:
    serializedVersion: 2
-    x: 1032
+    x: 1269
    y: 24
-    width: 888
+    width: 651
    height: 915
  m_SerializedDataModeController:
    m_DataMode: 0