From 7fcfe2b029ffad2c35630d411d283c95ada7df5f Mon Sep 17 00:00:00 2001
From: chenxin <chenxin6991@163.com>
Date: Wed, 09 Dec 2020 17:43:15 +0800
Subject: [PATCH] Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle into master
---
Assets/Resources/Music/选择buff后.wav.meta | 2 +-
/dev/null | 0
Assets/Materials/PVE/PVEBg3.png.meta | 2 +-
Assets/Scripts/TowerDefense/UI/HUD/SelectBuffIcon.cs | 16 +++++++++++++++-
Assets/Materials/PVE/Materials/PVEBg.mat | 2 +-
Assets/Scripts/TowerDefense/UI/EndlessBuffSelect.cs | 3 ++-
Assets/Resources/Music/火焰喷射.mp3 | 0
Assets/Resources/Music/BGM2.mp3 | 0
Assets/Scripts/Music/AudioSourceManager.cs | 8 +++++++-
Assets/Scripts/UI/FinalPanel/FinalPanel.cs | 4 +++-
Assets/Scripts/TowerDefense/UI/EndlessTowerGridOpen.cs | 3 +++
Assets/Resources/Music/冰淇淋技能.mp3 | 0
Assets/Resources/Music/选择buff后.wav | 0
13 files changed, 33 insertions(+), 7 deletions(-)
diff --git a/Assets/Materials/PVE/Materials/PVEBg.mat b/Assets/Materials/PVE/Materials/PVEBg.mat
index d74932e..2ceca37 100644
--- a/Assets/Materials/PVE/Materials/PVEBg.mat
+++ b/Assets/Materials/PVE/Materials/PVEBg.mat
@@ -8,7 +8,7 @@
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: PVEBg
- m_Shader: {fileID: 10750, guid: 0000000000000000f000000000000000, type: 0}
+ m_Shader: {fileID: 10752, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
diff --git a/Assets/Materials/PVE/PVEBg3.png.meta b/Assets/Materials/PVE/PVEBg3.png.meta
index 8d2404a..767c486 100644
--- a/Assets/Materials/PVE/PVEBg3.png.meta
+++ b/Assets/Materials/PVE/PVEBg3.png.meta
@@ -6,7 +6,7 @@
serializedVersion: 11
mipmaps:
mipMapMode: 0
- enableMipMap: 1
+ enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
diff --git a/Assets/Resources/Music/BGM2.mp3 b/Assets/Resources/Music/BGM2.mp3
index b5b3864..5da4d7c 100644
--- a/Assets/Resources/Music/BGM2.mp3
+++ b/Assets/Resources/Music/BGM2.mp3
Binary files differ
diff --git "a/Assets/Resources/Music/\345\206\260\346\267\207\346\267\213\346\212\200\350\203\275.mp3" "b/Assets/Resources/Music/\345\206\260\346\267\207\346\267\213\346\212\200\350\203\275.mp3"
index 3f82706..086c872 100644
--- "a/Assets/Resources/Music/\345\206\260\346\267\207\346\267\213\346\212\200\350\203\275.mp3"
+++ "b/Assets/Resources/Music/\345\206\260\346\267\207\346\267\213\346\212\200\350\203\275.mp3"
Binary files differ
diff --git "a/Assets/Resources/Music/\347\201\253\347\204\260\345\226\267\345\260\204.mp3" "b/Assets/Resources/Music/\347\201\253\347\204\260\345\226\267\345\260\204.mp3"
index 9749835..2acde59 100644
--- "a/Assets/Resources/Music/\347\201\253\347\204\260\345\226\267\345\260\204.mp3"
+++ "b/Assets/Resources/Music/\347\201\253\347\204\260\345\226\267\345\260\204.mp3"
Binary files differ
diff --git "a/Assets/Resources/Music/\351\200\211\346\213\251buff\345\220\216.mp3" "b/Assets/Resources/Music/\351\200\211\346\213\251buff\345\220\216.mp3"
deleted file mode 100644
index f13baca..0000000
--- "a/Assets/Resources/Music/\351\200\211\346\213\251buff\345\220\216.mp3"
+++ /dev/null
Binary files differ
diff --git "a/Assets/Resources/Music/\351\200\211\346\213\251buff\345\220\216.wav" "b/Assets/Resources/Music/\351\200\211\346\213\251buff\345\220\216.wav"
new file mode 100644
index 0000000..71fd851
--- /dev/null
+++ "b/Assets/Resources/Music/\351\200\211\346\213\251buff\345\220\216.wav"
Binary files differ
diff --git "a/Assets/Resources/Music/\351\200\211\346\213\251buff\345\220\216.mp3.meta" "b/Assets/Resources/Music/\351\200\211\346\213\251buff\345\220\216.wav.meta"
similarity index 91%
rename from "Assets/Resources/Music/\351\200\211\346\213\251buff\345\220\216.mp3.meta"
rename to "Assets/Resources/Music/\351\200\211\346\213\251buff\345\220\216.wav.meta"
index 1c8cc5b..ffb6d2d 100644
--- "a/Assets/Resources/Music/\351\200\211\346\213\251buff\345\220\216.mp3.meta"
+++ "b/Assets/Resources/Music/\351\200\211\346\213\251buff\345\220\216.wav.meta"
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: 7038f3d098e09e24dae79641a76e7784
+guid: 28f2776f5338e0d44af75342f26e20da
AudioImporter:
externalObjects: {}
serializedVersion: 6
diff --git a/Assets/Scripts/Music/AudioSourceManager.cs b/Assets/Scripts/Music/AudioSourceManager.cs
index 5781941..17665d4 100644
--- a/Assets/Scripts/Music/AudioSourceManager.cs
+++ b/Assets/Scripts/Music/AudioSourceManager.cs
@@ -26,6 +26,7 @@
WaterTowerSkill,//冰淇淋技能
WoodSkill,//玉米狙击子弹
Upgrade,//合成
+ Gold,//金币
}
public class AudioSourceManager : MonoBehaviour
@@ -154,6 +155,9 @@
case AudioEnum.Upgrade:
Play("合成", true);
break;
+ case AudioEnum.Gold:
+ Play("金币", true);
+ break;
}
}
@@ -229,8 +233,10 @@
/// </summary>
public void StopBGAudio()
{
- if (!audioSourceList[0].isPlaying)
+ if (audioSourceList[0].isPlaying)
+ {
audioSourceList[0].Stop();
+ }
}
/// <summary>
diff --git a/Assets/Scripts/TowerDefense/UI/EndlessBuffSelect.cs b/Assets/Scripts/TowerDefense/UI/EndlessBuffSelect.cs
index b036506..51ccd43 100644
--- a/Assets/Scripts/TowerDefense/UI/EndlessBuffSelect.cs
+++ b/Assets/Scripts/TowerDefense/UI/EndlessBuffSelect.cs
@@ -51,7 +51,6 @@
IconList[i].Reset();
}
- AudioSourceManager.Ins?.Play(AudioEnum.BuffAppear);
}
private void OnDisable()
@@ -120,6 +119,7 @@
{
EndlessMaskUI.instance.Show();
gameObject.SetActive(true);
+ AudioSourceManager.Ins?.Play(AudioEnum.ChooseBuff);
}
public void HideBuffUI()
@@ -138,6 +138,7 @@
IconList[i].SetName(list[i].Config.name);
IconList[i].SetEffect(list[i].Config.brief);
IconList[i].SetRare(list[i].Config.rare);
+ IconList[i].SetIsGold(list[i].EffectType == EndlessBuffEffectType.GoldAdd);
}
}
}
diff --git a/Assets/Scripts/TowerDefense/UI/EndlessTowerGridOpen.cs b/Assets/Scripts/TowerDefense/UI/EndlessTowerGridOpen.cs
index 6b4749b..b93333c 100644
--- a/Assets/Scripts/TowerDefense/UI/EndlessTowerGridOpen.cs
+++ b/Assets/Scripts/TowerDefense/UI/EndlessTowerGridOpen.cs
@@ -70,7 +70,10 @@
{
float cashToOpen = TowerPlacementGridEndless.GRID_OPENCASH;
if (EndlessLevelManager.instance.Currency.currentCurrency < cashToOpen)
+ {
+ AudioSourceManager.Ins.Play(AudioEnum.UIDisable);
return;
+ }
// 减少Cash并开启相应塔防管理器的兵线
bool bsucc = EndlessLevelManager.instance.Currency.TryPurchase((int)cashToOpen);
diff --git a/Assets/Scripts/TowerDefense/UI/HUD/SelectBuffIcon.cs b/Assets/Scripts/TowerDefense/UI/HUD/SelectBuffIcon.cs
index 9a6b69e..054ea46 100644
--- a/Assets/Scripts/TowerDefense/UI/HUD/SelectBuffIcon.cs
+++ b/Assets/Scripts/TowerDefense/UI/HUD/SelectBuffIcon.cs
@@ -63,7 +63,15 @@
public void OnClick()
{
- AudioSourceManager.Ins.Play(AudioEnum.ChooseBuff);
+ //判断是否是金钱
+ if (isGold)
+ {
+ AudioSourceManager.Ins.Play(AudioEnum.Gold);
+ }
+ else
+ {
+ AudioSourceManager.Ins.Play(AudioEnum.UI);
+ }
if (OnSelectBuffCompleted != null)
OnSelectBuffCompleted(Index);
@@ -106,6 +114,12 @@
Name.color = EndlessBuffData.GetColorByRare(rare);
}
+ bool isGold;//是否是金币BUFF
+ public void SetIsGold(bool isGold)
+ {
+ this.isGold = isGold;
+ }
+
/// <summary>
/// 设置选中状态，做个缓动播放粒子特效
diff --git a/Assets/Scripts/UI/FinalPanel/FinalPanel.cs b/Assets/Scripts/UI/FinalPanel/FinalPanel.cs
index 0d80c49..3a89838 100644
--- a/Assets/Scripts/UI/FinalPanel/FinalPanel.cs
+++ b/Assets/Scripts/UI/FinalPanel/FinalPanel.cs
@@ -80,6 +80,8 @@
/// <param name="myScore">789220</param>
public void SetData(string waveInfo, int myScore)
{
+ AudioSourceManager.Ins.StopBGAudio();//进来后停止播放BGM
+
_waveInfo = waveInfo;
_myScore = myScore;
isFirstStart = true;//首次启动下载到数据执行动效
@@ -233,7 +235,7 @@
{
var temp = Math.Floor(value);
scoreText.text = temp + "";
- }, 0, _myScore, 1.71f));
+ }, 0, _myScore, 1.4f));
agentTweenSeq.AppendCallback(StartLoadLargeData);
tsLight = transform.Find("ImageLight");
--
Gitblit v1.9.1