helar/Heroes_of_Hiis
1
0
Fork 0
Code Issues 8 Pull Requests 2 Projects Releases Wiki Activity

merge fixes and icebolt tweaks

Browse Source
This commit is contained in:
joonasp
2022-04-14 17:56:04 +03:00
parent be8b9a987d
commit 5bf99356ff
16 changed files with 1490 additions and 36926 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
Assets/_TerrainData/TerrainData_521113671563848736.asset
View File

@@ -250,9 +250,9 @@ MonoBehaviour:
colorByNormalPropertyName: _ColorByNormal
colorBlendPropertyName: _ColorBlend
dimensionPropertyName: _Dimension
colorByHeightMap: {fileID: 5600802747215712828}
colorByNormalMap: {fileID: 4387930893138807582}
colorBlendMap: {fileID: 567659264843545098}
colorByHeightMap: {fileID: 7937926164014354006}
colorByNormalMap: {fileID: 1824847980210742918}
colorBlendMap: {fileID: -1989707927698212272}
splats: {fileID: 11400000, guid: a3cfde07cd0a9f4488f10294d27e360e, type: 2}
splatControlResolution: 512
splatControls: []
@@ -276,26 +276,7 @@ MonoBehaviour:
terrainData: {fileID: 11400000}
maskMapResolution: 256
maskMap: {fileID: 0}
--- !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: 9be8aeadd554b3c488c79555c2c46709, type: 3}
m_Name: TerrainData_521113671563848736
m_EditorClassIdentifier:
id: 521113671563848736
geometry: {fileID: -8348571099446269230}
shading: {fileID: -6296467136306377332}
rendering: {fileID: 1146199632233519638}
foliage: {fileID: 966795845191840372}
mask: {fileID: -4957312979561511316}
geometryData: {fileID: 11400000, guid: 8c5f1bd1dc4449b4498c41f28a74d012, type: 2}
--- !u!28 &567659264843545098
--- !u!28 &-1989707927698212272
Texture2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -342,6 +323,25 @@ Texture2D:
offset: 0
size: 0
path:
--- !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: 9be8aeadd554b3c488c79555c2c46709, type: 3}
m_Name: TerrainData_521113671563848736
m_EditorClassIdentifier:
id: 521113671563848736
geometry: {fileID: -8348571099446269230}
shading: {fileID: -6296467136306377332}
rendering: {fileID: 1146199632233519638}
foliage: {fileID: 966795845191840372}
mask: {fileID: -4957312979561511316}
geometryData: {fileID: 11400000, guid: 8c5f1bd1dc4449b4498c41f28a74d012, type: 2}
--- !u!114 &966795845191840372
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -2955,7 +2955,7 @@ MonoBehaviour:
treeDistance: 200
grassDistance: 100
grassFadeStart: 0.75
--- !u!28 &4387930893138807582
--- !u!28 &1824847980210742918
Texture2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -3002,7 +3002,7 @@ Texture2D:
offset: 0
size: 0
path:
--- !u!28 &5600802747215712828
--- !u!28 &7937926164014354006
Texture2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}

200
Assets/_TerrainData/TerrainData_699485723238748736.asset
View File

File diff suppressed because one or more lines are too long

180
Assets/_TerrainData/TerrainData_869121471408748736.asset
View File

File diff suppressed because one or more lines are too long

6
Assets/_TerrainData/TerrainMaterial_521113671563848736.mat
View File

@@ -27,17 +27,17 @@ Material:
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ColorBlend:
m_Texture: {fileID: 567659264843545098, guid: b6bbea2e1167a7346822545139402874,
m_Texture: {fileID: -1989707927698212272, guid: b6bbea2e1167a7346822545139402874,
type: 2}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ColorByHeight:
m_Texture: {fileID: 5600802747215712828, guid: b6bbea2e1167a7346822545139402874,
m_Texture: {fileID: 7937926164014354006, guid: b6bbea2e1167a7346822545139402874,
type: 2}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ColorByNormal:
m_Texture: {fileID: 4387930893138807582, guid: b6bbea2e1167a7346822545139402874,
m_Texture: {fileID: 1824847980210742918, guid: b6bbea2e1167a7346822545139402874,
type: 2}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}

6
Assets/_TerrainData/TerrainMaterial_699485723238748736.mat
View File

@@ -40,17 +40,17 @@ Material:
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ColorBlend:
m_Texture: {fileID: -8225046794103038699, guid: 726ce83d589353742be6b48ff467fc48,
m_Texture: {fileID: 8107136639599825324, guid: 726ce83d589353742be6b48ff467fc48,
type: 2}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ColorByHeight:
m_Texture: {fileID: 6831111675755459306, guid: 726ce83d589353742be6b48ff467fc48,
m_Texture: {fileID: 3516647102606722172, guid: 726ce83d589353742be6b48ff467fc48,
type: 2}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ColorByNormal:
m_Texture: {fileID: 165637708112304383, guid: 726ce83d589353742be6b48ff467fc48,
m_Texture: {fileID: 4906480472719197437, guid: 726ce83d589353742be6b48ff467fc48,
type: 2}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}

6
Assets/_TerrainData/TerrainMaterial_869121471408748736.mat
View File

@@ -40,17 +40,17 @@ Material:
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ColorBlend:
m_Texture: {fileID: 3234995293974440031, guid: 7f589c682d367b442b8cf75918f5aa55,
m_Texture: {fileID: -9047105083863647604, guid: 7f589c682d367b442b8cf75918f5aa55,
type: 2}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ColorByHeight:
m_Texture: {fileID: 7438741728987644076, guid: 7f589c682d367b442b8cf75918f5aa55,
m_Texture: {fileID: 3290042660671939480, guid: 7f589c682d367b442b8cf75918f5aa55,
type: 2}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ColorByNormal:
m_Texture: {fileID: -7540841678319409431, guid: 7f589c682d367b442b8cf75918f5aa55,
m_Texture: {fileID: -1827338606171078033, guid: 7f589c682d367b442b8cf75918f5aa55,
type: 2}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}