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

chenxin

2020-12-12 899beb99be4dcff08cade5656b9bf6354b3eaef7

 Assets/Scripts/TowerDefense/UI/EndlessDropReward.cs

@@ -80,30 +80,17 @@
        public GameObject drapIcon;
        public void OnClick()
        {
            //GameObject obj;
            FlyImage fly;
            //GameObject ui = GameObject.Find("BottomUI");

            if (Application.platform == RuntimePlatform.WindowsEditor)
            {
                //UnityEditor.EditorApplication.isPaused = true;
            }
            if (isBox)
            {
                for (int i = 0; i < 5; i++)
                {
                    fly = EndlessDropManager.instance.CreateIcon(transform.parent);
                    fly.SetDestination(Icon.sprite, transform.position, (propBtn.transform as RectTransform).position, true);
                }
            }
            else
            {
                fly = EndlessDropManager.instance.CreateIcon(transform.parent);
                fly.SetDestination(Icon.sprite, transform.position, (propBtn.transform as RectTransform).position, false);
            }
            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);

        }