add 添加拖拽功能和测试场景，模型待修改

add 完善流程
add 添加关门事件处理；测试当前所有流程并修复bug
2023-09-24 11:29:21 +08:00 · 2023-09-24 11:28:47 +08:00 · 2023-09-20 12:13:08 +08:00
37 changed files with 73468 additions and 714 deletions
--- a/Assets/AddressableAssetsData/AssetGroups/Default
+++ b/Assets/AddressableAssetsData/AssetGroups/Default
@ -25,6 +25,10 @@ MonoBehaviour:
    m_Address: Assets/UnityTest/ZXL/Assets/RT_L.renderTexture
    m_ReadOnly: 0
    m_SerializedLabels: []
+  - m_GUID: a41fdb0a846171942b25ba3bfae6f4c0
+    m_Address: Assets/UnityTest/ZXL/Scripts/Test
+    m_ReadOnly: 0
+    m_SerializedLabels: []
  m_ReadOnly: 0
  m_Settings: {fileID: 11400000, guid: ed913c58494404948976a29465fa0b05, type: 2}
  m_SchemaSet:
--- a/Assets/Artworks/MeiGongZiYuan/Animations/ShiYanShi2-DH/2-13_J.FBX.meta
+++ b/Assets/Artworks/MeiGongZiYuan/Animations/ShiYanShi2-DH/2-13_J.FBX.meta
@ -123,7 +123,7 @@ ModelImporter:
      name: "\u706D\u706B\u4E0E\u68C0\u67E5\u9600\u95E8"
      takeName: Take 001
      internalID: 1465369574596688972
-      firstFrame: 890
+      firstFrame: 901
      lastFrame: 1245
      wrapMode: 0
      orientationOffsetY: 0
--- a/Assets/Artworks/MeiGongZiYuan/Animations/Timeline/2-1/2-1Timeline.playable
+++ b/Assets/Artworks/MeiGongZiYuan/Animations/Timeline/2-1/2-1Timeline.playable
@ -385,6 +385,99 @@ MonoBehaviour:
  m_Markers:
    m_Objects: []
  m_PostPlaybackState: 3
+--- !u!114 &-7936005232432707424
+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 (18)
+  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: 13.283333333333333
+    m_ClipIn: 0
+    m_Asset: {fileID: 6383259848905059059}
+    m_Duration: 3.2333333333333343
+    m_TimeScale: 1
+    m_ParentTrack: {fileID: -7936005232432707424}
+    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 &-7682043480882723804
 MonoBehaviour:
  m_ObjectHideFlags: 1
@ -2814,6 +2907,7 @@ MonoBehaviour:
  - {fileID: -5792532357855431075}
  - {fileID: 6747700512757112769}
  - {fileID: -8750762335291663897}
+  - {fileID: -7936005232432707424}
  - {fileID: 6592815776478595467}
  - {fileID: -8196139133182293469}
  - {fileID: 7009415848581031321}
@ -2888,7 +2982,25 @@ MonoBehaviour:
      m_RotationOrder: 4
    m_MixOutCurve:
      serializedVersion: 2
-      m_Curve: []
+      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
@ -3584,6 +3696,18 @@ MonoBehaviour:
  m_OpenClipOffsetRotation: {x: 0, y: 0, z: 0, w: 1}
  m_Rotation: {x: 0, y: 0, z: 0, w: 1}
  m_ApplyOffsets: 0
+--- !u!114 &6383259848905059059
+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 &6592815776478595467
 MonoBehaviour:
  m_ObjectHideFlags: 1
--- a/Inspector/Config/Editor/AOTGenerationConfig.asset
+++ b/Inspector/Config/Editor/AOTGenerationConfig.asset
@ -16,7 +16,7 @@ MonoBehaviour:
  deleteDllAfterBuilds: 1
  AutomateForAllAOTPlatforms: 1
  automateForPlatforms: 0900000014000000
-  lastScan: 638307341190086387
+  lastScan: 638309647287011270
  supportSerializedTypes:
  - TypeName: UnityEngine.Animator, UnityEngine.AnimationModule
    IsCustom: 0
--- a/Assets/UnityTest/ZXL/Scene/Main.unity
+++ b/Assets/UnityTest/ZXL/Scene/Main.unity
--- a/Assets/UnityTest/ZXL/Scene/ces.unity
+++ b/Assets/UnityTest/ZXL/Scene/ces.unity
--- a/Assets/UnityTest/ZXL/Scene/ces.unity.meta
+++ b/Assets/UnityTest/ZXL/Scene/ces.unity.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: bde4aeef11512d048ac4632ac788d161
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/UnityTest/ZXL/Scripts/ConstData.cs
+++ b/Assets/UnityTest/ZXL/Scripts/ConstData.cs
@ -73,6 +73,8 @@ namespace UnityTest.ZXL
        弹出气瓶燃烧提示并等待关闭, // 取消了
        湿抹布高亮等待点击,
        拧紧阀门时弹出选择题并等待关闭,
+        关门,
+        开门,

        // 1-4
        等待点击进入实验室按钮,
--- a/Assets/UnityTest/ZXL/Scripts/Door.cs
+++ b/Assets/UnityTest/ZXL/Scripts/Door.cs
@ -0,0 +1,31 @@
+using System;
+using Mono.Event;
+using UnityEngine;
+
+namespace UnityTest.ZXL
+{
+    public class Door : MonoBehaviour
+    {
+        private bool isOpen;
+
+        private void Awake()
+        {
+            EventManager.Instance.Subscribe(DoorEventArgs.EventId, DoorEvent);
+        }
+
+        private void OnDestroy()
+        {
+            EventManager.Instance.Unsubscribe(DoorEventArgs.EventId, DoorEvent);
+        }
+
+        private void DoorEvent(object sender, GameEventArgs e)
+        {
+            var args = e as DoorEventArgs;
+
+            if (args.isOpen)
+                transform.localEulerAngles = new Vector3(0, 90, 0);
+            else
+                transform.localEulerAngles = Vector3.zero;
+        }
+    }
+}
--- a/Assets/UnityTest/ZXL/Scripts/Door.cs.meta
+++ b/Assets/UnityTest/ZXL/Scripts/Door.cs.meta
@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: ecbff04d1ec54d028ce2c13ab564bb23
+timeCreated: 1695177778
--- a/Assets/UnityTest/ZXL/Scripts/Effect/EffectManager.cs
+++ b/Assets/UnityTest/ZXL/Scripts/Effect/EffectManager.cs
@ -68,5 +68,8 @@ namespace UnityTest.ZXL
        光度计爆炸特效,
        光度计烟雾特效,
        光度计持续燃烧特效,
+        喷水特效,
+        乙炔气瓶燃烧特效,
+        喷雾特效,
    }
 }
--- a/Assets/UnityTest/ZXL/Scripts/Event/Args/DoorEventArgs.cs
+++ b/Assets/UnityTest/ZXL/Scripts/Event/Args/DoorEventArgs.cs
@ -0,0 +1,15 @@
+namespace Mono.Event
+{
+    public class DoorEventArgs : GameEventArgs
+    {
+        public static readonly int EventId = typeof(DoorEventArgs).GetHashCode();
+        public override int Id => EventId;
+
+        public bool isOpen;
+
+        public DoorEventArgs(bool isOpen)
+        {
+            this.isOpen = isOpen;
+        }
+    }
+}
--- a/Assets/UnityTest/ZXL/Scripts/Event/Args/DoorEventArgs.cs.meta
+++ b/Assets/UnityTest/ZXL/Scripts/Event/Args/DoorEventArgs.cs.meta
@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: d741a2e5742b494bb88b606a752a935a
+timeCreated: 1695177734
--- a/Assets/UnityTest/ZXL/Scripts/Process/FirstProcess.cs
+++ b/Assets/UnityTest/ZXL/Scripts/Process/FirstProcess.cs
@ -114,6 +114,10 @@ namespace UnityTest.ZXL
                case ConstDataType.打开检查结果提示等待关闭:
                    WaitOperateFinish1_4_3().Coroutine();
                    break;
+                case ConstDataType.关门:
+                    EventManager.Instance.FireNow(this, new DoorEventArgs(false));
+                    this.SetPlayDirector(CurrentPlayableDirector, PlayTimelineMode.Resume);
+                    break;
                default:
                    throw new ArgumentOutOfRangeException();
            }
@ -195,7 +199,10 @@ namespace UnityTest.ZXL

            string choiceQuestionResult;
            if (result)
