From adb0dae8a82a7eabb4e686bc0e83c8859bf6445f Mon Sep 17 00:00:00 2001
From: chenxin <chenxin6991@163.com>
Date: Fri, 25 Dec 2020 10:48:53 +0800
Subject: [PATCH] Merge branch 'master' of http://47.95.218.140:8090/r/GemBattle into master
---
Assets/Scripts/TowerDefense/UI/EndlessBuffSelect.cs | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/Assets/Scripts/TowerDefense/UI/EndlessBuffSelect.cs b/Assets/Scripts/TowerDefense/UI/EndlessBuffSelect.cs
index 38e449a..8c88a41 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()
@@ -71,8 +70,10 @@
SelectedIndex = index;
IconList[index].SetState(true);
- PlayEffect();
+
+ //PlayEffect();
}
+
private void PlayEffect()
{
@@ -111,6 +112,9 @@
HideBuffUI();
+ IconList[index].Fly();
+ EndlessRandomTower.instance.SetCountDown(true,true);
+
if (BuffSelectCompleted != null)
BuffSelectCompleted(index);
}
@@ -119,6 +123,7 @@
{
EndlessMaskUI.instance.Show();
gameObject.SetActive(true);
+ AudioSourceManager.Ins?.Play(AudioEnum.ChooseBuff);
}
public void HideBuffUI()
@@ -137,6 +142,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);
}
}
}
--
Gitblit v1.9.1