Updated Discover with better handling for PlayableDirector Actions

5 年前 · 4e20ceb3
--- a/Assets/Scenes/Spaceship/Spaceship_LD.unity
+++ b/Assets/Scenes/Spaceship/Spaceship_LD.unity
    - target: {fileID: 8093936953533293329, guid: 121a558423b86f748ad5d1d2bfb0726b,
        type: 3}
      propertyPath: m_IsActive
-      value: 0
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 770918023806767499, guid: 121a558423b86f748ad5d1d2bfb0726b,
        type: 3}
    - target: {fileID: 6773719536125375938, guid: 121a558423b86f748ad5d1d2bfb0726b,
        type: 3}
      propertyPath: m_Enabled
-      value: 0
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 7395329105956178968, guid: 121a558423b86f748ad5d1d2bfb0726b,
        type: 3}
    SectionContent: The intro timeline gathers all animation, audio and script for
      the introduction of the sequence.
    Actions:
-    - Description: Timeline Game Object
-      Target: {fileID: 1215627718}
-    - Description: Timeline Asset
-      Target: {fileID: 11400000, guid: aff85b061b792dd459c7852dc150feae, type: 2}
+    - Description: Introduction Timeline
+      Target: {fileID: 1215627721}
+    - Description: Door Open Timeline
+      Target: {fileID: 4491288562871868901}
    - Description: In Editor Preview Camera (Debug)
      Target: {fileID: 296498929}
  - SectionName: Animated Door (Intro Specific)
    - target: {fileID: 6339412032765467694, guid: eae930db8733cb94faece5e5e28a6971,
        type: 3}
      propertyPath: m_IsActive
-      value: 0
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 7105583794536475867, guid: eae930db8733cb94faece5e5e28a6971,
        type: 3}
    - target: {fileID: 8835803652683809974, guid: eae930db8733cb94faece5e5e28a6971,
        type: 3}
      propertyPath: m_Enabled
-      value: 0
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 8835803652683809981, guid: eae930db8733cb94faece5e5e28a6971,
        type: 3}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 122056121}
-  m_Enabled: 0
+  m_Enabled: 1
  m_CastShadows: 0
  m_ReceiveShadows: 0
  m_DynamicOccludee: 1
      targets.'
    Actions:
    - Description: Alert Timeline
-      Target: {fileID: 1724704493}
+      Target: {fileID: 1724704496}
    - Description: Main VFX
      Target: {fileID: 8926484042661614526, guid: a90015afc76247443adc491f5ce38870,
        type: 3}
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!4 &222509506
 Transform:
  m_ObjectHideFlags: 0
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 222509505}
-  m_Enabled: 0
+  m_Enabled: 1
  m_CastShadows: 0
  m_ReceiveShadows: 0
  m_DynamicOccludee: 1
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!4 &231637109
 Transform:
  m_ObjectHideFlags: 0
  m_Name: 
  m_EditorClassIdentifier: 
  m_ExecuteInEditor: 1
-  m_Bindings: []
+  m_Bindings:
+  - {fileID: 231637115}
+  - {fileID: 231637114}
  m_VisualEffect: {fileID: 231637113}
 --- !u!73398921 &231637112
 VFXRenderer:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 231637108}
-  m_Enabled: 0
+  m_Enabled: 1
  m_CastShadows: 0
  m_ReceiveShadows: 0
  m_DynamicOccludee: 1
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!4 &288907321
 Transform:
  m_ObjectHideFlags: 0
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 288907320}
-  m_Enabled: 0
+  m_Enabled: 1
  m_CastShadows: 0
  m_ReceiveShadows: 0
  m_DynamicOccludee: 1
    - target: {fileID: 6339412032765467694, guid: eae930db8733cb94faece5e5e28a6971,
        type: 3}
      propertyPath: m_IsActive
-      value: 0
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 7105583794536475867, guid: eae930db8733cb94faece5e5e28a6971,
        type: 3}
    - target: {fileID: 8835803652683809974, guid: eae930db8733cb94faece5e5e28a6971,
        type: 3}
      propertyPath: m_Enabled
