Skip to content

Design doc - Janet & Yue #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 43 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
43a3315
design doc images
xchennnw Nov 8, 2023
b1f0f13
Update README.md
xchennnw Nov 8, 2023
0141c4c
Update README.md
xchennnw Nov 8, 2023
21c2936
unity project
xchennnw Nov 15, 2023
efbb375
add folders
xchennnw Nov 15, 2023
2fd7209
Merge pull request #1 from xchennnw/jan
xchennnw Nov 15, 2023
11df5ad
hex terrain & biome config
xchennnw Nov 15, 2023
c1e330b
Merge pull request #2 from xchennnw/jan
xchennnw Nov 15, 2023
69e7259
milestone1 readme
YueZhang1027 Nov 15, 2023
c6d6d68
Update README.md
xchennnw Nov 15, 2023
83793bc
Starry sky
YueZhang1027 Nov 22, 2023
5f0a2b2
skybox cont
YueZhang1027 Nov 23, 2023
49b1fcb
Change gradient
YueZhang1027 Nov 24, 2023
0e807f8
Cloud
YueZhang1027 Nov 25, 2023
427d35a
Star
YueZhang1027 Nov 25, 2023
f82249f
Merge pull request #3 from xchennnw/yue
YueZhang1027 Nov 25, 2023
a531788
Tree & Stone
xchennnw Nov 27, 2023
2bd3ddb
Add image & post process color adjust
xchennnw Nov 27, 2023
3374b34
Update README.md
xchennnw Nov 27, 2023
bc0e2a7
Update README.md
xchennnw Nov 27, 2023
52ad60e
cloud floating
YueZhang1027 Nov 29, 2023
24b3b3a
twinkle twinkle little star
YueZhang1027 Nov 29, 2023
a2f236f
added more biomes, sky color setting, camera shake
xchennnw Dec 5, 2023
4b9f48c
object spawning optimize
xchennnw Dec 5, 2023
8ddf538
dotween
xchennnw Dec 5, 2023
d2ce9bb
add audio, fix z-fighting
YueZhang1027 Dec 5, 2023
e155de1
code organization
xchennnw Dec 6, 2023
22436b5
Merge pull request #4 from xchennnw/jan2
xchennnw Dec 6, 2023
b3f2abc
pause & play UI
xchennnw Dec 6, 2023
87cd362
Merge pull request #5 from xchennnw/jan2
xchennnw Dec 6, 2023
77882c2
update post process tint
xchennnw Dec 6, 2023
0186d19
Readme
YueZhang1027 Dec 6, 2023
d841755
fix math bug
xchennnw Dec 6, 2023
a5cb948
Merge branch 'main' of https://github.com/xchennnw/final-project
xchennnw Dec 6, 2023
c07c0cd
Update README.md
xchennnw Dec 6, 2023
856d381
screen shots
xchennnw Dec 6, 2023
d6daeb3
Update README.md
xchennnw Dec 6, 2023
deb3cf8
Update README.md
xchennnw Dec 6, 2023
3719b93
Update README.md
xchennnw Dec 6, 2023
d705bb2
Update README.md
xchennnw Dec 6, 2023
bfc79ab
Update README.md
xchennnw Dec 6, 2023
c0080b0
Update README.md
xchennnw Dec 6, 2023
f8e9045
Update README.md
xchennnw Dec 6, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
240 changes: 141 additions & 99 deletions README.md

Large diffs are not rendered by default.

72 changes: 72 additions & 0 deletions TerrainTest/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
# This .gitignore file should be placed at the root of your Unity project directory
#
# Get latest from https://github.com/github/gitignore/blob/main/Unity.gitignore
#
/[Ll]ibrary/
/[Tt]emp/
/[Oo]bj/
/[Bb]uild/
/[Bb]uilds/
/[Ll]ogs/
/[Uu]ser[Ss]ettings/

# MemoryCaptures can get excessive in size.
# They also could contain extremely sensitive data
/[Mm]emoryCaptures/

# Recordings can get excessive in size
/[Rr]ecordings/

# Uncomment this line if you wish to ignore the asset store tools plugin
# /[Aa]ssets/AssetStoreTools*

# Autogenerated Jetbrains Rider plugin
/[Aa]ssets/Plugins/Editor/JetBrains*

# Visual Studio cache directory
.vs/

# Gradle cache directory
.gradle/

