From 871594462e82d6bc1341918d39e11ab036d59563 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期四, 18 九月 2025 19:26:28 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts
---
Main/System/Sound/SoundPlayer.cs | 35 +++++++++++++++++------------------
1 files changed, 17 insertions(+), 18 deletions(-)
diff --git a/Main/System/Sound/SoundPlayer.cs b/Main/System/Sound/SoundPlayer.cs
index 4fcaefc..3315f86 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
@@ -125,7 +124,7 @@
public void UnLoadMusic(int _exclude)
{
- if (!AssetSource.audioFromEditor && DeviceUtility.IsLowMemory())
+ if (AssetSource.isUseAssetBundle && DeviceUtility.IsLowMemory())
{
foreach (var key in musicAudioClipDict.Keys)
{
@@ -303,23 +302,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