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

feat: add some more lights to the town area

Browse source 
fix: apply various missing textures

feat: modified ApplyVertexColour and ApplyVertexColourTransparent shaders, the material surface attributes may now be overwritten
This commit is contained in:
Jo 2024-08-15 01:24:26 +02:00
parent d8a41a2c56
commit 5f1824fcd4
790 changed files with 17554 additions and 4020 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -62,6 +62,15 @@
},
{
"m_Id": "b91347eb6874495986fc8632708b6be6"
},
{
"m_Id": "2c93cf976d594b64b59a0c99675ec419"
},
{
"m_Id": "a1e1a845970347b3859fd4017024771e"
},
{
"m_Id": "acaaf34470614025a4740fcb5a382901"
}
],
"m_GroupDatas": [],
@ -220,6 +229,15 @@
},
{
"m_Id": "b91347eb6874495986fc8632708b6be6"
},
{
"m_Id": "2c93cf976d594b64b59a0c99675ec419"
},
{
"m_Id": "a1e1a845970347b3859fd4017024771e"
},
{
"m_Id": "acaaf34470614025a4740fcb5a382901"
}
]
},
@ -521,6 +539,39 @@
"m_Labels": []
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.BlockNode",
"m_ObjectId": "2c93cf976d594b64b59a0c99675ec419",
"m_Group": {
"m_Id": ""
},
"m_Name": "SurfaceDescription.Specular",
"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": "df99b3d732394e84897253637f77eb10"
}
],
"synonyms": [],
"m_Precision": 0,
"m_PreviewExpanded": true,
"m_PreviewMode": 0,
"m_CustomColors": {
"m_SerializableColors": []
},
"m_SerializedDescriptor": "SurfaceDescription.Specular"
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.BlockNode",
@ -569,6 +620,21 @@
"m_Labels": []
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
"m_ObjectId": "3767164dd10949eb8e0961b61837b264",
"m_Id": 0,
"m_DisplayName": "Alpha Clip Threshold",
"m_SlotType": 0,
"m_Hidden": false,
"m_ShaderOutputName": "AlphaClipThreshold",
"m_StageCapability": 2,
"m_Value": 0.5,
"m_DefaultValue": 0.5,
"m_Labels": []
}
{
"m_SGVersion": 1,
"m_Type": "UnityEditor.Rendering.Universal.ShaderGraph.UniversalTarget",
@ -576,7 +642,7 @@
"m_ActiveSubTarget": {
"m_Id": "91ca02ef68834885b116f1f421705a86"
},
"m_AllowMaterialOverride": false,
"m_AllowMaterialOverride": true,
"m_SurfaceType": 0,
"m_ZTestMode": 4,
"m_ZWriteControl": 0,
@ -669,6 +735,21 @@
"m_BareResource": false
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
"m_ObjectId": "490637d2f0d04f7cbd2042882450c408",
"m_Id": 0,
"m_DisplayName": "Alpha",
"m_SlotType": 0,
"m_Hidden": false,
"m_ShaderOutputName": "Alpha",
"m_StageCapability": 2,
"m_Value": 1.0,
"m_DefaultValue": 1.0,
"m_Labels": []
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.PropertyNode",
@ -1046,6 +1127,39 @@
}
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.BlockNode",
"m_ObjectId": "a1e1a845970347b3859fd4017024771e",
"m_Group": {
"m_Id": ""
},
"m_Name": "SurfaceDescription.Alpha",
"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": "490637d2f0d04f7cbd2042882450c408"
}
],
"synonyms": [],
"m_Precision": 0,
"m_PreviewExpanded": true,
"m_PreviewMode": 0,
"m_CustomColors": {
"m_SerializableColors": []
},
"m_SerializedDescriptor": "SurfaceDescription.Alpha"
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.NormalMaterialSlot",
@ -1094,6 +1208,39 @@
}
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.BlockNode",
"m_ObjectId": "acaaf34470614025a4740fcb5a382901",
"m_Group": {
"m_Id": ""
},
"m_Name": "SurfaceDescription.AlphaClipThreshold",
"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": "3767164dd10949eb8e0961b61837b264"
}
],
"synonyms": [],
"m_Precision": 0,
"m_PreviewExpanded": true,
"m_PreviewMode": 0,
"m_CustomColors": {
"m_SerializableColors": []
},
"m_SerializedDescriptor": "SurfaceDescription.AlphaClipThreshold"
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
@ -1354,7 +1501,7 @@
"m_Guid": ""
},
"isMainTexture": false,
"useTilingAndOffset": false,
"useTilingAndOffset": true,
"m_Modifiable": true,
"m_DefaultType": 0
}
@ -1557,6 +1704,36 @@
}
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.ColorRGBMaterialSlot",
"m_ObjectId": "df99b3d732394e84897253637f77eb10",
"m_Id": 0,
"m_DisplayName": "Specular Color",
"m_SlotType": 0,
"m_Hidden": false,
"m_ShaderOutputName": "Specular",
"m_StageCapability": 2,
"m_Value": {
"x": 0.5,
"y": 0.5,
"z": 0.5
},
"m_DefaultValue": {
"x": 0.0,
"y": 0.0,
"z": 0.0
},
"m_Labels": [],
"m_ColorMode": 0,
"m_DefaultColor": {
"r": 0.5,
"g": 0.5,
"b": 0.5,
"a": 1.0
}
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",

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

