From 47998dc6daec5da4562ed23d51af65990e9cf3af Mon Sep 17 00:00:00 2001
From: chenxin <chenxin6991@163.com>
Date: Fri, 11 Dec 2020 20:18:06 +0800
Subject: [PATCH] Merge commit 'f7c9c6db1c194233d15fdd848721b2d47b8dd11e' into master
---
Assets/Scripts/TowerDefense/Level/EndlessDropManager.cs | 62 ++++++++++++++++++++++++++-----
1 files changed, 52 insertions(+), 10 deletions(-)
diff --git a/Assets/Scripts/TowerDefense/Level/EndlessDropManager.cs b/Assets/Scripts/TowerDefense/Level/EndlessDropManager.cs
index 01c55c5..7ea8bf3 100644
--- a/Assets/Scripts/TowerDefense/Level/EndlessDropManager.cs
+++ b/Assets/Scripts/TowerDefense/Level/EndlessDropManager.cs
@@ -69,7 +69,7 @@
if (AllDropList[i].ElapsedTime >= AllDropList[i].AutoPickupTime)
{
EndlessDropReward dropReward = DropObjDic[AllDropList[i].Id].GetComponent<EndlessDropReward>();
- dropReward?.OnClick();
+ // dropReward?.OnClick();
//AllDropList[i].IsPickupCompleted = true;
//SafelyCallObtainDrop(AllDropList[i]);
@@ -104,15 +104,15 @@
/// <param name="pos">小怪的世界坐标</param>
public void AddDrop(List<reward> list, Vector3 pos)
{
- for (int i = 0; i < list.Count; ++i)
- {
- EndlessDrop drop = new EndlessDrop();
- drop.Reward = list[i];
- drop.Id = GetDropId();
- drop.AutoPickupTime = AutoPickupTime;
- CreateDrop(drop, pos, list.Count > 0);
- AllDropList.Add(drop);
- }
+ // for (int i = 0; i < list.Count; ++i)
+ // {
+ // EndlessDrop drop = new EndlessDrop();
+ // drop.Reward = list[i];
+ // drop.Id = GetDropId();
+ // drop.AutoPickupTime = AutoPickupTime;
+ // CreateDrop(drop, pos, list.Count > 0);
+ // AllDropList.Add(drop);
+ // }
}
/// <summary>
@@ -156,6 +156,10 @@
obj.GetComponent<Transform>().SetParent(mainUITransform, true);
obj.transform.position = worldPos;
+
+ Vector3 offect = obj.GetComponent<RectTransform>().anchoredPosition3D;
+ offect.z = 0;
+ obj.GetComponent<RectTransform>().anchoredPosition3D = offect;
// obj.transform.localRotation = Quaternion.identity;
// obj.transform.localScale = Vector3.one;
@@ -194,6 +198,44 @@
return fly;
}
+
+ public void FlyIcon(Transform ts, Sprite sp, Vector3 startP, Vector3 endP, bool useBezier, int count)
+ {
+ StartCoroutine(CreateIcon(ts, sp, startP, endP, useBezier, count));
+ }
+
+ IEnumerator CreateIcon(Transform ts, Sprite sp, Vector3 startP, Vector3 endP, bool useBezier, int count)
+ {
+ FlyImage fly;
+
+ // for (int i = 0; i < 5; i++)
+ // {
+ // fly = CreateIcon(ts);
+ // fly.SetDestination(sp, startP, endP, useBezier);
+ // }
+ // yield return new WaitForSeconds(0.2f);
+
+
+ for (int i = 0; i < 15; i++)
+ {
+ fly = CreateIcon(ts);
+ if (i == 0)
+ {
+ fly.Init(true, count);
+ }
+ else
+ {
+ fly.Init(false, 0);
+ }
+
+ fly.SetDestination(sp, startP, endP, useBezier);
+ yield return new WaitForSeconds(0.01f);
+
+ }
+
+ yield break;
+ }
+
/// <summary>
/// 调用掉落获得事件
/// </summary>
--
Gitblit v1.9.1