From f36af18476217e5da2290ee0781834e830224849 Mon Sep 17 00:00:00 2001 From: Joshua Reason Date: Thu, 31 Jan 2019 18:00:39 +1100 Subject: [PATCH] Fixed main scene --- .../Examples/HD SRP Samples.unitypackage.meta | 7 ++ .../Examples/LW SRP Samples.unitypackage.meta | 7 ++ .../Custom RT Samples.unitypackage.meta | 7 ++ .../ApplyGrassWindToTerrain.unitypackage.meta | 7 ++ .../LegacySubstanceExample.unitypackage.meta | 7 ++ .../Substance2018.unitypackage.meta | 7 ++ .../CustomRTTemplates.unitypackage.meta | 7 ++ .../HDSRPTemplates (Legacy).unitypackage.meta | 7 ++ .../SRP/HDSRPTemplates.unitypackage.meta | 7 ++ .../LWSRPTemplates (Legacy).unitypackage.meta | 7 ++ .../SRP/LWSRPTemplates.unitypackage.meta | 7 ++ Assets/Scenes/MainScene.unity | 18 ++++- Assets/VeggieSpots/carrot_02.prefab | 79 +------------------ Assets/VeggieSpots/potato_01.prefab | 4 +- ProjectSettings/ProjectSettings.asset | 4 +- 15 files changed, 100 insertions(+), 82 deletions(-) create mode 100644 Assets/AmplifyShaderEditor/Examples/HD SRP Samples.unitypackage.meta create mode 100644 Assets/AmplifyShaderEditor/Examples/LW SRP Samples.unitypackage.meta create mode 100644 Assets/AmplifyShaderEditor/Examples/Official/CustomRTRain/Custom RT Samples.unitypackage.meta create mode 100644 Assets/AmplifyShaderEditor/Examples/Official/SimpleTerrain/ApplyGrassWindToTerrain.unitypackage.meta create mode 100644 Assets/AmplifyShaderEditor/Examples/Official/Substance/LegacySubstanceExample.unitypackage.meta create mode 100644 Assets/AmplifyShaderEditor/Examples/Official/Substance2018/Substance2018.unitypackage.meta create mode 100644 Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/CustomRTTemplates.unitypackage.meta create mode 100644 Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/SRP/HDSRPTemplates (Legacy).unitypackage.meta create mode 100644 Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/SRP/HDSRPTemplates.unitypackage.meta create mode 100644 Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/SRP/LWSRPTemplates (Legacy).unitypackage.meta create mode 100644 Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/SRP/LWSRPTemplates.unitypackage.meta diff --git a/Assets/AmplifyShaderEditor/Examples/HD SRP Samples.unitypackage.meta b/Assets/AmplifyShaderEditor/Examples/HD SRP Samples.unitypackage.meta new file mode 100644 index 0000000..872a1e1 --- /dev/null +++ b/Assets/AmplifyShaderEditor/Examples/HD SRP Samples.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: d1c0b77896049554fa4b635531caf741 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AmplifyShaderEditor/Examples/LW SRP Samples.unitypackage.meta b/Assets/AmplifyShaderEditor/Examples/LW SRP Samples.unitypackage.meta new file mode 100644 index 0000000..74eb369 --- /dev/null +++ b/Assets/AmplifyShaderEditor/Examples/LW SRP Samples.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 6ecbfd0a046659943a69328c98ff0442 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AmplifyShaderEditor/Examples/Official/CustomRTRain/Custom RT Samples.unitypackage.meta b/Assets/AmplifyShaderEditor/Examples/Official/CustomRTRain/Custom RT Samples.unitypackage.meta new file mode 100644 index 0000000..5b4b6c6 --- /dev/null +++ b/Assets/AmplifyShaderEditor/Examples/Official/CustomRTRain/Custom RT Samples.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 88dfe89a073bdf748bf05396f5285cdd +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AmplifyShaderEditor/Examples/Official/SimpleTerrain/ApplyGrassWindToTerrain.unitypackage.meta b/Assets/AmplifyShaderEditor/Examples/Official/SimpleTerrain/ApplyGrassWindToTerrain.unitypackage.meta new file mode 100644 index 0000000..f13afd9 --- /dev/null +++ b/Assets/AmplifyShaderEditor/Examples/Official/SimpleTerrain/ApplyGrassWindToTerrain.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 11f44bcb01ea56742bb7177b439b1a4f +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AmplifyShaderEditor/Examples/Official/Substance/LegacySubstanceExample.unitypackage.meta b/Assets/AmplifyShaderEditor/Examples/Official/Substance/LegacySubstanceExample.unitypackage.meta new file mode 100644 index 0000000..5417a54 --- /dev/null +++ b/Assets/AmplifyShaderEditor/Examples/Official/Substance/LegacySubstanceExample.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 490e8164148c52c468b633dcc1c12d57 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AmplifyShaderEditor/Examples/Official/Substance2018/Substance2018.unitypackage.meta b/Assets/AmplifyShaderEditor/Examples/Official/Substance2018/Substance2018.unitypackage.meta new file mode 100644 index 0000000..bed3c3e --- /dev/null +++ b/Assets/AmplifyShaderEditor/Examples/Official/Substance2018/Substance2018.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: af7de8b91a27c254fa1bd24c01ae6e8e +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/CustomRTTemplates.unitypackage.meta b/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/CustomRTTemplates.unitypackage.meta new file mode 100644 index 0000000..1e0464d --- /dev/null +++ b/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/CustomRTTemplates.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 191365b4aece81443875ae2bb7243b55 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/SRP/HDSRPTemplates (Legacy).unitypackage.meta b/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/SRP/HDSRPTemplates (Legacy).unitypackage.meta new file mode 100644 index 0000000..2d96284 --- /dev/null +++ b/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/SRP/HDSRPTemplates (Legacy).unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 4dc1afbcc68875c4780502f5e6b80158 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/SRP/HDSRPTemplates.unitypackage.meta b/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/SRP/HDSRPTemplates.unitypackage.meta new file mode 100644 index 0000000..e51ee6d --- /dev/null +++ b/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/SRP/HDSRPTemplates.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 9a5e61a8b3421b944863d0946e32da0a +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/SRP/LWSRPTemplates (Legacy).unitypackage.meta b/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/SRP/LWSRPTemplates (Legacy).unitypackage.meta new file mode 100644 index 0000000..8a216b9 --- /dev/null +++ b/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/SRP/LWSRPTemplates (Legacy).unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: b53d2f3b156ff104f90d4d7693d769c8 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/SRP/LWSRPTemplates.unitypackage.meta b/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/SRP/LWSRPTemplates.unitypackage.meta new file mode 100644 index 0000000..0f3221b --- /dev/null +++ b/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/SRP/LWSRPTemplates.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 4c816894a3147d343891060451241bfe +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/MainScene.unity b/Assets/Scenes/MainScene.unity index 618a1d2..9df0091 100644 --- a/Assets/Scenes/MainScene.unity +++ b/Assets/Scenes/MainScene.unity @@ -1343,14 +1343,28 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Tiles: - - {fileID: 1154370926395206, guid: 297a08e48e84317498d7b72c86327088, type: 2} + - {fileID: 1998568239351332, guid: 716881502e2a84a409e16c13cd999db5, type: 2} + - {fileID: 1743310745419280, guid: 0720bfb7b9fefb14089a52006989ff22, type: 2} + - {fileID: 1826403842147774, guid: 07a4dee3623ac5d4c845b6123b25b8c0, type: 2} + - {fileID: 1577805789422060, guid: 987e0107a846c1f4ebbdef315d2a0e03, type: 2} Landmarks: - {fileID: 1507904707863932, guid: d5ee26df5800f8745830b0ae25b626ee, type: 2} - {fileID: 1920492649654550, guid: 99097c2a41ae18240a0d95f1a93cc214, type: 2} - {fileID: 1116618855275128, guid: 1483dfc0af431664bab3d817b9f7bc2d, type: 2} - {fileID: 1420467368236124, guid: bdc66d0f6076df140aeef41a2805a9a8, type: 2} + - {fileID: 1901724256481308, guid: cbe846a199ea1014b9faca04c0d536ff, type: 2} + - {fileID: 1422404471343568, guid: 8105903d0650e604aa3485262d468b2a, type: 2} + - {fileID: 1979100733614630, guid: 14c7a63c4b68f2a4aae1077f7ed5303f, type: 2} + - {fileID: 1118807460158846, guid: 00ae67d3661ad604f8e28345b77b1802, type: 2} + - {fileID: 1226806743324978, guid: 9759bfe3647d01c4392804b2ea040b2a, type: 2} + - {fileID: 1391931725963818, guid: b1d75b278ada91f48b1a9cfd1fe98859, type: 2} + - {fileID: 1771015549225716, guid: 40069da53c4f564469bb5d4cc4a23494, type: 2} + - {fileID: 1837890494469408, guid: 86e9ecea2904dd845bd21e968ab92f26, type: 2} + - {fileID: 1374314220734608, guid: 569da2a514e4ffe4aa11b17843eaa9ba, type: 2} + - {fileID: 1865412863028234, guid: 63c5103bd47f04141993be1bc51323b9, type: 2} + - {fileID: 1470186944116456, guid: 8f4abbcf6230dc94283278aefdf1f583, type: 2} TileSize: 100 - MapDimensions: {x: 1, y: 1} + MapDimensions: {x: 3, y: 3} --- !u!114 &340012152 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/VeggieSpots/carrot_02.prefab b/Assets/VeggieSpots/carrot_02.prefab index ed8c4aa..f4a324b 100644 --- a/Assets/VeggieSpots/carrot_02.prefab +++ b/Assets/VeggieSpots/carrot_02.prefab @@ -11,23 +11,6 @@ Prefab: m_SourcePrefab: {fileID: 0} m_RootGameObject: {fileID: 1507904707863932} m_IsPrefabAsset: 1 ---- !u!1 &1299243923031594 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 6 - m_Component: - - component: {fileID: 4121938311380124} - - component: {fileID: 33966115456832688} - - component: {fileID: 23712034607101652} - m_Layer: 0 - m_Name: potato - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 --- !u!1 &1507904707863932 GameObject: m_ObjectHideFlags: 0 @@ -63,19 +46,6 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &4121938311380124 -Transform: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1299243923031594} - m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0, y: 0.00737719, z: 0} - m_LocalScale: {x: 1.1943321, y: 1.1943321, z: 2.149752} - m_Children: [] - m_Father: {fileID: 4365294101830012} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &4224880173686552 Transform: m_ObjectHideFlags: 1 @@ -96,49 +66,13 @@ Transform: m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1507904707863932} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -3.8306704, y: 1647.9479, z: -2985.4912} - m_LocalScale: {x: 134.83574, y: 134.83574, z: 134.83574} + m_LocalPosition: {x: 6.983041, y: -2.8933718, z: -2985.4912} + m_LocalScale: {x: 100, y: 100, z: 100} m_Children: - {fileID: 4224880173686552} - - {fileID: 4121938311380124} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!23 &23712034607101652 -MeshRenderer: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1299243923031594} - m_Enabled: 0 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RenderingLayerMask: 4294967295 - m_Materials: - - {fileID: 2100004, guid: 17fce145d99490b4293e7b1e3ab97185, type: 3} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 0 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 --- !u!23 &23948054871297300 MeshRenderer: m_ObjectHideFlags: 1 @@ -182,13 +116,6 @@ MeshFilter: m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1691079951970104} m_Mesh: {fileID: 4300000, guid: 17fce145d99490b4293e7b1e3ab97185, type: 3} ---- !u!33 &33966115456832688 -MeshFilter: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1299243923031594} - m_Mesh: {fileID: 4300002, guid: 17fce145d99490b4293e7b1e3ab97185, type: 3} --- !u!54 &54734235210677366 Rigidbody: m_ObjectHideFlags: 1 @@ -214,7 +141,7 @@ BoxCollider: m_IsTrigger: 0 m_Enabled: 1 serializedVersion: 2 - m_Size: {x: 0.07, y: 0.02, z: 0.1} + m_Size: {x: 0.03, y: 0.02, z: 0.1} m_Center: {x: 0, y: 0, z: 0} --- !u!114 &114730137093934732 MonoBehaviour: diff --git a/Assets/VeggieSpots/potato_01.prefab b/Assets/VeggieSpots/potato_01.prefab index 9df0927..7a811db 100644 --- a/Assets/VeggieSpots/potato_01.prefab +++ b/Assets/VeggieSpots/potato_01.prefab @@ -38,8 +38,8 @@ Transform: m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1116618855275128} m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.66493, y: 3.5159, z: -12.026813} - m_LocalScale: {x: 57.981243, y: 57.981243, z: 104.364006} + m_LocalPosition: {x: 8.402776, y: 4.3547134, z: -2977.9204} + m_LocalScale: {x: 70, y: 70, z: 120} m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 2616877..04a0ffd 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e1a747d0fb41057738f95b7a8d54c6dc25c0ee2d645222f913f1cfd910e9def0 -size 19747 +oid sha256:49db624a0e6e3613f23cc7ac300bf259521df691b4f67d3ced11b017904df0a9 +size 19716