Skip to content

Commit 232424d

Browse files
authored
Merge pull request #2 from KingWazzack/ToDo-Functionality
TodoFunctionality Merge
2 parents a1f877b + b29e878 commit 232424d

File tree

20 files changed

+3318
-387
lines changed

20 files changed

+3318
-387
lines changed

UnityPomodoro/Assets/AdrianMiasik/Materials/Originals/Circle.mat

Lines changed: 9 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Material:
88
m_PrefabInstance: {fileID: 0}
99
m_PrefabAsset: {fileID: 0}
1010
m_Name: Circle
11-
m_Shader: {fileID: -6465566751694194690, guid: bf62f522454b7d247aa12edbfc5e086b, type: 3}
11+
m_Shader: {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0}
1212
m_ValidKeywords: []
1313
m_InvalidKeywords: []
1414
m_LightmapFlags: 4
@@ -20,98 +20,21 @@ Material:
2020
m_SavedProperties:
2121
serializedVersion: 3
2222
m_TexEnvs:
23-
- _BaseMap:
24-
m_Texture: {fileID: 0}
25-
m_Scale: {x: 1, y: 1}
26-
m_Offset: {x: 0, y: 0}
27-
- _BumpMap:
28-
m_Texture: {fileID: 0}
29-
m_Scale: {x: 1, y: 1}
30-
m_Offset: {x: 0, y: 0}
31-
- _DetailAlbedoMap:
32-
m_Texture: {fileID: 0}
33-
m_Scale: {x: 1, y: 1}
34-
m_Offset: {x: 0, y: 0}
35-
- _DetailMask:
36-
m_Texture: {fileID: 0}
37-
m_Scale: {x: 1, y: 1}
38-
m_Offset: {x: 0, y: 0}
39-
- _DetailNormalMap:
40-
m_Texture: {fileID: 0}
41-
m_Scale: {x: 1, y: 1}
42-
m_Offset: {x: 0, y: 0}
43-
- _EmissionMap:
44-
m_Texture: {fileID: 0}
45-
m_Scale: {x: 1, y: 1}
46-
m_Offset: {x: 0, y: 0}
4723
- _MainTex:
4824
m_Texture: {fileID: 0}
4925
m_Scale: {x: 1, y: 1}
5026
m_Offset: {x: 0, y: 0}
51-
- _MetallicGlossMap:
52-
m_Texture: {fileID: 0}
53-
m_Scale: {x: 1, y: 1}
54-
m_Offset: {x: 0, y: 0}
55-
- _OcclusionMap:
56-
m_Texture: {fileID: 0}
57-
m_Scale: {x: 1, y: 1}
58-
m_Offset: {x: 0, y: 0}
59-
- _ParallaxMap:
60-
m_Texture: {fileID: 0}
61-
m_Scale: {x: 1, y: 1}
62-
m_Offset: {x: 0, y: 0}
63-
- _SpecGlossMap:
64-
m_Texture: {fileID: 0}
65-
m_Scale: {x: 1, y: 1}
66-
m_Offset: {x: 0, y: 0}
67-
- unity_Lightmaps:
68-
m_Texture: {fileID: 0}
69-
m_Scale: {x: 1, y: 1}
70-
m_Offset: {x: 0, y: 0}
71-
- unity_LightmapsInd:
72-
m_Texture: {fileID: 0}
73-
m_Scale: {x: 1, y: 1}
74-
m_Offset: {x: 0, y: 0}
75-
- unity_ShadowMasks:
76-
m_Texture: {fileID: 0}
77-
m_Scale: {x: 1, y: 1}
78-
m_Offset: {x: 0, y: 0}
7927
m_Ints: []
8028
m_Floats:
81-
- Vector1_98525729712540259c19ac6e37e93b62: 0.5
82-
- _AlphaClip: 0
83-
- _Blend: 0
84-
- _BumpScale: 1
85-
- _ClearCoatMask: 0
86-
- _ClearCoatSmoothness: 0
87-
- _Cull: 2
88-
- _Cutoff: 0.5
89-
- _DetailAlbedoMapScale: 1
90-
- _DetailNormalMapScale: 1
91-
- _DstBlend: 0
92-
- _EnvironmentReflections: 1
93-
- _GlossMapScale: 0
94-
- _Glossiness: 0
95-
- _GlossyReflections: 0
96-
- _Metallic: 0
97-
- _OcclusionStrength: 1
98-
- _Parallax: 0.005
99-
- _QueueControl: 0
100-
- _QueueOffset: 0
101-
- _ReceiveShadows: 1
102-
- _Smoothness: 0.5
103-
- _SmoothnessTextureChannel: 0
104-
- _SpecularHighlights: 1
105-
- _SrcBlend: 1
106-
- _Surface: 0
107-
- _WorkflowMode: 1
108-
- _ZWrite: 1
29+
- _ColorMask: 15
30+
- _Stencil: 0
31+
- _StencilComp: 8
32+
- _StencilOp: 0
33+
- _StencilReadMask: 255
34+
- _StencilWriteMask: 255
35+
- _UseUIAlphaClip: 0
10936
m_Colors:
110-
- Color_297012532bf444df807f8743bdb7e4fd: {r: 0.91, g: 0.91, b: 0.91, a: 1}
111-
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
112-
- _Color: {r: 0.25, g: 0.25, b: 0.25, a: 1}
113-
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
114-
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
37+
- _Color: {r: 1, g: 1, b: 1, a: 1}
11538
m_BuildTextureStacks: []
11639
--- !u!114 &3293545290711233980
11740
MonoBehaviour:

0 commit comments

Comments
 (0)