DESKTOP-FB72PO8\Administrator 1 kuukausi sitten
vanhempi
commit
d28fdd8193

+ 35 - 29
Assets/Scripts/Core/UI/Core/GameAssetUpdatePanel.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using Fort23.Core;
 using Fort23.GameData;
 using hirdParty.DownloadSystem;
-
+using OfficeOpenXml.FormulaParsing.Excel.Functions.Logical;
 using ThirdParty;
 using ThirdParty.DownloadSystem;
 using UnityEngine;
@@ -18,14 +18,22 @@ public class GameAssetUpdatePanel
 
     private List<MD5FileInfo> checkFileInfo = new List<MD5FileInfo>();
 
-    public void StartUpdateAsset()
+    public void StartUpdateAsset(System.Action finishCallBack)
     {
+        OnCallBack = finishCallBack;
+        if (!HotSyncContent.isOpenHotFix)
+        {
+            OnCallBack?.Invoke();
+            return;
+        }
+
         _downloadUI = HotSyncContent.DownloadUI;
-        _downloadUI.SetMassge("开始校验资源");
+        _downloadUI.SetMassge("Start verifying");
         // DownloadFileData downloadFileData = new DownloadFileData();
         // downloadFileData.remoteUrl = AssetBundleLoadManager.Instance.RootPersistentBundleURL + "MD5.txt";
         // DownloadHander downloadHander = FileDownloadSystem.Instance.DownloadFile(downloadFileData);
 
+        Debug.Log("HotSyncContent.AssetURL"+HotSyncContent.AssetURL);
         DownloadFileData downloadFileData2 = new DownloadFileData();
         downloadFileData2.remoteUrl =
             $"{HotSyncContent.AssetURL}/{HotSyncContent.platform}/{HotSyncContent.Currversion}/Bundle/MD5.txt";
@@ -42,7 +50,7 @@ public class GameAssetUpdatePanel
 
     private void ComparisonMD5(DownloadHander downloadHander2)
     {
-        _downloadUI.SetMassge("对比资源中");
+        _downloadUI.SetMassge("Check");
         // AssetMD5Info localMD5Info = JsonHelper.FromJson<AssetMD5Info>(downloadHander.Text);
         string json = System.Text.UTF8Encoding.UTF8.GetString(downloadHander2.Data);
         remotelyMD5Info = JsonHelper.FromJson<AssetMD5Info>(json);
@@ -78,7 +86,7 @@ public class GameAssetUpdatePanel
     private async void DownloadFile(List<MD5FileInfo> updateFlieInfo)
     {
         Debug.Log("开始下载文件" + updateFlieInfo.Count);
-     
+
         CTask<bool> cTask = CTask<bool>.Create();
 
         long size = 0;
@@ -103,22 +111,22 @@ public class GameAssetUpdatePanel
         string message = _downloadUI.GetLoadingText(46);
 
         message = string.Format(message, size / 1024 / 1024);
-        _downloadUI.ShowPopWindow(0, message, () =>
-        {
-            _downloadUI.HidePopWindow();
-            cTask.SetResult(false);
-            Application.Quit();
-        }, () =>
-        {
-            _downloadUI.HidePopWindow();
-            cTask.SetResult(true);
-        });
-
-        await cTask;
-        if (!cTask.GetResult())
-        {
-            return;
-        }
+        // _downloadUI.ShowPopWindow(0, message, () =>
+        // {
+        //     _downloadUI.HidePopWindow();
+        //     cTask.SetResult(false);
+        //     Application.Quit();
+        // }, () =>
+        // {
+        //     _downloadUI.HidePopWindow();
+        //     cTask.SetResult(true);
+        // });
+        //
+        // await cTask;
+        // if (!cTask.GetResult())
+        // {
+        //     return;
+        // }
 
 
         DownLoadHanderGroup downLoadHanderGroup = new DownLoadHanderGroup();
@@ -150,17 +158,15 @@ public class GameAssetUpdatePanel
         float sizeM = size / 1024f / 1024f;
         SliderData sliderData = new SliderData();
         sliderData.maxValue = size;
-        _downloadUI.SetMassge($"开始下载文件,个数{updateFlieInfo.Count}   大小{sizeM}");
+        _downloadUI.SetMassge($"Start downloading: {updateFlieInfo.Count}  , {sizeM}");
+
 
-        
-   
-        
         sliderData.CcurrValue = delegate
         {
             float m = downLoadHanderGroup.size / 1024f / 1024f;
             float speed = downLoadHanderGroup.speed / 1024f;
             _downloadUI.SetMassge(
-                $"开始下载文件,个数{updateFlieInfo.Count}   大小{m.ToString(".00")}M / {sizeM.ToString(".00")}M  速度{speed.ToString(".00")} Kb");
+                $"Downloading:{updateFlieInfo.Count}   {m.ToString(".00")}M / {sizeM.ToString(".00")}M  speed {speed.ToString(".00")} Kb");
             return downLoadHanderGroup.size;
         };
         _downloadUI.SetSlider(sliderData);
@@ -176,11 +182,11 @@ public class GameAssetUpdatePanel
         checkFileInfo.Clear();
         checkFileInfo.AddRange(remotelyMD5Info.fileInfo);
         CheckFilePool _checkFileThrans = new CheckFilePool();
-        _checkFileThrans.isStreamingAssetsPath = true;
+        _checkFileThrans.isStreamingAssetsPath = false;
         _checkFileThrans.streamingAssetsPath = AssetBundleLoadManager.Instance.RootStreamingBundleURL;
         SliderData sliderData = new SliderData();
         sliderData.maxValue = checkFileInfo.Count;
-        _downloadUI.SetMassge($"校验本地文件");
+        _downloadUI.SetMassge($"Check 2");
         sliderData.CcurrValue = delegate
         {
             float m = _checkFileThrans.FileCount();
@@ -206,7 +212,7 @@ public class GameAssetUpdatePanel
             else
             {
                 _downloadUI.SetMassge(
-                    $"校验本地文件{m} / {sliderData.maxValue}");
+                    $"Check 3{m} / {sliderData.maxValue}");
             }
 
 

+ 1 - 0
Assets/Scripts/GameUI/GameApplction.cs

@@ -51,6 +51,7 @@ public class GameApplction : IGameStart
         await InitGameApplication();
         LoadFinish?.Invoke();
         UIManager.Instance.Canvas.gameObject.SetActive(true);
+        
         Debug.Log("初始化完成");
     }
 

BIN
Excel2Json/Excel/MentalPower.xlsx


+ 237 - 128
UserSettings/Layouts/default-2022.dwlt

@@ -1,6 +1,30 @@
 %YAML 1.1
 %TAG !u! tag:yousandi.cn,2023:
 --- !u!114 &1
+MonoBehaviour:
+  m_ObjectHideFlags: 52
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 12004, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_PixelRect:
+    serializedVersion: 2
+    x: 3132
+    y: 468
+    width: 1311
+    height: 697
+  m_ShowMode: 0
+  m_Title: Console
+  m_RootView: {fileID: 4}
+  m_MinSize: {x: 100, y: 121}
+  m_MaxSize: {x: 4000, y: 4021}
+  m_Maximized: 0
+--- !u!114 &2
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -14,17 +38,68 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_PixelRect:
     serializedVersion: 2
-    x: 8
-    y: 51
-    width: 2544
-    height: 1339
+    x: 0
+    y: 43
+    width: 2560
+    height: 1349
   m_ShowMode: 4
-  m_Title: Hierarchy
-  m_RootView: {fileID: 6}
+  m_Title: Inspector
+  m_RootView: {fileID: 9}
   m_MinSize: {x: 875, y: 300}
   m_MaxSize: {x: 10000, y: 10000}
-  m_Maximized: 0
---- !u!114 &2
+  m_Maximized: 1
+--- !u!114 &3
+MonoBehaviour:
+  m_ObjectHideFlags: 52
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: ConsoleWindow
+  m_EditorClassIdentifier: 
+  m_Children: []
+  m_Position:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 1311
+    height: 697
+  m_MinSize: {x: 100, y: 121}
+  m_MaxSize: {x: 4000, y: 4021}
+  m_ActualView: {fileID: 15}
+  m_Panes:
+  - {fileID: 15}
+  m_Selected: 0
+  m_LastSelected: 0
+--- !u!114 &4
+MonoBehaviour:
+  m_ObjectHideFlags: 52
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Children:
+  - {fileID: 3}
+  m_Position:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 1311
+    height: 697
+  m_MinSize: {x: 100, y: 121}
+  m_MaxSize: {x: 4000, y: 4021}
+  vertical: 0
+  controlID: 11651
+  draggingID: 0
+--- !u!114 &5
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -40,17 +115,17 @@ MonoBehaviour:
   m_Position:
     serializedVersion: 2
     x: 0
-    y: 930
-    width: 457
-    height: 359
+    y: 997
+    width: 709
+    height: 302
   m_MinSize: {x: 232, y: 271}
   m_MaxSize: {x: 10002, y: 10021}
-  m_ActualView: {fileID: 19}
+  m_ActualView: {fileID: 23}
   m_Panes:
-  - {fileID: 19}
+  - {fileID: 23}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &3
+--- !u!114 &6
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -63,20 +138,20 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
-  - {fileID: 11}
-  - {fileID: 2}
+  - {fileID: 14}
+  - {fileID: 5}
   m_Position:
     serializedVersion: 2
-    x: 955
+    x: 945
     y: 0
-    width: 457
-    height: 1289
+    width: 709
+    height: 1299
   m_MinSize: {x: 100, y: 100}
   m_MaxSize: {x: 8096, y: 16192}
   vertical: 1
-  controlID: 41
+  controlID: 42
   draggingID: 0
---- !u!114 &4
+--- !u!114 &7
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -91,19 +166,19 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 2003
+    x: 2016
     y: 0
-    width: 541
-    height: 1289
+    width: 544
+    height: 1299
   m_MinSize: {x: 275, y: 50}
   m_MaxSize: {x: 4000, y: 4000}
-  m_ActualView: {fileID: 18}
+  m_ActualView: {fileID: 22}
   m_Panes:
-  - {fileID: 18}
-  - {fileID: 13}
+  - {fileID: 22}
+  - {fileID: 17}
   m_Selected: 0
   m_LastSelected: 1
---- !u!114 &5
+--- !u!114 &8
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -120,16 +195,16 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 955
-    height: 1289
-  m_MinSize: {x: 200, y: 200}
-  m_MaxSize: {x: 4000, y: 4000}
-  m_ActualView: {fileID: 20}
+    width: 945
+    height: 1299
+  m_MinSize: {x: 201, y: 221}
+  m_MaxSize: {x: 4001, y: 4021}
+  m_ActualView: {fileID: 24}
   m_Panes:
-  - {fileID: 20}
+  - {fileID: 24}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &6
+--- !u!114 &9
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -142,22 +217,22 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
-  - {fileID: 7}
-  - {fileID: 8}
-  - {fileID: 9}
+  - {fileID: 10}
+  - {fileID: 11}
+  - {fileID: 12}
   m_Position:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 2544
-    height: 1339
+    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 &7
+--- !u!114 &10
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -174,12 +249,12 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 2544
+    width: 2560
     height: 30
   m_MinSize: {x: 0, y: 0}
   m_MaxSize: {x: 0, y: 0}
   m_LastLoadedLayoutName: 
---- !u!114 &8
+--- !u!114 &11
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -192,22 +267,22 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
-  - {fileID: 5}
-  - {fileID: 3}
-  - {fileID: 10}
-  - {fileID: 4}
+  - {fileID: 8}
+  - {fileID: 6}
+  - {fileID: 13}
+  - {fileID: 7}
   m_Position:
     serializedVersion: 2
     x: 0
     y: 30
-    width: 2544
-    height: 1289
+    width: 2560
+    height: 1299
   m_MinSize: {x: 400, y: 100}
   m_MaxSize: {x: 32384, y: 16192}
   vertical: 0
-  controlID: 40
+  controlID: 41
   draggingID: 0
---- !u!114 &9
+--- !u!114 &12
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -223,12 +298,12 @@ MonoBehaviour:
   m_Position:
     serializedVersion: 2
     x: 0
-    y: 1319
-    width: 2544
+    y: 1329
+    width: 2560
     height: 20
   m_MinSize: {x: 0, y: 0}
   m_MaxSize: {x: 0, y: 0}
---- !u!114 &10
+--- !u!114 &13
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -243,18 +318,18 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 1412
+    x: 1654
     y: 0
-    width: 591
-    height: 1289
+    width: 362
+    height: 1299
   m_MinSize: {x: 202, y: 221}
   m_MaxSize: {x: 4002, y: 4021}
-  m_ActualView: {fileID: 17}
+  m_ActualView: {fileID: 21}
   m_Panes:
-  - {fileID: 17}
+  - {fileID: 21}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &11
+--- !u!114 &14
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -271,20 +346,54 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 457
-    height: 930
+    width: 709
+    height: 997
   m_MinSize: {x: 202, y: 221}
   m_MaxSize: {x: 4002, y: 4021}
-  m_ActualView: {fileID: 21}
+  m_ActualView: {fileID: 25}
   m_Panes:
-  - {fileID: 21}
+  - {fileID: 25}
+  - {fileID: 20}
+  - {fileID: 19}
+  - {fileID: 18}
   - {fileID: 16}
-  - {fileID: 15}
-  - {fileID: 14}
-  - {fileID: 12}
   m_Selected: 0
   m_LastSelected: 4
---- !u!114 &12
+--- !u!114 &15
+MonoBehaviour:
+  m_ObjectHideFlags: 52
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 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: -4327648978806127646, guid: 0000000000000000d000000000000000, type: 0}
+    m_Tooltip: 
+  m_Pos:
+    serializedVersion: 2
+    x: 3132
+    y: 468
+    width: 1311
+    height: 676
+  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
+--- !u!114 &16
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -327,7 +436,7 @@ MonoBehaviour:
   m_SequencePath:
     m_SelectionRoot: 0
     m_SubElements: []
---- !u!114 &13
+--- !u!114 &17
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -361,7 +470,7 @@ MonoBehaviour:
     m_LastAppliedPresetName: Default
     m_SaveData: []
     m_OverlaysVisible: 1
---- !u!114 &14
+--- !u!114 &18
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1163,7 +1272,7 @@ MonoBehaviour:
     {\n        \"m_SerializableColors\": []\n    }\n}\n\n"
   m_AssetMaybeChangedOnDisk: 0
   m_AssetMaybeDeleted: 0
---- !u!114 &15
+--- !u!114 &19
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1989,7 +2098,7 @@ MonoBehaviour:
     {\n        \"m_SerializableColors\": []\n    }\n}\n\n"
   m_AssetMaybeChangedOnDisk: 0
   m_AssetMaybeDeleted: 0
---- !u!114 &16
+--- !u!114 &20
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -2291,7 +2400,7 @@ MonoBehaviour:
     true,\n    \"m_ClearCoat\": false\n}\n\n"
   m_AssetMaybeChangedOnDisk: 0
   m_AssetMaybeDeleted: 0
---- !u!114 &17
+--- !u!114 &21
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -2311,10 +2420,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1420
-    y: 81
-    width: 589
-    height: 1268
+    x: 1654
+    y: 73
+    width: 360
+    height: 1278
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -2330,7 +2439,7 @@ MonoBehaviour:
       scrollPos: {x: 0, y: 0}
       m_SelectedIDs: 
       m_LastClickedID: 0
-      m_ExpandedIDs: fa88ffff0889ffff0a89ffff64e4ffff9cf7ffff78faffff70c1000082c10000bac10000e2c10000
+      m_ExpandedIDs: 848bffff8a8bffff3afaffff40faffff78faffffb0a80000
       m_RenameOverlay:
         m_UserAcceptedRename: 0
         m_Name: 
@@ -2346,7 +2455,7 @@ MonoBehaviour:
         m_IsRenaming: 0
         m_OriginalEventType: 11
         m_IsRenamingFilename: 0
-        m_ClientGUIView: {fileID: 10}
+        m_ClientGUIView: {fileID: 13}
       m_SearchString: 
     m_ExpandedScenes: []
     m_CurrenRootInstanceID: 0
@@ -2354,7 +2463,7 @@ MonoBehaviour:
       m_IsLocked: 0
     m_CurrentSortingName: TransformSorting
   m_WindowGUID: f7da054d227971a4d8e6d4985252c187
---- !u!114 &18
+--- !u!114 &22
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -2374,10 +2483,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 2011
-    y: 81
-    width: 540
-    height: 1268
+    x: 2016
+    y: 73
+    width: 543
+    height: 1278
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -2401,7 +2510,7 @@ MonoBehaviour:
   m_LockTracker:
     m_IsLocked: 0
   m_PreviewWindow: {fileID: 0}
---- !u!114 &19
+--- !u!114 &23
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -2421,10 +2530,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 963
-    y: 1011
-    width: 455
-    height: 338
+    x: 945
+    y: 1070
+    width: 707
+    height: 281
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -2446,7 +2555,7 @@ MonoBehaviour:
     m_SkipHidden: 0
     m_SearchArea: 1
     m_Folders:
-    - Assets/Scripts/GameLogic/Hero
+    - Assets/Scripts/GameLogic/Combat/Hero
     m_Globs: []
     m_OriginalText: 
     m_ImportLogFlags: 0
@@ -2454,16 +2563,16 @@ MonoBehaviour:
   m_ViewMode: 1
   m_StartGridSize: 16
   m_LastFolders:
-  - Assets/Scripts/GameLogic/Hero
+  - Assets/Scripts/GameLogic/Combat/Hero
   m_LastFoldersGridSize: 16
   m_LastProjectPath: D:\unityProject\XiuXianGame
   m_LockTracker:
     m_IsLocked: 0
   m_FolderTreeState:
-    scrollPos: {x: 0, y: 292}
-    m_SelectedIDs: c0bd0000
-    m_LastClickedID: 48576
-    m_ExpandedIDs: 0000000012a8000014a8000016a8000018a800001aa800001ca800001ea8000020a8000022a8000024a8000026a8000028a800006caa000000ca9a3bffffff7f
+    scrollPos: {x: 0, y: 763}
+    m_SelectedIDs: 5ada0000
+    m_LastClickedID: 55898
+    m_ExpandedIDs: 000000004ead000050ad000052ad000054ad000056ad000058ad00005aad00005cad00005ead000060ad000062ad000064ad000078ad0000a2ad000034ae000000ca9a3bffffff7f
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -2479,7 +2588,7 @@ MonoBehaviour:
       m_IsRenaming: 0
       m_OriginalEventType: 11
       m_IsRenamingFilename: 1
-      m_ClientGUIView: {fileID: 2}
+      m_ClientGUIView: {fileID: 5}
     m_SearchString: 
     m_CreateAssetUtility:
       m_EndAction: {fileID: 0}
@@ -2491,7 +2600,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: 0000000012a8000014a8000016a8000018a800001aa800001ca800001ea8000020a8000022a8000024a8000026a8000028a80000
+    m_ExpandedIDs: 000000004ead000050ad000052ad000054ad000056ad000058ad00005aad00005cad00005ead000060ad000062ad000064ad0000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -2522,20 +2631,20 @@ MonoBehaviour:
     m_ExpandedInstanceIDs: bc7400008ebd000008bd0000300b0100b0ae00005cdf0000c8480100f630010094b1000014b3000090b4000088b4000042b40000aab40000fcb3000044b30000a2b400007cb400008cb4000048a501003eb2000022b20000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
-      m_Name: Test
-      m_OriginalName: Test
+      m_Name: 
+      m_OriginalName: 
       m_EditFieldRect:
         serializedVersion: 2
         x: 0
         y: 0
         width: 0
         height: 0
-      m_UserData: 48682
+      m_UserData: 0
       m_IsWaitingForDelay: 0
       m_IsRenaming: 0
-      m_OriginalEventType: 0
+      m_OriginalEventType: 11
       m_IsRenamingFilename: 1
-      m_ClientGUIView: {fileID: 2}
+      m_ClientGUIView: {fileID: 5}
     m_CreateAssetUtility:
       m_EndAction: {fileID: 0}
       m_InstanceID: 0
@@ -2543,11 +2652,11 @@ MonoBehaviour:
       m_Icon: {fileID: 0}
       m_ResourceFile: 
     m_NewAssetIndexInList: -1
-    m_ScrollPosition: {x: 0, y: 0}
+    m_ScrollPosition: {x: 0, y: 57}
     m_GridSize: 16
   m_SkipHiddenPackages: 0
-  m_DirectoriesAreaWidth: 204.99992
---- !u!114 &20
+  m_DirectoriesAreaWidth: 50
+--- !u!114 &24
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -2567,10 +2676,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 8
-    y: 81
-    width: 954
-    height: 1268
+    x: 0
+    y: 73
+    width: 944
+    height: 1278
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -2623,29 +2732,29 @@ MonoBehaviour:
       serializedVersion: 2
       x: 0
       y: 21
-      width: 954
-      height: 1247
-    m_Scale: {x: 0.76785713, y: 0.76785713}
-    m_Translation: {x: 477, y: 623.5}
+      width: 944
+      height: 1257
+    m_Scale: {x: 0.7740148, y: 0.7740148}
+    m_Translation: {x: 472, y: 628.5}
     m_MarginLeft: 0
     m_MarginRight: 0
     m_MarginTop: 0
     m_MarginBottom: 0
     m_LastShownAreaInsideMargins:
       serializedVersion: 2
-      x: -621.2093
+      x: -609.8075
       y: -812
-      width: 1242.4186
+      width: 1219.615
       height: 1624
     m_MinimalGUI: 1
-  m_defaultScale: 0.76785713
-  m_LastWindowPixelSize: {x: 954, y: 1268}
+  m_defaultScale: 0.7740148
+  m_LastWindowPixelSize: {x: 944, y: 1278}
   m_ClearInEditMode: 1
   m_NoCameraWarning: 1
   m_LowResolutionForAspectRatios: 00000000000000000000
   m_XRRenderMode: 0
   m_RenderTexture: {fileID: 0}
---- !u!114 &21
+--- !u!114 &25
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -2665,10 +2774,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 963
-    y: 81
-    width: 455
-    height: 909
+    x: 945
+    y: 73
+    width: 707
+    height: 976
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -3040,9 +3149,9 @@ MonoBehaviour:
   m_PlayAudio: 0
   m_AudioPlay: 0
   m_Position:
-    m_Target: {x: 1.3485222, y: -2.7016625, z: 0}
+    m_Target: {x: 0, y: 5, z: 0}
     speed: 2
-    m_Value: {x: 1.3485222, y: -2.7016625, z: 0}
+    m_Value: {x: 0, y: 5, z: 0}
   m_RenderMode: 0
   m_CameraMode:
     drawMode: 0
@@ -3088,13 +3197,13 @@ MonoBehaviour:
     m_GridAxis: 1
     m_gridOpacity: 0.5
   m_Rotation:
-    m_Target: {x: -0.1409842, y: 0.1952449, z: -0.028372366, w: -0.9701625}
+    m_Target: {x: -0.13555086, y: -0.30186856, z: 0.043395378, w: -0.9426828}
     speed: 2
-    m_Value: {x: -0.14098299, y: 0.1952432, z: -0.028372118, w: -0.97015405}
+    m_Value: {x: -0.13554864, y: -0.30186364, z: 0.04339467, w: -0.9426674}
   m_Size:
-    m_Target: 0.69013995
+    m_Target: 10
     speed: 2
-    m_Value: 0.69013995
+    m_Value: 10
   m_Ortho:
     m_Target: 0
     speed: 2