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

chenxin

2020-11-25 554eda43e00d5817cd3e06a60e39d4bd882ee584

 Assets/Scripts/TowerDefense/UI/HUD/GameUI.cs

@@ -1478,8 +1478,6 @@
                    PlayUpgradeEffect(createdTower);
            }

            PlayAppearEffect(createdTower.transform.position);

            // 处理成长骰子,复制骰子等等功能.
            if (lvl == 0)
            {
@@ -1685,6 +1683,8 @@
        /// <param name="val"></param>
        public void generateBloodText(Vector3 wpos, float val, bool crit = false, bool doubleHit = false, bool poison = false)
        {
            if (Mathf.FloorToInt(val) == 0) return;

            Vector3 spos = m_Camera.WorldToScreenPoint(wpos);
            TextMoveDoTween tm;
            if (crit)