Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Tommé Nöll
seedling
Commits
33eac013
Commit
33eac013
authored
Jun 29, 2019
by
Tommé Nöll
Browse files
Merge branch 'tomme'
parents
b65103d6
621309e0
Changes
5
Hide whitespace changes
Inline
Side-by-side
Assets/Audio/AudioMixer.mixer
View file @
33eac013
...
...
@@ -109,6 +109,7 @@ AudioMixerSnapshotController:
m_AudioMixer
:
{
fileID
:
24100000
}
m_SnapshotID
:
e35afdc169f23856985257d5d8407839
m_FloatValues
:
62d4a408f19d9ccca93c0f8d930d313a
:
-6.556618
a98134e8e944cd69bb556954408855b5
:
0
m_TransitionOverrides
:
{}
---
!u!244
&1340513398732023173
...
...
Assets/Audio/Music/.gitkeep
deleted
100644 → 0
View file @
b65103d6
Assets/Audio/Music/Tutorial.mp3
0 → 100644
LFS
View file @
33eac013
File added
Assets/Audio/Music/Tutorial.mp3.meta
0 → 100644
View file @
33eac013
fileFormatVersion: 2
guid: 99bfc60558e1ad300a5b0add036c0765
AudioImporter:
externalObjects: {}
serializedVersion: 6
defaultSettings:
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
preloadAudioData: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:
Assets/Prefabs/MainCamera.prefab
View file @
33eac013
...
...
@@ -104,6 +104,7 @@ GameObject:
-
component
:
{
fileID
:
8811539149977030264
}
-
component
:
{
fileID
:
8811539149977030271
}
-
component
:
{
fileID
:
4797791628540356424
}
-
component
:
{
fileID
:
5104620888276671122
}
m_Layer
:
0
m_Name
:
MainCamera
m_TagString
:
MainCamera
...
...
@@ -241,3 +242,100 @@ MonoBehaviour:
lookaheadDelay
:
1
lookAheadSpeedMultiplier
:
1
minSpeed
:
0.05
---
!u!82
&5104620888276671122
AudioSource
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
8811539149977030262
}
m_Enabled
:
1
serializedVersion
:
4
OutputAudioMixerGroup
:
{
fileID
:
-3742625869990079855
,
guid
:
695b0927dcbd31e0bacecbafd1c34b15
,
type
:
2
}
m_audioClip
:
{
fileID
:
8300000
,
guid
:
99bfc60558e1ad300a5b0add036c0765
,
type
:
3
}
m_PlayOnAwake
:
1
m_Volume
:
1
m_Pitch
:
1
Loop
:
1
Mute
:
0
Spatialize
:
0
SpatializePostEffects
:
0
Priority
:
128
DopplerLevel
:
1
MinDistance
:
1
MaxDistance
:
500
Pan2D
:
0
rolloffMode
:
0
BypassEffects
:
0
BypassListenerEffects
:
0
BypassReverbZones
:
0
rolloffCustomCurve
:
serializedVersion
:
2
m_Curve
:
-
serializedVersion
:
3
time
:
0
value
:
1
inSlope
:
0
outSlope
:
0
tangentMode
:
0
weightedMode
:
0
inWeight
:
0.33333334
outWeight
:
0.33333334
-
serializedVersion
:
3
time
:
1
value
:
0
inSlope
:
0
outSlope
:
0
tangentMode
:
0
weightedMode
:
0
inWeight
:
0.33333334
outWeight
:
0.33333334
m_PreInfinity
:
2
m_PostInfinity
:
2
m_RotationOrder
:
4
panLevelCustomCurve
:
serializedVersion
:
2
m_Curve
:
-
serializedVersion
:
3
time
:
0
value
:
0
inSlope
:
0
outSlope
:
0
tangentMode
:
0
weightedMode
:
0
inWeight
:
0.33333334
outWeight
:
0.33333334
m_PreInfinity
:
2
m_PostInfinity
:
2
m_RotationOrder
:
4
spreadCustomCurve
:
serializedVersion
:
2
m_Curve
:
-
serializedVersion
:
3
time
:
0
value
:
0
inSlope
:
0
outSlope
:
0
tangentMode
:
0
weightedMode
:
0
inWeight
:
0.33333334
outWeight
:
0.33333334
m_PreInfinity
:
2
m_PostInfinity
:
2
m_RotationOrder
:
4
reverbZoneMixCustomCurve
:
serializedVersion
:
2
m_Curve
:
-
serializedVersion
:
3
time
:
0
value
:
1
inSlope
:
0
outSlope
:
0
tangentMode
:
0
weightedMode
:
0
inWeight
:
0.33333334
outWeight
:
0.33333334
m_PreInfinity
:
2
m_PostInfinity
:
2
m_RotationOrder
:
4
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment