|
|
@@ -238,9 +238,14 @@ public class MoveCharacter : Character
|
|
|
return;
|
|
|
}
|
|
|
screenReflectPresets.ScreenReflect(hitFeedbackSystem, attackInfo.attackValue - hitResistance);
|
|
|
+ int damageData;
|
|
|
if(damage == -1)
|
|
|
{
|
|
|
- damage = attackInfo.damage;
|
|
|
+ damageData = attackInfo.damage;
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ damageData = damage;
|
|
|
}
|
|
|
int armorRate = attributeStatus.resistances.armor;
|
|
|
if (attackInfo.attackEffect != null && attackInfo.attackEffect.Length > 0)
|
|
|
@@ -263,10 +268,10 @@ public class MoveCharacter : Character
|
|
|
}
|
|
|
|
|
|
//计算护甲减免
|
|
|
- damage = (int)(damage * (100f / (100 + armorRate)) + 0.5f);
|
|
|
+ damageData = (int)(damageData * (100f / (100 + armorRate)) + 0.5f);
|
|
|
|
|
|
//计算易伤
|
|
|
- damage = attributeStatus.DamageCalculation(damage);
|
|
|
+ damageData = attributeStatus.DamageCalculation(damageData);
|
|
|
|
|
|
//伤害减免，先注释，用到的时候再改
|
|
|
//if (isDamageReduction)
|
|
|
@@ -303,7 +308,7 @@ public class MoveCharacter : Character
|
|
|
}
|
|
|
|
|
|
TextMeshProUGUI text = injuryNum.GetComponentInChildren<TextMeshProUGUI>();
|
|
|
- text.text = damage.ToString();
|
|
|
+ text.text = damageData.ToString();
|
|
|
}
|
|
|
|
|
|
uiHp.Show(hp, totalHp);
|
|
|
@@ -316,7 +321,11 @@ public class MoveCharacter : Character
|
|
|
}
|
|
|
|
|
|
//顿帧
|
|
|
- hitFeedbackSystem.FreezeFrame(attackInfo, attackFrom);
|
|
|
+ if(damage == -1)
|
|
|
+ {
|
|
|
+ hitFeedbackSystem.FreezeFrame(attackInfo, attackFrom);
|
|
|
+ }
|
|
|
+
|
|
|
}
|
|
|
|
|
|
//受到持续伤害
|