+            {
                choiceQuestionResult = "已关闭事故瓶出气口阀门，火焰熄灭，周围未有新的引燃物。";
+                EffectManager.Instance().ShowOrHideEffect(EffectType.光度计持续燃烧特效, false);
+            }
            else
                choiceQuestionResult = "无法关闭事故瓶出气口阀门，火焰依然燃烧，周围未有新的引燃物。";

--- a/Assets/UnityTest/ZXL/Scripts/Process/FourProcess.cs
+++ b/Assets/UnityTest/ZXL/Scripts/Process/FourProcess.cs
@ -186,6 +186,12 @@ namespace UnityTest.ZXL
            await WaitOperateFinish_Click();
            await currentTask;
            UIManager.Instance().HideUI(UIType.StrongTips);
+
+            showUI = UIManager.Instance().ShowUI(UIType.Summarize);
+            var summarizeUI = showUI as SummarizeUI;
+            summarizeUI.SetAction(() => { currentTask.SetResult(true); });
+            await WaitOperateFinish_Click();
+            UIManager.Instance().HideUI(UIType.StrongTips);
        }

        #endregion
--- a/Assets/UnityTest/ZXL/Scripts/Process/ProcessBase.cs
+++ b/Assets/UnityTest/ZXL/Scripts/Process/ProcessBase.cs
@ -68,8 +68,11 @@ namespace UnityTest.ZXL
            EventManager.Instance.Subscribe(ClickObjectEventArgs.EventId, ClickObjectEvent);
            EventManager.Instance.Subscribe(PlayableStoppedEventArgs.EventId, PlayableStoppedEvent);

-            // var list = go.GetComponentAllChild<PlayableDirector>();
-            // playableDirectors = list;
+            foreach (var playableDirector in playableDirectors)
+            {
+                playableDirector.gameObject.SetActive(false);
+            }
+
            this.index = 0;
        }

