融合程序

修改加载PPT逻辑
2025-04-08 13:31:23 +08:00 · 2025-04-08 13:18:28 +08:00 · 2025-04-08 13:17:40 +08:00 · 2025-04-08 09:25:51 +08:00 · 2025-04-08 09:25:14 +08:00
12 changed files with 287 additions and 403 deletions
--- a/Assets/Scripts/Bootstrap.cs
+++ b/Assets/Scripts/Bootstrap.cs
@ -17,37 +17,37 @@ public class Bootstrap : SingletonMono<Bootstrap>
        base.Awake();
        uiManager = new UIManager();
        eventCenter = new EventCenter();
-        scenesManager = new ScenesManager();
+        scenesManager = new ScenesManager(this);
        pptFolderName = Application.streamingAssetsPath + "/PPT";
-        LoadPPTTest.PPTFiles(pptFolderName);
-        ppts = LoadPPTTest.PPTName();
        DontDestroyOnLoad(gameObject);
    }

    private void Start()
    {
-        eventCenter.EventTrigger(Enum_EventType.UpdateProgress, 0.1f);
-        scenesManager.LoadSceneAsyn(this, "MenuScene", () =>
+        uiManager.ShowPanel<UI_LoadingPanel>(this, E_UI_Layer.System, (panel) =>
        {
-            uiManager.ShowPanel<UI_BGPanel>(this, E_UI_Layer.Bot, (panel) =>
+            eventCenter.EventTrigger(Enum_EventType.UpdateProgress, 0.1f);
+            scenesManager.LoadSceneAsyn("MenuScene", () =>
            {
-                uiManager.ShowPanel<UI_SelectModePanel>(this, E_UI_Layer.Top, (panel) =>
+                uiManager.ShowPanel<UI_BGPanel>(this, E_UI_Layer.Bot, (panel) =>
                {
-                    Debug.Log("UI_SelectModePanel");
+                    //LoadPPTTest.PPTFiles(pptFolderName);
+                    uiManager.ShowPanel<UI_SelectModePanel>(this, E_UI_Layer.Top, (panel) =>
+                    {
+                        ppts = LoadPPTTest.PPTName();
+                        Debug.Log("UI_SelectModePanel");
+                    });
                });
+                eventCenter.EventTrigger(Enum_EventType.UpdateProgress, 2f);
            });
-            eventCenter.EventTrigger(Enum_EventType.UpdateProgress, 0.9f);
-        });

-        //uiManager.ShowPanel<UI_LoadingPanel>(this, E_UI_Layer.System, (panel) =>
-        //{
-           
-        //});
+
+        });
    }

    // Update is called once per frame
    void Update()
    {
-       
+
    }
 }
--- a/Assets/Scripts/Project/ProjectBase/ScenesManager.cs
+++ b/Assets/Scripts/Project/ProjectBase/ScenesManager.cs
@ -6,7 +6,11 @@ using UnityEngine.SceneManagement;

 public class ScenesManager
 {
-    public ScenesManager() { }
+    private MonoBehaviour _target;
+    public ScenesManager(MonoBehaviour target)
+    {
+        _target = target;
+    }
    /// <summary>
    /// 同步加载场景
    /// </summary>
@ -25,11 +29,9 @@ public class ScenesManager
    /// <param name="sceneName">场景名称</param>
    /// <param name="action">委托</param>
    /// <param name="loadSceneMode">加载场景方式</param>
-    public void LoadSceneAsyn(MonoBehaviour taget, string sceneName, UnityAction action = null,
-        LoadSceneMode loadSceneMode = LoadSceneMode.Single)
+    public void LoadSceneAsyn(string sceneName, UnityAction action = null)
    {
-        Debug.Log("LoadSceneAsyn");
-        taget.StartCoroutine(ReallyLoadScene(sceneName, action));
+        _target.StartCoroutine(ReallyLoadScene(sceneName, action));
    }

    /// <summary>
@ -43,8 +45,7 @@ public class ScenesManager
        LoadSceneMode loadSceneMode = LoadSceneMode.Single)
    {
        AsyncOperation ao = SceneManager.LoadSceneAsync(sceneName, loadSceneMode);
+        yield return ao;
        action?.Invoke();
-        yield return ao.isDone;
-       
    }
 }
--- a/Assets/Scripts/Test/LoadPPTTest.cs
+++ b/Assets/Scripts/Test/LoadPPTTest.cs
@ -14,6 +14,7 @@ using UnityEngine.UI;

 public static class LoadPPTTest
 {
+
    /// <summary>
    /// 
    /// </summary>
@ -29,34 +30,27 @@ public static class LoadPPTTest
    /// <returns></returns>
    public static List<Texture2D> LoadPPTItems(string pptName)
    {
-
        string pptPath = GetPPTPathByName(pptName);
        return GetTexture2DsByName(pptName, pptPath);
        //target.StartCoroutine(LoadAllPPTFiles(pptPath));
    }


+
    public static string[] PPTName()
    {
        ///切割pptsPath
        return pptsPath;
    }

+
    private static List<Texture2D> GetTexture2DsByName(string pptName, string pptPath)
-    {      
-        if (!texturesDic.ContainsKey(pptName))
+    {
+        foreach (var item in texturesDic.Keys)
        {
-            texturesDic.Add(pptName, LoadAllPPTFiles(pptPath));
-            return LoadAllPPTFiles(pptPath);
+            if (item.Equals(pptName))
+                return texturesDic[item];
        }
-        else
-        {
-            foreach (var item in texturesDic.Keys)
-            {
-                if (item.Equals(pptName))
-                    return texturesDic[item];              
-            }
-        }        
        return null;
    }
    /// <summary>
@ -78,42 +72,75 @@ public static class LoadPPTTest
    /// 获取文件夹下所有.pptx文件
    /// </summary>
    /// <param name="folderPath"></param>
-    public static void PPTFiles(string folderPath)
+    public static async void PPTFiles(string folderPath)
    {
        string fullPPTFolderPath = Path.Combine(Application.streamingAssetsPath, folderPath);
        pptsPath = Directory.GetFiles(fullPPTFolderPath, "*.pptx");
+        for (int i = 0; i < pptsPath.Length; i++)
+        {
+            string pptName = PathName(pptsPath[i]);
+            await LoadAllPPTFiles(pptName, pptsPath[i]);
+        }
    }

-    public static List<Texture2D> LoadAllPPTFiles(string folderPath)
+
+    public static async UniTask LoadAllPPTFiles(string pptName, string folderPath)
    {
        List<Texture2D> texture2Ds = new List<Texture2D>();
-        Presentation presentation = new Aspose.Slides.Presentation(folderPath);
-
+        Presentation presentation = new Presentation(folderPath);
        // 遍历文档（只做示例使用自己根据需求拓展）
        for (int i = 0; i < presentation.Slides.Count; i++)
        {
            ISlide slide = presentation.Slides[i];
            var bitmap = slide.GetThumbnail(1f, 1f);
-
            // 声明内存流，将图片转换为内存流，再由流转换为byte数组，然后用texture2d加载byte数组
            using (MemoryStream ms = new MemoryStream())
            {
                bitmap.Save(ms, ImageFormat.Jpeg);
                byte[] buff = new byte[ms.Length];
                ms.Seek(0, SeekOrigin.Begin);
-                ms.Read(buff, 0, (int)ms.Length);
-
+                await ms.ReadAsync(buff, 0, (int)ms.Length);
                // 注意这个image的命名空间为system.drawing不是unity.ui,这个图片的目的是提供图片的宽高
                System.Drawing.Image sizeImage = System.Drawing.Image.FromStream(ms);
-
                Texture2D texture2D = new Texture2D(sizeImage.Width, sizeImage.Height);
                texture2D.LoadImage(buff);
                texture2Ds.Add(texture2D);
            }
        }
+        texturesDic.Add(pptName, texture2Ds);
        Debug.Log("所有PPT加载完成！");
-        return texture2Ds;
    }
+
+    //public static List<Texture2D> LoadAllPPTFiles(string folderPath)
+    //{
+    //    List<Texture2D> texture2Ds = new List<Texture2D>();
+    //    Presentation presentation = new Presentation(folderPath);
+
+    //    // 遍历文档（只做示例使用自己根据需求拓展）
+    //    for (int i = 0; i < presentation.Slides.Count; i++)
+    //    {
+    //        ISlide slide = presentation.Slides[i];
+    //        var bitmap = slide.GetThumbnail(1f, 1f);
+
+    //        // 声明内存流，将图片转换为内存流，再由流转换为byte数组，然后用texture2d加载byte数组
+    //        using (MemoryStream ms = new MemoryStream())
+    //        {
+    //            bitmap.Save(ms, ImageFormat.Jpeg);
+    //            byte[] buff = new byte[ms.Length];
+    //            ms.Seek(0, SeekOrigin.Begin);
+    //            ms.Read(buff, 0, (int)ms.Length);
+
+    //            // 注意这个image的命名空间为system.drawing不是unity.ui,这个图片的目的是提供图片的宽高
+    //            System.Drawing.Image sizeImage = System.Drawing.Image.FromStream(ms);
+
+    //            Texture2D texture2D = new Texture2D(sizeImage.Width, sizeImage.Height);
+    //            texture2D.LoadImage(buff);
+    //            texture2Ds.Add(texture2D);
+    //        }
+    //    }
+    //    Debug.Log("所有PPT加载完成！");
+    //    return texture2Ds;
+    //}
    // 逐个加载每个PPT文件

    /// <summary>
@ -137,7 +164,7 @@ public static class LoadPPTTest
    /// <summary>
    /// 从文件名中提取开头的数字（如 "1-第一章" -> 返回 1）
    /// </summary>
-    public  static int ExtractLeadingNumber(string fileName)
+    public static int ExtractLeadingNumber(string fileName)
    {
        if (string.IsNullOrEmpty(fileName)) return 0;

--- a/Assets/Scripts/TestScene1Manager.cs
+++ b/Assets/Scripts/TestScene1Manager.cs
@ -19,7 +19,7 @@ public class TestScene1Manager : MonoBehaviour
            Bootstrap.Instance.uiManager.ShowPanel<UI_LoadingPanel>(this, E_UI_Layer.System, (panel) =>
            {
                Bootstrap.Instance.eventCenter.EventTrigger(Enum_EventType.UpdateProgress, 0.1f);
-                Bootstrap.Instance.scenesManager.LoadSceneAsyn(this, "TestScene", () =>
+                Bootstrap.Instance.scenesManager.LoadSceneAsyn("TestScene", () =>
                {
                    Debug.Log("加载场景成功");
                    Bootstrap.Instance.eventCenter.EventTrigger(Enum_EventType.UpdateProgress, 0.9f);
--- a/Assets/Scripts/TestSceneManager.cs
+++ b/Assets/Scripts/TestSceneManager.cs
@ -20,7 +20,7 @@ public class TestSceneManager : MonoBehaviour
            Bootstrap.Instance.uiManager.ShowPanel<UI_LoadingPanel>(this, E_UI_Layer.System, (panel) =>
            {
                Bootstrap.Instance.eventCenter.EventTrigger(Enum_EventType.UpdateProgress, 0.1f);
-                Bootstrap.Instance.scenesManager.LoadSceneAsyn(this, "TestScene1", () =>
+                Bootstrap.Instance.scenesManager.LoadSceneAsyn("TestScene1", () =>
                {
                    Debug.Log("加载场景成功");
                    Bootstrap.Instance.eventCenter.EventTrigger(Enum_EventType.UpdateProgress, 0.9f);
--- a/Assets/Scripts/UI/UIPanel/UI_ExamPanel.cs
+++ b/Assets/Scripts/UI/UIPanel/UI_ExamPanel.cs
@ -170,7 +170,7 @@ public class UI_ExamPanel : BasePanel
        switch (btnName)
        {
            case "retrun_Btn":
-                Bootstrap.Instance.scenesManager.LoadSceneAsyn(this, "MenuScene", () =>
+                Bootstrap.Instance.scenesManager.LoadSceneAsyn( "MenuScene", () =>
                {
                    Bootstrap.Instance.uiManager.ShowPanel<UI_SelectModePanel>(this, E_UI_Layer.Top, (panel) =>
                    {
--- a/Assets/Scripts/UI/UIPanel/UI_LoadingPanel.cs
+++ b/Assets/Scripts/UI/UIPanel/UI_LoadingPanel.cs
@ -9,10 +9,9 @@ public class UI_LoadingPanel : BasePanel
    public Slider loadSlider;

    private float currentProgress = 0;
-    public float targetProgress;
+    public float speed;
    public bool isLoading = false;
    public TextMeshProUGUI Slider_Text;
-
    public Sprite[] frames; // 将每一帧的Sprite图片依次拖入这个数组中
    public float frameRate = 30f; // 每秒播放的帧数
    private Image image;
@ -21,70 +20,50 @@ public class UI_LoadingPanel : BasePanel
        base.Awake();
        loadSlider = GetControl<Slider>("loadSlider");
        Slider_Text = GetControl<TextMeshProUGUI>("%");
-        
        image = GetControl<Image>("middleImage");
-        if (image == null)
-        {
-            Debug.LogError("Image component not found!");
-        }
-
-        StartCoroutine(Animate());
    }

    public override void ShowMe()
    {
        base.ShowMe();
-        loadSlider.value = 0;
        Slider_Text.text = "0%";
-        Debug.Log("UI_LoadingPanel ShowMe");
        Bootstrap.Instance.eventCenter.AddEventListener<float>(Enum_EventType.UpdateProgress, UpdateProgress);
-       
+
    }

    public override void HideMe()
    {
        base.HideMe();
-        Debug.Log("UI_LoadingPanel HideMe");
+        loadSlider.value = 0;
+        currentProgress = 0;
+        speed = 0;
        Bootstrap.Instance.eventCenter.RemoveEventListener<float>(Enum_EventType.UpdateProgress, UpdateProgress);
-       
+
    }

    private void Update()
    {
        if (isLoading)
        {
-            if (currentProgress < targetProgress)
+            if (currentProgress < 0.98f)
            {
-                currentProgress += Time.deltaTime;
-                if (currentProgress >= targetProgress)
-                    currentProgress = targetProgress;
+                currentProgress += Time.deltaTime * speed;
                loadSlider.value = currentProgress;
-                // 将Slider的value（0~1）转为百分比（0%~100%）
                float percent = loadSlider.value * 100f;
                Slider_Text.text = Mathf.RoundToInt(percent) + "%";
            }
            else
            {
                isLoading = false;
-                Bootstrap.Instance.uiManager.HidePanel<UI_LoadingPanel>();
+                HideMe();
            }
        }
    }

-    private void UpdateProgress(float progress)
+    private void UpdateProgress(float speed)
    {
        isLoading = true;
-        targetProgress += progress;
-    }
-    private IEnumerator Animate()
-    {
-        for (int i = 0; i < frames.Length; i++)
-        {
-            image.sprite = frames[i];
-            yield return new WaitForSeconds(1f / frameRate);
-        }
-        // 你可以在这里添加循环播放的代码，或者在特定条件下停止动画
-        StartCoroutine(Animate()); // 循环播放
+        this.speed = speed;
    }
 }

--- a/Assets/Scripts/UI/UIPanel/UI_SelectModePanel.cs
+++ b/Assets/Scripts/UI/UIPanel/UI_SelectModePanel.cs
@ -28,7 +28,7 @@ public class UI_SelectModePanel : BasePanel
                        Bootstrap.Instance.uiManager.HidePanel<UI_SelectModePanel>();
                        Bootstrap.Instance.uiManager.HidePanel<UI_StepsPanel>();
                    });
-                  
+
                });
                //Bootstrap.Instance.uiManager.HidePanel<UI_SelectModePanel>();
                break;
@ -37,7 +37,7 @@ public class UI_SelectModePanel : BasePanel
                Bootstrap.Instance.eventCenter.EventTrigger(Enum_EventType.UpdateProgress, 0.1f);
                Bootstrap.Instance.uiManager.ShowPanel<UI_LoadingPanel>(this, E_UI_Layer.System, (panel) =>
                {
-                    Bootstrap.Instance.scenesManager.LoadSceneAsyn(this, "理论考核", () =>
+                    Bootstrap.Instance.scenesManager.LoadSceneAsyn("理论考核", () =>
                    {
                        Bootstrap.Instance.uiManager.ShowPanel<UI_MainTitlePanel>(this, E_UI_Layer.Bot, (panel) =>
                        {
@ -58,7 +58,7 @@ public class UI_SelectModePanel : BasePanel
                Bootstrap.Instance.eventCenter.EventTrigger(Enum_EventType.UpdateProgress, 0.1f);
                Bootstrap.Instance.uiManager.ShowPanel<UI_LoadingPanel>(this, E_UI_Layer.System, (panel) =>
                {
-                    Bootstrap.Instance.scenesManager.LoadSceneAsyn(this, "LiveScene", () =>
+                    Bootstrap.Instance.scenesManager.LoadSceneAsyn("LiveScene", () =>
                    {
                        Bootstrap.Instance.uiManager.ShowPanel<UI_MainTitlePanel>(this, E_UI_Layer.Bot, (panel) =>
                        {
@ -78,7 +78,7 @@ public class UI_SelectModePanel : BasePanel
                });

                //Bootstrap.Instance.uiManager.HidePanel<UI_SelectModePanel>();
-                
+
                break;
        }
    }
--- a/Assets/Scripts/UI/UIPanel/UI_StepsPanel.cs
+++ b/Assets/Scripts/UI/UIPanel/UI_StepsPanel.cs
@ -24,7 +24,7 @@ public class UI_StepsPanel : BasePanel
    public PptFilesData data = new PptFilesData();

    public Sprite XuanZhongsprite;
-    
+

    public string jsonFileName = "StepsConfig"; // JSON文件名
    protected override void Awake()
@ -42,7 +42,7 @@ public class UI_StepsPanel : BasePanel
            var item = Instantiate(StepsItem, StepsContent);
            item.Init(pptFile.fileName);
            var buttonText = item.GetComponentInChildren<TextMeshProUGUI>();
-            Button button  = item.GetComponentInChildren<Button>();
+            Button button = item.GetComponentInChildren<Button>();
            button.name = pptFile.fileName;
            if (buttonText != null)
            {
@ -56,7 +56,7 @@ public class UI_StepsPanel : BasePanel
            //}

            // 设置按钮文本
-            
+
        }
        base.Awake();
    }
@ -78,8 +78,8 @@ public class UI_StepsPanel : BasePanel
        switch (btnName)
        {
            case "retrun_Btn":
-                
-                Bootstrap.Instance.scenesManager.LoadSceneAsyn(this, "MenuScene", () =>
+
+                Bootstrap.Instance.scenesManager.LoadSceneAsyn("MenuScene", () =>
                {
                    Bootstrap.Instance.uiManager.ShowPanel<UI_SelectModePanel>(this, E_UI_Layer.Top, (panel) =>
                    {
@ -97,42 +97,42 @@ public class UI_StepsPanel : BasePanel
                            Bootstrap.Instance.eventCenter.EventTrigger(Enum_EventType.拖车, false);
                        });
                    });
-                   
+
                });
                break;
            case "育苗前种子处理":
                Debug.Log("育苗前种子处理");

-                    UI_ContentPanel.instance.Tips= "1.选种是为了淘汰瘦小、损伤、虫蛀和霉变的种子，选出粒大饱满、外观光滑且有光泽的籽粒。选种方法包括风选和筛选，风选可用风车或簸箕将枇子、虫蛀等籽粒扇掉，筛选则使用3.5毫米-4毫米孔径的筛子筛去小粒种子。选种后，种子发芽率更高，出苗整齐一致，有利于培育壮苗。(在簸箕中选择完整种子并进行泡发)\r\n" +
-                            "\n2.再用%广枯宁水剂浸泡10～12小时，待种子吸胀后捞起滤干备用。这种方法既能有效防治病害，又能保证高粱产品的有机品质" 
-                            ;
-                    UI_ContentPanel.instance.fizhi();
-                    Bootstrap.Instance.uiManager.HidePanel<UI_FineSoilPreparationPanel>();
-                    CameraManager.instance.Camera.transform.SetPositionAndRotation
-                        (CameraManager.instance.StepTrans[0].transform.position, CameraManager.instance.StepTrans[0].transform.rotation);
+                UI_ContentPanel.instance.Tips = "1.选种是为了淘汰瘦小、损伤、虫蛀和霉变的种子，选出粒大饱满、外观光滑且有光泽的籽粒。选种方法包括风选和筛选，风选可用风车或簸箕将枇子、虫蛀等籽粒扇掉，筛选则使用3.5毫米-4毫米孔径的筛子筛去小粒种子。选种后，种子发芽率更高，出苗整齐一致，有利于培育壮苗。(在簸箕中选择完整种子并进行泡发)\r\n" +
+                        "\n2.再用%广枯宁水剂浸泡10～12小时，待种子吸胀后捞起滤干备用。这种方法既能有效防治病害，又能保证高粱产品的有机品质"
+                        ;
+                UI_ContentPanel.instance.fizhi();
+                Bootstrap.Instance.uiManager.HidePanel<UI_FineSoilPreparationPanel>();
+                CameraManager.instance.Camera.transform.SetPositionAndRotation
+                    (CameraManager.instance.StepTrans[0].transform.position, CameraManager.instance.StepTrans[0].transform.rotation);

                UI_ContentPanel.instance.Tips = "";
                break;
            case "播撒育苗技术流程":
                Debug.Log("播撒育苗技术流程");
-                    
-                    Bootstrap.Instance.uiManager.HidePanel<UI_FineSoilPreparationPanel>();
-                    CameraManager.instance.Camera.transform.SetPositionAndRotation
-                        (CameraManager.instance.StepTrans[4].transform.position, CameraManager.instance.StepTrans[4].transform.rotation);
+
+                Bootstrap.Instance.uiManager.HidePanel<UI_FineSoilPreparationPanel>();
+                CameraManager.instance.Camera.transform.SetPositionAndRotation
+                    (CameraManager.instance.StepTrans[4].transform.position, CameraManager.instance.StepTrans[4].transform.rotation);
                break;
            case "精细整地要求":
                //UI_ContentPanel.instance.Tips = "";
                Bootstrap.Instance.uiManager.ShowPanel<UI_FineSoilPreparationPanel>(this, E_UI_Layer.Mid, (panel) =>
                {
-                        UI_ContentPanel.instance.Tips ="1.在整地过程中，需彻底清除杂草，以减少杂草与高粱争夺养分。" +
-                            "\n2.在播种前进行精细整地，春季解冻后深翻至20～30cm，确保土壤疏松无硬结，为播种和保苗创造良好条件。" +
-                            "\n3.整地时需注意地表平整，无坷垃，以便于后续的播种和田间管理。";
-                        UI_ContentPanel.instance.fizhi();
-                        Debug.Log("精细整地要求");
-                        CameraManager.instance.Camera.fieldOfView = 60;
-                        CameraManager.instance.Camera.transform.SetPositionAndRotation
-                            (CameraManager.instance.StepTrans[1].transform.position, CameraManager.instance.StepTrans[1].transform.rotation);
-                   
+                    UI_ContentPanel.instance.Tips = "1.在整地过程中，需彻底清除杂草，以减少杂草与高粱争夺养分。" +
+                        "\n2.在播种前进行精细整地，春季解冻后深翻至20～30cm，确保土壤疏松无硬结，为播种和保苗创造良好条件。" +
+                        "\n3.整地时需注意地表平整，无坷垃，以便于后续的播种和田间管理。";
+                    UI_ContentPanel.instance.fizhi();
+                    Debug.Log("精细整地要求");
+                    CameraManager.instance.Camera.fieldOfView = 60;
+                    CameraManager.instance.Camera.transform.SetPositionAndRotation
+                        (CameraManager.instance.StepTrans[1].transform.position, CameraManager.instance.StepTrans[1].transform.rotation);
+
                });
                UI_ContentPanel.instance.Tips = "";
                //Bootstrap.Instance.eventCenter.EventTrigger(Enum_EventType.拖车, true);
--- a/Assets/Scripts/UI/UIPanel/UI_TipsForPracticePanel.cs
+++ b/Assets/Scripts/UI/UIPanel/UI_TipsForPracticePanel.cs
@ -49,6 +49,8 @@ public class UI_TipsForPracticePanel : BasePanel
    public override void ShowMe()
    {
        base.ShowMe();
+        string pptBtnName = Left_content.GetChild(0).GetComponent<UI_TipsForPracticePanelPPTNameItem>().PPTName_Btn.gameObject.name;
+        OnClick(pptBtnName);
    }
    public override void HideMe()
    {
--- a/UserSettings/EditorUserSettings.asset
+++ b/UserSettings/EditorUserSettings.asset
@ -6,28 +6,28 @@ EditorUserSettings:
  serializedVersion: 4
  m_ConfigSettings:
    RecentlyUsedSceneGuid-0:
-      value: 5452075006075b5f540c5c77497706444f4e4d2b2d7e27677d2b4b30b5b8316d
-      flags: 0
-    RecentlyUsedSceneGuid-1:
      value: 5006505e5c0c0a5e0e0b5a2746220b44174e1d292d7b74617c2b196be0b66168
      flags: 0
-    RecentlyUsedSceneGuid-2:
+    RecentlyUsedSceneGuid-1:
      value: 5754060550000c5e59580a2348270d44434e1b782a7b7633747e1e30e4b5616b
      flags: 0
-    RecentlyUsedSceneGuid-3:
+    RecentlyUsedSceneGuid-2:
      value: 0609045307065a5d5a0d0874407b5944124f1e72787b2465287e1f36b0b8316f
      flags: 0
-    RecentlyUsedSceneGuid-4:
+    RecentlyUsedSceneGuid-3:
      value: 55085253045108025c56097646265e44124f4f7b7e7a76312c2f4960e6b1363d
      flags: 0
-    RecentlyUsedSceneGuid-5:
+    RecentlyUsedSceneGuid-4:
      value: 0004025352565f0d0c0d5827167b09444f4f1c282a7877677b704536b6b36c6d
      flags: 0
+    RecentlyUsedSceneGuid-5:
+      value: 5400065054540b095f0b5c7511255b4447151e787a2b253628794c37e7b6676e
+      flags: 0
    RecentlyUsedSceneGuid-6:
-      value: 5a5757560101590a5d0c0e24427b5d44434e4c7a7b7a23677f2b4565b7b5353a
+      value: 5452075006075b5f540c5c77497706444f4e4d2b2d7e27677d2b4b30b5b8316d
      flags: 0
    RecentlyUsedSceneGuid-7:
-      value: 5400065054540b095f0b5c7511255b4447151e787a2b253628794c37e7b6676e
+      value: 5a5757560101590a5d0c0e24427b5d44434e4c7a7b7a23677f2b4565b7b5353a
      flags: 0
    vcSharedLogLevel:
      value: 0d5e400f0650
--- a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt
+++ b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt
@ -14,18 +14,19 @@ MonoBehaviour:
  m_EditorClassIdentifier: 
  m_Children:
  - {fileID: 3}
-  - {fileID: 8}
-  - {fileID: 16}
+  - {fileID: 7}
+  - {fileID: 12}
+  - {fileID: 14}
  m_Position:
    serializedVersion: 2
    x: 0
    y: 30
-    width: 2560
-    height: 1307
+    width: 1920
+    height: 939
  m_MinSize: {x: 400, y: 200}
  m_MaxSize: {x: 32384, y: 16192}
  vertical: 0
-  controlID: 11139
+  controlID: 305
 --- !u!114 &2
 MonoBehaviour:
  m_ObjectHideFlags: 52
@ -46,10 +47,10 @@ MonoBehaviour:
    m_Tooltip: 
  m_Pos:
    serializedVersion: 2
-    x: 0
-    y: 1010
-    width: 1205
-    height: 349
+    x: 2560
+    y: 371
+    width: 711
+    height: 620
  m_ViewDataDictionary: {fileID: 0}
  m_OverlayCanvas:
    m_LastAppliedPresetName: Default
@ -97,26 +98,26 @@ MonoBehaviour:
      serializedVersion: 2
      x: 0
      y: 21
-      width: 1205
-      height: 328
-    m_Scale: {x: 0.3037037, y: 0.3037037}
-    m_Translation: {x: 602.5, y: 164}
+      width: 711
+      height: 599
+    m_Scale: {x: 0.3703125, y: 0.3703125}
+    m_Translation: {x: 355.49997, y: 299.5}
    m_MarginLeft: 0
    m_MarginRight: 0
    m_MarginTop: 0
    m_MarginBottom: 0
    m_LastShownAreaInsideMargins:
      serializedVersion: 2
-      x: -1983.8416
-      y: -540
-      width: 3967.683
-      height: 1080
+      x: -959.9999
+      y: -808.77637
+      width: 1919.9999
+      height: 1617.5527
    m_MinimalGUI: 1
-  m_defaultScale: 0.3037037
-  m_LastWindowPixelSize: {x: 1205, y: 349}
+  m_defaultScale: 0.3703125
+  m_LastWindowPixelSize: {x: 711, y: 620}
  m_ClearInEditMode: 1
  m_NoCameraWarning: 1
-  m_LowResolutionForAspectRatios: 01000000000000000000
+  m_LowResolutionForAspectRatios: 00000000000000000000
  m_XRRenderMode: 0
  m_RenderTexture: {fileID: 0}
 --- !u!114 &3
@ -138,12 +139,12 @@ MonoBehaviour:
    serializedVersion: 2
    x: 0
    y: 0
-    width: 1206
-    height: 1307
+    width: 712
+    height: 939
  m_MinSize: {x: 100, y: 200}
  m_MaxSize: {x: 8096, y: 16192}
  vertical: 1
-  controlID: 11140
+  controlID: 306
 --- !u!114 &4
 MonoBehaviour:
  m_ObjectHideFlags: 52
@ -154,15 +155,15 @@ MonoBehaviour:
  m_Enabled: 1
  m_EditorHideFlags: 1
  m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: SceneView
+  m_Name: 
  m_EditorClassIdentifier: 
  m_Children: []
  m_Position:
    serializedVersion: 2
    x: 0
    y: 0
-    width: 1206
-    height: 937
+    width: 712
+    height: 298
  m_MinSize: {x: 201, y: 221}
  m_MaxSize: {x: 4001, y: 4021}
  m_ActualView: {fileID: 5}
@ -190,10 +191,10 @@ MonoBehaviour:
    m_Tooltip: 
  m_Pos:
    serializedVersion: 2
-    x: 0
+    x: 2560
    y: 73
-    width: 1205
-    height: 916
+    width: 711
+    height: 277
  m_ViewDataDictionary: {fileID: 0}
  m_OverlayCanvas:
    m_LastAppliedPresetName: Default
@ -203,7 +204,7 @@ MonoBehaviour:
      floating: 0
      collapsed: 0
      displayed: 1
-      snapOffset: {x: -171, y: -26}
+      snapOffset: {x: -101, y: -26}
      snapOffsetDelta: {x: 0, y: 0}
      snapCorner: 3
      id: Tool Settings
@ -214,9 +215,9 @@ MonoBehaviour:
      floating: 0
      collapsed: 0
      displayed: 1
-      snapOffset: {x: -141, y: 149}
+      snapOffset: {x: -141, y: -184}
      snapOffsetDelta: {x: 0, y: 0}
-      snapCorner: 1
+      snapCorner: 3
      id: unity-grid-and-snap-toolbar
      index: 1
      layout: 1
@ -269,7 +270,7 @@ MonoBehaviour:
      floating: 0
      collapsed: 0
      displayed: 1
-      snapOffset: {x: 67.5, y: 26}
+      snapOffset: {x: 67.5, y: 6.399994}
      snapOffsetDelta: {x: 0, y: 0}
      snapCorner: 0
      id: Orientation
@ -328,39 +329,6 @@ MonoBehaviour:
      snapOffsetDelta: {x: 0, y: 0}
      snapCorner: 0
      id: Scene View/Navmesh Display
-      index: 5
-      layout: 4
-    - dockPosition: 1
-      containerId: overlay-container--right
-      floating: 0
-      collapsed: 0
-      displayed: 0
-      snapOffset: {x: 0, y: 0}
-      snapOffsetDelta: {x: 0, y: 0}
-      snapCorner: 0
-      id: Scene View/Agent Display
-      index: 7
-      layout: 4
-    - dockPosition: 1
-      containerId: overlay-container--right
-      floating: 0
-      collapsed: 0
-      displayed: 0
-      snapOffset: {x: 0, y: 0}
-      snapOffsetDelta: {x: 0, y: 0}
-      snapCorner: 0
-      id: Scene View/Obstacle Display
-      index: 9
-      layout: 4
-    - dockPosition: 1
-      containerId: overlay-container--right
-      floating: 0
-      collapsed: 0
-      displayed: 0
-      snapOffset: {x: 0, y: 0}
-      snapOffsetDelta: {x: 0, y: 0}
-      snapCorner: 0
-      id: Scene View/Occlusion Culling
      index: 4
      layout: 4
    - dockPosition: 1
@ -371,7 +339,18 @@ MonoBehaviour:
      snapOffset: {x: 0, y: 0}
      snapOffsetDelta: {x: 0, y: 0}
      snapCorner: 0
-      id: Scene View/Physics Debugger
+      id: Scene View/Agent Display
+      index: 5
+      layout: 4
+    - dockPosition: 1
+      containerId: overlay-container--right
+      floating: 0
+      collapsed: 0
+      displayed: 0
+      snapOffset: {x: 0, y: 0}
+      snapOffsetDelta: {x: 0, y: 0}
+      snapCorner: 0
+      id: Scene View/Obstacle Display
      index: 6
      layout: 4
    - dockPosition: 1
@ -382,9 +361,31 @@ MonoBehaviour:
      snapOffset: {x: 0, y: 0}
      snapOffsetDelta: {x: 0, y: 0}
      snapCorner: 0
-      id: Scene View/Scene Visibility
+      id: Scene View/Occlusion Culling
+      index: 7
+      layout: 4
+    - dockPosition: 1
+      containerId: overlay-container--right
+      floating: 0
+      collapsed: 0
+      displayed: 0
+      snapOffset: {x: 0, y: 0}
+      snapOffsetDelta: {x: 0, y: 0}
+      snapCorner: 0
+      id: Scene View/Physics Debugger
      index: 8
      layout: 4
+    - dockPosition: 1
+      containerId: overlay-container--right
+      floating: 0
+      collapsed: 0
+      displayed: 0
+      snapOffset: {x: 0, y: 0}
+      snapOffsetDelta: {x: 0, y: 0}
+      snapCorner: 0
+      id: Scene View/Scene Visibility
+      index: 9
+      layout: 4
    - dockPosition: 1
      containerId: overlay-container--right
      floating: 0
@ -418,41 +419,8 @@ MonoBehaviour:
      id: Scene View/Tilemap Palette Helper
      index: 12
      layout: 4
-    - dockPosition: 1
-      containerId: overlay-container--right
-      floating: 0
-      collapsed: 0
-      displayed: 0
-      snapOffset: {x: 48, y: 48}
-      snapOffsetDelta: {x: 0, y: 0}
-      snapCorner: 0
-      id: Scene View/TrailRenderer
-      index: 7
-      layout: 4
-    - dockPosition: 1
-      containerId: overlay-container--right
-      floating: 0
-      collapsed: 0
-      displayed: 1
-      snapOffset: {x: 48, y: 2}
-      snapOffsetDelta: {x: 0, y: 0}
-      snapCorner: 0
-      id: UnityEditor.SceneViewCameraOverlay
-      index: 9
-      layout: 4
-    - dockPosition: 1
-      containerId: overlay-container--right
-      floating: 0
-      collapsed: 0
-      displayed: 0
-      snapOffset: {x: 48, y: 48}
-      snapOffsetDelta: {x: 0, y: 0}
-      snapCorner: 0
-      id: APV Overlay
-      index: 8
-      layout: 4
    m_OverlaysVisible: 1
-  m_WindowGUID: 30731efe385b684419a68e2e2d932ed9
+  m_WindowGUID: 7be1e39b4febbe842b94ac1da474e6bf
  m_Gizmos: 1
  m_OverrideSceneCullingMask: 6917529027641081856
  m_SceneIsLit: 1
@ -462,9 +430,9 @@ MonoBehaviour:
  m_PlayAudio: 0
  m_AudioPlay: 0
  m_Position:
-    m_Target: {x: 1672.3152, y: 859.96405, z: 0.06000942}
+    m_Target: {x: 897.201, y: 696.0929, z: -1.3810096}
    speed: 2
-    m_Value: {x: 1672.3152, y: 859.96405, z: 0.06000942}
+    m_Value: {x: 897.201, y: 696.0929, z: -1.3810096}
  m_RenderMode: 0
  m_CameraMode:
    drawMode: 0
@ -490,7 +458,7 @@ MonoBehaviour:
        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}
    yGrid:
      m_Fade:
        m_Target: 0
@ -501,13 +469,13 @@ MonoBehaviour:
      m_Size: {x: 1, y: 1}
    zGrid:
      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}
-    m_ShowGrid: 0
+    m_ShowGrid: 1
    m_GridAxis: 1
    m_gridOpacity: 0.5
  m_Rotation:
@ -515,16 +483,16 @@ MonoBehaviour:
    speed: 2
    m_Value: {x: 0, y: 0, z: 0, w: 1}
  m_Size:
-    m_Target: 208.66856
+    m_Target: 387.84515
    speed: 2
-    m_Value: 208.66856
+    m_Value: 387.84515
  m_Ortho:
    m_Target: 1
    speed: 2
    m_Value: 1
  m_CameraSettings:
-    m_Speed: 0.9453
-    m_SpeedNormalized: 0.47
+    m_Speed: 1
+    m_SpeedNormalized: 0.5
    m_SpeedMin: 0.01
    m_SpeedMax: 2
    m_EasingEnabled: 1
@ -535,7 +503,7 @@ MonoBehaviour:
    m_FarClip: 10000
    m_DynamicClip: 1
    m_OcclusionCulling: 0
-  m_LastSceneViewRotation: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226}
+  m_LastSceneViewRotation: {x: -0.39604196, y: 0.38672963, z: -0.18882361, w: -0.81113297}
  m_LastSceneViewOrtho: 0
  m_ReplacementShader: {fileID: 0}
  m_ReplacementString: 
@ -552,87 +520,23 @@ MonoBehaviour:
  m_Enabled: 1
  m_EditorHideFlags: 1
  m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: GameView
+  m_Name: 
  m_EditorClassIdentifier: 
  m_Children: []
  m_Position:
    serializedVersion: 2
    x: 0
-    y: 937
-    width: 1206
-    height: 370
+    y: 298
+    width: 712
+    height: 641
  m_MinSize: {x: 201, y: 221}
  m_MaxSize: {x: 4001, y: 4021}
  m_ActualView: {fileID: 2}
  m_Panes:
  - {fileID: 2}
-  - {fileID: 7}
  m_Selected: 0
-  m_LastSelected: 1
+  m_LastSelected: 0
 --- !u!114 &7
-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: 11500000, guid: f817a38900380be47942905e17e7d39b, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_MinSize: {x: 100, y: 100}
-  m_MaxSize: {x: 4000, y: 4000}
-  m_TitleContent:
-    m_Text: Timeline
-    m_Image: {fileID: -9173288242387172643, guid: 0000000000000000d000000000000000, type: 0}
-    m_Tooltip: 
-  m_Pos:
-    serializedVersion: 2
-    x: 2560
-    y: 848
-    width: 876
-    height: 151
-  m_ViewDataDictionary: {fileID: 0}
-  m_OverlayCanvas:
-    m_LastAppliedPresetName: Default
-    m_SaveData: []
-    m_OverlaysVisible: 1
-  m_Preferences:
-    editType: 0
-    timeReferenceMode: 0
-  m_LockTracker:
-    m_IsLocked: 0
-  m_SequenceHierarchy: {fileID: 0}
-  m_SequencePath:
-    m_SelectionRoot: 0
-    m_SubElements: []
--- !u!114 &8
-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: 9}
-  - {fileID: 14}
-  m_Position:
-    serializedVersion: 2
-    x: 1206
-    y: 0
-    width: 786
-    height: 1307
-  m_MinSize: {x: 200, y: 200}
-  m_MaxSize: {x: 16192, y: 16192}
-  vertical: 0
-  controlID: 11185
--- !u!114 &9
 MonoBehaviour:
  m_ObjectHideFlags: 52
  m_CorrespondingSourceObject: {fileID: 0}
@ -645,19 +549,19 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  m_Children:
+  - {fileID: 8}
  - {fileID: 10}
-  - {fileID: 12}
  m_Position:
    serializedVersion: 2
-    x: 0
+    x: 712
    y: 0
-    width: 508
-    height: 1307
+    width: 438
+    height: 939
  m_MinSize: {x: 100, y: 200}
  m_MaxSize: {x: 8096, y: 16192}
  vertical: 1
-  controlID: 11186
--- !u!114 &10
+  controlID: 3255
+--- !u!114 &8
 MonoBehaviour:
  m_ObjectHideFlags: 52
  m_CorrespondingSourceObject: {fileID: 0}
@ -674,16 +578,16 @@ MonoBehaviour:
    serializedVersion: 2
    x: 0
    y: 0
-    width: 508
-    height: 725
+    width: 438
+    height: 468
  m_MinSize: {x: 202, y: 221}
  m_MaxSize: {x: 4002, y: 4021}
-  m_ActualView: {fileID: 11}
+  m_ActualView: {fileID: 9}
  m_Panes:
-  - {fileID: 11}
+  - {fileID: 9}
  m_Selected: 0
  m_LastSelected: 0
--- !u!114 &11
+--- !u!114 &9
 MonoBehaviour:
  m_ObjectHideFlags: 52
  m_CorrespondingSourceObject: {fileID: 0}
@ -703,10 +607,10 @@ MonoBehaviour:
    m_Tooltip: 
  m_Pos:
    serializedVersion: 2
-    x: 1206
+    x: 3272
    y: 73
-    width: 506
-    height: 704
+    width: 436
+    height: 447
  m_ViewDataDictionary: {fileID: 0}
  m_OverlayCanvas:
    m_LastAppliedPresetName: Default
@ -715,33 +619,33 @@ MonoBehaviour:
  m_SceneHierarchy:
    m_TreeViewState:
      scrollPos: {x: 0, y: 0}
-      m_SelectedIDs: 
+      m_SelectedIDs: f2680000
      m_LastClickedID: 0
-      m_ExpandedIDs: fa65ffff0066ffff8667ffff9867ffff3a74ffff8675ffff7299ffff7899ffff969affffa09affffaa9affffb09affff369cffff489cffff08caffff8ad2ffff94d2ffff9ed2ffffc0d2fffffed2ffff42ddffff46ddffff4addffff54ddffff38fbfffff4ffffff
+      m_ExpandedIDs: a078feffaa78feffb478feffba78feff3a7ffeff3e7ffeff467ffeff507ffeff50c3feffa4c3feffbac3feffcaf7feff26f8feff3c7effff467effff507effff567effff3c7fffffbe87ffffc687fffffc87ffff0688ffff1088ffff1688fffffa88ffff1089ffff16a6ffff20a6ffff2aa6ffff30a6ffffc6a6ffff14a7ffff18a7ffff20a7ffff2aa7ffffb8bfffffcebfffffd0bfffff5cc0ffff84c1ffffa6c1ffff74ebffff8aebffff9cebffffa2ebfffff8efffff4af0ffff52f0ffff5cf0ffffbcf4fffff4ffffff647d0000
      m_RenameOverlay:
        m_UserAcceptedRename: 0
-        m_Name: 
-        m_OriginalName: 
+        m_Name: Tip
+        m_OriginalName: Tip
        m_EditFieldRect:
          serializedVersion: 2
          x: 0
          y: 0
          width: 0
          height: 0
-        m_UserData: 0
+        m_UserData: -16002
        m_IsWaitingForDelay: 0
        m_IsRenaming: 0
-        m_OriginalEventType: 11
+        m_OriginalEventType: 0
        m_IsRenamingFilename: 0
-        m_ClientGUIView: {fileID: 10}
+        m_ClientGUIView: {fileID: 8}
      m_SearchString: 
    m_ExpandedScenes: []
    m_CurrenRootInstanceID: 0
    m_LockTracker:
      m_IsLocked: 0
    m_CurrentSortingName: TransformSorting
-  m_WindowGUID: abe4b46ffaa4cd34ba9c73eb593d2f91
--- !u!114 &12
+  m_WindowGUID: 18868db7f5d498141b53bc785b267277
+--- !u!114 &10
 MonoBehaviour:
  m_ObjectHideFlags: 52
  m_CorrespondingSourceObject: {fileID: 0}
@ -757,17 +661,17 @@ MonoBehaviour:
  m_Position:
    serializedVersion: 2
    x: 0
-    y: 725
-    width: 508
-    height: 582
+    y: 468
+    width: 438
+    height: 471
  m_MinSize: {x: 102, y: 121}
  m_MaxSize: {x: 4002, y: 4021}
-  m_ActualView: {fileID: 13}
+  m_ActualView: {fileID: 11}
  m_Panes:
-  - {fileID: 13}
+  - {fileID: 11}
  m_Selected: 0
  m_LastSelected: 0
--- !u!114 &13
+--- !u!114 &11
 MonoBehaviour:
  m_ObjectHideFlags: 52
  m_CorrespondingSourceObject: {fileID: 0}
@ -787,16 +691,16 @@ MonoBehaviour:
    m_Tooltip: 
  m_Pos:
    serializedVersion: 2
-    x: 1206
-    y: 798
-    width: 506
-    height: 561
+    x: 3272
+    y: 541
+    width: 436
+    height: 450
  m_ViewDataDictionary: {fileID: 0}
  m_OverlayCanvas:
    m_LastAppliedPresetName: Default
    m_SaveData: []
    m_OverlaysVisible: 1
--- !u!114 &14
+--- !u!114 &12
 MonoBehaviour:
  m_ObjectHideFlags: 52
  m_CorrespondingSourceObject: {fileID: 0}
@ -804,25 +708,25 @@ MonoBehaviour:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 0}
  m_Enabled: 1
-  m_EditorHideFlags: 0
+  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: 508
+    x: 1150
    y: 0
-    width: 278
-    height: 1307
+    width: 187
+    height: 939
  m_MinSize: {x: 232, y: 271}
  m_MaxSize: {x: 10002, y: 10021}
-  m_ActualView: {fileID: 15}
+  m_ActualView: {fileID: 13}
  m_Panes:
-  - {fileID: 15}
+  - {fileID: 13}
  m_Selected: 0
  m_LastSelected: 0
--- !u!114 &15
+--- !u!114 &13
 MonoBehaviour:
  m_ObjectHideFlags: 52
  m_CorrespondingSourceObject: {fileID: 0}
@ -842,10 +746,10 @@ MonoBehaviour:
    m_Tooltip: 
  m_Pos:
    serializedVersion: 2
-    x: 1714
+    x: 3710
    y: 73
-    width: 276
-    height: 1286
+    width: 185
+    height: 918
  m_ViewDataDictionary: {fileID: 0}
  m_OverlayCanvas:
    m_LastAppliedPresetName: Default
@ -862,22 +766,23 @@ MonoBehaviour:
    m_SkipHidden: 0
    m_SearchArea: 1
    m_Folders:
-    - Assets/Resources/UI/UIPanel
+    - Assets
    m_Globs: []
    m_OriginalText: 
    m_FilterByTypeIntersection: 0
  m_ViewMode: 0
  m_StartGridSize: 64
-  m_LastFolders: []
+  m_LastFolders:
+  - Assets
  m_LastFoldersGridSize: -1
-  m_LastProjectPath: "E:\\\u9676\u82CF\u59472025\u9879\u76EE\u6587\u4EF6\u5939\\CultivationOfBrewing"
+  m_LastProjectPath: D:\UnityProjects\LGZN\CultivationOfBrewing
  m_LockTracker:
    m_IsLocked: 0
  m_FolderTreeState:
    scrollPos: {x: 0, y: 0}
-    m_SelectedIDs: c0350000
-    m_LastClickedID: 13760
-    m_ExpandedIDs: ffffffff000000006a5a00006c5a00006e5a0000705a0000725a0000745a0000765a0000785a00007a5a00007c5a00007e5a0000805a0000825a0000845a0000865a0000885a00008a5a00008c5a0000
+    m_SelectedIDs: f2680000
+    m_LastClickedID: 26866
+    m_ExpandedIDs: ffffffff00000000f268000000ca9a3bffffff7f
    m_RenameOverlay:
      m_UserAcceptedRename: 0
      m_Name: 
@ -902,10 +807,10 @@ MonoBehaviour:
      m_Icon: {fileID: 0}
      m_ResourceFile: 
  m_AssetTreeState:
-    scrollPos: {x: 0, y: 256}
-    m_SelectedIDs: 
-    m_LastClickedID: 0
-    m_ExpandedIDs: ffffffff000000006a5a00006c5a00006e5a0000705a0000725a0000745a0000765a0000785a00007a5a00007c5a00007e5a0000805a0000825a0000845a0000865a0000885a00008a5a00008c5a0000
+    scrollPos: {x: 0, y: 0}
+    m_SelectedIDs: f2680000
+    m_LastClickedID: 26866
+    m_ExpandedIDs: ffffffff0000000016610000f26800006269000064690000666900006e690000307f0000848200008a820000c08b0000c28b0000
    m_RenameOverlay:
      m_UserAcceptedRename: 0
      m_Name: 
@ -921,7 +826,7 @@ MonoBehaviour:
      m_IsRenaming: 0
      m_OriginalEventType: 11
      m_IsRenamingFilename: 1
-      m_ClientGUIView: {fileID: 14}
+      m_ClientGUIView: {fileID: 0}
    m_SearchString: 
    m_CreateAssetUtility:
      m_EndAction: {fileID: 0}
@ -930,9 +835,9 @@ MonoBehaviour:
      m_Icon: {fileID: 0}
      m_ResourceFile: 
  m_ListAreaState:
-    m_SelectedInstanceIDs: 
-    m_LastClickedInstanceID: 0
-    m_HadKeyboardFocusLastEvent: 1
+    m_SelectedInstanceIDs: f2680000
+    m_LastClickedInstanceID: 26866
+    m_HadKeyboardFocusLastEvent: 0
    m_ExpandedInstanceIDs: 
    m_RenameOverlay:
      m_UserAcceptedRename: 0
@ -961,7 +866,7 @@ MonoBehaviour:
    m_GridSize: 64
  m_SkipHiddenPackages: 0
  m_DirectoriesAreaWidth: 115
--- !u!114 &16
+--- !u!114 &14
 MonoBehaviour:
  m_ObjectHideFlags: 52
  m_CorrespondingSourceObject: {fileID: 0}
@ -971,24 +876,23 @@ MonoBehaviour:
  m_Enabled: 1
  m_EditorHideFlags: 1
  m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: InspectorWindow
+  m_Name: 
  m_EditorClassIdentifier: 
  m_Children: []
  m_Position:
    serializedVersion: 2
-    x: 1992
+    x: 1337
    y: 0
-    width: 568
-    height: 1307
+    width: 583
+    height: 939
  m_MinSize: {x: 276, y: 71}
  m_MaxSize: {x: 4001, y: 4021}
-  m_ActualView: {fileID: 17}
+  m_ActualView: {fileID: 15}
  m_Panes:
-  - {fileID: 17}
-  - {fileID: 18}
+  - {fileID: 15}
  m_Selected: 0
-  m_LastSelected: 1
--- !u!114 &17
+  m_LastSelected: 0
+--- !u!114 &15
 MonoBehaviour:
  m_ObjectHideFlags: 52
  m_CorrespondingSourceObject: {fileID: 0}
@ -1008,10 +912,10 @@ MonoBehaviour:
    m_Tooltip: 
  m_Pos:
    serializedVersion: 2
-    x: 1992
+    x: 3897
    y: 73
-    width: 567
-    height: 1286
+    width: 582
+    height: 918
  m_ViewDataDictionary: {fileID: 0}
  m_OverlayCanvas:
    m_LastAppliedPresetName: Default
@ -1020,7 +924,7 @@ MonoBehaviour:
  m_ObjectsLockedBeforeSerialization: []
  m_InstanceIDsLockedBeforeSerialization: 
  m_PreviewResizer:
-    m_CachedPref: -345
+    m_CachedPref: -160
    m_ControlHash: -371814159
    m_PrefName: Preview_InspectorPreview
  m_LastInspectedObjectInstanceID: -1
@ -1030,32 +934,3 @@ MonoBehaviour:
  m_LockTracker:
    m_IsLocked: 0
  m_PreviewWindow: {fileID: 0}
--- !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: 0
-  m_Script: {fileID: 12079, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_MinSize: {x: 390, y: 390}
-  m_MaxSize: {x: 4000, y: 4000}
-  m_TitleContent:
-    m_Text: Lighting
-    m_Image: {fileID: -1347227620855488341, guid: 0000000000000000d000000000000000, type: 0}
-    m_Tooltip: 
-  m_Pos:
-    serializedVersion: 2
-    x: 1487
-    y: 73
-    width: 432
-    height: 926
-  m_ViewDataDictionary: {fileID: 0}
-  m_OverlayCanvas:
-    m_LastAppliedPresetName: Default
-    m_SaveData: []
-    m_OverlaysVisible: 1
Author	SHA1	Message	Date
yanghua	cc78728949	融合程序	2025-04-08 13:31:23 +08:00
yanghua	d93f221bfa	融合程序	2025-04-08 13:18:28 +08:00
yanghua	6b0384849a	修改加载PPT逻辑	2025-04-08 13:17:40 +08:00
yanghua	c9f5e2e308	1	2025-04-08 09:25:51 +08:00
yanghua	568b31e519	融合	2025-04-08 09:25:14 +08:00