From 570d48f979363f2269fb74554f6a6eb35d3ebc7c Mon Sep 17 00:00:00 2001
From: milimoe <mili@wrss.org>
Date: Tue, 3 Dec 2024 01:00:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=A2=9D=E5=A4=96HP/MP?=
 =?UTF-8?q?=E7=99=BE=E5=88=86=E6=AF=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Entity/Character/Character.cs                 | 26 ++++++++++++++-----
 .../JsonConverter/CharacterConverter.cs       | 12 +++++++--
 2 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/Entity/Character/Character.cs b/Entity/Character/Character.cs
index fd01609..44c6046 100644
--- a/Entity/Character/Character.cs
+++ b/Entity/Character/Character.cs
@@ -181,11 +181,16 @@ namespace Milimoe.FunGame.Core.Entity
         /// 额外生命值2 [ 与技能和物品相关 ]
         /// </summary>
         public double ExHP2 { get; set; } = 0;
+        
+        /// <summary>
+        /// 额外生命值% [ 与技能和物品相关 ]
+        /// </summary>
+        public double ExHPPercentage { get; set; } = 0;
 
         /// <summary>
-        /// 最大生命值 = 基础生命值 + 额外生命值 + 额外生命值2
+        /// 最大生命值 = 基础生命值 + 额外生命值 + 额外生命值2 + 额外生命值%
         /// </summary>
-        public double MaxHP => BaseHP + ExHP + ExHP2;
+        public double MaxHP => BaseHP + ExHP + ExHP2 + ((BaseHP + ExHP + ExHP2) * ExHPPercentage);
 
         /// <summary>
         /// 当前生命值 [ 战斗相关 ]
@@ -226,9 +231,14 @@ namespace Milimoe.FunGame.Core.Entity
         public double ExMP2 { get; set; } = 0;
 
         /// <summary>
-        /// 最大魔法值 = 基础魔法值 + 额外魔法值 + 额外魔法值2
+        /// 额外魔法值% [ 与技能和物品相关 ]
         /// </summary>
-        public double MaxMP => BaseMP + ExMP + ExMP2;
+        public double ExMPPercentage { get; set; } = 0;
+
+        /// <summary>
+        /// 最大魔法值 = 基础魔法值 + 额外魔法值 + 额外魔法值2 + 额外魔法值%
+        /// </summary>
+        public double MaxMP => BaseMP + ExMP + ExMP2 + ((BaseMP + ExMP + ExMP2) * ExMPPercentage);
 
         /// <summary>
         /// 当前魔法值 [ 战斗相关 ]
@@ -1106,8 +1116,8 @@ namespace Milimoe.FunGame.Core.Entity
             StringBuilder builder = new();
 
             builder.AppendLine(showUser ? ToStringWithLevel() : ToStringWithLevelWithOutUser());
-            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.##}]" : ""));
+            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.##}]" : ""));
             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.##}%)");
@@ -1336,8 +1346,10 @@ namespace Milimoe.FunGame.Core.Entity
                 EXP = EXP,
                 InitialHP = InitialHP,
                 ExHP2 = ExHP2,
+                ExHPPercentage = ExHPPercentage,
                 InitialMP = InitialMP,
                 ExMP2 = ExMP2,
+                ExMPPercentage = ExMPPercentage,
                 EP = EP,
                 InitialATK = InitialATK,
                 ExATK2 = ExATK2,
@@ -1432,8 +1444,10 @@ namespace Milimoe.FunGame.Core.Entity
             UpdateCharacterState();
             InitialHP = c.InitialHP;
             ExHP2 = c.ExHP2;
+            ExHPPercentage = c.ExHPPercentage;
             InitialMP = c.InitialMP;
             ExMP2 = c.ExMP2;
+            ExMPPercentage = c.ExMPPercentage;
             EP = c.EP;
             InitialATK = c.InitialATK;
             ExATK2 = c.ExATK2;
diff --git a/Library/Common/JsonConverter/CharacterConverter.cs b/Library/Common/JsonConverter/CharacterConverter.cs
index 983af79..995ad0a 100644
--- a/Library/Common/JsonConverter/CharacterConverter.cs
+++ b/Library/Common/JsonConverter/CharacterConverter.cs
@@ -68,15 +68,21 @@ namespace Milimoe.FunGame.Core.Library.Common.JsonConverter
                 case nameof(Character.InitialHP):
                     result.InitialHP = reader.GetDouble();
                     break;
-                case nameof(Character.ExHP):
+                case nameof(Character.ExHP2):
                     result.ExHP2 = reader.GetDouble();
                     break;
+                case nameof(Character.ExHPPercentage):
+                    result.ExHPPercentage = reader.GetDouble();
+                    break;
                 case nameof(Character.InitialMP):
                     result.InitialMP = reader.GetDouble();
                     break;
-                case nameof(Character.ExMP):
+                case nameof(Character.ExMP2):
                     result.ExMP2 = reader.GetDouble();
                     break;
+                case nameof(Character.ExMPPercentage):
+                    result.ExMPPercentage = reader.GetDouble();
+                    break;
                 case nameof(Character.EP):
                     result.EP = reader.GetDouble();
                     break;
@@ -214,8 +220,10 @@ namespace Milimoe.FunGame.Core.Library.Common.JsonConverter
             writer.WriteNumber(nameof(Character.CharacterState), (int)value.CharacterState);
             writer.WriteNumber(nameof(Character.InitialHP), value.InitialHP);
             writer.WriteNumber(nameof(Character.ExHP2), value.ExHP2);
+            writer.WriteNumber(nameof(Character.ExHPPercentage), value.ExHPPercentage);
             writer.WriteNumber(nameof(Character.InitialMP), value.InitialMP);
             writer.WriteNumber(nameof(Character.ExMP2), value.ExMP2);
+            writer.WriteNumber(nameof(Character.ExMPPercentage), value.ExMPPercentage);
             writer.WriteNumber(nameof(Character.EP), value.EP);
             writer.WriteNumber(nameof(Character.InitialATK), value.InitialATK);
             writer.WriteNumber(nameof(Character.ExATK2), value.ExATK2);