diff --git a/ShaderGraph_ExampleLibrary_Project/Assets/Characters/AngryBots/EnemyBuzzer/Materials/EnemyBuzzer_Body_Mat.mat b/ShaderGraph_ExampleLibrary_Project/Assets/Characters/AngryBots/EnemyBuzzer/Materials/EnemyBuzzer_Body_Mat.mat index 05cce97..b16f364 100644 --- a/ShaderGraph_ExampleLibrary_Project/Assets/Characters/AngryBots/EnemyBuzzer/Materials/EnemyBuzzer_Body_Mat.mat +++ b/ShaderGraph_ExampleLibrary_Project/Assets/Characters/AngryBots/EnemyBuzzer/Materials/EnemyBuzzer_Body_Mat.mat @@ -5,19 +5,25 @@ Material: serializedVersion: 6 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_Name: EnemyBuzzer_Body_Mat m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} - m_ShaderKeywords: _EMISSION _METALLICGLOSSMAP _METALLICSPECGLOSSMAP _NORMALMAP + m_ShaderKeywords: _EMISSION _METALLICSPECGLOSSMAP _NORMALMAP m_LightmapFlags: 2 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} + m_CustomRenderQueue: 2050 + stringTagMap: + RenderType: Opaque disabledShaderPasses: [] m_SavedProperties: serializedVersion: 3 m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 2800000, guid: 44580608999de43adb0123838e3f7eb7, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _BumpMap: m_Texture: {fileID: 2800000, guid: 0717f2207e49f42c9b5dfb030f993ec0, type: 3} m_Scale: {x: 1, y: 1} @@ -66,6 +72,7 @@ Material: - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossyReflections: 1 @@ -73,6 +80,9 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 1 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 @@ -81,6 +91,20 @@ Material: - _WorkflowMode: 1 - _ZWrite: 1 m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 3.9999995, g: 3.9999995, b: 3.9999995, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} +--- !u!114 &7585303134719011143 +MonoBehaviour: + m_ObjectHideFlags: 11 + 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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 1 diff --git a/ShaderGraph_ExampleLibrary_Project/Assets/Characters/AngryBots/EnemyBuzzer/Materials/EnemyBuzzer_Wings_Mat.mat b/ShaderGraph_ExampleLibrary_Project/Assets/Characters/AngryBots/EnemyBuzzer/Materials/EnemyBuzzer_Wings_Mat.mat index 0fe3b78..ff9eeca 100644 --- a/ShaderGraph_ExampleLibrary_Project/Assets/Characters/AngryBots/EnemyBuzzer/Materials/EnemyBuzzer_Wings_Mat.mat +++ b/ShaderGraph_ExampleLibrary_Project/Assets/Characters/AngryBots/EnemyBuzzer/Materials/EnemyBuzzer_Wings_Mat.mat @@ -5,14 +5,15 @@ Material: serializedVersion: 6 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_Name: EnemyBuzzer_Wings_Mat m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} - m_ShaderKeywords: _EMISSION _METALLICGLOSSMAP _METALLICSPECGLOSSMAP _NORMALMAP + m_ShaderKeywords: _EMISSION _METALLICSPECGLOSSMAP _NORMALMAP m_LightmapFlags: 2 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 3000 + m_CustomRenderQueue: 3050 stringTagMap: RenderType: Transparent disabledShaderPasses: @@ -20,6 +21,10 @@ Material: m_SavedProperties: serializedVersion: 3 m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 2800000, guid: 98f21374d51684606bbc75cf951f3e36, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _BumpMap: m_Texture: {fileID: 2800000, guid: ed220f551f6da4040a5c0dc019da1c26, type: 3} m_Scale: {x: 1, y: 1} @@ -68,6 +73,7 @@ Material: - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 10 + - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossyReflections: 1 @@ -75,6 +81,9 @@ Material: - _Mode: 2 - _OcclusionStrength: 1 - _Parallax: 0.02 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 1 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 5 @@ -83,6 +92,20 @@ Material: - _WorkflowMode: 1 - _ZWrite: 0 m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 21.361254, g: 1.2302293, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} +--- !u!114 &3212208797457234376 +MonoBehaviour: + m_ObjectHideFlags: 11 + 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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 1 diff --git a/ShaderGraph_ExampleLibrary_Project/Assets/Characters/AngryBots/Player/Materials/Gun_MAT.mat b/ShaderGraph_ExampleLibrary_Project/Assets/Characters/AngryBots/Player/Materials/Gun_MAT.mat index ae0d5ab..cefdd09 100644 --- a/ShaderGraph_ExampleLibrary_Project/Assets/Characters/AngryBots/Player/Materials/Gun_MAT.mat +++ b/ShaderGraph_ExampleLibrary_Project/Assets/Characters/AngryBots/Player/Materials/Gun_MAT.mat @@ -1,19 +1,34 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!114 &-209962198372145799 +MonoBehaviour: + m_ObjectHideFlags: 11 + 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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 1 --- !u!21 &2100000 Material: serializedVersion: 6 m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_Name: Gun_MAT m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} - m_ShaderKeywords: _EMISSION _METALLICGLOSSMAP _METALLICSPECGLOSSMAP _NORMALMAP + m_ShaderKeywords: _EMISSION _METALLICSPECGLOSSMAP _NORMALMAP m_LightmapFlags: 2 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} + m_CustomRenderQueue: 2050 + stringTagMap: + RenderType: Opaque disabledShaderPasses: [] m_SavedProperties: serializedVersion: 3 @@ -54,6 +69,10 @@ Material: m_Texture: {fileID: 2800000, guid: dff115c36813d4df68554b3f8fee91eb, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _BaseMap: + m_Texture: {fileID: 2800000, guid: a2585b52309084b379d22ad7c6352e29, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _BumpMap: m_Texture: {fileID: 2800000, guid: f626d158585294843b1c4fe5664a7783, type: 3} m_Scale: {x: 1, y: 1} @@ -99,10 +118,14 @@ Material: - Float_9FB77EE1: 0 - Float_A5A8E873: 0.7 - Float_B7AA6BC6: 10 + - _AlphaClip: 0 + - _Blend: 0 - _BumpScale: 1 + - _Cull: 2 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossyReflections: 1 @@ -110,13 +133,18 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 1 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 - _ZWrite: 1 m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} diff --git a/ShaderGraph_ExampleLibrary_Project/Assets/Characters/AngryBots/Player/Materials/Player_MAT.mat b/ShaderGraph_ExampleLibrary_Project/Assets/Characters/AngryBots/Player/Materials/Player_MAT.mat index 845d0e1..4877072 100644 --- a/ShaderGraph_ExampleLibrary_Project/Assets/Characters/AngryBots/Player/Materials/Player_MAT.mat +++ b/ShaderGraph_ExampleLibrary_Project/Assets/Characters/AngryBots/Player/Materials/Player_MAT.mat @@ -1,5 +1,18 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!114 &-8005465287643777245 +MonoBehaviour: + m_ObjectHideFlags: 11 + 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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 1 --- !u!21 &2100000 Material: serializedVersion: 6 @@ -9,12 +22,13 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Player_MAT m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} - m_ShaderKeywords: _EMISSION _METALLICGLOSSMAP _METALLICSPECGLOSSMAP _NORMALMAP + m_ShaderKeywords: _EMISSION _METALLICSPECGLOSSMAP _NORMALMAP m_LightmapFlags: 2 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} + m_CustomRenderQueue: 2050 + stringTagMap: + RenderType: Opaque disabledShaderPasses: [] m_SavedProperties: serializedVersion: 3 @@ -39,6 +53,10 @@ Material: m_Texture: {fileID: 2800000, guid: 936a43635c57b0a408fb70bee7efbb2a, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _BaseMap: + m_Texture: {fileID: 2800000, guid: 206adb28e14acb0479ae315df5e1d743, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _BumpMap: m_Texture: {fileID: 2800000, guid: 39c790ced3e137243bff34375839baa9, type: 3} m_Scale: {x: 1, y: 1} @@ -88,6 +106,7 @@ Material: - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossyReflections: 1 @@ -95,7 +114,9 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 + - _QueueOffset: 0 - _ReceiveShadows: 1 + - _Smoothness: 1 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 @@ -104,6 +125,7 @@ Material: - _WorkflowMode: 1 - _ZWrite: 1 m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 2, g: 2, b: 2, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} diff --git a/ShaderGraph_ExampleLibrary_Project/Assets/Characters/EelDog/Materials/Eeldog_Yellow_Mat.mat b/ShaderGraph_ExampleLibrary_Project/Assets/Characters/EelDog/Materials/Eeldog_Yellow_Mat.mat index f32cfd7..af0adba 100644 --- a/ShaderGraph_ExampleLibrary_Project/Assets/Characters/EelDog/Materials/Eeldog_Yellow_Mat.mat +++ b/ShaderGraph_ExampleLibrary_Project/Assets/Characters/EelDog/Materials/Eeldog_Yellow_Mat.mat @@ -5,19 +5,25 @@ Material: serializedVersion: 6 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_Name: Eeldog_Yellow_Mat m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} m_ShaderKeywords: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} + m_CustomRenderQueue: 2050 + stringTagMap: + RenderType: Opaque disabledShaderPasses: [] m_SavedProperties: serializedVersion: 3 m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _BumpMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -66,12 +72,16 @@ Material: - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0 - _GlossyReflections: 1 - _Metallic: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 @@ -80,6 +90,20 @@ Material: - _WorkflowMode: 1 - _ZWrite: 1 m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 0} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} +--- !u!114 &8302681214543393828 +MonoBehaviour: + m_ObjectHideFlags: 11 + 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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 1 diff --git a/ShaderGraph_ExampleLibrary_Project/Assets/Characters/Ellen2D/Materials/EllenMat-LightweightStandard.mat b/ShaderGraph_ExampleLibrary_Project/Assets/Characters/Ellen2D/Materials/EllenMat-LightweightStandard.mat index 153c93b..d8792ee 100644 --- a/ShaderGraph_ExampleLibrary_Project/Assets/Characters/Ellen2D/Materials/EllenMat-LightweightStandard.mat +++ b/ShaderGraph_ExampleLibrary_Project/Assets/Characters/Ellen2D/Materials/EllenMat-LightweightStandard.mat @@ -1,23 +1,42 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!114 &-8458791575534127904 +MonoBehaviour: + m_ObjectHideFlags: 11 + 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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 1 --- !u!21 &2100000 Material: serializedVersion: 6 m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_Name: EllenMat-LightweightStandard m_Shader: {fileID: 4800000, guid: 650dd9526735d5b46b79224bc6e94025, type: 3} - m_ShaderKeywords: ETC1_EXTERNAL_ALPHA _ALPHATEST_ON + m_ShaderKeywords: _ALPHATEST_ON _EMISSION m_LightmapFlags: 2 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} + m_CustomRenderQueue: 2500 + stringTagMap: + RenderType: TransparentCutout disabledShaderPasses: [] m_SavedProperties: serializedVersion: 3 m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _BumpMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -73,6 +92,7 @@ Material: - _Mode: 1 - _OcclusionStrength: 1 - _Parallax: 0.02 + - _QueueOffset: 0 - _SampleGI: 0 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 @@ -82,6 +102,7 @@ Material: - _WorkflowMode: 0 - _ZWrite: 1 m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} diff --git a/ShaderGraph_ExampleLibrary_Project/Assets/Characters/Ellen2D/Sprites/ELLEN_RUN_NoGun_01_5x5.png.meta b/ShaderGraph_ExampleLibrary_Project/Assets/Characters/Ellen2D/Sprites/ELLEN_RUN_NoGun_01_5x5.png.meta index 8b13b6a..4cd1622 100644 --- a/ShaderGraph_ExampleLibrary_Project/Assets/Characters/Ellen2D/Sprites/ELLEN_RUN_NoGun_01_5x5.png.meta +++ b/ShaderGraph_ExampleLibrary_Project/Assets/Characters/Ellen2D/Sprites/ELLEN_RUN_NoGun_01_5x5.png.meta @@ -1,31 +1,75 @@ fileFormatVersion: 2 guid: 429445aeeb26a441fb0e2d02fdc4614c TextureImporter: - fileIDToRecycleName: - 21300000: ELLEN_RUN_NoGun_01_5x5_0 - 21300002: ELLEN_RUN_NoGun_01_5x5_1 - 21300004: ELLEN_RUN_NoGun_01_5x5_2 - 21300006: ELLEN_RUN_NoGun_01_5x5_3 - 21300008: ELLEN_RUN_NoGun_01_5x5_4 - 21300010: ELLEN_RUN_NoGun_01_5x5_5 - 21300012: ELLEN_RUN_NoGun_01_5x5_6 - 21300014: ELLEN_RUN_NoGun_01_5x5_7 - 21300016: ELLEN_RUN_NoGun_01_5x5_8 - 21300018: ELLEN_RUN_NoGun_01_5x5_9 - 21300020: ELLEN_RUN_NoGun_01_5x5_10 - 21300022: ELLEN_RUN_NoGun_01_5x5_11 - 21300024: ELLEN_RUN_NoGun_01_5x5_12 - 21300026: ELLEN_RUN_NoGun_01_5x5_13 - 21300028: ELLEN_RUN_NoGun_01_5x5_14 - 21300030: ELLEN_RUN_NoGun_01_5x5_15 - 21300032: ELLEN_RUN_NoGun_01_5x5_16 - 21300034: ELLEN_RUN_NoGun_01_5x5_17 - 21300036: ELLEN_RUN_NoGun_01_5x5_18 - 21300038: ELLEN_RUN_NoGun_01_5x5_19 - 21300040: ELLEN_RUN_NoGun_01_5x5_20 - 21300042: ELLEN_RUN_NoGun_01_5x5_21 + internalIDToNameTable: + - first: + 213: 21300000 + second: ELLEN_RUN_NoGun_01_5x5_0 + - first: + 213: 21300002 + second: ELLEN_RUN_NoGun_01_5x5_1 + - first: + 213: 21300004 + second: ELLEN_RUN_NoGun_01_5x5_2 + - first: + 213: 21300006 + second: ELLEN_RUN_NoGun_01_5x5_3 + - first: + 213: 21300008 + second: ELLEN_RUN_NoGun_01_5x5_4 + - first: + 213: 21300010 + second: ELLEN_RUN_NoGun_01_5x5_5 + - first: + 213: 21300012 + second: ELLEN_RUN_NoGun_01_5x5_6 + - first: + 213: 21300014 + second: ELLEN_RUN_NoGun_01_5x5_7 + - first: + 213: 21300016 + second: ELLEN_RUN_NoGun_01_5x5_8 + - first: + 213: 21300018 + second: ELLEN_RUN_NoGun_01_5x5_9 + - first: + 213: 21300020 + second: ELLEN_RUN_NoGun_01_5x5_10 + - first: + 213: 21300022 + second: ELLEN_RUN_NoGun_01_5x5_11 + - first: + 213: 21300024 + second: ELLEN_RUN_NoGun_01_5x5_12 + - first: + 213: 21300026 + second: ELLEN_RUN_NoGun_01_5x5_13 + - first: + 213: 21300028 + second: ELLEN_RUN_NoGun_01_5x5_14 + - first: + 213: 21300030 + second: ELLEN_RUN_NoGun_01_5x5_15 + - first: + 213: 21300032 + second: ELLEN_RUN_NoGun_01_5x5_16 + - first: + 213: 21300034 + second: ELLEN_RUN_NoGun_01_5x5_17 + - first: + 213: 21300036 + second: ELLEN_RUN_NoGun_01_5x5_18 + - first: + 213: 21300038 + second: ELLEN_RUN_NoGun_01_5x5_19 + - first: + 213: 21300040 + second: ELLEN_RUN_NoGun_01_5x5_20 + - first: + 213: 21300042 + second: ELLEN_RUN_NoGun_01_5x5_21 externalObjects: {} - serializedVersion: 5 + serializedVersion: 10 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -43,6 +87,8 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -53,7 +99,7 @@ TextureImporter: serializedVersion: 2 filterMode: 1 aniso: -1 - mipBias: -1 + mipBias: -100 wrapU: 1 wrapV: 1 wrapW: 1 @@ -78,7 +124,7 @@ TextureImporter: compressionQualitySet: 0 textureFormatSet: 0 platformSettings: - - serializedVersion: 2 + - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 @@ -89,7 +135,8 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Standalone maxTextureSize: 2048 resizeAlgorithm: 0 @@ -100,6 +147,7 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 spriteSheet: serializedVersion: 2 sprites: @@ -119,6 +167,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 9a932a93335a54a2c9bcb9811be4db79 + internalID: 21300000 vertices: [] indices: edges: [] @@ -139,6 +188,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 3b7ab9bce712742dd8a4623b4b5433c8 + internalID: 21300002 vertices: [] indices: edges: [] @@ -159,6 +209,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: cc1be15a4e9344c0fab6894a374a0359 + internalID: 21300004 vertices: [] indices: edges: [] @@ -179,6 +230,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 6f230eba412a74e97a012e6d0430a9bd + internalID: 21300006 vertices: [] indices: edges: [] @@ -199,6 +251,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 7a9c0851047d0441fb2f40445531d672 + internalID: 21300008 vertices: [] indices: edges: [] @@ -219,6 +272,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: c89eb3af5db5e4b308bc32a91a0b6ff5 + internalID: 21300010 vertices: [] indices: edges: [] @@ -239,6 +293,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 6f66a77e8097a400fbb3164f116240fe + internalID: 21300012 vertices: [] indices: edges: [] @@ -259,6 +314,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 3895c3f1491df4fcda6acfdb6cae8ea0 + internalID: 21300014 vertices: [] indices: edges: [] @@ -279,6 +335,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 5b3d896fc04aa412d887ff0d4ce0ebac + internalID: 21300016 vertices: [] indices: edges: [] @@ -299,6 +356,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: e66411107bb9b4d4081f2b161bf02be8 + internalID: 21300018 vertices: [] indices: edges: [] @@ -319,6 +377,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 363c0c94eefec4cf78977e88491b7a0b + internalID: 21300020 vertices: [] indices: edges: [] @@ -339,6 +398,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: edbaff32222a242bf858a7dc5b36b8c3 + internalID: 21300022 vertices: [] indices: edges: [] @@ -359,6 +419,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 4f611cc49c16e41de9bc52fb96707fb1 + internalID: 21300024 vertices: [] indices: edges: [] @@ -379,6 +440,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 842fac6e0980c493b9e4f6ffd313eaf8 + internalID: 21300026 vertices: [] indices: edges: [] @@ -399,6 +461,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: ffbe0bada992a438d934fa9d54e1441b + internalID: 21300028 vertices: [] indices: edges: [] @@ -419,6 +482,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: fdf5af8f280884eb784f43bca4a4e6b9 + internalID: 21300030 vertices: [] indices: edges: [] @@ -439,6 +503,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 747829a07f83d4c33b1ae2eb1b608b95 + internalID: 21300032 vertices: [] indices: edges: [] @@ -459,6 +524,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 619a3ffe7ed724d9da9bc1b6a971a181 + internalID: 21300034 vertices: [] indices: edges: [] @@ -479,6 +545,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 9f46c910f5c594dffa4d2f811a8c4bfa + internalID: 21300036 vertices: [] indices: edges: [] @@ -499,6 +566,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: b352fa64c7c2348aa9b458239174fe8d + internalID: 21300038 vertices: [] indices: edges: [] @@ -519,6 +587,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 67b04c1b8850e4fb09f5cc8198042696 + internalID: 21300040 vertices: [] indices: edges: [] @@ -539,6 +608,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 6bc47ca54f31846fc9bfac39aacf385a + internalID: 21300042 vertices: [] indices: edges: [] @@ -547,11 +617,15 @@ TextureImporter: physicsShape: [] bones: [] spriteID: d34124ed6ebeb4419ab7879c45886838 + internalID: 0 vertices: [] indices: edges: [] weights: [] + secondaryTextures: [] spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/ShaderGraph_ExampleLibrary_Project/Assets/Characters/Spiderbot/Animations/Materials/Bug_Red_d.mat b/ShaderGraph_ExampleLibrary_Project/Assets/Characters/Spiderbot/Animations/Materials/Bug_Red_d.mat index 4c614dd..e4c0279 100644 --- a/ShaderGraph_ExampleLibrary_Project/Assets/Characters/Spiderbot/Animations/Materials/Bug_Red_d.mat +++ b/ShaderGraph_ExampleLibrary_Project/Assets/Characters/Spiderbot/Animations/Materials/Bug_Red_d.mat @@ -4,20 +4,26 @@ Material: serializedVersion: 6 m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_Name: Bug_Red_d m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} - m_ShaderKeywords: - m_LightmapFlags: 5 + m_ShaderKeywords: _EMISSION + m_LightmapFlags: 1 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} + m_CustomRenderQueue: 2050 + stringTagMap: + RenderType: Opaque disabledShaderPasses: [] m_SavedProperties: serializedVersion: 3 m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _BumpMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -59,11 +65,15 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Floats: + - _AlphaClip: 0 + - _Blend: 0 - _BumpScale: 1 + - _Cull: 2 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 - _EmissionScaleUI: 0 + - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossyReflections: 1 @@ -71,14 +81,32 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 - _ZWrite: 1 m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _EmissionColorUI: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} +--- !u!114 &7287003242868528269 +MonoBehaviour: + m_ObjectHideFlags: 11 + 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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 1 diff --git a/ShaderGraph_ExampleLibrary_Project/Assets/Characters/Spiderbot/Animations/bot.fbx.meta b/ShaderGraph_ExampleLibrary_Project/Assets/Characters/Spiderbot/Animations/bot.fbx.meta index b792da0..0b6e906 100644 --- a/ShaderGraph_ExampleLibrary_Project/Assets/Characters/Spiderbot/Animations/bot.fbx.meta +++ b/ShaderGraph_ExampleLibrary_Project/Assets/Characters/Spiderbot/Animations/bot.fbx.meta @@ -1,200 +1,568 @@ fileFormatVersion: 2 guid: 620216aa4858015458322c245690e761 ModelImporter: - serializedVersion: 18 - fileIDToRecycleName: - 100000: Barrel_Turret_Body_Camera_Leg_Shin_Foot - 100002: Body - 100004: //RootNode - 100006: Camera - 100008: Eye - 100010: eyes - 100012: Foot - 100014: Foot001 - 100016: Foot002 - 100018: Foot003 - 100020: Foot004 - 100022: Foot005 - 100024: geo - 100026: Gun - 100028: ikHandle2 - 100030: ikHandle3 - 100032: ikHandle4 - 100034: ikHandle5 - 100036: L_BackLeg_1 - 100038: L_BackLeg_2 - 100040: L_BackLeg_Toe - 100042: L_FrontLeg_1 - 100044: L_FrontLeg_2 - 100046: L_FrontLeg_Toe - 100048: L_MiddleLeg_1 - 100050: L_MiddleLeg_2 - 100052: L_MiddleLeg_Toe - 100054: Leg - 100056: Leg001 - 100058: Leg002 - 100060: Leg003 - 100062: Leg004 - 100064: Leg005 - 100066: leg_L_back - 100068: leg_L_backGRP - 100070: leg_L_front - 100072: leg_L_frontGRP - 100074: leg_L_mid - 100076: leg_L_midGRP - 100078: leg_R_back - 100080: leg_R_backGRP - 100082: leg_R_front - 100084: leg_R_frontGRP - 100086: leg_R_frontIK - 100088: leg_R_mid - 100090: leg_R_midGRP - 100092: leg_R_midIK - 100094: R_BackLeg_1 - 100096: R_BackLeg_2 - 100098: R_BackLeg_Toe - 100100: R_FrontLeg_1 - 100102: R_FrontLeg_2 - 100104: R_FrontLeg_Toe - 100106: R_MiddleLeg_1 - 100108: R_MiddleLeg_2 - 100110: R_MiddleLeg_Toe - 100112: Root - 100114: root - 100116: Shin - 100118: Shin001 - 100120: Shin002 - 100122: Shin003 - 100124: Shin004 - 100126: Shin005 - 100128: Turret - 400000: Barrel_Turret_Body_Camera_Leg_Shin_Foot - 400002: Body - 400004: //RootNode - 400006: Camera - 400008: Eye - 400010: eyes - 400012: Foot - 400014: Foot001 - 400016: Foot002 - 400018: Foot003 - 400020: Foot004 - 400022: Foot005 - 400024: geo - 400026: Gun - 400028: ikHandle2 - 400030: ikHandle3 - 400032: ikHandle4 - 400034: ikHandle5 - 400036: L_BackLeg_1 - 400038: L_BackLeg_2 - 400040: L_BackLeg_Toe - 400042: L_FrontLeg_1 - 400044: L_FrontLeg_2 - 400046: L_FrontLeg_Toe - 400048: L_MiddleLeg_1 - 400050: L_MiddleLeg_2 - 400052: L_MiddleLeg_Toe - 400054: Leg - 400056: Leg001 - 400058: Leg002 - 400060: Leg003 - 400062: Leg004 - 400064: Leg005 - 400066: leg_L_back - 400068: leg_L_backGRP - 400070: leg_L_front - 400072: leg_L_frontGRP - 400074: leg_L_mid - 400076: leg_L_midGRP - 400078: leg_R_back - 400080: leg_R_backGRP - 400082: leg_R_front - 400084: leg_R_frontGRP - 400086: leg_R_frontIK - 400088: leg_R_mid - 400090: leg_R_midGRP - 400092: leg_R_midIK - 400094: R_BackLeg_1 - 400096: R_BackLeg_2 - 400098: R_BackLeg_Toe - 400100: R_FrontLeg_1 - 400102: R_FrontLeg_2 - 400104: R_FrontLeg_Toe - 400106: R_MiddleLeg_1 - 400108: R_MiddleLeg_2 - 400110: R_MiddleLeg_Toe - 400112: Root - 400114: root - 400116: Shin - 400118: Shin001 - 400120: Shin002 - 400122: Shin003 - 400124: Shin004 - 400126: Shin005 - 400128: Turret - 4300000: Barrel_Turret_Body_Camera_Leg_Shin_Foot - 4300002: Leg001 - 4300004: Shin001 - 4300006: Foot001 - 4300008: Leg - 4300010: Shin - 4300012: Foot - 4300014: Leg002 - 4300016: Shin002 - 4300018: Foot002 - 4300020: Leg004 - 4300022: Shin004 - 4300024: Foot004 - 4300026: Leg003 - 4300028: Shin003 - 4300030: Foot003 - 4300032: Leg005 - 4300034: Shin005 - 4300036: Foot005 - 4300038: Turret - 4300040: Gun - 4300042: Camera - 7400000: Take 001 - 9500000: //RootNode - 13700000: Barrel_Turret_Body_Camera_Leg_Shin_Foot - 13700002: Camera - 13700004: Foot - 13700006: Foot001 - 13700008: Foot002 - 13700010: Foot003 - 13700012: Foot004 - 13700014: Foot005 - 13700016: Gun - 13700018: Leg - 13700020: Leg001 - 13700022: Leg002 - 13700024: Leg003 - 13700026: Leg004 - 13700028: Leg005 - 13700030: Shin - 13700032: Shin001 - 13700034: Shin002 - 13700036: Shin003 - 13700038: Shin004 - 13700040: Shin005 - 13700042: Turret + serializedVersion: 19300 + internalIDToNameTable: + - first: + 1: 100000 + second: Barrel_Turret_Body_Camera_Leg_Shin_Foot + - first: + 1: 100002 + second: Body + - first: + 1: 100004 + second: //RootNode + - first: + 1: 100006 + second: Camera + - first: + 1: 100008 + second: Eye + - first: + 1: 100010 + second: eyes + - first: + 1: 100012 + second: Foot + - first: + 1: 100014 + second: Foot001 + - first: + 1: 100016 + second: Foot002 + - first: + 1: 100018 + second: Foot003 + - first: + 1: 100020 + second: Foot004 + - first: + 1: 100022 + second: Foot005 + - first: + 1: 100024 + second: geo + - first: + 1: 100026 + second: Gun + - first: + 1: 100028 + second: ikHandle2 + - first: + 1: 100030 + second: ikHandle3 + - first: + 1: 100032 + second: ikHandle4 + - first: + 1: 100034 + second: ikHandle5 + - first: + 1: 100036 + second: L_BackLeg_1 + - first: + 1: 100038 + second: L_BackLeg_2 + - first: + 1: 100040 + second: L_BackLeg_Toe + - first: + 1: 100042 + second: L_FrontLeg_1 + - first: + 1: 100044 + second: L_FrontLeg_2 + - first: + 1: 100046 + second: L_FrontLeg_Toe + - first: + 1: 100048 + second: L_MiddleLeg_1 + - first: + 1: 100050 + second: L_MiddleLeg_2 + - first: + 1: 100052 + second: L_MiddleLeg_Toe + - first: + 1: 100054 + second: Leg + - first: + 1: 100056 + second: Leg001 + - first: + 1: 100058 + second: Leg002 + - first: + 1: 100060 + second: Leg003 + - first: + 1: 100062 + second: Leg004 + - first: + 1: 100064 + second: Leg005 + - first: + 1: 100066 + second: leg_L_back + - first: + 1: 100068 + second: leg_L_backGRP + - first: + 1: 100070 + second: leg_L_front + - first: + 1: 100072 + second: leg_L_frontGRP + - first: + 1: 100074 + second: leg_L_mid + - first: + 1: 100076 + second: leg_L_midGRP + - first: + 1: 100078 + second: leg_R_back + - first: + 1: 100080 + second: leg_R_backGRP + - first: + 1: 100082 + second: leg_R_front + - first: + 1: 100084 + second: leg_R_frontGRP + - first: + 1: 100086 + second: leg_R_frontIK + - first: + 1: 100088 + second: leg_R_mid + - first: + 1: 100090 + second: leg_R_midGRP + - first: + 1: 100092 + second: leg_R_midIK + - first: + 1: 100094 + second: R_BackLeg_1 + - first: + 1: 100096 + second: R_BackLeg_2 + - first: + 1: 100098 + second: R_BackLeg_Toe + - first: + 1: 100100 + second: R_FrontLeg_1 + - first: + 1: 100102 + second: R_FrontLeg_2 + - first: + 1: 100104 + second: R_FrontLeg_Toe + - first: + 1: 100106 + second: R_MiddleLeg_1 + - first: + 1: 100108 + second: R_MiddleLeg_2 + - first: + 1: 100110 + second: R_MiddleLeg_Toe + - first: + 1: 100112 + second: Root + - first: + 1: 100114 + second: root + - first: + 1: 100116 + second: Shin + - first: + 1: 100118 + second: Shin001 + - first: + 1: 100120 + second: Shin002 + - first: + 1: 100122 + second: Shin003 + - first: + 1: 100124 + second: Shin004 + - first: + 1: 100126 + second: Shin005 + - first: + 1: 100128 + second: Turret + - first: + 4: 400000 + second: Barrel_Turret_Body_Camera_Leg_Shin_Foot + - first: + 4: 400002 + second: Body + - first: + 4: 400004 + second: //RootNode + - first: + 4: 400006 + second: Camera + - first: + 4: 400008 + second: Eye + - first: + 4: 400010 + second: eyes + - first: + 4: 400012 + second: Foot + - first: + 4: 400014 + second: Foot001 + - first: + 4: 400016 + second: Foot002 + - first: + 4: 400018 + second: Foot003 + - first: + 4: 400020 + second: Foot004 + - first: + 4: 400022 + second: Foot005 + - first: + 4: 400024 + second: geo + - first: + 4: 400026 + second: Gun + - first: + 4: 400028 + second: ikHandle2 + - first: + 4: 400030 + second: ikHandle3 + - first: + 4: 400032 + second: ikHandle4 + - first: + 4: 400034 + second: ikHandle5 + - first: + 4: 400036 + second: L_BackLeg_1 + - first: + 4: 400038 + second: L_BackLeg_2 + - first: + 4: 400040 + second: L_BackLeg_Toe + - first: + 4: 400042 + second: L_FrontLeg_1 + - first: + 4: 400044 + second: L_FrontLeg_2 + - first: + 4: 400046 + second: L_FrontLeg_Toe + - first: + 4: 400048 + second: L_MiddleLeg_1 + - first: + 4: 400050 + second: L_MiddleLeg_2 + - first: + 4: 400052 + second: L_MiddleLeg_Toe + - first: + 4: 400054 + second: Leg + - first: + 4: 400056 + second: Leg001 + - first: + 4: 400058 + second: Leg002 + - first: + 4: 400060 + second: Leg003 + - first: + 4: 400062 + second: Leg004 + - first: + 4: 400064 + second: Leg005 + - first: + 4: 400066 + second: leg_L_back + - first: + 4: 400068 + second: leg_L_backGRP + - first: + 4: 400070 + second: leg_L_front + - first: + 4: 400072 + second: leg_L_frontGRP + - first: + 4: 400074 + second: leg_L_mid + - first: + 4: 400076 + second: leg_L_midGRP + - first: + 4: 400078 + second: leg_R_back + - first: + 4: 400080 + second: leg_R_backGRP + - first: + 4: 400082 + second: leg_R_front + - first: + 4: 400084 + second: leg_R_frontGRP + - first: + 4: 400086 + second: leg_R_frontIK + - first: + 4: 400088 + second: leg_R_mid + - first: + 4: 400090 + second: leg_R_midGRP + - first: + 4: 400092 + second: leg_R_midIK + - first: + 4: 400094 + second: R_BackLeg_1 + - first: + 4: 400096 + second: R_BackLeg_2 + - first: + 4: 400098 + second: R_BackLeg_Toe + - first: + 4: 400100 + second: R_FrontLeg_1 + - first: + 4: 400102 + second: R_FrontLeg_2 + - first: + 4: 400104 + second: R_FrontLeg_Toe + - first: + 4: 400106 + second: R_MiddleLeg_1 + - first: + 4: 400108 + second: R_MiddleLeg_2 + - first: + 4: 400110 + second: R_MiddleLeg_Toe + - first: + 4: 400112 + second: Root + - first: + 4: 400114 + second: root + - first: + 4: 400116 + second: Shin + - first: + 4: 400118 + second: Shin001 + - first: + 4: 400120 + second: Shin002 + - first: + 4: 400122 + second: Shin003 + - first: + 4: 400124 + second: Shin004 + - first: + 4: 400126 + second: Shin005 + - first: + 4: 400128 + second: Turret + - first: + 43: 4300000 + second: Barrel_Turret_Body_Camera_Leg_Shin_Foot + - first: + 43: 4300002 + second: Leg001 + - first: + 43: 4300004 + second: Shin001 + - first: + 43: 4300006 + second: Foot001 + - first: + 43: 4300008 + second: Leg + - first: + 43: 4300010 + second: Shin + - first: + 43: 4300012 + second: Foot + - first: + 43: 4300014 + second: Leg002 + - first: + 43: 4300016 + second: Shin002 + - first: + 43: 4300018 + second: Foot002 + - first: + 43: 4300020 + second: Leg004 + - first: + 43: 4300022 + second: Shin004 + - first: + 43: 4300024 + second: Foot004 + - first: + 43: 4300026 + second: Leg003 + - first: + 43: 4300028 + second: Shin003 + - first: + 43: 4300030 + second: Foot003 + - first: + 43: 4300032 + second: Leg005 + - first: + 43: 4300034 + second: Shin005 + - first: + 43: 4300036 + second: Foot005 + - first: + 43: 4300038 + second: Turret + - first: + 43: 4300040 + second: Gun + - first: + 43: 4300042 + second: Camera + - first: + 74: 7400000 + second: Take 001 + - first: + 95: 9500000 + second: //RootNode + - first: + 137: 13700000 + second: Barrel_Turret_Body_Camera_Leg_Shin_Foot + - first: + 137: 13700002 + second: Camera + - first: + 137: 13700004 + second: Foot + - first: + 137: 13700006 + second: Foot001 + - first: + 137: 13700008 + second: Foot002 + - first: + 137: 13700010 + second: Foot003 + - first: + 137: 13700012 + second: Foot004 + - first: + 137: 13700014 + second: Foot005 + - first: + 137: 13700016 + second: Gun + - first: + 137: 13700018 + second: Leg + - first: + 137: 13700020 + second: Leg001 + - first: + 137: 13700022 + second: Leg002 + - first: + 137: 13700024 + second: Leg003 + - first: + 137: 13700026 + second: Leg004 + - first: + 137: 13700028 + second: Leg005 + - first: + 137: 13700030 + second: Shin + - first: + 137: 13700032 + second: Shin001 + - first: + 137: 13700034 + second: Shin002 + - first: + 137: 13700036 + second: Shin003 + - first: + 137: 13700038 + second: Shin004 + - first: + 137: 13700040 + second: Shin005 + - first: + 137: 13700042 + second: Turret + externalObjects: + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: Bug_Base + second: {fileID: 2100000, guid: 44af2cd4eedf24bc0b9b2c51edf35eb9, type: 2} materials: - importMaterials: 1 + materialImportMode: 1 materialName: 0 materialSearch: 1 + materialLocation: 0 animations: legacyGenerateAnimations: 4 bakeSimulation: 0 + resampleCurves: 1 optimizeGameObjects: 0 motionNodeName: - pivotNodeName: + rigImportErrors: + rigImportWarnings: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + importConstraints: 0 animationCompression: 1 - animationRotationError: .5 - animationPositionError: .5 - animationScaleError: .5 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 animationWrapMode: 0 extraExposedTransformPaths: [] + extraUserProperties: [] clipAnimations: [] isReadable: 1 meshes: @@ -202,13 +570,23 @@ ModelImporter: globalScale: 1 meshCompression: 0 addColliders: 0 + useSRGBMaterialColor: 1 + sortHierarchyByName: 1 + importVisibility: 0 importBlendShapes: 1 + importCameras: 0 + importLights: 0 swapUVChannels: 0 generateSecondaryUV: 0 useFileUnits: 1 - optimizeMeshForGPU: 1 keepQuads: 0 weldVertices: 1 + preserveHierarchy: 0 + skinWeightsMode: 0 + maxBonesPerVertex: 4 + minBoneWeight: 0.001 + meshOptimizationFlags: -1 + indexFormat: 1 secondaryUVAngleDistortion: 8 secondaryUVAreaDistortion: 15.000001 secondaryUVHardAngle: 88 @@ -216,24 +594,56 @@ ModelImporter: useFileScale: 1 tangentSpace: normalSmoothAngle: 60 - splitTangentsAcrossUV: 1 normalImportMode: 0 - tangentImportMode: 1 + tangentImportMode: 4 + normalCalculationMode: 0 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 1 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + referencedClips: + - 98d1d65ed4dd7164d9fdce528333c6a3 + - 8113e4afbba78bc4fae5d4b0fedd9b0f + - 24aa90fbb15509247ab13ca81ec97c7c + - 81ce2052f42042f489322ee42d6f5d4b + - 14c3dca1ec1d7c64c86eec49a074cbec + - db688e6108fd995459a530212da14a4f + - 0eb213f75b4f7cf40b6170a167cedd37 + - 77e1d0f44cd75ab4cad17c9329907980 + - 7d6f85ebbb55dd141a4e4452605773b3 + - 5e23d9cf3c1cf954086f44892bae911d + - 5180bda539c2dc743a730ae5942d4d52 + - f057d4e2a90ec5749b6e9308f45c48fe + - dad81875dddade14ab04efffef27e08e + - ba81dc67638b1c740a7308615b120892 + - eb0d7f0880e02ff40b3558480ced4bfa + - b0fe57f5618a123479ced07c0afe4271 + - dc5939b2036cc224f9c2f7e5387604e9 + - ad2aebcef9b57904dbff7e003e3268e8 + - 9c78091437de9b04b8dce007c9746806 + - 3c6677b68b689c1479f19abb5b7033c4 importAnimation: 1 - copyAvatar: 0 humanDescription: + serializedVersion: 3 human: [] skeleton: [] - armTwist: .5 - foreArmTwist: .5 - upperLegTwist: .5 - legTwist: .5 - armStretch: .0500000007 - legStretch: .0500000007 + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 feetSpacing: 0 + globalScale: 1 rootMotionBoneName: Root + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 0 lastHumanDescriptionAvatarSource: {instanceID: 0} + autoGenerateAvatarMappingIfUnspecified: 1 animationType: 2 + humanoidOversampling: 1 + avatarSetup: 1 additionalBone: 0 userData: assetBundleName: + assetBundleVariant: diff --git a/ShaderGraph_ExampleLibrary_Project/Assets/Characters/Spiderbot/Spiderbot_Mat.mat b/ShaderGraph_ExampleLibrary_Project/Assets/Characters/Spiderbot/Spiderbot_Mat.mat index 2426df4..79c7134 100644 --- a/ShaderGraph_ExampleLibrary_Project/Assets/Characters/Spiderbot/Spiderbot_Mat.mat +++ b/ShaderGraph_ExampleLibrary_Project/Assets/Characters/Spiderbot/Spiderbot_Mat.mat @@ -1,19 +1,34 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!114 &-8679123497212708202 +MonoBehaviour: + m_ObjectHideFlags: 11 + 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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 1 --- !u!21 &2100000 Material: serializedVersion: 6 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_Name: Spiderbot_Mat m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} - m_ShaderKeywords: _EMISSION _METALLICGLOSSMAP _METALLICSPECGLOSSMAP _NORMALMAP _OCCLUSIONMAP + m_ShaderKeywords: _EMISSION _METALLICSPECGLOSSMAP _NORMALMAP _OCCLUSIONMAP m_LightmapFlags: 2 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} + m_CustomRenderQueue: 2050 + stringTagMap: + RenderType: Opaque disabledShaderPasses: [] m_SavedProperties: serializedVersion: 3 @@ -58,6 +73,10 @@ Material: m_Texture: {fileID: 2800000, guid: 1b5c211881ce24c1d8a904279d9c6967, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _BaseMap: + m_Texture: {fileID: 2800000, guid: babad5b2bfbaf430f9c59fb9f39a413d, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _BumpMap: m_Texture: {fileID: 2800000, guid: da5ed5fab636e470295d5dff041dfe59, type: 3} m_Scale: {x: 1, y: 1} @@ -139,6 +158,7 @@ Material: - _Cutout_Value: 0.312 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossinessSource: 0 @@ -147,8 +167,11 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 + - _QueueOffset: 0 + - _ReceiveShadows: 1 - _SampleGI: 0 - _Shininess: 1 + - _Smoothness: 1 - _SmoothnessTextureChannel: 0 - _SpecSource: 0 - _SpecularHighlights: 1 @@ -168,6 +191,7 @@ Material: - Color_D6D28AC7: {r: 1, g: 0, b: 0.07135868, a: 0} - Color_DF47C50C: {r: 0.7395463, g: 1, b: 0, a: 0} - Color_EC8DE029: {r: 1, g: 0.10620204, b: 0, a: 0} + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 9.189588, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} diff --git a/ShaderGraph_ExampleLibrary_Project/Assets/Environment/SlidingDoor/Materials/SlidingDoorBase_Mat.mat b/ShaderGraph_ExampleLibrary_Project/Assets/Environment/SlidingDoor/Materials/SlidingDoorBase_Mat.mat index 12a516c..78bd442 100644 --- a/ShaderGraph_ExampleLibrary_Project/Assets/Environment/SlidingDoor/Materials/SlidingDoorBase_Mat.mat +++ b/ShaderGraph_ExampleLibrary_Project/Assets/Environment/SlidingDoor/Materials/SlidingDoorBase_Mat.mat @@ -1,23 +1,42 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!114 &-3140051930384699157 +MonoBehaviour: + m_ObjectHideFlags: 11 + 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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 1 --- !u!21 &2100000 Material: serializedVersion: 6 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_Name: SlidingDoorBase_Mat m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} - m_ShaderKeywords: _EMISSION _METALLICGLOSSMAP _METALLICSPECGLOSSMAP _NORMALMAP + m_ShaderKeywords: _EMISSION _METALLICSPECGLOSSMAP _NORMALMAP m_LightmapFlags: 2 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} + m_CustomRenderQueue: 2050 + stringTagMap: + RenderType: Opaque disabledShaderPasses: [] m_SavedProperties: serializedVersion: 3 m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 2800000, guid: 81034207a764ba84f97c56899786a35f, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _BumpMap: m_Texture: {fileID: 2800000, guid: 13d8db17d72efa94e9c9c28fa4932cdb, type: 3} m_Scale: {x: 1, y: 1} @@ -69,6 +88,7 @@ Material: - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossyReflections: 1 @@ -76,6 +96,9 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 1 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 @@ -85,6 +108,7 @@ Material: - _ZWrite: 1 m_Colors: - Color_73AAD2A0: {r: 1, g: 0, b: 0, a: 0} + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 2.9960785, g: 2.9960785, b: 2.9960785, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} diff --git a/ShaderGraph_ExampleLibrary_Project/Assets/Environment/SlidingDoor/Materials/SlidingDoorFrame_mat.mat b/ShaderGraph_ExampleLibrary_Project/Assets/Environment/SlidingDoor/Materials/SlidingDoorFrame_mat.mat index 1918853..079892a 100644 --- a/ShaderGraph_ExampleLibrary_Project/Assets/Environment/SlidingDoor/Materials/SlidingDoorFrame_mat.mat +++ b/ShaderGraph_ExampleLibrary_Project/Assets/Environment/SlidingDoor/Materials/SlidingDoorFrame_mat.mat @@ -5,19 +5,25 @@ Material: serializedVersion: 6 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_Name: SlidingDoorFrame_mat m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} - m_ShaderKeywords: _EMISSION _METALLICGLOSSMAP _METALLICSPECGLOSSMAP _NORMALMAP + m_ShaderKeywords: _EMISSION _METALLICSPECGLOSSMAP _NORMALMAP m_LightmapFlags: 2 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} + m_CustomRenderQueue: 2050 + stringTagMap: + RenderType: Opaque disabledShaderPasses: [] m_SavedProperties: serializedVersion: 3 m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 2800000, guid: 39a25eca9efb9b04986cb9469b9342e4, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _BumpMap: m_Texture: {fileID: 2800000, guid: c366638393799aa4480d96b839cf97b9, type: 3} m_Scale: {x: 1, y: 1} @@ -66,6 +72,7 @@ Material: - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossyReflections: 1 @@ -73,6 +80,9 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 1 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 @@ -81,6 +91,20 @@ Material: - _WorkflowMode: 1 - _ZWrite: 1 m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 2.9960785, g: 2.9960785, b: 2.9960785, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} +--- !u!114 &7604550911605486084 +MonoBehaviour: + m_ObjectHideFlags: 11 + 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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 1 diff --git a/ShaderGraph_ExampleLibrary_Project/Assets/ForwardRenderer.asset b/ShaderGraph_ExampleLibrary_Project/Assets/ForwardRenderer.asset new file mode 100644 index 0000000..1096d69 --- /dev/null +++ b/ShaderGraph_ExampleLibrary_Project/Assets/ForwardRenderer.asset @@ -0,0 +1,35 @@ +%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: de640fe3d0db1804a85f9fc8f5cadab6, type: 3} + m_Name: ForwardRenderer + m_EditorClassIdentifier: + m_RendererFeatures: [] + postProcessData: {fileID: 0} + shaders: + blitPS: {fileID: 0} + copyDepthPS: {fileID: 0} + screenSpaceShadowPS: {fileID: 0} + samplingPS: {fileID: 0} + fallbackErrorPS: {fileID: 0} + m_OpaqueLayerMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_TransparentLayerMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_DefaultStencilState: + overrideStencilState: 0 + stencilReference: 0 + stencilCompareFunction: 8 + passOperation: 0 + failOperation: 0 + zFailOperation: 0 diff --git a/ShaderGraph_ExampleLibrary_Project/Assets/ForwardRenderer.asset.meta b/ShaderGraph_ExampleLibrary_Project/Assets/ForwardRenderer.asset.meta new file mode 100644 index 0000000..f91f306 --- /dev/null +++ b/ShaderGraph_ExampleLibrary_Project/Assets/ForwardRenderer.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c357d6800821b3946a2e142a4e1895ac +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/ShaderGraph_ExampleLibrary_Project/Assets/Standard Assets/Prototyping/Materials/NavyGrid.mat b/ShaderGraph_ExampleLibrary_Project/Assets/Standard Assets/Prototyping/Materials/NavyGrid.mat index a6da2c7..a2dbb13 100755 --- a/ShaderGraph_ExampleLibrary_Project/Assets/Standard Assets/Prototyping/Materials/NavyGrid.mat +++ b/ShaderGraph_ExampleLibrary_Project/Assets/Standard Assets/Prototyping/Materials/NavyGrid.mat @@ -1,23 +1,42 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!114 &-7857852220672238144 +MonoBehaviour: + m_ObjectHideFlags: 11 + 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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 1 --- !u!21 &2100000 Material: serializedVersion: 6 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_Name: NavyGrid m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} m_ShaderKeywords: _EMISSION _SPECULAR_SETUP m_LightmapFlags: 2 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} + m_CustomRenderQueue: 2050 + stringTagMap: + RenderType: Opaque disabledShaderPasses: [] m_SavedProperties: serializedVersion: 3 m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 2800000, guid: 86e4aa9207c9e2740b6ace599d659c05, type: 3} + m_Scale: {x: 5, y: 5} + m_Offset: {x: 0, y: 0} - _BumpMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -72,6 +91,7 @@ Material: - _DetailNormalMapScale: 1 - _DstBlend: 0 - _EmissionScaleUI: 2 + - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.1 - _GlossyReflections: 1 @@ -80,6 +100,9 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.1 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 @@ -88,6 +111,7 @@ Material: - _WorkflowMode: 0 - _ZWrite: 1 m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 5.3393354, g: 5.3393354, b: 5.3393354, a: 1.3348337} - _EmissionColorUI: {r: 0, g: 0, b: 0, a: 1} diff --git a/ShaderGraph_ExampleLibrary_Project/Assets/Standard Assets/Prototyping/Materials/NavySmooth.mat b/ShaderGraph_ExampleLibrary_Project/Assets/Standard Assets/Prototyping/Materials/NavySmooth.mat index 6297108..7872ce6 100755 --- a/ShaderGraph_ExampleLibrary_Project/Assets/Standard Assets/Prototyping/Materials/NavySmooth.mat +++ b/ShaderGraph_ExampleLibrary_Project/Assets/Standard Assets/Prototyping/Materials/NavySmooth.mat @@ -5,20 +5,25 @@ Material: serializedVersion: 6 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_Name: NavySmooth m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} - m_ShaderKeywords: _LIGHTMAPPING_DYNAMIC_LIGHTMAPS _LIGHTMAPPING_REALTIME _SPECULAR_SETUP - _UVSEC_UV1 + m_ShaderKeywords: _SPECULAR_SETUP m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} + m_CustomRenderQueue: 2050 + stringTagMap: + RenderType: Opaque disabledShaderPasses: [] m_SavedProperties: serializedVersion: 3 m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 2800000, guid: 86e4aa9207c9e2740b6ace599d659c05, type: 3} + m_Scale: {x: 4, y: 4} + m_Offset: {x: 0, y: 0} - _BumpMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -73,6 +78,7 @@ Material: - _DetailNormalMapScale: 1 - _DstBlend: 0 - _EmissionScaleUI: 0 + - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.1 - _GlossyReflections: 1 @@ -81,6 +87,9 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.1 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 @@ -89,9 +98,23 @@ Material: - _WorkflowMode: 0 - _ZWrite: 1 m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 0} - _EmissionColorUI: {r: 0, g: 0, b: 0, a: 1} - _EmissionColorWithMapUI: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 0.11764706, g: 0.11764706, b: 0.11764706, a: 1} - _SpecularColor: {r: 0.15686275, g: 0.15686275, b: 0.15686275, a: 1} +--- !u!114 &2242160607881317293 +MonoBehaviour: + m_ObjectHideFlags: 11 + 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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 1 diff --git a/ShaderGraph_ExampleLibrary_Project/Assets/Standard Assets/Prototyping/Materials/PinkGrid.mat b/ShaderGraph_ExampleLibrary_Project/Assets/Standard Assets/Prototyping/Materials/PinkGrid.mat index 3a5c7fc..d4c413f 100755 --- a/ShaderGraph_ExampleLibrary_Project/Assets/Standard Assets/Prototyping/Materials/PinkGrid.mat +++ b/ShaderGraph_ExampleLibrary_Project/Assets/Standard Assets/Prototyping/Materials/PinkGrid.mat @@ -5,20 +5,25 @@ Material: serializedVersion: 6 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_Name: PinkGrid m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} - m_ShaderKeywords: _EMISSION _EMISSIONMAP _LIGHTMAPPING_DYNAMIC_LIGHTMAPS _LIGHTMAPPING_REALTIME - _SPECULAR_SETUP _UVSEC_UV1 + m_ShaderKeywords: _EMISSION _SPECULAR_SETUP m_LightmapFlags: 0 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} + m_CustomRenderQueue: 2050 + stringTagMap: + RenderType: Opaque disabledShaderPasses: [] m_SavedProperties: serializedVersion: 3 m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 2800000, guid: 580615edf5e29d245af58fc5fe2b06ac, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _BumpMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -73,6 +78,7 @@ Material: - _DetailNormalMapScale: 1 - _DstBlend: 0 - _EmissionScaleUI: 2 + - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.1 - _GlossyReflections: 1 @@ -81,6 +87,9 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.1 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 @@ -89,9 +98,23 @@ Material: - _WorkflowMode: 0 - _ZWrite: 1 m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 1.3348337, g: 1.3348337, b: 1.3348337, a: 1.3348337} - _EmissionColorUI: {r: 0, g: 0, b: 0, a: 1} - _EmissionColorWithMapUI: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 0.11764706, g: 0.11764706, b: 0.11764706, a: 1} - _SpecularColor: {r: 0.15686275, g: 0.15686275, b: 0.15686275, a: 1} +--- !u!114 &4264636717769863196 +MonoBehaviour: + m_ObjectHideFlags: 11 + 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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 1 diff --git a/ShaderGraph_ExampleLibrary_Project/Assets/Standard Assets/Prototyping/Materials/PinkSmooth.mat b/ShaderGraph_ExampleLibrary_Project/Assets/Standard Assets/Prototyping/Materials/PinkSmooth.mat index 2fe7539..5f9c4f1 100755 --- a/ShaderGraph_ExampleLibrary_Project/Assets/Standard Assets/Prototyping/Materials/PinkSmooth.mat +++ b/ShaderGraph_ExampleLibrary_Project/Assets/Standard Assets/Prototyping/Materials/PinkSmooth.mat @@ -1,24 +1,42 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!114 &-8501766945874693774 +MonoBehaviour: + m_ObjectHideFlags: 11 + 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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 1 --- !u!21 &2100000 Material: serializedVersion: 6 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_Name: PinkSmooth m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} - m_ShaderKeywords: _EMISSIONMAP _LIGHTMAPPING_DYNAMIC_LIGHTMAPS _LIGHTMAPPING_REALTIME - _SPECULAR_SETUP _UVSEC_UV1 + m_ShaderKeywords: _EMISSION _SPECULAR_SETUP m_LightmapFlags: 0 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} + m_CustomRenderQueue: 2050 + stringTagMap: + RenderType: Opaque disabledShaderPasses: [] m_SavedProperties: serializedVersion: 3 m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 2800000, guid: 580615edf5e29d245af58fc5fe2b06ac, type: 3} + m_Scale: {x: 4, y: 4} + m_Offset: {x: 0, y: 0} - _BumpMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -73,6 +91,7 @@ Material: - _DetailNormalMapScale: 1 - _DstBlend: 0 - _EmissionScaleUI: 2 + - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.1 - _GlossyReflections: 1 @@ -81,6 +100,9 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.1 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 @@ -89,6 +111,7 @@ Material: - _WorkflowMode: 0 - _ZWrite: 1 m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1.3348337} - _EmissionColorUI: {r: 0, g: 0, b: 0, a: 1} diff --git a/ShaderGraph_ExampleLibrary_Project/Assets/Standard Assets/Prototyping/Materials/YellowGrid.mat b/ShaderGraph_ExampleLibrary_Project/Assets/Standard Assets/Prototyping/Materials/YellowGrid.mat index 3cda2b2..6a36239 100755 --- a/ShaderGraph_ExampleLibrary_Project/Assets/Standard Assets/Prototyping/Materials/YellowGrid.mat +++ b/ShaderGraph_ExampleLibrary_Project/Assets/Standard Assets/Prototyping/Materials/YellowGrid.mat @@ -5,20 +5,25 @@ Material: serializedVersion: 6 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_Name: YellowGrid m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} - m_ShaderKeywords: _EMISSION _EMISSIONMAP _LIGHTMAPPING_DYNAMIC_LIGHTMAPS _LIGHTMAPPING_REALTIME - _SPECULAR_SETUP _UVSEC_UV1 + m_ShaderKeywords: _EMISSION _SPECULAR_SETUP m_LightmapFlags: 0 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} + m_CustomRenderQueue: 2050 + stringTagMap: + RenderType: Opaque disabledShaderPasses: [] m_SavedProperties: serializedVersion: 3 m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 2800000, guid: b4646ae63b0bcca40b1bdde3b87e01bf, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _BumpMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -73,6 +78,7 @@ Material: - _DetailNormalMapScale: 1 - _DstBlend: 0 - _EmissionScaleUI: 2 + - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.1 - _GlossyReflections: 1 @@ -81,6 +87,9 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.1 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 @@ -89,9 +98,23 @@ Material: - _WorkflowMode: 0 - _ZWrite: 1 m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 1.3348337, g: 1.3348337, b: 1.3348337, a: 1.3348337} - _EmissionColorUI: {r: 0, g: 0, b: 0, a: 1} - _EmissionColorWithMapUI: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 0.11764706, g: 0.11764706, b: 0.11764706, a: 1} - _SpecularColor: {r: 0.15686275, g: 0.15686275, b: 0.15686275, a: 1} +--- !u!114 &7127116567065057150 +MonoBehaviour: + m_ObjectHideFlags: 11 + 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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 1 diff --git a/ShaderGraph_ExampleLibrary_Project/Assets/Standard Assets/Prototyping/Materials/YellowSmooth.mat b/ShaderGraph_ExampleLibrary_Project/Assets/Standard Assets/Prototyping/Materials/YellowSmooth.mat index 69337f3..8a8aff0 100755 --- a/ShaderGraph_ExampleLibrary_Project/Assets/Standard Assets/Prototyping/Materials/YellowSmooth.mat +++ b/ShaderGraph_ExampleLibrary_Project/Assets/Standard Assets/Prototyping/Materials/YellowSmooth.mat @@ -5,20 +5,25 @@ Material: serializedVersion: 6 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_Name: YellowSmooth m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} - m_ShaderKeywords: _EMISSION _EMISSIONMAP _LIGHTMAPPING_DYNAMIC_LIGHTMAPS _LIGHTMAPPING_REALTIME - _SPECULAR_SETUP _UVSEC_UV1 + m_ShaderKeywords: _EMISSION _SPECULAR_SETUP m_LightmapFlags: 0 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} + m_CustomRenderQueue: 2050 + stringTagMap: + RenderType: Opaque disabledShaderPasses: [] m_SavedProperties: serializedVersion: 3 m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 2800000, guid: b4646ae63b0bcca40b1bdde3b87e01bf, type: 3} + m_Scale: {x: 4, y: 4} + m_Offset: {x: 0, y: 0} - _BumpMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -73,6 +78,7 @@ Material: - _DetailNormalMapScale: 1 - _DstBlend: 0 - _EmissionScaleUI: 2 + - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.1 - _GlossyReflections: 1 @@ -81,6 +87,9 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.1 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 @@ -89,9 +98,23 @@ Material: - _WorkflowMode: 0 - _ZWrite: 1 m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1.3348337} - _EmissionColorUI: {r: 0, g: 0, b: 0, a: 1} - _EmissionColorWithMapUI: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 0.11764706, g: 0.11764706, b: 0.11764706, a: 1} - _SpecularColor: {r: 0.15686275, g: 0.15686275, b: 0.15686275, a: 1} +--- !u!114 &277328560117245566 +MonoBehaviour: + m_ObjectHideFlags: 11 + 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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 1 diff --git a/ShaderGraph_ExampleLibrary_Project/Library/ScriptAssemblies/Unity.PackageManagerUI.Editor.dll b/ShaderGraph_ExampleLibrary_Project/Library/ScriptAssemblies/Unity.PackageManagerUI.Editor.dll deleted file mode 100755 index 5b98baf..0000000 Binary files a/ShaderGraph_ExampleLibrary_Project/Library/ScriptAssemblies/Unity.PackageManagerUI.Editor.dll and /dev/null differ diff --git a/ShaderGraph_ExampleLibrary_Project/Library/ScriptAssemblies/Unity.PackageManagerUI.Editor.dll.mdb b/ShaderGraph_ExampleLibrary_Project/Library/ScriptAssemblies/Unity.PackageManagerUI.Editor.dll.mdb deleted file mode 100644 index 619d7b9..0000000 Binary files a/ShaderGraph_ExampleLibrary_Project/Library/ScriptAssemblies/Unity.PackageManagerUI.Editor.dll.mdb and /dev/null differ diff --git a/ShaderGraph_ExampleLibrary_Project/Logs/Packages-Update.log b/ShaderGraph_ExampleLibrary_Project/Logs/Packages-Update.log new file mode 100644 index 0000000..8f776c9 --- /dev/null +++ b/ShaderGraph_ExampleLibrary_Project/Logs/Packages-Update.log @@ -0,0 +1,25 @@ + +=== Tue Mar 31 12:11:10 2020 + +Packages were changed. +Update Mode: updateDependencies + +The following packages were added: + com.unity.2d.sprite@1.0.0 + com.unity.2d.tilemap@1.0.0 + com.unity.ide.rider@1.1.4 + com.unity.ide.vscode@1.1.4 + com.unity.modules.androidjni@1.0.0 + com.unity.multiplayer-hlapi@1.0.4 + com.unity.test-framework@1.1.11 + com.unity.timeline@1.2.10 + com.unity.ugui@1.0.0 + com.unity.xr.legacyinputhelpers@1.3.8 +The following packages were updated: + com.unity.analytics from version 3.2.2 to 3.3.5 + com.unity.collab-proxy from version 1.2.15 to 1.2.16 + com.unity.purchasing from version 2.0.3 to 2.0.6 + com.unity.render-pipelines.lightweight from version 4.6.0-preview to 7.1.8 + com.unity.textmeshpro from version 1.3.0 to 2.0.1 +The following packages were removed: + com.unity.package-manager-ui@2.0.3 diff --git a/ShaderGraph_ExampleLibrary_Project/Packages/manifest.json b/ShaderGraph_ExampleLibrary_Project/Packages/manifest.json index d15c8f7..29a1145 100644 --- a/ShaderGraph_ExampleLibrary_Project/Packages/manifest.json +++ b/ShaderGraph_ExampleLibrary_Project/Packages/manifest.json @@ -1,13 +1,22 @@ { "dependencies": { + "com.unity.2d.sprite": "1.0.0", + "com.unity.2d.tilemap": "1.0.0", "com.unity.ads": "2.3.1", - "com.unity.analytics": "3.2.2", - "com.unity.collab-proxy": "1.2.15", - "com.unity.package-manager-ui": "2.0.3", - "com.unity.purchasing": "2.0.3", - "com.unity.render-pipelines.lightweight": "4.6.0-preview", - "com.unity.textmeshpro": "1.3.0", + "com.unity.analytics": "3.3.5", + "com.unity.collab-proxy": "1.2.16", + "com.unity.ide.rider": "1.1.4", + "com.unity.ide.vscode": "1.1.4", + "com.unity.multiplayer-hlapi": "1.0.4", + "com.unity.purchasing": "2.0.6", + "com.unity.render-pipelines.lightweight": "7.1.8", + "com.unity.test-framework": "1.1.11", + "com.unity.textmeshpro": "2.0.1", + "com.unity.timeline": "1.2.10", + "com.unity.ugui": "1.0.0", + "com.unity.xr.legacyinputhelpers": "1.3.8", "com.unity.modules.ai": "1.0.0", + "com.unity.modules.androidjni": "1.0.0", "com.unity.modules.animation": "1.0.0", "com.unity.modules.assetbundle": "1.0.0", "com.unity.modules.audio": "1.0.0", diff --git a/ShaderGraph_ExampleLibrary_Project/ProjectSettings/EditorSettings.asset b/ShaderGraph_ExampleLibrary_Project/ProjectSettings/EditorSettings.asset index e9455fd..634b44d 100644 --- a/ShaderGraph_ExampleLibrary_Project/ProjectSettings/EditorSettings.asset +++ b/ShaderGraph_ExampleLibrary_Project/ProjectSettings/EditorSettings.asset @@ -3,19 +3,33 @@ --- !u!159 &1 EditorSettings: m_ObjectHideFlags: 0 - serializedVersion: 7 + serializedVersion: 9 m_ExternalVersionControlSupport: Hidden Meta Files m_SerializationMode: 2 m_LineEndingsForNewScripts: 2 m_DefaultBehaviorMode: 0 + m_PrefabRegularEnvironment: {fileID: 0} + m_PrefabUIEnvironment: {fileID: 0} m_SpritePackerMode: 0 m_SpritePackerPaddingPower: 1 m_EtcTextureCompressorBehavior: 1 m_EtcTextureFastCompressor: 1 m_EtcTextureNormalCompressor: 2 m_EtcTextureBestCompressor: 4 - m_ProjectGenerationIncludedExtensions: txt;xml;fnt;cd + m_ProjectGenerationIncludedExtensions: txt;xml;fnt;cd;asmref m_ProjectGenerationRootNamespace: - m_UserGeneratedProjectSuffix: m_CollabEditorSettings: inProgressEnabled: 1 + m_EnableTextureStreamingInEditMode: 1 + m_EnableTextureStreamingInPlayMode: 1 + m_AsyncShaderCompilation: 1 + m_EnterPlayModeOptionsEnabled: 0 + m_EnterPlayModeOptions: 3 + m_ShowLightmapResolutionOverlay: 1 + m_UseLegacyProbeSampleCount: 1 + m_AssetPipelineMode: 1 + m_CacheServerMode: 0 + m_CacheServerEndpoint: + m_CacheServerNamespacePrefix: default + m_CacheServerEnableDownload: 1 + m_CacheServerEnableUpload: 1 diff --git a/ShaderGraph_ExampleLibrary_Project/ProjectSettings/InputManager.asset b/ShaderGraph_ExampleLibrary_Project/ProjectSettings/InputManager.asset index ddadb94..20dfedf 100644 --- a/ShaderGraph_ExampleLibrary_Project/ProjectSettings/InputManager.asset +++ b/ShaderGraph_ExampleLibrary_Project/ProjectSettings/InputManager.asset @@ -453,3 +453,35 @@ InputManager: type: 0 axis: 0 joyNum: 0 + - serializedVersion: 3 + m_Name: Debug Reset + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: left alt + altNegativeButton: + altPositiveButton: joystick button 1 + gravity: 0 + dead: 0 + sensitivity: 0 + snap: 0 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: Debug Multiplier + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: left shift + altNegativeButton: + altPositiveButton: joystick button 3 + gravity: 0 + dead: 0 + sensitivity: 0 + snap: 0 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 diff --git a/ShaderGraph_ExampleLibrary_Project/ProjectSettings/ProjectSettings.asset b/ShaderGraph_ExampleLibrary_Project/ProjectSettings/ProjectSettings.asset index 3e0bb33..9d08ebd 100644 --- a/ShaderGraph_ExampleLibrary_Project/ProjectSettings/ProjectSettings.asset +++ b/ShaderGraph_ExampleLibrary_Project/ProjectSettings/ProjectSettings.asset @@ -3,7 +3,7 @@ --- !u!129 &1 PlayerSettings: m_ObjectHideFlags: 0 - serializedVersion: 15 + serializedVersion: 20 productGUID: b07f6ec40b76f2a4ab7db208d52bd740 AndroidProfiler: 0 AndroidFilterTouchesWhenObscured: 0 @@ -52,8 +52,7 @@ PlayerSettings: m_StackTraceTypes: 010000000100000001000000010000000100000001000000 iosShowActivityIndicatorOnLoading: -1 androidShowActivityIndicatorOnLoading: -1 - iosAppInBackgroundBehavior: 0 - displayResolutionDialog: 1 + iosUseCustomAppBackgroundBehavior: 0 iosAllowHTTPDownload: 1 allowedAutorotateToPortrait: 1 allowedAutorotateToPortraitUpsideDown: 1 @@ -65,6 +64,7 @@ PlayerSettings: disableDepthAndStencilBuffers: 0 androidStartInFullscreen: 1 androidRenderOutsideSafeArea: 0 + androidUseSwappy: 0 androidBlitType: 0 defaultIsNativeResolution: 1 macRetinaSupport: 1 @@ -79,11 +79,11 @@ PlayerSettings: usePlayerLog: 1 bakeCollisionMeshes: 0 forceSingleInstance: 0 + useFlipModelSwapchain: 1 resizableWindow: 0 useMacAppStoreValidation: 0 macAppStoreCategory: public.app-category.games gpuSkinning: 0 - graphicsJobs: 0 xboxPIXTextureCapture: 0 xboxEnableAvatar: 0 xboxEnableKinect: 0 @@ -91,7 +91,6 @@ PlayerSettings: xboxEnableFitness: 0 visibleInBackground: 1 allowFullscreenSwitch: 1 - graphicsJobMode: 0 fullscreenMode: 1 xboxSpeechDB: 0 xboxEnableHeadOrientation: 0 @@ -104,8 +103,15 @@ PlayerSettings: xboxOneMonoLoggingLevel: 0 xboxOneLoggingLevel: 1 xboxOneDisableEsram: 0 + xboxOneEnableTypeOptimization: 0 xboxOnePresentImmediateThreshold: 0 switchQueueCommandMemory: 0 + switchQueueControlMemory: 16384 + switchQueueComputeMemory: 262144 + switchNVNShaderPoolsGranularity: 33554432 + switchNVNDefaultPoolsGranularity: 16777216 + switchNVNOtherPoolsGranularity: 16777216 + vulkanNumSwapchainBuffers: 3 vulkanEnableSetSRGBWrite: 0 m_SupportedAspectRatios: 4:3: 1 @@ -120,7 +126,6 @@ PlayerSettings: m_HolographicPauseOnTrackingLoss: 1 xboxOneDisableKinectGpuReservation: 0 xboxOneEnable7thCore: 0 - isWsaHolographicRemotingEnabled: 0 vrSettings: cardboard: depthFormat: 0 @@ -135,13 +140,23 @@ PlayerSettings: hololens: depthFormat: 1 depthBufferSharingEnabled: 0 + lumin: + depthFormat: 0 + frameTiming: 2 + enableGLCache: 0 + glCacheMaxBlobSize: 524288 + glCacheMaxFileSize: 8388608 oculus: sharedDepthBuffer: 0 dashSupport: 0 + lowOverheadMode: 0 + protectedContext: 0 + v2Signing: 1 enable360StereoCapture: 0 - protectGraphicsMemory: 0 + isWsaHolographicRemotingEnabled: 0 enableFrameTimingStats: 0 useHDRDisplay: 0 + D3DHDRBitDepth: 0 m_ColorGamuts: 00000000 targetPixelDensity: 30 resolutionScalingMode: 0 @@ -152,7 +167,7 @@ PlayerSettings: Standalone: com.unity.lightweightpipeline buildNumber: {} AndroidBundleVersionCode: 1 - AndroidMinSdkVersion: 18 + AndroidMinSdkVersion: 19 AndroidTargetSdkVersion: 0 AndroidPreferredInstallLocation: 1 aotOptions: @@ -167,10 +182,10 @@ PlayerSettings: StripUnusedMeshComponents: 0 VertexChannelCompressionMask: 4054 iPhoneSdkVersion: 988 - iOSTargetOSVersionString: 9.0 + iOSTargetOSVersionString: 10.0 tvOSSdkVersion: 0 tvOSRequireExtendedGameController: 0 - tvOSTargetOSVersionString: 9.0 + tvOSTargetOSVersionString: 10.0 uIPrerenderedIcon: 0 uIRequiresPersistentWiFi: 0 uIRequiresFullScreen: 1 @@ -189,6 +204,10 @@ PlayerSettings: iPadHighResPortraitSplashScreen: {fileID: 0} iPadLandscapeSplashScreen: {fileID: 0} iPadHighResLandscapeSplashScreen: {fileID: 0} + iPhone65inPortraitSplashScreen: {fileID: 0} + iPhone65inLandscapeSplashScreen: {fileID: 0} + iPhone61inPortraitSplashScreen: {fileID: 0} + iPhone61inLandscapeSplashScreen: {fileID: 0} appleTVSplashScreen: {fileID: 0} appleTVSplashScreen2x: {fileID: 0} tvOSSmallIconLayers: [] @@ -232,6 +251,7 @@ PlayerSettings: tvOSManualSigningProvisioningProfileType: 0 appleEnableAutomaticSigning: 0 iOSRequireARKit: 0 + iOSAutomaticallyDetectAndAddCapabilities: 1 appleEnableProMotion: 0 clonedFromGUID: 00000000000000000000000000000000 templatePackageId: @@ -239,7 +259,7 @@ PlayerSettings: AndroidTargetArchitectures: 5 AndroidSplashScreenScale: 0 androidSplashScreen: {fileID: 0} - AndroidKeystoreName: + AndroidKeystoreName: '{inproject}: ' AndroidKeyaliasName: AndroidBuildApkPerCpuArchitecture: 0 AndroidTVCompatibility: 1 @@ -247,15 +267,49 @@ PlayerSettings: AndroidEnableTango: 0 androidEnableBanner: 1 androidUseLowAccuracyLocation: 0 + androidUseCustomKeystore: 0 m_AndroidBanners: - width: 320 height: 180 banner: {fileID: 0} androidGamepadSupportLevel: 0 - resolutionDialogBanner: {fileID: 0} + AndroidValidateAppBundleSize: 1 + AndroidAppBundleSizeToValidate: 150 m_BuildTargetIcons: [] m_BuildTargetPlatformIcons: [] m_BuildTargetBatching: [] + m_BuildTargetGraphicsJobs: + - m_BuildTarget: MacStandaloneSupport + m_GraphicsJobs: 0 + - m_BuildTarget: Switch + m_GraphicsJobs: 0 + - m_BuildTarget: MetroSupport + m_GraphicsJobs: 0 + - m_BuildTarget: AppleTVSupport + m_GraphicsJobs: 0 + - m_BuildTarget: BJMSupport + m_GraphicsJobs: 0 + - m_BuildTarget: LinuxStandaloneSupport + m_GraphicsJobs: 0 + - m_BuildTarget: PS4Player + m_GraphicsJobs: 0 + - m_BuildTarget: iOSSupport + m_GraphicsJobs: 0 + - m_BuildTarget: WindowsStandaloneSupport + m_GraphicsJobs: 0 + - m_BuildTarget: XboxOnePlayer + m_GraphicsJobs: 0 + - m_BuildTarget: LuminSupport + m_GraphicsJobs: 0 + - m_BuildTarget: AndroidPlayer + m_GraphicsJobs: 0 + - m_BuildTarget: WebGLSupport + m_GraphicsJobs: 0 + m_BuildTargetGraphicsJobMode: + - m_BuildTarget: PS4Player + m_GraphicsJobMode: 0 + - m_BuildTarget: XboxOnePlayer + m_GraphicsJobMode: 0 m_BuildTargetGraphicsAPIs: - m_BuildTarget: AndroidPlayer m_APIs: 0b000000 @@ -266,9 +320,9 @@ PlayerSettings: m_Devices: - Oculus - OpenVR - m_BuildTargetEnableVuforiaSettings: [] openGLRequireES31: 0 openGLRequireES31AEP: 0 + openGLRequireES32: 0 m_TemplateCustomTags: {} mobileMTRendering: Android: 1 @@ -384,6 +438,7 @@ PlayerSettings: switchRatingsInt_9: 0 switchRatingsInt_10: 0 switchRatingsInt_11: 0 + switchRatingsInt_12: 0 switchLocalCommunicationIds_0: switchLocalCommunicationIds_1: switchLocalCommunicationIds_2: @@ -398,6 +453,7 @@ PlayerSettings: switchAllowsRuntimeAddOnContentInstall: 0 switchDataLossConfirmation: 0 switchUserAccountLockEnabled: 0 + switchSystemResourceMemory: 16777216 switchSupportedNpadStyles: 3 switchNativeFsCacheSize: 32 switchIsHoldTypeHorizontal: 0 @@ -451,6 +507,7 @@ PlayerSettings: ps4DownloadDataSize: 0 ps4GarlicHeapSize: 2048 ps4ProGarlicHeapSize: 2560 + playerPrefsMaxSize: 32768 ps4Passcode: frAQBc8Wsa1xVPfvJcrgRYwTiizs2trQ ps4pnSessions: 1 ps4pnPresence: 1 @@ -481,9 +538,11 @@ PlayerSettings: ps4contentSearchFeaturesUsed: 0 ps4attribEyeToEyeDistanceSettingVR: 0 ps4IncludedModules: [] + ps4attribVROutputEnabled: 0 monoEnv: splashScreenBackgroundSourceLandscape: {fileID: 0} splashScreenBackgroundSourcePortrait: {fileID: 0} + blurSplashScreenBackground: 1 spritePackerPolicy: webGLMemorySize: 256 webGLExceptionSupport: 1 @@ -498,6 +557,7 @@ PlayerSettings: webGLCompressionFormat: 1 webGLLinkerTarget: 0 webGLThreadsSupport: 0 + webGLWasmStreaming: 0 scriptingDefineSymbols: 1: UNITY_POST_PROCESSING_STACK_V2 4: UNITY_POST_PROCESSING_STACK_V2 @@ -514,6 +574,7 @@ PlayerSettings: 26: UNITY_POST_PROCESSING_STACK_V2 27: UNITY_POST_PROCESSING_STACK_V2 28: UNITY_POST_PROCESSING_STACK_V2 + 29: UNITY_POST_PROCESSING_STACK_V2 platformArchitecture: {} scriptingBackend: {} il2cppCompilerConfiguration: {} @@ -521,7 +582,9 @@ PlayerSettings: incrementalIl2cppBuild: {} allowUnsafeCode: 0 additionalIl2CppArgs: - scriptingRuntimeVersion: 0 + scriptingRuntimeVersion: 1 + gcIncremental: 0 + gcWBarrierValidation: 0 apiCompatibilityLevelPerPlatform: {} m_RenderingPath: 1 m_MobileRenderingPath: 1 @@ -552,7 +615,6 @@ PlayerSettings: metroFTAName: metroFTAFileTypes: [] metroProtocolName: - metroCompilationOverrides: 1 XboxOneProductId: XboxOneUpdateKey: XboxOneSandboxId: @@ -577,7 +639,6 @@ PlayerSettings: XboxOneAllowedProductIds: [] XboxOnePersistentLocalStorageSize: 0 XboxOneXTitleMemory: 8 - xboxOneScriptCompiler: 0 XboxOneOverrideIdentityName: vrEditorSettings: daydream: @@ -590,19 +651,12 @@ PlayerSettings: m_PortalFolderPath: luminCert: m_CertPath: - m_PrivateKeyPath: + m_SignPackage: 1 luminIsChannelApp: 0 luminVersion: m_VersionCode: 1 m_VersionName: - facebookSdkVersion: 7.9.4 - facebookAppId: - facebookCookies: 1 - facebookLogging: 1 - facebookStatus: 1 - facebookXfbml: 0 - facebookFrictionlessRequests: 1 - apiCompatibilityLevel: 2 + apiCompatibilityLevel: 6 cloudProjectId: bf2c0afe-e914-4208-b0bc-36fafcdbe102 framebufferDepthMemorylessMode: 0 projectName: LightweightPipeline diff --git a/ShaderGraph_ExampleLibrary_Project/ProjectSettings/ProjectVersion.txt b/ShaderGraph_ExampleLibrary_Project/ProjectSettings/ProjectVersion.txt index ca32b1e..f04fc72 100644 --- a/ShaderGraph_ExampleLibrary_Project/ProjectSettings/ProjectVersion.txt +++ b/ShaderGraph_ExampleLibrary_Project/ProjectSettings/ProjectVersion.txt @@ -1 +1,2 @@ -m_EditorVersion: 2018.3.0f2 +m_EditorVersion: 2019.3.2f1 +m_EditorVersionWithRevision: 2019.3.2f1 (c46a3a38511e) diff --git a/ShaderGraph_ExampleLibrary_Project/ProjectSettings/XRSettings.asset b/ShaderGraph_ExampleLibrary_Project/ProjectSettings/XRSettings.asset new file mode 100644 index 0000000..482590c --- /dev/null +++ b/ShaderGraph_ExampleLibrary_Project/ProjectSettings/XRSettings.asset @@ -0,0 +1,10 @@ +{ + "m_SettingKeys": [ + "VR Device Disabled", + "VR Device User Alert" + ], + "m_SettingValues": [ + "False", + "False" + ] +} \ No newline at end of file