From 899beb99be4dcff08cade5656b9bf6354b3eaef7 Mon Sep 17 00:00:00 2001
From: chenxin <chenxin6991@163.com>
Date: Sat, 12 Dec 2020 14:26:54 +0800
Subject: [PATCH] Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle into master
---
Assets/Scripts/TowerDefense/UI/EndlessDropReward.cs | 39 ++++++++++++++++++++++++++++++++++++---
1 files changed, 36 insertions(+), 3 deletions(-)
diff --git a/Assets/Scripts/TowerDefense/UI/EndlessDropReward.cs b/Assets/Scripts/TowerDefense/UI/EndlessDropReward.cs
index a6a93e4..e4aca09 100644
--- a/Assets/Scripts/TowerDefense/UI/EndlessDropReward.cs
+++ b/Assets/Scripts/TowerDefense/UI/EndlessDropReward.cs
@@ -6,6 +6,8 @@
using TowerDefense.Level;
using System;
using Protobuf;
+using DG.Tweening;
+
/**
* 无尽模式道具掉落管理器
@@ -65,28 +67,57 @@
public event Action<EndlessDrop> ClickDropEvent;
+ private bool isBox;//是否是宝箱
+ private GameObject propBtn;
+
// Start is called before the first frame update
private void Start()
{
ClickDropEvent += EndlessDropManager.instance.OnClickDrop;
+ propBtn = GameObject.Find("BottomUI/PropsObtained/PropButton");
}
+ public GameObject drapIcon;
public void OnClick()
{
- if (ClickDropEvent != null)
- ClickDropEvent(DropData);
+ // if (isBox)
+ // {
+ // EndlessDropManager.instance.FlyIcon(transform.parent, Icon.sprite, transform.position, (propBtn.transform as RectTransform).position, true);
+ // }
+ // else
+ // {
+ // FlyImage fly = EndlessDropManager.instance.CreateIcon(transform.parent);
+ // fly.SetDestination(Icon.sprite, transform.position, (propBtn.transform as RectTransform).position, false);
+ // }
+ // if (ClickDropEvent != null)
+ // ClickDropEvent(DropData);
+
}
public void SetIcon()
{
string resId = "";
+ Vector3 scale = Icon.rectTransform.localScale;
if (DropData.Reward.id == 0)
+ {
resId = $"{path}{(int)DropData.Reward.type}";
+ isBox = true;
+ }
else
- resId = $"{path}{(int)DropData.Reward.type}_${DropData.Reward.id}";
+ {
+ resId = $"{path}{(int)DropData.Reward.type}_{DropData.Reward.id}";
+ scale *= 1.5f;
+ isBox = false;
+
+ }
Icon.sprite = Resources.Load<Sprite>(resId);
Icon.SetNativeSize();
+
+ //Debug.Log("开始缩放");
+ Icon.rectTransform.localScale = scale * 0.5f;
+ Icon.rectTransform.DOScale(scale, 0.5f);
+
}
/// <summary>
@@ -96,5 +127,7 @@
{
LightParticle.Play();
}
+
+
}
}
\ No newline at end of file
--
Gitblit v1.9.1