From df50daf0ca2cd0c442b10f83fdf0d25758fd9d2d Mon Sep 17 00:00:00 2001
From: liuzhiwei <liuzhiwei@qq.com>
Date: Tue, 17 Nov 2020 16:30:26 +0800
Subject: [PATCH] Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle into master
---
Assets/Scripts/Music/AudioSourceManager.cs | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/Assets/Scripts/Music/AudioSourceManager.cs b/Assets/Scripts/Music/AudioSourceManager.cs
index c3d98a9..5b963fe 100644
--- a/Assets/Scripts/Music/AudioSourceManager.cs
+++ b/Assets/Scripts/Music/AudioSourceManager.cs
@@ -118,13 +118,13 @@
Play("放下宝石", true);
break;
case AudioEnum.FireTAttack:
- Play("火攻击", true);
+ Play("火攻击", true, 0.5f);
break;
case AudioEnum.WaterTAttack:
- Play("水攻击", true);
+ Play("水攻击", true, 0.5f);
break;
case AudioEnum.WoodTAttack:
- Play("木攻击", true);
+ Play("木攻击", true, 0.5f);
break;
case AudioEnum.LightningSkill:
Play("电技能", true);
@@ -140,7 +140,7 @@
Dictionary<string, AudioClip> clipDic;
- private void Play(string musicName, bool isOneShot)
+ private void Play(string musicName, bool isOneShot, float volume = 1.0f)
{
AudioClip au = LoadAudioClip(musicName);
AudioSource tmpAudioSource;
@@ -160,6 +160,7 @@
tmpAudioSource = audioSourceList[0];
tmpAudioSource.clip = au;
tmpAudioSource.loop = true;
+ tmpAudioSource.volume = volume;
}
tmpAudioSource.Play();
}
--
Gitblit v1.9.1