diff --git a/.plastic/plastic.changes b/.plastic/plastic.changes index 3f054dc1..2646fd9c 100644 Binary files a/.plastic/plastic.changes and b/.plastic/plastic.changes differ diff --git a/.plastic/plastic.wktree b/.plastic/plastic.wktree index 4de5492d..7483ca19 100644 Binary files a/.plastic/plastic.wktree and b/.plastic/plastic.wktree differ diff --git a/Assets/UnityTest/ZXL/Scene/Main.unity b/Assets/UnityTest/ZXL/Scene/Main.unity index 7f0d64b5..f9c935cb 100644 --- a/Assets/UnityTest/ZXL/Scene/Main.unity +++ b/Assets/UnityTest/ZXL/Scene/Main.unity @@ -77959,7 +77959,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 2147483647 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &888783798 Transform: m_ObjectHideFlags: 0 @@ -87675,6 +87675,8 @@ PlayableDirector: value: {fileID: 1834951373} - key: {fileID: 8002768729873784443, guid: 70beec9ac30ab71429c3fbc83895b6bd, type: 2} value: {fileID: 1231343421} + - key: {fileID: -6140706245439905431, guid: 70beec9ac30ab71429c3fbc83895b6bd, type: 2} + value: {fileID: 888783797} m_ExposedReferences: m_References: [] --- !u!1 &1024800890 @@ -179400,6 +179402,8 @@ PlayableDirector: value: {fileID: 518019148} - key: {fileID: -1425538169675652274, guid: bed6bf723e0261e49b3ce30148c270de, type: 2} value: {fileID: 1373826167} + - key: {fileID: 3380951217326714550, guid: bed6bf723e0261e49b3ce30148c270de, type: 2} + value: {fileID: 888783797} m_ExposedReferences: m_References: [] --- !u!1 &2068761421 @@ -181986,6 +181990,8 @@ PlayableDirector: value: {fileID: 1286785093} - key: {fileID: -4655930145863088553, guid: 1ec9cc242ad72bb4f8428e27f10710a8, type: 2} value: {fileID: 936812111} + - key: {fileID: 6667462319075996530, guid: 1ec9cc242ad72bb4f8428e27f10710a8, type: 2} + value: {fileID: 888783797} m_ExposedReferences: m_References: [] --- !u!1 &2096766021 diff --git a/Assets/UnityTest/ZXL/Timeline/first/4/1-4.playable b/Assets/UnityTest/ZXL/Timeline/first/4/1-4.playable index 37422828..bfc8f823 100644 --- a/Assets/UnityTest/ZXL/Timeline/first/4/1-4.playable +++ b/Assets/UnityTest/ZXL/Timeline/first/4/1-4.playable @@ -4051,6 +4051,7 @@ MonoBehaviour: - {fileID: 1308402172955920895} - {fileID: -7349800994023337538} - {fileID: -3727953138479953394} + - {fileID: 3380951217326714550} - {fileID: -3890754444066327061} - {fileID: 5762696575413513829} - {fileID: -5151550474741809273} @@ -4943,6 +4944,111 @@ MonoBehaviour: m_Loop: 0 m_Version: 1 m_Rotation: {x: 0, y: 0, z: 0, w: 1} +--- !u!114 &3380951217326714550 +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 (17) + 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: 30.016666666666666 + m_ClipIn: 0 + m_Asset: {fileID: 3631046556063395804} + m_Duration: 16.367991628994545 + m_TimeScale: 1 + m_ParentTrack: {fileID: 3380951217326714550} + 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 &3631046556063395804 +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 &4093283734063041663 MonoBehaviour: m_ObjectHideFlags: 1 diff --git a/Assets/UnityTest/ZXL/Timeline/third/1/3-1.playable b/Assets/UnityTest/ZXL/Timeline/third/1/3-1.playable index 25842304..a12ca038 100644 --- a/Assets/UnityTest/ZXL/Timeline/third/1/3-1.playable +++ b/Assets/UnityTest/ZXL/Timeline/third/1/3-1.playable @@ -340,6 +340,30 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fde0d25a170598d46a0b9dc16b4527a5, type: 3} m_Name: ActivationPlayableAsset m_EditorClassIdentifier: +--- !u!114 &-6140706245439905431 +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 (7) + 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 &-5156510335991347295 MonoBehaviour: m_ObjectHideFlags: 1 @@ -888,6 +912,7 @@ MonoBehaviour: - {fileID: -4537791393037083819} - {fileID: 5457770882652769369} - {fileID: -8586970984175606962} + - {fileID: -6140706245439905431} - {fileID: 4901517399552899008} - {fileID: 3708511450069442029} - {fileID: 8741245137966128610} diff --git a/Assets/UnityTest/ZXL/Timeline/third/6/3-6.playable b/Assets/UnityTest/ZXL/Timeline/third/6/3-6.playable index 95b07c07..2a4ac99e 100644 --- a/Assets/UnityTest/ZXL/Timeline/third/6/3-6.playable +++ b/Assets/UnityTest/ZXL/Timeline/third/6/3-6.playable @@ -1,5 +1,17 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!114 &-7937226552987324073 +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 &-7517858922797123470 MonoBehaviour: m_ObjectHideFlags: 1 @@ -1222,6 +1234,7 @@ MonoBehaviour: - {fileID: -2874692046920710348} - {fileID: -4655930145863088553} - {fileID: 6664253316566297471} + - {fileID: 6667462319075996530} m_FixedDuration: 0 m_EditorSettings: m_Framerate: 60 @@ -1444,7 +1457,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 @@ -1471,7 +1502,25 @@ MonoBehaviour: m_BlendOutDuration: -1 m_MixInCurve: serializedVersion: 2 - m_Curve: [] + 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 @@ -1689,6 +1738,99 @@ MonoBehaviour: m_Markers: m_Objects: - {fileID: -3642929888178310773} +--- !u!114 &6667462319075996530 +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 (5) + 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: 7.55 + m_ClipIn: 0 + m_Asset: {fileID: -7937226552987324073} + m_Duration: 5.383333333333333 + m_TimeScale: 1 + m_ParentTrack: {fileID: 6667462319075996530} + 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 &8169917803613984941 MonoBehaviour: m_ObjectHideFlags: 1