Skip to content

Commit 6557b76

Browse files
NetzwergDENetzwergDE
authored
Merge pull request #122 from cgtuebingen/Recolor
changes colors of base mesh, clock and buttons
2 parents 1f19b17 + c39f5b1 commit 6557b76

File tree

13 files changed

+747
-239
lines changed

13 files changed

+747
-239
lines changed

‎UnityProjekte/Base Project/Assets/3D Objects/Sun/SunColors/BlackBackgroundTest.mat

+8-6
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,17 @@ Material:
2121
m_PrefabInstance: {fileID: 0}
2222
m_PrefabAsset: {fileID: 0}
2323
m_Name: BlackBackgroundTest
24-
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
24+
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
2525
m_Parent: {fileID: 0}
2626
m_ModifiedSerializedProperties: 0
27-
m_ValidKeywords: []
27+
m_ValidKeywords:
28+
- _GLOSSYREFLECTIONS_OFF
2829
m_InvalidKeywords: []
2930
m_LightmapFlags: 4
3031
m_EnableInstancingVariants: 0
3132
m_DoubleSidedGI: 0
3233
m_CustomRenderQueue: -1
33-
stringTagMap:
34-
RenderType: Opaque
34+
stringTagMap: {}
3535
disabledShaderPasses: []
3636
m_LockedProperties:
3737
m_SavedProperties:
@@ -113,6 +113,7 @@ Material:
113113
- _Glossiness: 0
114114
- _GlossyReflections: 0
115115
- _Metallic: 0
116+
- _Mode: 0
116117
- _OcclusionStrength: 1
117118
- _Parallax: 0.005
118119
- _QueueOffset: 0
@@ -123,11 +124,12 @@ Material:
123124
- _SrcBlend: 1
124125
- _SrcBlendAlpha: 1
125126
- _Surface: 0
127+
- _UVSec: 0
126128
- _WorkflowMode: 1
127129
- _ZWrite: 1
128130
m_Colors:
129-
- _BaseColor: {r: 0, g: 0, b: 0, a: 1}
130-
- _Color: {r: 0, g: 0, b: 0, a: 1}
131+
- _BaseColor: {r: 0.35686275, g: 0.27058825, b: 1, a: 1}
132+
- _Color: {r: 0.35686272, g: 0.2705882, b: 1, a: 1}
131133
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
132134
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
133135
m_BuildTextureStacks: []

‎UnityProjekte/Base Project/Assets/Clock/blackMaterial.mat

+2-2
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,8 @@ Material:
113113
- _WorkflowMode: 1
114114
- _ZWrite: 1
115115
m_Colors:
116-
- _BaseColor: {r: 0, g: 0, b: 0, a: 1}
117-
- _Color: {r: 0, g: 0, b: 0, a: 1}
116+
- _BaseColor: {r: 0.35686275, g: 0.27058825, b: 1, a: 1}
117+
- _Color: {r: 0.35686272, g: 0.2705882, b: 1, a: 1}
118118
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
119119
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
120120
m_BuildTextureStacks: []

‎UnityProjekte/Base Project/Assets/Materials/BaseMaterial.meta

+8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎UnityProjekte/Base Project/Assets/Materials/BaseMaterial/ButtonMaterial.mat

+133
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,133 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!114 &-1884984288409612703
4+
MonoBehaviour:
5+
m_ObjectHideFlags: 11
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
m_GameObject: {fileID: 0}
10+
m_Enabled: 1
11+
m_EditorHideFlags: 0
12+
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
13+
m_Name:
14+
m_EditorClassIdentifier:
15+
version: 7
16+
--- !u!21 &2100000
17+
Material:
18+
serializedVersion: 8
19+
m_ObjectHideFlags: 0
20+
m_CorrespondingSourceObject: {fileID: 0}
21+
m_PrefabInstance: {fileID: 0}
22+
m_PrefabAsset: {fileID: 0}
23+
m_Name: ButtonMaterial
24+
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
25+
m_Parent: {fileID: 0}
26+
m_ModifiedSerializedProperties: 0
27+
m_ValidKeywords: []
28+
m_InvalidKeywords: []
29+
m_LightmapFlags: 4
30+
m_EnableInstancingVariants: 0
31+
m_DoubleSidedGI: 0
32+
m_CustomRenderQueue: -1
33+
stringTagMap:
34+
RenderType: Opaque
35+
disabledShaderPasses: []
36+
m_LockedProperties:
37+
m_SavedProperties:
38+
serializedVersion: 3
39+
m_TexEnvs:
40+
- _BaseMap:
41+
m_Texture: {fileID: 0}
42+
m_Scale: {x: 1, y: 1}
43+
m_Offset: {x: 0, y: 0}
44+
- _BumpMap:
45+
m_Texture: {fileID: 0}
46+
m_Scale: {x: 1, y: 1}
47+
m_Offset: {x: 0, y: 0}
48+
- _DetailAlbedoMap:
49+
m_Texture: {fileID: 0}
50+
m_Scale: {x: 1, y: 1}
51+
m_Offset: {x: 0, y: 0}
52+
- _DetailMask:
53+
m_Texture: {fileID: 0}
54+
m_Scale: {x: 1, y: 1}
55+
m_Offset: {x: 0, y: 0}
56+
- _DetailNormalMap:
57+
m_Texture: {fileID: 0}
58+
m_Scale: {x: 1, y: 1}
59+
m_Offset: {x: 0, y: 0}
60+
- _EmissionMap:
61+
m_Texture: {fileID: 0}
62+
m_Scale: {x: 1, y: 1}
63+
m_Offset: {x: 0, y: 0}
64+
- _MainTex:
65+
m_Texture: {fileID: 0}
66+
m_Scale: {x: 1, y: 1}
67+
m_Offset: {x: 0, y: 0}
68+
- _MetallicGlossMap:
69+
m_Texture: {fileID: 0}
70+
m_Scale: {x: 1, y: 1}
71+
m_Offset: {x: 0, y: 0}
72+
- _OcclusionMap:
73+
m_Texture: {fileID: 0}
74+
m_Scale: {x: 1, y: 1}
75+
m_Offset: {x: 0, y: 0}
76+
- _ParallaxMap:
77+
m_Texture: {fileID: 0}
78+
m_Scale: {x: 1, y: 1}
79+
m_Offset: {x: 0, y: 0}
80+
- _SpecGlossMap:
81+
m_Texture: {fileID: 0}
82+
m_Scale: {x: 1, y: 1}
83+
m_Offset: {x: 0, y: 0}
84+
- unity_Lightmaps:
85+
m_Texture: {fileID: 0}
86+
m_Scale: {x: 1, y: 1}
87+
m_Offset: {x: 0, y: 0}
88+
- unity_LightmapsInd:
89+
m_Texture: {fileID: 0}
90+
m_Scale: {x: 1, y: 1}
91+
m_Offset: {x: 0, y: 0}
92+
- unity_ShadowMasks:
93+
m_Texture: {fileID: 0}
94+
m_Scale: {x: 1, y: 1}
95+
m_Offset: {x: 0, y: 0}
96+
m_Ints: []
97+
m_Floats:
98+
- _AlphaClip: 0
99+
- _AlphaToMask: 0
100+
- _Blend: 0
101+
- _BlendModePreserveSpecular: 1
102+
- _BumpScale: 1
103+
- _ClearCoatMask: 0
104+
- _ClearCoatSmoothness: 0
105+
- _Cull: 2
106+
- _Cutoff: 0.5
107+
- _DetailAlbedoMapScale: 1
108+
- _DetailNormalMapScale: 1
109+
- _DstBlend: 0
110+
- _DstBlendAlpha: 0
111+
- _EnvironmentReflections: 1
112+
- _GlossMapScale: 0
113+
- _Glossiness: 0
114+
- _GlossyReflections: 0
115+
- _Metallic: 0
116+
- _OcclusionStrength: 1
117+
- _Parallax: 0.005
118+
- _QueueOffset: 0
119+
- _ReceiveShadows: 1
120+
- _Smoothness: 0.5
121+
- _SmoothnessTextureChannel: 0
122+
- _SpecularHighlights: 1
123+
- _SrcBlend: 1
124+
- _SrcBlendAlpha: 1
125+
- _Surface: 0
126+
- _WorkflowMode: 1
127+
- _ZWrite: 1
128+
m_Colors:
129+
- _BaseColor: {r: 0, g: 0, b: 0, a: 1}
130+
- _Color: {r: 0, g: 0, b: 0, a: 1}
131+
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
132+
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
133+
m_BuildTextureStacks: []

‎UnityProjekte/Base Project/Assets/Materials/BaseMaterial/ButtonMaterial.mat.meta

+8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎UnityProjekte/Base Project/Assets/Materials/BaseMaterial/GlassMaterial.mat

+134
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,134 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!114 &-4911049799335796789
4+
MonoBehaviour:
5+
m_ObjectHideFlags: 11
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
m_GameObject: {fileID: 0}
10+
m_Enabled: 1
11+
m_EditorHideFlags: 0
12+
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
13+
m_Name:
14+
m_EditorClassIdentifier:
15+
version: 7
16+
--- !u!21 &2100000
17+
Material:
18+
serializedVersion: 8
19+
m_ObjectHideFlags: 0
20+
m_CorrespondingSourceObject: {fileID: 0}
21+
m_PrefabInstance: {fileID: 0}
22+
m_PrefabAsset: {fileID: 0}
23+
m_Name: GlassMaterial
24+
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
25+
m_Parent: {fileID: 0}
26+
m_ModifiedSerializedProperties: 0
27+
m_ValidKeywords:
28+
- _SPECULAR_SETUP
29+
m_InvalidKeywords: []
30+
m_LightmapFlags: 4
31+
m_EnableInstancingVariants: 0
32+
m_DoubleSidedGI: 0
33+
m_CustomRenderQueue: 2000
34+
stringTagMap:
35+
RenderType: Opaque
36+
disabledShaderPasses: []
37+
m_LockedProperties:
38+
m_SavedProperties:
39+
serializedVersion: 3
40+
m_TexEnvs:
41+
- _BaseMap:
42+
m_Texture: {fileID: 0}
43+
m_Scale: {x: 1, y: 1}
44+
m_Offset: {x: 0, y: 0}
45+
- _BumpMap:
46+
m_Texture: {fileID: 0}
47+
m_Scale: {x: 1, y: 1}
48+
m_Offset: {x: 0, y: 0}
49+
- _DetailAlbedoMap:
50+
m_Texture: {fileID: 0}
51+
m_Scale: {x: 1, y: 1}
52+
m_Offset: {x: 0, y: 0}
53+
- _DetailMask:
54+
m_Texture: {fileID: 0}
55+
m_Scale: {x: 1, y: 1}
56+
m_Offset: {x: 0, y: 0}
57+
- _DetailNormalMap:
58+
m_Texture: {fileID: 0}
59+
m_Scale: {x: 1, y: 1}
60+
m_Offset: {x: 0, y: 0}
61+
- _EmissionMap:
62+
m_Texture: {fileID: 0}
63+
m_Scale: {x: 1, y: 1}
64+
m_Offset: {x: 0, y: 0}
65+
- _MainTex:
66+
m_Texture: {fileID: 0}
67+
m_Scale: {x: 1, y: 1}
68+
m_Offset: {x: 0, y: 0}
69+
- _MetallicGlossMap:
70+
m_Texture: {fileID: 0}
71+
m_Scale: {x: 1, y: 1}
72+
m_Offset: {x: 0, y: 0}
73+
- _OcclusionMap:
74+
m_Texture: {fileID: 0}
75+
m_Scale: {x: 1, y: 1}
76+
m_Offset: {x: 0, y: 0}
77+
- _ParallaxMap:
78+
m_Texture: {fileID: 0}
79+
m_Scale: {x: 1, y: 1}
80+
m_Offset: {x: 0, y: 0}
81+
- _SpecGlossMap:
82+
m_Texture: {fileID: 0}
83+
m_Scale: {x: 1, y: 1}
84+
m_Offset: {x: 0, y: 0}
85+
- unity_Lightmaps:
86+
m_Texture: {fileID: 0}
87+
m_Scale: {x: 1, y: 1}
88+
m_Offset: {x: 0, y: 0}
89+
- unity_LightmapsInd:
90+
m_Texture: {fileID: 0}
91+
m_Scale: {x: 1, y: 1}
92+
m_Offset: {x: 0, y: 0}
93+
- unity_ShadowMasks:
94+
m_Texture: {fileID: 0}
95+
m_Scale: {x: 1, y: 1}
96+
m_Offset: {x: 0, y: 0}
97+
m_Ints: []
98+
m_Floats:
99+
- _AlphaClip: 0
100+
- _AlphaToMask: 0
101+
- _Blend: 0
102+
- _BlendModePreserveSpecular: 1
103+
- _BumpScale: 1
104+
- _ClearCoatMask: 0
105+
- _ClearCoatSmoothness: 0
106+
- _Cull: 2
107+
- _Cutoff: 0.5
108+
- _DetailAlbedoMapScale: 1
109+
- _DetailNormalMapScale: 1
110+
- _DstBlend: 0
111+
- _DstBlendAlpha: 0
112+
- _EnvironmentReflections: 1
113+
- _GlossMapScale: 0
114+
- _Glossiness: 0
115+
- _GlossyReflections: 0
116+
- _Metallic: 0
117+
- _OcclusionStrength: 1
118+
- _Parallax: 0.005
119+
- _QueueOffset: 0
120+
- _ReceiveShadows: 1
121+
- _Smoothness: 0.5
122+
- _SmoothnessTextureChannel: 0
123+
- _SpecularHighlights: 1
124+
- _SrcBlend: 1
125+
- _SrcBlendAlpha: 1
126+
- _Surface: 0
127+
- _WorkflowMode: 0
128+
- _ZWrite: 1
129+
m_Colors:
130+
- _BaseColor: {r: 0, g: 0, b: 0, a: 0.84313726}
131+
- _Color: {r: 0, g: 0, b: 0, a: 0.84313726}
132+
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
133+
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
134+
m_BuildTextureStacks: []

‎UnityProjekte/Base Project/Assets/Materials/BaseMaterial/GlassMaterial.mat.meta

+8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)