From 48199425b13931a8e120da25731b88ee17141df0 Mon Sep 17 00:00:00 2001
From: chenxin <chenxin6991@163.com>
Date: Thu, 26 Nov 2020 16:26:15 +0800
Subject: [PATCH] Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle into master
---
Assets/Scripts/TowerDefense/UI/DropCoinImage.cs | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/Assets/Scripts/TowerDefense/UI/DropCoinImage.cs b/Assets/Scripts/TowerDefense/UI/DropCoinImage.cs
index 122ac1a..3c9ed80 100644
--- a/Assets/Scripts/TowerDefense/UI/DropCoinImage.cs
+++ b/Assets/Scripts/TowerDefense/UI/DropCoinImage.cs
@@ -11,7 +11,7 @@
void Awake()
{
tmpBtn = transform.GetComponent<Button>();
- flyImage = transform.GetComponent<FlyImage>();
+ //flyImage = transform.GetComponent<FlyImage>();
tmpBtn.onClick.AddListener(OnClick);
}
@@ -21,7 +21,7 @@
}
bool countdown;
float timer;
-
+
public void Init()
{
timer = 0;
@@ -48,7 +48,15 @@
{
tmpBtn.interactable = false;
RectTransform end = GameObject.Find("UICamera/MainUI/FlyEndPos").GetComponent<RectTransform>();
- flyImage.SetDestination(null, transform.position, end.position, true);
-
+ //金币飞动 增加多少个金币，制造多少个
+ TowerDefense.Level.EndlessDropManager.instance.FlyIcon(
+ transform.parent,
+ null,
+ transform.position,
+ end.position,
+ true,
+ TowerDefense.Level.EndlessLevelManager.instance.DropCoin);
+ Core.Utilities.Poolable.TryPool(gameObject);
+ //flyImage.SetDestination(null, transform.position, end.position, true);
}
}
--
Gitblit v1.9.1