fix：完善逻辑

2024-12-02 17:42:16 +08:00 · 2024-12-02 17:42:16 +08:00 · 57bdc1d992
parent d2a985b4de
commit 57bdc1d992
12 changed files with 290 additions and 35 deletions
--- a/Assets/DemoGame/GameRes/Scene/ChouXueScene.unity
+++ b/Assets/DemoGame/GameRes/Scene/ChouXueScene.unity
@ -38,6 +38,7 @@ 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:
@ -274,6 +275,8 @@ MonoBehaviour:
  Datas:
  - name: "\u5E38\u89C4\u8840\u6DB2\u4E0E\u5C3F\u6DB2\u5206\u6790\u70B9"
    go: {fileID: 1194776732}
+  - name: "\u5C3F\u6DB2\u53D6\u6837\u70B9"
+    go: {fileID: 1191143519}
 --- !u!4 &368766239
 Transform:
  m_ObjectHideFlags: 0
@ -800,8 +803,67 @@ PrefabInstance:
    m_RemovedComponents: []
    m_RemovedGameObjects: []
    m_AddedGameObjects: []
-    m_AddedComponents: []
+    m_AddedComponents:
+    - targetCorrespondingSourceObject: {fileID: 666602370706033372, guid: a38545e6d570a6941833d61c7a894f15, type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 1438550277}
+    - targetCorrespondingSourceObject: {fileID: -7334406490737183551, guid: a38545e6d570a6941833d61c7a894f15, type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 1438550276}
  m_SourcePrefab: {fileID: 100100000, guid: a38545e6d570a6941833d61c7a894f15, type: 3}
+--- !u!1 &1438550274 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: -7334406490737183551, guid: a38545e6d570a6941833d61c7a894f15, type: 3}
+  m_PrefabInstance: {fileID: 1438550273}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1 &1438550275 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 666602370706033372, guid: a38545e6d570a6941833d61c7a894f15, type: 3}
+  m_PrefabInstance: {fileID: 1438550273}
+  m_PrefabAsset: {fileID: 0}
+--- !u!65 &1438550276
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1438550274}
+  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_IsTrigger: 0
+  m_ProvidesContacts: 0
+  m_Enabled: 1
+  serializedVersion: 3
+  m_Size: {x: 3.4800003, y: 5.480002, z: 0.0100000035}
+  m_Center: {x: 0, y: 0, z: 0.0050000018}
+--- !u!64 &1438550277
+MeshCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1438550275}
+  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_IsTrigger: 0
+  m_ProvidesContacts: 0
+  m_Enabled: 1
+  serializedVersion: 5
+  m_Convex: 0
+  m_CookingOptions: 30
+  m_Mesh: {fileID: -7553716758358721678, guid: a38545e6d570a6941833d61c7a894f15, type: 3}
 --- !u!1 &1543823431
 GameObject:
  m_ObjectHideFlags: 0
--- a/Assets/DemoGame/GameRes/Scene/HuShiTaiScene.unity
+++ b/Assets/DemoGame/GameRes/Scene/HuShiTaiScene.unity
@ -38,6 +38,7 @@ 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:
@ -504,15 +505,112 @@ PrefabInstance:
      propertyPath: m_LocalEulerAnglesHint.z
      value: 0
      objectReference: {fileID: 0}
+    - target: {fileID: -2277309834036754802, guid: e914bc0d78dc26844b337223bfaba583, type: 3}
+      propertyPath: m_Enabled
+      value: 1
+      objectReference: {fileID: 0}
    - target: {fileID: 919132149155446097, guid: e914bc0d78dc26844b337223bfaba583, type: 3}
      propertyPath: m_Name
      value: 03
      objectReference: {fileID: 0}
+    - target: {fileID: 7510385977639289135, guid: e914bc0d78dc26844b337223bfaba583, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
    m_RemovedComponents: []
    m_RemovedGameObjects: []
    m_AddedGameObjects: []
-    m_AddedComponents: []
+    m_AddedComponents:
+    - targetCorrespondingSourceObject: {fileID: -2917118976797415121, guid: e914bc0d78dc26844b337223bfaba583, type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 1933276505}
+    - targetCorrespondingSourceObject: {fileID: 2588606950836171102, guid: e914bc0d78dc26844b337223bfaba583, type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 1933276504}
+    - targetCorrespondingSourceObject: {fileID: 7026343843153984662, guid: e914bc0d78dc26844b337223bfaba583, type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 1933276503}
  m_SourcePrefab: {fileID: 100100000, guid: e914bc0d78dc26844b337223bfaba583, type: 3}
+--- !u!1 &1933276500 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 7026343843153984662, guid: e914bc0d78dc26844b337223bfaba583, type: 3}
+  m_PrefabInstance: {fileID: 1933276499}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1 &1933276501 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 2588606950836171102, guid: e914bc0d78dc26844b337223bfaba583, type: 3}
+  m_PrefabInstance: {fileID: 1933276499}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1 &1933276502 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: -2917118976797415121, guid: e914bc0d78dc26844b337223bfaba583, type: 3}
+  m_PrefabInstance: {fileID: 1933276499}
+  m_PrefabAsset: {fileID: 0}
+--- !u!65 &1933276503
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1933276500}
+  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_IsTrigger: 0
+  m_ProvidesContacts: 0
+  m_Enabled: 1
+  serializedVersion: 3
+  m_Size: {x: 11.393034, y: 17.985966, z: 0}
+  m_Center: {x: 0.696517, y: -1.7285646, z: 0}
+--- !u!64 &1933276504
+MeshCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1933276501}
+  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_IsTrigger: 0
+  m_ProvidesContacts: 0
+  m_Enabled: 1
+  serializedVersion: 5
+  m_Convex: 0
+  m_CookingOptions: 30
+  m_Mesh: {fileID: 3009663438640755768, guid: e914bc0d78dc26844b337223bfaba583, type: 3}
+--- !u!64 &1933276505
+MeshCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1933276502}
+  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_IsTrigger: 0
+  m_ProvidesContacts: 0
+  m_Enabled: 1
+  serializedVersion: 5
+  m_Convex: 0
+  m_CookingOptions: 30
+  m_Mesh: {fileID: -4146931179504492528, guid: e914bc0d78dc26844b337223bfaba583, type: 3}
 --- !u!1 &2057956786
 GameObject:
  m_ObjectHideFlags: 0
--- a/Assets/DemoGame/GameRes/Scene/LiaoTianScene.unity
+++ b/Assets/DemoGame/GameRes/Scene/LiaoTianScene.unity
@ -38,6 +38,7 @@ 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:
@ -170,6 +171,10 @@ PrefabInstance:
      propertyPath: m_LocalEulerAnglesHint.z
      value: 0
      objectReference: {fileID: 0}
+    - target: {fileID: -3530722532248670027, guid: 5c8e29627ef528f4a886003943114f80, type: 3}
+      propertyPath: m_Enabled
+      value: 1
+      objectReference: {fileID: 0}
    - target: {fileID: 919132149155446097, guid: 5c8e29627ef528f4a886003943114f80, type: 3}
      propertyPath: m_Name
      value: 02
@ -182,6 +187,12 @@ PrefabInstance:
    m_RemovedGameObjects: []
    m_AddedGameObjects: []
    m_AddedComponents:
+    - targetCorrespondingSourceObject: {fileID: -2917118976797415121, guid: 5c8e29627ef528f4a886003943114f80, type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 67294482}
+    - targetCorrespondingSourceObject: {fileID: 2588606950836171102, guid: 5c8e29627ef528f4a886003943114f80, type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 67294481}
    - targetCorrespondingSourceObject: {fileID: 7026343843153984662, guid: 5c8e29627ef528f4a886003943114f80, type: 3}
      insertIndex: -1
      addedObject: {fileID: 67294478}
@ -212,6 +223,60 @@ BoxCollider:
  serializedVersion: 3
  m_Size: {x: 14.1772175, y: 12.664554, z: 0}
  m_Center: {x: -2.088609, y: -1.332276, z: 0}
+--- !u!1 &67294479 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 2588606950836171102, guid: 5c8e29627ef528f4a886003943114f80, type: 3}
+  m_PrefabInstance: {fileID: 67294476}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1 &67294480 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: -2917118976797415121, guid: 5c8e29627ef528f4a886003943114f80, type: 3}
+  m_PrefabInstance: {fileID: 67294476}
+  m_PrefabAsset: {fileID: 0}
+--- !u!64 &67294481
+MeshCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 67294479}
+  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_IsTrigger: 0
+  m_ProvidesContacts: 0
+  m_Enabled: 1
+  serializedVersion: 5
+  m_Convex: 0
+  m_CookingOptions: 30
+  m_Mesh: {fileID: 3009663438640755768, guid: 5c8e29627ef528f4a886003943114f80, type: 3}
+--- !u!64 &67294482
+MeshCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 67294480}
+  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_IsTrigger: 0
+  m_ProvidesContacts: 0
+  m_Enabled: 1
+  serializedVersion: 5
+  m_Convex: 0
+  m_CookingOptions: 30
+  m_Mesh: {fileID: -4146931179504492528, guid: 5c8e29627ef528f4a886003943114f80, type: 3}
 --- !u!1 &731266090
 GameObject:
  m_ObjectHideFlags: 0
--- a/Assets/DemoGame/GameRes/UIPanel/UIModelDisplay.prefab
+++ b/Assets/DemoGame/GameRes/UIPanel/UIModelDisplay.prefab
@ -338,7 +338,7 @@ MonoBehaviour:
  Datas:
  - name: btn_EquipItem
    go: {fileID: 1736183138085325245}
-  - name: txt_LeftName
+  - name: txt_EquipItemName
    go: {fileID: 6574151432076934515}
 --- !u!1 &2283451047794573686
 GameObject:
--- a/Assets/DemoGame/GameScript/Hotfix/Data/ConstStr.cs
+++ b/Assets/DemoGame/GameScript/Hotfix/Data/ConstStr.cs
@ -45,6 +45,7 @@
        public static string 是否有特殊的饮食要求 = "是否有特殊的饮食要求";
        public static string 是否有宗教信仰 = "是否有宗教信仰";
        public static string 其他需要补充的信息 = "其他需要补充的信息";
+        public static string 患者签名 = "患者签名";
        // tiwen
        public static string 姓名提问 = "姓名提问 ";
        public static string 性别提问 = "性别提问 ";
@ -77,6 +78,7 @@
        public static string 是否有特殊的饮食要求提问 = "是否有特殊的饮食要求提问 ";
        public static string 是否有宗教信仰提问 = "是否有宗教信仰提问 ";
        public static string 其他需要补充的信息提问 = "其他需要补充的信息提问 ";
+        public static string 患者签名提问 = "患者签名提问 ";
        // huida
        public static string 姓名回答 = "姓名回答 ";
        public static string 性别回答 = "性别回答 ";
@ -109,5 +111,6 @@
        public static string 是否有特殊的饮食要求回答 = "是否有特殊的饮食要求回答 ";
        public static string 是否有宗教信仰回答 = "是否有宗教信仰回答 ";
        public static string 其他需要补充的信息回答 = "其他需要补充的信息回答 ";
+        public static string 患者签名回答 = "患者签名回答 ";
    }
 }
--- a/Assets/DemoGame/GameScript/Hotfix/Other/TriggerEvent.cs
+++ b/Assets/DemoGame/GameScript/Hotfix/Other/TriggerEvent.cs
@ -21,5 +21,10 @@ namespace ZC
            this.targetName = target;
            this.callback = callback;
        }
+
+        public void Dispose()
+        {
+            Destroy(this);
+        }
    }
 }
--- a/Assets/DemoGame/GameScript/Hotfix/Procedure/Logic/体格检查Procedure.cs
+++ b/Assets/DemoGame/GameScript/Hotfix/Procedure/Logic/体格检查Procedure.cs
@ -12,14 +12,14 @@ namespace ZC
            base.OnEnter();
            ResourcesLocalComponent.Instance.LoadScene(AssetConst.Assets_DemoGame_GameRes_Scene_HuShiTaiScene_unity);

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

        private void IntroduceUI_Callback()
        {
            Global.UIManager.HideUI(UIType.IntroduceUI);
-            var bigTipsUI = (BigTipsUI)Global.UIManager.ShowOnlyUI(UIType.BigTipsUI);
+            var bigTipsUI = (BigTipsUI)Global.UIManager.ShowUI(UIType.BigTipsUI);
            bigTipsUI.SetData(ConstStr.移动到护士身边进行老人的体格检查);

            var binding = GameObject.FindObjectOfType<SceneGameObjectBinding>();
@ -31,14 +31,7 @@ namespace ZC
        private void PlayerMoveToPoint()
        {
            Global.UIManager.HideUI(UIType.BigTipsUI);
-            var introduceUI = (IntroduceUI)Global.UIManager.ShowOnlyUI(UIType.IntroduceUI);
-            introduceUI.SetData(ConstStr.常规血液与尿液分析, ConstStr.常规血液与尿液分析介绍, IntroduceUI1_Callback);
-        }
-
-        private void IntroduceUI1_Callback()
-        {
-            Global.UIManager.HideUI(UIType.IntroduceUI);
-            // var mIntroduceUI = (ModelDisplayUI)Global.UIManager.ShowUI(UIType.ModelDisplayUI);
+            Global.ProcedureManager.ChangeProcedure(ProcedureType.常规血液与尿液分析Procedure);
        }
    }
 }