# Autogenerated VS/MD/Consulo solution and project files
ExportedObj/
.consulo/
*.csproj
*.unityproj
*.sln
*.suo
*.tmp
*.user
*.userprefs
*.pidb
*.booproj
*.svd
*.pdb
*.mdb
*.opendb
*.VC.db

# Unity3D generated meta files
*.pidb.meta
*.pdb.meta
*.mdb.meta

# Unity3D generated file on crash reports
sysinfo.txt

# Builds
*.apk
*.aab
*.unitypackage
*.app

# Crashlytics generated file
crashlytics-build.properties

# Packed Addressables
/[Aa]ssets/[Aa]ddressable[Aa]ssets[Dd]ata/*/*.bin*

# Temporary auto-generated Android Assets
/[Aa]ssets/[Ss]treamingAssets/aa.meta
/[Aa]ssets/[Ss]treamingAssets/aa/*
6 changes: 6 additions & 0 deletions TerrainTest/.vsconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"version": "1.0",
"components": [
"Microsoft.VisualStudio.Workload.ManagedGame"
]
}
8 changes: 8 additions & 0 deletions TerrainTest/Assets/Audio.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added TerrainTest/Assets/Audio/Train-movement-loop.mp3
Binary file not shown.
23 changes: 23 additions & 0 deletions TerrainTest/Assets/Audio/Train-movement-loop.mp3.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions TerrainTest/Assets/Biomes.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

70 changes: 70 additions & 0 deletions TerrainTest/Assets/Biomes/Biome1.asset
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 84bc5866b5fb8594b823cf28a3bfc026, type: 3}
m_Name: Biome1
m_EditorClassIdentifier:
blendNearMid: 1
midNearRatio: 0.8
blendMidFar: 0
farMidRatio: 0
near:
width: 2
meshes:
- {fileID: 8598159772378286561, guid: db15377d8e428b4498c64ae0b8817561, type: 3}
- {fileID: 9219758427260941236, guid: 990b47c63baffae498f68312019acc04, type: 3}
- {fileID: 1495801216899893060, guid: 41189d4cd9026344392ed43caafde860, type: 3}
material: {fileID: 2100000, guid: 2860990df8af0484998b47dac3c04616, type: 2}
hasTree: 0
tree: {fileID: 0}
treeNumberPerGrid: 0
randomPosY: 0
randomPosYRange: {x: 0, y: 0}
hasStone: 1
stoneNumberPerGrid: 20
stone: {fileID: 7213392421638990745, guid: 155c04343b0a3ee459c952376d0d9f9e, type: 3}
tilePoolID: 0
treePoolID: 0
stonePoolID: 0
mid:
width: 1
meshes:
- {fileID: 8462614397845747776, guid: aa91ba573a0d6ab4fbf4781a833de1e9, type: 3}
material: {fileID: 2100000, guid: 98457f38b26c27646a7443a6ec7e6602, type: 2}
hasTree: 0
tree: {fileID: 0}
treeNumberPerGrid: 0
randomPosY: 0
randomPosYRange: {x: 0, y: 0}
hasStone: 0
stoneNumberPerGrid: 0
stone: {fileID: 0}
tilePoolID: 1
treePoolID: 0
stonePoolID: 0
far:
width: 2
meshes:
- {fileID: 5310724817394783291, guid: 11e638d1b503d9f4186ab491f3ec0c73, type: 3}
- {fileID: 7227429322105617817, guid: be7ad61b365b009429502fd493d9514f, type: 3}
material: {fileID: 2100000, guid: 474faface03d15149914528adcee5f6c, type: 2}
hasTree: 0
tree: {fileID: 0}
treeNumberPerGrid: 0
randomPosY: 0
randomPosYRange: {x: 0, y: 0}
hasStone: 0
stoneNumberPerGrid: 0
stone: {fileID: 0}
tilePoolID: 2
treePoolID: 0
stonePoolID: 0
skyConfig: {fileID: 11400000, guid: bd4ef31a76776aa478b7a7c4b8964d98, type: 2}
8 changes: 8 additions & 0 deletions TerrainTest/Assets/Biomes/Biome1.asset.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

67 changes: 67 additions & 0 deletions TerrainTest/Assets/Biomes/Biome2.asset
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 84bc5866b5fb8594b823cf28a3bfc026, type: 3}
m_Name: Biome2
m_EditorClassIdentifier:
blendNearMid: 0
midNearRatio: 0
blendMidFar: 0
farMidRatio: 0.7
near:
width: 2
meshes:
- {fileID: 1495801216899893060, guid: 41189d4cd9026344392ed43caafde860, type: 3}
material: {fileID: 2100000, guid: ea759fd514a435546a31a84e1b857e7f, type: 2}
hasTree: 0
tree: {fileID: 0}
treeNumberPerGrid: 0
randomPosY: 0
randomPosYRange: {x: 0, y: 0}
hasStone: 0
stoneNumberPerGrid: 0
stone: {fileID: 0}
tilePoolID: 9
treePoolID: 0
stonePoolID: 0
mid:
width: 1
meshes:
- {fileID: 8598159772378286561, guid: db15377d8e428b4498c64ae0b8817561, type: 3}
material: {fileID: 2100000, guid: 775781adbb6e93c4a8e3899326e3c52c, type: 2}
hasTree: 0
tree: {fileID: 0}
treeNumberPerGrid: 0
randomPosY: 0
randomPosYRange: {x: 0, y: 0}
hasStone: 0
stoneNumberPerGrid: 0
stone: {fileID: 0}
tilePoolID: 10
treePoolID: 0
stonePoolID: 0
far:
width: 2
meshes:
- {fileID: 8598159772378286561, guid: db15377d8e428b4498c64ae0b8817561, type: 3}
material: {fileID: 2100000, guid: ea759fd514a435546a31a84e1b857e7f, type: 2}
hasTree: 1
tree: {fileID: 1313749818314350997, guid: 2fd043a687d70594da234cd86ff195d2, type: 3}
treeNumberPerGrid: 3
randomPosY: 1
randomPosYRange: {x: -0.4, y: -0.1}
hasStone: 0
stoneNumberPerGrid: 0
stone: {fileID: 0}
tilePoolID: 11
treePoolID: 5
stonePoolID: 0
skyConfig: {fileID: 11400000, guid: a895736ed37f4714d8de4cbb9c530960, type: 2}
8 changes: 8 additions & 0 deletions TerrainTest/Assets/Biomes/Biome2.asset.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

62 changes: 62 additions & 0 deletions TerrainTest/Assets/Biomes/Biome3.asset
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 84bc5866b5fb8594b823cf28a3bfc026, type: 3}
m_Name: Biome3
m_EditorClassIdentifier:
blendNearMid: 0
midNearRatio: 0
blendMidFar: 0
farMidRatio: 0.7
near:
width: 2
meshes:
- {fileID: 8462614397845747776, guid: aa91ba573a0d6ab4fbf4781a833de1e9, type: 3}
material: {fileID: 2100000, guid: 3cc8cabd94ea93249a125bd1db1a10e1, type: 2}
hasTree: 0
tree: {fileID: 0}
treeNumberPerGrid: 0
randomPosY: 0
hasStone: 0
stoneNumberPerGrid: 0
stone: {fileID: 0}
treePoolID: 0
stonePoolID: 0
mid:
width: 2
meshes:
- {fileID: 8462614397845747776, guid: aa91ba573a0d6ab4fbf4781a833de1e9, type: 3}
material: {fileID: 2100000, guid: 3cc8cabd94ea93249a125bd1db1a10e1, type: 2}
hasTree: 0
tree: {fileID: 0}
treeNumberPerGrid: 0
randomPosY: 0
hasStone: 1
stoneNumberPerGrid: 1
stone: {fileID: 3292276700657338325, guid: 3eb793053d83aba44b383f0641941259, type: 3}
treePoolID: 0
stonePoolID: 1
far:
width: 1
meshes:
- {fileID: 7227429322105617817, guid: be7ad61b365b009429502fd493d9514f, type: 3}
- {fileID: 1495801216899893060, guid: 41189d4cd9026344392ed43caafde860, type: 3}
material: {fileID: 2100000, guid: 474faface03d15149914528adcee5f6c, type: 2}
hasTree: 0
tree: {fileID: 1313749818314350997, guid: 2fd043a687d70594da234cd86ff195d2, type: 3}
treeNumberPerGrid: 3
randomPosY: 0
hasStone: 0
stoneNumberPerGrid: 0
stone: {fileID: 0}
treePoolID: 1
stonePoolID: 0
skyConfig: {fileID: 11400000, guid: 8ec3298287de0be49b60db2c3364c46d, type: 2}
8 changes: 8 additions & 0 deletions TerrainTest/Assets/Biomes/Biome3.asset.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading