Skip to content

Commit 86c168a

Browse files
kirevdokimovkirevdokimov
committed
Merge branch 'independent-round'
2 parents 07666d4 + 95c02f7 commit 86c168a

26 files changed

Lines changed: 635 additions & 421 deletions

Examples/ButtonMaterial1.mat renamed to Examples/ButtonBack.mat

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,10 @@ Material:
55
serializedVersion: 6
66
m_ObjectHideFlags: 0
77
m_CorrespondingSourceObject: {fileID: 0}
8-
m_PrefabInternal: {fileID: 0}
9-
m_Name: ButtonMaterial1
10-
m_Shader: {fileID: 4800000, guid: 121a88190b32dc9499d59e1fc5bc3191, type: 3}
8+
m_PrefabInstance: {fileID: 0}
9+
m_PrefabAsset: {fileID: 0}
10+
m_Name: ButtonBack
11+
m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3}
1112
m_ShaderKeywords:
1213
m_LightmapFlags: 4
1314
m_EnableInstancingVariants: 0
@@ -63,12 +64,10 @@ Material:
6364
- _GlossMapScale: 1
6465
- _Glossiness: 0.5
6566
- _GlossyReflections: 1
66-
- _Height: 30
6767
- _Metallic: 0
6868
- _Mode: 0
6969
- _OcclusionStrength: 1
7070
- _Parallax: 0.02
71-
- _Radius: 4
7271
- _SmoothnessTextureChannel: 0
7372
- _SpecularHighlights: 1
7473
- _SrcBlend: 1
@@ -79,8 +78,8 @@ Material:
7978
- _StencilWriteMask: 255
8079
- _UVSec: 0
8180
- _UseUIAlphaClip: 0
82-
- _Width: 160
8381
- _ZWrite: 1
8482
m_Colors:
8583
- _Color: {r: 1, g: 1, b: 1, a: 1}
8684
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
85+
- _WidthHeightRadius: {r: 160, g: 30, b: 8, a: 0}

Examples/QuadTextureMaterial.mat.meta renamed to Examples/ButtonBack.mat.meta

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Examples/ButtonMaterial2.mat renamed to Examples/ButtonFore.mat

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,10 @@ Material:
55
serializedVersion: 6
66
m_ObjectHideFlags: 0
77
m_CorrespondingSourceObject: {fileID: 0}
8-
m_PrefabInternal: {fileID: 0}
9-
m_Name: ButtonMaterial2
10-
m_Shader: {fileID: 4800000, guid: 121a88190b32dc9499d59e1fc5bc3191, type: 3}
8+
m_PrefabInstance: {fileID: 0}
9+
m_PrefabAsset: {fileID: 0}
10+
m_Name: ButtonFore
11+
m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3}
1112
m_ShaderKeywords:
1213
m_LightmapFlags: 4
1314
m_EnableInstancingVariants: 0
@@ -63,12 +64,10 @@ Material:
6364
- _GlossMapScale: 1
6465
- _Glossiness: 0.5
6566
- _GlossyReflections: 1
66-
- _Height: 29
6767
- _Metallic: 0
6868
- _Mode: 0
6969
- _OcclusionStrength: 1
7070
- _Parallax: 0.02
71-
- _Radius: 3.5
7271
- _SmoothnessTextureChannel: 0
7372
- _SpecularHighlights: 1
7473
- _SrcBlend: 1
@@ -79,8 +78,8 @@ Material:
7978
- _StencilWriteMask: 255
8079
- _UVSec: 0
8180
- _UseUIAlphaClip: 0
82-
- _Width: 159
8381
- _ZWrite: 1
8482
m_Colors:
8583
- _Color: {r: 1, g: 1, b: 1, a: 1}
8684
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
85+
- _WidthHeightRadius: {r: 159, g: 29, b: 7.39, a: 0}

Examples/ButtonMaterial1.mat.meta renamed to Examples/ButtonFore.mat.meta

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Examples/IndependentCornersMaterial.mat‎

Lines changed: 87 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,87 @@
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_CorrespondingSourceObject: {fileID: 0}
8+
m_PrefabInstance: {fileID: 0}
9+
m_PrefabAsset: {fileID: 0}
10+
m_Name: IndependentCornersMaterial
11+
m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3}
12+
m_ShaderKeywords:
13+
m_LightmapFlags: 4
14+
m_EnableInstancingVariants: 0
15+
m_DoubleSidedGI: 0
16+
m_CustomRenderQueue: -1
17+
stringTagMap: {}
18+
disabledShaderPasses: []
19+
m_SavedProperties:
20+
serializedVersion: 3
21+
m_TexEnvs:
22+
- _BumpMap:
23+
m_Texture: {fileID: 0}
24+
m_Scale: {x: 1, y: 1}
25+
m_Offset: {x: 0, y: 0}
26+
- _DetailAlbedoMap:
27+
m_Texture: {fileID: 0}
28+
m_Scale: {x: 1, y: 1}
29+
m_Offset: {x: 0, y: 0}
30+
- _DetailMask:
31+
m_Texture: {fileID: 0}
32+
m_Scale: {x: 1, y: 1}
33+
m_Offset: {x: 0, y: 0}
34+
- _DetailNormalMap:
35+
m_Texture: {fileID: 0}
36+
m_Scale: {x: 1, y: 1}
37+
m_Offset: {x: 0, y: 0}
38+
- _EmissionMap:
39+
m_Texture: {fileID: 0}
40+
m_Scale: {x: 1, y: 1}
41+
m_Offset: {x: 0, y: 0}
42+
- _MainTex:
43+
m_Texture: {fileID: 0}
44+
m_Scale: {x: 1, y: 1}
45+
m_Offset: {x: 0, y: 0}
46+
- _MetallicGlossMap:
47+
m_Texture: {fileID: 0}
48+
m_Scale: {x: 1, y: 1}
49+
m_Offset: {x: 0, y: 0}
50+
- _OcclusionMap:
51+
m_Texture: {fileID: 0}
52+
m_Scale: {x: 1, y: 1}
53+
m_Offset: {x: 0, y: 0}
54+
- _ParallaxMap:
55+
m_Texture: {fileID: 0}
56+
m_Scale: {x: 1, y: 1}
57+
m_Offset: {x: 0, y: 0}
58+
m_Floats:
59+
- _BumpScale: 1
60+
- _ColorMask: 15
61+
- _Cutoff: 0.5
62+
- _DetailNormalMapScale: 1
63+
- _DstBlend: 0
64+
- _GlossMapScale: 1
65+
- _Glossiness: 0.5
66+
- _GlossyReflections: 1
67+
- _Metallic: 0
68+
- _Mode: 0
69+
- _OcclusionStrength: 1
70+
- _Parallax: 0.02
71+
- _SmoothnessTextureChannel: 0
72+
- _SpecularHighlights: 1
73+
- _SrcBlend: 1
74+
- _Stencil: 0
75+
- _StencilComp: 8
76+
- _StencilOp: 0
77+
- _StencilReadMask: 255
78+
- _StencilWriteMask: 255
79+
- _UVSec: 0
80+
- _UseUIAlphaClip: 0
81+
- _ZWrite: 1
82+
m_Colors:
83+
- _Color: {r: 1, g: 1, b: 1, a: 1}
84+
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
85+
- _halfSize: {r: 50, g: 50, b: 0, a: 0}
86+
- _r: {r: 10, g: 10, b: 10, a: 10}
87+
- _rect2props: {r: 0.0000038146973, g: -0.0000076293945, b: 63.639614, a: 63.639614}

Examples/ButtonMaterial2.mat.meta renamed to Examples/IndependentCornersMaterial.mat.meta

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Examples/QuadTextureMaterial.mat renamed to Examples/MaskedMaterial.mat

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ Material:
77
m_CorrespondingSourceObject: {fileID: 0}
88
m_PrefabInstance: {fileID: 0}
99
m_PrefabAsset: {fileID: 0}
10-
m_Name: QuadTextureMaterial
11-
m_Shader: {fileID: 4800000, guid: a820d47057094b0d80093faa8200efde, type: 3}
10+
m_Name: MaskedMaterial
11+
m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3}
1212
m_ShaderKeywords:
1313
m_LightmapFlags: 4
1414
m_EnableInstancingVariants: 0
@@ -40,7 +40,7 @@ Material:
4040
m_Scale: {x: 1, y: 1}
4141
m_Offset: {x: 0, y: 0}
4242
- _MainTex:
43-
m_Texture: {fileID: 10305, guid: 0000000000000000f000000000000000, type: 0}
43+
m_Texture: {fileID: 0}
4444
m_Scale: {x: 1, y: 1}
4545
m_Offset: {x: 0, y: 0}
4646
- _MetallicGlossMap:
@@ -64,12 +64,10 @@ Material:
6464
- _GlossMapScale: 1
6565
- _Glossiness: 0.5
6666
- _GlossyReflections: 1
67-
- _Height: 42
6867
- _Metallic: 0
6968
- _Mode: 0
7069
- _OcclusionStrength: 1
7170
- _Parallax: 0.02
72-
- _Radius: 8
7371
- _SmoothnessTextureChannel: 0
7472
- _SpecularHighlights: 1
7573
- _SrcBlend: 1
@@ -80,8 +78,8 @@ Material:
8078
- _StencilWriteMask: 255
8179
- _UVSec: 0
8280
- _UseUIAlphaClip: 0
83-
- _Width: 42
8481
- _ZWrite: 1
8582
m_Colors:
86-
- _Color: {r: 0.3700605, g: 0.77965206, b: 0.7924528, a: 1}
83+
- _Color: {r: 1, g: 1, b: 1, a: 1}
8784
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
85+
- _WidthHeightRadius: {r: 100, g: 100, b: 16, a: 0}

‎Examples/MaskedMaterial.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.

‎Examples/RoundedCornersTextureMaterial.mat‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,3 +85,4 @@ Material:
8585
m_Colors:
8686
- _Color: {r: 1, g: 1, b: 1, a: 1}
8787
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
88+
- _WidthHeightRadius: {r: 100, g: 100, b: 60, a: 0}

0 commit comments

Comments
 (0)