Skip to content

Commit 468e9d0

Browse files
AdsitoAdsito
committed
Merge branch 'beta'
2 parents 5f6503e + b68f215 commit 468e9d0

30 files changed

+242
-2
lines changed

‎Assets/Resources/Textures/Ground/Dirt.terrainlayer‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!1953259897 &8574412962073106934
4+
TerrainLayer:
5+
m_ObjectHideFlags: 0
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
m_Name: Dirt
10+
m_DiffuseTexture: {fileID: 2800000, guid: 1f6cf31e886b8c941915d8cc59bf6f50, type: 3}
11+
m_NormalMapTexture: {fileID: 2800000, guid: 3449a2e698a0deb44a70dec747a3f8e9, type: 3}
12+
m_MaskMapTexture: {fileID: 0}
13+
m_TileSize: {x: 2, y: 2}
14+
m_TileOffset: {x: 0, y: 0}
15+
m_Specular: {r: 0, g: 0, b: 0, a: 0}
16+
m_Metallic: 0
17+
m_Smoothness: 0
18+
m_NormalScale: 10
19+
m_DiffuseRemapMin: {x: 0, y: 0, z: 0, w: 0}
20+
m_DiffuseRemapMax: {x: 1, y: 1, z: 1, w: 1}
21+
m_MaskMapRemapMin: {x: 0, y: 0, z: 0, w: 0}
22+
m_MaskMapRemapMax: {x: 1, y: 1, z: 1, w: 1}

‎Assets/Resources/Textures/Ground/Dirt.terrainlayer.meta‎

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/Resources/Textures/Ground/Forest.terrainlayer‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!1953259897 &8574412962073106934
4+
TerrainLayer:
5+
m_ObjectHideFlags: 0
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
m_Name: Forest
10+
m_DiffuseTexture: {fileID: 2800000, guid: 54703e04559adcf48bc1dc4358373c92, type: 3}
11+
m_NormalMapTexture: {fileID: 2800000, guid: 9cb8a98194aa15642b2ceaa3011ccde3, type: 3}
12+
m_MaskMapTexture: {fileID: 0}
13+
m_TileSize: {x: 2, y: 2}
14+
m_TileOffset: {x: 0, y: 0}
15+
m_Specular: {r: 0, g: 0, b: 0, a: 0}
16+
m_Metallic: 0.25
17+
m_Smoothness: 0
18+
m_NormalScale: 5
19+
m_DiffuseRemapMin: {x: 0, y: 0, z: 0, w: 0}
20+
m_DiffuseRemapMax: {x: 1, y: 1, z: 1, w: 1}
21+
m_MaskMapRemapMin: {x: 0, y: 0, z: 0, w: 0}
22+
m_MaskMapRemapMax: {x: 1, y: 1, z: 1, w: 1}

‎Assets/Resources/Textures/Ground/Forest.terrainlayer.meta‎

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/Resources/Textures/Ground/Grass.terrainlayer‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!1953259897 &8574412962073106934
4+
TerrainLayer:
5+
m_ObjectHideFlags: 0
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
m_Name: Grass
10+
m_DiffuseTexture: {fileID: 2800000, guid: cf7a0e5698d33ae418248ea1e9c95419, type: 3}
11+
m_NormalMapTexture: {fileID: 0}
12+
m_MaskMapTexture: {fileID: 0}
13+
m_TileSize: {x: 2, y: 2}
14+
m_TileOffset: {x: 0, y: 0}
15+
m_Specular: {r: 0, g: 0, b: 0, a: 0}
16+
m_Metallic: 0
17+
m_Smoothness: 0
18+
m_NormalScale: 5.03
19+
m_DiffuseRemapMin: {x: 0, y: 0, z: 0, w: 0}
20+
m_DiffuseRemapMax: {x: 1, y: 1, z: 1, w: 1}
21+
m_MaskMapRemapMin: {x: 0, y: 0, z: 0, w: 0}
22+
m_MaskMapRemapMax: {x: 1, y: 1, z: 1, w: 1}

‎Assets/Resources/Textures/Ground/Grass.terrainlayer.meta‎

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/Resources/Textures/Ground/Gravel.terrainlayer‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!1953259897 &8574412962073106934
4+
TerrainLayer:
5+
m_ObjectHideFlags: 0
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
m_Name: Gravel
10+
m_DiffuseTexture: {fileID: 2800000, guid: ee293e59a80d65441938236425b289b1, type: 3}
11+
m_NormalMapTexture: {fileID: 2800000, guid: 1ce8744130c8d5542bb1f6e380e35a7e, type: 3}
12+
m_MaskMapTexture: {fileID: 0}
13+
m_TileSize: {x: 2, y: 2}
14+
m_TileOffset: {x: 0, y: 0}
15+
m_Specular: {r: 0, g: 0, b: 0, a: 0}
16+
m_Metallic: 0
17+
m_Smoothness: 0
18+
m_NormalScale: 5
19+
m_DiffuseRemapMin: {x: 0, y: 0, z: 0, w: 0}
20+
m_DiffuseRemapMax: {x: 1, y: 1, z: 1, w: 1}
21+
m_MaskMapRemapMin: {x: 0, y: 0, z: 0, w: 0}
22+
m_MaskMapRemapMax: {x: 1, y: 1, z: 1, w: 1}

‎Assets/Resources/Textures/Ground/Gravel.terrainlayer.meta‎

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/Resources/Textures/Ground/Rock.terrainlayer‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!1953259897 &8574412962073106934
4+
TerrainLayer:
5+
m_ObjectHideFlags: 0
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
m_Name: Rock
10+
m_DiffuseTexture: {fileID: 2800000, guid: 75504e77c8245b644a2f8bd2575e7483, type: 3}
11+
m_NormalMapTexture: {fileID: 0}
12+
m_MaskMapTexture: {fileID: 0}
13+
m_TileSize: {x: 2, y: 2}
14+
m_TileOffset: {x: 0, y: 0}
15+
m_Specular: {r: 0, g: 0, b: 0, a: 0}
16+
m_Metallic: 0
17+
m_Smoothness: 0
18+
m_NormalScale: 1
19+
m_DiffuseRemapMin: {x: 0, y: 0, z: 0, w: 0}
20+
m_DiffuseRemapMax: {x: 1, y: 1, z: 1, w: 1}
21+
m_MaskMapRemapMin: {x: 0, y: 0, z: 0, w: 0}
22+
m_MaskMapRemapMax: {x: 1, y: 1, z: 1, w: 1}

‎Assets/Resources/Textures/Ground/Rock.terrainlayer.meta‎

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)