增加黑屏过度

2024-12-04 23:54:19 +08:00 · 2024-12-04 23:54:19 +08:00 · c1dc76d2d4
parent 1f2e8889aa
commit c1dc76d2d4
12 changed files with 453 additions and 175 deletions
--- a/Assets/DemoGame/GameRes/UIPanel/UIBlack.prefab
+++ b/Assets/DemoGame/GameRes/UIPanel/UIBlack.prefab
@ -12,7 +12,7 @@ GameObject:
  - component: {fileID: 2132094194892885705}
  - component: {fileID: 6498830797524188334}
  m_Layer: 5
-  m_Name: Image
+  m_Name: img_BG
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
@ -58,7 +58,7 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  m_Material: {fileID: 0}
-  m_Color: {r: 0, g: 0, b: 0, a: 0.6039216}
+  m_Color: {r: 0, g: 0, b: 0, a: 1}
  m_RaycastTarget: 0
  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
  m_Maskable: 1
@ -167,11 +167,5 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  Datas:
-  - name: btn_Start
-    go: {fileID: 0}
-  - name: txt_Score
-    go: {fileID: 0}
-  - name: txt_Progress
-    go: {fileID: 0}
-  - name: txt_Score
-    go: {fileID: 0}
+  - name: img_BG
+    go: {fileID: 904459869104082739}
--- a/Assets/DemoGame/GameScript/Hotfix/Helper/CommonHelper.cs
+++ b/Assets/DemoGame/GameScript/Hotfix/Helper/CommonHelper.cs
@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using Cysharp.Threading.Tasks;
+using Unity.Loader;
 using UnityEngine;
 using UnityEngine.SceneManagement;
 using Object = UnityEngine.Object;
@ -102,5 +103,17 @@ namespace ZC
            callback?.Invoke(binding);
            return binding;
        }
+
+        public static async UniTask OpenLoadingAsync()
+        {
+            var blackUI = Global.UIManager.GetUI<BlackUI>(UIType.BlackUI);
+            await blackUI.OpenAsync();
+        }
+
+        public static async UniTask CloseLoadingAsync()
+        {
+            var blackUI = Global.UIManager.GetUI<BlackUI>(UIType.BlackUI);
+            await blackUI.CloseAsync();
+        }
    }
 }
--- a/Assets/DemoGame/GameScript/Hotfix/Procedure/Logic/体格检查Procedure.cs
+++ b/Assets/DemoGame/GameScript/Hotfix/Procedure/Logic/体格检查Procedure.cs
@ -1,4 +1,5 @@
-using Unity.Loader;
+using Cysharp.Threading.Tasks;
+using Unity.Loader;
 using UnityEngine;
 using UnityEngine.EventSystems;

@ -8,15 +9,23 @@ namespace ZC
    class 体格检查Procedure : ProcedureBase
    {
        TriggerEvent triggerEvent;
+
        public override void OnEnter()
        {
            base.OnEnter();
+
+            async UniTask Enter()
+            {
                ResourcesLocalComponent.Instance.LoadScene(AssetConst.Assets_DemoGame_GameRes_Scene_HuShiTaiScene_unity);
+                await CommonHelper.CloseLoadingAsync();

                var introduceUI = (IntroduceUI)Global.UIManager.ShowUI(UIType.IntroduceUI);
                introduceUI.SetData(ConstStr.体格检查, ConstStr.体格检查介绍, IntroduceUI_Callback);
            }

+            Enter().Forget();
+        }
+
        private void IntroduceUI_Callback()
        {
            Global.UIManager.HideUI(UIType.IntroduceUI);
@ -30,10 +39,16 @@ namespace ZC
        }

        private void PlayerMoveToPoint()
+        {
+            async UniTask Close()
            {
                triggerEvent.Dispose();
+                await CommonHelper.OpenLoadingAsync();
                Global.UIManager.HideUI(UIType.BigTipsUI);
                Global.ProcedureManager.ChangeProcedure(ProcedureType.常规血液与尿液分析Procedure);
            }
+
+            Close().Forget();
+        }
    }
 }