-      value: 0
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 8835803652683809981, guid: eae930db8733cb94faece5e5e28a6971,
        type: 3}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 421008120}
-  m_Enabled: 0
+  m_Enabled: 1
  m_CastShadows: 0
  m_ReceiveShadows: 0
  m_DynamicOccludee: 1
    - Description: Login Sequence Root
      Target: {fileID: 1872206184}
    - Description: Timeline
-      Target: {fileID: 11400000, guid: c493c8da31c69c94a906107b0b355b57, type: 2}
+      Target: {fileID: 1872206187}
    - Description: 'VFX : Background Pane'
      Target: {fileID: 8926484042661614526, guid: 77ea475f326e0cf4b920e08f2407816d,
        type: 3}
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!4 &558696551
 Transform:
  m_ObjectHideFlags: 0
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 558696550}
-  m_Enabled: 0
+  m_Enabled: 1
  m_CastShadows: 0
  m_ReceiveShadows: 0
  m_DynamicOccludee: 1
  m_RenderingLayerMask: 1
  m_RendererPriority: 0
  m_Materials:
-  - {fileID: 0}
  - {fileID: 0}
  - {fileID: 0}
  - {fileID: 0}
  m_Name: 
  m_EditorClassIdentifier: 
  m_ExecuteInEditor: 1
-  m_Bindings: []
+  m_Bindings:
+  - {fileID: 558696554}
  m_VisualEffect: {fileID: 558696553}
 --- !u!1 &562487022
 GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!4 &693561817
 Transform:
  m_ObjectHideFlags: 0
  m_Name: 
  m_EditorClassIdentifier: 
  m_ExecuteInEditor: 1
-  m_Bindings: []
+  m_Bindings:
+  - {fileID: 693561818}
  m_VisualEffect: {fileID: 693561821}
 --- !u!73398921 &693561820
 VFXRenderer:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 693561816}
-  m_Enabled: 0
+  m_Enabled: 1
  m_CastShadows: 0
  m_ReceiveShadows: 0
  m_DynamicOccludee: 1
  m_RenderingLayerMask: 1
  m_RendererPriority: 0
  m_Materials:
-  - {fileID: 0}
  - {fileID: 0}
  - {fileID: 0}
  - {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1103111085}
-  m_Enabled: 0
+  m_Enabled: 1
  m_CastShadows: 0
  m_ReceiveShadows: 0
  m_DynamicOccludee: 1
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!4 &1225818234
 Transform:
  m_ObjectHideFlags: 0
  m_Name: 
  m_EditorClassIdentifier: 
  m_ExecuteInEditor: 1
-  m_Bindings: []
+  m_Bindings:
+  - {fileID: 1225818235}
  m_VisualEffect: {fileID: 1225818238}
 --- !u!73398921 &1225818237
 VFXRenderer:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1225818233}
-  m_Enabled: 0
+  m_Enabled: 1
  m_CastShadows: 0
  m_ReceiveShadows: 0
  m_DynamicOccludee: 1
      Target: {fileID: 8926484042661614526, guid: 5a76904835c86af4f9089ceb91c1f8f3,
        type: 3}
    - Description: Looping Animation
-      Target: {fileID: 1659247560}
-    - Description: Timeline
-      Target: {fileID: 11400000, guid: b3e4b1dda021070449c87c3c9889db75, type: 2}
+      Target: {fileID: 1659247563}
  - SectionName: Going to the next State
    SectionContent: 'Upon Entering the Trigger, the player triggers the state change
      of the State Machine from '
      a set of interactive planets.
    Actions:
    - Description: Opening Timeline
-      Target: {fileID: 1377262143}
+      Target: {fileID: 1377262146}
    - Description: Root Scene Object
      Target: {fileID: 1892397007}
    - Description: Planet VFX
    - Description: Root Object
      Target: {fileID: 409463118}
    - Description: Opening Timeline
-      Target: {fileID: 100306583}
+      Target: {fileID: 100306586}
    - Description: Galaxy VFX Graph
      Target: {fileID: 8926484042661614526, guid: a00ea9360a500a046b7289ccddea56d6,
        type: 3}
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!4 &1840947101
 Transform:
  m_ObjectHideFlags: 0
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1840947100}
-  m_Enabled: 0
+  m_Enabled: 1
  m_CastShadows: 0
  m_ReceiveShadows: 0
  m_DynamicOccludee: 1
  m_RenderingLayerMask: 1
  m_RendererPriority: 0
  m_Materials:
-  - {fileID: 0}
  - {fileID: 0}
  - {fileID: 0}
  - {fileID: 0}
  m_Name: 
  m_EditorClassIdentifier: 
  m_ExecuteInEditor: 1
-  m_Bindings: []
+  m_Bindings:
+  - {fileID: 1840947104}
  m_VisualEffect: {fileID: 1840947103}
 --- !u!1 &1846261231
 GameObject:
      triggered at the end of the timeline.'
    Actions:
    - Description: Transition + Scan Timeline
-      Target: {fileID: 903704807}
+      Target: {fileID: 903704810}
    - Description: Pin Screen VFX
      Target: {fileID: 8926484042661614526, guid: 5a76904835c86af4f9089ceb91c1f8f3,
        type: 3}
    - target: {fileID: 3999544795325332815, guid: 36060410c536b7f41aef1167a497bc03,
        type: 3}
      propertyPath: m_IsActive
-      value: 0
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 3999544795325332812, guid: 36060410c536b7f41aef1167a497bc03,
        type: 3}
    - target: {fileID: 7536699061915691602, guid: 36060410c536b7f41aef1167a497bc03,
        type: 3}
      propertyPath: m_Enabled
-      value: 0
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 7536699061915691602, guid: 36060410c536b7f41aef1167a497bc03,
        type: 3}
  m_Icon: {fileID: 8418204508859773708, guid: 0000000000000000d000000000000000, type: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!4 &1892397008
 Transform:
  m_ObjectHideFlags: 0
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!4 &1954251703
 Transform:
  m_ObjectHideFlags: 0
  m_Name: 
  m_EditorClassIdentifier: 
  m_ExecuteInEditor: 1
-  m_Bindings: []
+  m_Bindings:
+  - {fileID: 1954251704}
  m_VisualEffect: {fileID: 1954251707}
 --- !u!73398921 &1954251706
 VFXRenderer:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1954251702}
-  m_Enabled: 0
+  m_Enabled: 1
  m_CastShadows: 0
  m_ReceiveShadows: 0
  m_DynamicOccludee: 1
  m_RenderingLayerMask: 1
  m_RendererPriority: 0
  m_Materials:
-  - {fileID: 0}
  - {fileID: 0}
  - {fileID: 0}
  - {fileID: 0}
      of the Alert.'
    Actions:
    - Description: Core Depletion Timeline
-      Target: {fileID: 853526720}
+      Target: {fileID: 853526723}
    - Description: Ship Core (Nucleus + Events)
      Target: {fileID: 8926484042661614526, guid: 7fe66147a719b064dae2eca99b3e7760,
        type: 3}
      the Core Hit Timeline that controls both events and parameters."
    Actions:
    - Description: Core Hit Timeline
-      Target: {fileID: 493632545}
+      Target: {fileID: 493632548}
    - Description: Core Visual Effect
      Target: {fileID: 183492633}
  - SectionName: 'Next State : Wrecked Room'
    - target: {fileID: 8093936953533293329, guid: 121a558423b86f748ad5d1d2bfb0726b,
        type: 3}
      propertyPath: m_IsActive
-      value: 0
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 770918023806767499, guid: 121a558423b86f748ad5d1d2bfb0726b,
        type: 3}
    - target: {fileID: 6773719536125375938, guid: 121a558423b86f748ad5d1d2bfb0726b,
        type: 3}
      propertyPath: m_Enabled
-      value: 0
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 7395329105956178968, guid: 121a558423b86f748ad5d1d2bfb0726b,
        type: 3}
    - target: {fileID: 7395329105956178968, guid: 121a558423b86f748ad5d1d2bfb0726b,
        type: 3}
      propertyPath: m_Enabled
-      value: 0
+      value: 1
      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: 121a558423b86f748ad5d1d2bfb0726b, type: 3}
    - target: {fileID: 7660099872938097455, guid: 327fa13727455184f964993ce7f440da,
        type: 3}
      propertyPath: m_Enabled
-      value: 0
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 4059716053816343495, guid: 327fa13727455184f964993ce7f440da,
        type: 3}
    - target: {fileID: 6844143513303384915, guid: a02ecd8819d4762419ba3db87647fe3b,
        type: 3}
      propertyPath: m_Enabled
-      value: 0
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 928425700605494203, guid: a02ecd8819d4762419ba3db87647fe3b,
        type: 3}
    type: 3}
  m_PrefabInstance: {fileID: 4491288562871868898}
  m_PrefabAsset: {fileID: 0}
+--- !u!320 &4491288562871868901 stripped
+PlayableDirector:
+  m_CorrespondingSourceObject: {fileID: 4491288562856828603, guid: 217d2408b2d414746963e5a4fda23bee,
+    type: 3}
+  m_PrefabInstance: {fileID: 4491288562871868898}
+  m_PrefabAsset: {fileID: 0}
 --- !u!4 &4621624834313966343
 Transform:
  m_ObjectHideFlags: 0
    - target: {fileID: 3595417953437637124, guid: ad004882a4525124aa5f0f62cb871e3f,
        type: 3}
      propertyPath: m_Enabled
-      value: 0
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 450479329459638031, guid: ad004882a4525124aa5f0f62cb871e3f,
        type: 3}
    - target: {fileID: 2995061074926258824, guid: 54548549e90682c458551c1d59338a01,
        type: 3}
      propertyPath: m_Enabled
-      value: 0
+      value: 1
      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: 54548549e90682c458551c1d59338a01, type: 3}
    - target: {fileID: 2430614744843432221, guid: 86c3ac5285fac2b4189fd1467e2a28fe,
        type: 3}
      propertyPath: m_Enabled
-      value: 0
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 2358060171923390977, guid: 86c3ac5285fac2b4189fd1467e2a28fe,
        type: 3}
    - target: {fileID: 1538546691493051009, guid: e62f6accf406c8c49a2704cfdc8464ef,
        type: 3}
      propertyPath: m_Enabled
-      value: 0
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 1466132855381690781, guid: e62f6accf406c8c49a2704cfdc8464ef,
        type: 3}
    - target: {fileID: 6339412032765467694, guid: eae930db8733cb94faece5e5e28a6971,
        type: 3}
      propertyPath: m_IsActive
-      value: 0
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 7105583794536475867, guid: eae930db8733cb94faece5e5e28a6971,
        type: 3}
    - target: {fileID: 8835803652683809974, guid: eae930db8733cb94faece5e5e28a6971,
        type: 3}
      propertyPath: m_Enabled
-      value: 0
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 8835803652683809981, guid: eae930db8733cb94faece5e5e28a6971,
        type: 3}
    - target: {fileID: 2704855277785929649, guid: eae930db8733cb94faece5e5e28a6971,
        type: 3}
      propertyPath: m_Enabled
-      value: 0
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 2704855277785929649, guid: eae930db8733cb94faece5e5e28a6971,
        type: 3}
--- a/LocalPackages/net.peeweek.gameplay-ingredients/Editor/Discover/DiscoverEditor.cs
+++ b/LocalPackages/net.peeweek.gameplay-ingredients/Editor/Discover/DiscoverEditor.cs
 using System.Collections.Generic;
 using UnityEngine;
 using UnityEditor;
+using UnityEngine.Playables;
 #if UNITY_2019_3_OR_NEWER
 using UnityEngine.VFX;
 #else
                {
                    TimelineAsset timeline = target as TimelineAsset;
                    AssetDatabase.OpenAsset(timeline);
+                }
+            }
+            else if (t == typeof(PlayableDirector))
+            {
+                if (GUILayout.Button("Open Director"))
+                {
+                    PlayableDirector director = target as PlayableDirector;
+
+                    AssetDatabase.OpenAsset(director.playableAsset);
+                    Selection.activeObject = director.gameObject;
                }
            }
            else if (t == typeof(Shader))