diff --git a/Assets/Resources/Prefabs/GameView/GameTexMaterial.mat b/Assets/Resources/Prefabs/GameView/GameTexMaterial.mat index 9c55a022..8b20e59f 100644 --- a/Assets/Resources/Prefabs/GameView/GameTexMaterial.mat +++ b/Assets/Resources/Prefabs/GameView/GameTexMaterial.mat @@ -8,7 +8,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: GameTexMaterial - m_Shader: {fileID: 4800000, guid: 0ae724cf80d801b43b140517e4bbb12f, type: 3} + m_Shader: {fileID: 4800000, guid: 0596a6838d78f624397b642817cf20bc, type: 3} m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -20,10 +20,18 @@ Material: m_SavedProperties: serializedVersion: 3 m_TexEnvs: + - _BlendTex: + 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} m_Offset: {x: 0, y: 0} + - _Cube: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _DetailAlbedoMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -40,10 +48,18 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _FaceTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _MainTex: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _MaskTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _MetallicGlossMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -52,6 +68,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _OutlineTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _ParallaxMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -63,21 +83,51 @@ Material: m_Ints: [] m_Floats: - _Alpha: 1 + - _Bevel: 0.5 + - _BevelClamp: 0 + - _BevelOffset: 0 + - _BevelRoundness: 0 + - _BevelWidth: 0 - _BlendDst: 1 - _BlendSrc: 1 + - _BumpFace: 0.5 + - _BumpOutline: 0.5 - _BumpScale: 1 - _ColorMask: 15 + - _CullMode: 0 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _FaceDilate: 0 + - _FaceShininess: 0 + - _FaceUVSpeedX: 0 + - _FaceUVSpeedY: 0 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossyReflections: 1 + - _GlowInner: 0.05 + - _GlowOffset: 0 + - _GlowOuter: 0.05 + - _GlowPower: 0.75 + - _GradientScale: 5 - _InvFade: 1 - _Metallic: 0 - _Mode: 0 - _OcclusionStrength: 1 + - _OutlineShininess: 0 + - _OutlineSoftness: 0 + - _OutlineUVSpeedX: 0 + - _OutlineUVSpeedY: 0 + - _OutlineWidth: 0 - _Parallax: 0.02 + - _PerspectiveFilter: 0.875 + - _ScaleRatioA: 1 + - _ScaleRatioB: 1 + - _ScaleRatioC: 1 + - _ScaleX: 1 + - _ScaleY: 1 + - _ShaderFlags: 0 + - _Sharpness: 0 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 @@ -86,12 +136,27 @@ Material: - _StencilOp: 0 - _StencilReadMask: 255 - _StencilWriteMask: 255 + - _TextureHeight: 512 + - _TextureWidth: 512 - _UVSec: 0 - _UseUIAlphaClip: 0 + - _VertexOffsetX: 0 + - _VertexOffsetY: 0 + - _WeightBold: 0.5 + - _WeightNormal: 0 - _ZWrite: 1 m_Colors: + - _BlendColor: {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} + - _EnvMatrixRotation: {r: 0, g: 0, b: 0, a: 0} + - _FaceColor: {r: 1, g: 1, b: 1, a: 1} + - _GlowColor: {r: 0, g: 1, b: 0, a: 0.5} + - _MainColor: {r: 1, g: 1, b: 1, a: 1} + - _OutlineColor: {r: 0, g: 0, b: 0, a: 1} + - _ReflectFaceColor: {r: 0, g: 0, b: 0, a: 1} + - _ReflectOutlineColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0, g: 0, b: 0, a: 1} - _Tint1: {r: 1, g: 1, b: 1, a: 0} - _Tint2: {r: 1, g: 1, b: 1, a: 0} m_BuildTextureStacks: [] diff --git a/Packages/manifest.json b/Packages/manifest.json index ecff0ce9..66ec8d3d 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -19,6 +19,7 @@ "com.unity.textmeshpro": "3.2.0-pre.5", "com.unity.timeline": "1.6.5", "com.unity.ugui": "1.0.0", + "com.zigurous.shaders.blending": "https://github.com/zigurous/unity-blend-shaders.git", "jillejr.newtonsoft.json-for-unity.converters": "1.3.0", "com.unity.modules.ai": "1.0.0", "com.unity.modules.androidjni": "1.0.0", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 14788200..2c03dc44 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -165,6 +165,13 @@ "com.unity.modules.imgui": "1.0.0" } }, + "com.zigurous.shaders.blending": { + "version": "https://github.com/zigurous/unity-blend-shaders.git", + "depth": 0, + "source": "git", + "dependencies": {}, + "hash": "4b351991a8c464adc961232425ff99f607396b9d" + }, "jillejr.newtonsoft.json-for-unity.converters": { "version": "1.5.1", "depth": 1,