From 93f7205a1fae05152941af7f55e6312e5448fda5 Mon Sep 17 00:00:00 2001
From: milimoe <mili@wrss.org>
Date: Tue, 12 Aug 2025 01:09:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9C=B0=E5=8C=BA=E6=98=BE=E7=A4=BA=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 OshimaModules/Regions/OshimaRegion.cs |  2 +-
 OshimaModules/Skills/魔法/根源屏障.cs |  2 +-
 OshimaServers/Model/HorseRacing.cs    | 18 +++++++++++-------
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/OshimaModules/Regions/OshimaRegion.cs b/OshimaModules/Regions/OshimaRegion.cs
index 2cce642..488f1a0 100644
--- a/OshimaModules/Regions/OshimaRegion.cs
+++ b/OshimaModules/Regions/OshimaRegion.cs
@@ -50,7 +50,7 @@ namespace Oshima.FunGame.OshimaModules.Regions
             builder.AppendLine($"☆--- {Name} ---☆");
             builder.AppendLine($"编号：{Id}");
             builder.AppendLine($"天气：{Weather}");
-            builder.AppendLine($"温度：{Temperature} °C");
+            builder.AppendLine($"温度：{Temperature} ℃");
             builder.AppendLine($"{Description}");
 
             if (Characters.Count > 0)
diff --git a/OshimaModules/Skills/魔法/根源屏障.cs b/OshimaModules/Skills/魔法/根源屏障.cs
index f4c1a7d..8e1e102 100644
--- a/OshimaModules/Skills/魔法/根源屏障.cs
+++ b/OshimaModules/Skills/魔法/根源屏障.cs
@@ -9,7 +9,7 @@ namespace Oshima.FunGame.OshimaModules.Skills
         public override long Id => (long)MagicID.根源屏障;
         public override string Name => "根源屏障";
         public override string Description => string.Join("", Effects.Select(e => e.Description));
-        public override string DispelDescription => "被驱散性：魔法免疫可弱驱散" + (Level > 4 ? $"，技能免疫需强驱散" : "");
+        public override string DispelDescription => "被驱散性：可弱驱散";
         public override double MPCost => Level > 0 ? 200 + (75 * (Level - 1)) : 200;
         public override double CD => Level > 0 ? 120 - (3 * (Level - 1)) : 120;
         public override double CastTime => Level > 0 ? 12 - (0.5 * (Level - 1)) : 12;
diff --git a/OshimaServers/Model/HorseRacing.cs b/OshimaServers/Model/HorseRacing.cs
index b813772..555ab96 100644
--- a/OshimaServers/Model/HorseRacing.cs
+++ b/OshimaServers/Model/HorseRacing.cs
@@ -66,6 +66,7 @@ namespace Oshima.FunGame.OshimaServers.Model
                     }
                 }
 
+                List<string> winners = [];
                 foreach (Horse horse in horses)
                 {
                     turnSteps[horse] = 0;
@@ -168,25 +169,28 @@ namespace Oshima.FunGame.OshimaServers.Model
 
                     if (horse.CurrentPosition >= maxLength)
                     {
-                        builder.AppendLine($"\r\n🎯 恭喜 [ {horse} ] 冲过终点线！它赢得了比赛！\r\n");
+                        winners.Add(horse.Name);
+                        builder.AppendLine($"\r\n🎯 [ {horse} ] 冲过终点线！\r\n");
                         raceFinished = true;
-                        break;
                     }
                 }
 
-                builder.AppendLine("☆--- 赛道状况 ---☆");
+                builder.AppendLine("\r\n☆--- 赛道状况 ---☆");
                 for (int i = 0; i < horses.Count; i++)
                 {
                     builder.AppendLine(GenerateTrackString(horses[i], i + 1, maxLength, turnSteps));
                 }
 
-                msgs.Add($"{builder.ToString().Trim()}\r\n");
-                builder.Clear();
-
                 if (raceFinished)
                 {
+                    builder.AppendLine($"\r\n🎯 赢家：[ {string.Join(" ] / [ ", winners)} ]！");
+                    msgs.Add($"{builder.ToString().Trim()}\r\n");
+                    builder.Clear();
                     break;
                 }
+
+                msgs.Add($"{builder.ToString().Trim()}\r\n");
+                builder.Clear();
             }
 
             builder.Clear();
@@ -205,7 +209,7 @@ namespace Oshima.FunGame.OshimaServers.Model
                     lastPosition = currentHorse.CurrentPosition;
                     horsesAtCurrentRankCount = 1;
                 }
-                else if (currentHorse.CurrentPosition == lastPosition) // 与前一匹马平局
+                else if (currentHorse.CurrentPosition == lastPosition || currentHorse.CurrentPosition >= maxLength) // 与前一匹马平局或都是冠军
                 {
                     horsesAtCurrentRankCount++;
                 }