diff --git a/Library/Common/JsonConverter/RoundRecordConverter.cs b/Library/Common/JsonConverter/RoundRecordConverter.cs index 6dc4ffa..d760343 100644 --- a/Library/Common/JsonConverter/RoundRecordConverter.cs +++ b/Library/Common/JsonConverter/RoundRecordConverter.cs @@ -3,6 +3,7 @@ using Milimoe.FunGame.Core.Api.Utility; using Milimoe.FunGame.Core.Entity; using Milimoe.FunGame.Core.Library.Common.Architecture; using Milimoe.FunGame.Core.Library.Constant; +using Milimoe.FunGame.Core.Model; namespace Milimoe.FunGame.Core.Library.Common.JsonConverter { diff --git a/Entity/System/RoundRecord.cs b/Model/RoundRecord.cs similarity index 96% rename from Entity/System/RoundRecord.cs rename to Model/RoundRecord.cs index 5a96bcc..a8ad3c3 100644 --- a/Entity/System/RoundRecord.cs +++ b/Model/RoundRecord.cs @@ -114,6 +114,7 @@ namespace Milimoe.FunGame.Core.Entity string hasDamage = ""; string hasHeal = ""; string hasEffect = ""; + string hasEvaded = ""; if (Damages.TryGetValue(target, out double damage)) { hasDamage = $"伤害:{damage:0.##}"; @@ -134,18 +135,18 @@ namespace Milimoe.FunGame.Core.Entity { if (ActionType == CharacterActionType.NormalAttack) { - hasDamage = "完美闪避"; + hasEvaded = hasDamage == "" ? "完美闪避" : "闪避"; } else if ((ActionType == CharacterActionType.PreCastSkill || ActionType == CharacterActionType.CastSkill || ActionType == CharacterActionType.CastSuperSkill)) { - hasDamage = "技能免疫"; + hasEvaded = "技能免疫"; } } if (IsImmune.ContainsKey(target) && hasDamage != "" && target != Actor) { hasDamage = "免疫"; } - string[] strs = [hasDamage, hasHeal, hasEffect]; + string[] strs = [hasDamage, hasHeal, hasEffect, hasEvaded]; strs = [.. strs.Where(s => s != "")]; if (strs.Length == 0) strings.Add($"[ {target} ])"); else strings.Add($"[ {target}({string.Join(" / ", strs)})])");