diff --git a/Assets/Maya/Player Model/Hands_To_Unity.fbm.meta b/Assets/Maya/Player Model/Hands_To_Unity.fbm.meta new file mode 100644 index 0000000..37f5338 --- /dev/null +++ b/Assets/Maya/Player Model/Hands_To_Unity.fbm.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 67f7274cc8ca55a4c9c63c2b4a535ff3 +folderAsset: yes +timeCreated: 1431056462 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/AudioController.cs b/Assets/Scripts/AudioController.cs index c6ca6c6..75465d7 100644 --- a/Assets/Scripts/AudioController.cs +++ b/Assets/Scripts/AudioController.cs @@ -230,7 +230,8 @@ public void changeVolume(){ float musicVolume = GetComponent().musicVolume/10f; foreach (AudioSource a in audiosourceDic.Keys) a.volume = masterVolume * soundEffectsVolume * audiosourceDic[a]; - musicSource.volume = masterVolume * musicVolume; + if (musicSource) + musicSource.volume = masterVolume * musicVolume; }