--- a/Assets/DemoGame/GameScript/Hotfix/Procedure/Logic/基本资料填写Procedure.cs
+++ b/Assets/DemoGame/GameScript/Hotfix/Procedure/Logic/基本资料填写Procedure.cs
@ -32,13 +32,13 @@ namespace ZC
        {
            go.CloseHighlight();
            go.RemoveEventTrigger();
-            var basicInformationUI = (BasicInformationUI)Global.UIManager.ShowOnlyUI(UIType.BasicInformationUI);
+            var basicInformationUI = (BasicInformationUI)Global.UIManager.ShowUI(UIType.BasicInformationUI);
            basicInformationUI.SetData(BasicInformationUI_TianXie, BasicInformationUI_Callback);
        }

        void TiWen(string tiWenContent, string huiDaContent)
        {
-            var dialogueUI = (DialogueUI)Global.UIManager.ShowOnlyUI(UIType.DialogueUI);
+            var dialogueUI = (DialogueUI)Global.UIManager.ShowUI(UIType.DialogueUI);
            dialogueUI.SetData(tiWenContent, () =>
            {
                Global.UIManager.HideUI(UIType.DialogueUI);
@ -48,7 +48,7 @@ namespace ZC

        void HuiDa(string huiDaContent)
        {
-            var dialogueUI = (DialogueUI)Global.UIManager.ShowOnlyUI(UIType.DialogueUI);
+            var dialogueUI = (DialogueUI)Global.UIManager.ShowUI(UIType.DialogueUI);
            dialogueUI.SetData(huiDaContent, () => { Global.UIManager.HideUI(UIType.DialogueUI); });
        }

@ -171,6 +171,10 @@ namespace ZC
                case BasicInformationUIActionType.其他需要补充的信息:
                    TiWen(ConstStr.其他需要补充的信息提问, ConstStr.其他需要补充的信息提问);

+                    break;
+                case BasicInformationUIActionType.患者签名:
+                    TiWen(ConstStr.患者签名提问, ConstStr.患者签名回答);
+
                    break;
                default:
                    throw new ArgumentOutOfRangeException(nameof(obj), obj, null);
@ -179,13 +183,15 @@ namespace ZC

        private void BasicInformationUI_Callback()
        {
-            var introduceUI = (IntroduceUI)Global.UIManager.ShowOnlyUI(UIType.IntroduceUI);
+            var introduceUI = (IntroduceUI)Global.UIManager.ShowUI(UIType.IntroduceUI);
            introduceUI.SetData(ConstStr.基本资料采集内容如下, ConstStr.基本资料采集内容如下介绍, IntroduceUI_Callback);
        }

        private void IntroduceUI_Callback()
        {
+            Global.UIManager.HideUI(UIType.DialogueUI);
            Global.UIManager.HideUI(UIType.IntroduceUI);
+            Global.UIManager.HideUI(UIType.BasicInformationUI);
            Global.ProcedureManager.ChangeProcedure(ProcedureType.体格检查Procedure);
        }
    }
--- a/Assets/DemoGame/GameScript/Hotfix/Procedure/Logic/常规血液与尿液分析Procedure.cs
+++ b/Assets/DemoGame/GameScript/Hotfix/Procedure/Logic/常规血液与尿液分析Procedure.cs
@ -8,43 +8,52 @@ namespace ZC
    class 常规血液与尿液分析Procedure : ProcedureBase
    {
        SceneGameObjectBinding binding;
+        TriggerEvent triggerEvent;

-        public override void Init()
+        public override void OnEnter()
        {
-            base.Init();
+            base.OnEnter();
            ResourcesLocalComponent.Instance.LoadScene(AssetConst.Assets_DemoGame_GameRes_Scene_ChouXueScene_unity);

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

        private void IntroduceUI_Callback()
        {
-            var modelDisplayUI = (ModelDisplayUI)Global.UIManager.ShowOnlyUI(UIType.ModelDisplayUI);
+            Global.UIManager.CloseLast();
+            var modelDisplayUI = (ModelDisplayUI)Global.UIManager.ShowUI(UIType.ModelDisplayUI);
            modelDisplayUI.SetData(ModelDisplayUI_Callback);
        }

        private void ModelDisplayUI_Callback()
        {
-            var minTipsUI = (MinTipsUI)Global.UIManager.ShowOnlyUI(UIType.MinTipsUI);
+            Global.UIManager.CloseLast();
+            var minTipsUI = (MinTipsUI)Global.UIManager.ShowUI(UIType.MinTipsUI);
            minTipsUI.SetData("知识点讲解", "常规血液与尿液分析知识点讲解——设备认知之后的", MinTipsUI_Callback);
        }

        private void MinTipsUI_Callback()
        {
+            Global.UIManager.CloseLast();
            var bigTipsUI = (BigTipsUI)Global.UIManager.ShowOnlyUI(UIType.BigTipsUI);
            bigTipsUI.SetData("移动到护士身边进行常规血液检查");
            var minTipsUI = (MinTipsUI)Global.UIManager.ShowOnlyUI(UIType.MinTipsUI);
-            minTipsUI.SetData("知识点讲解1", "常规血液与尿液分析知识点讲解——设备认知之后的1", () => { Global.UIManager.HideUI(UIType.MinTipsUI); });
+            minTipsUI.SetData("知识点讲解1", "常规血液与尿液分析知识点讲解——设备认知之后的1",
+                () => { Global.UIManager.HideUI(UIType.MinTipsUI); });

            binding = GameObject.FindObjectOfType<SceneGameObjectBinding>();
            var gameObject = binding.GetValue("常规血液检查点");
-            var triggerEvent = gameObject.GetOrAddComponent<TriggerEvent>();
+            triggerEvent = gameObject.GetOrAddComponent<TriggerEvent>();
            triggerEvent.SetData(PlayerMoveToPoint);
        }

        private void PlayerMoveToPoint()
        {
+            Global.UIManager.HideUI(UIType.BigTipsUI);
+            Global.UIManager.HideUI(UIType.MinTipsUI);
+            triggerEvent.Dispose();
+
            // 播放抽血动画
            var minTipsUI = (MinTipsUI)Global.UIManager.ShowOnlyUI(UIType.MinTipsUI);
            minTipsUI.SetData("知识点讲解2", "常规血液与尿液分析知识点讲解——设备认知之后的2 ----------- 播放抽血动画", () =>
@ -58,11 +67,11 @@ namespace ZC
        {
            await UniTask.Delay(3000);

-            var bigTipsUI = (BigTipsUI)Global.UIManager.ShowOnlyUI(UIType.BigTipsUI);
+            var bigTipsUI = (BigTipsUI)Global.UIManager.ShowUI(UIType.BigTipsUI);
            bigTipsUI.SetData("根据箭头指引让老人去进行尿液取样");

            var gameObject = binding.GetValue("尿液取样点");
-            var triggerEvent = gameObject.GetOrAddComponent<TriggerEvent>();
+            triggerEvent = gameObject.GetOrAddComponent<TriggerEvent>();
            triggerEvent.SetData(PlayerMoveToPoint1);
        }

@ -71,26 +80,34 @@ namespace ZC
            // 打开U取样面板
            async UniTask RunAsync()
            {
-                var urineSamplingUI = (UrineSamplingUI)Global.UIManager.ShowOnlyUI(UIType.UrineSamplingUI);
+                Global.UIManager.HideUI(UIType.BigTipsUI);
+                triggerEvent.Dispose();
+
+                var urineSamplingUI = (UrineSamplingUI)Global.UIManager.ShowUI(UIType.UrineSamplingUI);
                urineSamplingUI.SetData(UrineSamplingUI_Callback);
                await UniTask.Delay(3000);
            }
+
+            RunAsync().Forget();
        }

        private void UrineSamplingUI_Callback()
        {
-            var analysisReportUI = (AnalysisReportUI)Global.UIManager.ShowOnlyUI(UIType.AnalysisReportUI);
+            Global.UIManager.CloseLast();
+            var analysisReportUI = (AnalysisReportUI)Global.UIManager.ShowUI(UIType.AnalysisReportUI);
            analysisReportUI.SetData("血常规与尿液分析报告", null, "血常规与尿液分析报告内容", AnalysisReportUI_Callback);
        }

        private void AnalysisReportUI_Callback()
        {
-            var answerUI = (AnswerUI)Global.UIManager.ShowOnlyUI(UIType.AnswerUI);
+            Global.UIManager.CloseLast();
+            var answerUI = (AnswerUI)Global.UIManager.ShowUI(UIType.AnswerUI);
            answerUI.SetData(AnswerUI_Callback);
        }

        private void AnswerUI_Callback()
        {
+            Global.UIManager.CloseLast();
            Global.ProcedureManager.ChangeProcedure(ProcedureType.返回体检场景Procedure);
        }
    }
--- a/Assets/DemoGame/GameScript/Hotfix/Procedure/Logic/返回体检场景Procedure.cs
+++ b/Assets/DemoGame/GameScript/Hotfix/Procedure/Logic/返回体检场景Procedure.cs
@ -3,6 +3,10 @@
    [Procedure(ProcedureType.返回体检场景Procedure)]
    class 返回体检场景Procedure : ProcedureBase
    {
-        
+        public override void OnEnter()
+        {
+            base.OnEnter();
+            ResourcesLocalComponent.Instance.LoadScene(AssetConst.Assets_DemoGame_GameRes_Scene_HuShiTaiScene_unity);
+        }
    }
 }
--- a/Assets/DemoGame/GameScript/Hotfix/Procedure/Logic/首页Procedure.cs
+++ b/Assets/DemoGame/GameScript/Hotfix/Procedure/Logic/首页Procedure.cs
@ -10,22 +10,22 @@ namespace ZC
        {
            base.OnEnter();
            ResourcesLocalComponent.Instance.LoadScene(AssetConst.Assets_DemoGame_GameRes_Scene_MainScene_unity);
-            var mainUI = (MainUI)Global.UIManager.ShowOnlyUI(UIType.MainUI);
+            var mainUI = (MainUI)Global.UIManager.ShowUI(UIType.MainUI);
            mainUI.SetData(MainUI_Callback);
        }

        void MainUI_Callback()
        {
-            Global.UIManager.HideUI(UIType.MainUI);
-            var introduceUI = (IntroduceUI)Global.UIManager.ShowOnlyUI(UIType.IntroduceUI);
+            // Global.UIManager.HideUI(UIType.MainUI);
+            var introduceUI = (IntroduceUI)Global.UIManager.ShowUI(UIType.IntroduceUI);
            introduceUI.SetData(ConstStr.实训目标, ConstStr.实训目标介绍, IntroduceUI_Callback);
        }

        private void IntroduceUI_Callback()
        {
            Global.UIManager.HideUI(UIType.IntroduceUI);
-            Global.UIManager.ShowOnlyUI(UIType.TaskListUI);
-            var bigTipsUI = (BigTipsUI)Global.UIManager.ShowOnlyUI(UIType.BigTipsUI);
+            Global.UIManager.ShowUI(UIType.TaskListUI);
+            var bigTipsUI = (BigTipsUI)Global.UIManager.ShowUI(UIType.BigTipsUI);
            bigTipsUI.SetData(ConstStr.根据箭头指引进入培训中心);
            // 开启箭头碰撞事件并注入回调
            var gameObject = ResourcesLocalComponent.Instance.LoadGameObjectSync(AssetConst
--- a/Assets/DemoGame/GameScript/Hotfix/UI/Logic/MainUI.cs
+++ b/Assets/DemoGame/GameScript/Hotfix/UI/Logic/MainUI.cs
@ -1,6 +1,7 @@
 using System;
 using TMPro;
 using Unity.Loader;
+using UnityEngine;
 using UnityEngine.UI;

 namespace ZC
@ -47,6 +48,7 @@ namespace ZC

        private void OnClickBtnStart()
        {
+            btn_Start.transform.localScale = Vector3.zero;
            _action?.Invoke();
            _action = null;
        }