285 【公会】公会行商（砍价）

hch

3 天以前 cfe2a2d5bc6fe9a85488542597d4f73dddbfeee8

 Main/System/Sound/SoundPlayer.cs

@@ -2,7 +2,6 @@
using System.Collections.Generic;
using UnityEngine;

using vnxbqy.UI;
using System;

public class SoundPlayer : MonoBehaviour
@@ -12,8 +11,18 @@

    static readonly List<int> commonUseAudioSet = new List<int>() { defaultClickPositiveAudio, defaultClickNegativeAudio, 3, 4 };

    public static SoundPlayer Instance {
        get; set;
    static SoundPlayer m_Instance = null;
    public static SoundPlayer Instance
    {
        get
        {
            if (m_Instance == null)
            {
                CreateSoundPlayer();
            }
            return m_Instance;
        }

    }

    [SerializeField] AudioSource m_MusicAudioSource;
@@ -46,9 +55,9 @@
    public static void CreateSoundPlayer()
    {
        var gameObject = GameObject.Instantiate(BuiltInLoader.LoadPrefab("SoundPlayer"));
        Instance = gameObject.GetComponent<SoundPlayer>();
        Instance.name = "SoundPlayer";
        Instance.SetActive(true);
        m_Instance = gameObject.GetComponent<SoundPlayer>();
        m_Instance.name = "SoundPlayer";
        m_Instance.SetActive(true);
        DontDestroyOnLoad(gameObject);
    }

@@ -125,14 +134,14 @@

    public void UnLoadMusic(int _exclude)
    {
        if (!AssetSource.audioFromEditor && DeviceUtility.IsLowMemory())
        if (AssetSource.isUseAssetBundle && DeviceUtility.IsLowMemory())
        {
            foreach (var key in musicAudioClipDict.Keys)
            {
                if (key != _exclude)
                {
                    var config = AudioConfig.Get(key);
                    AssetBundleUtility.Instance.UnloadAsset("audio/music", config.Audio);
                    ResManager.Instance.UnloadAsset("Audio/" + config.Folder, config.Audio);
                }
            }

@@ -303,23 +312,23 @@
        }
    }

    public void PlayLoginMusic()
    {
        var loginMusic = BuiltInLoader.LoadMusic("Music_Login");
        if (!m_MusicAudioSource.isPlaying || m_MusicAudioSource.clip != loginMusic)
        {
            StartCoroutine(Co_BackGroundMusicFadeOutIn(loginMusic, false));
        }
    }
    //public void PlayLoginMusic()
    //{
    //    var loginMusic = BuiltInLoader.LoadMusic("Music_Login");
    //    if (!m_MusicAudioSource.isPlaying || m_MusicAudioSource.clip != loginMusic)
    //    {
    //        StartCoroutine(Co_BackGroundMusicFadeOutIn(loginMusic, false));
    //    }
    //}

    private void LateUpdate()
    {
        // if (CameraController.Instance != null && CameraController.Instance.CameraObject != null)
        // {
        //     this.transform.position = CameraController.Instance.transform.position + new Vector3(0, 5, 0);
        //     this.transform.rotation = CameraController.Instance.CameraObject.transform.rotation;
        // }
    }
    //private void LateUpdate()
    //{
    //    if (CameraController.Instance != null && CameraController.Instance.CameraObject != null)
    //    {
    //        this.transform.position = CameraController.Instance.transform.position + new Vector3(0, 5, 0);
    //        this.transform.rotation = CameraController.Instance.CameraObject.transform.rotation;
    //    }
    //}

    IEnumerator Co_BackGroundMusicFadeOutIn(AudioClip _clip, bool _oneShot)
    {