From 4d7fe1fa1c9ccc3644c446d7c8cee1e07f0df446 Mon Sep 17 00:00:00 2001 From: cblech Date: Sun, 5 Jan 2025 19:08:44 +0100 Subject: [PATCH] Added Music to timeline --- Assets/Main.mixer | 3 +- Assets/Prefabs/SceneBasics.prefab | 45 ++++ Assets/Scenes/SecondTry.unity | 195 +++++++++++++++++- Assets/Scripts/MusicManager.cs | 31 +++ Assets/Scripts/ReturnToMainMenu.cs | 15 ++ Assets/Scripts/ReturnToMainMenu.cs.meta | 2 + Assets/Signals/Music.signal | 14 ++ Assets/Signals/Music.signal.meta | 8 + Assets/Timelines/1-MainMenuTimeline.playable | 41 ++++ .../15-TrashRightLegTimeline.playable | 41 ++++ .../Timelines/20-DoggyTurnTimeline.playable | 41 ++++ .../22-DoggyOPDetailTimeline.playable | 41 ++++ .../23-JeremyPowerUpTimeline.playable | 17 ++ .../5-WorkshopFirstLookTimeline.playable | 17 ++ .../6-DoggyWithFirstArmTimeline.playable | 41 ++++ ...niversalRenderPipelineGlobalSettings.asset | 130 ++++++------ 16 files changed, 614 insertions(+), 68 deletions(-) create mode 100644 Assets/Scripts/ReturnToMainMenu.cs create mode 100644 Assets/Scripts/ReturnToMainMenu.cs.meta create mode 100644 Assets/Signals/Music.signal create mode 100644 Assets/Signals/Music.signal.meta diff --git a/Assets/Main.mixer b/Assets/Main.mixer index f8fe690..ebd7ffa 100644 --- a/Assets/Main.mixer +++ b/Assets/Main.mixer @@ -150,7 +150,8 @@ AudioMixerSnapshotController: m_Name: Snapshot m_AudioMixer: {fileID: 24100000} m_SnapshotID: 13333b49960512348b7a2815273ad462 - m_FloatValues: {} + m_FloatValues: + 123b1d2824fdc9947a3f764c54ad0eeb: -16.660439 m_TransitionOverrides: {} --- !u!243 &6485322140526855340 AudioMixerGroupController: diff --git a/Assets/Prefabs/SceneBasics.prefab b/Assets/Prefabs/SceneBasics.prefab index e0f836d..d38bda9 100644 --- a/Assets/Prefabs/SceneBasics.prefab +++ b/Assets/Prefabs/SceneBasics.prefab @@ -141,6 +141,7 @@ Transform: - {fileID: 7398008089674865407} - {fileID: 750704102962528561} - {fileID: 4532477003407849038} + - {fileID: 1246535691794865856} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &3582756679087629794 @@ -946,6 +947,50 @@ AudioSource: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 +--- !u!1 &8921046308740132086 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1246535691794865856} + - component: {fileID: 2148659914358893172} + m_Layer: 0 + m_Name: Resetter + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1246535691794865856 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8921046308740132086} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 6534699924056499542} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &2148659914358893172 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8921046308740132086} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 94d32097486fc794cb466619a9571d58, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &8961537913259028911 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/SecondTry.unity b/Assets/Scenes/SecondTry.unity index 0d290d3..f1f2abf 100644 --- a/Assets/Scenes/SecondTry.unity +++ b/Assets/Scenes/SecondTry.unity @@ -129,6 +129,7 @@ GameObject: m_Component: - component: {fileID: 37478705} - component: {fileID: 37478706} + - component: {fileID: 37478707} m_Layer: 0 m_Name: 6-DoggyWithFirstArm m_TagString: Untagged @@ -176,8 +177,25 @@ PlayableDirector: value: {fileID: 1655854536} - key: {fileID: 2845738039573819732, guid: 05c95ba7c04696c43a66646eda0c1872, type: 2} value: {fileID: 614152673} + - key: {fileID: -7451755293292363163, guid: 05c95ba7c04696c43a66646eda0c1872, type: 2} + value: {fileID: 37478707} m_ExposedReferences: m_References: [] +--- !u!114 &37478707 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 37478704} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e52de21a22b6dd44c9cc19f810c65059, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Events: + m_Signals: [] + m_Events: [] --- !u!1 &37857173 GameObject: m_ObjectHideFlags: 0 @@ -524,6 +542,7 @@ MonoBehaviour: m_Events: m_Signals: - {fileID: 11400000, guid: 7ff41bb94f156fe458259794407f867f, type: 2} + - {fileID: 11400000, guid: 17897fa9d0c81d248a34fc0ff93fac69, type: 2} m_Events: - m_PersistentCalls: m_Calls: @@ -539,6 +558,20 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 + - m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1712245177} + m_TargetAssemblyTypeName: MusicManager, Assembly-CSharp + m_MethodName: PlayMusicFinaleBuildUp + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!1 &92100610 GameObject: m_ObjectHideFlags: 0 @@ -3565,6 +3598,7 @@ GameObject: m_Component: - component: {fileID: 666077052} - component: {fileID: 666077053} + - component: {fileID: 666077054} m_Layer: 0 m_Name: 1-MainMenu m_TagString: Untagged @@ -3606,8 +3640,40 @@ PlayableDirector: value: {fileID: 2005490199} - key: {fileID: 7424517097278253482, guid: 7a2b8a832524b58409674b14bab5f69a, type: 2} value: {fileID: 491528497} + - key: {fileID: 2093478255871917301, guid: 7a2b8a832524b58409674b14bab5f69a, type: 2} + value: {fileID: 666077054} m_ExposedReferences: m_References: [] +--- !u!114 &666077054 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 666077051} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e52de21a22b6dd44c9cc19f810c65059, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Events: + m_Signals: + - {fileID: 11400000, guid: 17897fa9d0c81d248a34fc0ff93fac69, type: 2} + m_Events: + - m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1712245177} + m_TargetAssemblyTypeName: MusicManager, Assembly-CSharp + m_MethodName: PlayMusicCozy + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!1 &668583055 GameObject: m_ObjectHideFlags: 0 @@ -4452,6 +4518,7 @@ GameObject: m_Component: - component: {fileID: 824061400} - component: {fileID: 824061401} + - component: {fileID: 824061402} m_Layer: 0 m_Name: 15-TrashRightLeg m_TagString: Untagged @@ -4496,9 +4563,41 @@ PlayableDirector: value: {fileID: 881863053} - key: {fileID: 4484598294104975580, guid: 7e63ca2f70cff174984580bc91332e21, type: 2} value: {fileID: 614152673} + - key: {fileID: -6749673999287359741, guid: 7e63ca2f70cff174984580bc91332e21, type: 2} + value: {fileID: 824061402} m_ExposedReferences: m_References: - 1bc3b4f78c985f64d802b91dd1927376: {fileID: 43342454} +--- !u!114 &824061402 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 824061399} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e52de21a22b6dd44c9cc19f810c65059, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Events: + m_Signals: + - {fileID: 11400000, guid: 17897fa9d0c81d248a34fc0ff93fac69, type: 2} + m_Events: + - m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1712245177} + m_TargetAssemblyTypeName: MusicManager, Assembly-CSharp + m_MethodName: PlayMusicBuilding + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!1 &866295404 GameObject: m_ObjectHideFlags: 0 @@ -8851,7 +8950,7 @@ MonoBehaviour: m_BoolArgument: 0 m_CallState: 2 _outlineFx: {fileID: 0} - isActive: 0 + isActive: 1 --- !u!1 &1671845398 GameObject: m_ObjectHideFlags: 0 @@ -9025,6 +9124,7 @@ GameObject: m_Component: - component: {fileID: 1672360742} - component: {fileID: 1672360743} + - component: {fileID: 1672360744} m_Layer: 0 m_Name: 20-DoggyTurn m_TagString: Untagged @@ -9082,8 +9182,40 @@ PlayableDirector: value: {fileID: 1712245181} - key: {fileID: 4271253055062602636, guid: f23c08ddf12082242b7dfc9154555ee7, type: 2} value: {fileID: 614152673} + - key: {fileID: -2856112576394045403, guid: f23c08ddf12082242b7dfc9154555ee7, type: 2} + value: {fileID: 1672360744} m_ExposedReferences: m_References: [] +--- !u!114 &1672360744 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1672360741} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e52de21a22b6dd44c9cc19f810c65059, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Events: + m_Signals: + - {fileID: 11400000, guid: 17897fa9d0c81d248a34fc0ff93fac69, type: 2} + m_Events: + - m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1712245177} + m_TargetAssemblyTypeName: MusicManager, Assembly-CSharp + m_MethodName: PlayMusicTurnAround + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!1 &1676006750 GameObject: m_ObjectHideFlags: 0 @@ -9266,6 +9398,17 @@ MonoBehaviour: m_MipBias: 0 m_VarianceClampScale: 0.9 m_ContrastAdaptiveSharpening: 0 +--- !u!114 &1712245177 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 4726213464259086350, guid: 6288754d3f1f19e4aac4dbf1b5033c50, type: 3} + m_PrefabInstance: {fileID: 1712245174} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d105854c4ef8253498191cabbacf6202, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!95 &1712245181 Animator: serializedVersion: 7 @@ -9624,6 +9767,7 @@ MonoBehaviour: m_Events: m_Signals: - {fileID: 11400000, guid: 7ff41bb94f156fe458259794407f867f, type: 2} + - {fileID: 11400000, guid: 17897fa9d0c81d248a34fc0ff93fac69, type: 2} m_Events: - m_PersistentCalls: m_Calls: @@ -9639,6 +9783,20 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 + - m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1712245177} + m_TargetAssemblyTypeName: MusicManager, Assembly-CSharp + m_MethodName: PlayMusicCozyPlusTrash + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!114 &1792707390 MonoBehaviour: m_ObjectHideFlags: 0 @@ -10261,13 +10419,14 @@ GameObject: m_Component: - component: {fileID: 2025623354} - component: {fileID: 2025623355} + - component: {fileID: 2025623356} m_Layer: 0 m_Name: 22-DoggyOPDetail m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!4 &2025623354 Transform: m_ObjectHideFlags: 0 @@ -10306,8 +10465,40 @@ PlayableDirector: value: {fileID: 1012237401} - key: {fileID: 6245622514681690319, guid: c7a2a808b906f4847ab929c8df47c049, type: 2} value: {fileID: 614152673} + - key: {fileID: 1619188942213112811, guid: c7a2a808b906f4847ab929c8df47c049, type: 2} + value: {fileID: 2025623356} m_ExposedReferences: m_References: [] +--- !u!114 &2025623356 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2025623353} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e52de21a22b6dd44c9cc19f810c65059, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Events: + m_Signals: + - {fileID: 11400000, guid: 17897fa9d0c81d248a34fc0ff93fac69, type: 2} + m_Events: + - m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1712245177} + m_TargetAssemblyTypeName: MusicManager, Assembly-CSharp + m_MethodName: PlayMusicTurnAroundPlusJeremyLives + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!1 &2028584897 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/MusicManager.cs b/Assets/Scripts/MusicManager.cs index c6a61be..d494d17 100644 --- a/Assets/Scripts/MusicManager.cs +++ b/Assets/Scripts/MusicManager.cs @@ -39,6 +39,37 @@ public class MusicManager : MonoBehaviour [SerializeField] private AudioSource _FinaleBuildUpSource; + public void PlayMusicCozy() + { + currentTrack = Track.Cozy; + } + + public void PlayMusicCozyPlusTrash() + { + currentTrack = Track.CozyPlusTrash; + } + + public void PlayMusicBuilding() + { + currentTrack = Track.Building; + } + + public void PlayMusicTurnAround() + { + currentTrack = Track.TurnAround; + } + + public void PlayMusicTurnAroundPlusJeremyLives() + { + currentTrack = Track.TurnAroundPlusJeremyLives; + } + + public void PlayMusicFinaleBuildUp() + { + currentTrack = Track.FinaleBuildUp; + } + + public void PlayMusic(Track track) { currentTrack = track; diff --git a/Assets/Scripts/ReturnToMainMenu.cs b/Assets/Scripts/ReturnToMainMenu.cs new file mode 100644 index 0000000..b732d1a --- /dev/null +++ b/Assets/Scripts/ReturnToMainMenu.cs @@ -0,0 +1,15 @@ +using UnityEngine; +using UnityEngine.SceneManagement; + +public class ReturnToMainMenu : MonoBehaviour +{ + + // Update is called once per frame + void Update() + { + if (Input.GetKeyDown(KeyCode.Q)) + { + SceneSwitcher.Instance.SwitchScene(0); + } + } +} diff --git a/Assets/Scripts/ReturnToMainMenu.cs.meta b/Assets/Scripts/ReturnToMainMenu.cs.meta new file mode 100644 index 0000000..64c84f3 --- /dev/null +++ b/Assets/Scripts/ReturnToMainMenu.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 94d32097486fc794cb466619a9571d58 \ No newline at end of file diff --git a/Assets/Signals/Music.signal b/Assets/Signals/Music.signal new file mode 100644 index 0000000..4f91f5f --- /dev/null +++ b/Assets/Signals/Music.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: Music + m_EditorClassIdentifier: diff --git a/Assets/Signals/Music.signal.meta b/Assets/Signals/Music.signal.meta new file mode 100644 index 0000000..995c4b8 --- /dev/null +++ b/Assets/Signals/Music.signal.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 17897fa9d0c81d248a34fc0ff93fac69 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Timelines/1-MainMenuTimeline.playable b/Assets/Timelines/1-MainMenuTimeline.playable index 37bdc4e..29ca68e 100644 --- a/Assets/Timelines/1-MainMenuTimeline.playable +++ b/Assets/Timelines/1-MainMenuTimeline.playable @@ -109,6 +109,7 @@ MonoBehaviour: m_Tracks: - {fileID: -3014622215544060849} - {fileID: 7424517097278253482} + - {fileID: 2093478255871917301} m_FixedDuration: 0 m_EditorSettings: m_Framerate: 60 @@ -127,6 +128,30 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fde0d25a170598d46a0b9dc16b4527a5, type: 3} m_Name: ActivationPlayableAsset m_EditorClassIdentifier: +--- !u!114 &2093478255871917301 +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: 5554847729490436949} --- !u!114 &2121136880385598890 MonoBehaviour: m_ObjectHideFlags: 1 @@ -139,6 +164,22 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fde0d25a170598d46a0b9dc16b4527a5, type: 3} m_Name: ActivationPlayableAsset m_EditorClassIdentifier: +--- !u!114 &5554847729490436949 +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: 17897fa9d0c81d248a34fc0ff93fac69, type: 2} --- !u!114 &7424517097278253482 MonoBehaviour: m_ObjectHideFlags: 1 diff --git a/Assets/Timelines/15-TrashRightLegTimeline.playable b/Assets/Timelines/15-TrashRightLegTimeline.playable index 2aaa6ee..3871978 100644 --- a/Assets/Timelines/15-TrashRightLegTimeline.playable +++ b/Assets/Timelines/15-TrashRightLegTimeline.playable @@ -12,6 +12,30 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fde0d25a170598d46a0b9dc16b4527a5, type: 3} m_Name: ActivationPlayableAsset m_EditorClassIdentifier: +--- !u!114 &-6749673999287359741 +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: -2548736304627437202} --- !u!114 &-5495804328322236321 MonoBehaviour: m_ObjectHideFlags: 1 @@ -201,6 +225,22 @@ MonoBehaviour: m_Markers: m_Objects: [] m_PostPlaybackState: 3 +--- !u!114 &-2548736304627437202 +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: 17897fa9d0c81d248a34fc0ff93fac69, type: 2} --- !u!114 &-2263587155866186371 MonoBehaviour: m_ObjectHideFlags: 1 @@ -248,6 +288,7 @@ MonoBehaviour: - {fileID: -4186213564920504375} - {fileID: -5495804328322236321} - {fileID: 4484598294104975580} + - {fileID: -6749673999287359741} m_FixedDuration: 0 m_EditorSettings: m_Framerate: 60 diff --git a/Assets/Timelines/20-DoggyTurnTimeline.playable b/Assets/Timelines/20-DoggyTurnTimeline.playable index fec98fb..5e4253f 100644 --- a/Assets/Timelines/20-DoggyTurnTimeline.playable +++ b/Assets/Timelines/20-DoggyTurnTimeline.playable @@ -300,6 +300,30 @@ MonoBehaviour: volume: 1 stereoPan: 0 spatialBlend: 0 +--- !u!114 &-2856112576394045403 +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: 2158885892645426362} --- !u!114 &-1021264088509499193 MonoBehaviour: m_ObjectHideFlags: 1 @@ -382,6 +406,7 @@ MonoBehaviour: - {fileID: 778745253601670405} - {fileID: -3175387091829829856} - {fileID: 4271253055062602636} + - {fileID: -2856112576394045403} m_FixedDuration: 0 m_EditorSettings: m_Framerate: 60 @@ -583,6 +608,22 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 9f56a4c3fb40a3447ad70f8c9eaa3730, type: 3} m_Name: MyButtonTrackClip m_EditorClassIdentifier: +--- !u!114 &2158885892645426362 +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: 17897fa9d0c81d248a34fc0ff93fac69, type: 2} --- !u!114 &2382108922280598489 MonoBehaviour: m_ObjectHideFlags: 1 diff --git a/Assets/Timelines/22-DoggyOPDetailTimeline.playable b/Assets/Timelines/22-DoggyOPDetailTimeline.playable index 224dd02..2146c11 100644 --- a/Assets/Timelines/22-DoggyOPDetailTimeline.playable +++ b/Assets/Timelines/22-DoggyOPDetailTimeline.playable @@ -238,6 +238,7 @@ MonoBehaviour: - {fileID: -4884857283317208669} - {fileID: 6245622514681690319} - {fileID: 3788056184702097699} + - {fileID: 1619188942213112811} m_FixedDuration: 0 m_EditorSettings: m_Framerate: 60 @@ -268,6 +269,30 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 9f56a4c3fb40a3447ad70f8c9eaa3730, type: 3} m_Name: MyButtonTrackClip m_EditorClassIdentifier: +--- !u!114 &1619188942213112811 +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: 4680375421581920961} --- !u!114 &3788056184702097699 MonoBehaviour: m_ObjectHideFlags: 1 @@ -372,6 +397,22 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fde0d25a170598d46a0b9dc16b4527a5, type: 3} m_Name: ActivationPlayableAsset m_EditorClassIdentifier: +--- !u!114 &4680375421581920961 +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: 3.066666666666667 + m_Retroactive: 0 + m_EmitOnce: 0 + m_Asset: {fileID: 11400000, guid: 17897fa9d0c81d248a34fc0ff93fac69, type: 2} --- !u!114 &6245622514681690319 MonoBehaviour: m_ObjectHideFlags: 1 diff --git a/Assets/Timelines/23-JeremyPowerUpTimeline.playable b/Assets/Timelines/23-JeremyPowerUpTimeline.playable index 44bcaa9..6bcffb8 100644 --- a/Assets/Timelines/23-JeremyPowerUpTimeline.playable +++ b/Assets/Timelines/23-JeremyPowerUpTimeline.playable @@ -1,5 +1,21 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!114 &-8789908730229311606 +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: 8.983333333333333 + m_Retroactive: 0 + m_EmitOnce: 0 + m_Asset: {fileID: 11400000, guid: 17897fa9d0c81d248a34fc0ff93fac69, type: 2} --- !u!114 &-8243278030878092886 MonoBehaviour: m_ObjectHideFlags: 1 @@ -2354,6 +2370,7 @@ MonoBehaviour: m_Markers: m_Objects: - {fileID: 4919251609171802334} + - {fileID: -8789908730229311606} --- !u!114 &6946805870332341142 MonoBehaviour: m_ObjectHideFlags: 1 diff --git a/Assets/Timelines/5-WorkshopFirstLookTimeline.playable b/Assets/Timelines/5-WorkshopFirstLookTimeline.playable index c38bb2f..9c1d486 100644 --- a/Assets/Timelines/5-WorkshopFirstLookTimeline.playable +++ b/Assets/Timelines/5-WorkshopFirstLookTimeline.playable @@ -41,6 +41,7 @@ MonoBehaviour: m_Markers: m_Objects: - {fileID: 6940695200547958411} + - {fileID: 2826608638488037034} --- !u!114 &-7267927671596610429 MonoBehaviour: m_ObjectHideFlags: 1 @@ -553,6 +554,22 @@ MonoBehaviour: m_Name: SubtitleTrackClip m_EditorClassIdentifier: subtitleText: Jeremy ist aber leider noch nicht fertig. +--- !u!114 &2826608638488037034 +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: 17897fa9d0c81d248a34fc0ff93fac69, type: 2} --- !u!114 &3107905204910472718 MonoBehaviour: m_ObjectHideFlags: 1 diff --git a/Assets/Timelines/6-DoggyWithFirstArmTimeline.playable b/Assets/Timelines/6-DoggyWithFirstArmTimeline.playable index 00f3436..13d6ad2 100644 --- a/Assets/Timelines/6-DoggyWithFirstArmTimeline.playable +++ b/Assets/Timelines/6-DoggyWithFirstArmTimeline.playable @@ -12,6 +12,30 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fde0d25a170598d46a0b9dc16b4527a5, type: 3} m_Name: ActivationPlayableAsset m_EditorClassIdentifier: +--- !u!114 &-7451755293292363163 +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: 3121577379863605697} --- !u!114 &-7260204385717138581 MonoBehaviour: m_ObjectHideFlags: 1 @@ -69,6 +93,7 @@ MonoBehaviour: - {fileID: 3022711697355553447} - {fileID: 6711621071124173306} - {fileID: 2845738039573819732} + - {fileID: -7451755293292363163} m_FixedDuration: 0 m_EditorSettings: m_Framerate: 60 @@ -503,6 +528,22 @@ MonoBehaviour: m_DisplayName: MyButtonTrackClip m_Markers: m_Objects: [] +--- !u!114 &3121577379863605697 +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: 0} --- !u!114 &3845302467908430539 MonoBehaviour: m_ObjectHideFlags: 1 diff --git a/Assets/UniversalRenderPipelineGlobalSettings.asset b/Assets/UniversalRenderPipelineGlobalSettings.asset index a07bcfa..b5c9684 100644 --- a/Assets/UniversalRenderPipelineGlobalSettings.asset +++ b/Assets/UniversalRenderPipelineGlobalSettings.asset @@ -33,27 +33,27 @@ MonoBehaviour: m_Settings: m_SettingsList: m_List: - - rid: 540480424176779491 + - rid: 540480435489079570 - rid: 540480424176779492 - rid: 540480424176779493 - rid: 540480424176779494 - - rid: 540480424176779495 + - rid: 540480435489079571 - rid: 540480424176779496 - rid: 540480424176779497 - - rid: 540480424176779498 + - rid: 540480435489079572 - rid: 540480424176779499 - rid: 540480424176779500 - - rid: 540480424176779501 - - rid: 540480424176779502 + - rid: 540480435489079573 + - rid: 540480435489079574 - rid: 540480424176779503 - - rid: 540480424176779504 - - rid: 540480424176779505 - - rid: 540480424176779506 + - rid: 540480435489079575 + - rid: 540480435489079576 + - rid: 540480435489079577 - rid: 540480424176779507 - - rid: 540480424176779508 - - rid: 540480424176779509 + - rid: 540480435489079578 + - rid: 540480435489079579 - rid: 540480424176779510 - - rid: 540480424176779511 + - rid: 540480435489079580 m_RuntimeSettings: m_List: - rid: 540480424176779492 @@ -89,18 +89,6 @@ MonoBehaviour: references: version: 2 RefIds: - - rid: 540480424176779491 - type: {class: UniversalRenderPipelineEditorShaders, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} - data: - m_AutodeskInteractive: {fileID: 4800000, guid: 0e9d5a909a1f7e84882a534d0d11e49f, type: 3} - m_AutodeskInteractiveTransparent: {fileID: 4800000, guid: 5c81372d981403744adbdda4433c9c11, type: 3} - m_AutodeskInteractiveMasked: {fileID: 4800000, guid: 80aa867ac363ac043847b06ad71604cd, type: 3} - m_TerrainDetailLit: {fileID: 4800000, guid: f6783ab646d374f94b199774402a5144, type: 3} - m_TerrainDetailGrassBillboard: {fileID: 4800000, guid: 29868e73b638e48ca99a19ea58c48d90, type: 3} - m_TerrainDetailGrass: {fileID: 4800000, guid: e507fdfead5ca47e8b9a768b51c291a1, type: 3} - m_DefaultSpeedTree7Shader: {fileID: 4800000, guid: 0f4122b9a743b744abe2fb6a0a88868b, type: 3} - m_DefaultSpeedTree8Shader: {fileID: -6465566751694194690, guid: 9920c1f1781549a46ba081a2a15a16ec, type: 3} - m_DefaultSpeedTree9Shader: {fileID: -6465566751694194690, guid: cbd3e1cc4ae141c42a30e33b4d666a61, type: 3} - rid: 540480424176779492 type: {class: UniversalRenderPipelineRuntimeShaders, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} data: @@ -130,15 +118,6 @@ MonoBehaviour: data: m_Version: 0 m_VolumeProfile: {fileID: 11400000, guid: 8127a98b2c3ef674797b34ed1b7a9617, type: 2} - - rid: 540480424176779495 - type: {class: UniversalRenderPipelineEditorMaterials, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} - data: - m_DefaultMaterial: {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} - m_DefaultParticleMaterial: {fileID: 2100000, guid: e823cd5b5d27c0f4b8256e7c12ee3e6d, type: 2} - m_DefaultLineMaterial: {fileID: 2100000, guid: e823cd5b5d27c0f4b8256e7c12ee3e6d, type: 2} - m_DefaultTerrainMaterial: {fileID: 2100000, guid: 594ea882c5a793440b60ff72d896021e, type: 2} - m_DefaultDecalMaterial: {fileID: 2100000, guid: 31d0dcc6f2dd4e4408d18036a2c93862, type: 2} - m_DefaultSpriteMaterial: {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2} - rid: 540480424176779496 type: {class: UniversalRenderPipelineRuntimeXRResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} data: @@ -152,13 +131,6 @@ MonoBehaviour: m_BlueNoise64LTex: {fileID: 2800000, guid: e3d24661c1e055f45a7560c033dbb837, type: 3} m_BayerMatrixTex: {fileID: 2800000, guid: f9ee4ed84c1d10c49aabb9b210b0fc44, type: 3} m_DebugFontTex: {fileID: 2800000, guid: 26a413214480ef144b2915d6ff4d0beb, type: 3} - - rid: 540480424176779498 - type: {class: URPShaderStrippingSetting, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} - data: - m_Version: 0 - m_StripUnusedPostProcessingVariants: 0 - m_StripUnusedVariants: 1 - m_StripScreenCoordOverrideVariants: 1 - rid: 540480424176779499 type: {class: UniversalRenderPipelineDebugShaders, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} data: @@ -170,7 +142,53 @@ MonoBehaviour: data: m_Version: 0 m_EnableRenderCompatibilityMode: 1 - - rid: 540480424176779501 + - rid: 540480424176779503 + type: {class: RenderGraphGlobalSettings, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} + data: + m_version: 0 + m_EnableCompilationCaching: 1 + m_EnableValidityChecks: 1 + - rid: 540480424176779507 + type: {class: RenderGraphUtilsResources, ns: UnityEngine.Rendering.RenderGraphModule.Util, asm: Unity.RenderPipelines.Core.Runtime} + data: + m_Version: 0 + m_CoreCopyPS: {fileID: 4800000, guid: 12dc59547ea167a4ab435097dd0f9add, type: 3} + - rid: 540480424176779510 + type: {class: ShaderStrippingSetting, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} + data: + m_Version: 0 + m_ExportShaderVariants: 1 + m_ShaderVariantLogLevel: 0 + m_StripRuntimeDebugShaders: 1 + - rid: 540480435489079570 + type: {class: UniversalRenderPipelineEditorShaders, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} + data: + m_AutodeskInteractive: {fileID: 4800000, guid: 0e9d5a909a1f7e84882a534d0d11e49f, type: 3} + m_AutodeskInteractiveTransparent: {fileID: 4800000, guid: 5c81372d981403744adbdda4433c9c11, type: 3} + m_AutodeskInteractiveMasked: {fileID: 4800000, guid: 80aa867ac363ac043847b06ad71604cd, type: 3} + m_TerrainDetailLit: {fileID: 4800000, guid: f6783ab646d374f94b199774402a5144, type: 3} + m_TerrainDetailGrassBillboard: {fileID: 4800000, guid: 29868e73b638e48ca99a19ea58c48d90, type: 3} + m_TerrainDetailGrass: {fileID: 4800000, guid: e507fdfead5ca47e8b9a768b51c291a1, type: 3} + m_DefaultSpeedTree7Shader: {fileID: 4800000, guid: 0f4122b9a743b744abe2fb6a0a88868b, type: 3} + m_DefaultSpeedTree8Shader: {fileID: -6465566751694194690, guid: 9920c1f1781549a46ba081a2a15a16ec, type: 3} + m_DefaultSpeedTree9Shader: {fileID: -6465566751694194690, guid: cbd3e1cc4ae141c42a30e33b4d666a61, type: 3} + - rid: 540480435489079571 + type: {class: UniversalRenderPipelineEditorMaterials, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} + data: + m_DefaultMaterial: {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + m_DefaultParticleMaterial: {fileID: 2100000, guid: e823cd5b5d27c0f4b8256e7c12ee3e6d, type: 2} + m_DefaultLineMaterial: {fileID: 2100000, guid: e823cd5b5d27c0f4b8256e7c12ee3e6d, type: 2} + m_DefaultTerrainMaterial: {fileID: 2100000, guid: 594ea882c5a793440b60ff72d896021e, type: 2} + m_DefaultDecalMaterial: {fileID: 2100000, guid: 31d0dcc6f2dd4e4408d18036a2c93862, type: 2} + m_DefaultSpriteMaterial: {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2} + - rid: 540480435489079572 + type: {class: URPShaderStrippingSetting, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} + data: + m_Version: 0 + m_StripUnusedPostProcessingVariants: 0 + m_StripUnusedVariants: 1 + m_StripScreenCoordOverrideVariants: 1 + - rid: 540480435489079573 type: {class: UniversalRendererResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} data: m_Version: 0 @@ -178,7 +196,7 @@ MonoBehaviour: m_CameraMotionVector: {fileID: 4800000, guid: c56b7e0d4c7cb484e959caeeedae9bbf, type: 3} m_StencilDeferredPS: {fileID: 4800000, guid: e9155b26e1bc55942a41e518703fe304, type: 3} m_DBufferClear: {fileID: 4800000, guid: f056d8bd2a1c7e44e9729144b4c70395, type: 3} - - rid: 540480424176779502 + - rid: 540480435489079574 type: {class: GPUResidentDrawerResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.GPUDriven.Runtime} data: m_Version: 0 @@ -191,27 +209,21 @@ MonoBehaviour: m_OcclusionCullingDebugKernels: {fileID: 7200000, guid: b23e766bcf50ca4438ef186b174557df, type: 3} m_DebugOcclusionTestPS: {fileID: 4800000, guid: d3f0849180c2d0944bc71060693df100, type: 3} m_DebugOccluderPS: {fileID: 4800000, guid: b3c92426a88625841ab15ca6a7917248, type: 3} - - rid: 540480424176779503 - type: {class: RenderGraphGlobalSettings, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} - data: - m_version: 0 - m_EnableCompilationCaching: 1 - m_EnableValidityChecks: 1 - - rid: 540480424176779504 + - rid: 540480435489079575 type: {class: ProbeVolumeRuntimeResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} data: m_Version: 1 probeVolumeBlendStatesCS: {fileID: 7200000, guid: a3f7b8c99de28a94684cb1daebeccf5d, type: 3} probeVolumeUploadDataCS: {fileID: 7200000, guid: 0951de5992461754fa73650732c4954c, type: 3} probeVolumeUploadDataL2CS: {fileID: 7200000, guid: 6196f34ed825db14b81fb3eb0ea8d931, type: 3} - - rid: 540480424176779505 + - rid: 540480435489079576 type: {class: IncludeAdditionalRPAssets, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} data: m_version: 0 m_IncludeReferencedInScenes: 0 m_IncludeAssetsByLabel: 0 m_LabelToInclude: - - rid: 540480424176779506 + - rid: 540480435489079577 type: {class: ProbeVolumeBakingResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} data: m_Version: 1 @@ -224,12 +236,7 @@ MonoBehaviour: skyOcclusionRT: {fileID: -5126288278712620388, guid: 5a2a534753fbdb44e96c3c78b5a6999d, type: 3} renderingLayerCS: {fileID: -6772857160820960102, guid: 94a070d33e408384bafc1dea4a565df9, type: 3} renderingLayerRT: {fileID: -5126288278712620388, guid: 94a070d33e408384bafc1dea4a565df9, type: 3} - - rid: 540480424176779507 - type: {class: RenderGraphUtilsResources, ns: UnityEngine.Rendering.RenderGraphModule.Util, asm: Unity.RenderPipelines.Core.Runtime} - data: - m_Version: 0 - m_CoreCopyPS: {fileID: 4800000, guid: 12dc59547ea167a4ab435097dd0f9add, type: 3} - - rid: 540480424176779508 + - rid: 540480435489079578 type: {class: ProbeVolumeDebugResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} data: m_Version: 1 @@ -239,19 +246,12 @@ MonoBehaviour: probeVolumeOffsetDebugShader: {fileID: 4800000, guid: db8bd7436dc2c5f4c92655307d198381, type: 3} probeSamplingDebugMesh: {fileID: -3555484719484374845, guid: 20be25aac4e22ee49a7db76fb3df6de2, type: 3} numbersDisplayTex: {fileID: 2800000, guid: 73fe53b428c5b3440b7e87ee830b608a, type: 3} - - rid: 540480424176779509 + - rid: 540480435489079579 type: {class: ProbeVolumeGlobalSettings, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} data: m_Version: 1 m_ProbeVolumeDisableStreamingAssets: 0 - - rid: 540480424176779510 - type: {class: ShaderStrippingSetting, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} - data: - m_Version: 0 - m_ExportShaderVariants: 1 - m_ShaderVariantLogLevel: 0 - m_StripRuntimeDebugShaders: 1 - - rid: 540480424176779511 + - rid: 540480435489079580 type: {class: STP/RuntimeResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} data: m_setupCS: {fileID: 7200000, guid: 33be2e9a5506b2843bdb2bdff9cad5e1, type: 3}