Merge branch 'master' of http://mobile.secondworld.net.cn:10010/r/Project_S...

hch

22 小时以前 dc0e8a38a7013908c6e1abc27a6b10a8ef2b00a1

Merge branch 'master' of http://mobile.secondworld.net.cn:10010/r/Project_SG_scripts

 Main/System/Battle/UIComp/TotalDamageDisplayer.cs

@@ -8,8 +8,12 @@
{
    public Image damageBackground;
    public Text textDamage;
    public Image imgTotalDesc; //总伤害或者总治疗

    public Color recoveryColor;
    public Color recoveryOutlineColor;
    public Color damageColor;
    public Color damageOutlineColor;
    public Text textTotalDesc;
    public OutlineEx outlineTotalDesc;
    private long damage = 0;

    private long heal = 0;
@@ -47,7 +51,9 @@
            }
            textDamage.text = BattleUtility.DisplayDamageNum(heal, BattleConst.BattleTotalRecoverType);
            damageBackground.sprite = UILoader.LoadSprite("Fight", "Fight1_img_83");
            imgTotalDesc.sprite = UILoader.LoadSprite("Fight", "Fight1_img_80");
            textTotalDesc.text = Language.Get("DamageTypeRecovery");
            textTotalDesc.color = recoveryColor;
            outlineTotalDesc.OutlineColor = recoveryOutlineColor;
        }
        else if (dmgInfo.IsType(DamageType.Damage) || dmgInfo.IsType(DamageType.Realdamage))
        {
@@ -57,8 +63,11 @@
                damage += d;
            }
            textDamage.text = BattleUtility.DisplayDamageNum(damage, BattleConst.BattleTotalDamageType);
            imgTotalDesc.sprite = UILoader.LoadSprite("Fight", "Fight1_img_85");
            damageBackground.sprite = UILoader.LoadSprite("Fight", "Fight1_img_88");
            textTotalDesc.text = Language.Get("DamageTypeDamage");
            textTotalDesc.color = damageColor;
            outlineTotalDesc.OutlineColor = damageOutlineColor;

        }
        else
        {