--- a/Assets/UnityTest/ZXL/Scripts/Test.meta
+++ b/Assets/UnityTest/ZXL/Scripts/Test.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: a41fdb0a846171942b25ba3bfae6f4c0
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/UnityTest/ZXL/Scripts/Test/CharacterInfo.cs
+++ b/Assets/UnityTest/ZXL/Scripts/Test/CharacterInfo.cs
@ -0,0 +1,53 @@
+using System.Collections.Generic;
+using UnityEngine;
+
+namespace UnityTest.ZXL
+{
+    public class CharacterInfo : MonoBehaviour
+    {
+        [SerializeField] private ClothingType clothingType;
+        [SerializeField] private List<ClothingData> list = new List<ClothingData>();
+
+        public void SetCloth(string str)
+        {
+            ClothingData go = null;
+            foreach (var data in list)
+            {
+                if (data.name == str)
+                {
+                    go = data;
+                }
+            }
+
+            if (go != null)
+            {
+                foreach (var clothingData in list)
+                {
+                    clothingData.go.SetActive(false);
+                }
+
+                go.go.SetActive(true);
+            }
+            else
+            {
+                Debug.LogError($"the info dont have {str}");
+            }
+        }
+    }
+
+    [System.Serializable]
+    public class ClothingData
+    {
+        public string name;
+        public GameObject go;
+    }
+
+    public enum ClothingType
+    {
+        衣服,
+        呼吸器,
+        头盔,
+        手套,
+        鞋子,
+    }
+}
--- a/Assets/UnityTest/ZXL/Scripts/Test/CharacterInfo.cs.meta
+++ b/Assets/UnityTest/ZXL/Scripts/Test/CharacterInfo.cs.meta
@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 9a6d6265860f4bab99d0db4de9801082
+timeCreated: 1695524250
--- a/Assets/UnityTest/ZXL/Scripts/Test/DragItem.cs
+++ b/Assets/UnityTest/ZXL/Scripts/Test/DragItem.cs
@ -0,0 +1,142 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using Sirenix.OdinInspector;
+using UnityEngine;
+using UnityEngine.EventSystems;
+using UnityEngine.Serialization;
+
+namespace UnityTest.ZXL
+{
+    [RequireComponent(typeof(BoxCollider), typeof(Rigidbody))]
+    public class DragItem : MonoBehaviour, IDragHandler, IPointerClickHandler, IEndDragHandler
+    {
+        [FormerlySerializedAs("img")] public RectTransform icon;
+
+        [SerializeField] [ReadOnly] private Vector3 startPosition;
+        [SerializeField] [ReadOnly] private bool isCanPut;
+        [SerializeField] [ReadOnly] private bool isPutIn;
+
+        [SerializeField] private DragData _dragData;
+
+        private void Start()
+        {
+            var rect = GetComponent<RectTransform>();
+            startPosition = rect.anchoredPosition3D;
+            // startPosition = icon.position;
+
+            isPutIn = false;
+            GetComponent<Collider>().enabled = true;
+        }
+
+        public void OnDrag(PointerEventData eventData)
+        {
+            if (isPutIn)
+                return;
+
+            Debug.Log("OnDrag");
+            icon.position = eventData.position;
+        }
+
+        public void OnEndDrag(PointerEventData eventData)
+        {
+            if (isPutIn)
+                return;
+
+            Debug.Log("OnEndDrag");
+            TryPut();
+        }
+
+        public void OnPointerClick(PointerEventData eventData)
+        {
+            if (isPutIn)
+                return;
+
+            Debug.Log("OnPointerClick");
+        }
+
+        void TryPut()
+        {
+            if (target != null && isCanPut)
+            {
+                // 到达目标点的固定位置
+                // icon.position = target.itemPosition;
+                // startPosition = target.itemPosition;
+
+                // 回到原位
+                icon.anchoredPosition3D = startPosition;
+
+                _dragData.PutOrOut(true);
+                isPutIn = true;
+            }
+            else
+            {
+                icon.anchoredPosition3D = startPosition;
+                _dragData.PutOrOut(false);
+            }
+        }
+
+        private DragTarget target;
+
+        private void OnTriggerEnter(Collider other)
+        {
+            Debug.Log($"{transform.parent.name} OnTriggerEnter {other.transform.parent.name}");
+            target = other.GetComponent<DragTarget>();
+            if (target == null)
+                return;
+
+            isCanPut = true;
+        }
+
+        private void OnTriggerExit(Collider other)
+        {
+            Debug.Log($"{transform.parent.name} OnTriggerExit {other.transform.parent.name}");
+            if (isPutIn)
+            {
+                Debug.Log($"已经放入");
+                return;
+            }
+
+            isCanPut = false;
+            target = null;
+        }
+
+#if UNITY_EDITOR
+        [Button]
+        void Add()
+        {
+            var rectTransform = gameObject.GetComponent<RectTransform>();
+            var rect = rectTransform.rect;
+            var boxCollider = GetComponent<BoxCollider>();
+            boxCollider.isTrigger = true;
+            boxCollider.size = new Vector3(rect.width, rect.height, 5);
+            var rigidbody = GetComponent<Rigidbody>();
+            rigidbody.useGravity = true;
+            rigidbody.isKinematic = true;
+            icon = rectTransform;
+            UnityEditor.EditorUtility.SetDirty(this);
+        }
+
+        [Button]
+        void SetDirty()
+        {
+            UnityEditor.EditorUtility.SetDirty(this);
+        }
+#endif
+    }
+
+    [System.Serializable]
+    public struct DragData
+    {
+        public string name;
+        public CharacterInfo info;
+
+        public void PutOrOut(bool isPut)
+        {
+            if (info == null || !isPut)
+                return;
+
+            info.SetCloth(name);
+        }
+    }
+}
--- a/Assets/UnityTest/ZXL/Scripts/Test/DragItem.cs.meta
+++ b/Assets/UnityTest/ZXL/Scripts/Test/DragItem.cs.meta
@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 94e1c20b7a14db147b642f9f8ee4ca48
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/UnityTest/ZXL/Scripts/Test/DragTarget.cs
+++ b/Assets/UnityTest/ZXL/Scripts/Test/DragTarget.cs
@ -0,0 +1,28 @@
+using Sirenix.OdinInspector;
+using UnityEngine;
+
+namespace UnityTest.ZXL
+{
+    // [RequireComponent(typeof(BoxCollider2D))]
+    [RequireComponent(typeof(BoxCollider), typeof(Rigidbody))]
+    public class DragTarget : MonoBehaviour
+    {
+        [SerializeField] private Transform itemPoint;
+        public Vector3 itemPosition => itemPoint.position;
+
+#if UNITY_EDITOR
+        [Button]
+        void Add()
+        {
+            var rectTransform = gameObject.GetComponent<RectTransform>();
+            var rect = rectTransform.rect;
+            var boxCollider = GetComponent<BoxCollider>();
+            boxCollider.size = new Vector3(rect.width, rect.height, 5);
+            boxCollider.isTrigger = true;
+            var rigidbody = GetComponent<Rigidbody>();
+            rigidbody.useGravity = true;
+            rigidbody.isKinematic = true;
+        }
+#endif
+    }
+}
--- a/Assets/UnityTest/ZXL/Scripts/Test/DragTarget.cs.meta
+++ b/Assets/UnityTest/ZXL/Scripts/Test/DragTarget.cs.meta
@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 47b77b9d6ce2485288a016cba83ab05a
+timeCreated: 1695343165
--- a/Assets/UnityTest/ZXL/Scripts/UI/SummarizeUI.cs
+++ b/Assets/UnityTest/ZXL/Scripts/UI/SummarizeUI.cs
@ -0,0 +1,30 @@
+using System;
+using UnityEngine;
+using UnityEngine.UI;
+
+namespace UnityTest.ZXL
+{
+    public class SummarizeUI : UI
+    {
+        public Button button;
+        private Action action;
+
+        public override void OnInit()
+        {
+            base.OnInit();
+            button.onClick.AddListener(Over);
+        }
+
+        public void SetAction(Action action)
+        {
+            this.action = action;
+        }
+
+        private void Over()
+        {
+            // 结束6-4实验
+            Debug.Log("6-4 is finish!! ");
+            action?.Invoke();
+        }
+    }
+}
--- a/Assets/UnityTest/ZXL/Scripts/UI/SummarizeUI.cs.meta
+++ b/Assets/UnityTest/ZXL/Scripts/UI/SummarizeUI.cs.meta
@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: cf30d0cba62d49ce9c3f0e4e0a566988
+timeCreated: 1695261992
--- a/Assets/UnityTest/ZXL/Scripts/UI/UIManager.cs
+++ b/Assets/UnityTest/ZXL/Scripts/UI/UIManager.cs
@ -67,6 +67,7 @@ namespace UnityTest.ZXL
        Dialogue, //对话
        GasDetector, //气体探测器
        ChoiceQuestion, // 选择题
+        Summarize, // 总结面板
    }

    [System.Serializable]
--- a/Assets/UnityTest/ZXL/Timeline/first/2/1-2.playable
+++ b/Assets/UnityTest/ZXL/Timeline/first/2/1-2.playable
@ -1,6 +1,18 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
 --- !u!114 &-8475716365976117477
+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 &-8219074647308309382
 MonoBehaviour:
  m_ObjectHideFlags: 1
  m_CorrespondingSourceObject: {fileID: 0}
@ -815,6 +827,18 @@ MonoBehaviour:
  m_OpenClipOffsetRotation: {x: 0, y: 0, z: 0, w: 1}
  m_Rotation: {x: 0, y: 0, z: 0, w: 1}
  m_ApplyOffsets: 0
+--- !u!114 &-3933717773745292401
+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(Clone)(Clone)
+  m_EditorClassIdentifier: 
 --- !u!114 &-3858687581058526804
 MonoBehaviour:
  m_ObjectHideFlags: 1
@ -2358,7 +2382,7 @@ MonoBehaviour:
    m_Start: 0
    m_ClipIn: 0
    m_Asset: {fileID: 3668440815884203523}
-    m_Duration: 29.116666348775247
+    m_Duration: 33.266666348775246
    m_TimeScale: 1
    m_ParentTrack: {fileID: -821849089730012908}
    m_EaseInDuration: 0
@ -4269,6 +4293,7 @@ MonoBehaviour:
  - {fileID: 2776090318627986429}
  - {fileID: 5726233430093062603}
  - {fileID: 1982909493914488253}
+  - {fileID: 5925959689451643155}
  - {fileID: -3858687581058526804}
  - {fileID: -1102657235992436068}
  - {fileID: 1295615053537815030}
@ -6044,7 +6069,7 @@ MonoBehaviour:
    m_Start: 0
    m_ClipIn: 0
    m_Asset: {fileID: 1848402127925291248}
