From 06529f672b2a9c2395892639f8900c65e6f16164 Mon Sep 17 00:00:00 2001
From: "Bob.Song" <bob.song@ingcreates.com>
Date: Fri, 6 Mar 2026 10:17:57 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=B5=8B=E8=AF=95=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Handler/Inner/S2G_ChatMessageHandler.cs   | 67 ++++++++++---------
 Hotfix/Social/SocialUnitSystem.cs             |  2 +-
 Server.sln.DotSettings.user                   |  3 +
 3 files changed, 41 insertions(+), 31 deletions(-)

diff --git a/Hotfix/Gate/Handler/Inner/S2G_ChatMessageHandler.cs b/Hotfix/Gate/Handler/Inner/S2G_ChatMessageHandler.cs
index d619d63..b0f6aaa 100644
--- a/Hotfix/Gate/Handler/Inner/S2G_ChatMessageHandler.cs
+++ b/Hotfix/Gate/Handler/Inner/S2G_ChatMessageHandler.cs
@@ -7,42 +7,49 @@ using Fantasy.PacketParser;
 
 namespace NB.Gate;
 
-public class S2G_ChatMessageHandler : Address<Scene, S2G_ChatMessage>
+public class S2G_ChatMessageHandler : Address<Scene, Chat2G_ChatMessage>
 {
-    protected override async FTask Run(Scene scene, S2G_ChatMessage message)
+    protected override async FTask Run(Scene scene, Chat2G_ChatMessage message)
     {
-        var chatMessage = new S2C_Message()
+        // var chatMessage = new S2C_Message()
+        // {
+        //     Msg = message.Message,
+        // };
+        // var idList = message.IdList;
+        // bool isAll = !(idList != null && idList.Count > 0);
+        //
+        // var gateUnitManage = scene.GetComponent<GateUnitManageComponent>();
+        //
+        // if (isAll)
+        // {
+        //     foreach (var session in gateUnitManage.ForEachUnitSession())
+        //     {
+        //         session.Send(chatMessage);
+        //     }
+        // }
+        // else
+        // {
+        //     if (idList == null) return;
+        //     foreach (var (_, gateUnit) in gateUnitManage.Units)
+        //     {
+        //         if (gateUnit.AccountID > 0 && idList.Contains(gateUnit.AccountID))
+        //         {
+        //             Session session = gateUnit.Session;
+        //             if (session != null)
+        //             {
+        //                 session.Send(chatMessage);
+        //             }
+        //         }
+        //     }
+        // }
+        var chatMessage = new Chat2C_Message()
         {
-            Msg = message.Message,
+            ChatInfoTree = message.ChatInfoTree
         };
-        var idList = message.IdList;
-        bool isAll = !(idList != null && idList.Count > 0);
-
-        var gateUnitManage = scene.GetComponent<GateUnitManageComponent>();
-
-        if (isAll)
+        foreach (var session in scene.GetComponent<GateUnitManageComponent>().ForEachUnitSession())
         {
-            foreach (var session in gateUnitManage.ForEachUnitSession())
-            {
-                session.Send(chatMessage);
-            }
+            session.Send(chatMessage);
         }
-        else
-        {
-            if (idList == null) return;
-            foreach (var (_, gateUnit) in gateUnitManage.Units)
-            {
-                if (gateUnit.AccountID > 0 && idList.Contains(gateUnit.AccountID))
-                {
-                    Session session = gateUnit.Session;
-                    if (session != null)
-                    {
-                        session.Send(chatMessage);
-                    }
-                }
-            }
-        }
-
 
         await FTask.CompletedTask;
     }
diff --git a/Hotfix/Social/SocialUnitSystem.cs b/Hotfix/Social/SocialUnitSystem.cs
index 2e564dd..dcec9e1 100644
--- a/Hotfix/Social/SocialUnitSystem.cs
+++ b/Hotfix/Social/SocialUnitSystem.cs
@@ -7,7 +7,7 @@ public sealed class SocialUnitDestroySystem : DestroySystem<SocialUnit>
 {
     protected override void Destroy(SocialUnit self)
     {
-        self.Role.Return();
+        self.Role?.Return();
         self.Role = null;
         self.GateRouteId = 0;
         // 退出当前ChatUnit拥有的所有频道
diff --git a/Server.sln.DotSettings.user b/Server.sln.DotSettings.user
index 6ff39cd..9fdeb46 100644
--- a/Server.sln.DotSettings.user
+++ b/Server.sln.DotSettings.user
@@ -6,8 +6,11 @@
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AAwakeSystem_00601_002Ecs_002Fl_003AC_0021_003FUsers_003F60527_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F3cbbaf32e578423d8d0163d75da8233f87e00_003Fd6_003F72740830_003FAwakeSystem_00601_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ADestroySystem_00601_002Ecs_002Fl_003AC_0021_003FUsers_003F60527_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F3cbbaf32e578423d8d0163d75da8233f87e00_003Fbd_003Fcd9cb7f1_003FDestroySystem_00601_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ADictionary_00602_002Ecs_002Fl_003AC_0021_003FUsers_003F60527_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F76803a04e31b4fee99d90bcbfc5a6bdde8e930_003F33_003F170c5f2b_003FDictionary_00602_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AIProtoParser_00601_002Ecs_002Fl_003AC_0021_003FUsers_003FFIREBAT_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F199e3c534d1e41cbb9a3a30bbf9ac93bde200_003Fcc_003Fc5b3dd8c_003FIProtoParser_00601_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AISerialize_002Ecs_002Fl_003AC_0021_003FUsers_003FFIREBAT_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F199e3c534d1e41cbb9a3a30bbf9ac93bde200_003F7d_003F9fe3ad36_003FISerialize_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AList_002Ecs_002Fl_003AC_0021_003FUsers_003F60527_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E3_003Fresharper_002Dhost_003FSourcesCache_003F1b81cb3be224213a6a73519b6e340a628d9a1fb8629c351a186a26f6376669_003FList_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ANetworkMessagingComponent_002Ecs_002Fl_003AC_0021_003FUsers_003F60527_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F5935efc3ba8745d5800392d88681b8c2ddc00_003Fdd_003Fc26349d0_003FNetworkMessagingComponent_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AScene_002Ecs_002Fl_003AC_0021_003FUsers_003FFIREBAT_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E2_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F3cbbaf32e578423d8d0163d75da8233f87e00_003F6a_003F5adfe93e_003FScene_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ASerializerManager_002Ecs_002Fl_003AC_0021_003FUsers_003FFIREBAT_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F199e3c534d1e41cbb9a3a30bbf9ac93bde200_003F9f_003Fa4f53cf4_003FSerializerManager_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ASortedOneToManyList_00602_002Ecs_002Fl_003AC_0021_003FUsers_003F60527_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F3cbbaf32e578423d8d0163d75da8233f87e00_003F12_003Fcfa98068_003FSortedOneToManyList_00602_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AWorld_002Ecs_002Fl_003AC_0021_003FUsers_003FFIREBAT_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E2_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F3cbbaf32e578423d8d0163d75da8233f87e00_003F4f_003F90b7c061_003FWorld_002Ecs/@EntryIndexedValue">ForceIncluded</s:String></wpf:ResourceDictionary>
\ No newline at end of file