修改bug

Assets/Res/UI/HeroDetailPanel.prefab

@@ -12589,7 +12589,7 @@ GameObject:
   - component: {fileID: 8963168838308406584}
   - component: {fileID: 5422228824707887719}
   - component: {fileID: 4187952801782332659}
-  - component: {fileID: 3279573720056198076}
+  - component: {fileID: 812303865189167499}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: HeroDetailPanel
@@ -12972,7 +12972,7 @@ CanvasGroup:
   m_Interactable: 1
   m_BlocksRaycasts: 1
   m_IgnoreParentGroups: 0
---- !u!114 &3279573720056198076
+--- !u!114 &812303865189167499
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -12984,14 +12984,21 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 6a23dadfaa104ddf929b8c98dd02623c, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  allTargets:
-  - {fileID: 8323024823130982353}
-  - {fileID: 4187952801782332659}
-  TweenAssetInfo: {fileID: 11400000, guid: f0bdd4e99fcc6c74da59f9ab86e8701f, type: 2}
-  TargetFoldout: 1
   maxDuration: 0.3
   isUpdate: 0
-  currTime: 0.3
+  currTime: 0.34208518
+  GrpupInfos:
+  - Foldout: 1
+    isActive: 1
+    animName: play
+    allTargets:
+    - {fileID: 8323024823130982353}
+    - {fileID: 4187952801782332659}
+    TweenAssetInfo: {fileID: 11400000, guid: f0bdd4e99fcc6c74da59f9ab86e8701f, type: 2}
+    TargetFoldout: 1
+    maxDuration: 0.3
+    isUpdate: 1
+    currTime: 0
 --- !u!1 &6246054039842062518
 GameObject:
   m_ObjectHideFlags: 0

Assets/Res/UIAnimRes/TweenAssetInfoBox (1).asset

@@ -13,7 +13,7 @@ MonoBehaviour:
   m_Name: TweenAssetInfoBox (1)
   m_EditorClassIdentifier: 
   allTweenInfo:
-  - Foldout: 1
+  - Foldout: 0
     TweenType: 1
     duration: 1
     delay: 0
@@ -29,8 +29,8 @@ MonoBehaviour:
       delay: 0
       currSchedule: 0
       TweenLerpType: 0
-      StartAlpha: 0
-      EndAlpha: 1
+      StartAlpha: 1
+      EndAlpha: 0
       startX:
         serializedVersion: 2
         m_Curve: []

Assets/Res/UIAnimRes/TweenAssetInfoHeroDetailPanel.asset

@@ -13,7 +13,7 @@ MonoBehaviour:
   m_Name: TweenAssetInfoHeroDetailPanel
   m_EditorClassIdentifier: 
   allTweenInfo:
-  - Foldout: 1
+  - Foldout: 0
     TweenType: 0
     duration: 0.3
     delay: 0
@@ -113,19 +113,19 @@ MonoBehaviour:
         m_PreInfinity: 2
         m_PostInfinity: 2
         m_RotationOrder: 4
-  - Foldout: 1
+  - Foldout: 0
     TweenType: 1
     duration: 0.3
     delay: 0
     TweenBasic:
       Foldout: 0
-      duration: 0
+      duration: 0.3
       delay: 0
       currSchedule: 0
       TweenRectTransformInfos: []
     TweenCanvasGroup:
       Foldout: 1
-      duration: 0
+      duration: 0.3
       delay: 0
       currSchedule: 0
       TweenLerpType: 1

Assets/Scripts/Core/Editor/Tween/UITweenControllerInspector.cs

@@ -8,7 +8,6 @@ using UnityEngine;
 public class UITweenControllerInspector : Editor
 {
     private UITweenController _uiTweenController;
-
     // private float currValue;
 
     public override void OnInspectorGUI()
@@ -19,10 +18,57 @@ public class UITweenControllerInspector : Editor
             return;
         }
 
+        _uiTweenController.SetMaxTime();
+        EditorGUI.BeginChangeCheck();
+        _uiTweenController.currTime =
+            EditorGUILayout.Slider(_uiTweenController.currTime, 0, _uiTweenController.maxDuration);
+        if (EditorGUI.EndChangeCheck())
+        {
+            if (!_uiTweenController.isUpdate)
+            {
+                _uiTweenController.JumpToTime(_uiTweenController.currTime);
+            }
+        }
+
         EditorGUILayout.BeginHorizontal();
