Skip to content

Commit 03475c5

Browse files
AndrewTHEManeriAndrewTHEManeri
committed
Merge remote-tracking branch 'remotes/origin/bugfixes/dylanu/primitive-menu-shader-cleanup' into staging
2 parents b5a9677 + 0d364b1 commit 03475c5

8 files changed

Lines changed: 1317 additions & 1027 deletions

‎Menus/MainMenu/Materials/PrimitiveMenuFaceBlur.mat‎

Lines changed: 88 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!21 &2100000
4+
Material:
5+
serializedVersion: 6
6+
m_ObjectHideFlags: 0
7+
m_PrefabParentObject: {fileID: 0}
8+
m_PrefabInternal: {fileID: 0}
9+
m_Name: PrimitiveMenuFaceBlur
10+
m_Shader: {fileID: 4800000, guid: 1bc55feb3f493374ca90e594b518edb9, type: 3}
11+
m_ShaderKeywords: _ALPHAPREMULTIPLY_ON _EMISSION _METALLICGLOSSMAP
12+
m_LightmapFlags: 1
13+
m_EnableInstancingVariants: 0
14+
m_CustomRenderQueue: 9002
15+
stringTagMap: {}
16+
disabledShaderPasses: []
17+
m_SavedProperties:
18+
serializedVersion: 3
19+
m_TexEnvs:
20+
- _BumpMap:
21+
m_Texture: {fileID: 2800000, guid: 06dc8da358c6ebb4dad67b286b513f95, type: 3}
22+
m_Scale: {x: 1, y: 1}
23+
m_Offset: {x: 0, y: 0}
24+
- _DetailAlbedoMap:
25+
m_Texture: {fileID: 0}
26+
m_Scale: {x: 1, y: 1}
27+
m_Offset: {x: 0, y: 0}
28+
- _DetailMask:
29+
m_Texture: {fileID: 0}
30+
m_Scale: {x: 1, y: 1}
31+
m_Offset: {x: 0, y: 0}
32+
- _DetailNormalMap:
33+
m_Texture: {fileID: 0}
34+
m_Scale: {x: 1, y: 1}
35+
m_Offset: {x: 0, y: 0}
36+
- _EmissionMap:
37+
m_Texture: {fileID: 2800000, guid: 3cd61233b718b974e99810df6209b4c4, type: 3}
38+
m_Scale: {x: 1, y: 1}
39+
m_Offset: {x: 0, y: 0}
40+
- _MainTex:
41+
m_Texture: {fileID: 0}
42+
m_Scale: {x: 1, y: 1}
43+
m_Offset: {x: 0, y: 0}
44+
- _MetallicGlossMap:
45+
m_Texture: {fileID: 2800000, guid: 79e3d026b08ce624a8e621c78501dcc8, type: 3}
46+
m_Scale: {x: 1, y: 1}
47+
m_Offset: {x: 0, y: 0}
48+
- _OcclusionMap:
49+
m_Texture: {fileID: 0}
50+
m_Scale: {x: 1, y: 1}
51+
m_Offset: {x: 0, y: 0}
52+
- _ParallaxMap:
53+
m_Texture: {fileID: 0}
54+
m_Scale: {x: 1, y: 1}
55+
m_Offset: {x: 0, y: 0}
56+
- _SpecGlossMap:
57+
m_Texture: {fileID: 0}
58+
m_Scale: {x: 1, y: 1}
59+
m_Offset: {x: 0, y: 0}
60+
m_Floats:
61+
- _Blur: 1.75
62+
- _BumpAmt: 128
63+
- _BumpScale: 2
64+
- _Cutoff: 0.5
65+
- _DetailNormalMapScale: 1
66+
- _DstBlend: 10
67+
- _GlossMapScale: 0.414
68+
- _Glossiness: 0.5
69+
- _GlossyReflections: 1
70+
- _Height: 0.5
71+
- _InvFade: 1
72+
- _Metallic: 0.256
73+
- _Mode: 3
74+
- _OcclusionStrength: 1
75+
- _Parallax: 0.02
76+
- _Size: 2.4
77+
- _SmoothnessTextureChannel: 0
78+
- _SpecularHighlights: 1
79+
- _SrcBlend: 1
80+
- _UVSec: 0
81+
- _VerticalOffset: 0
82+
- _ZWrite: 0
83+
m_Colors:
84+
- _Color: {r: 0.67058825, g: 0.6784314, b: 0.68235296, a: 1}
85+
- _EmisColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 0}
86+
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
87+
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
88+
- _TintColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5}

