From c1dc76d2d42e87837671549067c12555d1bcf80b Mon Sep 17 00:00:00 2001 From: zc <1062808664@qq.com> Date: Wed, 4 Dec 2024 23:54:19 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=BB=91=E5=B1=8F=E8=BF=87?= =?UTF-8?q?=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DemoGame/GameRes/UIPanel/UIBlack.prefab | 14 +- .../GameScript/Hotfix/Helper/CommonHelper.cs | 13 + .../Procedure/Logic/体格检查Procedure.cs | 29 +- .../Logic/基本资料填写Procedure.cs | 38 +- .../常规血液与尿液分析Procedure.cs | 23 +- .../Logic/返回体检场景Procedure.cs | 12 +- .../Hotfix/Procedure/Logic/首页Procedure.cs | 26 +- .../GameScript/Hotfix/UI/Logic/BlackUI.cs | 50 ++- .../Hotfix/UI/Logic/BlackUI.cs.meta | 12 +- .../Hotfix/UI/Logic/ModelDisplayUI.cs | 1 + Assets/DemoGame/GameScript/Loader/Global.cs | 5 +- Assets/Scenes/Init.unity | 405 ++++++++++++------ 12 files changed, 453 insertions(+), 175 deletions(-) diff --git a/Assets/DemoGame/GameRes/UIPanel/UIBlack.prefab b/Assets/DemoGame/GameRes/UIPanel/UIBlack.prefab index aec7a61..9041fa5 100644 --- 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} diff --git a/Assets/DemoGame/GameScript/Hotfix/Helper/CommonHelper.cs b/Assets/DemoGame/GameScript/Hotfix/Helper/CommonHelper.cs index e972d12..079df7a 100644 --- 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(UIType.BlackUI); + await blackUI.OpenAsync(); + } + + public static async UniTask CloseLoadingAsync() + { + var blackUI = Global.UIManager.GetUI(UIType.BlackUI); + await blackUI.CloseAsync(); + } } } \ No newline at end of file diff --git a/Assets/DemoGame/GameScript/Hotfix/Procedure/Logic/体格检查Procedure.cs b/Assets/DemoGame/GameScript/Hotfix/Procedure/Logic/体格检查Procedure.cs index 746b9b1..c2b485f 100644 --- 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,13 +9,21 @@ namespace ZC class 体格检查Procedure : ProcedureBase { TriggerEvent triggerEvent; + public override void OnEnter() { base.OnEnter(); - ResourcesLocalComponent.Instance.LoadScene(AssetConst.Assets_DemoGame_GameRes_Scene_HuShiTaiScene_unity); - var introduceUI = (IntroduceUI)Global.UIManager.ShowUI(UIType.IntroduceUI); - introduceUI.SetData(ConstStr.体格检查, ConstStr.体格检查介绍, IntroduceUI_Callback); + 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() @@ -31,9 +40,15 @@ namespace ZC private void PlayerMoveToPoint() { - triggerEvent.Dispose(); - Global.UIManager.HideUI(UIType.BigTipsUI); - Global.ProcedureManager.ChangeProcedure(ProcedureType.常规血液与尿液分析Procedure); + async UniTask Close() + { + triggerEvent.Dispose(); + await CommonHelper.OpenLoadingAsync(); + Global.UIManager.HideUI(UIType.BigTipsUI); + Global.ProcedureManager.ChangeProcedure(ProcedureType.常规血液与尿液分析Procedure); + } + + Close().Forget(); } } } \ No newline at end of file diff --git a/Assets/DemoGame/GameScript/Hotfix/Procedure/Logic/基本资料填写Procedure.cs b/Assets/DemoGame/GameScript/Hotfix/Procedure/Logic/基本资料填写Procedure.cs index 7988e93..bb40656 100644 --- 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(); - ResourcesLocalComponent.Instance.LoadScene(AssetConst.Assets_DemoGame_GameRes_Scene_LiaoTianScene_unity); - CommonHelper.GetSceneBindingAsync((bind) => + + async UniTask Enter() { - this.binding = bind; - binding = GameObject.FindObjectOfType(); - go = binding.GetValue("老人"); - go.OpenHighlight(); - go.AddEventTrigger(EventTriggerType.PointerClick, ClickHiglight); - }).Forget(); + ResourcesLocalComponent.Instance.LoadScene(AssetConst.Assets_DemoGame_GameRes_Scene_LiaoTianScene_unity); + await CommonHelper.CloseLoadingAsync(); + + await CommonHelper.GetSceneBindingAsync((bind) => + { + this.binding = bind; + binding = GameObject.FindObjectOfType(); + go = binding.GetValue("老人"); + go.OpenHighlight(); + go.AddEventTrigger(EventTriggerType.PointerClick, ClickHiglight); + }); + } + + Enter().Forget(); } private void ClickHiglight(BaseEventData arg0) @@ -189,10 +197,16 @@ namespace ZC private void IntroduceUI_Callback() { - Global.UIManager.HideUI(UIType.DialogueUI); - Global.UIManager.HideUI(UIType.IntroduceUI); - Global.UIManager.HideUI(UIType.BasicInformationUI); - Global.ProcedureManager.ChangeProcedure(ProcedureType.体格检查Procedure); + 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(); } } } \ No newline at end of file diff --git a/Assets/DemoGame/GameScript/Hotfix/Procedure/Logic/常规血液与尿液分析Procedure.cs b/Assets/DemoGame/GameScript/Hotfix/Procedure/Logic/常规血液与尿液分析Procedure.cs index c734197..ad6091f 100644 --- a/Assets/DemoGame/GameScript/Hotfix/Procedure/Logic/常规血液与尿液分析Procedure.cs +++ b/Assets/DemoGame/GameScript/Hotfix/Procedure/Logic/常规血液与尿液分析Procedure.cs @@ -13,10 +13,17 @@ namespace ZC public override void OnEnter() { base.OnEnter(); - ResourcesLocalComponent.Instance.LoadScene(AssetConst.Assets_DemoGame_GameRes_Scene_ChouXueScene_unity); - var introduceUI = (IntroduceUI)Global.UIManager.ShowUI(UIType.IntroduceUI); - introduceUI.SetData(ConstStr.常规血液与尿液分析, ConstStr.常规血液与尿液分析介绍, IntroduceUI_Callback); + 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() @@ -108,8 +115,14 @@ namespace ZC private void AnswerUI_Callback() { - Global.UIManager.CloseLast(); - Global.ProcedureManager.ChangeProcedure(ProcedureType.返回体检场景Procedure); + async UniTask Close() + { + await CommonHelper.OpenLoadingAsync(); + Global.UIManager.CloseLast(); + Global.ProcedureManager.ChangeProcedure(ProcedureType.返回体检场景Procedure); + } + + Close().Forget(); } } } \ No newline at end of file diff --git a/Assets/DemoGame/GameScript/Hotfix/Procedure/Logic/返回体检场景Procedure.cs b/Assets/DemoGame/GameScript/Hotfix/Procedure/Logic/返回体检场景Procedure.cs index a88644f..4aa33dc 100644 --- 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(); - ResourcesLocalComponent.Instance.LoadScene(AssetConst.Assets_DemoGame_GameRes_Scene_HuShiTaiScene_unity); + async UniTask Enter() + { + ResourcesLocalComponent.Instance.LoadScene(AssetConst.Assets_DemoGame_GameRes_Scene_HuShiTaiScene_unity); + await CommonHelper.CloseLoadingAsync(); + } + Enter().Forget(); } } } \ No newline at end of file diff --git a/Assets/DemoGame/GameScript/Hotfix/Procedure/Logic/首页Procedure.cs b/Assets/DemoGame/GameScript/Hotfix/Procedure/Logic/首页Procedure.cs index f213747..5f4205a 100644 --- a/Assets/DemoGame/GameScript/Hotfix/Procedure/Logic/首页Procedure.cs +++ b/Assets/DemoGame/GameScript/Hotfix/Procedure/Logic/首页Procedure.cs @@ -8,12 +8,20 @@ namespace ZC class 首页Procedure : ProcedureBase { TriggerEvent triggerEvent; + public override void OnEnter() { base.OnEnter(); - ResourcesLocalComponent.Instance.LoadScene(AssetConst.Assets_DemoGame_GameRes_Scene_MainScene_unity); - var mainUI = (MainUI)Global.UIManager.ShowUI(UIType.MainUI); - mainUI.SetData(MainUI_Callback); + + 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() @@ -38,9 +46,15 @@ namespace ZC private void PlayerMoveToPoint() { - triggerEvent.Dispose(); - Global.UIManager.HideUI(UIType.BigTipsUI); - Global.ProcedureManager.ChangeProcedure(ProcedureType.基本资料填写Procedure); + async UniTask Close() + { + triggerEvent.Dispose(); + await CommonHelper.OpenLoadingAsync(); + Global.UIManager.HideUI(UIType.BigTipsUI); + Global.ProcedureManager.ChangeProcedure(ProcedureType.基本资料填写Procedure); + } + + Close().Forget(); } } } \ No newline at end of file diff --git a/Assets/DemoGame/GameScript/Hotfix/UI/Logic/BlackUI.cs b/Assets/DemoGame/GameScript/Hotfix/UI/Logic/BlackUI.cs index 4b1e8a1..262e1c5 100644 --- 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("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 + } } } \ No newline at end of file diff --git a/Assets/DemoGame/GameScript/Hotfix/UI/Logic/BlackUI.cs.meta b/Assets/DemoGame/GameScript/Hotfix/UI/Logic/BlackUI.cs.meta index 1278821..11c8b83 100644 --- 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 \ No newline at end of file +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/DemoGame/GameScript/Hotfix/UI/Logic/ModelDisplayUI.cs b/Assets/DemoGame/GameScript/Hotfix/UI/Logic/ModelDisplayUI.cs index df516a4..9ecfeb9 100644 --- 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(); binding.GetValue