TheVoidCafe/WuhuIsland
1
0
Fork 0
Code Issues 1 Pull requests Projects 1 Releases 1 Packages Wiki Activity

feat: add missing pieces to WS2_common_island

Browse source 
feat: add custom water shader

feat: add WS2_common_sea component

feat: inital lighting settings for night variant

feat: add a few new shader for displaying vertex colours on transparent elements or applying blend effects
This commit is contained in:
Jo 2024-08-12 02:12:53 +02:00
parent fa599d7fb9
commit 5ae51add65
674 changed files with 88034 additions and 2387 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Assets/_MarrowAssets/Levels/Wuhu Island/Shader/WS2_common_island.meta Normal file
View file

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: a120c25cce4c734429f116471a91854f
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

1561
Assets/_MarrowAssets/Levels/Wuhu Island/Shader/WS2_common_island/mountain.shadergraph Normal file
View file

File diff suppressed because it is too large Load diff

10
Assets/_MarrowAssets/Levels/Wuhu Island/Shader/WS2_common_island/mountain.shadergraph.meta Normal file
View file

@ -0,0 +1,10 @@
fileFormatVersion: 2
guid: 6f6dd7858e105ef44b20d2a73cfbb255
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 2
userData:
assetBundleName:
assetBundleVariant:
script: {fileID: 11500000, guid: 625f186215c104763be7675aa2d941aa, type: 3}

1637
Assets/_MarrowAssets/Levels/Wuhu Island/Shader/common/ApplyVertexColour.shadergraph Normal file
View file

File diff suppressed because it is too large Load diff

10
Assets/_MarrowAssets/Levels/Wuhu Island/Shader/common/ApplyVertexColour.shadergraph.meta Normal file
View file

@ -0,0 +1,10 @@
fileFormatVersion: 2
guid: dfcf13297b3274f479a59a8c290091c1
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 2
userData:
assetBundleName:
assetBundleVariant:
script: {fileID: 11500000, guid: 625f186215c104763be7675aa2d941aa, type: 3}

1705
Assets/_MarrowAssets/Levels/Wuhu Island/Shader/common/ApplyVertexColourTransparent.shadergraph Normal file
View file

File diff suppressed because it is too large Load diff

10
Assets/_MarrowAssets/Levels/Wuhu Island/Shader/common/ApplyVertexColourTransparent.shadergraph.meta Normal file
View file

@ -0,0 +1,10 @@
fileFormatVersion: 2
guid: 394b468f7176a384f9859fa7a0e188e8
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 2
userData:
assetBundleName:
assetBundleVariant:
script: {fileID: 11500000, guid: 625f186215c104763be7675aa2d941aa, type: 3}

2105
Assets/_MarrowAssets/Levels/Wuhu Island/Shader/common/CartoonWater.shadergraph Normal file
View file

File diff suppressed because it is too large Load diff

10
Assets/_MarrowAssets/Levels/Wuhu Island/Shader/common/CartoonWater.shadergraph.meta Normal file
View file

@ -0,0 +1,10 @@
fileFormatVersion: 2
guid: d82eb9402d0977340a794c751eb354a8
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 2
userData:
assetBundleName:
assetBundleVariant:
script: {fileID: 11500000, guid: 625f186215c104763be7675aa2d941aa, type: 3}

2366
Assets/_MarrowAssets/Levels/Wuhu Island/Shader/common/GradientVertexColour.shadergraph Normal file
View file

File diff suppressed because it is too large Load diff

10
Assets/_MarrowAssets/Levels/Wuhu Island/Shader/common/GradientVertexColour.shadergraph.meta Normal file
View file

@ -0,0 +1,10 @@
fileFormatVersion: 2
guid: 9128d3e3f195a3440bb8bb36943889ad
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 2
userData:
assetBundleName:
assetBundleVariant:
script: {fileID: 11500000, guid: 625f186215c104763be7675aa2d941aa, type: 3}

303
Assets/_MarrowAssets/Levels/Wuhu Island/Shader/common/OverlayShader.shadergraph
View file