‎Menus/MainMenu/Materials/PrimitiveMenuFaceBlur.mat.meta‎

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Menus/MainMenu/Materials/PrimitiveMenuFaceTitleIcon.mat‎

Lines changed: 83 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,83 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!21 &2100000
4+
Material:
5+
serializedVersion: 6
6+
m_ObjectHideFlags: 0
7+
m_PrefabParentObject: {fileID: 0}
8+
m_PrefabInternal: {fileID: 0}
9+
m_Name: MenuFaceTitleIcon
10+
m_Shader: {fileID: 4800000, guid: 269bee83d6b662e489c098a4f0d9af32, type: 3}
11+
m_ShaderKeywords: _EMISSION _METALLICGLOSSMAP _NORMALMAP
12+
m_LightmapFlags: 1
13+
m_EnableInstancingVariants: 0
14+
m_CustomRenderQueue: 9001
15+
stringTagMap: {}
16+
disabledShaderPasses: []
17+
m_SavedProperties:
18+
serializedVersion: 3
19+
m_TexEnvs:
20+
- _BumpMap:
21+
m_Texture: {fileID: 2800000, guid: b2816b0a15efb7b4c9d7b0c9658cce91, type: 3}
22+
m_Scale: {x: 1, y: 1}
23+
m_Offset: {x: 0, y: 0}
24+
- _ColorRamp:
25+
m_Texture: {fileID: 0}
26+
m_Scale: {x: 1, y: 1}
27+
m_Offset: {x: 0, y: 0}
28+
- _DetailAlbedoMap:
29+
m_Texture: {fileID: 0}
30+
m_Scale: {x: 1, y: 1}
31+
m_Offset: {x: 0, y: 0}
32+
- _DetailMask:
33+
m_Texture: {fileID: 0}
34+
m_Scale: {x: 1, y: 1}
35+
m_Offset: {x: 0, y: 0}
36+
- _DetailNormalMap:
37+
m_Texture: {fileID: 0}
38+
m_Scale: {x: 1, y: 1}
39+
m_Offset: {x: 0, y: 0}
40+
- _EmissionMap:
41+
m_Texture: {fileID: 2800000, guid: 79598c28225d2d34b8302226bd9eef22, type: 3}
42+
m_Scale: {x: 1, y: 1}
43+
m_Offset: {x: 0, y: 0}
44+
- _MainTex:
45+
m_Texture: {fileID: 2800000, guid: e3d142da281fe8c44a8ad1f5804bcab3, type: 3}
46+
m_Scale: {x: 1, y: 1}
47+
m_Offset: {x: 0, y: 0}
48+
- _MetallicGlossMap:
49+
m_Texture: {fileID: 2800000, guid: 5041e241ded3448438f63bdf4bef11fd, type: 3}
50+
m_Scale: {x: 1, y: 1}
51+
m_Offset: {x: 0, y: 0}
52+
- _OcclusionMap:
53+
m_Texture: {fileID: 0}
54+
m_Scale: {x: 1, y: 1}
55+
m_Offset: {x: 0, y: 0}
56+
- _ParallaxMap:
57+
m_Texture: {fileID: 0}
58+
m_Scale: {x: 1, y: 1}
59+
m_Offset: {x: 0, y: 0}
60+
m_Floats:
61+
- _BumpScale: 1.5
62+
- _ColorRampOffset: 0
63+
- _Cutoff: 0.5
64+
- _DetailNormalMapScale: 1
65+
- _DstBlend: 0
66+
- _GlossMapScale: 0.539
67+
- _Glossiness: 0.5
68+
- _GlossyReflections: 1
69+
- _Metallic: 0
70+
- _Mode: 0
71+
- _OcclusionStrength: 1
72+
- _Parallax: 0.02
73+
- _Scale: 4.4
74+
- _SmoothnessTextureChannel: 0
75+
- _SpecularHighlights: 1
76+
- _SrcBlend: 1
77+
- _UVSec: 0
78+
- _ZWrite: 1
79+
m_Colors:
80+
- _Color: {r: 1, g: 1, b: 1, a: 1}
81+
- _ColorBottom: {r: 1, g: 0, b: 0, a: 1}
82+
- _ColorTop: {r: 1, g: 0.9724138, b: 0, a: 1}
83+
- _EmissionColor: {r: 1, g: 1, b: 1, a: 1}

‎Menus/MainMenu/Materials/PrimitiveMenuFaceTitleIcon.mat.meta‎

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)