修改bug

Assets/Res/UI/MainHeroPanel/BtnFaBaoWidget.prefab

@@ -200,6 +200,11 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: reorderableListElement
+    gameObject: {fileID: 4972287993358098244}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 1
 --- !u!114 &8343493153327066832
 MonoBehaviour:
@@ -236,6 +241,7 @@ MonoBehaviour:
   IsGrabbable: 1
   _isTransferable: 1
   isDroppableInSpace: 0
+  isNoCalculation: 0
 --- !u!1 &7055209374934089222
 GameObject:
   m_ObjectHideFlags: 0

Assets/Res/UI/MainHeroPanel/MainHeroPanel.prefab

@@ -2054,7 +2054,7 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
-  isAssetBundle: 0
+  isAssetBundle: 1
 --- !u!1 &9116643901897262833
 GameObject:
   m_ObjectHideFlags: 0

Assets/Res/UI/MainHeroPanel/SelectFaBaoPanel.prefab

@@ -2561,7 +2561,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   startTime: 0.5
-  intervalTime: 0.2
+  intervalTime: 0.1
   isPressd: 0
 --- !u!1 &3931340268851502278
 GameObject:

Assets/Res/UI/SkillSelectPanel/GongFaUpgradePanel.prefab

@@ -5598,7 +5598,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   startTime: 0.5
-  intervalTime: 0.2
+  intervalTime: 0.1
   isPressd: 0
 --- !u!1001 &2049131876637579995
 PrefabInstance:

Assets/Scripts/GameUI/UI/MainHeroPnael/BtnFaBaoWidget.cs

@@ -28,7 +28,9 @@ namespace Fort23.Mono
 
         public async void CustomInit(int index)
         {
+            own.name = "BtnFaBaoWidget" + index;
             UIManager.Instance.DormancyGComponent(faBaoWidget);
+            faBaoWidget = null;
             this.index = index;
             FaBaoInfo faBaoInfo = PlayerManager.Instance.FaBaoControl.FightFaBao[index];
             if (faBaoInfo != null)
@@ -43,14 +45,26 @@ namespace Fort23.Mono
             else
             {
                 UIManager.Instance.DormancyGComponent(faBaoWidget);
+                faBaoWidget = null;
             }
 
             RedDotComType01.CustomInit(9, new object[] { faBaoInfo, index });
+            if (index > PlayerManager.Instance.myHero.powerUpConfig.MaxFabaoNum - 1)
+            {
+                reorderableListElement.isNoCalculation = true;
+                reorderableListElement.IsGrabbable = false;
+            }
+            else
+            {
+                reorderableListElement.isNoCalculation = false;
+                reorderableListElement.IsGrabbable = true;
+            }
         }
 
         public override void DormancyObj()
         {
             UIManager.Instance.DormancyGComponent(faBaoWidget);
+            faBaoWidget = null;
             base.DormancyObj();
         }
     }

Assets/Scripts/GameUI/UI/MainHeroPnael/BtnFaBaoWidgetData.cs

@@ -3,6 +3,8 @@ using Fort23.UTool;
 using UnityEngine.UI;
 using UnityEngine;
 using System.Collections.Generic;
+using UnityEngine.UI.Extensions;
+
 namespace Fort23.Mono
 {
 	public partial class BtnFaBaoWidget 
@@ -41,6 +43,17 @@ namespace Fort23.Mono
 	      return _RedDotComType01;
 	     }
 	   }
+	  private ReorderableListElement _reorderableListElement;
+	  public ReorderableListElement reorderableListElement
+	   {
+	   get{
+	      if (_reorderableListElement == null)
+	       {
+	         _reorderableListElement  = GetUIUnit<ReorderableListElement>("reorderableListElement"); 
+	       }
+	      return _reorderableListElement;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{

Assets/Scripts/GameUI/UI/MainHeroPnael/MainHeroPanel.cs

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.Linq;
 using Animancer;
 using Animancer.TransitionLibraries;
 using Core.Language;
@@ -70,51 +71,55 @@ namespace Fort23.Mono
             FromIndex = arg0.FromIndex;
         }
 
-  
+
         private async void GetReorderableData(ReorderableList.ReorderableListEventStruct arg0)
         {
             ToIndex = arg0.ToIndex;
-            if (ToIndex > PlayerManager.Instance.myHero.powerUpConfig.MaxFabaoNum - 1)
+            //一样直接不交换
+            if (ToIndex == FromIndex)
             {
-                for (var i = 0; i < btnFaBaoWidgets.Count; i++)
-                {
-                    btnFaBaoWidgets[i].CustomInit(i);
-                }
+                return;
+            }
 
+            if (ToIndex > PlayerManager.Instance.myHero.powerUpConfig.MaxFabaoNum - 1)
+            {
                 return;
             }
 
             FaBaoInfo faBaoInfo = PlayerManager.Instance.FaBaoControl.FightFaBao[FromIndex];
-            FaBaoInfo faBaoInfo1 = PlayerManager.Instance.FaBaoControl.FightFaBao[ToIndex];
-            PlayerManager.Instance.FaBaoControl.ChangeUseFaBao(FromIndex, faBaoInfo1);
-            PlayerManager.Instance.FaBaoControl.ChangeUseFaBao(ToIndex, faBaoInfo);
-            // for (var i = 0; i < btnFaBaoWidgets.Count; i++)
-            // {
-            //     btnFaBaoWidgets[i].CustomInit(i);
-            // }
-            foreach (var btnFaBaoWidget in btnFaBaoWidgets)
+            List<FaBaoInfo> faBaoInfos = PlayerManager.Instance.FaBaoControl.FightFaBao.ToList();
+            faBaoInfos.RemoveAt(FromIndex);
+            faBaoInfos.Insert(ToIndex,faBaoInfo);
+            for (var i = 0; i < faBaoInfos.Count; i++)
             {
-                UIManager.Instance.DormancyGComponent(btnFaBaoWidget);
+                PlayerManager.Instance.FaBaoControl.ChangeUseFaBao(i, faBaoInfos[i]);
             }
-
-            btnFaBaoWidgets.Clear();
-            for (int i = 0; i < 4; i++)
+            BtnFaBaoWidget btnFaBaoWidget = btnFaBaoWidgets[FromIndex];
+  
+            btnFaBaoWidgets.RemoveAt(FromIndex);
+            btnFaBaoWidgets.Insert(ToIndex,btnFaBaoWidget);
+            for (var i = 0; i < btnFaBaoWidgets.Count; i++)
             {
-                BtnFaBaoWidget btnFaBaoWidget =
-                    await UIManager.Instance.CreateGComponent<BtnFaBaoWidget>(null, FaBaoRoot);
-                btnFaBaoWidget.CustomInit(i);
-                btnFaBaoWidget.OnClick = OnClick;
-                btnFaBaoWidgets.Add(btnFaBaoWidget);
+                btnFaBaoWidgets[i].CustomInit(i);
             }
+  
         }
 
-        public override CTask<bool> AsyncInit(object[] uiData)
+        public async override CTask<bool> AsyncInit(object[] uiData)
         {
-            return base.AsyncInit(uiData);
+            await CustomInit();
+            base.AsyncInit(uiData);
+            return true;
         }
 
-        public async void CustomInit()
+        public async CTask CustomInit()
         {
+            foreach (var btnFaBaoWidget in btnFaBaoWidgets)
+            {
+                UIManager.Instance.DormancyGComponent(btnFaBaoWidget);
+            }
+
+            btnFaBaoWidgets.Clear();
             for (int i = 0; i < 4; i++)
             {
                 BtnFaBaoWidget btnFaBaoWidget =
@@ -258,7 +263,7 @@ namespace Fort23.Mono
         {
             MainHeroPanel mainHeroPanel =
                 await UIManager.Instance.LoadAndOpenPanel<MainHeroPanel>(null, isFullUI: true);
-            mainHeroPanel.CustomInit();
+
             return mainHeroPanel;
         }
 

Assets/Scripts/GameUI/UIExtensions/Scripts/Controls/ReorderableList/ReorderableList.cs

@@ -1,4 +1,6 @@
 using System;
+using System.Collections.Generic;
+using System.Linq;
 using UnityEngine.Events;
 
 namespace UnityEngine.UI.Extensions
@@ -33,7 +35,9 @@ namespace UnityEngine.UI.Extensions
         public int maxItems = int.MaxValue;
 
 
-        [Header("UI Re-orderable Events")] public ReorderableListHandler OnElementDropped = new ReorderableListHandler();
+        [Header("UI Re-orderable Events")]
+        public ReorderableListHandler OnElementDropped = new ReorderableListHandler();
+
         public ReorderableListHandler OnElementGrabbed = new ReorderableListHandler();
         public ReorderableListHandler OnElementRemoved = new ReorderableListHandler();
         public ReorderableListHandler OnElementAdded = new ReorderableListHandler();
@@ -46,6 +50,7 @@ namespace UnityEngine.UI.Extensions
         private RectTransform _content;
         private ReorderableListContent _listContent;
 
+
         public RectTransform Content
         {
             get
@@ -89,6 +94,7 @@ namespace UnityEngine.UI.Extensions
         {
             _listContent = ContentLayout.gameObject.GetOrAddComponent<ReorderableListContent>();
             _listContent.Init(this);
+
         }
 
         private void Start()
@@ -101,9 +107,8 @@ namespace UnityEngine.UI.Extensions
 
             if (DraggableArea == null)
             {
-              
-                DraggableArea =transform.root.GetComponent<RectTransform>();
-               // DraggableArea = transform.root.GetComponentInChildren<Canvas>().GetComponent<RectTransform>();
+                DraggableArea = transform.root.GetComponent<RectTransform>();
+                // DraggableArea = transform.root.GetComponentInChildren<Canvas>().GetComponent<RectTransform>();
             }
 
             if (IsDropable && !GetComponent<Graphic>())

Assets/Scripts/GameUI/UIExtensions/Scripts/Controls/ReorderableList/ReorderableListContent.cs

@@ -3,6 +3,7 @@
 
 using System.Collections;
 using System.Collections.Generic;
+using System.Linq;
 
 namespace UnityEngine.UI.Extensions
 {
@@ -16,6 +17,8 @@ namespace UnityEngine.UI.Extensions
         private RectTransform _rect;
         private bool _started = false;
 
+   
+
         private void OnEnable()
         {
             if(_rect)StartCoroutine(RefreshChildren());
@@ -35,7 +38,6 @@ namespace UnityEngine.UI.Extensions
             _rect = GetComponent<RectTransform>();
             _cachedChildren = new List<Transform>();
             _cachedListElement = new List<ReorderableListElement>();
-
             StartCoroutine(RefreshChildren());
             _started = true;
         }
@@ -56,6 +58,8 @@ namespace UnityEngine.UI.Extensions
                 _cachedChildren.Add(_rect.GetChild(i));
                 _cachedListElement.Add(_ele);
             }
+            
+            
 
             //HACK a little hack, if I don't wait one frame I don't have the right deleted children
             yield return 0;

Assets/Scripts/GameUI/UIExtensions/Scripts/Controls/ReorderableList/ReorderableListElement.cs

@@ -4,35 +4,34 @@
 
 using System;
 using System.Collections.Generic;
+using Fort23.UTool;
 using UnityEngine.EventSystems;
 
 namespace UnityEngine.UI.Extensions
 {
-
     [RequireComponent(typeof(RectTransform), typeof(LayoutElement))]
     public class ReorderableListElement : MonoBehaviour, IDragHandler, IBeginDragHandler, IEndDragHandler
     {
-        [Tooltip("这个元素可以拖动吗?")]
-        [SerializeField]
+        [Tooltip("这个元素可以拖动吗?")] [SerializeField]
         public bool IsGrabbable = true;
 
-        [Tooltip("这个元素可以被转移到另一个listelement被拖动吗?  ")]
-        [SerializeField]
+        [Tooltip("这个元素可以被转移到另一个listelement被拖动吗?  ")] [SerializeField]
         private bool _isTransferable = true;
 
-        [Tooltip("这个元素能被放到空间中吗?")]
-        [SerializeField]
+        [Tooltip("这个元素能被放到空间中吗?")] [SerializeField]
         private bool isDroppableInSpace = false;
 
+        [Tooltip("这个元素参与计算吗?")] public bool isNoCalculation = false;
+
 
         public bool IsTransferable
         {
             get { return _isTransferable; }
-            set 
+            set
             {
                 _canvasGroup = gameObject.GetOrAddComponent<CanvasGroup>();
                 _canvasGroup.blocksRaycasts = value;
-                _isTransferable = value; 
+                _isTransferable = value;
             }
         }
 
@@ -65,7 +64,11 @@ namespace UnityEngine.UI.Extensions
 
         public void OnBeginDrag(PointerEventData eventData)
         {
-            if (!_canvasGroup) { _canvasGroup = gameObject.GetOrAddComponent<CanvasGroup>(); }
+            if (!_canvasGroup)
+            {
+                _canvasGroup = gameObject.GetOrAddComponent<CanvasGroup>();
+            }
+
             _canvasGroup.blocksRaycasts = false;
             isValid = true;
             if (_reorderableList == null)
@@ -88,14 +91,15 @@ namespace UnityEngine.UI.Extensions
                 if (_reorderableList.OnElementRemoved != null)
                 {
                     _reorderableList.OnElementRemoved.Invoke(new ReorderableList.ReorderableListEventStruct
-                        {
-                            DroppedObject = _draggingObject.gameObject,
-                            IsAClone = _reorderableList.CloneDraggedObject,
-                            SourceObject = _reorderableList.CloneDraggedObject ? gameObject : _draggingObject.gameObject,
-                            FromList = _reorderableList,
-                            FromIndex = _fromIndex,
-                        });
+                    {
+                        DroppedObject = _draggingObject.gameObject,
+                        IsAClone = _reorderableList.CloneDraggedObject,
+                        SourceObject = _reorderableList.CloneDraggedObject ? gameObject : _draggingObject.gameObject,
+                        FromList = _reorderableList,
+                        FromIndex = _fromIndex,
+                    });
                 }
+
                 if (isValid == false)
                 {
                     _draggingObject = null;
@@ -114,25 +118,31 @@ namespace UnityEngine.UI.Extensions
             _draggingObjectLE = _draggingObject.GetComponent<LayoutElement>();
             _draggingObject.SetParent(_reorderableList.DraggableArea, true);
             _draggingObject.SetAsLastSibling();
-            _reorderableList.Refresh();
+            // _reorderableList.Refresh();
 
             //Create a fake element for previewing placement
             _fakeElement = new GameObject("Fake").AddComponent<RectTransform>();
             _fakeElementLE = _fakeElement.gameObject.AddComponent<LayoutElement>();
-
+            _fakeElement.transform.SetParent(_reorderableList.Content, false);
             RefreshSizes();
+            _fakeElement.SetSiblingIndex(_fromIndex);
+            _reorderableList.Refresh();
+            
+            LayoutRebuilder.ForceRebuildLayoutImmediate(_reorderableList.Content);
+
+
             OnBeginDragAction?.Invoke();
             //Send OnElementGrabbed Event
             if (_reorderableList.OnElementGrabbed != null)
             {
                 _reorderableList.OnElementGrabbed.Invoke(new ReorderableList.ReorderableListEventStruct
-                    {
-                        DroppedObject = _draggingObject.gameObject,
-                        IsAClone = _reorderableList.CloneDraggedObject,
-                        SourceObject = _reorderableList.CloneDraggedObject ? gameObject : _draggingObject.gameObject,
-                        FromList = _reorderableList,
-                        FromIndex = _fromIndex,
-                    });
+                {
+                    DroppedObject = _draggingObject.gameObject,
+                    IsAClone = _reorderableList.CloneDraggedObject,
+                    SourceObject = _reorderableList.CloneDraggedObject ? gameObject : _draggingObject.gameObject,
+                    FromList = _reorderableList,
+                    FromIndex = _fromIndex,
+                });
 
                 if (!isValid)
                 {
@@ -158,11 +168,13 @@ namespace UnityEngine.UI.Extensions
                 CancelDrag();
                 return;
             }
+
             //Set dragging object on cursor
-          //  var canvas = _draggingObject.GetComponentInParent<Canvas>();
-            var canvas =_draggingObject.GetComponentInParent<Canvas>();
+            //  var canvas = _draggingObject.GetComponentInParent<Canvas>();
+            var canvas = _draggingObject.GetComponentInParent<Canvas>();
             Vector3 worldPoint;
-            RectTransformUtility.ScreenPointToWorldPointInRectangle(canvas.GetComponent<RectTransform>(), eventData.position,
+            RectTransformUtility.ScreenPointToWorldPointInRectangle(canvas.GetComponent<RectTransform>(),
+                eventData.position,
                 canvas.renderMode != RenderMode.ScreenSpaceOverlay ? canvas.worldCamera : null, out worldPoint);
             _draggingObject.position = worldPoint;
 
@@ -182,33 +194,49 @@ namespace UnityEngine.UI.Extensions
             //如果没有找到或列表不可删除，将假元素放在外面
             if (_currentReorderableListRaycasted == null || _currentReorderableListRaycasted.IsDropable == false
 //                || (_oldReorderableListRaycasted != _reorderableList && !IsTransferable)
-                || ((_fakeElement.parent == _currentReorderableListRaycasted.Content 
-                    ? _currentReorderableListRaycasted.Content.childCount - 1 
-                    : _currentReorderableListRaycasted.Content.childCount) >= _currentReorderableListRaycasted.maxItems && !_currentReorderableListRaycasted.IsDisplacable)
-                || _currentReorderableListRaycasted.maxItems <= 0)
+                                                         || ((_fakeElement.parent ==
+                                                              _currentReorderableListRaycasted.Content
+                                                                 ? _currentReorderableListRaycasted.Content.childCount -
+                                                                   1
+                                                                 : _currentReorderableListRaycasted.Content
+                                                                     .childCount) >=
+                                                             _currentReorderableListRaycasted.maxItems &&
+                                                             !_currentReorderableListRaycasted.IsDisplacable)
+                                                         || _currentReorderableListRaycasted.maxItems <= 0)
             {
                 RefreshSizes();
-                _fakeElement.transform.SetParent(_reorderableList.DraggableArea, false);
+                // _fakeElement.transform.SetParent(_reorderableList.DraggableArea, false);
+                _fakeElement.transform.SetParent(_reorderableList.Content, false);
                 // revert the displaced element when not hovering over its list
                 if (_displacedObject != null)
                 {
                     revertDisplacedElement();
                 }
+
+                _fakeElement.gameObject.SetActive(false);
+                _fakeElement.SetSiblingIndex(_fromIndex);
+                _fakeElement.gameObject.SetActive(true);
             }
             //否则找到列表中的最佳位置并将假元素放在正确的索引上
             else
             {
-                if (_currentReorderableListRaycasted.Content.childCount < _currentReorderableListRaycasted.maxItems && _fakeElement.parent != _currentReorderableListRaycasted.Content)
+                if (_currentReorderableListRaycasted.Content.childCount < _currentReorderableListRaycasted.maxItems &&
+                    _fakeElement.parent != _currentReorderableListRaycasted.Content)
                 {
                     _fakeElement.SetParent(_currentReorderableListRaycasted.Content, false);
                 }
 
                 float minDistance = float.PositiveInfinity;
-                int targetIndex = 0;
+                int targetIndex = _fromIndex;
                 float dist = 0;
                 for (int j = 0; j < _currentReorderableListRaycasted.Content.childCount; j++)
                 {
                     var c = _currentReorderableListRaycasted.Content.GetChild(j).GetComponent<RectTransform>();
+                    if (_currentReorderableListRaycasted.Content.GetChild(j).GetComponent<ReorderableListElement>()
+                        .isNoCalculation)
+                    {
+                        continue;
+                    }
 
                     if (_currentReorderableListRaycasted.ContentLayout is VerticalLayoutGroup)
                         dist = Mathf.Abs(c.position.y - worldPoint.y);
@@ -223,14 +251,18 @@ namespace UnityEngine.UI.Extensions
                         targetIndex = j;
                     }
                 }
-                if ((_currentReorderableListRaycasted != _oldReorderableListRaycasted || targetIndex != _displacedFromIndex)
+
+
+                if ((_currentReorderableListRaycasted != _oldReorderableListRaycasted ||
+                     targetIndex != _displacedFromIndex)
                     && _currentReorderableListRaycasted.Content.childCount == _currentReorderableListRaycasted.maxItems)
                 {
                     Transform toDisplace = _currentReorderableListRaycasted.Content.GetChild(targetIndex);
                     if (_displacedObject != null)
                     {
                         revertDisplacedElement();
-                        if (_currentReorderableListRaycasted.Content.childCount > _currentReorderableListRaycasted.maxItems)
+                        if (_currentReorderableListRaycasted.Content.childCount >
+                            _currentReorderableListRaycasted.maxItems)
                         {
                             displaceElement(targetIndex, toDisplace);
                         }
@@ -241,11 +273,11 @@ namespace UnityEngine.UI.Extensions
                         displaceElement(targetIndex, toDisplace);
                     }
                 }
+
                 RefreshSizes();
                 _fakeElement.gameObject.SetActive(false);
                 _fakeElement.SetSiblingIndex(targetIndex);
                 _fakeElement.gameObject.SetActive(true);
-
             }
         }
 
@@ -270,11 +302,12 @@ namespace UnityEngine.UI.Extensions
             };
 
 
-            int c = _fakeElement.parent == _reorderableList.Content 
-                ? _reorderableList.Content.childCount - 1 
+            int c = _fakeElement.parent == _reorderableList.Content
+                ? _reorderableList.Content.childCount - 1
                 : _reorderableList.Content.childCount;
 
-            if (_reorderableList.IsDropable && c < _reorderableList.maxItems && _displacedObject.GetComponent<ReorderableListElement>().IsTransferable)
+            if (_reorderableList.IsDropable && c < _reorderableList.maxItems &&
+                _displacedObject.GetComponent<ReorderableListElement>().IsTransferable)
             {
                 _displacedObjectLE.preferredWidth = _draggingObjectOriginalSize.x;
                 _displacedObjectLE.preferredHeight = _draggingObjectOriginalSize.y;
@@ -294,7 +327,8 @@ namespace UnityEngine.UI.Extensions
             {
                 _displacedObject.SetParent(_currentReorderableListRaycasted.DraggableArea, true);
                 _currentReorderableListRaycasted.Refresh();
-                _displacedObject.position += new Vector3(_draggingObjectOriginalSize.x / 2, _draggingObjectOriginalSize.y / 2, 0);
+                _displacedObject.position +=
+                    new Vector3(_draggingObjectOriginalSize.x / 2, _draggingObjectOriginalSize.y / 2, 0);
             }
             else
             {
@@ -302,6 +336,7 @@ namespace UnityEngine.UI.Extensions
                 _displacedObjectOriginList.Refresh();
                 _displacedObject.gameObject.SetActive(false);
             }
+
             _displacedObjectOriginList.OnElementDisplacedFrom.Invoke(args);
             _reorderableList.OnElementRemoved.Invoke(args);
         }
@@ -336,6 +371,7 @@ namespace UnityEngine.UI.Extensions
                 _reorderableList.OnElementDisplacedToReturned.Invoke(args);
                 _reorderableList.OnElementRemoved.Invoke(args);
             }
+
             _displacedObjectOriginList.OnElementDisplacedFromReturned.Invoke(args);
             _displacedObjectOriginList.OnElementAdded.Invoke(args);
 
@@ -343,7 +379,6 @@ namespace UnityEngine.UI.Extensions
             _displacedObjectOriginList = null;
             _displacedObject = null;
             _displacedObjectLE = null;
-
         }
 
 
@@ -353,6 +388,7 @@ namespace UnityEngine.UI.Extensions
             {
                 Destroy(_displacedObject.gameObject);
             }
+
             _displacedFromIndex = -1;
             _displacedObjectOriginList = null;
             _displacedObject = null;
@@ -365,16 +401,17 @@ namespace UnityEngine.UI.Extensions
         #region IEndDragHandler Members
 
         public Action OnEndDragAction;
+
         public void OnEndDrag(PointerEventData eventData)
         {
             _isDragging = false;
 
             if (_draggingObject != null)
             {
-             
                 //If we have a ReorderableList that is dropable
                 //Put the dragged object into the content and at the right index
-                if (_currentReorderableListRaycasted != null && _fakeElement.parent == _currentReorderableListRaycasted.Content)
+                if (_currentReorderableListRaycasted != null &&
+                    _fakeElement.parent == _currentReorderableListRaycasted.Content)
                 {
                     var args = new ReorderableList.ReorderableListEventStruct
                     {
@@ -391,11 +428,13 @@ namespace UnityEngine.UI.Extensions
                     {
                         _reorderableList.OnElementDropped.Invoke(args);
                     }
+
                     if (!isValid)
                     {
                         CancelDrag();
                         return;
                     }
+
                     RefreshSizes();
                     _draggingObject.SetParent(_currentReorderableListRaycasted.Content, false);
                     _draggingObject.rotation = _currentReorderableListRaycasted.transform.rotation;
@@ -407,12 +446,13 @@ namespace UnityEngine.UI.Extensions
                         var cg = _draggingObject.GetComponent<CanvasGroup>();
                         cg.blocksRaycasts = true;
                     }
+
                     // Force refreshing both lists because otherwise we get inappropriate FromList in ReorderableListEventStruct 
                     _reorderableList.Refresh();
                     _currentReorderableListRaycasted.Refresh();
 
                     _reorderableList.OnElementAdded.Invoke(args);
-            
+
                     if (_displacedObject != null)
                     {
                         finishDisplacingElement();
@@ -421,27 +461,27 @@ namespace UnityEngine.UI.Extensions
                     if (!isValid)
                         throw new Exception("It's too late to cancel the Transfer! Do so in OnElementDropped!");
                 }
-                
+
                 else
                 {
                     //We don't have an ReorderableList
                     if (this.isDroppableInSpace)
                     {
                         _reorderableList.OnElementDropped.Invoke(new ReorderableList.ReorderableListEventStruct
-                            {
-                                DroppedObject = _draggingObject.gameObject,
-                                IsAClone = _reorderableList.CloneDraggedObject,
-                                SourceObject =
-                                    _reorderableList.CloneDraggedObject ? gameObject : _draggingObject.gameObject,
-                                FromList = _reorderableList,
-                                FromIndex = _fromIndex
-                            });
+                        {
+                            DroppedObject = _draggingObject.gameObject,
+                            IsAClone = _reorderableList.CloneDraggedObject,
+                            SourceObject =
+                                _reorderableList.CloneDraggedObject ? gameObject : _draggingObject.gameObject,
+                            FromList = _reorderableList,
+                            FromIndex = _fromIndex
+                        });
                     }
                     else
                     {
                         CancelDrag();
                     }
-                    
+
                     //If there is no more room for the element in the target list, notify it (OnElementDroppedWithMaxItems event) 
                     if (_currentReorderableListRaycasted != null)
                     {
@@ -461,9 +501,8 @@ namespace UnityEngine.UI.Extensions
                                     ToList = _currentReorderableListRaycasted,
                                     FromIndex = _fromIndex
                                 });
-                        } 
+                        }
                     }
-                    
                 }
             }
 
@@ -471,9 +510,10 @@ namespace UnityEngine.UI.Extensions
             if (_fakeElement != null)
             {
                 Destroy(_fakeElement.gameObject);
-             
+
                 _fakeElement = null;
             }
+
             _canvasGroup.blocksRaycasts = true;
             OnEndDragAction?.Invoke();
         }
