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

wangguan

2020-12-02 6bc45c691891dac88bece3483fb6f3cf2d7a00a4

 Assets/Scripts/TowerDefense/Towers/Projectiles/BallisticAttack.cs

@@ -65,7 +65,6 @@

            // 这里也可以把碰撞点传进来
            enemy.TakeDamage(basicDamage, enemy.position, damager.alignmentProvider);
            EndlessGameUI.instance.generateBloodText(backPos, basicDamage);
        }

        /// <summary>
@@ -159,8 +158,8 @@
            {
                if (GameUI.instanceExists)
                    GameUI.instance.generateBloodText(backPos, basicDamage, crit);
                else if (EndlessGameUI.instanceExists)
                    EndlessGameUI.instance.generateBloodText(backPos, basicDamage, crit);
                else if (EndlessGameUI.instanceExists && crit)
                    EndlessGameUI.instance.FloatCritWord(backPos);
            }

            // 播放受击动画: