Joshua Reason 5 years ago
parent
commit
7bae56c80a
15 changed files with 242 additions and 95 deletions
  1. +0
    -7
      Assets/AmplifyShaderEditor/Examples/LW SRP Samples.unitypackage.meta
  2. +0
    -7
      Assets/AmplifyShaderEditor/Examples/Official/CustomRTRain/Custom RT Samples.unitypackage.meta
  3. +0
    -7
      Assets/AmplifyShaderEditor/Examples/Official/SimpleTerrain/ApplyGrassWindToTerrain.unitypackage.meta
  4. +0
    -7
      Assets/AmplifyShaderEditor/Examples/Official/Substance/LegacySubstanceExample.unitypackage.meta
  5. +0
    -7
      Assets/AmplifyShaderEditor/Examples/Official/Substance2018/Substance2018.unitypackage.meta
  6. +0
    -7
      Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/CustomRTTemplates.unitypackage.meta
  7. +0
    -7
      Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/SRP/HDSRPTemplates (Legacy).unitypackage.meta
  8. +0
    -7
      Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/SRP/HDSRPTemplates.unitypackage.meta
  9. +0
    -7
      Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/SRP/LWSRPTemplates (Legacy).unitypackage.meta
  10. +0
    -7
      Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/SRP/LWSRPTemplates.unitypackage.meta
  11. +233
    -0
      Assets/FBX/Plane.prefab
  12. +3
    -2
      Assets/FBX/Plane.prefab.meta
  13. +3
    -20
      Assets/Scenes/MainScene.unity
  14. +2
    -2
      ProjectSettings/ProjectSettings.asset
  15. +1
    -1
      ProjectSettings/ProjectVersion.txt

+ 0
- 7
Assets/AmplifyShaderEditor/Examples/LW SRP Samples.unitypackage.meta View File

@ -1,7 +0,0 @@
fileFormatVersion: 2
guid: 6ecbfd0a046659943a69328c98ff0442
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

+ 0
- 7
Assets/AmplifyShaderEditor/Examples/Official/CustomRTRain/Custom RT Samples.unitypackage.meta View File

@ -1,7 +0,0 @@
fileFormatVersion: 2
guid: 88dfe89a073bdf748bf05396f5285cdd
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

+ 0
- 7
Assets/AmplifyShaderEditor/Examples/Official/SimpleTerrain/ApplyGrassWindToTerrain.unitypackage.meta View File

@ -1,7 +0,0 @@
fileFormatVersion: 2
guid: 11f44bcb01ea56742bb7177b439b1a4f
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

+ 0
- 7
Assets/AmplifyShaderEditor/Examples/Official/Substance/LegacySubstanceExample.unitypackage.meta View File

@ -1,7 +0,0 @@
fileFormatVersion: 2
guid: 490e8164148c52c468b633dcc1c12d57
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

+ 0
- 7
Assets/AmplifyShaderEditor/Examples/Official/Substance2018/Substance2018.unitypackage.meta View File

@ -1,7 +0,0 @@
fileFormatVersion: 2
guid: af7de8b91a27c254fa1bd24c01ae6e8e
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

+ 0
- 7
Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/CustomRTTemplates.unitypackage.meta View File

@ -1,7 +0,0 @@
fileFormatVersion: 2
guid: 191365b4aece81443875ae2bb7243b55
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

+ 0
- 7
Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/SRP/HDSRPTemplates (Legacy).unitypackage.meta View File

@ -1,7 +0,0 @@
fileFormatVersion: 2
guid: 4dc1afbcc68875c4780502f5e6b80158
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

+ 0
- 7
Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/SRP/HDSRPTemplates.unitypackage.meta View File

@ -1,7 +0,0 @@
fileFormatVersion: 2
guid: 9a5e61a8b3421b944863d0946e32da0a
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

+ 0
- 7
Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/SRP/LWSRPTemplates (Legacy).unitypackage.meta View File

@ -1,7 +0,0 @@
fileFormatVersion: 2
guid: b53d2f3b156ff104f90d4d7693d769c8
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

+ 0
- 7
Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/SRP/LWSRPTemplates.unitypackage.meta View File

@ -1,7 +0,0 @@
fileFormatVersion: 2
guid: 4c816894a3147d343891060451241bfe
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

+ 233
- 0
Assets/FBX/Plane.prefab View File

@ -0,0 +1,233 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1001 &100100000
Prefab:
m_ObjectHideFlags: 1
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications: []
m_RemovedComponents: []
m_SourcePrefab: {fileID: 0}
m_RootGameObject: {fileID: 1452803202134222}
m_IsPrefabAsset: 1
--- !u!1 &1055792907909626
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 6
m_Component:
- component: {fileID: 4667161639406646}
m_Layer: 0
m_Name: GameObject
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!1 &1276793768883796
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 6
m_Component:
- component: {fileID: 4261464106823984}
m_Layer: 0
m_Name: GameObject (3)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!1 &1452803202134222
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 6
m_Component:
- component: {fileID: 4142985379825338}
- component: {fileID: 33148371242452838}
- component: {fileID: 23437045635250346}
- component: {fileID: 64600720912655110}
- component: {fileID: 114085358137528168}
m_Layer: 0
m_Name: Plane
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!1 &1568239569562444
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 6
m_Component:
- component: {fileID: 4872503332865470}
m_Layer: 0
m_Name: GameObject (1)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!1 &1995092270206248
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 6
m_Component:
- component: {fileID: 4000874864451424}
m_Layer: 0
m_Name: GameObject (2)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &4000874864451424
Transform:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1995092270206248}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 3.28, y: 0, z: -2.56}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4142985379825338}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &4142985379825338
Transform:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1452803202134222}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -119.680695, y: 468.06778, z: 10.275379}
m_LocalScale: {x: 38.877, y: 38.877, z: 38.877}
m_Children:
- {fileID: 4667161639406646}
- {fileID: 4872503332865470}
- {fileID: 4000874864451424}
- {fileID: 4261464106823984}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &4261464106823984
Transform:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1276793768883796}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -1.99, y: 0, z: -2.56}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4142985379825338}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &4667161639406646
Transform:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1055792907909626}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -2.36, y: 0, z: 2.9}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4142985379825338}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &4872503332865470
Transform:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1568239569562444}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 3.28, y: 0, z: 2.9}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4142985379825338}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!23 &23437045635250346
MeshRenderer:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1452803202134222}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RenderingLayerMask: 4294967295
m_Materials:
- {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
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!33 &33148371242452838
MeshFilter:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1452803202134222}
m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
--- !u!64 &64600720912655110
MeshCollider:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1452803202134222}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 3
m_Convex: 0
m_CookingOptions: 14
m_SkinWidth: 0.01
m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
--- !u!114 &114085358137528168
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1452803202134222}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 2301390022f0d72478aae034e36cd8ff, type: 3}
m_Name:
m_EditorClassIdentifier:
LandMarkLocations:
- {fileID: 4667161639406646}
- {fileID: 4872503332865470}
- {fileID: 4000874864451424}
- {fileID: 4261464106823984}

Assets/AmplifyShaderEditor/Examples/HD SRP Samples.unitypackage.meta → Assets/FBX/Plane.prefab.meta View File

@ -1,7 +1,8 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: d1c0b77896049554fa4b635531caf741
DefaultImporter:
guid: d35e08ffaa663c945a63f1045fff78e8
NativeFormatImporter:
externalObjects: {} externalObjects: {}
mainObjectFileID: 100100000
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:

+ 3
- 20
Assets/Scenes/MainScene.unity View File

@ -1343,31 +1343,14 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
Tiles: Tiles:
- {fileID: 1998568239351332, guid: 716881502e2a84a409e16c13cd999db5, type: 2}
- {fileID: 1743310745419280, guid: 0720bfb7b9fefb14089a52006989ff22, type: 2}
- {fileID: 1826403842147774, guid: 07a4dee3623ac5d4c845b6123b25b8c0, type: 2}
- {fileID: 1577805789422060, guid: 987e0107a846c1f4ebbdef315d2a0e03, type: 2}
- {fileID: 1452803202134222, guid: d35e08ffaa663c945a63f1045fff78e8, type: 2}
Landmarks: Landmarks:
- {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}
- {fileID: 1920492649654550, guid: 99097c2a41ae18240a0d95f1a93cc214, type: 2}
- {fileID: 1507904707863932, guid: d5ee26df5800f8745830b0ae25b626ee, type: 2} - {fileID: 1507904707863932, guid: d5ee26df5800f8745830b0ae25b626ee, type: 2}
- {fileID: 1920492649654550, guid: 99097c2a41ae18240a0d95f1a93cc214, type: 2}
- {fileID: 1116618855275128, guid: 1483dfc0af431664bab3d817b9f7bc2d, type: 2} - {fileID: 1116618855275128, guid: 1483dfc0af431664bab3d817b9f7bc2d, type: 2}
- {fileID: 1420467368236124, guid: bdc66d0f6076df140aeef41a2805a9a8, type: 2} - {fileID: 1420467368236124, guid: bdc66d0f6076df140aeef41a2805a9a8, type: 2}
- {fileID: 1771015549225716, guid: 40069da53c4f564469bb5d4cc4a23494, type: 2}
- {fileID: 1865412863028234, guid: 63c5103bd47f04141993be1bc51323b9, type: 2}
- {fileID: 1979100733614630, guid: 14c7a63c4b68f2a4aae1077f7ed5303f, type: 2}
TileSize: 100 TileSize: 100
MapDimensions: {x: 3, y: 3}
MapDimensions: {x: 1, y: 1}
--- !u!114 &340012152 --- !u!114 &340012152
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

+ 2
- 2
ProjectSettings/ProjectSettings.asset View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:7c672f68a685ee0ee6aebb7fcdf7225032efdabcccd35bb7be92e0187777dd38
size 19677
oid sha256:e1a747d0fb41057738f95b7a8d54c6dc25c0ee2d645222f913f1cfd910e9def0
size 19747

+ 1
- 1
ProjectSettings/ProjectVersion.txt View File

@ -1 +1 @@
m_EditorVersion: 2018.2.2f1
m_EditorVersion: 2018.2.13f1

Loading…
Cancel
Save