From 18f96c9313bf24d2296e615f44fc0ca005f2e872 Mon Sep 17 00:00:00 2001
From: liuzhiwei <liuzhiwei@qq.com>
Date: Thu, 12 Nov 2020 16:05:44 +0800
Subject: [PATCH] Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle into master
---
Assets/Scripts/TowerDefense/Level/EndlessDropManager.cs | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/Assets/Scripts/TowerDefense/Level/EndlessDropManager.cs b/Assets/Scripts/TowerDefense/Level/EndlessDropManager.cs
index e70bf07..2a7504b 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>
--
Gitblit v1.9.1