From 9e89e605d5429babb4b33df2e47ea86dff9d2ba7 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期四, 20 十一月 2025 11:55:04 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts
---
Main/System/Sound/SoundPlayer.cs | 53 +++++++++++++++++++++++++++++++----------------------
1 files changed, 31 insertions(+), 22 deletions(-)
diff --git a/Main/System/Sound/SoundPlayer.cs b/Main/System/Sound/SoundPlayer.cs
index 977d073..ad7e910 100644
--- a/Main/System/Sound/SoundPlayer.cs
+++ b/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);
}
@@ -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)
{
--
Gitblit v1.8.0