-    m_Duration: 29.116666348775247
+    m_Duration: 33.266666348775246
    m_TimeScale: 1
    m_ParentTrack: {fileID: 2703925668106721516}
    m_EaseInDuration: 0
@ -6239,25 +6264,7 @@ MonoBehaviour:
      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_Curve: []
      m_PreInfinity: 2
      m_PostInfinity: 2
      m_RotationOrder: 4
@ -6284,25 +6291,7 @@ MonoBehaviour:
    m_BlendOutDuration: -1
    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_Curve: []
      m_PreInfinity: 2
      m_PostInfinity: 2
      m_RotationOrder: 4
@ -6394,25 +6383,7 @@ MonoBehaviour:
    m_BlendOutDuration: -1
    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_Curve: []
      m_PreInfinity: 2
      m_PostInfinity: 2
      m_RotationOrder: 4
@ -6469,25 +6440,7 @@ MonoBehaviour:
      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_Curve: []
      m_PreInfinity: 2
      m_PostInfinity: 2
      m_RotationOrder: 4
@ -8720,25 +8673,7 @@ MonoBehaviour:
      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_Curve: []
      m_PreInfinity: 2
      m_PostInfinity: 2
      m_RotationOrder: 4
@ -8765,25 +8700,7 @@ MonoBehaviour:
    m_BlendOutDuration: -1
    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_Curve: []
      m_PreInfinity: 2
      m_PostInfinity: 2
      m_RotationOrder: 4
@ -8863,6 +8780,168 @@ MonoBehaviour:
  m_Loop: 0
  m_Version: 1
  m_Rotation: {x: 0, y: 0, z: 0, w: 1}
+--- !u!114 &5925959689451643155
+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 (15)
+  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: 2.9333333333333336
+    m_ClipIn: 0
+    m_Asset: {fileID: -8219074647308309382}
+    m_Duration: 1.5333333333333332
+    m_TimeScale: 1
+    m_ParentTrack: {fileID: 5925959689451643155}
+    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_Version: 1
+    m_Start: 4.983333333333333
+    m_ClipIn: 0
+    m_Asset: {fileID: -3933717773745292401}
+    m_Duration: 1.8333333333333357
+    m_TimeScale: 1
+    m_ParentTrack: {fileID: 5925959689451643155}
+    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 &5942921155233201773
 MonoBehaviour:
  m_ObjectHideFlags: 1
@ -10128,25 +10207,7 @@ MonoBehaviour:
      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_Curve: []
      m_PreInfinity: 2
      m_PostInfinity: 2
      m_RotationOrder: 4
@ -10173,25 +10234,7 @@ MonoBehaviour:
    m_BlendOutDuration: -1
    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_Curve: []
      m_PreInfinity: 2
      m_PostInfinity: 2
      m_RotationOrder: 4
--- a/Assets/UnityTest/ZXL/Timeline/first/3/1-3.playable
+++ b/Assets/UnityTest/ZXL/Timeline/first/3/1-3.playable
@ -46,6 +46,22 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: fde0d25a170598d46a0b9dc16b4527a5, type: 3}
  m_Name: ActivationPlayableAsset
  m_EditorClassIdentifier: 
+--- !u!114 &-6636324636768503793
+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: 28.13
+  m_Retroactive: 0
+  m_EmitOnce: 0
+  m_Asset: {fileID: 11400000, guid: 5fab8d54477591b409f60701075e7aaf, type: 2}
 --- !u!114 &-5578192596031706824
 MonoBehaviour:
  m_ObjectHideFlags: 1
@ -2343,10 +2359,10 @@ MonoBehaviour:
  m_Children: []
  m_Clips:
  - m_Version: 1
-    m_Start: 28.13
+    m_Start: 27.783333333333335
    m_ClipIn: 0
    m_Asset: {fileID: -4479283051849765233}
-    m_Duration: 4.120000000000008
+    m_Duration: 4.466666666666672
    m_TimeScale: 1
    m_ParentTrack: {fileID: 194531870188935603}
    m_EaseInDuration: 0
@ -2787,6 +2803,7 @@ MonoBehaviour:
    m_Objects:
    - {fileID: -553716043092955182}
    - {fileID: -5578192596031706824}
