From 15dd11a6f94b7eacd060e85c659ff62c728b3620 Mon Sep 17 00:00:00 2001 From: Adam Ramberg Date: Mon, 2 Mar 2020 19:40:34 +0100 Subject: [PATCH] Fix example scenes --- Examples/Assets/Intro/Intro.unity | 11 ++--- Examples/Assets/UniRx/UniRx.unity | 72 +++++++++++++++++-------------- 2 files changed, 46 insertions(+), 37 deletions(-) diff --git a/Examples/Assets/Intro/Intro.unity b/Examples/Assets/Intro/Intro.unity index 91d6e803..52632add 100644 --- a/Examples/Assets/Intro/Intro.unity +++ b/Examples/Assets/Intro/Intro.unity @@ -525,7 +525,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f1c809a089b464a50a8620b8da884f31, type: 3} m_Name: m_EditorClassIdentifier: - Health: {fileID: 0} + Health: {fileID: 11400000, guid: 50206c000343d496fa82bd362e3b3b2b, type: 2} --- !u!114 &854994185 MonoBehaviour: m_ObjectHideFlags: 0 @@ -539,6 +539,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: _tags: + - {fileID: 11400000, guid: 23f42a77324bd4158a00555f04f7824e, type: 2} - {fileID: 0} --- !u!1 &973978720 GameObject: @@ -844,9 +845,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: bced320f87ec14de98a51ee9c0ebb03e, type: 3} m_Name: m_EditorClassIdentifier: - _UIStateVariable: {fileID: 0} + _UIStateVariable: {fileID: 11400000, guid: ca4bd447b40154988be601bad9c84506, type: 2} _visibleForStates: - - {fileID: 0} + - {fileID: 11400000, guid: 0f191ae005f2448dfb420563d3f089a7, type: 2} --- !u!1 &1067648696 GameObject: m_ObjectHideFlags: 0 @@ -1239,9 +1240,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: bced320f87ec14de98a51ee9c0ebb03e, type: 3} m_Name: m_EditorClassIdentifier: - _UIStateVariable: {fileID: 0} + _UIStateVariable: {fileID: 11400000, guid: ca4bd447b40154988be601bad9c84506, type: 2} _visibleForStates: - - {fileID: 0} + - {fileID: 11400000, guid: cb8238ac7ef5d407fb31219fe114d2ae, type: 2} --- !u!1 &1459948897 GameObject: m_ObjectHideFlags: 0 diff --git a/Examples/Assets/UniRx/UniRx.unity b/Examples/Assets/UniRx/UniRx.unity index a081400f..d99b96ad 100644 --- a/Examples/Assets/UniRx/UniRx.unity +++ b/Examples/Assets/UniRx/UniRx.unity @@ -96,6 +96,7 @@ LightmapSettings: m_PVRFilteringAtrousPositionSigmaAO: 1 m_ExportTrainingData: 0 m_TrainingDataDestination: TrainingData + m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 0} m_UseShadowmask: 1 --- !u!196 &4 @@ -247,8 +248,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: df9d93e69065440c2b752b81e4dbacd1, type: 3} m_Name: m_EditorClassIdentifier: - _maxHealth: {fileID: 11400000, guid: 41aa2296cd68a4b718a8fd1bd8ad5a95, type: 2} - _health: {fileID: 11400000, guid: 30c71ebe6587c4fe8b18d5279710b4dc, type: 2} + _health: {fileID: 11400000, guid: 50206c000343d496fa82bd362e3b3b2b, type: 2} --- !u!114 &145633449 MonoBehaviour: m_ObjectHideFlags: 0 @@ -366,7 +366,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &854994178 GameObject: @@ -416,7 +416,7 @@ Transform: m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &854994181 SpriteRenderer: @@ -432,6 +432,7 @@ SpriteRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -526,7 +527,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f1c809a089b464a50a8620b8da884f31, type: 3} m_Name: m_EditorClassIdentifier: - Health: {fileID: 11400000, guid: 30c71ebe6587c4fe8b18d5279710b4dc, type: 2} + Health: {fileID: 11400000, guid: 50206c000343d496fa82bd362e3b3b2b, type: 2} --- !u!114 &854994185 MonoBehaviour: m_ObjectHideFlags: 0 @@ -913,7 +914,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1128657630 GameObject: @@ -1162,13 +1163,43 @@ RectTransform: - {fileID: 1399228591} - {fileID: 1055906073} m_Father: {fileID: 0} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} +--- !u!1 &1351447217 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1111135183548040, guid: f4cdf4b23d0154814b9975c71d15466b, + type: 3} + m_PrefabInstance: {fileID: 1322628080651166342} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1351447218 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1351447217} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 050ff37b5550f4b7e9bdf8b985aff484, type: 3} + m_Name: + m_EditorClassIdentifier: + _developerDescription: + _unityEventResponse: + m_PersistentCalls: + m_Calls: [] + _actionResponses: + - {fileID: 11400000, guid: 58f78c691d84e44cd84c884aadacf21a, type: 2} + _eventReference: + _usage: 0 + _event: {fileID: 11400000, guid: fb1508338b66f42099fceb52aa22cf4c, type: 2} + _eventInstancer: {fileID: 0} + _variable: {fileID: 0} + _variableInstancer: {fileID: 0} --- !u!1 &1399228590 GameObject: m_ObjectHideFlags: 0 @@ -1792,7 +1823,8 @@ PrefabInstance: propertyPath: _unityEventResponse.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName value: objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 114212381404589792, guid: f4cdf4b23d0154814b9975c71d15466b, type: 3} m_SourcePrefab: {fileID: 100100000, guid: f4cdf4b23d0154814b9975c71d15466b, type: 3} --- !u!1001 &4425509693841326314 PrefabInstance: @@ -1858,27 +1890,3 @@ PrefabInstance: m_RemovedComponents: - {fileID: 5067224520480043162, guid: 01e7046886cdb499a99f4bed284db6a1, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 01e7046886cdb499a99f4bed284db6a1, type: 3} ---- !u!1 &4425509693841326315 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 1776152155576434, guid: 01e7046886cdb499a99f4bed284db6a1, - type: 3} - m_PrefabInstance: {fileID: 4425509693841326314} - m_PrefabAsset: {fileID: 0} ---- !u!114 &4425509693841326316 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4425509693841326315} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d6b2ba18c3f8e4b409ccb9db0bcd4ce5, type: 3} - m_Name: - m_EditorClassIdentifier: - Event: {fileID: 11400000, guid: 5c0f015f6258d41f0bfefbfe014169cf, type: 2} - EventWithGameObjectReference: {fileID: 0} - _selectGameObjectReference: {fileID: 0} - _triggerOnEnter: 1 - _triggerOnExit: 0 - _triggerOnStay: 0