Skip to content

Commit 34e8bd7

Browse files
TomDotScottTomDotScott
committed
Level tweaks
Lighting was tweaked on the levels, the terrain now surrounds the course. Picks ups now emit light, making them easier to see
1 parent 3e89632 commit 34e8bd7

File tree

168 files changed

+1313
-1226
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

168 files changed

+1313
-1226
lines changed

‎Assets/Animations/CreditTemp.anim‎

Lines changed: 67 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ AnimationClip:
3131
outWeight: 0.33333334
3232
- serializedVersion: 3
3333
time: 1
34-
value: -110
34+
value: -55
3535
inSlope: 0
3636
outSlope: 0
3737
tangentMode: 136
@@ -115,7 +115,7 @@ AnimationClip:
115115
outWeight: 0.33333334
116116
- serializedVersion: 3
117117
time: 1
118-
value: 110
118+
value: 67.399994
119119
inSlope: 0
120120
outSlope: 0
121121
tangentMode: 136
@@ -166,6 +166,34 @@ AnimationClip:
166166
path: Button/Text (TMP)
167167
classID: 114
168168
script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
169+
- curve:
170+
serializedVersion: 2
171+
m_Curve:
172+
- serializedVersion: 3
173+
time: 0
174+
value: 0.049999
175+
inSlope: 0
176+
outSlope: 0
177+
tangentMode: 136
178+
weightedMode: 0
179+
inWeight: 0.33333334
180+
outWeight: 0.33333334
181+
- serializedVersion: 3
182+
time: 1
183+
value: 0.049999
184+
inSlope: 0
185+
outSlope: 0
186+
tangentMode: 136
187+
weightedMode: 0
188+
inWeight: 0.33333334
189+
outWeight: 0.33333334
190+
m_PreInfinity: 2
191+
m_PostInfinity: 2
192+
m_RotationOrder: 4
193+
attribute: m_AnchoredPosition.x
194+
path: Logo
195+
classID: 224
196+
script: {fileID: 0}
169197
m_PPtrCurves: []
170198
m_SampleRate: 60
171199
m_WrapMode: 0
@@ -209,6 +237,13 @@ AnimationClip:
209237
typeID: 114
210238
customType: 0
211239
isPPtrCurve: 0
240+
- serializedVersion: 2
241+
path: 1153185069
242+
attribute: 1460864421
243+
script: {fileID: 0}
244+
typeID: 224
245+
customType: 28
246+
isPPtrCurve: 0
212247
pptrCurveMapping: []
213248
m_AnimationClipSettings:
214249
serializedVersion: 2
@@ -245,7 +280,7 @@ AnimationClip:
245280
outWeight: 0.33333334
246281
- serializedVersion: 3
247282
time: 1
248-
value: -110
283+
value: -55
249284
inSlope: 0
250285
outSlope: 0
251286
tangentMode: 136
@@ -329,7 +364,7 @@ AnimationClip:
329364
outWeight: 0.33333334
330365
- serializedVersion: 3
331366
time: 1
332-
value: 110
367+
value: 67.399994
333368
inSlope: 0
334369
outSlope: 0
335370
tangentMode: 136
@@ -380,6 +415,34 @@ AnimationClip:
380415
path: Button/Text (TMP)
381416
classID: 114
382417
script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
418+
- curve:
419+
serializedVersion: 2
420+
m_Curve:
421+
- serializedVersion: 3
422+
time: 0
423+
value: 0.049999
424+
inSlope: 0
425+
outSlope: 0
426+
tangentMode: 136
427+
weightedMode: 0
428+
inWeight: 0.33333334
429+
outWeight: 0.33333334
430+
- serializedVersion: 3
431+
time: 1
432+
value: 0.049999
433+
inSlope: 0
434+
outSlope: 0
435+
tangentMode: 136
436+
weightedMode: 0
437+
inWeight: 0.33333334
438+
outWeight: 0.33333334
439+
m_PreInfinity: 2
440+
m_PostInfinity: 2
441+
m_RotationOrder: 4
442+
attribute: m_AnchoredPosition.x
443+
path: Logo
444+
classID: 224
445+
script: {fileID: 0}
383446
m_EulerEditorCurves: []
384447
m_HasGenericRootTransform: 0
385448
m_HasMotionFloatCurves: 0

‎Assets/Materials/Pick-Ups/Blue.mat‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ Material:
99
m_PrefabAsset: {fileID: 0}
1010
m_Name: Blue
1111
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
12-
m_ShaderKeywords:
13-
m_LightmapFlags: 4
12+
m_ShaderKeywords: _EMISSION
13+
m_LightmapFlags: 2
1414
m_EnableInstancingVariants: 0
1515
m_DoubleSidedGI: 0
1616
m_CustomRenderQueue: -1
@@ -73,5 +73,5 @@ Material:
7373
- _UVSec: 0
7474
- _ZWrite: 1
7575
m_Colors:
76-
- _Color: {r: 0, g: 0, b: 1, a: 1}
77-
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
76+
- _Color: {r: 1, g: 1, b: 1, a: 1}
77+
- _EmissionColor: {r: 0, g: 0, b: 4, a: 1}

‎Assets/Materials/Pick-Ups/Green.mat‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ Material:
99
m_PrefabAsset: {fileID: 0}
1010
m_Name: Green
1111
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
12-
m_ShaderKeywords:
13-
m_LightmapFlags: 4
12+
m_ShaderKeywords: _EMISSION
13+
m_LightmapFlags: 2
1414
m_EnableInstancingVariants: 0
1515
m_DoubleSidedGI: 0
1616
m_CustomRenderQueue: -1
@@ -73,5 +73,5 @@ Material:
7373
- _UVSec: 0
7474
- _ZWrite: 1
7575
m_Colors:
76-
- _Color: {r: 0.018781245, g: 0.5, b: 0, a: 1}
77-
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
76+
- _Color: {r: 1, g: 1, b: 1, a: 1}
77+
- _EmissionColor: {r: 0.03137255, g: 0.29411766, b: 0, a: 1}

‎Assets/Materials/Pick-Ups/Pink.mat‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ Material:
99
m_PrefabAsset: {fileID: 0}
1010
m_Name: Pink
1111
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
12-
m_ShaderKeywords:
13-
m_LightmapFlags: 4
12+
m_ShaderKeywords: _EMISSION
13+
m_LightmapFlags: 2
1414
m_EnableInstancingVariants: 0
1515
m_DoubleSidedGI: 0
1616
m_CustomRenderQueue: -1
@@ -73,5 +73,5 @@ Material:
7373
- _UVSec: 0
7474
- _ZWrite: 1
7575
m_Colors:
76-
- _Color: {r: 1, g: 0, b: 0.9423084, a: 1}
77-
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
76+
- _Color: {r: 1, g: 1, b: 1, a: 1}
77+
- _EmissionColor: {r: 0.7490196, g: 0, b: 0.5647059, a: 1}

‎Assets/Materials/Pick-Ups/Pocket-Watch.mat‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ Material:
99
m_PrefabAsset: {fileID: 0}
1010
m_Name: Pocket-Watch
1111
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
12-
m_ShaderKeywords: _ALPHAPREMULTIPLY_ON _METALLICGLOSSMAP _NORMALMAP
13-
m_LightmapFlags: 4
12+
m_ShaderKeywords: _ALPHAPREMULTIPLY_ON _EMISSION _METALLICGLOSSMAP _NORMALMAP
13+
m_LightmapFlags: 2
1414
m_EnableInstancingVariants: 0
1515
m_DoubleSidedGI: 0
1616
m_CustomRenderQueue: 3000
@@ -75,4 +75,4 @@ Material:
7575
- _ZWrite: 0
7676
m_Colors:
7777
- _Color: {r: 1, g: 1, b: 1, a: 1}
78-
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
78+
- _EmissionColor: {r: 0.125, g: 0.125, b: 0.125, a: 1}

‎Assets/Materials/Pick-Ups/Red.mat‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ Material:
99
m_PrefabAsset: {fileID: 0}
1010
m_Name: Red
1111
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
12-
m_ShaderKeywords:
13-
m_LightmapFlags: 4
12+
m_ShaderKeywords: _EMISSION
13+
m_LightmapFlags: 2
1414
m_EnableInstancingVariants: 0
1515
m_DoubleSidedGI: 0
1616
m_CustomRenderQueue: -1
@@ -73,5 +73,5 @@ Material:
7373
- _UVSec: 0
7474
- _ZWrite: 1
7575
m_Colors:
76-
- _Color: {r: 1, g: 0, b: 0, a: 1}
77-
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
76+
- _Color: {r: 1, g: 1, b: 1, a: 1}
77+
- _EmissionColor: {r: 4, g: 0, b: 0, a: 1}

‎Assets/Materials/Pick-Ups/Teapot.mat‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ Material:
99
m_PrefabAsset: {fileID: 0}
1010
m_Name: Teapot
1111
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
12-
m_ShaderKeywords: _NORMALMAP _PARALLAXMAP
13-
m_LightmapFlags: 4
12+
m_ShaderKeywords: _EMISSION _NORMALMAP _PARALLAXMAP
13+
m_LightmapFlags: 2
1414
m_EnableInstancingVariants: 0
1515
m_DoubleSidedGI: 0
1616
m_CustomRenderQueue: -1
@@ -74,4 +74,4 @@ Material:
7474
- _ZWrite: 1
7575
m_Colors:
7676
- _Color: {r: 1, g: 1, b: 1, a: 1}
77-
- _EmissionColor: {r: 0.46226418, g: 0.46226418, b: 0.46226418, a: 1}
77+
- _EmissionColor: {r: 0, g: 0.4, b: 0.5, a: 1}

‎Assets/Materials/Pick-Ups/White.mat‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ Material:
99
m_PrefabAsset: {fileID: 0}
1010
m_Name: White
1111
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
12-
m_ShaderKeywords:
13-
m_LightmapFlags: 4
12+
m_ShaderKeywords: _EMISSION
13+
m_LightmapFlags: 2
1414
m_EnableInstancingVariants: 0
1515
m_DoubleSidedGI: 0
1616
m_CustomRenderQueue: -1
@@ -74,4 +74,4 @@ Material:
7474
- _ZWrite: 1
7575
m_Colors:
7676
- _Color: {r: 1, g: 1, b: 1, a: 1}
77-
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
77+
- _EmissionColor: {r: 0.9999999, g: 0.9999999, b: 0.9999999, a: 1}

‎Assets/Materials/Pick-Ups/Yellow.mat‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ Material:
99
m_PrefabAsset: {fileID: 0}
1010
m_Name: Yellow
1111
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
12-
m_ShaderKeywords:
13-
m_LightmapFlags: 4
12+
m_ShaderKeywords: _EMISSION
13+
m_LightmapFlags: 2
1414
m_EnableInstancingVariants: 0
1515
m_DoubleSidedGI: 0
1616
m_CustomRenderQueue: -1
@@ -73,5 +73,5 @@ Material:
7373
- _UVSec: 0
7474
- _ZWrite: 1
7575
m_Colors:
76-
- _Color: {r: 0.90465856, g: 1, b: 0, a: 1}
77-
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
76+
- _Color: {r: 1, g: 1, b: 1, a: 1}
77+
- _EmissionColor: {r: 1.9137255, g: 2, b: 0, a: 1}

‎Assets/Prefabs/PickUps/Cheshire.prefab‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ PrefabInstance:
137137
type: 3}
138138
propertyPath: m_Materials.Array.data[0]
139139
value:
140-
objectReference: {fileID: 2100000, guid: 72e0e83bf37bc0d47b103a91d5d012d7, type: 2}
140+
objectReference: {fileID: 2100000, guid: 60f85e564e2567f4e8bbe9e7a2275bad, type: 2}
141141
m_RemovedComponents: []
142142
m_SourcePrefab: {fileID: 100100000, guid: 8aff45a6fe64ad644a297c3e5450457b, type: 3}
143143
--- !u!4 &8137306341241917512 stripped
@@ -457,7 +457,7 @@ PrefabInstance:
457457
type: 3}
458458
propertyPath: m_Materials.Array.data[0]
459459
value:
460-
objectReference: {fileID: 2100000, guid: 60f85e564e2567f4e8bbe9e7a2275bad, type: 2}
460+
objectReference: {fileID: 2100000, guid: 72e0e83bf37bc0d47b103a91d5d012d7, type: 2}
461461
m_RemovedComponents: []
462462
m_SourcePrefab: {fileID: 100100000, guid: 2235a2ee69aa1064da4a7dc79a3020d4, type: 3}
463463
--- !u!4 &8137306342530023710 stripped

0 commit comments

Comments
 (0)