融合程序

Assets/Scripts/UI/UIPanel/UI_LoadingPanel.cs

@@ -1,5 +1,6 @@
 using System.Collections;
 using System.Collections.Generic;
+using TMPro;
 using UnityEngine;
 using UnityEngine.UI;
 
@@ -10,15 +11,22 @@ public class UI_LoadingPanel : BasePanel
     private float currentProgress = 0;
     public float speed;
     public bool isLoading = false;
+    public TextMeshProUGUI Slider_Text;
+    public Sprite[] frames; // 将每一帧的Sprite图片依次拖入这个数组中
+    public float frameRate = 30f; // 每秒播放的帧数
+    private Image image;
     protected override void Awake()
     {
         base.Awake();
         loadSlider = GetControl<Slider>("loadSlider");
+        Slider_Text = GetControl<TextMeshProUGUI>("%");
+        image = GetControl<Image>("middleImage");
     }
 
     public override void ShowMe()
     {
         base.ShowMe();
+        Slider_Text.text = "0%";
         Bootstrap.Instance.eventCenter.AddEventListener<float>(Enum_EventType.UpdateProgress, UpdateProgress);
 
     }
@@ -41,6 +49,8 @@ public class UI_LoadingPanel : BasePanel
             {
                 currentProgress += Time.deltaTime * speed;
                 loadSlider.value = currentProgress;
+                float percent = loadSlider.value * 100f;
+                Slider_Text.text = Mathf.RoundToInt(percent) + "%";
             }
             else
             {

Assets/Scripts/UI/UIPanel/UI_StepsPanel.cs

@@ -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)
             {
@@ -79,7 +79,7 @@ public class UI_StepsPanel : BasePanel
         {
             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) =>
                     {
@@ -103,35 +103,35 @@ public class UI_StepsPanel : BasePanel
             case "育苗前种子处理":
                 Debug.Log("育苗前种子处理");
 
-                    UI_ContentPanel.instance.Tips= "1.选种是为了淘汰瘦小、损伤、虫蛀和霉变的种子，选出粒大饱满、外观光滑且有光泽的籽粒。选种方法包括风选和筛选，风选可用风车或簸箕将枇子、虫蛀等籽粒扇掉，筛选则使用3.5毫米-4毫米孔径的筛子筛去小粒种子。选种后，种子发芽率更高，出苗整齐一致，有利于培育壮苗。(在簸箕中选择完整种子并进行泡发)\r\n" +
+                UI_ContentPanel.instance.Tips = "1.选种是为了淘汰瘦小、损伤、虫蛀和霉变的种子，选出粒大饱满、外观光滑且有光泽的籽粒。选种方法包括风选和筛选，风选可用风车或簸箕将枇子、虫蛀等籽粒扇掉，筛选则使用3.5毫米-4毫米孔径的筛子筛去小粒种子。选种后，种子发芽率更高，出苗整齐一致，有利于培育壮苗。(在簸箕中选择完整种子并进行泡发)\r\n" +
-                            "\n2.再用%广枯宁水剂浸泡10～12小时，待种子吸胀后捞起滤干备用。这种方法既能有效防治病害，又能保证高粱产品的有机品质" 
+                        "\n2.再用%广枯宁水剂浸泡10～12小时，待种子吸胀后捞起滤干备用。这种方法既能有效防治病害，又能保证高粱产品的有机品质"
-                            ;
+                        ;
-                    UI_ContentPanel.instance.fizhi();
+                UI_ContentPanel.instance.fizhi();
-                    Bootstrap.Instance.uiManager.HidePanel<UI_FineSoilPreparationPanel>();
+                Bootstrap.Instance.uiManager.HidePanel<UI_FineSoilPreparationPanel>();
-                    CameraManager.instance.Camera.transform.SetPositionAndRotation
+                CameraManager.instance.Camera.transform.SetPositionAndRotation
-                        (CameraManager.instance.StepTrans[0].transform.position, CameraManager.instance.StepTrans[0].transform.rotation);
+                    (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>();
+                Bootstrap.Instance.uiManager.HidePanel<UI_FineSoilPreparationPanel>();
-                    CameraManager.instance.Camera.transform.SetPositionAndRotation
+                CameraManager.instance.Camera.transform.SetPositionAndRotation
-                        (CameraManager.instance.StepTrans[4].transform.position, CameraManager.instance.StepTrans[4].transform.rotation);
+                    (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.在整地过程中，需彻底清除杂草，以减少杂草与高粱争夺养分。" +
+                    UI_ContentPanel.instance.Tips = "1.在整地过程中，需彻底清除杂草，以减少杂草与高粱争夺养分。" +
-                            "\n2.在播种前进行精细整地，春季解冻后深翻至20～30cm，确保土壤疏松无硬结，为播种和保苗创造良好条件。" +
+                        "\n2.在播种前进行精细整地，春季解冻后深翻至20～30cm，确保土壤疏松无硬结，为播种和保苗创造良好条件。" +
-                            "\n3.整地时需注意地表平整，无坷垃，以便于后续的播种和田间管理。";
+                        "\n3.整地时需注意地表平整，无坷垃，以便于后续的播种和田间管理。";
-                        UI_ContentPanel.instance.fizhi();
+                    UI_ContentPanel.instance.fizhi();
-                        Debug.Log("精细整地要求");
+                    Debug.Log("精细整地要求");
-                        CameraManager.instance.Camera.fieldOfView = 60;
+                    CameraManager.instance.Camera.fieldOfView = 60;
-                        CameraManager.instance.Camera.transform.SetPositionAndRotation
+                    CameraManager.instance.Camera.transform.SetPositionAndRotation
-                            (CameraManager.instance.StepTrans[1].transform.position, CameraManager.instance.StepTrans[1].transform.rotation);
+                        (CameraManager.instance.StepTrans[1].transform.position, CameraManager.instance.StepTrans[1].transform.rotation);
 
                 });
                 UI_ContentPanel.instance.Tips = "";

UserSettings/Layouts/CurrentMaximizeLayout.dwlt

@@ -14,18 +14,19 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Children:
   - {fileID: 3}
-  - {fileID: 8}
+  - {fileID: 7}
-  - {fileID: 16}
+  - {fileID: 12}
+  - {fileID: 14}
   m_Position:
     serializedVersion: 2
     x: 0
     y: 30
-    width: 2560
+    width: 1920
-    height: 1307
+    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
+    x: 2560
-    y: 1010
+    y: 371
-    width: 1205
+    width: 711
-    height: 349
+    height: 620
   m_ViewDataDictionary: {fileID: 0}
   m_OverlayCanvas:
     m_LastAppliedPresetName: Default
@@ -97,26 +98,26 @@ MonoBehaviour:
       serializedVersion: 2
       x: 0
       y: 21
-      width: 1205
+      width: 711
-      height: 328
+      height: 599
-    m_Scale: {x: 0.3037037, y: 0.3037037}
+    m_Scale: {x: 0.3703125, y: 0.3703125}
-    m_Translation: {x: 602.5, y: 164}
+    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
+      x: -959.9999
-      y: -540
+      y: -808.77637
-      width: 3967.683
+      width: 1919.9999
-      height: 1080
+      height: 1617.5527
     m_MinimalGUI: 1
-  m_defaultScale: 0.3037037
+  m_defaultScale: 0.3703125
-  m_LastWindowPixelSize: {x: 1205, y: 349}
+  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
+    width: 712
-    height: 1307
+    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
+    width: 712
-    height: 937
+    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
+    width: 711
-    height: 916
+    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_Speed: 1
-    m_SpeedNormalized: 0.47
+    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
+    y: 298
-    width: 1206
+    width: 712
-    height: 370
+    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
+    width: 438
-    height: 1307
+    height: 939
   m_MinSize: {x: 100, y: 200}
   m_MaxSize: {x: 8096, y: 16192}
   vertical: 1
-  controlID: 11186
+  controlID: 3255
---- !u!114 &10
+--- !u!114 &8
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -674,16 +578,16 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 508
+    width: 438
-    height: 725
+    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
+    width: 436
-    height: 704
+    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_Name: Tip
-        m_OriginalName: 
+        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
+  m_WindowGUID: 18868db7f5d498141b53bc785b267277
---- !u!114 &12
+--- !u!114 &10
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -757,17 +661,17 @@ MonoBehaviour:
   m_Position:
     serializedVersion: 2
     x: 0
-    y: 725
+    y: 468
-    width: 508
+    width: 438
-    height: 582
+    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
+    x: 3272
-    y: 798
+    y: 541
-    width: 506
+    width: 436
-    height: 561
+    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
+    width: 187
-    height: 1307
+    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
+    width: 185
-    height: 1286
+    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_SelectedIDs: f2680000
-    m_LastClickedID: 13760
+    m_LastClickedID: 26866
-    m_ExpandedIDs: ffffffff000000006a5a00006c5a00006e5a0000705a0000725a0000745a0000765a0000785a00007a5a00007c5a00007e5a0000805a0000825a0000845a0000865a0000885a00008a5a00008c5a0000
+    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}
+    scrollPos: {x: 0, y: 0}
-    m_SelectedIDs: 
+    m_SelectedIDs: f2680000
-    m_LastClickedID: 0
+    m_LastClickedID: 26866
-    m_ExpandedIDs: ffffffff000000006a5a00006c5a00006e5a0000705a0000725a0000745a0000765a0000785a00007a5a00007c5a00007e5a0000805a0000825a0000845a0000865a0000885a00008a5a00008c5a0000
+    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_SelectedInstanceIDs: f2680000
-    m_LastClickedInstanceID: 0
+    m_LastClickedInstanceID: 26866
-    m_HadKeyboardFocusLastEvent: 1
+    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
+    width: 583
-    height: 1307
+    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: 15}
-  - {fileID: 18}
   m_Selected: 0
-  m_LastSelected: 1
+  m_LastSelected: 0
---- !u!114 &17
+--- !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
+    width: 582
-    height: 1286
+    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