Skip to content

Commit 87cd362

Browse files
authored
Merge pull request #5 from xchennnw/jan2
pause & play UI
2 parents 22436b5 + b3f2abc commit 87cd362

11 files changed

+817
-13
lines changed

TerrainTest/Assets/Biomes/Biome1.asset

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,11 @@ MonoBehaviour:
2727
tree: {fileID: 0}
2828
treeNumberPerGrid: 0
2929
randomPosY: 0
30+
randomPosYRange: {x: 0, y: 0}
3031
hasStone: 1
31-
stoneNumberPerGrid: 30
32+
stoneNumberPerGrid: 20
3233
stone: {fileID: 7213392421638990745, guid: 155c04343b0a3ee459c952376d0d9f9e, type: 3}
34+
tilePoolID: 0
3335
treePoolID: 0
3436
stonePoolID: 0
3537
mid:
@@ -41,23 +43,28 @@ MonoBehaviour:
4143
tree: {fileID: 0}
4244
treeNumberPerGrid: 0
4345
randomPosY: 0
46+
randomPosYRange: {x: 0, y: 0}
4447
hasStone: 0
4548
stoneNumberPerGrid: 0
4649
stone: {fileID: 0}
50+
tilePoolID: 1
4751
treePoolID: 0
4852
stonePoolID: 0
4953
far:
5054
width: 2
5155
meshes:
5256
- {fileID: 5310724817394783291, guid: 11e638d1b503d9f4186ab491f3ec0c73, type: 3}
57+
- {fileID: 7227429322105617817, guid: be7ad61b365b009429502fd493d9514f, type: 3}
5358
material: {fileID: 2100000, guid: 474faface03d15149914528adcee5f6c, type: 2}
5459
hasTree: 0
5560
tree: {fileID: 0}
5661
treeNumberPerGrid: 0
5762
randomPosY: 0
63+
randomPosYRange: {x: 0, y: 0}
5864
hasStone: 0
5965
stoneNumberPerGrid: 0
6066
stone: {fileID: 0}
67+
tilePoolID: 2
6168
treePoolID: 0
6269
stonePoolID: 0
6370
skyConfig: {fileID: 11400000, guid: bd4ef31a76776aa478b7a7c4b8964d98, type: 2}

TerrainTest/Assets/Biomes/Biome2.asset

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ MonoBehaviour:
2929
hasStone: 0
3030
stoneNumberPerGrid: 0
3131
stone: {fileID: 0}
32+
tilePoolID: 9
3233
treePoolID: 0
3334
stonePoolID: 0
3435
mid:
@@ -44,6 +45,7 @@ MonoBehaviour:
4445
hasStone: 0
4546
stoneNumberPerGrid: 0
4647
stone: {fileID: 0}
48+
tilePoolID: 10
4749
treePoolID: 0
4850
stonePoolID: 0
4951
far:
@@ -55,10 +57,11 @@ MonoBehaviour:
5557
tree: {fileID: 1313749818314350997, guid: 2fd043a687d70594da234cd86ff195d2, type: 3}
5658
treeNumberPerGrid: 3
5759
randomPosY: 1
58-
randomPosYRange: {x: -0.3, y: 0}
60+
randomPosYRange: {x: -0.4, y: -0.1}
5961
hasStone: 0
6062
stoneNumberPerGrid: 0
6163
stone: {fileID: 0}
62-
treePoolID: 4
64+
tilePoolID: 11
65+
treePoolID: 5
6366
stonePoolID: 0
6467
skyConfig: {fileID: 11400000, guid: a895736ed37f4714d8de4cbb9c530960, type: 2}

TerrainTest/Assets/Biomes/Biome4.asset

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ MonoBehaviour:
2929
hasStone: 1
3030
stoneNumberPerGrid: 5
3131
stone: {fileID: 7213392421638990745, guid: 155c04343b0a3ee459c952376d0d9f9e, type: 3}
32+
tilePoolID: 3
3233
treePoolID: 1
3334
stonePoolID: 3
3435
mid:
@@ -41,10 +42,11 @@ MonoBehaviour:
4142
tree: {fileID: 1313749818314350997, guid: 2ff4b18080595d940b1ce754934b60a4, type: 3}
4243
treeNumberPerGrid: 2
4344
randomPosY: 1
44-
randomPosYRange: {x: 0, y: 0.6}
45+
randomPosYRange: {x: -0.1, y: 0}
4546
hasStone: 0
4647
stoneNumberPerGrid: 10
4748
stone: {fileID: 7213392421638990745, guid: 155c04343b0a3ee459c952376d0d9f9e, type: 3}
49+
tilePoolID: 4
4850
treePoolID: 2
4951
stonePoolID: 2
5052
far:
@@ -57,10 +59,11 @@ MonoBehaviour:
5759
tree: {fileID: 1313749818314350997, guid: 6e800955d19e6a04db6a131d8d26b436, type: 3}
5860
treeNumberPerGrid: 1
5961
randomPosY: 1
60-
randomPosYRange: {x: -0.3, y: 0}
62+
randomPosYRange: {x: -0.4, y: -0.2}
6163
hasStone: 0
6264
stoneNumberPerGrid: 5
6365
stone: {fileID: 7213392421638990745, guid: 155c04343b0a3ee459c952376d0d9f9e, type: 3}
66+
tilePoolID: 5
6467
treePoolID: 1
6568
stonePoolID: 0
6669
skyConfig: {fileID: 11400000, guid: 0dcada36fc37e3340adb9c633b151833, type: 2}
Loading

TerrainTest/Assets/Materials/Textures/Play-Stop-Pause-Button.png.meta

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

TerrainTest/Assets/Materials/Textures/Play-Stop-Pause-Button1.png.meta

Lines changed: 127 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)