diff --git a/OshimaModules/Items/Consumable/回复药.cs b/OshimaModules/Items/Consumable/回复药.cs index 1011b83..262bd08 100644 --- a/OshimaModules/Items/Consumable/回复药.cs +++ b/OshimaModules/Items/Consumable/回复药.cs @@ -76,7 +76,7 @@ namespace Oshima.FunGame.OshimaModules.Items public override string Name => "小回复药"; public override string Description => Skills.Active?.Description ?? ""; public override QualityType QualityType => QualityType.White; - public double HP { get; set; } = 300; + public double HP { get; set; } = 600; public 小回复药(User? user = null, int remainUseTimes = 1) : base(ItemType.Consumable) { @@ -96,7 +96,7 @@ namespace Oshima.FunGame.OshimaModules.Items public override string Name => "中回复药"; public override string Description => Skills.Active?.Description ?? ""; public override QualityType QualityType => QualityType.Green; - public double HP { get; set; } = 700; + public double HP { get; set; } = 1800; public 中回复药(User? user = null, int remainUseTimes = 1) : base(ItemType.Consumable) { @@ -116,7 +116,7 @@ namespace Oshima.FunGame.OshimaModules.Items public override string Name => "大回复药"; public override string Description => Skills.Active?.Description ?? ""; public override QualityType QualityType => QualityType.Blue; - public double HP { get; set; } = 1500; + public double HP { get; set; } = 3000; public 大回复药(User? user = null, int remainUseTimes = 1) : base(ItemType.Consumable) { diff --git a/OshimaServers/Service/FunGameActionQueue.cs b/OshimaServers/Service/FunGameActionQueue.cs index 9a2dd29..6685ace 100644 --- a/OshimaServers/Service/FunGameActionQueue.cs +++ b/OshimaServers/Service/FunGameActionQueue.cs @@ -32,6 +32,14 @@ namespace Oshima.FunGame.OshimaServers.Service // 创建顺序表并排序 ActionQueue actionQueue = new(characters, false, WriteLine); actionQueue.SetCharactersToAIControl(false, characters); + foreach (Character dead in characters) + { + if (dead.HP <= 0) + { + actionQueue.Queue.Remove(dead); + actionQueue.Eliminated.Add(dead); + } + } ActionQueue = actionQueue; if (PrintOut) Console.WriteLine(); @@ -242,6 +250,14 @@ namespace Oshima.FunGame.OshimaServers.Service MaxScoreToWin = maxScoreToWin }; actionQueue.SetCharactersToAIControl(false, characters); + foreach (Character dead in characters) + { + if (dead.HP <= 0) + { + actionQueue.Queue.Remove(dead); + actionQueue.Eliminated.Add(dead); + } + } ActionQueue = actionQueue; if (PrintOut) Console.WriteLine();