From 243d65af53aae9e3084f20ea9c5815f5b29df09e Mon Sep 17 00:00:00 2001
From: liuzhiwei <liuzhiwei@qq.com>
Date: Thu, 26 Nov 2020 18:26:58 +0800
Subject: [PATCH] Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle into master
---
Assets/Scripts/UI/FlyImage.cs | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/Assets/Scripts/UI/FlyImage.cs b/Assets/Scripts/UI/FlyImage.cs
index 14fa3ca..4f5a5d0 100644
--- a/Assets/Scripts/UI/FlyImage.cs
+++ b/Assets/Scripts/UI/FlyImage.cs
@@ -1,5 +1,7 @@
using System.Collections.Generic;
using DG.Tweening;
+using KTGMGemClient;
+using TowerDefense.Level;
using UnityEngine;
using UnityEngine.UI;
@@ -32,7 +34,8 @@
/// <param name="useBezier">是否使用贝塞尔</param>
public void SetDestination(Sprite sp, Vector3 startP, Vector3 endP, bool useBezier)
{
- tmpImage.sprite = sp;
+ if (sp != null)
+ tmpImage.sprite = sp;
transform.position = startP;
ts.localPosition += RandomPos();
if (useBezier)
@@ -104,9 +107,13 @@
private void Close()
{
- //Debug.Log("到终点了,可以消失了");
+ //Debug.Log("到终点了,可以消失了" + EndlessLevelManager.instance.DropCoin);
gameObject.SetActive(false);
+
+ EndlessLevelManager.instance.Currency.AddCurrency(1);//每个金币增加1
+ EventCenter.Ins.BroadCast((int)KTGMGemClient.EventType.PlayGetGoldPS);
+ //Core.Utilities.Poolable.TryPool(gameObject);
}
/// <summary>
--
Gitblit v1.9.1