@@ -515,7 +555,6 @@ namespace UnityEngine.UI.Extensions
 
                 if (!isValid)
                     throw new Exception("Transfer is already Canceled.");
-
             }
 
             //Delete fake element
@@ -524,10 +563,12 @@ namespace UnityEngine.UI.Extensions
                 Destroy(_fakeElement.gameObject);
                 _fakeElement = null;
             }
+
             if (_displacedObject != null)
             {
                 revertDisplacedElement();
             }
+
             _canvasGroup.blocksRaycasts = true;
         }
 
@@ -560,4 +601,4 @@ namespace UnityEngine.UI.Extensions
             _canvasGroup = gameObject.GetOrAddComponent<CanvasGroup>();
         }
     }
-}
+}

Assets/StreamingAssets/assetBundle.zip.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: DSxJ43uoUH8kT0YwMiNbOE+4J0BQp6l+fEMrKmhKdWq4r0S/FEZZQeH4/d3n
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Packages/manifest.json

@@ -16,7 +16,7 @@
     "com.unity.entities": "1.0.16",
     "com.unity.entities.graphics": "1.0.16",
     "com.unity.feature.2d": "2.0.1",
-    "com.unity.ide.rider": "3.0.35",
+    "com.unity.ide.rider": "3.0.38",
     "com.unity.ide.visualstudio": "2.0.22",
     "com.unity.ide.vscode": "1.2.5",
     "com.unity.memoryprofiler": "1.1.6",

Packages/packages-lock.json

@@ -279,7 +279,7 @@
       }
     },
     "com.unity.ide.rider": {
-      "version": "3.0.35",
+      "version": "3.0.38",
       "depth": 0,
       "source": "registry",
       "dependencies": {

UserSettings/Layouts/default-2022.dwlt

@@ -14,13 +14,13 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_PixelRect:
     serializedVersion: 2
-    x: 0
-    y: 32.000004
-    width: 1920.0002
-    height: 1012.0001
+    x: -2560
+    y: 43
+    width: 2560
+    height: 1349
   m_ShowMode: 4
-  m_Title: Project
-  m_RootView: {fileID: 7}
+  m_Title: Inspector
+  m_RootView: {fileID: 2}
   m_MinSize: {x: 875, y: 300}
   m_MaxSize: {x: 10000, y: 10000}
   m_Maximized: 1
@@ -32,24 +32,26 @@ MonoBehaviour:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 0}
   m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: GameView
+  m_EditorHideFlags: 1
+  m_Script: {fileID: 12008, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 
   m_EditorClassIdentifier: 
-  m_Children: []
+  m_Children:
+  - {fileID: 3}
+  - {fileID: 4}
+  - {fileID: 5}
   m_Position:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 403.50003
-    height: 962.00006
-  m_MinSize: {x: 200, y: 200}
-  m_MaxSize: {x: 4000, y: 4000}
-  m_ActualView: {fileID: 17}
-  m_Panes:
-  - {fileID: 17}
-  m_Selected: 0
-  m_LastSelected: 0
+    width: 2560
+    height: 1349
+  m_MinSize: {x: 875, y: 300}
+  m_MaxSize: {x: 10000, y: 10000}
+  m_UseTopView: 1
+  m_TopViewHeight: 30
+  m_UseBottomView: 1
+  m_BottomViewHeight: 20
 --- !u!114 &3
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -58,24 +60,20 @@ MonoBehaviour:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 0}
   m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: SceneHierarchyWindow
+  m_EditorHideFlags: 1
+  m_Script: {fileID: 12011, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 
   m_EditorClassIdentifier: 
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 564.00006
+    x: 0
     y: 0
-    width: 538.50006
-    height: 570.00006
-  m_MinSize: {x: 202, y: 221}
-  m_MaxSize: {x: 4002, y: 4021}
-  m_ActualView: {fileID: 15}
-  m_Panes:
-  - {fileID: 15}
-  m_Selected: 0
-  m_LastSelected: 0
+    width: 2560
+    height: 30
+  m_MinSize: {x: 0, y: 0}
+  m_MaxSize: {x: 0, y: 0}
+  m_LastLoadedLayoutName: 1
 --- !u!114 &4
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -89,19 +87,20 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
-  - {fileID: 2}
-  - {fileID: 10}
-  - {fileID: 5}
+  - {fileID: 9}
+  - {fileID: 6}
+  - {fileID: 7}
+  - {fileID: 8}
   m_Position:
     serializedVersion: 2
     x: 0
     y: 30
-    width: 1920.0001
-    height: 962.00006
-  m_MinSize: {x: 400, y: 100}
-  m_MaxSize: {x: 32384, y: 16192}
+    width: 2560
+    height: 1299
+  m_MinSize: {x: 400, y: 50}
+  m_MaxSize: {x: 32384, y: 8096}
   vertical: 0
-  controlID: 1094
+  controlID: 29241
   draggingID: 0
 --- !u!114 &5
 MonoBehaviour:
@@ -112,23 +111,18 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 1
-  m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
+  m_Script: {fileID: 12042, guid: 0000000000000000e000000000000000, type: 0}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 1506.0001
-    y: 0
-    width: 414
-    height: 962.00006
-  m_MinSize: {x: 276, y: 71}
-  m_MaxSize: {x: 4001, y: 4021}
-  m_ActualView: {fileID: 14}
-  m_Panes:
-  - {fileID: 14}
-  m_Selected: 0
-  m_LastSelected: 0
+    x: 0
+    y: 1329
+    width: 2560
+    height: 20
+  m_MinSize: {x: 0, y: 0}
+  m_MaxSize: {x: 0, y: 0}
 --- !u!114 &6
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -139,23 +133,22 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 1
   m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: ProjectBrowser
+  m_Name: 
   m_EditorClassIdentifier: 
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 0
-    y: 570.00006
-    width: 1102.5001
-    height: 392
-  m_MinSize: {x: 232, y: 271}
-  m_MaxSize: {x: 10002, y: 10021}
-  m_ActualView: {fileID: 13}
+    x: 1209
+    y: 0
+    width: 411
+    height: 1299
+  m_MinSize: {x: 202, y: 221}
+  m_MaxSize: {x: 4002, y: 4021}
+  m_ActualView: {fileID: 10}
   m_Panes:
-  - {fileID: 13}
-  - {fileID: 18}
+  - {fileID: 10}
   m_Selected: 0
-  m_LastSelected: 1
+  m_LastSelected: 0
 --- !u!114 &7
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -165,25 +158,23 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 1
-  m_Script: {fileID: 12008, guid: 0000000000000000e000000000000000, type: 0}
+  m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_Children:
-  - {fileID: 8}
-  - {fileID: 4}
-  - {fileID: 9}
+  m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 0
+    x: 1620
     y: 0
-    width: 1920.0001
-    height: 1012.00006
-  m_MinSize: {x: 875, y: 300}
-  m_MaxSize: {x: 10000, y: 10000}
-  m_UseTopView: 1
-  m_TopViewHeight: 30
-  m_UseBottomView: 1
-  m_BottomViewHeight: 20
+    width: 367
+    height: 1299
+  m_MinSize: {x: 232, y: 271}
+  m_MaxSize: {x: 10002, y: 10021}
+  m_ActualView: {fileID: 12}
+  m_Panes:
+  - {fileID: 12}
+  m_Selected: 0
+  m_LastSelected: 0
 --- !u!114 &8
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -193,19 +184,23 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 1
-  m_Script: {fileID: 12011, guid: 0000000000000000e000000000000000, type: 0}
+  m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 0
+    x: 1987
     y: 0
-    width: 1920.0001
-    height: 30
-  m_MinSize: {x: 0, y: 0}
-  m_MaxSize: {x: 0, y: 0}
-  m_LastLoadedLayoutName: lt
+    width: 573
+    height: 1299
+  m_MinSize: {x: 276, y: 71}
+  m_MaxSize: {x: 4001, y: 4021}
+  m_ActualView: {fileID: 11}
+  m_Panes:
+  - {fileID: 11}
+  m_Selected: 0
+  m_LastSelected: 0
 --- !u!114 &9
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -215,18 +210,24 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 1
-  m_Script: {fileID: 12042, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: 
+  m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: GameView
   m_EditorClassIdentifier: 
   m_Children: []
   m_Position:
     serializedVersion: 2
     x: 0
-    y: 992.00006
-    width: 1920.0001
-    height: 20
-  m_MinSize: {x: 0, y: 0}
-  m_MaxSize: {x: 0, y: 0}
+    y: 0
+    width: 1209
+    height: 1299
+  m_MinSize: {x: 201, y: 221}
+  m_MaxSize: {x: 4001, y: 4021}
+  m_ActualView: {fileID: 13}
+  m_Panes:
+  - {fileID: 14}
+  - {fileID: 13}
+  m_Selected: 1
+  m_LastSelected: 0
 --- !u!114 &10
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -236,23 +237,60 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 1
-  m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0}
+  m_Script: {fileID: 12061, guid: 0000000000000000e000000000000000, type: 0}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_Children:
-  - {fileID: 11}
-  - {fileID: 6}
-  m_Position:
+  m_MinSize: {x: 200, y: 200}
+  m_MaxSize: {x: 4000, y: 4000}
+  m_TitleContent:
+    m_Text: Hierarchy
+    m_Image: {fileID: 7966133145522015247, guid: 0000000000000000d000000000000000, type: 0}
+    m_Tooltip: 
+  m_Pos:
     serializedVersion: 2
-    x: 403.50003
-    y: 0
-    width: 1102.5001
-    height: 962.00006
-  m_MinSize: {x: 200, y: 100}
-  m_MaxSize: {x: 16192, y: 16192}
-  vertical: 1
-  controlID: 1095
-  draggingID: 0
+    x: -1351
+    y: 73
+    width: 409
+    height: 1278
+  m_SerializedDataModeController:
+    m_DataMode: 0
+    m_PreferredDataMode: 0
+    m_SupportedDataModes: 
+    isAutomatic: 1
+  m_ViewDataDictionary: {fileID: 0}
+  m_OverlayCanvas:
+    m_LastAppliedPresetName: Default
+    m_SaveData: []
+    m_OverlaysVisible: 1
+  m_SceneHierarchy:
+    m_TreeViewState:
+      scrollPos: {x: 0, y: 0}
+      m_SelectedIDs: d0b00000
+      m_LastClickedID: 0
+      m_ExpandedIDs: 
+      m_RenameOverlay:
+        m_UserAcceptedRename: 0
+        m_Name: 
+        m_OriginalName: 
+        m_EditFieldRect:
+          serializedVersion: 2
+          x: 0
+          y: 0
+          width: 0
+          height: 0
+        m_UserData: 0
+        m_IsWaitingForDelay: 0
+        m_IsRenaming: 0
+        m_OriginalEventType: 11
+        m_IsRenamingFilename: 0
+        m_ClientGUIView: {fileID: 0}
+      m_SearchString: 
+    m_ExpandedScenes: []
+    m_CurrenRootInstanceID: 0
+    m_LockTracker:
+      m_IsLocked: 0
+    m_CurrentSortingName: TransformSorting
+  m_WindowGUID: 468457e0d3add1041b6fec0b00b6a014
 --- !u!114 &11
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -262,50 +300,45 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 1
-  m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0}
+  m_Script: {fileID: 12019, guid: 0000000000000000e000000000000000, type: 0}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_Children:
-  - {fileID: 12}
-  - {fileID: 3}
-  m_Position:
+  m_MinSize: {x: 275, y: 50}
+  m_MaxSize: {x: 4000, y: 4000}
+  m_TitleContent:
+    m_Text: Inspector
+    m_Image: {fileID: -2667387946076563598, guid: 0000000000000000d000000000000000, type: 0}
+    m_Tooltip: 
+  m_Pos:
     serializedVersion: 2
-    x: 0
-    y: 0
-    width: 1102.5001
-    height: 570.00006
-  m_MinSize: {x: 200, y: 50}
-  m_MaxSize: {x: 16192, y: 8096}
-  vertical: 0
-  controlID: 1096
-  draggingID: 0
+    x: -573
+    y: 73
+    width: 572
+    height: 1278
+  m_SerializedDataModeController:
+    m_DataMode: 0
+    m_PreferredDataMode: 0
+    m_SupportedDataModes: 
+    isAutomatic: 1
+  m_ViewDataDictionary: {fileID: 0}
+  m_OverlayCanvas:
+    m_LastAppliedPresetName: Default
+    m_SaveData: []
+    m_OverlaysVisible: 1
+  m_ObjectsLockedBeforeSerialization: []
+  m_InstanceIDsLockedBeforeSerialization: 
+  m_PreviewResizer:
+    m_CachedPref: -160
+    m_ControlHash: -371814159
+    m_PrefName: Preview_InspectorPreview
+  m_LastInspectedObjectInstanceID: -1
+  m_LastVerticalScrollValue: 0
+  m_GlobalObjectId: 
+  m_InspectorMode: 0
+  m_LockTracker:
+    m_IsLocked: 0
+  m_PreviewWindow: {fileID: 0}
 --- !u!114 &12
-MonoBehaviour:
-  m_ObjectHideFlags: 52
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 1
-  m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: SceneView
-  m_EditorClassIdentifier: 
-  m_Children: []
-  m_Position:
-    serializedVersion: 2
-    x: 0
-    y: 0
-    width: 564.00006
-    height: 570.00006
-  m_MinSize: {x: 202, y: 221}
-  m_MaxSize: {x: 4002, y: 4021}
-  m_ActualView: {fileID: 16}
-  m_Panes:
-  - {fileID: 16}
-  m_Selected: 0
-  m_LastSelected: 0
---- !u!114 &13
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -321,14 +354,14 @@ MonoBehaviour:
   m_MaxSize: {x: 10000, y: 10000}
   m_TitleContent:
     m_Text: Project
-    m_Image: {fileID: -5179483145760003458, guid: 0000000000000000d000000000000000, type: 0}
+    m_Image: {fileID: -5467254957812901981, guid: 0000000000000000d000000000000000, type: 0}
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 403.50006
-    y: 632.00006
-    width: 1100.5001
-    height: 371
+    x: -940
+    y: 73
+    width: 365
+    height: 1278
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -350,40 +383,40 @@ MonoBehaviour:
     m_SkipHidden: 0
     m_SearchArea: 1
     m_Folders:
-    - Assets/Art/VFX/UIFXprefab
+    - Assets
     m_Globs: []
     m_OriginalText: 
     m_ImportLogFlags: 0
     m_FilterByTypeIntersection: 0
   m_ViewMode: 1
-  m_StartGridSize: 16
+  m_StartGridSize: 64
   m_LastFolders:
-  - Assets/Art/VFX/UIFXprefab
-  m_LastFoldersGridSize: 16
-  m_LastProjectPath: H:\XY002\XiuXianGame
+  - Assets
+  m_LastFoldersGridSize: -1
+  m_LastProjectPath: D:\FB\XiuXianGame
   m_LockTracker:
     m_IsLocked: 0
   m_FolderTreeState:
-    scrollPos: {x: 0, y: 833}
-    m_SelectedIDs: aaf50100
-    m_LastClickedID: 128426
-    m_ExpandedIDs: 00000000d86a0000bef30100c0f30100c2f30100c4f30100c6f30100c8f30100caf30100ccf30100cef30100d0f30100d2f30100d4f30100d6f30100d8f30100daf30100dcf30100def30100e0f30100e2f30100e4f30100e6f30100e8f30100eaf30100ecf30100eef30100f0f30100f2f30100f4f30100f6f3010054f60100860502008805020000ca9a3b
+    scrollPos: {x: 0, y: 0}
+    m_SelectedIDs: 2eca0000
+    m_LastClickedID: 51758
+    m_ExpandedIDs: 0000000014a800002eca000030ca000032ca000034ca000036ca000038ca00003aca00003cca00003eca000040ca000044ca000046ca000048ca00004aca00004cca00004eca000052ca000056ca000058ca00005aca00005cca000000ca9a3b
     m_RenameOverlay:
       m_UserAcceptedRename: 0
-      m_Name: Noise
-      m_OriginalName: Noise
+      m_Name: 
+      m_OriginalName: 
       m_EditFieldRect:
         serializedVersion: 2
         x: 0
         y: 0
         width: 0
         height: 0
-      m_UserData: 128414
+      m_UserData: 0
       m_IsWaitingForDelay: 0
       m_IsRenaming: 0
-      m_OriginalEventType: 0
+      m_OriginalEventType: 11
       m_IsRenamingFilename: 1
-      m_ClientGUIView: {fileID: 6}
+      m_ClientGUIView: {fileID: 0}
     m_SearchString: 
     m_CreateAssetUtility:
       m_EndAction: {fileID: 0}
@@ -395,7 +428,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: 00000000d86a0000bef30100c0f30100c2f30100c4f30100c6f30100c8f30100caf30100ccf30100cef30100d0f30100d2f30100d4f30100d6f30100d8f30100daf30100dcf30100def30100e0f30100e2f30100e4f30100e6f30100e8f30100eaf30100ecf30100eef30100f0f30100f2f30100f4f30100f6f3010000ca9a3b
+    m_ExpandedIDs: 0000000014a800002eca000030ca000032ca000034ca000036ca000038ca00003aca00003cca00003eca000040ca000044ca000046ca000048ca00004aca00004cca00004eca000052ca000056ca000058ca00005aca00005cca000000ca9a3b
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -420,10 +453,10 @@ MonoBehaviour:
       m_Icon: {fileID: 0}
       m_ResourceFile: 
   m_ListAreaState:
-    m_SelectedInstanceIDs: a0c6fcff
-    m_LastClickedInstanceID: -211296
+    m_SelectedInstanceIDs: 
+    m_LastClickedInstanceID: 0
     m_HadKeyboardFocusLastEvent: 0
-    m_ExpandedInstanceIDs: c623000004f70100
+    m_ExpandedInstanceIDs: 
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -439,7 +472,7 @@ MonoBehaviour:
       m_IsRenaming: 0
       m_OriginalEventType: 11
       m_IsRenamingFilename: 1
-      m_ClientGUIView: {fileID: 6}
+      m_ClientGUIView: {fileID: 0}
     m_CreateAssetUtility:
       m_EndAction: {fileID: 0}
       m_InstanceID: 0
@@ -448,57 +481,10 @@ MonoBehaviour:
       m_ResourceFile: 
     m_NewAssetIndexInList: -1
     m_ScrollPosition: {x: 0, y: 0}
-    m_GridSize: 16
+    m_GridSize: 64
   m_SkipHiddenPackages: 0
-  m_DirectoriesAreaWidth: 207
---- !u!114 &14
-MonoBehaviour:
-  m_ObjectHideFlags: 52
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 1
-  m_Script: {fileID: 12019, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_MinSize: {x: 275, y: 50}
-  m_MaxSize: {x: 4000, y: 4000}
-  m_TitleContent:
-    m_Text: Inspector
-    m_Image: {fileID: -440750813802333266, guid: 0000000000000000d000000000000000, type: 0}
-    m_Tooltip: 
-  m_Pos:
-    serializedVersion: 2
-    x: 1506.0001
-    y: 62.000008
-    width: 413
-    height: 941.00006
-  m_SerializedDataModeController:
-    m_DataMode: 0
-    m_PreferredDataMode: 0
-    m_SupportedDataModes: 
-    isAutomatic: 1
-  m_ViewDataDictionary: {fileID: 0}
-  m_OverlayCanvas:
-    m_LastAppliedPresetName: Default
-    m_SaveData: []
-    m_OverlaysVisible: 1
-  m_ObjectsLockedBeforeSerialization: []
-  m_InstanceIDsLockedBeforeSerialization: 
-  m_PreviewResizer:
-    m_CachedPref: 443.00006
-    m_ControlHash: -371814159
-    m_PrefName: Preview_InspectorPreview
-  m_LastInspectedObjectInstanceID: -211296
-  m_LastVerticalScrollValue: 0
-  m_GlobalObjectId: 
-  m_InspectorMode: 0
-  m_LockTracker:
-    m_IsLocked: 0
-  m_PreviewWindow: {fileID: 0}
---- !u!114 &15
+  m_DirectoriesAreaWidth: 115
+--- !u!114 &13
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -507,21 +493,21 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 1
-  m_Script: {fileID: 12061, guid: 0000000000000000e000000000000000, type: 0}
+  m_Script: {fileID: 12015, guid: 0000000000000000e000000000000000, type: 0}
   m_Name: 
   m_EditorClassIdentifier: 
   m_MinSize: {x: 200, y: 200}
   m_MaxSize: {x: 4000, y: 4000}
   m_TitleContent:
-    m_Text: Hierarchy
-    m_Image: {fileID: -3734745235275155857, guid: 0000000000000000d000000000000000, type: 0}
+    m_Text: Game
+    m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000, type: 0}
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 967.5001
-    y: 62.000008
-    width: 536.50006
-    height: 549.00006
+    x: -2560
+    y: 73
+    width: 1208
+    height: 1278
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -532,36 +518,72 @@ MonoBehaviour:
     m_LastAppliedPresetName: Default
     m_SaveData: []
     m_OverlaysVisible: 1
-  m_SceneHierarchy:
-    m_TreeViewState:
-      scrollPos: {x: 0, y: 0}
-      m_SelectedIDs: a0c6fcff
-      m_LastClickedID: -211296
-      m_ExpandedIDs: 4c9df5ff4e9df5ff689df5ff1c9ef5ff269ef5ff349ef5ffd49ef5ffd89ef5fff09ef5ff2ceaf5ff2eeaf5ffd2eaf5ffe2eaf5ff64ebf5ff66ebf5ff20edf5ff2aedf5ffa632f6ffa832f6ff3839f6ff8e97f6ff1a98f6ff12a1f6ffaaa1f6ffb6e3f7ff6e78f8ffde7bf8ffe4eaf8ff90d6fbff6ad8fbff76d8fbff50f8fbffc6f8fbff20f9fbff5657fcff6257fcff8cc3fcff92c3fcff52c4fcff5ac4fcff32c6fcff38c6fcff3cc6fcff40c6fcffa0c6fcffe8ecfcfff0ecfcff00edfcff86edfcff8cedfcffc8edfcffbe13fdff4451ffff9851ffffc051ffffc651ffffce51ffff0253ffff3253ffffa653ffffac53ffffb053ffffb453ffff1454ffffb877ffffc477ffff9ef5ffffb4faffff42fbffff90c80000d6d0000094d4000080d5000084d800005adc000064e200000ae3000008e50000ece70000dce9000024f20000b0f20000e2ff0000da04010026050100c60801006c0e010058040300a40c0300621003004e1103005014030028180300de200300b82303008c2e0300ba3b0300aa400300f64003009a440300404a0300
-      m_RenameOverlay:
-        m_UserAcceptedRename: 0
-        m_Name: fx_ui_fb_shifang
-        m_OriginalName: fx_ui_fb_shifang
-        m_EditFieldRect:
-          serializedVersion: 2
-          x: 0
-          y: 0
-          width: 0
-          height: 0
-        m_UserData: -616412
-        m_IsWaitingForDelay: 0
-        m_IsRenaming: 0
-        m_OriginalEventType: 0
-        m_IsRenamingFilename: 0
-        m_ClientGUIView: {fileID: 3}
-      m_SearchString: 
-    m_ExpandedScenes: []
-    m_CurrenRootInstanceID: 0
-    m_LockTracker:
-      m_IsLocked: 0
-    m_CurrentSortingName: TransformSorting
-  m_WindowGUID: 4c969a2b90040154d917609493e03593
---- !u!114 &16
+  m_SerializedViewNames: []
+  m_SerializedViewValues: []
+  m_PlayModeViewName: GameView
+  m_ShowGizmos: 0
+  m_TargetDisplay: 0
+  m_ClearColor: {r: 0, g: 0, b: 0, a: 0}
+  m_TargetSize: {x: 750, y: 1624}
+  m_TextureFilterMode: 0
+  m_TextureHideFlags: 61
+  m_RenderIMGUI: 1
+  m_EnterPlayModeBehavior: 0
+  m_UseMipMap: 0
+  m_VSyncEnabled: 0
+  m_Gizmos: 0
+  m_Stats: 0
+  m_SelectedSizes: 08000000000000000000000012000000000000000000000000000000000000000000000000000000
+  m_ZoomArea:
+    m_HRangeLocked: 0
+    m_VRangeLocked: 0
+    hZoomLockedByDefault: 0
+    vZoomLockedByDefault: 0
+    m_HBaseRangeMin: -375
+    m_HBaseRangeMax: 375
+    m_VBaseRangeMin: -812
+    m_VBaseRangeMax: 812
+    m_HAllowExceedBaseRangeMin: 1
+    m_HAllowExceedBaseRangeMax: 1
+    m_VAllowExceedBaseRangeMin: 1
+    m_VAllowExceedBaseRangeMax: 1
+    m_ScaleWithWindow: 0
+    m_HSlider: 0
+    m_VSlider: 0
+    m_IgnoreScrollWheelUntilClicked: 0
+    m_EnableMouseInput: 1
+    m_EnableSliderZoomHorizontal: 0
+    m_EnableSliderZoomVertical: 0
+    m_UniformScale: 1
+    m_UpDirection: 1
+    m_DrawArea:
+      serializedVersion: 2
+      x: 0
+      y: 21
+      width: 1208
+      height: 1257
+    m_Scale: {x: 0.7740148, y: 0.7740148}
+    m_Translation: {x: 604, y: 628.5}
+    m_MarginLeft: 0
+    m_MarginRight: 0
+    m_MarginTop: 0
+    m_MarginBottom: 0
+    m_LastShownAreaInsideMargins:
+      serializedVersion: 2
+      x: -780.34686
+      y: -812
+      width: 1560.6937
+      height: 1624
+    m_MinimalGUI: 1
+  m_defaultScale: 0.7740148
+  m_LastWindowPixelSize: {x: 1208, y: 1278}
+  m_ClearInEditMode: 1
+  m_NoCameraWarning: 1
+  m_LowResolutionForAspectRatios: 01000001000000000000
+  m_XRRenderMode: 0
+  m_RenderTexture: {fileID: 0}
+  m_showToolbar: 1
+--- !u!114 &14
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -577,14 +599,14 @@ MonoBehaviour:
   m_MaxSize: {x: 4000, y: 4000}
   m_TitleContent:
     m_Text: Scene
-    m_Image: {fileID: 8634526014445323508, guid: 0000000000000000d000000000000000, type: 0}
+    m_Image: {fileID: 2593428753322112591, guid: 0000000000000000d000000000000000, type: 0}
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 403.50006
-    y: 62.000008
-    width: 562.00006
-    height: 549.00006
+    x: 0
+    y: 19
+    width: 1201
+    height: 1262
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -599,8 +621,8 @@ MonoBehaviour:
       floating: 0
       collapsed: 0
       displayed: 1
-      snapOffset: {x: -176.5, y: -26}
-      snapOffsetDelta: {x: 0, y: 0}
+      snapOffset: {x: 0, y: 0}
+      snapOffsetDelta: {x: -164, y: -26}
       snapCorner: 3
       id: Tool Settings
       index: 0
@@ -651,7 +673,7 @@ MonoBehaviour:
       floating: 0
       collapsed: 0
       displayed: 1
-      snapOffset: {x: 0, y: 25.000002}
+      snapOffset: {x: 0, y: 0}
       snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 0
       id: unity-transform-toolbar
@@ -820,9 +842,9 @@ MonoBehaviour:
       floating: 0
       collapsed: 0
       displayed: 0
-      snapOffset: {x: -231.00003, y: -199.00003}
+      snapOffset: {x: 0, y: 0}
       snapOffsetDelta: {x: 0, y: 0}
-      snapCorner: 3
+      snapCorner: 0
       id: Scene View/Particles
       index: 8
       layout: 4
@@ -880,6 +902,19 @@ MonoBehaviour:
       layout: 4
       size: {x: 0, y: 0}
       sizeOverriden: 0
+    - dockPosition: 1
+      containerId: overlay-container--right
+      floating: 0
+      collapsed: 0
+      displayed: 1
+      snapOffset: {x: 48, y: 48}
+      snapOffsetDelta: {x: 0, y: 0}
+      snapCorner: 0
+      id: AINavigationOverlay
+      index: 9
+      layout: 4
+      size: {x: 0, y: 0}
+      sizeOverriden: 0
     - dockPosition: 1
       containerId: overlay-container--right
       floating: 0
@@ -910,11 +945,11 @@ MonoBehaviour:
       containerId: overlay-container--right
       floating: 0
       collapsed: 0
-      displayed: 1
+      displayed: 0
       snapOffset: {x: 48, y: 48}
       snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 0
-      id: Hot Reload
+      id: Scene View/TrailRenderer
       index: 11
       layout: 4
       size: {x: 0, y: 0}
@@ -923,18 +958,18 @@ MonoBehaviour:
       containerId: overlay-container--right
       floating: 0
       collapsed: 0
-      displayed: 0
+      displayed: 1
       snapOffset: {x: 48, y: 48}
       snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 0
-      id: Scene View/TrailRenderer
+      id: Hot Reload
       index: 12
       layout: 4
       size: {x: 0, y: 0}
       sizeOverriden: 0
     m_OverlaysVisible: 1
-  m_WindowGUID: cc27987af1a868c49b0894db9c0f5429
-  m_Gizmos: 0
+  m_WindowGUID: 3de2bc164a2229345aaffb3c6f51b287
+  m_Gizmos: 1
   m_OverrideSceneCullingMask: 6917529027641081856
   m_SceneIsLit: 1
   m_SceneLighting: 1
@@ -943,9 +978,9 @@ MonoBehaviour:
   m_PlayAudio: 0
   m_AudioPlay: 0
   m_Position:
-    m_Target: {x: 0.94368494, y: -3.7347584, z: 0.055999573}
+    m_Target: {x: -0.061213993, y: -4.470768, z: -0.062394675}
     speed: 2
-    m_Value: {x: 0.94368494, y: -3.7347584, z: 0.055999573}
+    m_Value: {x: -0.061213993, y: -4.470768, z: -0.062394675}
   m_RenderMode: 0
   m_CameraMode:
     drawMode: 0
@@ -954,7 +989,7 @@ MonoBehaviour:
   m_ValidateTrueMetals: 0
   m_DoValidateTrueMetals: 0
   m_SceneViewState:
-    m_AlwaysRefresh: 1
+    m_AlwaysRefresh: 0
     showFog: 1
     showSkybox: 1
     showFlares: 1
@@ -973,31 +1008,31 @@ MonoBehaviour:
       m_Size: {x: 0, y: 0}
     yGrid:
       m_Fade:
-        m_Target: 0
+        m_Target: 1
         speed: 2
-        m_Value: 0
+        m_Value: 1
       m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4}
       m_Pivot: {x: 0, y: 0, z: 0}
       m_Size: {x: 1, y: 1}
     zGrid:
       m_Fade:
