From 7b9712f33f42b14e4d277166fa533a379021312d Mon Sep 17 00:00:00 2001
From: chenxin <chenxin6991@163.com>
Date: Fri, 18 Dec 2020 09:52:45 +0800
Subject: [PATCH] Merge branch 'master' of http://47.95.218.140:8090/r/GemBattle into master
---
Assets/Scripts/TowerDefense/UI/HUD/EndlessGameUI.cs | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Assets/Scripts/TowerDefense/UI/HUD/EndlessGameUI.cs b/Assets/Scripts/TowerDefense/UI/HUD/EndlessGameUI.cs
index 8c1d17c..3814f55 100644
--- a/Assets/Scripts/TowerDefense/UI/HUD/EndlessGameUI.cs
+++ b/Assets/Scripts/TowerDefense/UI/HUD/EndlessGameUI.cs
@@ -277,12 +277,12 @@
//首次购买宝石特效
public GameObject fireAppearEffect1;
- public GameObject fireAppearEffect2;
+ //public GameObject fireAppearEffect2;
public GameObject waterAppearEffect1;
- public GameObject waterAppearEffect2;
+ //public GameObject waterAppearEffect2;
public GameObject woodAppearEffect1;
- public GameObject woodAppearEffect2;
+ //public GameObject woodAppearEffect2;
/// <summary>
/// 保存所有生成或合成的塔的最小等级
/// </summary>
@@ -1938,7 +1938,7 @@
{
//火元素
PlayAppearEffect(worldPos, fireAppearEffect1);
- PlayAppearEffect(worldPos, fireAppearEffect2);
+ //PlayAppearEffect(worldPos, fireAppearEffect2);
if (Application.platform == RuntimePlatform.WindowsEditor)
{
//UnityEditor.EditorApplication.isPaused = true;
@@ -1948,14 +1948,14 @@
{
//木元素
PlayAppearEffect(worldPos, woodAppearEffect1);
- PlayAppearEffect(worldPos, woodAppearEffect2);
+ //PlayAppearEffect(worldPos, woodAppearEffect2);
}
else if (towerName.StartsWith("CopyCatTower"))
{
//水元素
PlayAppearEffect(worldPos, waterAppearEffect1);
- PlayAppearEffect(worldPos, waterAppearEffect2);
+ //PlayAppearEffect(worldPos, waterAppearEffect2);
}
}
void PlayAppearEffect(Vector3 worldPos, GameObject prefab)
--
Gitblit v1.9.1