From c7c33938bfbaacfe565846d82813a30db7a44202 Mon Sep 17 00:00:00 2001 From: milimoe Date: Wed, 4 Dec 2024 01:00:57 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=A2=9D=E5=A4=96=E7=94=9F?= =?UTF-8?q?=E5=91=BD=E5=80=BC/=E9=AD=94=E6=B3=95=E5=80=BC3=EF=BC=9B?= =?UTF-8?q?=E8=B4=9F=E6=95=B0=E9=A2=9D=E5=A4=96=E5=8A=A0=E6=88=90=E5=B0=86?= =?UTF-8?q?=E4=BC=9A=E6=98=BE=E7=A4=BA=E5=9C=A8=E8=AF=A6=E7=BB=86=E9=9D=A2?= =?UTF-8?q?=E6=9D=BF=E4=B8=8A=EF=BC=9B=E7=89=A9=E7=90=86=E4=BC=A4=E5=AE=B3?= =?UTF-8?q?=E5=87=8F=E5=85=8D=E5=9B=A0=E5=AD=90=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Api/Utility/General.cs | 11 +++++++ Entity/Character/Character.cs | 60 +++++++++++++++++++++++------------ Model/EquilibriumConstant.cs | 2 +- 3 files changed, 51 insertions(+), 22 deletions(-) diff --git a/Api/Utility/General.cs b/Api/Utility/General.cs index 159d35b..d19c9a8 100644 --- a/Api/Utility/General.cs +++ b/Api/Utility/General.cs @@ -701,6 +701,17 @@ namespace Milimoe.FunGame.Core.Api.Utility { return Math.Max(0, Math.Min(value, 1)); } + + /// + /// 检查 是否约等于 0 + /// + /// + /// + /// + public static bool IsApproximatelyZero(double value, double epsilon = 1e-10) + { + return Math.Abs(value) < epsilon; + } } #endregion diff --git a/Entity/Character/Character.cs b/Entity/Character/Character.cs index 44c6046..89ec436 100644 --- a/Entity/Character/Character.cs +++ b/Entity/Character/Character.cs @@ -181,6 +181,11 @@ namespace Milimoe.FunGame.Core.Entity /// 额外生命值2 [ 与技能和物品相关 ] /// public double ExHP2 { get; set; } = 0; + + /// + /// 额外生命值3 [ 额外生命值% ] + /// + public double ExHP3 => (BaseHP + ExHP + ExHP2) * ExHPPercentage; /// /// 额外生命值% [ 与技能和物品相关 ] @@ -188,9 +193,9 @@ namespace Milimoe.FunGame.Core.Entity public double ExHPPercentage { get; set; } = 0; /// - /// 最大生命值 = 基础生命值 + 额外生命值 + 额外生命值2 + 额外生命值% + /// 最大生命值 = 基础生命值 + 额外生命值 + 额外生命值2 + 额外生命值3 /// - public double MaxHP => BaseHP + ExHP + ExHP2 + ((BaseHP + ExHP + ExHP2) * ExHPPercentage); + public double MaxHP => BaseHP + ExHP + ExHP2 + ExHP3; /// /// 当前生命值 [ 战斗相关 ] @@ -230,15 +235,20 @@ namespace Milimoe.FunGame.Core.Entity /// public double ExMP2 { get; set; } = 0; + /// + /// 额外魔法值2 [ 额外魔法值% ] + /// + public double ExMP3 => (BaseMP + ExMP + ExMP2) * ExMPPercentage; + /// /// 额外魔法值% [ 与技能和物品相关 ] /// public double ExMPPercentage { get; set; } = 0; /// - /// 最大魔法值 = 基础魔法值 + 额外魔法值 + 额外魔法值2 + 额外魔法值% + /// 最大魔法值 = 基础魔法值 + 额外魔法值 + 额外魔法值2 + 额外魔法值3 /// - public double MaxMP => BaseMP + ExMP + ExMP2 + ((BaseMP + ExMP + ExMP2) * ExMPPercentage); + public double MaxMP => BaseMP + ExMP + ExMP2 + ExMP3; /// /// 当前魔法值 [ 战斗相关 ] @@ -1116,22 +1126,27 @@ namespace Milimoe.FunGame.Core.Entity StringBuilder builder = new(); builder.AppendLine(showUser ? ToStringWithLevel() : ToStringWithLevelWithOutUser()); - builder.AppendLine($"生命值：{HP:0.##} / {MaxHP:0.##}" + (ExHP + ExHP2 + ExHPPercentage > 0 ? $" [{BaseHP:0.##} + {ExHP + ExHP2 + (MaxHP * ExHPPercentage):0.##}]" : "")); - builder.AppendLine($"魔法值：{MP:0.##} / {MaxMP:0.##}" + (ExMP + ExMP2 + ExMPPercentage > 0 ? $" [{BaseMP:0.##} + {ExMP + ExMP2 + (MaxMP * ExMPPercentage):0.##}]" : "")); + double exHP = ExHP + ExHP2 + ExHP3; + builder.AppendLine($"生命值：{HP:0.##} / {MaxHP:0.##}" + (exHP != 0 ? $" [{BaseHP:0.##} {(exHP >= 0 ? "+" : "-")} {Math.Abs(exHP):0.##}]" : "")); + double exMP = ExMP + ExMP2 + ExMP3; + builder.AppendLine($"魔法值：{MP:0.##} / {MaxMP:0.##}" + (exMP != 0 ? $" [{BaseMP:0.##} {(exMP >= 0 ? "+" : "-")} {Math.Abs(exMP):0.##}]" : "")); builder.AppendLine($"能量值：{EP:0.##} / {General.GameplayEquilibriumConstant.MaxEP:0.##}"); - builder.AppendLine($"攻击力：{ATK:0.##}" + (ExATK + ExATK2 > 0 ? $" [{BaseATK:0.##} + {ExATK + ExATK2:0.##}]" : "")); - builder.AppendLine($"物理护甲：{DEF:0.##}" + (ExDEF + ExDEF2 > 0 ? $" [{BaseDEF:0.##} + {ExDEF + ExDEF2:0.##}]" : "") + $" ({PDR * 100:0.##}%)"); - double mdf = (MDF.None + MDF.Starmark + MDF.PurityNatural + MDF.PurityContemporary + - MDF.Bright + MDF.Shadow + MDF.Element + MDF.Fleabane + MDF.Particle) / 9; - builder.AppendLine($"魔法抗性：{Calculation.Round4Digits(mdf) * 100:0.##}%（平均）"); + double exATK = ExATK + ExATK2; + builder.AppendLine($"攻击力：{ATK:0.##}" + (exATK != 0 ? $" [{BaseATK:0.##} {(exATK >= 0 ? "+" : "-")} {Math.Abs(exATK):0.##}]" : "")); + double exDEF = ExDEF + ExDEF2; + builder.AppendLine($"物理护甲：{DEF:0.##}" + (exDEF != 0 ? $" [{BaseDEF:0.##} {(exMP >= 0 ? "+" : "-")} {Math.Abs(exDEF):0.##}]" : "") + $" ({PDR * 100:0.##}%)"); + double mdf = Calculation.Round4Digits((MDF.None + MDF.Starmark + MDF.PurityNatural + MDF.PurityContemporary + + MDF.Bright + MDF.Shadow + MDF.Element + MDF.Fleabane + MDF.Particle) / 9) * 100; + if (Calculation.IsApproximatelyZero(mdf)) mdf = 0; + builder.AppendLine($"魔法抗性：{mdf:0.##}%（平均）"); double exSPD = AGI * General.GameplayEquilibriumConstant.AGItoSPDMultiplier + ExSPD; - builder.AppendLine($"行动速度：{SPD:0.##}" + (exSPD > 0 ? $" [{InitialSPD:0.##} + {exSPD:0.##}]" : "") + $" ({ActionCoefficient * 100:0.##}%)"); + builder.AppendLine($"行动速度：{SPD:0.##}" + (exSPD != 0 ? $" [{InitialSPD:0.##} {(exSPD >= 0 ? "+" : "-")} {Math.Abs(exSPD):0.##}]" : "") + $" ({ActionCoefficient * 100:0.##}%)"); builder.AppendLine($"核心属性：{CharacterSet.GetPrimaryAttributeName(PrimaryAttribute)}"); - builder.AppendLine($"力量：{STR:0.##}" + (ExSTR > 0 ? $" [{BaseSTR:0.##} + {ExSTR:0.##}]" : "")); - builder.AppendLine($"敏捷：{AGI:0.##}" + (ExAGI > 0 ? $" [{BaseAGI:0.##} + {ExAGI:0.##}]" : "")); - builder.AppendLine($"智力：{INT:0.##}" + (ExINT > 0 ? $" [{BaseINT:0.##} + {ExINT:0.##}]" : "")); - builder.AppendLine($"生命回复：{HR:0.##}" + (ExHR > 0 ? $" [{InitialHR + STR * 0.25:0.##} + {ExHR:0.##}]" : "")); - builder.AppendLine($"魔法回复：{MR:0.##}" + (ExMR > 0 ? $" [{InitialMR + INT * 0.1:0.##} + {ExMR:0.##}]" : "")); + builder.AppendLine($"力量：{STR:0.##}" + (ExSTR != 0 ? $" [{BaseSTR:0.##} {(ExSTR >= 0 ? "+" : "-")} {Math.Abs(ExSTR):0.##}]" : "")); + builder.AppendLine($"敏捷：{AGI:0.##}" + (ExAGI != 0 ? $" [{BaseAGI:0.##} {(ExAGI >= 0 ? "+" : "-")} {Math.Abs(ExAGI):0.##}]" : "")); + builder.AppendLine($"智力：{INT:0.##}" + (ExINT != 0 ? $" [{BaseINT:0.##} {(ExINT >= 0 ? "+" : "-")} {Math.Abs(ExINT):0.##}]" : "")); + builder.AppendLine($"生命回复：{HR:0.##}" + (ExHR != 0 ? $" [{InitialHR + STR * 0.25:0.##} {(ExHR >= 0 ? "+" : "-")} {Math.Abs(ExHR):0.##}]" : "")); + builder.AppendLine($"魔法回复：{MR:0.##}" + (ExMR != 0 ? $" [{InitialMR + INT * 0.1:0.##} {(ExMR >= 0 ? "+" : "-")} {Math.Abs(ExMR):0.##}]" : "")); builder.AppendLine($"暴击率：{CritRate * 100:0.##}%"); builder.AppendLine($"暴击伤害：{CritDMG * 100:0.##}%"); builder.AppendLine($"闪避率：{EvadeRate * 100:0.##}%"); @@ -1235,11 +1250,14 @@ namespace Milimoe.FunGame.Core.Entity StringBuilder builder = new(); builder.AppendLine(ToStringWithLevel()); - builder.AppendLine($"生命值：{HP:0.##} / {MaxHP:0.##}" + (ExHP + ExHP2 > 0 ? $" [{BaseHP:0.##} + {ExHP + ExHP2:0.##}]" : "")); - builder.AppendLine($"魔法值：{MP:0.##} / {MaxMP:0.##}" + (ExMP + ExMP2 > 0 ? $" [{BaseMP:0.##} + {ExMP + ExMP2:0.##}]" : "")); + double exHP = ExHP + ExHP2 + ExHP3; + builder.AppendLine($"生命值：{HP:0.##} / {MaxHP:0.##}" + (exHP != 0 ? $" [{BaseHP:0.##} {(exHP >= 0 ? "+" : "-")} {Math.Abs(exHP):0.##}]" : "")); + double exMP = ExMP + ExMP2 + ExMP3; + builder.AppendLine($"魔法值：{MP:0.##} / {MaxMP:0.##}" + (exMP != 0 ? $" [{BaseMP:0.##} {(exMP >= 0 ? "+" : "-")} {Math.Abs(exMP):0.##}]" : "")); builder.AppendLine($"能量值：{EP:0.##} / {General.GameplayEquilibriumConstant.MaxEP:0.##}"); - builder.AppendLine($"攻击力：{ATK:0.##}" + (ExATK + ExATK2 > 0 ? $" [{BaseATK:0.##} + {ExATK + ExATK2:0.##}]" : "")); - builder.AppendLine($"核心属性：{PrimaryAttributeValue:0.##}" + (ExPrimaryAttributeValue > 0 ? $" [{BasePrimaryAttributeValue:0.##} + {ExPrimaryAttributeValue:0.##}]" : "")); + double exATK = ExATK + ExATK2; + builder.AppendLine($"攻击力：{ATK:0.##}" + (exATK != 0 ? $" [{BaseATK:0.##} {(exATK >= 0 ? "+" : "-")} {Math.Abs(exATK):0.##}]" : "")); + builder.AppendLine($"核心属性：{PrimaryAttributeValue:0.##}" + (ExPrimaryAttributeValue != 0 ? $" [{BasePrimaryAttributeValue:0.##} {(ExPrimaryAttributeValue >= 0 ? "+" : "-")} {Math.Abs(ExPrimaryAttributeValue):0.##}]" : "")); if (CharacterState != CharacterState.Actionable) { diff --git a/Model/EquilibriumConstant.cs b/Model/EquilibriumConstant.cs index 67cd9aa..b386046 100644 --- a/Model/EquilibriumConstant.cs +++ b/Model/EquilibriumConstant.cs @@ -188,7 +188,7 @@ /// /// 物理伤害减免因子 /// - public double DEFReductionFactor { get; set; } = 120; + public double DEFReductionFactor { get; set; } = 240; /// /// 行动速度上限