-        m_Target: 1
+        m_Target: 0
         speed: 2
-        m_Value: 1
+        m_Value: 0
       m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4}
       m_Pivot: {x: 0, y: 0, z: 0}
-      m_Size: {x: 1, y: 1}
+      m_Size: {x: 0, y: 0}
     m_ShowGrid: 1
     m_GridAxis: 1
     m_gridOpacity: 0.5
   m_Rotation:
     m_Target: {x: 0, y: 0, z: 0, w: 1}
     speed: 2
-    m_Value: {x: 0, y: 0, z: 0, w: -1}
+    m_Value: {x: 0, y: 0, z: 0, w: 1}
   m_Size:
-    m_Target: 1.8339963
+    m_Target: 7.105501
     speed: 2
-    m_Value: 1.8339963
+    m_Value: 7.105501
   m_Ortho:
     m_Target: 1
     speed: 2
@@ -1005,7 +1040,7 @@ MonoBehaviour:
   m_CameraSettings:
     m_Speed: 1
     m_SpeedNormalized: 0.5
-    m_SpeedMin: 0.001
+    m_SpeedMin: 0.01
     m_SpeedMax: 2
     m_EasingEnabled: 1
     m_EasingDuration: 0.4
@@ -1017,143 +1052,10 @@ MonoBehaviour:
     m_OcclusionCulling: 0
     m_EnableGDRP: 1
     m_BackfaceCulling: 0
