Merge branch 'master' of http://47.95.218.140:8090/r/GemBattle into master

chenxin

2020-12-25 adb0dae8a82a7eabb4e686bc0e83c8859bf6445f

 Assets/Scripts/UI/FlyImage.cs

@@ -1,4 +1,5 @@
using System.Collections.Generic;
using System.Security.AccessControl;
using System.Collections.Generic;
using DG.Tweening;
using KTGMGemClient;
using TowerDefense.Level;
@@ -27,6 +28,13 @@
        ts = transform.GetComponent<RectTransform>();
    }
    private Image tmpImage;
    private bool isBroadCast;
    private int tmpCurrency;
    public void Init(bool isBC, int currency)
    {
        isBroadCast = isBC;
        tmpCurrency = currency;
    }
    /// <summary>
    /// 设置终点
    /// </summary>
@@ -59,28 +67,29 @@
        }
    }

    bool isUp;
    bool isLeft;
    private Vector3 RandomPos()
    {
        Vector3 tmpV = Vector3.zero;
        tmpV.x -= UnityEngine.Random.Range(10, 20);
        tmpV.y += UnityEngine.Random.Range(30, 50);
        int a = UnityEngine.Random.Range(-20, 20);
        isUp = a > 0;
        tmpV.z += a;
        isLeft = a > 0;
        tmpV.x += a;
        return tmpV;
    }

    private Vector3 GetOffect()
    {
        Vector3 tmpV = Vector3.zero;
        tmpV.x -= UnityEngine.Random.Range(10, 15);
        if (isUp)
        if (isLeft)
        {
            tmpV.z += UnityEngine.Random.Range(10, 20);
            tmpV.x -= UnityEngine.Random.Range(80, 150);
            tmpV.y += UnityEngine.Random.Range(500, 600);
        }
        else
        {
            tmpV.z -= UnityEngine.Random.Range(10, 20);
            tmpV.x += UnityEngine.Random.Range(500, 600);
            tmpV.y += UnityEngine.Random.Range(80, 150);
        }

        return tmpV;
@@ -111,8 +120,12 @@

        gameObject.SetActive(false);

        EndlessLevelManager.instance.Currency.AddCurrency(1);//每个金币增加1
        EventCenter.Ins.BroadCast((int)KTGMGemClient.EventType.PlayGetGoldPS);
        if (isBroadCast)
        {
            EndlessLevelManager.instance.Currency.AddCurrency(tmpCurrency);
            EventCenter.Ins.BroadCast((int)KTGMGemClient.EventType.PlayGetGoldPS);
        }

        //Core.Utilities.Poolable.TryPool(gameObject);
    }