Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

client_Hale

2018-10-26 45a6f4aaaf13119215f4cc2f20f5e8300ba13e00

 System/Sound/SoundPlayer.cs

@@ -291,7 +291,7 @@

    public void PlayLoginMusic()

    {

        var loginMusic = Resources.Load<AudioClip>("Music/Music_Login");

        var loginMusic = BuiltInLoader.LoadMusic("Music_Login");

        if (!m_MusicAudioSource.isPlaying || m_MusicAudioSource.clip != loginMusic)

        {

            StartCoroutine(Co_BackGroundMusicFadeOutIn(loginMusic, false));