Merge remote-tracking branch 'origin/master'

master
kziolkowski 1 year ago
commit a21c62d362

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: c178a89c81342fc4e82da80e195bb40c
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

@ -0,0 +1,23 @@
fileFormatVersion: 2
guid: 3f2388fd9092ec54db0867af854f3ddc
AudioImporter:
externalObjects: {}
serializedVersion: 8
defaultSettings:
serializedVersion: 2
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
preloadAudioData: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:

@ -0,0 +1,23 @@
fileFormatVersion: 2
guid: 7fd4d7d4c196b614a806576ded7c65f7
AudioImporter:
externalObjects: {}
serializedVersion: 8
defaultSettings:
serializedVersion: 2
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
preloadAudioData: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:

@ -0,0 +1,23 @@
fileFormatVersion: 2
guid: b20b94d14475bd84dad4193e47c5a676
AudioImporter:
externalObjects: {}
serializedVersion: 8
defaultSettings:
serializedVersion: 2
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
preloadAudioData: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:

@ -0,0 +1,23 @@
fileFormatVersion: 2
guid: ce23d608d1b1b4a469428ae6b886c927
AudioImporter:
externalObjects: {}
serializedVersion: 8
defaultSettings:
serializedVersion: 2
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
preloadAudioData: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:

@ -0,0 +1,23 @@
fileFormatVersion: 2
guid: c6af98d673df7a74eb3aacd69d418b63
AudioImporter:
externalObjects: {}
serializedVersion: 8
defaultSettings:
serializedVersion: 2
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
preloadAudioData: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:

@ -0,0 +1,23 @@
fileFormatVersion: 2
guid: 2bf20ee4d8206954d81a68482cd172e1
AudioImporter:
externalObjects: {}
serializedVersion: 8
defaultSettings:
serializedVersion: 2
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
preloadAudioData: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:

@ -0,0 +1,173 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!243 &-6548704791784632310
AudioMixerGroupController:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: VoiceOver
m_AudioMixer: {fileID: 24100000}
m_GroupID: aa96260ec477f7740899ada8f9b0ad76
m_Children: []
m_Volume: cc20019be79b02a4faf473db47497224
m_Pitch: 1ee5826c11ce1b849aeb13bd4a98d25a
m_Send: 00000000000000000000000000000000
m_Effects:
- {fileID: -4346424194814832110}
m_UserColorIndex: 0
m_Mute: 0
m_Solo: 0
m_BypassEffects: 0
--- !u!244 &-4346424194814832110
AudioMixerEffectController:
m_ObjectHideFlags: 3
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_EffectID: 12a72b32b653ef64093eb4e304476032
m_EffectName: Attenuation
m_MixLevel: e6c17c354fc73c743998dae4f08f9abd
m_Parameters: []
m_SendTarget: {fileID: 0}
m_EnableWetMix: 0
m_Bypass: 0
--- !u!243 &-3401777377381156506
AudioMixerGroupController:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Sfx
m_AudioMixer: {fileID: 24100000}
m_GroupID: a3f3d5fc6ae1f22499eaf6aec71992f8
m_Children: []
m_Volume: 0232f2f055888a144841fc6b75195784
m_Pitch: 50604a08a1981bd449344f9a00006329
m_Send: 00000000000000000000000000000000
m_Effects:
- {fileID: -1773323688125748967}
m_UserColorIndex: 0
m_Mute: 0
m_Solo: 0
m_BypassEffects: 0
--- !u!244 &-1773323688125748967
AudioMixerEffectController:
m_ObjectHideFlags: 3
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_EffectID: 26907637a792f2d4db306225b2422efc
m_EffectName: Attenuation
m_MixLevel: e8e21c75cefac874f829e6887e2125d1
m_Parameters: []
m_SendTarget: {fileID: 0}
m_EnableWetMix: 0
m_Bypass: 0
--- !u!244 &-1511174567186661400
AudioMixerEffectController:
m_ObjectHideFlags: 3
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_EffectID: 7ca7d4c04b70c9b42befde0bb903d0c9
m_EffectName: Attenuation
m_MixLevel: d829019ef5ad2ad40ab3e57d024496ed
m_Parameters: []
m_SendTarget: {fileID: 0}
m_EnableWetMix: 0
m_Bypass: 0
--- !u!241 &24100000
AudioMixerController:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Main
m_OutputGroup: {fileID: 0}
m_MasterGroup: {fileID: 24300002}
m_Snapshots:
- {fileID: 24500006}
m_StartSnapshot: {fileID: 24500006}
m_SuspendThreshold: -80
m_EnableSuspend: 1
m_UpdateMode: 0
m_ExposedParameters: []
m_AudioMixerGroupViews:
- guids:
- 0e09fd0e6f111cd4f9a62d73db86eb16
- e93279eed732a7243baa97b292d90ac0
- aa96260ec477f7740899ada8f9b0ad76
- a3f3d5fc6ae1f22499eaf6aec71992f8
name: View
m_CurrentViewIndex: 0
m_TargetSnapshot: {fileID: 24500006}
--- !u!243 &24300002
AudioMixerGroupController:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Master
m_AudioMixer: {fileID: 24100000}
m_GroupID: 0e09fd0e6f111cd4f9a62d73db86eb16
m_Children:
- {fileID: 6485322140526855340}
- {fileID: -3401777377381156506}
- {fileID: -6548704791784632310}
m_Volume: f14e5f65b4e3773469870e1e23efa9e7
m_Pitch: f7bcfa59827f28845b853a8e73e425cf
m_Send: 00000000000000000000000000000000
m_Effects:
- {fileID: 24400004}
m_UserColorIndex: 0
m_Mute: 0
m_Solo: 0
m_BypassEffects: 0
--- !u!244 &24400004
AudioMixerEffectController:
m_ObjectHideFlags: 3
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_EffectID: 61ff7530d4159bc44b2e73b522c6c777
m_EffectName: Attenuation
m_MixLevel: 3103e6aac6b8d4549892925ad0749d35
m_Parameters: []
m_SendTarget: {fileID: 0}
m_EnableWetMix: 0
m_Bypass: 0
--- !u!245 &24500006
AudioMixerSnapshotController:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Snapshot
m_AudioMixer: {fileID: 24100000}
m_SnapshotID: 13333b49960512348b7a2815273ad462
m_FloatValues: {}
m_TransitionOverrides: {}
--- !u!243 &6485322140526855340
AudioMixerGroupController:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Music
m_AudioMixer: {fileID: 24100000}
m_GroupID: e93279eed732a7243baa97b292d90ac0
m_Children: []
m_Volume: 123b1d2824fdc9947a3f764c54ad0eeb
m_Pitch: 8ce58531b41d4504f819266ddba56d65
m_Send: 00000000000000000000000000000000
m_Effects:
- {fileID: -1511174567186661400}
m_UserColorIndex: 0
m_Mute: 0
m_Solo: 0
m_BypassEffects: 0

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: b3dfbc8ee81afe14a9ec0118d26b20b5
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 24100000
userData:
assetBundleName:
assetBundleVariant:

@ -140,8 +140,138 @@ Transform:
m_Children:
- {fileID: 7398008089674865407}
- {fileID: 750704102962528561}
- {fileID: 4532477003407849038}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &3582756679087629794
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1103152704566937700}
- component: {fileID: 3883742793837539861}
m_Layer: 0
m_Name: 3bausequenzmanicprofessor
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1103152704566937700
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3582756679087629794}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 4532477003407849038}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!82 &3883742793837539861
AudioSource:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3582756679087629794}
m_Enabled: 1
serializedVersion: 4
OutputAudioMixerGroup: {fileID: 6485322140526855340, guid: b3dfbc8ee81afe14a9ec0118d26b20b5, type: 2}
m_audioClip: {fileID: 8300000, guid: 7fd4d7d4c196b614a806576ded7c65f7, type: 3}
m_Resource: {fileID: 8300000, guid: 7fd4d7d4c196b614a806576ded7c65f7, type: 3}
m_PlayOnAwake: 0
m_Volume: 0.585
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
--- !u!1 &5461865636035163790
GameObject:
m_ObjectHideFlags: 0
@ -229,3 +359,719 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!1 &5709738041816507488
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5376524828143859780}
- component: {fileID: 8938631103334231204}
m_Layer: 0
m_Name: haus_anfang_cozyhahaVers4
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &5376524828143859780
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5709738041816507488}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 4532477003407849038}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!82 &8938631103334231204
AudioSource:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5709738041816507488}
m_Enabled: 1
serializedVersion: 4
OutputAudioMixerGroup: {fileID: 6485322140526855340, guid: b3dfbc8ee81afe14a9ec0118d26b20b5, type: 2}
m_audioClip: {fileID: 8300000, guid: 2bf20ee4d8206954d81a68482cd172e1, type: 3}
m_Resource: {fileID: 8300000, guid: 2bf20ee4d8206954d81a68482cd172e1, type: 3}
m_PlayOnAwake: 0
m_Volume: 0.585
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
--- !u!1 &5761055253021171526
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4514190580306803833}
- component: {fileID: 4014883759115944350}
m_Layer: 0
m_Name: 4turnaroundhund
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &4514190580306803833
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5761055253021171526}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 4532477003407849038}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!82 &4014883759115944350
AudioSource:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5761055253021171526}
m_Enabled: 1
serializedVersion: 4
OutputAudioMixerGroup: {fileID: 6485322140526855340, guid: b3dfbc8ee81afe14a9ec0118d26b20b5, type: 2}
m_audioClip: {fileID: 8300000, guid: b20b94d14475bd84dad4193e47c5a676, type: 3}
m_Resource: {fileID: 8300000, guid: b20b94d14475bd84dad4193e47c5a676, type: 3}
m_PlayOnAwake: 0
m_Volume: 0.585
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
--- !u!1 &7381075809907012201
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4887334437374614248}
- component: {fileID: 6776657506516768907}
m_Layer: 0
m_Name: 5hoffnungjeremylebt
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &4887334437374614248
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7381075809907012201}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 4532477003407849038}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!82 &6776657506516768907
AudioSource:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7381075809907012201}
m_Enabled: 1
serializedVersion: 4
OutputAudioMixerGroup: {fileID: 6485322140526855340, guid: b3dfbc8ee81afe14a9ec0118d26b20b5, type: 2}
m_audioClip: {fileID: 8300000, guid: ce23d608d1b1b4a469428ae6b886c927, type: 3}
m_Resource: {fileID: 8300000, guid: ce23d608d1b1b4a469428ae6b886c927, type: 3}
m_PlayOnAwake: 0
m_Volume: 0.585
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
--- !u!1 &7701060939039408064
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4532477003407849038}
- component: {fileID: 1245931258083189695}
- component: {fileID: 4726213464259086350}
m_Layer: 0
m_Name: MusicManager
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &4532477003407849038
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7701060939039408064}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 5376524828143859780}
- {fileID: 2076077472737354393}
- {fileID: 1103152704566937700}
- {fileID: 4514190580306803833}
- {fileID: 4887334437374614248}
- {fileID: 7002877005877400754}
m_Father: {fileID: 6534699924056499542}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1245931258083189695
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7701060939039408064}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3a80e8e583428c245b275b4d443ea8d9, type: 3}
m_Name:
m_EditorClassIdentifier:
_track: 1
_musicManager: {fileID: 4726213464259086350}
--- !u!114 &4726213464259086350
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7701060939039408064}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d105854c4ef8253498191cabbacf6202, type: 3}
m_Name:
m_EditorClassIdentifier:
_CozySource: {fileID: 8938631103334231204}
_AdditiveTrashSource: {fileID: 6494021137014325591}
_BuildingSource: {fileID: 3883742793837539861}
_TurnAroundSource: {fileID: 4014883759115944350}
_AdditiveJeremyLivesSource: {fileID: 6776657506516768907}
_FinaleBuildUpSource: {fileID: 2839346491306446173}
--- !u!1 &8231737236184289242
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2076077472737354393}
- component: {fileID: 6494021137014325591}
m_Layer: 0
m_Name: 2schrottplatz_als_overlay_fuer_hauscozy
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &2076077472737354393
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8231737236184289242}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 4532477003407849038}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!82 &6494021137014325591
AudioSource:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8231737236184289242}
m_Enabled: 1
serializedVersion: 4
OutputAudioMixerGroup: {fileID: 6485322140526855340, guid: b3dfbc8ee81afe14a9ec0118d26b20b5, type: 2}
m_audioClip: {fileID: 8300000, guid: 3f2388fd9092ec54db0867af854f3ddc, type: 3}
m_Resource: {fileID: 8300000, guid: 3f2388fd9092ec54db0867af854f3ddc, type: 3}
m_PlayOnAwake: 0
m_Volume: 0.585
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
--- !u!1 &8961537913259028911
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7002877005877400754}
- component: {fileID: 2839346491306446173}
m_Layer: 0
m_Name: 6jeremyboesecutzublackscreen
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &7002877005877400754
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8961537913259028911}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 4532477003407849038}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!82 &2839346491306446173
AudioSource:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8961537913259028911}
m_Enabled: 1
serializedVersion: 4
OutputAudioMixerGroup: {fileID: 6485322140526855340, guid: b3dfbc8ee81afe14a9ec0118d26b20b5, type: 2}
m_audioClip: {fileID: 8300000, guid: c6af98d673df7a74eb3aacd69d418b63, type: 3}
m_Resource: {fileID: 8300000, guid: c6af98d673df7a74eb3aacd69d418b63, type: 3}
m_PlayOnAwake: 0
m_Volume: 0.585
m_Pitch: 1
Loop: 0
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

@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.Serialization;
public class MusicManager : MonoBehaviour
{
@ -8,8 +9,8 @@ public class MusicManager : MonoBehaviour
{
None,
Cozy,
Trash,
TrashPlusBuilding,
CozyPlusTrash,
Building,
TurnAround,
TurnAroundPlusJeremyLives,
FinaleBuildUp,
@ -20,61 +21,113 @@ public class MusicManager : MonoBehaviour
[SerializeField]
private AudioSource _CozySource;
[FormerlySerializedAs("_TrashSource")]
[SerializeField]
private AudioSource _TrashSource;
private AudioSource _AdditiveTrashSource;
[FormerlySerializedAs("_AdditiveBuildingSource")]
[SerializeField]
private AudioSource _AdditiveBuildingSource;
private AudioSource _BuildingSource;
[SerializeField]
private AudioSource _TurnAroundSource;
[SerializeField]
private AudioSource _AdditiveJeremyLivesSource;
[SerializeField]
private AudioSource _FinaleBuildUpSource;
public void PlayMusic(Track track)
{
switch (track)
{
case Track.None:
break;
case Track.Cozy:
break;
case Track.Trash:
break;
case Track.TrashPlusBuilding:
break;
case Track.TurnAround:
break;
case Track.TurnAroundPlusJeremyLives:
break;
case Track.FinaleBuildUp:
break;
default:
throw new ArgumentOutOfRangeException(nameof(track), track, null);
}
currentTrack = track;
}
private void Update()
{
var fadeMultiplier = 0.2f;
if(currentTrack == Track.Cozy)
if (currentTrack is Track.CozyPlusTrash or Track.Cozy)
{
if (!_AdditiveTrashSource.isPlaying)
_AdditiveTrashSource.Play();
if(!_CozySource.isPlaying)
_CozySource.Play();
_CozySource.volume = Mathf.Clamp(_CozySource.volume + (fadeMultiplier * Time.deltaTime),0,1);
}
else
{
_CozySource.volume = Mathf.Clamp(_CozySource.volume - (fadeMultiplier * Time.deltaTime),0,1);
if(_CozySource.volume == 0 && _CozySource.isPlaying)
if (_AdditiveTrashSource.volume == 0 && _AdditiveTrashSource.isPlaying)
_AdditiveTrashSource.Stop();
if (_CozySource.volume == 0 && _CozySource.isPlaying)
_CozySource.Stop();
}
_AdditiveTrashSource.volume = currentTrack == Track.CozyPlusTrash ?
Mathf.Clamp(_AdditiveTrashSource.volume + (fadeMultiplier * Time.deltaTime), 0, 1) :
Mathf.Clamp(_AdditiveTrashSource.volume - (fadeMultiplier * Time.deltaTime), 0, 1);
_CozySource.volume = currentTrack is Track.CozyPlusTrash or Track.Cozy ?
Mathf.Clamp(_CozySource.volume + (fadeMultiplier * Time.deltaTime), 0, 1) :
Mathf.Clamp(_CozySource.volume - (fadeMultiplier * Time.deltaTime), 0, 1);
if(currentTrack == Track.Building)
{
if (!_BuildingSource.isPlaying)
_BuildingSource.Play();
_BuildingSource.volume = Mathf.Clamp(_BuildingSource.volume + (fadeMultiplier * Time.deltaTime), 0, 1);
}
else
{
_BuildingSource.volume = Mathf.Clamp(_BuildingSource.volume - (fadeMultiplier * Time.deltaTime), 0, 1);
if (_BuildingSource.volume == 0 && _BuildingSource.isPlaying)
_BuildingSource.Stop();
}
if (currentTrack is Track.TurnAround or Track.TurnAroundPlusJeremyLives)
{
if (!_TurnAroundSource.isPlaying)
_TurnAroundSource.Play();
if(!_AdditiveJeremyLivesSource.isPlaying)
_AdditiveJeremyLivesSource.Play();
}
else
{
if (_TurnAroundSource.volume == 0 && _TurnAroundSource.isPlaying)
_TurnAroundSource.Stop();
if (_AdditiveJeremyLivesSource.volume == 0 && _AdditiveJeremyLivesSource.isPlaying)
_AdditiveJeremyLivesSource.Stop();
}
_TurnAroundSource.volume = currentTrack == Track.TurnAround || currentTrack == Track.TurnAroundPlusJeremyLives ?
Mathf.Clamp(_TurnAroundSource.volume + (fadeMultiplier * Time.deltaTime), 0, 1) :
Mathf.Clamp(_TurnAroundSource.volume - (fadeMultiplier * Time.deltaTime), 0, 1);
_AdditiveJeremyLivesSource.volume = currentTrack == Track.TurnAroundPlusJeremyLives ?
Mathf.Clamp(_AdditiveJeremyLivesSource.volume + (fadeMultiplier * Time.deltaTime), 0, 1) :
Mathf.Clamp(_AdditiveJeremyLivesSource.volume - (fadeMultiplier * Time.deltaTime), 0, 1);
if(currentTrack == Track.FinaleBuildUp)
{
if (!_FinaleBuildUpSource.isPlaying)
_FinaleBuildUpSource.Play();
_FinaleBuildUpSource.volume = Mathf.Clamp(_FinaleBuildUpSource.volume + (fadeMultiplier * Time.deltaTime), 0, 1);
}
else
{
_FinaleBuildUpSource.volume = Mathf.Clamp(_FinaleBuildUpSource.volume - (fadeMultiplier * Time.deltaTime), 0, 1);
if (_FinaleBuildUpSource.volume == 0 && _FinaleBuildUpSource.isPlaying)
_FinaleBuildUpSource.Stop();
}
}
}

@ -0,0 +1,17 @@
using TMPro;
using UnityEngine;
public class MusicManagerTest : MonoBehaviour
{
[SerializeField]
private MusicManager.Track _track;
[SerializeField]
private MusicManager _musicManager;
[ContextMenu("Switch Track")]
public void SwitchTrack()
{
_musicManager.PlayMusic(_track);
}
}

@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: 3a80e8e583428c245b275b4d443ea8d9
Loading…
Cancel
Save