From 62d3c38f320eaa3c880dc26527e9f57c35fd5902 Mon Sep 17 00:00:00 2001
From: milimoe <mili@wrss.org>
Date: Fri, 15 Nov 2024 20:01:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=87=BB=E6=9D=80=E6=96=B9?=
 =?UTF-8?q?=E4=BA=BA=E6=95=B0=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98=EF=BC=9B?=
 =?UTF-8?q?=E5=87=8F=E5=B0=91=E5=A4=8D=E6=B4=BB=E7=AD=89=E5=BE=85=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Model/ActionQueue.cs | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/Model/ActionQueue.cs b/Model/ActionQueue.cs
index 8205bd8..5f15cee 100644
--- a/Model/ActionQueue.cs
+++ b/Model/ActionQueue.cs
@@ -1436,7 +1436,15 @@ namespace Milimoe.FunGame.Core.Model
 
                     if (MaxRespawnTimes != 0)
                     {
-                        WriteLine($"\r\n=== 当前死亡竞赛比分 ===\r\n{string.Join("\r\n", Teams.OrderByDescending(kv => kv.Value.Score).Select(kv => kv.Key + "：" + kv.Value.Score + "（剩余存活人数：" + kv.Value.GetActiveCharacters(this).Count + "）"))}");
+                        string[] teamActive = Teams.OrderByDescending(kv => kv.Value.Score).Select(kv => {
+                            int activeCount = kv.Value.GetActiveCharacters(this).Count;
+                            if (kv.Value == killTeam)
+                            {
+                                activeCount += 1;
+                            }
+                            return kv.Key + "：" + kv.Value.Score + "（剩余存活人数：" + activeCount + "）";
+                        }).ToArray();
+                        WriteLine($"\r\n=== 当前死亡竞赛比分 ===\r\n{string.Join("\r\n", teamActive)}");
                     }
 
                     if (deathTeam != null)
@@ -1616,7 +1624,7 @@ namespace Milimoe.FunGame.Core.Model
             else
             {
                 // 进入复活倒计时
-                double respawnTime = Calculation.Round2Digits(Math.Min(90, death.Level * 0.36 + times * 2.77 + kills * Random.Shared.Next(0, 3)));
+                double respawnTime = Calculation.Round2Digits(Math.Min(90, death.Level * 0.15 + times * 2.77 + coefficient * Random.Shared.Next(1, 3)));
                 _respawnCountdown.TryAdd(death, respawnTime);
                 LastRound.RespawnCountdowns.TryAdd(death, respawnTime);
                 WriteLine($"[ {death} ] 进入复活倒计时：{respawnTime:0.##} 时间！");