-        EditorGUILayout.ObjectField("动画资源", _uiTweenController.TweenAssetInfo, typeof(TweenAssetInfo), false);
+        if (GUILayout.Button("添加新的片段"))
+        {
+            _uiTweenController.GrpupInfos.Add(new TweenAssetGrpupInfo());
+            EditorUtility.SetDirty(_uiTweenController);
+            EditorUtility.SetDirty(_uiTweenController.gameObject);
+        }
+        
+        if (GUILayout.Button("播放"))
+        {
+            _uiTweenController.StartPlay();
+        }
 
-        if (_uiTweenController.TweenAssetInfo == null)
+        EditorGUILayout.EndHorizontal();
+        for (int i = 0; i < _uiTweenController.GrpupInfos.Count; i++)
+        {
+            TweenAssetGrpupInfo tweenAssetGrpupInfo = _uiTweenController.GrpupInfos[i];
+            tweenAssetGrpupInfo.Foldout = EditorGUILayout.Foldout(tweenAssetGrpupInfo.Foldout,
+                tweenAssetGrpupInfo.animName);
+            if (tweenAssetGrpupInfo.Foldout)
+            {
+                EditorGUI.indentLevel++;
+                DrawGrpup(_uiTweenController.GrpupInfos[i]);
+                GUILayout.Space(10);
+                EditorGUI.indentLevel--;
+            }
+        }
+
+
+        serializedObject.ApplyModifiedProperties();
+    }
+
+    private void DrawGrpup(TweenAssetGrpupInfo _tweenAssetGrpupInfo)
+    {
+        EditorGUI.BeginChangeCheck();
+        EditorGUILayout.BeginHorizontal();
+        _tweenAssetGrpupInfo.TweenAssetInfo=(TweenAssetInfo)  EditorGUILayout.ObjectField("动画资源", _tweenAssetGrpupInfo.TweenAssetInfo, typeof(TweenAssetInfo), false);
+
+        if (_tweenAssetGrpupInfo.TweenAssetInfo == null)
         {
             if (GUILayout.Button("创建一个动画资源"))
             {
@@ -31,51 +77,46 @@ public class UITweenControllerInspector : Editor
                 if (!string.IsNullOrEmpty(selectedFolder))
                 {
                     string path = selectedFolder.Replace(Application.dataPath, "Assets");
-                    _uiTweenController.TweenAssetInfo = ScriptableObject.CreateInstance<TweenAssetInfo>();
-                    AssetDatabase.CreateAsset(_uiTweenController.TweenAssetInfo,
+                    _tweenAssetGrpupInfo.TweenAssetInfo = ScriptableObject.CreateInstance<TweenAssetInfo>();
+                    AssetDatabase.CreateAsset(_tweenAssetGrpupInfo.TweenAssetInfo,
                         path + $"/TweenAssetInfo{_uiTweenController.gameObject.name}.asset");
                     AssetDatabase.SaveAssets();
                 }
             }
         }
 
-        EditorGUILayout.EndHorizontal();
-        if (_uiTweenController.TweenAssetInfo == null)
+        if (GUILayout.Button("-"))
         {
-            return;
+            _uiTweenController.GrpupInfos.Remove(_tweenAssetGrpupInfo);
         }
 
-        _uiTweenController.SetMaxTime();
-        EditorGUI.BeginChangeCheck();
-        _uiTweenController.currTime = EditorGUILayout.Slider(_uiTweenController.currTime, 0, _uiTweenController.maxDuration);
-        if (EditorGUI.EndChangeCheck())
+        EditorGUILayout.EndHorizontal();
+        EditorGUILayout.BeginHorizontal();
+        _tweenAssetGrpupInfo.isActive = EditorGUILayout.Toggle("是否激活", _tweenAssetGrpupInfo.isActive);
+        _tweenAssetGrpupInfo.animName = EditorGUILayout.TextField("片段名", _tweenAssetGrpupInfo.animName);
+        EditorGUILayout.EndHorizontal();
+        if (_tweenAssetGrpupInfo.TweenAssetInfo == null)
         {
-            if (!_uiTweenController.isUpdate)
-            {
-                _uiTweenController.JumpToTime(_uiTweenController.currTime);
-            }
+            return;
         }
 
-        if (GUILayout.Button("播放"))
-        {
-            _uiTweenController.StartPlay();
-        }
+      
 
-        _uiTweenController.TargetFoldout = EditorGUILayout.Foldout(_uiTweenController.TargetFoldout,
+        _tweenAssetGrpupInfo.TargetFoldout = EditorGUILayout.Foldout(_tweenAssetGrpupInfo.TargetFoldout,
             "目标");
-        if (_uiTweenController.TargetFoldout)
+        if (_tweenAssetGrpupInfo.TargetFoldout)
         {
             EditorGUI.indentLevel++;
-            for (int i = 0; i < _uiTweenController.allTargets.Count; i++)
+            for (int i = 0; i < _tweenAssetGrpupInfo.allTargets.Count; i++)
             {
-                Object o = _uiTweenController.allTargets[i];
+                Object o = _tweenAssetGrpupInfo.allTargets[i];
                 Color color = GUI.color;
                 if (o == null)
                 {
                     GUI.color = Color.red;
                 }
 
-                _uiTweenController.allTargets[i] =
+                _tweenAssetGrpupInfo.allTargets[i] =
                     EditorGUILayout.ObjectField($"第{i + 1}个对象{o}", o, typeof(Object), true);
                 GUI.color = color;
             }
@@ -83,55 +124,53 @@ public class UITweenControllerInspector : Editor
             EditorGUI.indentLevel--;
         }
 
-        if (_uiTweenController.allTargets.Count > _uiTweenController.TweenAssetInfo.allTweenInfo.Count)
+        if (_tweenAssetGrpupInfo.allTargets.Count > _tweenAssetGrpupInfo.TweenAssetInfo.allTweenInfo.Count)
         {
-            for (int i = _uiTweenController.allTargets.Count - 1;
-                 i >= _uiTweenController.TweenAssetInfo.allTweenInfo.Count;
+            for (int i = _tweenAssetGrpupInfo.allTargets.Count - 1;
+                 i >= _tweenAssetGrpupInfo.TweenAssetInfo.allTweenInfo.Count;
                  i--)
             {
-                _uiTweenController.allTargets.RemoveAt(i);
+                _tweenAssetGrpupInfo.allTargets.RemoveAt(i);
             }
         }
 
-        if (_uiTweenController.allTargets.Count < _uiTweenController.TweenAssetInfo.allTweenInfo.Count)
+        if (_tweenAssetGrpupInfo.allTargets.Count < _tweenAssetGrpupInfo.TweenAssetInfo.allTweenInfo.Count)
         {
-            for (int i = _uiTweenController.allTargets.Count;
-                 i < _uiTweenController.TweenAssetInfo.allTweenInfo.Count;
+            for (int i = _tweenAssetGrpupInfo.allTargets.Count;
+                 i < _tweenAssetGrpupInfo.TweenAssetInfo.allTweenInfo.Count;
                  i++)
             {
-                _uiTweenController.allTargets.Add(new Object());
+                _tweenAssetGrpupInfo.allTargets.Add(new Object());
             }
         }
 
-        EditorGUI.BeginChangeCheck();
-        for (int i = 0; i < _uiTweenController.TweenAssetInfo.allTweenInfo.Count; i++)
+     
+        for (int i = 0; i < _tweenAssetGrpupInfo.TweenAssetInfo.allTweenInfo.Count; i++)
         {
-            TweenEntity tweenEntity = _uiTweenController.TweenAssetInfo.allTweenInfo[i];
+            TweenEntity tweenEntity = _tweenAssetGrpupInfo.TweenAssetInfo.allTweenInfo[i];
 
 
-            Object o = _uiTweenController.allTargets[i];
-            DrawTweenEntity(tweenEntity, o, i);
+            Object o = _tweenAssetGrpupInfo.allTargets[i];
+            DrawTweenEntity(_tweenAssetGrpupInfo, tweenEntity, o, i);
         }
 
         if (GUILayout.Button("添加动画"))
         {
-            _uiTweenController.TweenAssetInfo.allTweenInfo.Add(new TweenEntity()
+            _tweenAssetGrpupInfo.TweenAssetInfo.allTweenInfo.Add(new TweenEntity()
                 { TweenBasic = new TweenTransform() { } });
-            _uiTweenController.allTargets.Add(new Object());
+            _tweenAssetGrpupInfo.allTargets.Add(new Object());
         }
 
         if (EditorGUI.EndChangeCheck())
         {
-            EditorUtility.SetDirty(_uiTweenController.TweenAssetInfo);
+            EditorUtility.SetDirty(_tweenAssetGrpupInfo.TweenAssetInfo);
             EditorUtility.SetDirty(_uiTweenController.gameObject);
-            AssetDatabase.SaveAssets();
+            // AssetDatabase.SaveAssets();
         }
-
-        serializedObject.ApplyModifiedProperties();
-     
     }
 
-    private void DrawTweenEntity(TweenEntity tweenEntity, Object ob, int index)
+    private void DrawTweenEntity(TweenAssetGrpupInfo _tweenAssetGrpupInfo, TweenEntity tweenEntity, Object ob,
+        int index)
     {
         Color color = GUI.color;
         if (ob == null)
@@ -149,11 +188,11 @@ public class UITweenControllerInspector : Editor
             // 设置背景颜色
             EditorGUILayout.BeginHorizontal();
             ob = (Object)EditorGUILayout.ObjectField("目标", ob, typeof(Object));
-            _uiTweenController.allTargets[index] = ob;
+            _tweenAssetGrpupInfo.allTargets[index] = ob;
             if (GUILayout.Button("-"))
             {
-                _uiTweenController.TweenAssetInfo.allTweenInfo.RemoveAt(index);
-                _uiTweenController.allTargets.RemoveAt(index);
+                _tweenAssetGrpupInfo.TweenAssetInfo.allTweenInfo.RemoveAt(index);
+                _tweenAssetGrpupInfo.allTargets.RemoveAt(index);
             }
 
             EditorGUILayout.EndHorizontal();

Assets/Scripts/Core/UI/UTool/UITween/TweenAssetGrpupInfo.cs

@@ -0,0 +1,97 @@
+using System.Collections.Generic;
+using UnityEngine;
+
+namespace Core.UI.UTool.UITween
+{
+    [System.Serializable]
+    public class TweenAssetGrpupInfo
+    {
+        [HideInInspector] public bool Foldout;
+        public bool isActive;
+        public string animName;
+        public List<Object> allTargets = new List<Object>();
+
+        public TweenAssetInfo TweenAssetInfo;
+
+        public bool TargetFoldout = true;
+        public float maxDuration;
+        public bool isUpdate;
+        [HideInInspector] public float currTime;
+        // public List<TweenEntity> allTweenInfo = new List<TweenEntity>();
+
+
+
+
+
+        public void StartPlay()
+        {
+            if (TweenAssetInfo == null)
+            {
+                return;
+            }
+
+            maxDuration = 0;
+            for (int i = 0; i < TweenAssetInfo.allTweenInfo.Count; i++)
+            {
+                TweenEntity tweenEntity = TweenAssetInfo.allTweenInfo[i];
+                if (tweenEntity.duration + tweenEntity.delay > maxDuration)
+                {
+                    maxDuration = tweenEntity.duration + tweenEntity.delay;
+                }
+
+                tweenEntity.Prepare();
+                tweenEntity.Rest(allTargets[i]);
+            }
+
+            isUpdate = true;
+            currTime = 0;
+        }
+
+        public void SetMaxTime()
+        {
+            maxDuration = 0;
+            if (TweenAssetInfo == null)
+            {
+                return;
+            }
+
+            for (int i = 0; i < TweenAssetInfo.allTweenInfo.Count; i++)
+            {
+                TweenEntity tweenEntity = TweenAssetInfo.allTweenInfo[i];
+                if (tweenEntity.duration + tweenEntity.delay > maxDuration)
+                {
+                    maxDuration = tweenEntity.duration + tweenEntity.delay;
+                }
+            }
+        }
+
+        public void JumpToTime(float t)
+        {
+            if (TweenAssetInfo == null)
+            {
+                return;
+            }
+            for (int i = 0; i < TweenAssetInfo.allTweenInfo.Count; i++)
+            {
+                TweenAssetInfo.allTweenInfo[i].Prepare();
+                // allTweenInfo[i].Rest();
+            }
+
+            PlayTween(t, true);
+        }
+
+        public void PlayTween(float t, bool isFallBack)
+        {
+            if (TweenAssetInfo == null)
+            {
+                return;
+            }
+            for (int i = 0; i < TweenAssetInfo.allTweenInfo.Count; i++)
+            {
+                TweenAssetInfo.allTweenInfo[i].Play(allTargets[i], t, isFallBack);
+            }
+        }
+
+      
+    }
+}

Assets/Scripts/Core/UI/UTool/UITween/TweenAssetGrpupInfo.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: b1aa7b3a720e45639e811f10381148d6
+timeCreated: 1734187075

Assets/Scripts/Core/UI/UTool/UITween/TweenAssetInfo.cs

@@ -5,6 +5,7 @@ namespace Core.UI.UTool.UITween
 {
     public class TweenAssetInfo : ScriptableObject
     {
+       
         public List<TweenEntity> allTweenInfo = new List<TweenEntity>();
     }
 }

Assets/Scripts/Core/UI/UTool/UITween/UITweenController.cs

@@ -9,18 +9,14 @@ namespace Core.UI.UTool.UITween
     [ExecuteInEditMode]
     public class UITweenController : MonoBehaviour
     {
-        public List<Object> allTargets = new List<Object>();
-
-        public TweenAssetInfo TweenAssetInfo;
-
-        public bool TargetFoldout = true;
-
-        // public List<TweenEntity> allTweenInfo = new List<TweenEntity>();
         public float maxDuration;
         public bool isUpdate;
         [HideInInspector] public float currTime;
 
+        public List<TweenAssetGrpupInfo> GrpupInfos = new List<TweenAssetGrpupInfo>();
 
+
+        private BetterList<TweenAssetGrpupInfo> _currPlay = new BetterList<TweenAssetGrpupInfo>();
         private void OnEnable()
         {
             if (Application.isPlaying)
@@ -28,26 +24,37 @@ namespace Core.UI.UTool.UITween
                 StartPlay();
             }
         }
-
-
-        public void StartPlay()
+        public void Play(string animName)
         {
-            if (TweenAssetInfo == null)
+            _currPlay.Clear();
+            for (int i = 0; i < GrpupInfos.Count; i++)
             {
-                return;
+                TweenAssetGrpupInfo tweenAssetGrpupInfo = GrpupInfos[i];
+                if (tweenAssetGrpupInfo.animName.Equals(animName))
+                {
+                    _currPlay.Add(tweenAssetGrpupInfo);
+                }
             }
+        }
 
+        public void StartPlay()
+        {
             maxDuration = 0;
-            for (int i = 0; i < TweenAssetInfo.allTweenInfo.Count; i++)
+            _currPlay.Clear();
+            for (int i = 0; i < GrpupInfos.Count; i++)
             {
-                TweenEntity tweenEntity = TweenAssetInfo.allTweenInfo[i];
-                if (tweenEntity.duration + tweenEntity.delay > maxDuration)
+                TweenAssetGrpupInfo tweenAssetGrpupInfo = GrpupInfos[i];
+                tweenAssetGrpupInfo.SetMaxTime();
+                if (tweenAssetGrpupInfo.isActive)
                 {
-                    maxDuration = tweenEntity.duration + tweenEntity.delay;
-                }
+                    if (tweenAssetGrpupInfo.maxDuration > maxDuration)
+                    {
+                        maxDuration = tweenAssetGrpupInfo.maxDuration;
+                    }
 
-                tweenEntity.Prepare();
-                tweenEntity.Rest(allTargets[i]);
+                    tweenAssetGrpupInfo.StartPlay();
+                    _currPlay.Add(tweenAssetGrpupInfo);
+                }
             }
 
             isUpdate = true;
@@ -57,21 +64,25 @@ namespace Core.UI.UTool.UITween
         public void SetMaxTime()
         {
             maxDuration = 0;
-            for (int i = 0; i < TweenAssetInfo.allTweenInfo.Count; i++)
+            for (int i = 0; i < GrpupInfos.Count; i++)
             {
-                TweenEntity tweenEntity = TweenAssetInfo.allTweenInfo[i];
-                if (tweenEntity.duration + tweenEntity.delay > maxDuration)
+                TweenAssetGrpupInfo tweenAssetGrpupInfo = GrpupInfos[i];
+                tweenAssetGrpupInfo.SetMaxTime();
+                if (tweenAssetGrpupInfo.isActive)
                 {
-                    maxDuration = tweenEntity.duration + tweenEntity.delay;
+                    if (tweenAssetGrpupInfo.maxDuration > maxDuration)
+                    {
+                        maxDuration = tweenAssetGrpupInfo.maxDuration;
+                    }
                 }
             }
         }
 
         public void JumpToTime(float t)
         {
-            for (int i = 0; i < TweenAssetInfo.allTweenInfo.Count; i++)
+            for (int i = 0; i < GrpupInfos.Count; i++)
             {
-                TweenAssetInfo.allTweenInfo[i].Prepare();
+                GrpupInfos[i].JumpToTime(t);
                 // allTweenInfo[i].Rest();
             }
 
@@ -80,9 +91,9 @@ namespace Core.UI.UTool.UITween
 
         private void PlayTween(float t, bool isFallBack)
         {
-            for (int i = 0; i < TweenAssetInfo.allTweenInfo.Count; i++)
+            for (int i = 0; i < GrpupInfos.Count; i++)
             {
-                TweenAssetInfo.allTweenInfo[i].Play(allTargets[i], t, isFallBack);
+                GrpupInfos[i].PlayTween(t, isFallBack);
             }
         }
 
@@ -95,7 +106,10 @@ namespace Core.UI.UTool.UITween
 
             currTime += Time.deltaTime;
 
-            PlayTween(currTime, false);
+            for (int i = 0; i < _currPlay.Count; i++)
+            {
+                _currPlay[i].PlayTween(currTime, false);
+            }
             if (currTime >= maxDuration)
             {
                 isUpdate = false;

UserSettings/Layouts/default-2022.dwlt

@@ -19,7 +19,7 @@ MonoBehaviour:
     width: 2560
     height: 1357
   m_ShowMode: 4
-  m_Title: Project
+  m_Title: Game
   m_RootView: {fileID: 5}
   m_MinSize: {x: 875, y: 321}
   m_MaxSize: {x: 10000, y: 10000}
@@ -39,9 +39,9 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 1672
+    x: 1404
     y: 0
-    width: 214
+    width: 482
     height: 1307
   m_MinSize: {x: 202, y: 221}
   m_MaxSize: {x: 4002, y: 4021}
@@ -65,12 +65,12 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 1279
+    x: 827
     y: 0
-    width: 393
+    width: 577
     height: 1307
-  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: 21}
   m_Panes:
   - {fileID: 21}
@@ -93,7 +93,7 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 870
-    width: 756
+    width: 627
     height: 437
   m_MinSize: {x: 101, y: 121}
   m_MaxSize: {x: 4001, y: 4021}
@@ -180,7 +180,7 @@ MonoBehaviour:
   m_MinSize: {x: 600, y: 100}
   m_MaxSize: {x: 48576, y: 16192}
   vertical: 0
-  controlID: 200
+  controlID: 211
   draggingID: 0
 --- !u!114 &8
 MonoBehaviour:
@@ -222,12 +222,12 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 756
+    width: 627
     height: 1307
   m_MinSize: {x: 100, y: 100}
   m_MaxSize: {x: 8096, y: 16192}
   vertical: 1
-  controlID: 57
+  controlID: 39
   draggingID: 0
 --- !u!114 &10
 MonoBehaviour:
@@ -244,12 +244,12 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 756
+    x: 627
     y: 0
-    width: 194
+    width: 100
     height: 1307
-  m_MinSize: {x: 202, y: 221}
-  m_MaxSize: {x: 4002, y: 4021}
+  m_MinSize: {x: 200, y: 200}
+  m_MaxSize: {x: 4000, y: 4000}
   m_ActualView: {fileID: 18}
   m_Panes:
   - {fileID: 18}
@@ -270,9 +270,9 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 950
+    x: 727
     y: 0
-    width: 329
+    width: 100
     height: 1307
   m_MinSize: {x: 232, y: 271}
   m_MaxSize: {x: 10002, y: 10021}
@@ -324,10 +324,10 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 756
+    width: 627
     height: 870
-  m_MinSize: {x: 100, y: 100}
-  m_MaxSize: {x: 4000, y: 4000}
+  m_MinSize: {x: 101, y: 121}
+  m_MaxSize: {x: 4001, y: 4021}
   m_ActualView: {fileID: 14}
   m_Panes:
   - {fileID: 16}
@@ -357,7 +357,7 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 73
-    width: 755
+    width: 626
     height: 849
   m_SerializedDataModeController:
     m_DataMode: 0
@@ -668,7 +668,7 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 943
-    width: 755
+    width: 626
     height: 416
   m_SerializedDataModeController:
     m_DataMode: 0
@@ -700,9 +700,9 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 756
+    x: 627
     y: 73
-    width: 192
+    width: 98
     height: 1286
   m_SerializedDataModeController:
     m_DataMode: 0
@@ -717,20 +717,20 @@ MonoBehaviour:
   m_SceneHierarchy:
     m_TreeViewState:
       scrollPos: {x: 0, y: 0}
-      m_SelectedIDs: fece0000
+      m_SelectedIDs: e2a60000
       m_LastClickedID: 0
-      m_ExpandedIDs: 20b4fcff2eb4fcffe2b7fcff62d7ffff26e3ffff92b30000d4ba00005ebb0000dabb0000e6bb0000
+      m_ExpandedIDs: 66faffff
       m_RenameOverlay:
         m_UserAcceptedRename: 0
-        m_Name: Box (2)
-        m_OriginalName: Box (2)
+        m_Name: PanelBG
+        m_OriginalName: PanelBG
         m_EditFieldRect:
           serializedVersion: 2
           x: 0
           y: 0
           width: 0
           height: 0
-        m_UserData: 47866
+        m_UserData: 77068
         m_IsWaitingForDelay: 0
         m_IsRenaming: 0
         m_OriginalEventType: 0
@@ -784,7 +784,7 @@ MonoBehaviour:
     m_ControlHash: -371814159
     m_PrefName: Preview_InspectorPreview
   m_LastInspectedObjectInstanceID: -1
-  m_LastVerticalScrollValue: 0
+  m_LastVerticalScrollValue: 545
   m_GlobalObjectId: 
   m_InspectorMode: 0
   m_LockTracker:
@@ -810,9 +810,9 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 950
+    x: 727
     y: 73
-    width: 327
+    width: 98
     height: 1286
   m_SerializedDataModeController:
     m_DataMode: 0
@@ -825,7 +825,7 @@ MonoBehaviour:
     m_SaveData: []
     m_OverlaysVisible: 1
   m_SearchFilter:
-    m_NameFilter: herod
+    m_NameFilter: 
     m_ClassNames: []
     m_AssetLabels: []
     m_AssetBundleNames: []
@@ -835,24 +835,24 @@ MonoBehaviour:
     m_SkipHidden: 0
     m_SearchArea: 1
     m_Folders:
-    - Assets/Scenes
+    - Assets/Res/UI
     m_Globs: []
-    m_OriginalText: herod
+    m_OriginalText: 
     m_ImportLogFlags: 0
     m_FilterByTypeIntersection: 0
   m_ViewMode: 1
   m_StartGridSize: 16
   m_LastFolders:
-  - Assets/Scenes
+  - Assets/Res/UI
   m_LastFoldersGridSize: 16
   m_LastProjectPath: D:\UnityProject\XY001\xy001\XY001
   m_LockTracker:
     m_IsLocked: 0
   m_FolderTreeState:
     scrollPos: {x: 0, y: 0}
-    m_SelectedIDs: 62b70000
-    m_LastClickedID: 46946
-    m_ExpandedIDs: 00000000a8680000bab40000c0b40000c2b40000cab40000ccb40000ceb40000d0b40000d2b40000d4b40000d6b40000d8b40000dab40000dcb40000deb40000e0b40000e2b40000e4b40000e6b40000e8b40000eab4000064b7000044b800006ab800007eb8000088b80000feb8000000ca9a3bffffff7f
+    m_SelectedIDs: c0c90000
+    m_LastClickedID: 51648
+    m_ExpandedIDs: 000000007ca300007ea3000080a3000082a3000084a3000086a3000088a300008aa300008ca300008ea3000090a3000092a3000094a3000096a3000098a300009aa300009ca300009ea30000a0a30000a2a30000a4a30000a8a30000aaa30000aca30000aea30000b0a3000010a6000000ca9a3bffffff7f
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -880,7 +880,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: 00000000a8680000bab40000bcb40000beb40000c0b40000c2b40000c4b40000c6b40000c8b40000cab40000ccb40000ceb40000d0b40000d2b40000d4b40000d6b40000d8b40000dab40000dcb40000deb40000e0b40000e2b40000e4b40000e6b40000e8b40000eab40000
+    m_ExpandedIDs: 000000007ca300007ea3000080a3000082a3000084a3000086a3000088a300008aa300008ca300008ea3000090a3000092a3000094a3000096a3000098a300009aa300009ca300009ea30000a0a30000a2a30000a4a30000a6a30000a8a30000aaa30000aca30000aea30000b0a30000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -919,7 +919,7 @@ MonoBehaviour:
         y: 0
         width: 0
         height: 0
-      m_UserData: 52990
+      m_UserData: 42722
       m_IsWaitingForDelay: 0
       m_IsRenaming: 0
       m_OriginalEventType: 0
@@ -935,7 +935,7 @@ MonoBehaviour:
     m_ScrollPosition: {x: 0, y: 0}
     m_GridSize: 16
   m_SkipHiddenPackages: 0
-  m_DirectoriesAreaWidth: 204
+  m_DirectoriesAreaWidth: 50
 --- !u!114 &21
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -956,9 +956,9 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1279
+    x: 827
     y: 73
-    width: 391
+    width: 575
     height: 1286
   m_SerializedDataModeController:
     m_DataMode: 0
@@ -1012,10 +1012,10 @@ MonoBehaviour:
       serializedVersion: 2
       x: 0
       y: 21
-      width: 391
+      width: 575
       height: 1265
-    m_Scale: {x: 0.52133334, y: 0.52133334}
-    m_Translation: {x: 195.5, y: 632.5}
+    m_Scale: {x: 0.76666665, y: 0.76666665}
+    m_Translation: {x: 287.5, y: 632.5}
     m_MarginLeft: 0
     m_MarginRight: 0
     m_MarginTop: 0
@@ -1023,12 +1023,12 @@ MonoBehaviour:
     m_LastShownAreaInsideMargins:
       serializedVersion: 2
       x: -375
-      y: -1213.2352
+      y: -825
       width: 750
-      height: 2426.4705
+      height: 1650
     m_MinimalGUI: 1
-  m_defaultScale: 0.52133334
-  m_LastWindowPixelSize: {x: 391, y: 1286}
+  m_defaultScale: 0.76666665
+  m_LastWindowPixelSize: {x: 575, y: 1286}
   m_ClearInEditMode: 1
   m_NoCameraWarning: 1
   m_LowResolutionForAspectRatios: 01000000000000000000
@@ -1054,9 +1054,9 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1672
+    x: 1404
     y: 73
-    width: 212
+    width: 480
     height: 1286
   m_SerializedDataModeController:
     m_DataMode: 0
@@ -1150,8 +1150,8 @@ MonoBehaviour:
       floating: 0
       collapsed: 0
       displayed: 1
-      snapOffset: {x: -73, y: 25}
-      snapOffsetDelta: {x: -33, y: 0}
+      snapOffset: {x: -111, y: 25}
+      snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 1
       id: Orientation
       index: 0
@@ -1431,7 +1431,7 @@ MonoBehaviour:
   m_Position:
     m_Target: {x: 375, y: 812, z: 0}
     speed: 2
-    m_Value: {x: 408.56125, y: 192.50809, z: -73.37091}
+    m_Value: {x: 375, y: 812, z: 0}
   m_RenderMode: 0
   m_CameraMode:
     drawMode: 0
@@ -1479,11 +1479,11 @@ MonoBehaviour:
   m_Rotation:
     m_Target: {x: 0.2959024, y: -0.15921102, z: 0.05009006, w: 0.9405246}
     speed: 2
-    m_Value: {x: 0, y: 0, z: 0, w: 1}
+    m_Value: {x: 0.29590213, y: -0.15921088, z: 0.05009001, w: 0.9405237}
   m_Size:
     m_Target: 894.40985
     speed: 2
-    m_Value: 1480.6464
+    m_Value: 894.40985
   m_Ortho:
     m_Target: 0
     speed: 2