-  m_LastSceneViewRotation: {x: -0.17223626, y: 0.23740639, z: -0.04261252, w: -0.95502657}
+  m_LastSceneViewRotation: {x: 0.004411138, y: 0.98648864, z: -0.16153778, w: 0.026939217}
   m_LastSceneViewOrtho: 0
   m_ReplacementShader: {fileID: 0}
   m_ReplacementString: 
   m_SceneVisActive: 1
   m_LastLockedObject: {fileID: 0}
   m_ViewIsLockedToObject: 0
---- !u!114 &17
-MonoBehaviour:
-  m_ObjectHideFlags: 52
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 1
-  m_Script: {fileID: 12015, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_MinSize: {x: 200, y: 200}
-  m_MaxSize: {x: 4000, y: 4000}
-  m_TitleContent:
-    m_Text: Game
-    m_Image: {fileID: 4621777727084837110, guid: 0000000000000000d000000000000000, type: 0}
-    m_Tooltip: 
-  m_Pos:
-    serializedVersion: 2
-    x: 0
-    y: 62.000008
-    width: 402.50003
-    height: 941.00006
-  m_SerializedDataModeController:
-    m_DataMode: 0
-    m_PreferredDataMode: 0
-    m_SupportedDataModes: 
-    isAutomatic: 1
-  m_ViewDataDictionary: {fileID: 0}
-  m_OverlayCanvas:
-    m_LastAppliedPresetName: Default
-    m_SaveData: []
-    m_OverlaysVisible: 1
-  m_SerializedViewNames: []
-  m_SerializedViewValues: []
-  m_PlayModeViewName: GameView
-  m_ShowGizmos: 0
-  m_TargetDisplay: 0
-  m_ClearColor: {r: 0, g: 0, b: 0, a: 0}
-  m_TargetSize: {x: 750, y: 1624}
-  m_TextureFilterMode: 0
-  m_TextureHideFlags: 61
-  m_RenderIMGUI: 1
-  m_EnterPlayModeBehavior: 0
-  m_UseMipMap: 0
-  m_VSyncEnabled: 0
-  m_Gizmos: 0
-  m_Stats: 0
-  m_SelectedSizes: 07000000000000000000000000000000000000000000000000000000000000000000000000000000
-  m_ZoomArea:
-    m_HRangeLocked: 0
-    m_VRangeLocked: 0
-    hZoomLockedByDefault: 0
-    vZoomLockedByDefault: 0
-    m_HBaseRangeMin: -187.50002
-    m_HBaseRangeMax: 187.50002
-    m_VBaseRangeMin: -406.00006
-    m_VBaseRangeMax: 406.00006
-    m_HAllowExceedBaseRangeMin: 1
-    m_HAllowExceedBaseRangeMax: 1
-    m_VAllowExceedBaseRangeMin: 1
-    m_VAllowExceedBaseRangeMax: 1
-    m_ScaleWithWindow: 0
-    m_HSlider: 0
-    m_VSlider: 0
-    m_IgnoreScrollWheelUntilClicked: 0
-    m_EnableMouseInput: 1
-    m_EnableSliderZoomHorizontal: 0
-    m_EnableSliderZoomVertical: 0
-    m_UniformScale: 1
-    m_UpDirection: 1
-    m_DrawArea:
-      serializedVersion: 2
-      x: 0
-      y: 21
-      width: 402.50003
-      height: 920.00006
-    m_Scale: {x: 1, y: 1}
-    m_Translation: {x: 201.25002, y: 460.00003}
-    m_MarginLeft: 0
-    m_MarginRight: 0
-    m_MarginTop: 0
-    m_MarginBottom: 0
-    m_LastShownAreaInsideMargins:
-      serializedVersion: 2
-      x: -201.25002
-      y: -460.00003
-      width: 402.50003
-      height: 920.00006
-    m_MinimalGUI: 1
-  m_defaultScale: 1
-  m_LastWindowPixelSize: {x: 805, y: 1882}
-  m_ClearInEditMode: 1
-  m_NoCameraWarning: 1
-  m_LowResolutionForAspectRatios: 01000000000000000000
-  m_XRRenderMode: 0
-  m_RenderTexture: {fileID: 0}
-  m_showToolbar: 1
---- !u!114 &18
-MonoBehaviour:
-  m_ObjectHideFlags: 52
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 1
-  m_Script: {fileID: 12003, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_MinSize: {x: 100, y: 100}
-  m_MaxSize: {x: 4000, y: 4000}
-  m_TitleContent:
-    m_Text: Console
-    m_Image: {fileID: -4950941429401207979, guid: 0000000000000000d000000000000000, type: 0}
-    m_Tooltip: 
-  m_Pos:
-    serializedVersion: 2
-    x: 403.50006
-    y: 632.00006
-    width: 1100.5001
-    height: 371
-  m_SerializedDataModeController:
-    m_DataMode: 0
-    m_PreferredDataMode: 0
-    m_SupportedDataModes: 
-    isAutomatic: 1
-  m_ViewDataDictionary: {fileID: 0}
-  m_OverlayCanvas:
-    m_LastAppliedPresetName: Default
-    m_SaveData: []
-    m_OverlaysVisible: 1

XiuXianGame.sln.DotSettings.user

@@ -29,19 +29,23 @@
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ADictionary_00602_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F9c2967a135e648bdb993c5397a44991b573620_003Fad_003Fcb4b4f1f_003FDictionary_00602_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ADictionary_00602_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fe4df6db7850b4c40b72002ff5da8188846ac00_003Fc8_003F6520f62d_003FDictionary_00602_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ADictionary_00602_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fe4df6db7850b4c40b72002ff5da8188846ac00_003Fc8_003F6520f62d_003FDictionary_00602_002Ecs_002Fz_003A2_002D1/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ADisallowMultipleComponent_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F30c894378d1d4d5dae14bfc5b403a5c7180800_003Ffc_003F9d212fc7_003FDisallowMultipleComponent_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AEditorGUILayout_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F1f63769030ae497a94b35af8517071579d5a00_003F36_003F62e71429_003FEditorGUILayout_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AEditorStyles_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F1f63769030ae497a94b35af8517071579d5a00_003Fe4_003F4f2551a9_003FEditorStyles_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AEditorStyles_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fc939cc20e03646f3920381f99476dad7a09400_003F7a_003Ff18742f2_003FEditorStyles_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AEditor_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F1f63769030ae497a94b35af8517071579d5a00_003F3c_003F2c949974_003FEditor_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AEnumerable_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F5004a53079e04c2991f89460a5186cf010fc00_003Fd5_003F42d076c8_003FEnumerable_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AEnumerable_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F5004a53079e04c2991f89460a5186cf010fc00_003Fd5_003F42d076c8_003FEnumerable_002Ecs_002Fz_003A2_002D1/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AEnumerable_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Ff2b6204eed6b41348236173e8a2f539817a880_003F16_003Ff8f742c5_003FEnumerable_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AEventSystemManager_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F89c69cc281524e81ba8ee38baacb7e0245600_003F91_003F0fdbd4a4_003FEventSystemManager_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AExceptionDispatchInfo_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fc97329dd3fa74b7aa23fdb625c1fe90446ac00_003F6e_003F35e38912_003FExceptionDispatchInfo_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AExceptionDispatchInfo_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fe4df6db7850b4c40b72002ff5da8188846ac00_003Fd3_003F4533b7c3_003FExceptionDispatchInfo_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AExceptionDispatchInfo_002Ecs_002Fl_003AC_0021_003FUsers_003Fadmin_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fe4df6db7850b4c40b72002ff5da8188846ac00_003Fd3_003F4533b7c3_003FExceptionDispatchInfo_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AExceptionDispatchInfo_002Ecs_002Fl_003AC_0021_003FUsers_003Fck_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E2_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fe4df6db7850b4c40b72002ff5da8188846ac00_003F78_003Fe39b72ca_003FExceptionDispatchInfo_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AFile_002Ecs_002Fl_003AC_0021_003FUsers_003Fck_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E2_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F3789ee403a53437cbb6b5d9ab6311f51573620_003Fce_003Fe010d266_003FFile_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AFunc_00601_002Ecs_002Fl_003AC_0021_003FUsers_003Fck_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E2_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fe4df6db7850b4c40b72002ff5da8188846ac00_003F7d_003F1afce2dc_003FFunc_00601_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AGraphicsBuffer_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F5c4a01f363eb46748231fc41bd9bdd8517e000_003F3a_003F867eec19_003FGraphicsBuffer_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AGuid_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fc97329dd3fa74b7aa23fdb625c1fe90446ac00_003Fd5_003F81627ae4_003FGuid_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AIDisposable_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fe4df6db7850b4c40b72002ff5da8188846ac00_003Ff0_003F55936aef_003FIDisposable_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AIGrouping_00602_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F5004a53079e04c2991f89460a5186cf010fc00_003Fb1_003F69de2d9e_003FIGrouping_00602_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AIMGUIContainer_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F56d039fe633a4adf8fb266a0b1797e6c17a000_003F2c_003F134ee6ec_003FIMGUIContainer_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
@@ -65,6 +69,7 @@
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AMath_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fb18a8b3398e74bca86895881dd02956c573648_003F8b_003F8699ce4e_003FMath_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AMath_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fe4df6db7850b4c40b72002ff5da8188846ac00_003F0b_003F91e5e512_003FMath_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AMesh_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F5c4a01f363eb46748231fc41bd9bdd8517e000_003Fde_003Fb0e5d275_003FMesh_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AMonoBehaviour_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F30c894378d1d4d5dae14bfc5b403a5c7180800_003F91_003Faa572b2b_003FMonoBehaviour_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AMonoBehaviour_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F5c4a01f363eb46748231fc41bd9bdd8517e000_003F2d_003F1dd7205f_003FMonoBehaviour_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ANativeArray_00601_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F5c4a01f363eb46748231fc41bd9bdd8517e000_003F3d_003F7966baaa_003FNativeArray_00601_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ANullable_00601_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fe4df6db7850b4c40b72002ff5da8188846ac00_003F14_003F6b3cf15a_003FNullable_00601_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>