@ -62,6 +62,21 @@
},
{
"m_Id": "845164f9fcc04ad69b0fdf33e39f6ff0"
},
{
"m_Id": "ca1876cf969440a1adfd3c1369cb685b"
},
{
"m_Id": "aa3dbf29dca9459497ebab4ec39b2c74"
},
{
"m_Id": "7623a17220894c7ba99bd9e5c6c03fae"
},
{
"m_Id": "3481b9d466de45c79ad01fe7b7c317df"
},
{
"m_Id": "0415501a517142b4888e0fbac9abdb5a"
}
],
"m_GroupDatas": [],
@ -253,6 +268,21 @@
},
{
"m_Id": "8b2715eb6fe44b86b04692b5545b8a15"
},
{
"m_Id": "ca1876cf969440a1adfd3c1369cb685b"
},
{
"m_Id": "aa3dbf29dca9459497ebab4ec39b2c74"
},
{
"m_Id": "7623a17220894c7ba99bd9e5c6c03fae"
},
{
"m_Id": "3481b9d466de45c79ad01fe7b7c317df"
},
{
"m_Id": "0415501a517142b4888e0fbac9abdb5a"
}
]
},
@ -311,6 +341,39 @@
}
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.BlockNode",
"m_ObjectId": "0415501a517142b4888e0fbac9abdb5a",
"m_Group": {
"m_Id": ""
},
"m_Name": "SurfaceDescription.Metallic",
"m_DrawState": {
"m_Expanded": true,
"m_Position": {
"serializedVersion": "2",
"x": 0.0,
"y": 0.0,
"width": 0.0,
"height": 0.0
}
},
"m_Slots": [
{
"m_Id": "0e4ad09d07404cc083c3cc8ac6e77d48"
}
],
"synonyms": [],
"m_Precision": 0,
"m_PreviewExpanded": true,
"m_PreviewMode": 0,
"m_CustomColors": {
"m_SerializableColors": []
},
"m_SerializedDescriptor": "SurfaceDescription.Metallic"
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.Internal.Texture2DShaderProperty",
@ -340,6 +403,21 @@
"m_DefaultType": 0
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
"m_ObjectId": "0e4ad09d07404cc083c3cc8ac6e77d48",
"m_Id": 0,
"m_DisplayName": "Metallic",
"m_SlotType": 0,
"m_Hidden": false,
"m_ShaderOutputName": "Metallic",
"m_StageCapability": 2,
"m_Value": 0.0,
"m_DefaultValue": 0.0,
"m_Labels": []
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.TangentMaterialSlot",
@ -451,8 +529,11 @@
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.Rendering.Universal.ShaderGraph.UniversalUnlitSubTarget",
"m_ObjectId": "30301a12e5e9453f8f299fc8f71a26cd"
"m_Type": "UnityEditor.Rendering.Universal.ShaderGraph.UniversalLitSubTarget",
"m_ObjectId": "2e8f2c69676a4064844919c16c9e8ef6",
"m_WorkflowMode": 1,
"m_NormalDropOffSpace": 0,
"m_ClearCoat": false
}
{
@ -488,6 +569,39 @@
"m_DefaultType": 0
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.BlockNode",
"m_ObjectId": "3481b9d466de45c79ad01fe7b7c317df",
"m_Group": {
"m_Id": ""
},
"m_Name": "SurfaceDescription.Occlusion",
"m_DrawState": {
"m_Expanded": true,
"m_Position": {
"serializedVersion": "2",
"x": 0.0,
"y": 0.0,
"width": 0.0,
"height": 0.0
}
},
"m_Slots": [
{
"m_Id": "777de20275944996be7cb3fc92c74394"
}
],
"synonyms": [],
"m_Precision": 0,
"m_PreviewExpanded": true,
"m_PreviewMode": 0,
"m_CustomColors": {
"m_SerializableColors": []
},
"m_SerializedDescriptor": "SurfaceDescription.Occlusion"
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot",
@ -536,6 +650,30 @@
}
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.NormalMaterialSlot",
"m_ObjectId": "3cbd7776b20e4d3ab65857c94b2ecf38",
"m_Id": 0,
"m_DisplayName": "Normal (Tangent Space)",
"m_SlotType": 0,
"m_Hidden": false,
"m_ShaderOutputName": "NormalTS",
"m_StageCapability": 2,
"m_Value": {
"x": 0.0,
"y": 0.0,
"z": 0.0
},
"m_DefaultValue": {
"x": 0.0,
"y": 0.0,
"z": 0.0
},
"m_Labels": [],
"m_Space": 3
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot",
@ -813,6 +951,54 @@
"m_Labels": []
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.BlockNode",
"m_ObjectId": "7623a17220894c7ba99bd9e5c6c03fae",
"m_Group": {
"m_Id": ""
},
"m_Name": "SurfaceDescription.Emission",
"m_DrawState": {
"m_Expanded": true,
"m_Position": {
"serializedVersion": "2",
"x": 0.0,
"y": 0.0,
"width": 0.0,
"height": 0.0
}
},
"m_Slots": [
{
"m_Id": "9fb59951713c49e1a11b518e1913766b"
}
],
"synonyms": [],
"m_Precision": 0,
"m_PreviewExpanded": true,
"m_PreviewMode": 0,
"m_CustomColors": {
"m_SerializableColors": []
},
"m_SerializedDescriptor": "SurfaceDescription.Emission"
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
"m_ObjectId": "777de20275944996be7cb3fc92c74394",
"m_Id": 0,
"m_DisplayName": "Ambient Occlusion",
"m_SlotType": 0,
"m_Hidden": false,
"m_ShaderOutputName": "Occlusion",
"m_StageCapability": 2,
"m_Value": 1.0,
"m_DefaultValue": 1.0,
"m_Labels": []
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.Internal.Texture2DShaderProperty",
@ -847,7 +1033,7 @@
"m_Type": "UnityEditor.Rendering.Universal.ShaderGraph.UniversalTarget",
"m_ObjectId": "7966a56da1cb4be6b9487c3ef4c6c9fa",
"m_ActiveSubTarget": {
"m_Id": "30301a12e5e9453f8f299fc8f71a26cd"
"m_Id": "2e8f2c69676a4064844919c16c9e8ef6"
},
"m_AllowMaterialOverride": false,
"m_SurfaceType": 0,
@ -1087,6 +1273,36 @@
"m_BareResource": false
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.ColorRGBMaterialSlot",
"m_ObjectId": "9fb59951713c49e1a11b518e1913766b",
"m_Id": 0,
"m_DisplayName": "Emission",
"m_SlotType": 0,
"m_Hidden": false,
"m_ShaderOutputName": "Emission",
"m_StageCapability": 2,
"m_Value": {
"x": 0.0,
"y": 0.0,
"z": 0.0
},
"m_DefaultValue": {
"x": 0.0,
"y": 0.0,
"z": 0.0
},
"m_Labels": [],
"m_ColorMode": 1,
"m_DefaultColor": {
"r": 0.0,
"g": 0.0,
"b": 0.0,
"a": 1.0
}
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.MultiplyNode",
@ -1177,6 +1393,39 @@
}
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.BlockNode",
"m_ObjectId": "aa3dbf29dca9459497ebab4ec39b2c74",
"m_Group": {
"m_Id": ""
},
"m_Name": "SurfaceDescription.NormalTS",
"m_DrawState": {
"m_Expanded": true,
"m_Position": {
"serializedVersion": "2",
"x": 0.0,
"y": 0.0,
"width": 0.0,
"height": 0.0
}
},
"m_Slots": [
{
"m_Id": "3cbd7776b20e4d3ab65857c94b2ecf38"
}
],
"synonyms": [],
"m_Precision": 0,
"m_PreviewExpanded": true,
"m_PreviewMode": 0,
"m_CustomColors": {
"m_SerializableColors": []
},
"m_SerializedDescriptor": "SurfaceDescription.NormalTS"
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.BlockNode",
@ -1243,6 +1492,39 @@
"m_SerializedDescriptor": "SurfaceDescription.Alpha"
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.BlockNode",
"m_ObjectId": "ca1876cf969440a1adfd3c1369cb685b",
"m_Group": {
"m_Id": ""
},
"m_Name": "SurfaceDescription.Smoothness",
"m_DrawState": {
"m_Expanded": true,
"m_Position": {
"serializedVersion": "2",
"x": 0.0,
"y": 0.0,
"width": 0.0,
"height": 0.0
}
},
"m_Slots": [
{
"m_Id": "e5d1c7f63b7a46c8a0d431d6c4888709"
}
],
"synonyms": [],
"m_Precision": 0,
"m_PreviewExpanded": true,
"m_PreviewMode": 0,
"m_CustomColors": {
"m_SerializableColors": []
},
"m_SerializedDescriptor": "SurfaceDescription.Smoothness"
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
@ -1518,6 +1800,21 @@
}
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
"m_ObjectId": "e5d1c7f63b7a46c8a0d431d6c4888709",
"m_Id": 0,
"m_DisplayName": "Smoothness",
"m_SlotType": 0,
"m_Hidden": false,
"m_ShaderOutputName": "Smoothness",
"m_StageCapability": 2,
"m_Value": 0.5,
"m_DefaultValue": 0.5,
"m_Labels": []
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot",