Merge branch 'master' of git@ooftooft.net:Racesm

This commit is contained in:
magn9775
2024-04-26 18:21:11 +02:00
5 changed files with 27 additions and 102 deletions

View File

@@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1 m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0} m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0} m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0.00027773753, g: 0.000305498, b: 0.00035180224, a: 1} m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1}
m_UseRadianceAmbientProbe: 0 m_UseRadianceAmbientProbe: 0
--- !u!157 &3 --- !u!157 &3
LightmapSettings: LightmapSettings:
@@ -1654,9 +1654,6 @@ PrefabInstance:
- targetCorrespondingSourceObject: {fileID: 820120218557562435, guid: dc3e6243ce610df4c845a9fa5df754a7, type: 3} - targetCorrespondingSourceObject: {fileID: 820120218557562435, guid: dc3e6243ce610df4c845a9fa5df754a7, type: 3}
insertIndex: -1 insertIndex: -1
addedObject: {fileID: 1607325868} addedObject: {fileID: 1607325868}
- targetCorrespondingSourceObject: {fileID: 820120218557562435, guid: dc3e6243ce610df4c845a9fa5df754a7, type: 3}
insertIndex: -1
addedObject: {fileID: 1607325869}
m_SourcePrefab: {fileID: 100100000, guid: dc3e6243ce610df4c845a9fa5df754a7, type: 3} m_SourcePrefab: {fileID: 100100000, guid: dc3e6243ce610df4c845a9fa5df754a7, type: 3}
--- !u!1001 &727592024 --- !u!1001 &727592024
PrefabInstance: PrefabInstance:
@@ -4604,102 +4601,6 @@ MonoBehaviour:
carType: carType:
carColor: carColor:
--- !u!82 &1607325868 --- !u!82 &1607325868
AudioSource:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1607325861}
m_Enabled: 1
serializedVersion: 4
OutputAudioMixerGroup: {fileID: 0}
m_audioClip: {fileID: 8300000, guid: 10cae2fd52e1c0f4eba2e2091d441cd1, type: 3}
m_PlayOnAwake: 1
m_Volume: 0.7
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!82 &1607325869
AudioSource: AudioSource:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}

View File

@@ -28,6 +28,9 @@ public class GameManager : MonoBehaviour
private bool hasCountedDown = false; private bool hasCountedDown = false;
void Start() void Start()
{ {
AudioSource backgroundMusic = GameObject.Find("Car Data").GetComponent<AudioSource>();
backgroundMusic.Stop();
// reset laps // reset laps
playerLaps = new int[players.Count()]; playerLaps = new int[players.Count()];
playerTimes = new float[players.Count()]; playerTimes = new float[players.Count()];

View File

@@ -53,8 +53,6 @@ public class MapSelectorScript : MonoBehaviour
public void SelectMapAndLoadScene() public void SelectMapAndLoadScene()
{ {
AudioSource backgroundMusic = GameObject.Find("Car Data").GetComponent<AudioSource>();
backgroundMusic.Stop();
SceneManager.LoadScene(scene); SceneManager.LoadScene(scene);
} }
} }

Binary file not shown.

View File

@@ -0,0 +1,23 @@
fileFormatVersion: 2
guid: 0992f228a2c818041a77fad4a16f0551
AudioImporter:
externalObjects: {}
serializedVersion: 7
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: