Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts

yyl

17 小时以前 9705833cb610ea2a5147fafa8a2279020f98ed48

 Main/System/Battle/UIComp/TotalDamageDisplayer.cs

@@ -46,6 +46,12 @@
            imgTotalDesc.sprite = UILoader.LoadSprite("Fight", "Fight1_img_85");
            damageBackground.sprite = UILoader.LoadSprite("Fight", "Fight1_img_88");
        }
        else
        {
            textDamage.text =BattleUtility.DisplayDamageNum(0, BattleConst.BattleTotalDamageType);
            imgTotalDesc.sprite = UILoader.LoadSprite("Fight", "Fight1_img_85");
            damageBackground.sprite = UILoader.LoadSprite("Fight", "Fight1_img_88");
        }

        var tween = textDamage.transform.DOPunchScale(Vector3.one * 0.2f, 0.8f / battleField.speedRatio, 1).OnComplete(() =>
        {