--- a/Assets/DemoGame/GameScript/Hotfix/Procedure/Logic/基本资料填写Procedure.cs
+++ b/Assets/DemoGame/GameScript/Hotfix/Procedure/Logic/基本资料填写Procedure.cs
@ -17,15 +17,23 @@ namespace ZC
        public override void OnEnter()
        {
            base.OnEnter();
+
+            async UniTask Enter()
+            {
                ResourcesLocalComponent.Instance.LoadScene(AssetConst.Assets_DemoGame_GameRes_Scene_LiaoTianScene_unity);
-            CommonHelper.GetSceneBindingAsync((bind) =>
+                await CommonHelper.CloseLoadingAsync();
+
+                await CommonHelper.GetSceneBindingAsync((bind) =>
                {
                    this.binding = bind;
                    binding = GameObject.FindObjectOfType<SceneGameObjectBinding>();
                    go = binding.GetValue("老人");
                    go.OpenHighlight();
                    go.AddEventTrigger(EventTriggerType.PointerClick, ClickHiglight);
-            }).Forget();
+                });
+            }
+
+            Enter().Forget();
        }

        private void ClickHiglight(BaseEventData arg0)
@ -189,10 +197,16 @@ namespace ZC

        private void IntroduceUI_Callback()
        {
+            async UniTask Close()
+            {
+                await CommonHelper.OpenLoadingAsync();
                Global.UIManager.HideUI(UIType.DialogueUI);
                Global.UIManager.HideUI(UIType.IntroduceUI);
                Global.UIManager.HideUI(UIType.BasicInformationUI);
                Global.ProcedureManager.ChangeProcedure(ProcedureType.体格检查Procedure);
            }
+
+            Close().Forget();
+        }
    }
 }
--- a/Assets/DemoGame/GameScript/Hotfix/Procedure/Logic/常规血液与尿液分析Procedure.cs
+++ b/Assets/DemoGame/GameScript/Hotfix/Procedure/Logic/常规血液与尿液分析Procedure.cs
@ -13,12 +13,19 @@ namespace ZC
        public override void OnEnter()
        {
            base.OnEnter();
+
+            async UniTask Enter()
+            {
                ResourcesLocalComponent.Instance.LoadScene(AssetConst.Assets_DemoGame_GameRes_Scene_ChouXueScene_unity);
+                await CommonHelper.CloseLoadingAsync();

                var introduceUI = (IntroduceUI)Global.UIManager.ShowUI(UIType.IntroduceUI);
                introduceUI.SetData(ConstStr.常规血液与尿液分析, ConstStr.常规血液与尿液分析介绍, IntroduceUI_Callback);
            }

+            Enter().Forget();
+        }
+
        private void IntroduceUI_Callback()
        {
            Global.UIManager.CloseLast();
@ -108,8 +115,14 @@ namespace ZC

        private void AnswerUI_Callback()
        {
+            async UniTask Close()
+            {
+                await CommonHelper.OpenLoadingAsync();
                Global.UIManager.CloseLast();
                Global.ProcedureManager.ChangeProcedure(ProcedureType.返回体检场景Procedure);
            }
+
+            Close().Forget();
+        }
    }
 }
--- a/Assets/DemoGame/GameScript/Hotfix/Procedure/Logic/返回体检场景Procedure.cs
+++ b/Assets/DemoGame/GameScript/Hotfix/Procedure/Logic/返回体检场景Procedure.cs
@ -1,4 +1,7 @@
-namespace ZC
+using Cysharp.Threading.Tasks;
+using Unity.Loader;
+
+namespace ZC
 {
    [Procedure(ProcedureType.返回体检场景Procedure)]
    class 返回体检场景Procedure : ProcedureBase
@ -6,7 +9,12 @@
        public override void OnEnter()
        {
            base.OnEnter();
+            async UniTask Enter()
+            {
                ResourcesLocalComponent.Instance.LoadScene(AssetConst.Assets_DemoGame_GameRes_Scene_HuShiTaiScene_unity);
+                await CommonHelper.CloseLoadingAsync();
+            }
+            Enter().Forget();
        }
    }
 }
--- a/Assets/DemoGame/GameScript/Hotfix/Procedure/Logic/首页Procedure.cs
+++ b/Assets/DemoGame/GameScript/Hotfix/Procedure/Logic/首页Procedure.cs
@ -8,14 +8,22 @@ namespace ZC
    class 首页Procedure : ProcedureBase
    {
        TriggerEvent triggerEvent;
+
        public override void OnEnter()
        {
            base.OnEnter();
+
+            async UniTask Enter()
+            {
                ResourcesLocalComponent.Instance.LoadScene(AssetConst.Assets_DemoGame_GameRes_Scene_MainScene_unity);
+                await CommonHelper.CloseLoadingAsync();
                var mainUI = (MainUI)Global.UIManager.ShowUI(UIType.MainUI);
                mainUI.SetData(MainUI_Callback);
            }

+            Enter().Forget();
+        }
+
        void MainUI_Callback()
        {
            // Global.UIManager.HideUI(UIType.MainUI);
@ -37,10 +45,16 @@ namespace ZC
        }

        private void PlayerMoveToPoint()
+        {
+            async UniTask Close()
            {
                triggerEvent.Dispose();
+                await CommonHelper.OpenLoadingAsync();
                Global.UIManager.HideUI(UIType.BigTipsUI);
                Global.ProcedureManager.ChangeProcedure(ProcedureType.基本资料填写Procedure);
            }
+
+            Close().Forget();
+        }
    }
 }
--- a/Assets/DemoGame/GameScript/Hotfix/UI/Logic/BlackUI.cs
+++ b/Assets/DemoGame/GameScript/Hotfix/UI/Logic/BlackUI.cs
@ -1,7 +1,55 @@
-namespace ZC
+using Cysharp.Threading.Tasks;
+using DG.Tweening;
+using UnityEngine.UI;
+using TMPro;
+
+namespace ZC
 {
    [UIType(UIType.BlackUI)]
    public class BlackUI : UIBase
    {
+        #region AutoGen_InitIon
+
+        public Image img_BG;
+
+        #endregion
+
+        public override void Init()
+        {
+            base.Init();
+
+            #region AutoGen_Init
+
+            img_BG = GetValue<Image>("img_BG");
+
+            #endregion
+        }
+
+        public async UniTask OpenAsync()
+        {
+            img_BG.DOFade(1, 1f);
+            await UniTask.Delay(1000);
+        }
+
+        public async UniTask CloseAsync()
+        {
+            img_BG.DOFade(0, 1f);
+            await UniTask.Delay(1000);
+        }
+
+        #region AutoGen_Method
+
+        #endregion
+
+        public override void Dispose()
+        {
+            base.Dispose();
+
+            #region AutoGen_Dispose
+
+            img_BG = null;
+
+            #endregion
+        }
    }
 }
--- a/Assets/DemoGame/GameScript/Hotfix/UI/Logic/BlackUI.cs.meta
+++ b/Assets/DemoGame/GameScript/Hotfix/UI/Logic/BlackUI.cs.meta
@ -1,3 +1,11 @@
-fileFormatVersion: 2
+fileFormatVersion: 2
 guid: dd9abc3083384dc5a310404193297e5c
-timeCreated: 1730991322
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/DemoGame/GameScript/Hotfix/UI/Logic/ModelDisplayUI.cs
+++ b/Assets/DemoGame/GameScript/Hotfix/UI/Logic/ModelDisplayUI.cs
@ -51,6 +51,7 @@ namespace ZC
            foreach (Transform tran in camera.transform.GetChild(0))
            {
                var itemGo = GameObject.Instantiate(btn_EquipItem.gameObject, btn_EquipItem.transform.parent);
+                itemGo.gameObject.SetActive(true);
                var binding = itemGo.GetComponent<GameObjectBinding>();
                binding.GetValue<Button>("btn_EquipItem").onClick.AddListener(() =>
                {
--- a/Assets/DemoGame/GameScript/Loader/Global.cs
+++ b/Assets/DemoGame/GameScript/Loader/Global.cs
@ -112,6 +112,7 @@ namespace Unity.Loader
            
            //
            CreateUI();
+            Global.UIManager.ShowUI(UIType.BlackUI);

            _isInitFinish = true;
            this._procedureManager.ChangeProcedure(ProcedureType.首页Procedure);
@ -122,12 +123,12 @@ namespace Unity.Loader
            UIGameObjectFactory.CreateUI<AnalysisReportUI>(UIType.AnalysisReportUI,AssetConst.Assets_DemoGame_GameRes_UIPanel_UIAnalysisReport_prefab,UILayer.Mid);
            UIGameObjectFactory.CreateUI<BasicInformationUI>(UIType.BasicInformationUI,AssetConst.Assets_DemoGame_GameRes_UIPanel_UIBasicInformation_prefab,UILayer.Mid);
            UIGameObjectFactory.CreateUI<BigTipsUI>(UIType.BigTipsUI,AssetConst.Assets_DemoGame_GameRes_UIPanel_UIBigTips_prefab,UILayer.Mid);
-            UIGameObjectFactory.CreateUI<BlackUI>(UIType.BlackUI,AssetConst.Assets_DemoGame_GameRes_UIPanel_UIBlack_prefab,UILayer.Mid);
+            UIGameObjectFactory.CreateUI<BlackUI>(UIType.BlackUI,AssetConst.Assets_DemoGame_GameRes_UIPanel_UIBlack_prefab,UILayer.High);
            UIGameObjectFactory.CreateUI<DialogueUI>(UIType.DialogueUI,AssetConst.Assets_DemoGame_GameRes_UIPanel_UIDialogue_prefab,UILayer.Mid);
            UIGameObjectFactory.CreateUI<IntroduceUI>(UIType.IntroduceUI,AssetConst.Assets_DemoGame_GameRes_UIPanel_UIIntroduce_prefab,UILayer.Mid);
            UIGameObjectFactory.CreateUI<MainUI>(UIType.MainUI,AssetConst.Assets_DemoGame_GameRes_UIPanel_UIMain_prefab,UILayer.Mid);
            UIGameObjectFactory.CreateUI<MinTipsUI>(UIType.MinTipsUI,AssetConst.Assets_DemoGame_GameRes_UIPanel_UIMinTips_prefab,UILayer.Mid);
-            UIGameObjectFactory.CreateUI<TaskListUI>(UIType.TaskListUI,AssetConst.Assets_DemoGame_GameRes_UIPanel_UITaskList_prefab,UILayer.Mid);
+            UIGameObjectFactory.CreateUI<TaskListUI>(UIType.TaskListUI,AssetConst.Assets_DemoGame_GameRes_UIPanel_UITaskList_prefab,UILayer.Low);
            UIGameObjectFactory.CreateUI<UrineSamplingUI>(UIType.UrineSamplingUI,AssetConst.Assets_DemoGame_GameRes_UIPanel_UIUrineSampling_prefab,UILayer.Mid);
            UIGameObjectFactory.CreateUI<ModelDisplayUI>(UIType.ModelDisplayUI,AssetConst.Assets_DemoGame_GameRes_UIPanel_UIModelDisplay_prefab,UILayer.Mid);
            UIGameObjectFactory.CreateUI<AnswerUI>(UIType.AnswerUI,AssetConst.Assets_DemoGame_GameRes_UIPanel_UIAnswer_prefab,UILayer.Mid);
--- a/Assets/Scenes/Init.unity
+++ b/Assets/Scenes/Init.unity
@ -38,7 +38,6 @@ RenderSettings:
  m_ReflectionIntensity: 1
  m_CustomReflection: {fileID: 0}
  m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1}
  m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
@ -863,6 +862,108 @@ MonoBehaviour:
  m_EditorClassIdentifier: 
  playMode: 0
  packageName: DefaultPackage
+--- !u!1 &373951722
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 373951726}
+  - component: {fileID: 373951725}
+  - component: {fileID: 373951724}
+  - component: {fileID: 373951723}
+  m_Layer: 5
+  m_Name: Canvas
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &373951723
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 373951722}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IgnoreReversedGraphics: 1
+  m_BlockingObjects: 0
+  m_BlockingMask:
+    serializedVersion: 2
+    m_Bits: 119
+--- !u!114 &373951724
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 373951722}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_UiScaleMode: 0
+  m_ReferencePixelsPerUnit: 100
+  m_ScaleFactor: 1
+  m_ReferenceResolution: {x: 800, y: 600}
+  m_ScreenMatchMode: 0
+  m_MatchWidthOrHeight: 0
+  m_PhysicalUnit: 3
+  m_FallbackScreenDPI: 96
+  m_DefaultSpriteDPI: 96
+  m_DynamicPixelsPerUnit: 1
+  m_PresetInfoIsWorld: 0
+--- !u!223 &373951725
+Canvas:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 373951722}
+  m_Enabled: 1
+  serializedVersion: 3
+  m_RenderMode: 0
+  m_Camera: {fileID: 0}
+  m_PlaneDistance: 100
+  m_PixelPerfect: 0
+  m_ReceivesEvents: 1
+  m_OverrideSorting: 0
+  m_OverridePixelPerfect: 0
+  m_SortingBucketNormalizedSize: 0
+  m_VertexColorAlwaysGammaSpace: 0
+  m_AdditionalShaderChannelsFlag: 0
+  m_UpdateRectTransformForStandalone: 0
+  m_SortingLayerID: 0
+  m_SortingOrder: 100
+  m_TargetDisplay: 0
+--- !u!224 &373951726
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 373951722}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 0, y: 0, z: 0}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 615138896}
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0, y: 0}
 --- !u!1 &391156909
 GameObject:
  m_ObjectHideFlags: 0
