From 49ef44273e72c15bdb6550d7baf097343ad3f992 Mon Sep 17 00:00:00 2001 From: BlackMATov Date: Fri, 25 Nov 2016 03:10:43 +0700 Subject: [PATCH] to 5.4 --- .../Examples/Prefabs/Kenney/Building.prefab | 27 +- .../Examples/Prefabs/Kenney/Building2.prefab | 36 +- .../Examples/Prefabs/Kenney/Building3.prefab | 27 +- .../Examples/Prefabs/Kenney/Fence.prefab | 9 +- .../Examples/Prefabs/Kenney/Fence2.prefab | 9 +- .../Examples/Prefabs/Kenney/Road.prefab | 9 +- .../Examples/Prefabs/Kenney/Road2.prefab | 9 +- .../Examples/Prefabs/Kenney/Road3.prefab | 9 +- .../Examples/Prefabs/Kenney/Road4.prefab | 9 +- .../Examples/Prefabs/Kenney/Tile.prefab | 9 +- .../Examples/Prefabs/Kenney/Tree.prefab | 9 +- .../Examples/Prefabs/Kenney/Water.prefab | 9 +- .../Examples/Prefabs/Kenney/Water2.prefab | 9 +- .../Examples/Prefabs/Kenney/Water3.prefab | 9 +- .../Examples/Prefabs/Kenney/Water4.prefab | 317 ++++++++++++++++-- ProjectSettings/EditorBuildSettings.asset | 2 + ProjectSettings/ProjectSettings.asset | 133 ++++++-- ProjectSettings/ProjectVersion.txt | 2 +- 18 files changed, 527 insertions(+), 116 deletions(-) diff --git a/Assets/IsoTools/Examples/Prefabs/Kenney/Building.prefab b/Assets/IsoTools/Examples/Prefabs/Kenney/Building.prefab index 8adbec7..96326db 100644 --- a/Assets/IsoTools/Examples/Prefabs/Kenney/Building.prefab +++ b/Assets/IsoTools/Examples/Prefabs/Kenney/Building.prefab @@ -178,17 +178,20 @@ SpriteRenderer: m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 m_Materials: - - {fileID: 10754, guid: 0000000000000000e000000000000000, type: 0} + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} m_SubsetIndices: m_StaticBatchRoot: {fileID: 0} - m_UseLightProbes: 1 - m_ReflectionProbeUsage: 1 m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_SelectedWireframeHidden: 1 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 @@ -208,17 +211,20 @@ SpriteRenderer: m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 m_Materials: - - {fileID: 10754, guid: 0000000000000000e000000000000000, type: 0} + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} m_SubsetIndices: m_StaticBatchRoot: {fileID: 0} - m_UseLightProbes: 1 - m_ReflectionProbeUsage: 1 m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_SelectedWireframeHidden: 1 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 @@ -238,17 +244,20 @@ SpriteRenderer: m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 m_Materials: - - {fileID: 10754, guid: 0000000000000000e000000000000000, type: 0} + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} m_SubsetIndices: m_StaticBatchRoot: {fileID: 0} - m_UseLightProbes: 1 - m_ReflectionProbeUsage: 1 m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_SelectedWireframeHidden: 1 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 diff --git a/Assets/IsoTools/Examples/Prefabs/Kenney/Building2.prefab b/Assets/IsoTools/Examples/Prefabs/Kenney/Building2.prefab index 5206730..37df339 100644 --- a/Assets/IsoTools/Examples/Prefabs/Kenney/Building2.prefab +++ b/Assets/IsoTools/Examples/Prefabs/Kenney/Building2.prefab @@ -208,17 +208,20 @@ SpriteRenderer: m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 m_Materials: - - {fileID: 10754, guid: 0000000000000000e000000000000000, type: 0} + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} m_SubsetIndices: m_StaticBatchRoot: {fileID: 0} - m_UseLightProbes: 1 - m_ReflectionProbeUsage: 1 m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_SelectedWireframeHidden: 1 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 @@ -238,17 +241,20 @@ SpriteRenderer: m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 m_Materials: - - {fileID: 10754, guid: 0000000000000000e000000000000000, type: 0} + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} m_SubsetIndices: m_StaticBatchRoot: {fileID: 0} - m_UseLightProbes: 1 - m_ReflectionProbeUsage: 1 m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_SelectedWireframeHidden: 1 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 @@ -268,17 +274,20 @@ SpriteRenderer: m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 m_Materials: - - {fileID: 10754, guid: 0000000000000000e000000000000000, type: 0} + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} m_SubsetIndices: m_StaticBatchRoot: {fileID: 0} - m_UseLightProbes: 1 - m_ReflectionProbeUsage: 1 m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_SelectedWireframeHidden: 1 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 @@ -298,17 +307,20 @@ SpriteRenderer: m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 m_Materials: - - {fileID: 10754, guid: 0000000000000000e000000000000000, type: 0} + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} m_SubsetIndices: m_StaticBatchRoot: {fileID: 0} - m_UseLightProbes: 1 - m_ReflectionProbeUsage: 1 m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_SelectedWireframeHidden: 1 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 diff --git a/Assets/IsoTools/Examples/Prefabs/Kenney/Building3.prefab b/Assets/IsoTools/Examples/Prefabs/Kenney/Building3.prefab index a544459..ff482cd 100644 --- a/Assets/IsoTools/Examples/Prefabs/Kenney/Building3.prefab +++ b/Assets/IsoTools/Examples/Prefabs/Kenney/Building3.prefab @@ -178,17 +178,20 @@ SpriteRenderer: m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 m_Materials: - - {fileID: 10754, guid: 0000000000000000e000000000000000, type: 0} + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} m_SubsetIndices: m_StaticBatchRoot: {fileID: 0} - m_UseLightProbes: 1 - m_ReflectionProbeUsage: 1 m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_SelectedWireframeHidden: 1 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 @@ -208,17 +211,20 @@ SpriteRenderer: m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 m_Materials: - - {fileID: 10754, guid: 0000000000000000e000000000000000, type: 0} + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} m_SubsetIndices: m_StaticBatchRoot: {fileID: 0} - m_UseLightProbes: 1 - m_ReflectionProbeUsage: 1 m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_SelectedWireframeHidden: 1 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 @@ -238,17 +244,20 @@ SpriteRenderer: m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 m_Materials: - - {fileID: 10754, guid: 0000000000000000e000000000000000, type: 0} + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} m_SubsetIndices: m_StaticBatchRoot: {fileID: 0} - m_UseLightProbes: 1 - m_ReflectionProbeUsage: 1 m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_SelectedWireframeHidden: 1 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 diff --git a/Assets/IsoTools/Examples/Prefabs/Kenney/Fence.prefab b/Assets/IsoTools/Examples/Prefabs/Kenney/Fence.prefab index cb6a0a3..1094439 100644 --- a/Assets/IsoTools/Examples/Prefabs/Kenney/Fence.prefab +++ b/Assets/IsoTools/Examples/Prefabs/Kenney/Fence.prefab @@ -84,17 +84,20 @@ SpriteRenderer: m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 m_Materials: - - {fileID: 10754, guid: 0000000000000000e000000000000000, type: 0} + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} m_SubsetIndices: m_StaticBatchRoot: {fileID: 0} - m_UseLightProbes: 1 - m_ReflectionProbeUsage: 1 m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_SelectedWireframeHidden: 1 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 diff --git a/Assets/IsoTools/Examples/Prefabs/Kenney/Fence2.prefab b/Assets/IsoTools/Examples/Prefabs/Kenney/Fence2.prefab index c757dad..bdec1f4 100644 --- a/Assets/IsoTools/Examples/Prefabs/Kenney/Fence2.prefab +++ b/Assets/IsoTools/Examples/Prefabs/Kenney/Fence2.prefab @@ -84,17 +84,20 @@ SpriteRenderer: m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 m_Materials: - - {fileID: 10754, guid: 0000000000000000e000000000000000, type: 0} + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} m_SubsetIndices: m_StaticBatchRoot: {fileID: 0} - m_UseLightProbes: 1 - m_ReflectionProbeUsage: 1 m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_SelectedWireframeHidden: 1 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 diff --git a/Assets/IsoTools/Examples/Prefabs/Kenney/Road.prefab b/Assets/IsoTools/Examples/Prefabs/Kenney/Road.prefab index 0777848..2e11e78 100644 --- a/Assets/IsoTools/Examples/Prefabs/Kenney/Road.prefab +++ b/Assets/IsoTools/Examples/Prefabs/Kenney/Road.prefab @@ -84,17 +84,20 @@ SpriteRenderer: m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 m_Materials: - - {fileID: 10754, guid: 0000000000000000e000000000000000, type: 0} + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} m_SubsetIndices: m_StaticBatchRoot: {fileID: 0} - m_UseLightProbes: 1 - m_ReflectionProbeUsage: 1 m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_SelectedWireframeHidden: 1 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 diff --git a/Assets/IsoTools/Examples/Prefabs/Kenney/Road2.prefab b/Assets/IsoTools/Examples/Prefabs/Kenney/Road2.prefab index a799369..748b6b5 100644 --- a/Assets/IsoTools/Examples/Prefabs/Kenney/Road2.prefab +++ b/Assets/IsoTools/Examples/Prefabs/Kenney/Road2.prefab @@ -84,17 +84,20 @@ SpriteRenderer: m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 m_Materials: - - {fileID: 10754, guid: 0000000000000000e000000000000000, type: 0} + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} m_SubsetIndices: m_StaticBatchRoot: {fileID: 0} - m_UseLightProbes: 1 - m_ReflectionProbeUsage: 1 m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_SelectedWireframeHidden: 1 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 diff --git a/Assets/IsoTools/Examples/Prefabs/Kenney/Road3.prefab b/Assets/IsoTools/Examples/Prefabs/Kenney/Road3.prefab index 75ca209..02b4289 100644 --- a/Assets/IsoTools/Examples/Prefabs/Kenney/Road3.prefab +++ b/Assets/IsoTools/Examples/Prefabs/Kenney/Road3.prefab @@ -84,17 +84,20 @@ SpriteRenderer: m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 m_Materials: - - {fileID: 10754, guid: 0000000000000000e000000000000000, type: 0} + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} m_SubsetIndices: m_StaticBatchRoot: {fileID: 0} - m_UseLightProbes: 1 - m_ReflectionProbeUsage: 1 m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_SelectedWireframeHidden: 1 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 diff --git a/Assets/IsoTools/Examples/Prefabs/Kenney/Road4.prefab b/Assets/IsoTools/Examples/Prefabs/Kenney/Road4.prefab index 43c30ac..e2b49b8 100644 --- a/Assets/IsoTools/Examples/Prefabs/Kenney/Road4.prefab +++ b/Assets/IsoTools/Examples/Prefabs/Kenney/Road4.prefab @@ -84,17 +84,20 @@ SpriteRenderer: m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 m_Materials: - - {fileID: 10754, guid: 0000000000000000e000000000000000, type: 0} + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} m_SubsetIndices: m_StaticBatchRoot: {fileID: 0} - m_UseLightProbes: 1 - m_ReflectionProbeUsage: 1 m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_SelectedWireframeHidden: 1 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 diff --git a/Assets/IsoTools/Examples/Prefabs/Kenney/Tile.prefab b/Assets/IsoTools/Examples/Prefabs/Kenney/Tile.prefab index 09319e2..9fd1a69 100644 --- a/Assets/IsoTools/Examples/Prefabs/Kenney/Tile.prefab +++ b/Assets/IsoTools/Examples/Prefabs/Kenney/Tile.prefab @@ -84,17 +84,20 @@ SpriteRenderer: m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 m_Materials: - - {fileID: 10754, guid: 0000000000000000e000000000000000, type: 0} + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} m_SubsetIndices: m_StaticBatchRoot: {fileID: 0} - m_UseLightProbes: 1 - m_ReflectionProbeUsage: 1 m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_SelectedWireframeHidden: 1 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 diff --git a/Assets/IsoTools/Examples/Prefabs/Kenney/Tree.prefab b/Assets/IsoTools/Examples/Prefabs/Kenney/Tree.prefab index 1c7caab..d227062 100644 --- a/Assets/IsoTools/Examples/Prefabs/Kenney/Tree.prefab +++ b/Assets/IsoTools/Examples/Prefabs/Kenney/Tree.prefab @@ -84,17 +84,20 @@ SpriteRenderer: m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 m_Materials: - - {fileID: 10754, guid: 0000000000000000e000000000000000, type: 0} + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} m_SubsetIndices: m_StaticBatchRoot: {fileID: 0} - m_UseLightProbes: 1 - m_ReflectionProbeUsage: 1 m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_SelectedWireframeHidden: 1 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 diff --git a/Assets/IsoTools/Examples/Prefabs/Kenney/Water.prefab b/Assets/IsoTools/Examples/Prefabs/Kenney/Water.prefab index a5eb9b9..cdaaf86 100644 --- a/Assets/IsoTools/Examples/Prefabs/Kenney/Water.prefab +++ b/Assets/IsoTools/Examples/Prefabs/Kenney/Water.prefab @@ -84,17 +84,20 @@ SpriteRenderer: m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 m_Materials: - - {fileID: 10754, guid: 0000000000000000e000000000000000, type: 0} + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} m_SubsetIndices: m_StaticBatchRoot: {fileID: 0} - m_UseLightProbes: 1 - m_ReflectionProbeUsage: 1 m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_SelectedWireframeHidden: 1 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 diff --git a/Assets/IsoTools/Examples/Prefabs/Kenney/Water2.prefab b/Assets/IsoTools/Examples/Prefabs/Kenney/Water2.prefab index 6c7504d..83dfc8e 100644 --- a/Assets/IsoTools/Examples/Prefabs/Kenney/Water2.prefab +++ b/Assets/IsoTools/Examples/Prefabs/Kenney/Water2.prefab @@ -84,17 +84,20 @@ SpriteRenderer: m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 m_Materials: - - {fileID: 10754, guid: 0000000000000000e000000000000000, type: 0} + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} m_SubsetIndices: m_StaticBatchRoot: {fileID: 0} - m_UseLightProbes: 1 - m_ReflectionProbeUsage: 1 m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_SelectedWireframeHidden: 1 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 diff --git a/Assets/IsoTools/Examples/Prefabs/Kenney/Water3.prefab b/Assets/IsoTools/Examples/Prefabs/Kenney/Water3.prefab index 38245b0..9e228e6 100644 --- a/Assets/IsoTools/Examples/Prefabs/Kenney/Water3.prefab +++ b/Assets/IsoTools/Examples/Prefabs/Kenney/Water3.prefab @@ -84,17 +84,20 @@ SpriteRenderer: m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 m_Materials: - - {fileID: 10754, guid: 0000000000000000e000000000000000, type: 0} + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} m_SubsetIndices: m_StaticBatchRoot: {fileID: 0} - m_UseLightProbes: 1 - m_ReflectionProbeUsage: 1 m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_SelectedWireframeHidden: 1 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 diff --git a/Assets/IsoTools/Examples/Prefabs/Kenney/Water4.prefab b/Assets/IsoTools/Examples/Prefabs/Kenney/Water4.prefab index 2605228..b1832be 100644 --- a/Assets/IsoTools/Examples/Prefabs/Kenney/Water4.prefab +++ b/Assets/IsoTools/Examples/Prefabs/Kenney/Water4.prefab @@ -112,7 +112,7 @@ ParticleSystem: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 122872} - serializedVersion: 2 + serializedVersion: 4 lengthInSec: 5 startDelay: scalar: 0 @@ -150,12 +150,13 @@ ParticleSystem: m_RotationOrder: 4 minMaxState: 0 speed: 1 - randomSeed: 0 looping: 1 prewarm: 0 playOnAwake: 1 moveWithTransform: 1 + autoRandomSeed: 1 scalingMode: 2 + randomSeed: 0 InitialModule: serializedVersion: 2 enabled: 1 @@ -220,6 +221,7 @@ ParticleSystem: m_RotationOrder: 4 minMaxState: 0 startColor: + serializedVersion: 2 maxGradient: key0: serializedVersion: 2 @@ -306,12 +308,8 @@ ParticleSystem: atime7: 0 m_NumColorKeys: 2 m_NumAlphaKeys: 2 - minColor: - serializedVersion: 2 - rgba: 1610612659 - maxColor: - serializedVersion: 2 - rgba: 4278190003 + minColor: {r: 0.7019608, g: 1, b: 1, a: 0.37254903} + maxColor: {r: 0.7019608, g: 1, b: 1, a: 0.99607843} minMaxState: 2 startSize: scalar: 0.03 @@ -338,6 +336,76 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 minMaxState: 3 + startSizeY: + scalar: 1 + maxCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minMaxState: 0 + startSizeZ: + scalar: 1 + maxCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minMaxState: 0 startRotationX: scalar: 1 maxCurve: @@ -446,6 +514,7 @@ ParticleSystem: randomizeRotationDirection: 0 gravityModifier: 0 maxNumParticles: 1000 + size3D: 0 rotation3D: 0 ShapeModule: serializedVersion: 2 @@ -556,6 +625,77 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 minMaxState: 1 + y: + scalar: 1 + maxCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minMaxState: 1 + z: + scalar: 1 + maxCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minMaxState: 1 + separateAxes: 0 RotationModule: enabled: 0 x: @@ -667,6 +807,7 @@ ParticleSystem: ColorModule: enabled: 0 gradient: + serializedVersion: 2 maxGradient: key0: serializedVersion: 2 @@ -753,17 +894,13 @@ ParticleSystem: atime7: 0 m_NumColorKeys: 2 m_NumAlphaKeys: 2 - minColor: - serializedVersion: 2 - rgba: 4294967295 - maxColor: - serializedVersion: 2 - rgba: 4294967295 + minColor: {r: 1, g: 1, b: 1, a: 1} + maxColor: {r: 1, g: 1, b: 1, a: 1} minMaxState: 1 UVModule: enabled: 0 frameOverTime: - scalar: 1 + scalar: 0.9999 maxCurve: serializedVersion: 2 m_Curve: @@ -797,11 +934,47 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 minMaxState: 1 + startFrame: + scalar: 0 + maxCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minMaxState: 0 tilesX: 1 tilesY: 1 animationType: 0 rowIndex: 0 cycles: 1 + uvChannelMask: -1 randomRow: 1 VelocityModule: enabled: 1 @@ -1213,7 +1386,78 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 minMaxState: 1 + y: + scalar: 1 + maxCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minMaxState: 1 + z: + scalar: 1 + maxCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minMaxState: 1 range: {x: 0, y: 1} + separateAxes: 0 RotationBySpeedModule: enabled: 0 x: @@ -1326,6 +1570,7 @@ ParticleSystem: ColorBySpeedModule: enabled: 0 gradient: + serializedVersion: 2 maxGradient: key0: serializedVersion: 2 @@ -1412,17 +1657,13 @@ ParticleSystem: atime7: 0 m_NumColorKeys: 2 m_NumAlphaKeys: 2 - minColor: - serializedVersion: 2 - rgba: 4294967295 - maxColor: - serializedVersion: 2 - rgba: 4294967295 + minColor: {r: 1, g: 1, b: 1, a: 1} + maxColor: {r: 1, g: 1, b: 1, a: 1} minMaxState: 1 range: {x: 0, y: 1} CollisionModule: enabled: 0 - serializedVersion: 2 + serializedVersion: 3 type: 0 collisionMode: 0 plane0: {fileID: 0} @@ -1537,6 +1778,7 @@ ParticleSystem: m_RotationOrder: 4 minMaxState: 0 minKillSpeed: 0 + maxKillSpeed: 10000 radiusScale: 1 collidesWith: serializedVersion: 2 @@ -1547,6 +1789,19 @@ ParticleSystem: collisionMessages: 0 collidesWithDynamic: 1 interiorCollisions: 1 + TriggerModule: + enabled: 0 + collisionShape0: {fileID: 0} + collisionShape1: {fileID: 0} + collisionShape2: {fileID: 0} + collisionShape3: {fileID: 0} + collisionShape4: {fileID: 0} + collisionShape5: {fileID: 0} + inside: 1 + outside: 0 + enter: 0 + exit: 0 + radiusScale: 1 SubModule: enabled: 0 subEmitterBirth: {fileID: 0} @@ -1564,17 +1819,20 @@ ParticleSystemRenderer: m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 m_Materials: - - {fileID: 10754, guid: 0000000000000000e000000000000000, type: 0} + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} m_SubsetIndices: m_StaticBatchRoot: {fileID: 0} - m_UseLightProbes: 1 - m_ReflectionProbeUsage: 1 m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_SelectedWireframeHidden: 0 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 @@ -1605,17 +1863,20 @@ SpriteRenderer: m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 m_Materials: - - {fileID: 10754, guid: 0000000000000000e000000000000000, type: 0} + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} m_SubsetIndices: m_StaticBatchRoot: {fileID: 0} - m_UseLightProbes: 1 - m_ReflectionProbeUsage: 1 m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_SelectedWireframeHidden: 1 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index 172ff12..6bca180 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -21,3 +21,5 @@ EditorBuildSettings: path: Assets/IsoTools/Examples/Scenes/Scene06.unity - enabled: 1 path: Assets/IsoTools/Examples/Scenes/Scene07.unity + - enabled: 1 + path: Assets/IsoTools/Examples/Scenes/Scene08.unity diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 65750c5..f76be36 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -4,6 +4,7 @@ PlayerSettings: m_ObjectHideFlags: 0 serializedVersion: 8 + productGUID: 0ae4d8e5611a65d45bd97550aa4471af AndroidProfiler: 0 defaultScreenOrientation: 4 targetDevice: 2 @@ -13,6 +14,7 @@ PlayerSettings: productName: UnityIso defaultCursor: {fileID: 0} cursorHotspot: {x: 0, y: 0} + m_SplashScreenStyle: 0 m_ShowUnitySplashScreen: 1 m_VirtualRealitySplashScreen: {fileID: 0} defaultScreenWidth: 1024 @@ -24,7 +26,7 @@ PlayerSettings: m_ActiveColorSpace: 0 m_MTRendering: 1 m_MobileMTRendering: 0 - m_Stereoscopic3D: 0 + m_StackTraceTypes: 010000000100000001000000010000000100000001000000 iosShowActivityIndicatorOnLoading: -1 androidShowActivityIndicatorOnLoading: -1 iosAppInBackgroundBehavior: 0 @@ -50,6 +52,7 @@ PlayerSettings: resizableWindow: 0 useMacAppStoreValidation: 0 gpuSkinning: 0 + graphicsJobs: 0 xboxPIXTextureCapture: 0 xboxEnableAvatar: 0 xboxEnableKinect: 0 @@ -64,7 +67,6 @@ PlayerSettings: xboxEnableHeadOrientation: 0 xboxEnableGuest: 0 xboxEnablePIXSampling: 0 - xboxEnableEnableRenderThreadRunsJobs: 0 n3dsDisableStereoscopicView: 0 n3dsEnableSharedListOpt: 1 n3dsEnableVSync: 0 @@ -72,6 +74,7 @@ PlayerSettings: ignoreAlphaClear: 0 xboxOneResolution: 0 xboxOneMonoLoggingLevel: 0 + xboxOneLoggingLevel: 1 ps3SplashScreen: {fileID: 0} videoMemoryForVertexBuffers: 0 psp2PowerMode: 0 @@ -95,10 +98,9 @@ PlayerSettings: bundleVersion: 1.0 preloadedAssets: [] metroEnableIndependentInputSource: 0 - metroEnableLowLatencyPresentationAPI: 0 xboxOneDisableKinectGpuReservation: 0 - virtualRealitySupported: 0 - productGUID: 0ae4d8e5611a65d45bd97550aa4471af + singlePassStereoRendering: 0 + protectGraphicsMemory: 0 AndroidBundleVersionCode: 1 AndroidMinSdkVersion: 9 AndroidPreferredInstallLocation: 1 @@ -121,6 +123,7 @@ PlayerSettings: iPhoneTargetOSVersion: 22 tvOSSdkVersion: 0 tvOSTargetOSVersion: 900 + tvOSRequireExtendedGameController: 0 uIPrerenderedIcon: 0 uIRequiresPersistentWiFi: 0 uIRequiresFullScreen: 1 @@ -159,6 +162,8 @@ PlayerSettings: iOSLaunchScreeniPadSize: 100 iOSLaunchScreeniPadCustomXibPath: iOSDeviceRequirements: [] + iOSURLSchemes: [] + appleDeveloperTeamID: AndroidTargetDevice: 0 AndroidSplashScreenScale: 0 androidSplashScreen: {fileID: 0} @@ -206,7 +211,9 @@ PlayerSettings: enableInternalProfiler: 0 logObjCUncaughtExceptions: 1 enableCrashReportAPI: 0 + cameraUsageDescription: locationUsageDescription: + microphoneUsageDescription: XboxTitleId: XboxImageXexPath: XboxSpaPath: @@ -246,7 +253,8 @@ PlayerSettings: ps4AppType: 0 ps4ParamSfxPath: ps4VideoOutPixelFormat: 0 - ps4VideoOutResolution: 4 + ps4VideoOutInitialWidth: 1920 + ps4VideoOutReprojectionRate: 120 ps4PronunciationXMLPath: ps4PronunciationSIGPath: ps4BackgroundImagePath: @@ -275,14 +283,18 @@ PlayerSettings: ps4pnFriends: 1 ps4pnGameCustomData: 1 playerPrefsSupport: 0 + ps4UseResolutionFallback: 0 + restrictedAudioUsageRights: 0 ps4ReprojectionSupport: 0 ps4UseAudio3dBackend: 0 ps4SocialScreenEnabled: 0 + ps4ScriptOptimizationLevel: 3 ps4Audio3dVirtualSpeakerCount: 14 ps4attribCpuUsage: 0 ps4PatchPkgPath: ps4PatchLatestPkgPath: ps4PatchChangeinfoPath: + ps4PatchDayOne: 0 ps4attribUserManagement: 0 ps4attribMoveSupport: 0 ps4attrib3DSupport: 0 @@ -366,29 +378,12 @@ PlayerSettings: metroFTAFileTypes: [] metroProtocolName: metroCompilationOverrides: 1 - blackberryDeviceAddress: - blackberryDevicePassword: - blackberryTokenPath: - blackberryTokenExires: - blackberryTokenAuthor: - blackberryTokenAuthorId: - blackberryCskPassword: - blackberrySaveLogPath: - blackberrySharedPermissions: 0 - blackberryCameraPermissions: 0 - blackberryGPSPermissions: 0 - blackberryDeviceIDPermissions: 0 - blackberryMicrophonePermissions: 0 - blackberryGamepadSupport: 0 - blackberryBuildId: 0 - blackberryLandscapeSplashScreen: {fileID: 0} - blackberryPortraitSplashScreen: {fileID: 0} - blackberrySquareSplashScreen: {fileID: 0} tizenProductDescription: tizenProductURL: tizenSigningProfileName: tizenGPSPermissions: 0 tizenMicrophonePermissions: 0 + tizenMinOSVersion: 0 n3dsUseExtSaveData: 0 n3dsCompressStaticMem: 1 n3dsExtSaveDataNumber: 0x12345 @@ -450,19 +445,109 @@ PlayerSettings: tvOS::EnableIncrementalBuildSupportForIl2cpp: 0 tvOS::ScriptingBackend: 1 boolPropertyNames: + - Android::VR::enable + - Metro::VR::enable + - N3DS::VR::enable + - PS3::VR::enable + - PS4::VR::enable + - PSM::VR::enable + - PSP2::VR::enable + - SamsungTV::VR::enable + - Standalone::VR::enable + - Tizen::VR::enable + - WebGL::VR::enable - WebGL::analyzeBuildSize - WebGL::dataCaching - WebGL::useEmbeddedResources + - WebPlayer::VR::enable + - WiiU::VR::enable + - Xbox360::VR::enable + - XboxOne::VR::enable + - iOS::VR::enable + - tvOS::VR::enable + Android::VR::enable: 0 + Metro::VR::enable: 0 + N3DS::VR::enable: 0 + PS3::VR::enable: 0 + PS4::VR::enable: 0 + PSM::VR::enable: 0 + PSP2::VR::enable: 0 + SamsungTV::VR::enable: 0 + Standalone::VR::enable: 0 + Tizen::VR::enable: 0 + WebGL::VR::enable: 0 WebGL::analyzeBuildSize: 0 WebGL::dataCaching: 0 WebGL::useEmbeddedResources: 0 + WebPlayer::VR::enable: 0 + WiiU::VR::enable: 0 + Xbox360::VR::enable: 0 + XboxOne::VR::enable: 0 + iOS::VR::enable: 0 + tvOS::VR::enable: 0 stringPropertyNames: + - Analytics_ServiceEnabled::Analytics_ServiceEnabled + - Build_ServiceEnabled::Build_ServiceEnabled + - Collab_ServiceEnabled::Collab_ServiceEnabled + - ErrorHub_ServiceEnabled::ErrorHub_ServiceEnabled + - Game_Performance_ServiceEnabled::Game_Performance_ServiceEnabled + - Hub_ServiceEnabled::Hub_ServiceEnabled + - Purchasing_ServiceEnabled::Purchasing_ServiceEnabled + - UNet_ServiceEnabled::UNet_ServiceEnabled + - Unity_Ads_ServiceEnabled::Unity_Ads_ServiceEnabled - WebGL::emscriptenArgs - WebGL::template - additionalIl2CppArgs::additionalIl2CppArgs + Analytics_ServiceEnabled::Analytics_ServiceEnabled: False + Build_ServiceEnabled::Build_ServiceEnabled: False + Collab_ServiceEnabled::Collab_ServiceEnabled: False + ErrorHub_ServiceEnabled::ErrorHub_ServiceEnabled: False + Game_Performance_ServiceEnabled::Game_Performance_ServiceEnabled: False + Hub_ServiceEnabled::Hub_ServiceEnabled: False + Purchasing_ServiceEnabled::Purchasing_ServiceEnabled: False + UNet_ServiceEnabled::UNet_ServiceEnabled: False + Unity_Ads_ServiceEnabled::Unity_Ads_ServiceEnabled: False WebGL::emscriptenArgs: WebGL::template: APPLICATION:Default additionalIl2CppArgs::additionalIl2CppArgs: + vectorPropertyNames: + - Android::VR::enabledDevices + - Metro::VR::enabledDevices + - N3DS::VR::enabledDevices + - PS3::VR::enabledDevices + - PS4::VR::enabledDevices + - PSM::VR::enabledDevices + - PSP2::VR::enabledDevices + - SamsungTV::VR::enabledDevices + - Standalone::VR::enabledDevices + - Tizen::VR::enabledDevices + - WebGL::VR::enabledDevices + - WebPlayer::VR::enabledDevices + - WiiU::VR::enabledDevices + - Xbox360::VR::enabledDevices + - XboxOne::VR::enabledDevices + - iOS::VR::enabledDevices + - tvOS::VR::enabledDevices + Android::VR::enabledDevices: + - Oculus + Metro::VR::enabledDevices: [] + N3DS::VR::enabledDevices: [] + PS3::VR::enabledDevices: [] + PS4::VR::enabledDevices: + - PlayStationVR + PSM::VR::enabledDevices: [] + PSP2::VR::enabledDevices: [] + SamsungTV::VR::enabledDevices: [] + Standalone::VR::enabledDevices: + - Oculus + Tizen::VR::enabledDevices: [] + WebGL::VR::enabledDevices: [] + WebPlayer::VR::enabledDevices: [] + WiiU::VR::enabledDevices: [] + Xbox360::VR::enabledDevices: [] + XboxOne::VR::enabledDevices: [] + iOS::VR::enabledDevices: [] + tvOS::VR::enabledDevices: [] cloudProjectId: projectName: organizationId: diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index d4ad3ce..ae41cb6 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 5.3.6f1 +m_EditorVersion: 5.4.2f2 m_StandardAssetsVersion: 0