@ -65,6 +65,12 @@
},
{
"m_Id": "7f20d6b30cbb46fcb411da463554fdfa"
},
{
"m_Id": "8cef9a3f9b6e42c8b4636ad2562641ff"
},
{
"m_Id": "8044d0e202fc460ab0882cdad4b228e2"
}
],
"m_GroupDatas": [],
@ -240,6 +246,12 @@
},
{
"m_Id": "7f20d6b30cbb46fcb411da463554fdfa"
},
{
"m_Id": "8cef9a3f9b6e42c8b4636ad2562641ff"
},
{
"m_Id": "8044d0e202fc460ab0882cdad4b228e2"
}
]
},
@ -801,14 +813,14 @@
"m_ActiveSubTarget": {
"m_Id": "5b0d8a85896744418ae9ad439b4cd1f4"
},
"m_AllowMaterialOverride": false,
"m_AllowMaterialOverride": true,
"m_SurfaceType": 1,
"m_ZTestMode": 4,
"m_ZWriteControl": 0,
"m_AlphaMode": 0,
"m_RenderFace": 2,
"m_RenderFace": 0,
"m_AlphaClip": false,
"m_CastShadows": true,
"m_CastShadows": false,
"m_ReceiveShadows": true,
"m_CustomEditorGUI": "",
"m_SupportVFX": false
@ -949,6 +961,39 @@
"m_SerializedDescriptor": "SurfaceDescription.Alpha"
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.BlockNode",
"m_ObjectId": "8044d0e202fc460ab0882cdad4b228e2",
"m_Group": {
"m_Id": ""
},
"m_Name": "SurfaceDescription.AlphaClipThreshold",
"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": "f8da8a73cc1e4cc79e77b77f5546f375"
}
],
"synonyms": [],
"m_Precision": 0,
"m_PreviewExpanded": true,
"m_PreviewMode": 0,
"m_CustomColors": {
"m_SerializableColors": []
},
"m_SerializedDescriptor": "SurfaceDescription.AlphaClipThreshold"
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.BlockNode",
@ -1119,6 +1164,39 @@
}
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.BlockNode",
"m_ObjectId": "8cef9a3f9b6e42c8b4636ad2562641ff",
"m_Group": {
"m_Id": ""
},
"m_Name": "SurfaceDescription.Specular",
"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": "95ffbe497d53477ea24fb8d20b4830fb"
}
],
"synonyms": [],
"m_Precision": 0,
"m_PreviewExpanded": true,
"m_PreviewMode": 0,
"m_CustomColors": {
"m_SerializableColors": []
},
"m_SerializedDescriptor": "SurfaceDescription.Specular"
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.SampleTexture2DNode",
@ -1199,6 +1277,36 @@
}
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.ColorRGBMaterialSlot",
"m_ObjectId": "95ffbe497d53477ea24fb8d20b4830fb",
"m_Id": 0,
"m_DisplayName": "Specular Color",
"m_SlotType": 0,
"m_Hidden": false,
"m_ShaderOutputName": "Specular",
"m_StageCapability": 2,
"m_Value": {
"x": 0.5,
"y": 0.5,
"z": 0.5
},
"m_DefaultValue": {
"x": 0.0,
"y": 0.0,
"z": 0.0
},
"m_Labels": [],
"m_ColorMode": 0,
"m_DefaultColor": {
"r": 0.5,
"g": 0.5,
"b": 0.5,
"a": 1.0
}
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot",
@ -1658,6 +1766,21 @@
}
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
"m_ObjectId": "f8da8a73cc1e4cc79e77b77f5546f375",
"m_Id": 0,
"m_DisplayName": "Alpha Clip Threshold",
"m_SlotType": 0,
"m_Hidden": false,
"m_ShaderOutputName": "AlphaClipThreshold",
"m_StageCapability": 2,
"m_Value": 0.5,
"m_DefaultValue": 0.5,
"m_Labels": []
}
{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.LerpNode",

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

File diff suppressed because it is too large Load diff