Jam
/
GGJ_2019
1
0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

Merge branch 'master' of https://bitbucket.org/JoshuaReason/ggj-2019

master
Bernard Laptop 5 years ago
parent
6132d2b72f bc0843c159
commit
26f2cec434
14 changed files with 172 additions and 66 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +7
    -0
      Assets/AmplifyShaderEditor/Examples/HD SRP Samples.unitypackage.meta
  2. +7
    -0
      Assets/AmplifyShaderEditor/Examples/LW SRP Samples.unitypackage.meta
  3. +7
    -0
      Assets/AmplifyShaderEditor/Examples/Official/CustomRTRain/Custom RT Samples.unitypackage.meta
  4. +7
    -0
      Assets/AmplifyShaderEditor/Examples/Official/SimpleTerrain/ApplyGrassWindToTerrain.unitypackage.meta
  5. +7
    -0
      Assets/AmplifyShaderEditor/Examples/Official/Substance/LegacySubstanceExample.unitypackage.meta
  6. +7
    -0
      Assets/AmplifyShaderEditor/Examples/Official/Substance2018/Substance2018.unitypackage.meta
  7. +7
    -0
      Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/CustomRTTemplates.unitypackage.meta
  8. +7
    -0
      Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/SRP/HDSRPTemplates (Legacy).unitypackage.meta
  9. +7
    -0
      Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/SRP/HDSRPTemplates.unitypackage.meta
  10. +7
    -0
      Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/SRP/LWSRPTemplates (Legacy).unitypackage.meta
  11. +7
    -0
      Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/SRP/LWSRPTemplates.unitypackage.meta
  12. +93
    -64
      Assets/FBX/terrain_Prefabs/Test Tile.prefab
  13. +1
    -1
      Assets/FBX/terrain_Prefabs/Test Tile.prefab.meta
  14. +1
    -1
      Assets/Scenes/MainScene.unity

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Assets/FBX/Plane.prefab → Assets/FBX/terrain_Prefabs/Test Tile.prefab View File

@ -9,50 +9,50 @@ Prefab:
m_Modifications: []
m_RemovedComponents: []
m_SourcePrefab: {fileID: 0}
m_RootGameObject: {fileID: 1452803202134222}
m_RootGameObject: {fileID: 1154370926395206}
m_IsPrefabAsset: 1
--- !u!1 &1055792907909626
--- !u!1 &1154370926395206
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 6
m_Component:
- component: {fileID: 4667161639406646}
- component: {fileID: 4773535500321108}
- component: {fileID: 114843715242423308}
m_Layer: 0
m_Name: GameObject
m_Name: Test Tile
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!1 &1276793768883796
--- !u!1 &1226033997399134
GameObject:
m_ObjectHideFlags: 0
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 6
m_Component:
- component: {fileID: 4261464106823984}
- component: {fileID: 4160130260524990}
m_Layer: 0
m_Name: GameObject (3)
m_Name: GameObject (2)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!1 &1452803202134222
--- !u!1 &1353487355830180
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}
- component: {fileID: 4610373563206416}
- component: {fileID: 33528350831231870}
- component: {fileID: 23508319933308028}
- component: {fileID: 64597842629275536}
m_Layer: 0
m_Name: Plane
m_TagString: Untagged
@ -60,111 +60,140 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!1 &1568239569562444
--- !u!1 &1525973963407654
GameObject:
m_ObjectHideFlags: 0
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 6
m_Component:
- component: {fileID: 4872503332865470}
- component: {fileID: 4369998343097966}
m_Layer: 0
m_Name: GameObject (1)
m_Name: GameObject
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!1 &1995092270206248
--- !u!1 &1740301752958918
GameObject:
m_ObjectHideFlags: 0
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 6
m_Component:
- component: {fileID: 4000874864451424}
- component: {fileID: 4735398225799572}
m_Layer: 0
m_Name: GameObject (2)
m_Name: GameObject (3)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!1 &1820936703002534
GameObject:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 6
m_Component:
- component: {fileID: 4512889796976822}
m_Layer: 0
m_Name: GameObject (1)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &4000874864451424
--- !u!4 &4160130260524990
Transform:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1995092270206248}
m_GameObject: {fileID: 1226033997399134}
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_Father: {fileID: 4610373563206416}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &4142985379825338
--- !u!4 &4369998343097966
Transform:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1452803202134222}
m_GameObject: {fileID: 1525973963407654}
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_LocalPosition: {x: -2.36, y: 0, z: 2.9}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4610373563206416}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &4261464106823984
--- !u!4 &4512889796976822
Transform:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1276793768883796}
m_GameObject: {fileID: 1820936703002534}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -1.99, y: 0, z: -2.56}
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: 3
m_Father: {fileID: 4610373563206416}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &4667161639406646
--- !u!4 &4610373563206416
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_GameObject: {fileID: 1353487355830180}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 7.6246185, y: -14.929947, z: 3.9215088}
m_LocalScale: {x: 10, y: 10, z: 10}
m_Children:
- {fileID: 4369998343097966}
- {fileID: 4512889796976822}
- {fileID: 4160130260524990}
- {fileID: 4735398225799572}
m_Father: {fileID: 4773535500321108}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &4872503332865470
--- !u!4 &4735398225799572
Transform:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1568239569562444}
m_GameObject: {fileID: 1740301752958918}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 3.28, y: 0, z: 2.9}
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: 1
m_Father: {fileID: 4610373563206416}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &4773535500321108
Transform:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1154370926395206}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -7.6246185, y: 14.929947, z: -3.9215088}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 4610373563206416}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!23 &23437045635250346
--- !u!23 &23508319933308028
MeshRenderer:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1452803202134222}
m_GameObject: {fileID: 1353487355830180}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
@ -194,19 +223,19 @@ MeshRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
--- !u!33 &33148371242452838
--- !u!33 &33528350831231870
MeshFilter:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1452803202134222}
m_GameObject: {fileID: 1353487355830180}
m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
--- !u!64 &64600720912655110
--- !u!64 &64597842629275536
MeshCollider:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1452803202134222}
m_GameObject: {fileID: 1353487355830180}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
@ -215,19 +244,19 @@ MeshCollider:
m_CookingOptions: 14
m_SkinWidth: 0.01
m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
--- !u!114 &114085358137528168
--- !u!114 &114843715242423308
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1452803202134222}
m_GameObject: {fileID: 1154370926395206}
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}
- {fileID: 4369998343097966}
- {fileID: 4512889796976822}
- {fileID: 4160130260524990}
- {fileID: 4735398225799572}

Assets/FBX/Plane.prefab.meta → Assets/FBX/terrain_Prefabs/Test Tile.prefab.meta View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: d35e08ffaa663c945a63f1045fff78e8
guid: 297a08e48e84317498d7b72c86327088
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 100100000

+ 1
- 1
Assets/Scenes/MainScene.unity View File

@ -1343,7 +1343,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
Tiles:
- {fileID: 1452803202134222, guid: d35e08ffaa663c945a63f1045fff78e8, type: 2}
- {fileID: 1154370926395206, guid: 297a08e48e84317498d7b72c86327088, type: 2}
Landmarks:
- {fileID: 1507904707863932, guid: d5ee26df5800f8745830b0ae25b626ee, type: 2}
- {fileID: 1920492649654550, guid: 99097c2a41ae18240a0d95f1a93cc214, type: 2}

Write Preview
Loading…
Cancel
Save