+    - {fileID: -6636324636768503793}
 --- !u!114 &4991828266555547686
 MonoBehaviour:
  m_ObjectHideFlags: 1
--- a/Assets/UnityTest/ZXL/Timeline/first/3/关门.signal
+++ b/Assets/UnityTest/ZXL/Timeline/first/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: "\u5173\u95E8"
+  m_EditorClassIdentifier: 
--- a/Assets/UnityTest/ZXL/Timeline/first/3/关门.signal.meta
+++ b/Assets/UnityTest/ZXL/Timeline/first/3/关门.signal.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 5fab8d54477591b409f60701075e7aaf
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/UnityTest/ZXL/Timeline/first/3/开门.signal
+++ b/Assets/UnityTest/ZXL/Timeline/first/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: "\u5F00\u95E8"
+  m_EditorClassIdentifier: 
--- a/Assets/UnityTest/ZXL/Timeline/first/3/开门.signal.meta
+++ b/Assets/UnityTest/ZXL/Timeline/first/3/开门.signal.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 7117f7917b63cd245814acf04986c9e4
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/UnityTest/ZXL/Timeline/first/4/1-4.playable
+++ b/Assets/UnityTest/ZXL/Timeline/first/4/1-4.playable
@ -3118,6 +3118,30 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: fde0d25a170598d46a0b9dc16b4527a5, type: 3}
  m_Name: ActivationPlayableAsset
  m_EditorClassIdentifier: 
+--- !u!114 &-2290668608329556643
+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 (12)
+  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: []
+  m_PostPlaybackState: 3
 --- !u!114 &-1983992737184934353
 MonoBehaviour:
  m_ObjectHideFlags: 1
@ -3515,6 +3539,7 @@ MonoBehaviour:
  - {fileID: -5231455683635465303}
  - {fileID: -4250705456642191807}
  - {fileID: 1279630312936573731}
+  - {fileID: -2290668608329556643}
  - {fileID: 2210909402877853480}
  - {fileID: 1663104044600511777}
  - {fileID: 9083399298919590985}
--- a/Assets/UnityTest/ZXL/Timeline/four/1/4-1.playable
+++ b/Assets/UnityTest/ZXL/Timeline/four/1/4-1.playable
--- a/Assets/UnityTest/ZXL/Timeline/four/2/4-2.playable
+++ b/Assets/UnityTest/ZXL/Timeline/four/2/4-2.playable
--- a/ProjectSettings/ProjectSettings.asset
+++ b/ProjectSettings/ProjectSettings.asset
@ -149,7 +149,6 @@ PlayerSettings:
  preloadedAssets:
  - {fileID: 0}
  - {fileID: 0}
-  - {fileID: 11400000, guid: 377fab9146e60364fa298d388667a056, type: 2}
  metroInputSource: 0
  wsaTransparentSwapchain: 0
  m_HolographicPauseOnTrackingLoss: 1
@ -755,7 +754,7 @@ PlayerSettings:
  allowUnsafeCode: 0
  useDeterministicCompilation: 1
  enableRoslynAnalyzers: 1
-  selectedPlatform: 0
+  selectedPlatform: 2
  additionalIl2CppArgs: 
  scriptingRuntimeVersion: 1
  gcIncremental: 0
--- a/ProjectSettings/UnityConnectSettings.asset
+++ b/ProjectSettings/UnityConnectSettings.asset
@ -10,6 +10,8 @@ UnityConnectSettings:
  m_EventUrl: https://cdp.cloud.unity3d.com/v1/events
  m_ConfigUrl: https://config.uca.cloud.unity3d.com
  m_DashboardUrl: https://dashboard.unity3d.com
+  m_CNEventUrl: https://cdp.cloud.unity.cn/v1/events
+  m_CNConfigUrl: https://cdp.cloud.unity.cn/config
  m_TestInitMode: 0
  CrashReportingSettings:
    m_EventUrl: https://perf-events.cloud.unity3d.com
Author	SHA1	Message	Date
zc	3b647e7a5b	add 添加拖拽功能和测试场景，模型待修改	2023-09-24 11:29:21 +08:00
zc	db7c6dd005	add 完善流程	2023-09-24 11:28:47 +08:00
zc	2a836126cf	add 添加关门事件处理；测试当前所有流程并修复bug	2023-09-20 12:13:08 +08:00