From 82931aabaaa3e479bc04e11630a77cd9c9dd5fe3 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期五, 26 十月 2018 20:05:36 +0800
Subject: [PATCH] Merge branch 'master' into leonard
---
System/Sound/SoundPlayer.cs | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/System/Sound/SoundPlayer.cs b/System/Sound/SoundPlayer.cs
index b72acef..c4f4875 100644
--- a/System/Sound/SoundPlayer.cs
+++ b/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));
--
Gitblit v1.8.0