Commit 366cbe9f authored by Patrick Stengel's avatar Patrick Stengel
Browse files

Merge branch 'master' of...

Merge branch 'master' of gitlab.fsi.hochschule-trier.de:GameDevWeek/sommersemester-2019/unity/touch-me-if-you-can

 Conflicts:
	Assets/ShowCountdown.cs
parents 8586460e 5ebca023
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &-8503349478240661923
MonoBehaviour:
m_ObjectHideFlags: 3
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 6050e2d5de785ce4d931e4dbdbf2d755, type: 3}
m_Name: ChromaticAberration
m_EditorClassIdentifier:
active: 1
enabled:
overrideState: 1
value: 1
spectralLut:
overrideState: 1
value: {fileID: 0}
defaultState: 1
intensity:
overrideState: 1
value: 0.1
fastMode:
overrideState: 1
value: 0
--- !u!114 &-8260587101971785202
MonoBehaviour:
m_ObjectHideFlags: 3
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 48a79b01ea5641d4aa6daa2e23605641, type: 3}
m_Name: Bloom
m_EditorClassIdentifier:
active: 1
enabled:
overrideState: 1
value: 1
intensity:
overrideState: 1
value: 10.91
threshold:
overrideState: 1
value: 1
softKnee:
overrideState: 1
value: 0.5
clamp:
overrideState: 1
value: 65472
diffusion:
overrideState: 1
value: 7
anamorphicRatio:
overrideState: 1
value: 0
color:
overrideState: 1
value: {r: 1, g: 1, b: 1, a: 1}
fastMode:
overrideState: 1
value: 0
dirtTexture:
overrideState: 1
value: {fileID: 0}
defaultState: 1
dirtIntensity:
overrideState: 1
value: 0
--- !u!114 &-7235912126903520488
MonoBehaviour:
m_ObjectHideFlags: 3
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: adb84e30e02715445aeb9959894e3b4d, type: 3}
m_Name: ColorGrading
m_EditorClassIdentifier:
active: 1
enabled:
overrideState: 1
value: 1
gradingMode:
overrideState: 1
value: 1
externalLut:
overrideState: 1
value: {fileID: 11700000, guid: 225ffd6d3a3b7444b8cb31318b595ef2, type: 2}
defaultState: 1
tonemapper:
overrideState: 1
value: 2
toneCurveToeStrength:
overrideState: 1
value: 0
toneCurveToeLength:
overrideState: 1
value: 0.5
toneCurveShoulderStrength:
overrideState: 1
value: 0
toneCurveShoulderLength:
overrideState: 1
value: 0.5
toneCurveShoulderAngle:
overrideState: 1
value: 0
toneCurveGamma:
overrideState: 1
value: 1
ldrLut:
overrideState: 1
value: {fileID: 11700000, guid: 225ffd6d3a3b7444b8cb31318b595ef2, type: 2}
defaultState: 4
ldrLutContribution:
overrideState: 1
value: 1
temperature:
overrideState: 1
value: 0
tint:
overrideState: 1
value: 0
colorFilter:
overrideState: 1
value: {r: 1, g: 1, b: 1, a: 1}
hueShift:
overrideState: 1
value: 0
saturation:
overrideState: 1
value: 0
brightness:
overrideState: 1
value: 0
postExposure:
overrideState: 1
value: 0
contrast:
overrideState: 1
value: 0
mixerRedOutRedIn:
overrideState: 1
value: 100
mixerRedOutGreenIn:
overrideState: 1
value: 0
mixerRedOutBlueIn:
overrideState: 1
value: 0
mixerGreenOutRedIn:
overrideState: 1
value: 0
mixerGreenOutGreenIn:
overrideState: 1
value: 100
mixerGreenOutBlueIn:
overrideState: 1
value: 0
mixerBlueOutRedIn:
overrideState: 1
value: 0
mixerBlueOutGreenIn:
overrideState: 1
value: 0
mixerBlueOutBlueIn:
overrideState: 1
value: 100
lift:
overrideState: 1
value: {x: 1, y: 1, z: 1, w: 0}
gamma:
overrideState: 1
value: {x: 1, y: 1, z: 1, w: 0}
gain:
overrideState: 1
value: {x: 1, y: 1, z: 1, w: 0}
masterCurve:
overrideState: 1
value:
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 1
outSlope: 1
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 1
value: 1
inSlope: 1
outSlope: 1
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
m_Loop: 0
m_ZeroValue: 0
m_Range: 1
cachedData:
- 0
- 0.0078125
- 0.015625
- 0.0234375
- 0.03125
- 0.0390625
- 0.046875
- 0.0546875
- 0.0625
- 0.0703125
- 0.078125
- 0.0859375
- 0.09375
- 0.1015625
- 0.109375
- 0.1171875
- 0.125
- 0.1328125
- 0.140625
- 0.1484375
- 0.15625
- 0.1640625
- 0.171875
- 0.1796875
- 0.1875
- 0.1953125
- 0.203125
- 0.2109375
- 0.21875
- 0.2265625
- 0.234375
- 0.2421875
- 0.25
- 0.2578125
- 0.265625
- 0.2734375
- 0.28125
- 0.2890625
- 0.296875
- 0.3046875
- 0.3125
- 0.3203125
- 0.328125
- 0.3359375
- 0.34375
- 0.3515625
- 0.359375
- 0.3671875
- 0.375
- 0.3828125
- 0.390625
- 0.3984375
- 0.40625
- 0.4140625
- 0.421875
- 0.4296875
- 0.4375
- 0.4453125
- 0.453125
- 0.4609375
- 0.46875
- 0.4765625
- 0.484375
- 0.4921875
- 0.5
- 0.5078125
- 0.515625
- 0.5234375
- 0.53125
- 0.5390625
- 0.546875
- 0.5546875
- 0.5625
- 0.5703125
- 0.578125
- 0.5859375
- 0.59375
- 0.6015625
- 0.609375
- 0.6171875
- 0.625
- 0.6328125
- 0.640625
- 0.6484375
- 0.65625
- 0.6640625
- 0.671875
- 0.6796875
- 0.6875
- 0.6953125
- 0.703125
- 0.7109375
- 0.71875
- 0.7265625
- 0.734375
- 0.7421875
- 0.75
- 0.7578125
- 0.765625
- 0.7734375
- 0.78125
- 0.7890625
- 0.796875
- 0.8046875
- 0.8125
- 0.8203125
- 0.828125
- 0.8359375
- 0.84375
- 0.8515625
- 0.859375
- 0.8671875
- 0.875
- 0.8828125
- 0.890625
- 0.8984375
- 0.90625
- 0.9140625
- 0.921875
- 0.9296875
- 0.9375
- 0.9453125
- 0.953125
- 0.9609375
- 0.96875
- 0.9765625
- 0.984375
- 0.9921875
redCurve:
overrideState: 1
value:
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 1
outSlope: 1
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 1
value: 1
inSlope: 1
outSlope: 1
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
m_Loop: 0
m_ZeroValue: 0
m_Range: 1
cachedData:
- 0
- 0.0078125
- 0.015625
- 0.0234375
- 0.03125
- 0.0390625
- 0.046875
- 0.0546875
- 0.0625
- 0.0703125
- 0.078125
- 0.0859375
- 0.09375
- 0.1015625
- 0.109375
- 0.1171875
- 0.125
- 0.1328125
- 0.140625
- 0.1484375
- 0.15625
- 0.1640625
- 0.171875
- 0.1796875
- 0.1875
- 0.1953125
- 0.203125
- 0.2109375
- 0.21875
- 0.2265625
- 0.234375
- 0.2421875
- 0.25
- 0.2578125
- 0.265625
- 0.2734375
- 0.28125
- 0.2890625
- 0.296875
- 0.3046875
- 0.3125
- 0.3203125
- 0.328125
- 0.3359375
- 0.34375
- 0.3515625
- 0.359375
- 0.3671875
- 0.375
- 0.3828125
- 0.390625
- 0.3984375
- 0.40625
- 0.4140625
- 0.421875
- 0.4296875
- 0.4375
- 0.4453125
- 0.453125
- 0.4609375
- 0.46875
- 0.4765625
- 0.484375
- 0.4921875
- 0.5
- 0.5078125
- 0.515625
- 0.5234375
- 0.53125
- 0.5390625
- 0.546875
- 0.5546875
- 0.5625
- 0.5703125
- 0.578125
- 0.5859375
- 0.59375
- 0.6015625
- 0.609375
- 0.6171875
- 0.625
- 0.6328125
- 0.640625
- 0.6484375
- 0.65625
- 0.6640625
- 0.671875
- 0.6796875
- 0.6875
- 0.6953125
- 0.703125
- 0.7109375
- 0.71875
- 0.7265625
- 0.734375
- 0.7421875
- 0.75
- 0.7578125
- 0.765625
- 0.7734375
- 0.78125
- 0.7890625
- 0.796875
- 0.8046875
- 0.8125
- 0.8203125
- 0.828125
- 0.8359375
- 0.84375
- 0.8515625
- 0.859375
- 0.8671875
- 0.875
- 0.8828125
- 0.890625
- 0.8984375
- 0.90625
- 0.9140625
- 0.921875
- 0.9296875
- 0.9375
- 0.9453125
- 0.953125
- 0.9609375
- 0.96875
- 0.9765625
- 0.984375
- 0.9921875
greenCurve:
overrideState: 1
value:
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 1
outSlope: 1
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 1
value: 1
inSlope: 1
outSlope: 1
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
m_Loop: 0
m_ZeroValue: 0
m_Range: 1
cachedData:
- 0
- 0.0078125
- 0.015625
- 0.0234375
- 0.03125
- 0.0390625
- 0.046875
- 0.0546875
- 0.0625
- 0.0703125
- 0.078125
- 0.0859375
- 0.09375
- 0.1015625
- 0.109375
- 0.1171875
- 0.125
- 0.1328125
- 0.140625
- 0.1484375
- 0.15625
- 0.1640625
- 0.171875
- 0.1796875
- 0.1875
- 0.1953125
- 0.203125
- 0.2109375
- 0.21875
- 0.2265625
- 0.234375
- 0.2421875
- 0.25
- 0.2578125
- 0.265625
- 0.2734375
- 0.28125
- 0.2890625
- 0.296875
- 0.3046875
- 0.3125
- 0.3203125
- 0.328125
- 0.3359375
- 0.34375
- 0.3515625
- 0.359375
- 0.3671875
- 0.375
- 0.3828125
- 0.390625
- 0.3984375
- 0.40625
- 0.4140625
- 0.421875
- 0.4296875
- 0.4375
- 0.4453125
- 0.453125
- 0.4609375
- 0.46875
- 0.4765625
- 0.484375
- 0.4921875
- 0.5
- 0.5078125
- 0.515625
- 0.5234375
- 0.53125
- 0.5390625
- 0.546875
- 0.5546875
- 0.5625
- 0.5703125
- 0.578125
- 0.5859375
- 0.59375
- 0.6015625
- 0.609375
- 0.6171875
- 0.625
- 0.6328125