@ -1032,7 +1133,7 @@ RectTransform:
  m_Father: {fileID: 1770513432}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 0}
  m_AnchoredPosition: {x: 0, y: 0}
  m_SizeDelta: {x: 114.3303, y: 0}
  m_Pivot: {x: 0.5, y: 0.5}
@ -1074,6 +1175,81 @@ CanvasRenderer:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 398980808}
  m_CullTransparentMesh: 1
+--- !u!1 &615138895
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 615138896}
+  - component: {fileID: 615138898}
+  - component: {fileID: 615138897}
+  m_Layer: 5
+  m_Name: Image
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &615138896
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 615138895}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 373951726}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &615138897
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 615138895}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0, g: 0, b: 0, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!222 &615138898
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 615138895}
+  m_CullTransparentMesh: 1
 --- !u!1 &767437780
 GameObject:
  m_ObjectHideFlags: 0
@ -1093,7 +1269,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &767437781
 RectTransform:
  m_ObjectHideFlags: 0
@ -1803,8 +1979,8 @@ GameObject:
  m_Component:
  - component: {fileID: 1098682773}
  - component: {fileID: 1098682776}
-  - component: {fileID: 1098682775}
  - component: {fileID: 1098682777}
+  - component: {fileID: 1098682778}
  m_Layer: 5
  m_Name: Hid
  m_TagString: Untagged
@ -1832,36 +2008,6 @@ RectTransform:
  m_AnchoredPosition: {x: 0, y: 0}
  m_SizeDelta: {x: 0, y: 0}
  m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1098682775
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1098682772}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 0}
-  m_RaycastTarget: 0
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Sprite: {fileID: 0}
-  m_Type: 1
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
 --- !u!222 &1098682776
 CanvasRenderer:
  m_ObjectHideFlags: 0
@ -1882,6 +2028,29 @@ CanvasGroup:
  m_Interactable: 1
  m_BlocksRaycasts: 1
  m_IgnoreParentGroups: 0
+--- !u!223 &1098682778
+Canvas:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1098682772}
+  m_Enabled: 1
+  serializedVersion: 3
+  m_RenderMode: 2
+  m_Camera: {fileID: 0}
+  m_PlaneDistance: 100
+  m_PixelPerfect: 0
+  m_ReceivesEvents: 1
+  m_OverrideSorting: 1
+  m_OverridePixelPerfect: 0
+  m_SortingBucketNormalizedSize: 0
+  m_VertexColorAlwaysGammaSpace: 0
+  m_AdditionalShaderChannelsFlag: 25
+  m_UpdateRectTransformForStandalone: 0
+  m_SortingLayerID: 0
+  m_SortingOrder: 40
+  m_TargetDisplay: 0
 --- !u!1 &1120902180
 GameObject:
  m_ObjectHideFlags: 0
@ -2281,8 +2450,8 @@ GameObject:
  m_Component:
  - component: {fileID: 1217771107}
  - component: {fileID: 1217771110}
-  - component: {fileID: 1217771109}
  - component: {fileID: 1217771111}
+  - component: {fileID: 1217771112}
  m_Layer: 5
  m_Name: Mid
  m_TagString: Untagged
@ -2309,36 +2478,6 @@ RectTransform:
  m_AnchoredPosition: {x: 0, y: 0}
  m_SizeDelta: {x: 0, y: 0}
  m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1217771109
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1217771106}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 0}
-  m_RaycastTarget: 0
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Sprite: {fileID: 0}
-  m_Type: 1
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
 --- !u!222 &1217771110
 CanvasRenderer:
  m_ObjectHideFlags: 0
@ -2359,6 +2498,29 @@ CanvasGroup:
  m_Interactable: 1
  m_BlocksRaycasts: 1
  m_IgnoreParentGroups: 0
+--- !u!223 &1217771112
+Canvas:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1217771106}
+  m_Enabled: 1
+  serializedVersion: 3
+  m_RenderMode: 2
+  m_Camera: {fileID: 0}
+  m_PlaneDistance: 100
+  m_PixelPerfect: 0
+  m_ReceivesEvents: 1
+  m_OverrideSorting: 1
+  m_OverridePixelPerfect: 0
+  m_SortingBucketNormalizedSize: 0
+  m_VertexColorAlwaysGammaSpace: 0
+  m_AdditionalShaderChannelsFlag: 0
+  m_UpdateRectTransformForStandalone: 0
+  m_SortingLayerID: 0
+  m_SortingOrder: 30
+  m_TargetDisplay: 0
 --- !u!1 &1258592573
 GameObject:
  m_ObjectHideFlags: 0
@ -2369,8 +2531,8 @@ GameObject:
  m_Component:
  - component: {fileID: 1258592574}
  - component: {fileID: 1258592577}
-  - component: {fileID: 1258592576}
  - component: {fileID: 1258592578}
+  - component: {fileID: 1258592579}
  m_Layer: 5
  m_Name: Min
  m_TagString: Untagged
@ -2397,36 +2559,6 @@ RectTransform:
  m_AnchoredPosition: {x: 0, y: 0}
  m_SizeDelta: {x: 0, y: 0}
  m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1258592576
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1258592573}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 0}
-  m_RaycastTarget: 0
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Sprite: {fileID: 0}
-  m_Type: 1
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
 --- !u!222 &1258592577
 CanvasRenderer:
  m_ObjectHideFlags: 0
@ -2447,6 +2579,29 @@ CanvasGroup:
  m_Interactable: 1
  m_BlocksRaycasts: 1
  m_IgnoreParentGroups: 0
+--- !u!223 &1258592579
+Canvas:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1258592573}
+  m_Enabled: 1
+  serializedVersion: 3
+  m_RenderMode: 2
+  m_Camera: {fileID: 0}
+  m_PlaneDistance: 100
+  m_PixelPerfect: 0
+  m_ReceivesEvents: 1
+  m_OverrideSorting: 1
+  m_OverridePixelPerfect: 0
+  m_SortingBucketNormalizedSize: 0
+  m_VertexColorAlwaysGammaSpace: 0
+  m_AdditionalShaderChannelsFlag: 0
+  m_UpdateRectTransformForStandalone: 0
+  m_SortingLayerID: 0
+  m_SortingOrder: 10
+  m_TargetDisplay: 0
 --- !u!1 &1419415540
 GameObject:
  m_ObjectHideFlags: 0
@ -2770,7 +2925,7 @@ RectTransform:
  m_Father: {fileID: 1923750501}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 0}
  m_AnchoredPosition: {x: 0, y: 0}
  m_SizeDelta: {x: 10, y: 0}
  m_Pivot: {x: 0.5, y: 0.5}
@ -2901,8 +3056,8 @@ GameObject:
  m_Component:
  - component: {fileID: 1714431311}
  - component: {fileID: 1714431314}
-  - component: {fileID: 1714431313}
  - component: {fileID: 1714431315}
+  - component: {fileID: 1714431316}
  m_Layer: 5
  m_Name: Low
  m_TagString: Untagged
@ -2929,36 +3084,6 @@ RectTransform:
  m_AnchoredPosition: {x: 0, y: 0}
  m_SizeDelta: {x: 0, y: 0}
  m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1714431313
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1714431310}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 0}
-  m_RaycastTarget: 0
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Sprite: {fileID: 0}
-  m_Type: 1
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
 --- !u!222 &1714431314
 CanvasRenderer:
  m_ObjectHideFlags: 0
@ -2979,6 +3104,29 @@ CanvasGroup:
  m_Interactable: 1
  m_BlocksRaycasts: 1
  m_IgnoreParentGroups: 0
+--- !u!223 &1714431316
+Canvas:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1714431310}
+  m_Enabled: 1
+  serializedVersion: 3
+  m_RenderMode: 2
+  m_Camera: {fileID: 0}
+  m_PlaneDistance: 100
+  m_PixelPerfect: 0
+  m_ReceivesEvents: 1
+  m_OverrideSorting: 1
+  m_OverridePixelPerfect: 0
+  m_SortingBucketNormalizedSize: 0
+  m_VertexColorAlwaysGammaSpace: 0
+  m_AdditionalShaderChannelsFlag: 0
+  m_UpdateRectTransformForStandalone: 0
+  m_SortingLayerID: 0
+  m_SortingOrder: 20
+  m_TargetDisplay: 0
 --- !u!1 &1735912526
 GameObject:
  m_ObjectHideFlags: 0
@ -4003,4 +4151,5 @@ SceneRoots:
  m_Roots:
  - {fileID: 71194200}
  - {fileID: 1419415542}
+  - {fileID: 373951726}
  - {fileID: 345598784}