完成第一三四模块内容

2023-09-18 03:39:32 +08:00 · 2023-09-18 03:39:32 +08:00 · 1c8c362183
parent 2e8ac8aacd
commit 1c8c362183
27 changed files with 1591 additions and 233 deletions
--- a/Assets/AddressableAssetsData/AssetGroups/ZXLAsset.asset
+++ b/Assets/AddressableAssetsData/AssetGroups/ZXLAsset.asset
@ -27,6 +27,11 @@ MonoBehaviour:
    m_ReadOnly: 0
    m_SerializedLabels:
    - default
+  - m_GUID: ad0e516621e60fc4db2d3e37c8ace414
+    m_Address: Assets/UnityTest/ZXL/Timeline
+    m_ReadOnly: 0
+    m_SerializedLabels:
+    - default
  m_ReadOnly: 0
  m_Settings: {fileID: 11400000, guid: ed913c58494404948976a29465fa0b05, type: 2}
  m_SchemaSet:
--- a/Assets/AddressableAssetsData/AssetGroups/ZXLScene.asset
+++ b/Assets/AddressableAssetsData/AssetGroups/ZXLScene.asset
@ -16,12 +16,7 @@ MonoBehaviour:
  m_Data:
    m_SerializedData: []
  m_GUID: f9bf57291b1f1e44fb644fb20ee1d242
-  m_SerializeEntries:
-  - m_GUID: e57a377bbd0310c408cfe216203d5913
-    m_Address: Assets/UnityTest/ZXL/Scene/Main.unity
-    m_ReadOnly: 0
-    m_SerializedLabels:
-    - default
+  m_SerializeEntries: []
  m_ReadOnly: 0
  m_Settings: {fileID: 11400000, guid: ed913c58494404948976a29465fa0b05, type: 2}
  m_SchemaSet:
--- a/Assets/Plugins/Sirenix/Assemblies/AOT/Sirenix.Serialization.AOTGenerated.dll
+++ b/Assets/Plugins/Sirenix/Assemblies/AOT/Sirenix.Serialization.AOTGenerated.dll
--- a/Assets/Plugins/Sirenix/Assemblies/AOT/Sirenix.Serialization.AOTGenerated.dll.meta
+++ b/Assets/Plugins/Sirenix/Assemblies/AOT/Sirenix.Serialization.AOTGenerated.dll.meta
@ -1,33 +0,0 @@
-fileFormatVersion: 2
-guid: 9c0413fa904d5e147a56932da0cdb163
-PluginImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  iconMap: {}
-  executionOrder: {}
-  defineConstraints: []
-  isPreloaded: 0
-  isOverridable: 0
-  isExplicitlyReferenced: 0
-  validateReferences: 1
-  platformData:
-  - first:
-      Any: 
-    second:
-      enabled: 1
-      settings: {}
-  - first:
-      Editor: Editor
-    second:
-      enabled: 0
-      settings:
-        DefaultValueInitialized: true
-  - first:
-      Windows Store Apps: WindowsStoreApps
-    second:
-      enabled: 0
-      settings:
-        CPU: AnyCPU
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Plugins/Sirenix/Assemblies/AOT/link.xml
+++ b/Assets/Plugins/Sirenix/Assemblies/AOT/link.xml
@ -1,3 +0,0 @@
-<linker>
-       <assembly fullname="Sirenix.Serialization.AOTGenerated" preserve="all"/>
-</linker>
--- a/Assets/Plugins/Sirenix/Assemblies/AOT/link.xml.meta
+++ b/Assets/Plugins/Sirenix/Assemblies/AOT/link.xml.meta
@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: c3562bde2369fce4f9f3c634647d192c
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Inspector/Config/Editor/AOTGenerationConfig.asset
+++ b/Inspector/Config/Editor/AOTGenerationConfig.asset
@ -16,15 +16,11 @@ MonoBehaviour:
  deleteDllAfterBuilds: 1
  AutomateForAllAOTPlatforms: 1
  automateForPlatforms: 0900000014000000
-  lastScan: 638305697549808565
+  lastScan: 638306050127595745
  supportSerializedTypes:
  - TypeName: UnityEngine.Animator, UnityEngine.AnimationModule
    IsCustom: 0
    Emit: 1
-  - TypeName: UnityEngine.ResourceManagement.AsyncOperations.AsyncOperationHandle,
-      Unity.ResourceManager
-    IsCustom: 0
-    Emit: 1
  - TypeName: PMaker.Await.AwaitTimeline, Assembly-CSharp
    IsCustom: 0
    Emit: 1
@ -35,14 +31,6 @@ MonoBehaviour:
      Assembly-CSharp],[UnityEngine.GameObject, UnityEngine.CoreModule]], mscorlib
    IsCustom: 0
    Emit: 1
-  - TypeName: System.Collections.Generic.Dictionary`2[[System.Int32, mscorlib],[UnityEngine.ResourceManagement.AsyncOperations.AsyncOperationHandle,
-      Unity.ResourceManager]], mscorlib
-    IsCustom: 0
-    Emit: 1
-  - TypeName: System.Collections.Generic.Dictionary`2[[System.Int32, mscorlib],[UnityEngine.GameObject,
-      UnityEngine.CoreModule]], mscorlib
-    IsCustom: 0
-    Emit: 1
  - TypeName: System.Collections.Generic.Dictionary`2[[ObjectItem, Assembly-CSharp],[System.String[],
      mscorlib]], mscorlib
    IsCustom: 0
@ -71,14 +59,6 @@ MonoBehaviour:
      Assembly-CSharp]], mscorlib
    IsCustom: 0
    Emit: 1
-  - TypeName: System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[System.String,
-      mscorlib]], mscorlib
-    IsCustom: 0
-    Emit: 1
-  - TypeName: System.Collections.Generic.Dictionary`2[[TMPro.TMP_FontAsset, Unity.TextMeshPro],[System.Collections.Generic.List`1[[TMPro.TextMeshProUGUI,
-      Unity.TextMeshPro]], mscorlib]], mscorlib
-    IsCustom: 0
-    Emit: 1
  - TypeName: System.Collections.Generic.EnumEqualityComparer`1[[UnityTest.ZXL.DialogueType,
      Assembly-CSharp]], mscorlib
    IsCustom: 0
@ -99,10 +79,6 @@ MonoBehaviour:
      mscorlib]], mscorlib
    IsCustom: 0
    Emit: 1
-  - TypeName: System.Collections.Generic.HashSet`1[[System.Collections.Generic.Dictionary`2[[System.String,
-      mscorlib],[UnityEngine.GameObject, UnityEngine.CoreModule]], mscorlib]], System.Core
-    IsCustom: 0
-    Emit: 1
  - TypeName: System.Collections.Generic.IEqualityComparer`1[[UnityTest.ZXL.DialogueType,
      Assembly-CSharp]], mscorlib
    IsCustom: 0
@ -119,10 +95,6 @@ MonoBehaviour:
      mscorlib
    IsCustom: 0
    Emit: 1
-  - TypeName: System.Collections.Generic.IEqualityComparer`1[[TMPro.TMP_FontAsset,
-      Unity.TextMeshPro]], mscorlib
-    IsCustom: 0
-    Emit: 1
  - TypeName: System.Int32, mscorlib
    IsCustom: 0
    Emit: 1
@ -130,15 +102,8 @@ MonoBehaviour:
      mscorlib
    IsCustom: 0
    Emit: 1
-  - TypeName: System.Collections.Generic.List`1[[QuestionDatabase+Data, Assembly-CSharp]],
-      mscorlib
-    IsCustom: 0
-    Emit: 1
-  - TypeName: System.Collections.Generic.List`1[[System.String, mscorlib]], mscorlib
-    IsCustom: 0
-    Emit: 1
-  - TypeName: System.Collections.Generic.List`1[[TMPro.TextMeshProUGUI, Unity.TextMeshPro]],
-      mscorlib
+  - TypeName: System.Collections.Generic.List`1[[UnityEngine.Playables.PlayableDirector,
+      UnityEngine.DirectorModule]], mscorlib
    IsCustom: 0
    Emit: 1
  - TypeName: UnityTest.ZXL.ObjectComponent, Assembly-CSharp
@ -148,11 +113,10 @@ MonoBehaviour:
      mscorlib
    IsCustom: 0
    Emit: 1
-  - TypeName: System.Collections.Generic.ObjectEqualityComparer`1[[TMPro.TMP_FontAsset,
-      Unity.TextMeshPro]], mscorlib
+  - TypeName: ObjectItem, Assembly-CSharp
    IsCustom: 0
    Emit: 1
-  - TypeName: ObjectItem, Assembly-CSharp
+  - TypeName: UnityEngine.Playables.PlayableDirector, UnityEngine.DirectorModule
    IsCustom: 0
    Emit: 1
  - TypeName: UnityTest.ZXL.ProcessBase, Assembly-CSharp
@ -161,27 +125,9 @@ MonoBehaviour:
  - TypeName: UnityTest.ZXL.ProcessType, Assembly-CSharp
    IsCustom: 0
    Emit: 1
-  - TypeName: QuestionDatabase+Data, Assembly-CSharp
-    IsCustom: 0
-    Emit: 1
-  - TypeName: QuestionDatabase+Option, Assembly-CSharp
-    IsCustom: 0
-    Emit: 1
-  - TypeName: QuestionDatabase+QusetionType, Assembly-CSharp
-    IsCustom: 0
-    Emit: 1
-  - TypeName: UnityEngine.ResourceManagement.ResourceProviders.SceneInstance, Unity.ResourceManager
-    IsCustom: 0
-    Emit: 1
  - TypeName: System.String, mscorlib
    IsCustom: 0
    Emit: 1
  - TypeName: System.String[], mscorlib
    IsCustom: 0
    Emit: 1
-  - TypeName: TMPro.TextMeshProUGUI, Unity.TextMeshPro
-    IsCustom: 0
-    Emit: 1
-  - TypeName: TMPro.TMP_FontAsset, Unity.TextMeshPro
-    IsCustom: 0
-    Emit: 1
--- a/Materials/LiberationSans
+++ b/Materials/LiberationSans
--- a/Assets/UnityTest/ZXL/Scene/Main.unity
+++ b/Assets/UnityTest/ZXL/Scene/Main.unity
--- a/Assets/UnityTest/ZXL/Scripts/ConstData.cs
+++ b/Assets/UnityTest/ZXL/Scripts/ConstData.cs
@ -87,7 +87,8 @@ namespace UnityTest.ZXL
        打开二次确认提示并等待点击,

        // 3-3
-
+        打开穿戴面板等待穿戴完成,
+        
        // 3-4
        打开密封性良好提示并等待点击,

--- a/Assets/UnityTest/ZXL/Scripts/ObjectDataComponent.cs
+++ b/Assets/UnityTest/ZXL/Scripts/ObjectDataComponent.cs
@ -54,5 +54,7 @@ namespace UnityTest.ZXL
        湿抹布,
        警示牌,
        应急处理表,
+        消火栓,
+        灭火器,
    }
 }
--- a/Assets/UnityTest/ZXL/Scripts/Process/FourProcess.cs
+++ b/Assets/UnityTest/ZXL/Scripts/Process/FourProcess.cs
@ -1,5 +1,7 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using DragonSoul.Shared;
+using Mono.Event;
 using UnityEngine;
 using UnityEngine.Playables;

@ -9,6 +11,185 @@ namespace UnityTest.ZXL
    {
        public override ProcessType processType => ProcessType.四_现场处置场景;

+        protected override void OnInit()
+        {
+            base.OnInit();
+            StartAsync().Coroutine();
+        }
+
+        protected override void OnLevel()
+        {
+            base.OnLevel();
+        }
+
+        async ETTask StartAsync()
+        {
+            var ui = UIManager.Instance().ShowUI(UIType.Chapter);
+            var chapterUI = ui as ChapterUI;
+            if (chapterUI == null)
+            {
+                Debug.LogError($"{ui.GetType()}");
+                return;
+            }
+
+            await chapterUI.Transit(3);
+            UIManager.Instance().HideUI(UIType.Chapter);
+
+            this.SetPlayDirector(playableDirectors[0], PlayTimelineMode.Play);
+        }
+
+        protected override void Next()
+        {
+            base.Next();
+            switch (index)
+            {
+                case 0:
+                    this.SetPlayDirector(playableDirectors[0], PlayTimelineMode.Play);
+                    break;
+                case 1:
+                    this.SetPlayDirector(playableDirectors[1], PlayTimelineMode.Play);
+                    break;
+                case 2:
+                    this.SetPlayDirector(playableDirectors[2], PlayTimelineMode.Play);
+                    break;
+                case 3:
+                    this.SetPlayDirector(playableDirectors[3], PlayTimelineMode.Play);
+                    break;
+                case 4:
+                    this.SetPlayDirector(playableDirectors[4], PlayTimelineMode.Play);
+                    break;
+                case 5:
+                    // this.SetPlayDirector(playableDirectors[4], PlayTimelineMode.Play);
+                    // TODO: 打开总结面板
+                    break;
+                default:
+                    EventManager.Instance.FireNow(this, new ProcessOverEventArgs(processType));
+                    break;
+            }
+        }
+
+        public override void ConstEventLogic(object sender, GameEventArgs e)
+        {
+            base.ConstEventLogic(sender, e);
+            var args = e as ConstEventArgs;
+            this.SetPlayDirector(CurrentPlayableDirector, PlayTimelineMode.Pause);
+
+            switch (args.constDataType)
+            {
+                case ConstDataType.None:
+                    break;
+                case ConstDataType.消火栓高亮等待点击:
+                    WaitOperateFinish4_1_1().Coroutine();
+                    break;
+                case ConstDataType.出现小时钟及文字并等待点击灭火器:
+                    WaitOperateFinish4_1_2().Coroutine();
+                    break;
+                case ConstDataType.弹出阀门已关提示并等待关闭:
+                    WaitOperateFinish4_1_3().Coroutine();
+                    break;
+                case ConstDataType.打开检查无漏气提示并等待关闭:
+                    WaitOperateFinish4_1_5().Coroutine();
+                    break;
+                case ConstDataType.打开防止再次燃烧提示并等待关闭:
+                    WaitOperateFinish4_1_4().Coroutine();
+                    break;
+                case ConstDataType.打开事故气瓶转移提示并等待关闭:
+                    WaitOperateFinish4_1_6().Coroutine();
+                    break;
+                case ConstDataType.打开消防员做最后检测提示并等待关闭:
+                    WaitOperateFinish4_1_7().Coroutine();
+                    break;
+                default:
+                    throw new ArgumentOutOfRangeException();
+            }
+        }
+
+        public override void ClickObjectEvent(object sender, GameEventArgs e)
+        {
+            base.ClickObjectEvent(sender, e);
+            var args = e as ClickObjectEventArgs;
+            switch (args.objectType)
+            {
+                case HighlightObjectType.消火栓:
+                    currentTask.SetResult(true);
+                    break;
+                case HighlightObjectType.灭火器:
+                    currentTask.SetResult(true);
+                    break;
+                default:
+                    throw new ArgumentOutOfRangeException();
+            }
+        }
+
+        #region MyRegion
+
+        private async ETTask WaitOperateFinish4_1_1() // 消火栓高亮并等待点击
+        {
+            await WaitOperateFinish_ClickHighlight(HighlightObjectType.消火栓);
+        }
+
+        private async ETTask WaitOperateFinish4_1_2() // 出现小时钟及文字并等待点击灭火器
+        {
+            await WaitOperateFinish_ClickHighlight(HighlightObjectType.灭火器);
+        }
+
+        private async ETTask WaitOperateFinish4_1_3() // 出现小时钟及文字并等待点击灭火器
+        {
+            var showUI = UIManager.Instance().ShowUI(UIType.StrongTips);
+            var strongTipsUI = showUI as StrongTipsUI;
+            strongTipsUI.SetContent("提示", "“阀门已关闭", () => { currentTask.SetResult(true); }, 1);
+
+            await WaitOperateFinish_Click();
+            await currentTask;
+            UIManager.Instance().HideUI(UIType.StrongTips);
+        }
+
+        private async ETTask WaitOperateFinish4_1_4() // 
+        {
+            var showUI = UIManager.Instance().ShowUI(UIType.StrongTips);
+            var strongTipsUI = showUI as StrongTipsUI;
+            strongTipsUI.SetContent("提示", "“阀门关闭，火焰熄灭，继续用消防水枪进行保护，防止少量漏气，再次燃烧", () => { currentTask.SetResult(true); }, 1);
+
+            await WaitOperateFinish_Click();
+            await currentTask;
+            UIManager.Instance().HideUI(UIType.StrongTips);
+        }
+
+        private async ETTask WaitOperateFinish4_1_5() // 
+        {
+            var showUI = UIManager.Instance().ShowUI(UIType.StrongTips);
+            var strongTipsUI = showUI as StrongTipsUI;
+            strongTipsUI.SetContent("提示", "“已检查阀门完全关闭，无漏气，火焰无复燃，周围未有引燃物品，再停止消防水枪保护", () => { currentTask.SetResult(true); }, 1);
+
+            await WaitOperateFinish_Click();
+            await currentTask;
+            UIManager.Instance().HideUI(UIType.StrongTips);
+        }
+
+        private async ETTask WaitOperateFinish4_1_6() // 
+        {
+            var showUI = UIManager.Instance().ShowUI(UIType.StrongTips);
+            var strongTipsUI = showUI as StrongTipsUI;
+            strongTipsUI.SetContent("提示", "“消防人员到达后，经消防人员专业地检查判断下，由消防人员将事故气瓶转移到安全地点（通风、空旷、周围无易燃物）。", () => { currentTask.SetResult(true); }, 1);
+
+            await WaitOperateFinish_Click();
+            await currentTask;
+            UIManager.Instance().HideUI(UIType.StrongTips);
+        }
+
+        private async ETTask WaitOperateFinish4_1_7() // 
+        {
+            var showUI = UIManager.Instance().ShowUI(UIType.StrongTips);
+            var strongTipsUI = showUI as StrongTipsUI;
+            strongTipsUI.SetContent("提示", "“经消防员对整个室内环境做最后检测，确认无复燃点，室内安全，向实验室负责老师确认。救援结束。", () => { currentTask.SetResult(true); }, 1);
+
+            await WaitOperateFinish_Click();
+            await currentTask;
+            UIManager.Instance().HideUI(UIType.StrongTips);
+        }
+
+        #endregion
+
        // 4-1
        // ①J老师进门后，室内消火栓高亮，点击后播放动画2-12；（要求：打开软管前端喷枪阀门后，喷射出水）

--- a/Assets/UnityTest/ZXL/Scripts/Process/ProcessBase.cs
+++ b/Assets/UnityTest/ZXL/Scripts/Process/ProcessBase.cs
@ -40,7 +40,15 @@ namespace UnityTest.ZXL

                currentPlayableDirector = value;
            }
-            get => currentPlayableDirector;
+            get
+            {
+                if (currentPlayableDirector == null)
+                {
+                    currentPlayableDirector = playableDirectors[0];
+                }
+
+                return currentPlayableDirector;
+            }
        }

        protected int index;
--- a/Assets/UnityTest/ZXL/Scripts/Process/ProcessManager.cs
+++ b/Assets/UnityTest/ZXL/Scripts/Process/ProcessManager.cs
@ -23,6 +23,10 @@ namespace UnityTest.ZXL
            EventManager.Instance.Subscribe(ProcessOverEventArgs.EventId, PlayableStoppedEvent);

            SetProcess(ProcessType.一_爆炸发生场景);
+            processIndex = 0;
+            
+            // SetProcess(ProcessType.三_准备场景);
+            // processIndex = 2;
        }

        private void OnDestroy()
--- a/Assets/UnityTest/ZXL/Scripts/Process/SecondProcess.cs
+++ b/Assets/UnityTest/ZXL/Scripts/Process/SecondProcess.cs
@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using Cysharp.Threading.Tasks;
 using DragonSoul.Shared;
 using Mono.Event;
@ -11,22 +12,29 @@ namespace UnityTest.ZXL
    {
        public override ProcessType processType => ProcessType.二_汇报程序;

-        void Logic()
+        protected override void OnInit()
        {
+            base.OnInit();
+            StartAsync().Coroutine();
        }

-        protected override void Next()
+        protected override void OnLevel()
        {
-            base.Next();
-            switch (index)
+            base.OnLevel();
+        }
+
+        async ETTask StartAsync()
+        {
+            var ui = UIManager.Instance().ShowUI(UIType.Chapter);
+            var chapterUI = ui as ChapterUI;
+            if (chapterUI == null)
            {
-                case 0:
-                    // Minutia1_1().Coroutine();
-                    break;
-                default:
-                    EventManager.Instance.FireNow(this, new ProcessOverEventArgs(processType));
-                    break;
+                Debug.LogError($"{ui.GetType()}");
+                return;
            }
+
+            await chapterUI.Transit(1);
+            UIManager.Instance().HideUI(UIType.Chapter);
        }

        // 2-1
--- a/Assets/UnityTest/ZXL/Scripts/Process/ThirdProcess.cs
+++ b/Assets/UnityTest/ZXL/Scripts/Process/ThirdProcess.cs
@ -1,5 +1,7 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using DragonSoul.Shared;
+using Mono.Event;
 using UnityEngine;
 using UnityEngine.Playables;

@ -9,6 +11,176 @@ namespace UnityTest.ZXL
    {
        public override ProcessType processType => ProcessType.三_准备场景;

+        protected override void OnInit()
+        {
+            base.OnInit();
+            StartAsync().Coroutine();
+        }
+
+        protected override void OnLevel()
+        {
+            base.OnLevel();
+        }
+
+        async ETTask StartAsync()
+        {
+            var ui = UIManager.Instance().ShowUI(UIType.Chapter);
+            var chapterUI = ui as ChapterUI;
+            if (chapterUI == null)
+            {
+                Debug.LogError($"{ui.GetType()}");
+                return;
+            }
+
+            await chapterUI.Transit(2);
+            UIManager.Instance().HideUI(UIType.Chapter);
+
+            this.SetPlayDirector(playableDirectors[0], PlayTimelineMode.Play);
+        }
+
+        protected override void Next()
+        {
+            base.Next();
+            switch (index)
+            {
+                case 0:
+                    this.SetPlayDirector(playableDirectors[0], PlayTimelineMode.Play);
+                    break;
+                case 1:
+                    this.SetPlayDirector(playableDirectors[1], PlayTimelineMode.Play);
+                    break;
+                case 2:
+                    this.SetPlayDirector(playableDirectors[2], PlayTimelineMode.Play);
+                    break;
+                case 3:
+                    this.SetPlayDirector(playableDirectors[3], PlayTimelineMode.Play);
+                    break;
+                case 4:
+                    this.SetPlayDirector(playableDirectors[4], PlayTimelineMode.Play);
+                    break;
+                case 5:
+                    this.SetPlayDirector(playableDirectors[5], PlayTimelineMode.Play);
+                    break;
+                default:
+                    EventManager.Instance.FireNow(this, new ProcessOverEventArgs(processType));
+                    break;
+            }
+        }
+
+        public override void ConstEventLogic(object sender, GameEventArgs e)
+        {
+            base.ConstEventLogic(sender, e);
+            var args = e as ConstEventArgs;
+            this.SetPlayDirector(CurrentPlayableDirector, PlayTimelineMode.Pause);
+
+            switch (args.constDataType)
+            {
+                case ConstDataType.None:
+                    break;
+                case ConstDataType.警示牌高亮并等待点击:
+                    WaitOperateFinish3_1_1().Coroutine();
+                    break;
+                case ConstDataType.打开二次确认提示并等待点击:
+                    WaitOperateFinish3_1_2().Coroutine();
+                    break;
+                case ConstDataType.打开穿戴面板等待穿戴完成:
+                    WaitOperateFinish3_1_3().Coroutine();
+                    break;
+                case ConstDataType.打开密封性良好提示并等待点击:
+                    WaitOperateFinish3_1_4().Coroutine();
+                    break;
+                case ConstDataType.打开气体探测器检测正常并等待关闭:
+                    WaitOperateFinish3_1_5().Coroutine();
+                    break;
+                case ConstDataType.点击进入实验室按钮:
+                    currentTask.SetResult(true);
+                    break;
+                case ConstDataType.打开确认电源关闭提示并等待点击:
+                    WaitOperateFinish3_1_6().Coroutine();
+                    break;
+                default:
+                    throw new ArgumentOutOfRangeException();
+            }
+        }
+
+        public override void ClickObjectEvent(object sender, GameEventArgs e)
+        {
+            base.ClickObjectEvent(sender, e);
+            var args = e as ClickObjectEventArgs;
+            switch (args.objectType)
+            {
+                case HighlightObjectType.警示牌:
+                    currentTask.SetResult(true);
+                    break;
+                case HighlightObjectType.应急处理表:
+                    currentTask.SetResult(true);
+                    break;
+                default:
+                    throw new ArgumentOutOfRangeException();
+            }
+        }
+
+        #region 3-1
+
+        private async ETTask WaitOperateFinish3_1_1() // 警示牌高亮并等待点击
+        {
+            await WaitOperateFinish_ClickHighlight(HighlightObjectType.警示牌);
+        }
+
+        private async ETTask WaitOperateFinish3_1_2() // 打开二次确认提示并等待点击
+        {
+            var showUI = UIManager.Instance().ShowUI(UIType.StrongTips);
+            var strongTipsUI = showUI as StrongTipsUI;
+            strongTipsUI.SetContent("提示", "“对现场情况进行二次确认", () => { currentTask.SetResult(true); }, 1);
+
+            await WaitOperateFinish_Click();
+            await currentTask;
+            UIManager.Instance().HideUI(UIType.StrongTips);
+        }
+
+        private async ETTask WaitOperateFinish3_1_3() // 
+        {
+            this.SetPlayDirector(CurrentPlayableDirector, PlayTimelineMode.Resume);
+            // await WaitOperateFinish_Click();
+        }
+
+        private async ETTask WaitOperateFinish3_1_4() // 
+        {
+            var showUI = UIManager.Instance().ShowUI(UIType.StrongTips);
+            var strongTipsUI = showUI as StrongTipsUI;
+            strongTipsUI.SetContent("提示", "“两人防护服整齐，拉链处和鄂下处密封良好。", () => { currentTask.SetResult(true); }, 1);
+
+            await WaitOperateFinish_Click();
+            await currentTask;
+            UIManager.Instance().HideUI(UIType.StrongTips);
+        }
+
+        private async ETTask WaitOperateFinish3_1_5() // 
+        {
+            await WaitOperateFinish_Click();
+
+            // var showUI = UIManager.Instance().ShowUI(UIType.StrongTips);
+            // var strongTipsUI = showUI as GasDetectorUI;
+            // strongTipsUI.SetAction(() => { currentTask.SetResult(true); });
+            //
+            // await WaitOperateFinish_Click();
+            // await currentTask;
+            // UIManager.Instance().HideUI(UIType.StrongTips);
+        }
+
+        private async ETTask WaitOperateFinish3_1_6() // 
+        {
+            var showUI = UIManager.Instance().ShowUI(UIType.StrongTips);
+            var strongTipsUI = showUI as StrongTipsUI;
+            strongTipsUI.SetContent("提示", "“已确认电源关闭。", () => { currentTask.SetResult(true); }, 1);
+
+            await WaitOperateFinish_Click();
+            await currentTask;
+            UIManager.Instance().HideUI(UIType.StrongTips);
+        }
+
+        #endregion
+
        // 3-1
        // ①来到泄露现场，实验室门口站着同学G、F老师，L老师和J老师推着应急器材专用车来到实验室门口，将专用车放置在实验室走廊上，应急器材专用车中的警示牌高亮，点击后，在实验室入口处播放动画16，播放完毕显示警示牌和隔离带；

--- a/Assets/UnityTest/ZXL/Scripts/UI/GasDetectorUI.cs
+++ b/Assets/UnityTest/ZXL/Scripts/UI/GasDetectorUI.cs
@ -0,0 +1,28 @@
+using System;
+using UnityEngine.UI;
+
+namespace UnityTest.ZXL
+{
+    public class GasDetectorUI : UI
+    {
+        public Button button;
+        private Action _action;
+
+        public override void OnInit()
+        {
+            base.OnInit();
+            button.onClick.AddListener(ClickEnter);
+        }
+
+        public void SetAction(Action action)
+        {
+            _action = action;
+        }
+
+        private void ClickEnter()
+        {
+            _action?.Invoke();
+            _action = null;
+        }
+    }
+}
--- a/Assets/UnityTest/ZXL/Scripts/UI/GasDetectorUI.cs.meta
+++ b/Assets/UnityTest/ZXL/Scripts/UI/GasDetectorUI.cs.meta
@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 5ad915f2baa747b2b6024e417c1a98cc
+timeCreated: 1694974557
--- a/Assets/UnityTest/ZXL/Scripts/UI/UIManager.cs
+++ b/Assets/UnityTest/ZXL/Scripts/UI/UIManager.cs
@ -65,6 +65,7 @@ namespace UnityTest.ZXL
        StrongTips, //强提示
        WeakTips, //弱提示
        Dialogue, //对话
+        GasDetector, //气体探测器
    }

    [System.Serializable]
--- a/Assets/UnityTest/ZXL/Timeline/four/2/4-2.playable
+++ b/Assets/UnityTest/ZXL/Timeline/four/2/4-2.playable
@ -118,6 +118,99 @@ MonoBehaviour:
  m_Markers:
    m_Objects: []
  m_PostPlaybackState: 3
+--- !u!114 &-6407736874683907847
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  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: 21bf7f712d84d26478ebe6a299f21738, type: 3}
+  m_Name: Activation Track (2)
+  m_EditorClassIdentifier: 
+  m_Version: 3
+  m_AnimClip: {fileID: 0}
+  m_Locked: 0
+  m_Muted: 0
+  m_CustomPlayableFullTypename: 
+  m_Curves: {fileID: 0}
+  m_Parent: {fileID: 11400000}
+  m_Children: []
+  m_Clips:
+  - m_Version: 1
+    m_Start: 0
+    m_ClipIn: 0
+    m_Asset: {fileID: -5050201281411196377}
+    m_Duration: 0.950000000000001
+    m_TimeScale: 1
+    m_ParentTrack: {fileID: -6407736874683907847}
+    m_EaseInDuration: 0
+    m_EaseOutDuration: 0
+    m_BlendInDuration: 0
+    m_BlendOutDuration: 0
+    m_MixInCurve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      - serializedVersion: 3
+        time: 1
+        value: 1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    m_MixOutCurve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      - serializedVersion: 3
+        time: 1
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    m_BlendInCurveMode: 0
+    m_BlendOutCurveMode: 0
+    m_ExposedParameterNames: []
+    m_AnimationCurves: {fileID: 0}
+    m_Recordable: 0
+    m_PostExtrapolationMode: 0
+    m_PreExtrapolationMode: 0
+    m_PostExtrapolationTime: 0
+    m_PreExtrapolationTime: 0
+    m_DisplayName: Active
+  m_Markers:
+    m_Objects: []
+  m_PostPlaybackState: 3
 --- !u!114 &-5157909864286537661
 MonoBehaviour:
  m_ObjectHideFlags: 1
@ -130,10 +223,22 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 15c38f6fa1940124db1ab7f6fe7268d1, type: 3}
  m_Name: Signal Emitter
  m_EditorClassIdentifier: 
-  m_Time: 0.21666666666666667
+  m_Time: 0.48333333333333334
  m_Retroactive: 0
  m_EmitOnce: 0
  m_Asset: {fileID: 11400000, guid: 43d66aba408246040a07a55c8ad78488, type: 2}
+--- !u!114 &-5050201281411196377
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  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: fde0d25a170598d46a0b9dc16b4527a5, type: 3}
+  m_Name: ActivationPlayableAsset
+  m_EditorClassIdentifier: 
 --- !u!114 &-4531921439718165651
 MonoBehaviour:
  m_ObjectHideFlags: 1
@ -368,6 +473,7 @@ MonoBehaviour:
  - {fileID: 1733552069250951746}
  - {fileID: -2937642551046677163}
  - {fileID: -4531921439718165651}
+  - {fileID: -6407736874683907847}
  m_FixedDuration: 0
  m_EditorSettings:
    m_Framerate: 60
--- a/Assets/UnityTest/ZXL/Timeline/third/2/3-2.playable
+++ b/Assets/UnityTest/ZXL/Timeline/third/2/3-2.playable
@ -173,7 +173,7 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 15c38f6fa1940124db1ab7f6fe7268d1, type: 3}
  m_Name: Signal Emitter
  m_EditorClassIdentifier: 
-  m_Time: 1.8
+  m_Time: 0.1
  m_Retroactive: 0
  m_EmitOnce: 0
  m_Asset: {fileID: 11400000, guid: 27c8cdf2a16485447825e8417123d186, type: 2}
--- a/Assets/UnityTest/ZXL/Timeline/third/3/3-3.playable
+++ b/Assets/UnityTest/ZXL/Timeline/third/3/3-3.playable
@ -1,5 +1,21 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!114 &-4854831456388713961
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  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: 15c38f6fa1940124db1ab7f6fe7268d1, type: 3}
+  m_Name: Signal Emitter
+  m_EditorClassIdentifier: 
+  m_Time: 0
+  m_Retroactive: 0
+  m_EmitOnce: 0
+  m_Asset: {fileID: 11400000, guid: b2f75ec92758f894baedb0bfb7305882, type: 2}
 --- !u!114 &11400000
 MonoBehaviour:
  m_ObjectHideFlags: 0
@ -13,10 +29,35 @@ MonoBehaviour:
  m_Name: 3-3
  m_EditorClassIdentifier: 
  m_Version: 0
-  m_Tracks: []
+  m_Tracks:
+  - {fileID: 690482131920745726}
  m_FixedDuration: 0
  m_EditorSettings:
    m_Framerate: 60
    m_ScenePreview: 1
  m_DurationMode: 0
  m_MarkerTrack: {fileID: 0}
+--- !u!114 &690482131920745726
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  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: b46e36075dd1c124a8422c228e75e1fb, type: 3}
+  m_Name: Signal Track
+  m_EditorClassIdentifier: 
+  m_Version: 3
+  m_AnimClip: {fileID: 0}
+  m_Locked: 0
+  m_Muted: 0
+  m_CustomPlayableFullTypename: 
+  m_Curves: {fileID: 0}
+  m_Parent: {fileID: 11400000}
+  m_Children: []
+  m_Clips: []
+  m_Markers:
+    m_Objects:
+    - {fileID: -4854831456388713961}
--- a/Assets/UnityTest/ZXL/Timeline/third/3/打开穿戴面板等待穿戴完成.signal
+++ b/Assets/UnityTest/ZXL/Timeline/third/3/打开穿戴面板等待穿戴完成.signal
@ -0,0 +1,14 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  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: d6fa2d92fc1b3f34da284357edf89c3b, type: 3}
+  m_Name: "\u6253\u5F00\u7A7F\u6234\u9762\u677F\u7B49\u5F85\u7A7F\u6234\u5B8C\u6210"
+  m_EditorClassIdentifier: 
--- a/Assets/UnityTest/ZXL/Timeline/third/3/打开穿戴面板等待穿戴完成.signal.meta
+++ b/Assets/UnityTest/ZXL/Timeline/third/3/打开穿戴面板等待穿戴完成.signal.meta
@ -1,8 +1,8 @@
 fileFormatVersion: 2
-guid: 328396b161969e44eaa0600d34bd0d0f
-folderAsset: yes
-DefaultImporter:
+guid: b2f75ec92758f894baedb0bfb7305882
+NativeFormatImporter:
  externalObjects: {}
+  mainObjectFileID: 11400000
  userData: 
  assetBundleName: 
  assetBundleVariant: 
--- a/Assets/UnityTest/ZXL/Timeline/third/5/3-5.playable
+++ b/Assets/UnityTest/ZXL/Timeline/third/5/3-5.playable
@ -12,6 +12,99 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: fde0d25a170598d46a0b9dc16b4527a5, type: 3}
  m_Name: ActivationPlayableAsset
  m_EditorClassIdentifier: 
+--- !u!114 &-6924509929799618275
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  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: 21bf7f712d84d26478ebe6a299f21738, type: 3}
+  m_Name: Activation Track (6)
+  m_EditorClassIdentifier: 
+  m_Version: 3
+  m_AnimClip: {fileID: 0}
+  m_Locked: 0
+  m_Muted: 0
+  m_CustomPlayableFullTypename: 
+  m_Curves: {fileID: 0}
+  m_Parent: {fileID: 11400000}
+  m_Children: []
+  m_Clips:
+  - m_Version: 1
+    m_Start: 12.35
+    m_ClipIn: 0
+    m_Asset: {fileID: -2827903456830477702}
+    m_Duration: 0.11666666666666714
+    m_TimeScale: 1
+    m_ParentTrack: {fileID: -6924509929799618275}
+    m_EaseInDuration: 0
+    m_EaseOutDuration: 0
+    m_BlendInDuration: 0
+    m_BlendOutDuration: 0
+    m_MixInCurve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      - serializedVersion: 3
+        time: 1
+        value: 1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    m_MixOutCurve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      - serializedVersion: 3
+        time: 1
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    m_BlendInCurveMode: 0
+    m_BlendOutCurveMode: 0
+    m_ExposedParameterNames: []
+    m_AnimationCurves: {fileID: 0}
+    m_Recordable: 0
+    m_PostExtrapolationMode: 0
+    m_PreExtrapolationMode: 0
+    m_PostExtrapolationTime: 0
+    m_PreExtrapolationTime: 0
+    m_DisplayName: Active
+  m_Markers:
+    m_Objects: []
+  m_PostPlaybackState: 3
 --- !u!114 &-6613919681969633414
 MonoBehaviour:
  m_ObjectHideFlags: 1
@ -305,6 +398,18 @@ MonoBehaviour:
  m_Loop: 0
  m_Version: 1
  m_Rotation: {x: 0, y: 0, z: 0, w: 1}
+--- !u!114 &-2827903456830477702
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  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: fde0d25a170598d46a0b9dc16b4527a5, type: 3}
+  m_Name: ActivationPlayableAsset
+  m_EditorClassIdentifier: 
 --- !u!114 &-2385582141006943574
 MonoBehaviour:
  m_ObjectHideFlags: 1
@ -515,6 +620,7 @@ MonoBehaviour:
  - {fileID: 6740838764901362695}
  - {fileID: 1971642113932775813}
  - {fileID: 5375623767723304629}
+  - {fileID: -6924509929799618275}
  - {fileID: -6613919681969633414}
  - {fileID: -5671199369212176594}
  - {fileID: 19046140334750803}
@ -1149,7 +1255,7 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 15c38f6fa1940124db1ab7f6fe7268d1, type: 3}
  m_Name: Signal Emitter
  m_EditorClassIdentifier: 
-  m_Time: 12.383333333333333
+  m_Time: 12.4
  m_Retroactive: 0
  m_EmitOnce: 0
  m_Asset: {fileID: 11400000, guid: 226b31800a8619a4fa7c80c2f9271fb6, type: 2}
--- a/ProjectSettings/EditorBuildSettings.asset
+++ b/ProjectSettings/EditorBuildSettings.asset
@ -5,7 +5,7 @@ EditorBuildSettings:
  m_ObjectHideFlags: 0
  serializedVersion: 2
  m_Scenes:
-  - enabled: 1
+  - enabled: 0
    path: Assets/UnityTest/_0Loading/Scenes/00_Loading_Example.unity
    guid: e776010bfa8da4e41b8c9fa3b5eed144
  - enabled: 0
@ -14,9 +14,12 @@ EditorBuildSettings:
  - enabled: 0
    path: "Assets/UnityTest/_2\u5B9E\u9A8C\u5BA4\u7684\u9632\u62A4\u4E0E\u5E94\u6025/Scenes/02_Main_Example.unity"
    guid: 1f69a0a917cf9694d8223009986d69bb
-  - enabled: 1
+  - enabled: 0
    path: Assets/UnityTest/Common/Scenes/02_Main_Example_Copy.unity
    guid: 9b5c446b08e0a53408159ed3b43fbf0c
+  - enabled: 1
+    path: Assets/UnityTest/ZXL/Scene/Main.unity
+    guid: e57a377bbd0310c408cfe216203d5913
  m_configObjects:
    com.unity.addressableassets: {fileID: 11400000, guid: 4099a0d04bb604740b67eb403a8459a3,
      type: 2}
--- a/ProjectSettings/ProjectSettings.asset
+++ b/ProjectSettings/ProjectSettings.asset
@ -12,7 +12,7 @@ PlayerSettings:
  targetDevice: 2
  useOnDemandResources: 0
  accelerometerFrequency: 60
-  companyName: XXXX
+  companyName: xx
  productName: XXXX
  defaultCursor: {fileID: 0}
  cursorHotspot: {x: 0, y: 0}
@ -168,7 +168,7 @@ PlayerSettings:
  androidSupportedAspectRatio: 1
  androidMaxAspectRatio: 2.1
  applicationIdentifier:
-    Standalone: com.XXXX.XXXX
+    Standalone: com.xx.XXXX
  buildNumber:
    Standalone: 0
    iPhone: 0