完成第一模块的内容

Assets/Artworks/MeiGongZiYuan/Animations/Timeline/2-1/2-1Timeline.playable

@@ -1225,6 +1225,22 @@ MonoBehaviour:
   m_Retroactive: 0
   m_EmitOnce: 0
   m_Asset: {fileID: 11400000, guid: ede3fc21038c7334b8ed1d5959b99d0b, type: 2}
+--- !u!114 &-2400535452495327242
+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: 12.616666666666667
+  m_Retroactive: 0
+  m_EmitOnce: 0
+  m_Asset: {fileID: 11400000, guid: ba535e2a3cf68cc49a558dc37f456cca, type: 2}
 --- !u!114 &-2062498397165723363
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -3230,6 +3246,7 @@ MonoBehaviour:
     m_Objects:
     - {fileID: -3034490624713385214}
     - {fileID: 1926366267646294619}
+    - {fileID: -2400535452495327242}
 --- !u!114 &5454088595684049504
 MonoBehaviour:
   m_ObjectHideFlags: 1

Assets/UnityTest/ZXL/Scripts/CommonHelper.cs

@@ -48,6 +48,8 @@ namespace UnityTest.ZXL
         public static void HighlightOpen(this GameObject self)
         {
             var highlightEffect = self.GetOrAddComponent<HighlightEffect>();
+            var load = Resources.Load<HighlightProfile>("Highlight Plus Profile");
+            highlightEffect.ProfileLoad(load);
             highlightEffect.highlighted = true;
             self.GetComponent<ObjectComponent>().isCanClick = true;
         }

Assets/UnityTest/ZXL/Scripts/ConstData.cs

@@ -70,7 +70,7 @@ namespace UnityTest.ZXL
         电脑开始启动,
 
         // 1-3
-        弹出气瓶燃烧提示并等待关闭,
+        弹出气瓶燃烧提示并等待关闭, // 取消了
         湿抹布高亮等待点击,
         拧紧阀门时弹出选择题并等待关闭,
 
@@ -78,6 +78,7 @@ namespace UnityTest.ZXL
         等待点击进入实验室按钮,
         打开电源关闭提示等待关闭,
         打开检查结果提示等待关闭,
+        点击进入实验室按钮,
 
         // 3-1
         警示牌高亮并等待点击,

Assets/UnityTest/ZXL/Scripts/Process/FirstProcess.cs

@@ -92,14 +92,19 @@ namespace UnityTest.ZXL
                     WaitOperateFinish1_3_1().Coroutine();
                     break;
                 case ConstDataType.拧紧阀门时弹出选择题并等待关闭:
+                    WaitOperateFinish1_3_2().Coroutine();
                     break;
                 case ConstDataType.等待点击进入实验室按钮:
+                    WaitOperateFinish1_4_1().Coroutine();
+                    break;
+                case ConstDataType.点击进入实验室按钮:
+                    currentTask.SetResult(true);
                     break;
                 case ConstDataType.打开电源关闭提示等待关闭:
+                    WaitOperateFinish1_4_2().Coroutine();
                     break;
                 case ConstDataType.打开检查结果提示等待关闭:
-                    break;
+                    WaitOperateFinish1_4_3().Coroutine();
-                case ConstDataType.警示牌高亮并等待点击:
                     break;
                 default:
                     throw new ArgumentOutOfRangeException();
@@ -121,6 +126,7 @@ namespace UnityTest.ZXL
                 case HighlightObjectType.乙炔瓶柜门:
                     break;
                 case HighlightObjectType.湿抹布:
+                    currentTask.SetResult(true);
                     break;
                 case HighlightObjectType.警示牌:
                     break;
@@ -160,27 +166,52 @@ namespace UnityTest.ZXL
         {
             await WaitOperateFinish_ClickHighlight(HighlightObjectType.湿抹布, false);
 
-            var ui = UIManager.Instance().ShowUI(UIType.StrongTips);
+            var ui = UIManager.Instance().ShowUI(UIType.BigStrongTips);
-            var strongTipsUI = ui as StrongTipsUI;
+            var strongTipsUI = ui as BigStrongTipsUI;
             strongTipsUI.SetContent("提示",
                 "气瓶站立燃烧，由于火焰向外喷射，热量并不会直接炙烤气瓶，加上气体气化的吸热现象，气瓶的温度并不会剧烈升高，可按照应急程序，用湿抹布包住手，绕到自喷火口后方，尝试拧紧阀门。（注意：若气瓶倒在地面火焰朝地面喷射，或火焰被物体阻挡烘烤瓶体时，火的热量会导致气瓶内部温度、压力剧烈升高，气瓶瓶体受热强度下降，存在爆炸危险，这时不可盲目接近，所有人应立即迅速撤离现场。）",
                 () => { currentTask.SetResult(true); }, 1);
 
             await WaitOperateFinish_Click();
-            UIManager.Instance().HideUI(UIType.StrongTips);
+            UIManager.Instance().HideUI(UIType.BigStrongTips);
+        }
+
+        private async ETTask WaitOperateFinish1_3_2() // 拧紧阀门时弹出选择题并等待关闭
+        {
+            // TODO: 待添加选择题
+            this.SetPlayDirector(CurrentPlayableDirector, PlayTimelineMode.Resume);
+            await ETTask.CompletedTask;
         }
 
         #endregion
 
         #region 1-4
 
-        private async ETTask WaitOperateFinish4() // 弹出气瓶燃烧提示并等待关闭
+        private async ETTask WaitOperateFinish1_4_1() // 等待点击进入实验室按钮
         {
-            currentTask = ETTask<bool>.Create();
+            await WaitOperateFinish_Click();
-            currentToken = new ETCancellationToken();
+        }
 
-            currentToken.Add(TokenCancel);
+        private async ETTask WaitOperateFinish1_4_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 WaitOperateFinish1_4_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);
         }
 
         #endregion

Assets/UnityTest/ZXL/Scripts/UI/BigStrongTipsUI.cs

@@ -0,0 +1,59 @@
+using System;
+using TMPro;
+using UnityEngine.UI;
+
+namespace UnityTest.ZXL
+{
+    public class BigStrongTipsUI : UI
+    {
+        public TextMeshProUGUI titleText;
+        public TextMeshProUGUI contentText;
+        public Button btnLeft;
+        public Button btnRight;
+
+        private Action _action;
+
+        public override void OnInit()
+        {
+            base.OnInit();
+            btnLeft.onClick.AddListener(ClickSure);
+            btnRight.onClick.AddListener(ClickCancel);
+        }
+
+        private void ClickSure()
+        {
+            UIManager.Instance().HideUI(uiType);
+            _action?.Invoke();
+        }
+
+        private void ClickCancel()
+        {
+            UIManager.Instance().HideUI(uiType);
+        }
+
+        public void SetContent(string title, string content)
+        {
+            titleText.text = title;
+            contentText.text = content;
+        }
+
+        public void SetContent(string title, string content, Action callback, int btnCount)
+        {
+            titleText.text = title;
+            contentText.text = content;
+            _action = callback;
+
+            btnLeft.gameObject.SetActive(true);
+            btnRight.gameObject.SetActive(true);
+            if (btnCount == 0)
+            {
+                btnLeft.gameObject.SetActive(false);
+                btnRight.gameObject.SetActive(false);
+            }
+            else if (btnCount == 1)
+            {
+                btnRight.gameObject.SetActive(false);
+            }
+        }
+    }
+}

Assets/UnityTest/ZXL/Scripts/UI/BigStrongTipsUI.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 0919381130674380961cbf8c8c45e903
+timeCreated: 1694971943

Assets/UnityTest/ZXL/Scripts/UI/UIManager.cs

@@ -61,6 +61,7 @@ namespace UnityTest.ZXL
     public enum UIType
     {
         Chapter, //章节
+        BigStrongTips, //强提示
         StrongTips, //强提示
         WeakTips, //弱提示
         Dialogue, //对话

Assets/UnityTest/ZXL/Timeline/first/3/1-3.playable

@@ -1,18 +1,6 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
 --- !u!114 &-8764538398079199997
-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 &-7877134184629878192
 MonoBehaviour:
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1337,99 +1325,6 @@ AnimationClip:
   m_HasGenericRootTransform: 0
   m_HasMotionFloatCurves: 0
   m_Events: []
---- !u!114 &-5024056175405326126
-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 (1)
-  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.23333333333333334
-    m_ClipIn: 0
-    m_Asset: {fileID: -7877134184629878192}
-    m_Duration: 0.18333333333333335
-    m_TimeScale: 1
-    m_ParentTrack: {fileID: -5024056175405326126}
-    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 &-4825834137414296274
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -2301,22 +2196,6 @@ MonoBehaviour:
   m_Retroactive: 0
   m_EmitOnce: 0
   m_Asset: {fileID: 11400000, guid: 1c9c310b821073c448f564b8d95f6212, type: 2}
---- !u!114 &-1217468374668112052
-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.4166666666666667
-  m_Retroactive: 0
-  m_EmitOnce: 0
-  m_Asset: {fileID: 11400000, guid: 1c9c310b821073c448f564b8d95f6212, type: 2}
 --- !u!114 &-804754738298539892
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -2395,7 +2274,6 @@ MonoBehaviour:
   - {fileID: -3898578429262626925}
   - {fileID: 701617183543219563}
   - {fileID: 4991828266555547686}
-  - {fileID: -5024056175405326126}
   - {fileID: 4721351644446586883}
   - {fileID: 6662574301632688902}
   - {fileID: 2874833236098046474}
@@ -2872,7 +2750,6 @@ MonoBehaviour:
   m_Clips: []
   m_Markers:
     m_Objects:
-    - {fileID: -1217468374668112052}
     - {fileID: -553716043092955182}
     - {fileID: -5578192596031706824}
 --- !u!114 &4991828266555547686

Assets/UnityTest/功能模块/_3综合考核/Prefab/New/选择题-X-竖.prefab

@@ -1404,7 +1404,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 533.9906, y: 0}
-  m_SizeDelta: {x: 1087.981, y: 240}
+  m_SizeDelta: {x: 1087.981, y: 0}
   m_Pivot: {x: 1, y: 0.5}
 --- !u!114 &8494910740757869461
 MonoBehaviour: