协议定义

Hotfix/Chat/Handler/C2Chat_CreateChannelRequestHandler.cs

@@ -0,0 +1,26 @@
+using Fantasy;
+using Fantasy.Async;
+using Fantasy.Network.Interface;
+
+namespace NB.Chat;
+
+/// <summary>
+/// 请求创建频道
+/// </summary>
+public class
+    C2Chat_CreateChannelRequestHandler : RouteRPC<ChatUnit, C2Chat_CreateChannelRequest, Caht2C_CreateChannelResponse>
+{
+    protected override async FTask Run(ChatUnit entity, C2Chat_CreateChannelRequest request,
+        Caht2C_CreateChannelResponse response, Action reply)
+    {
+        var channelCenter = entity.Scene.GetComponent<ChatChannelCenterComponent>();
+        if (channelCenter == null)
+        {
+            response.ErrorCode = ErrorCode.ErrServer;
+            return;
+        }
+
+        var channel = await channelCenter.Create(entity);
+        
+    }
+}

Hotfix/Chat/Handler/C2Chat_JoinChannelRequestHandler.cs

@@ -24,22 +24,22 @@ public class
         if (oldChannelId > 0)
         {
             //退出旧的频道
-            if (channelCenter.TryGet(oldChannelId, out var oldChannel) && oldChannel != null)
+            var oldChannel = await channelCenter.Get(oldChannelId);
+            if (oldChannel != null)
             {
                 oldChannel.Exit(entity);
             }
         }
 
         //加入新频道
-        if (channelCenter.TryGet(request.Target, out var channel) && channel != null)
+        var newChannel = await channelCenter.Get(request.Target);
+        if (newChannel != null)
         {
-            channel.Enter(entity);
+            newChannel.Enter(entity);
         }
         else
         {
             response.ErrorCode = ErrorCode.ChatNotChannel;
         }
-
-        await FTask.CompletedTask;
     }
 }

Hotfix/Chat/Handler/C2Chat_SendMessageRequestHandler.cs

@@ -11,6 +11,14 @@ public sealed class
     protected override async FTask Run(ChatUnit chatUnit, C2Chat_SendMessageRequest request,
         Caht2C_SendMessageResponse response, Action reply)
     {
+        if (request.Type == 0) //频道聊天
+        {
+            
+        }
+        else if (request.Type == 1) //私聊
+        {
+            
+        }
         ChatSceneHelper.Broadcast(chatUnit.Scene, new ChatMessageInfo()
         {
             Content = request.Message,

Hotfix/Chat/System/ChatChannelCenterComponentSystem.cs

@@ -1,4 +1,5 @@
-using Fantasy.Entitas;
+using Fantasy.Async;
+using Fantasy.Entitas;
 using Fantasy.Entitas.Interface;
 using Fantasy.Helper;
 
@@ -22,15 +23,22 @@ public class ChatChannelCenterComponentDestroySystem : DestroySystem<ChatChannel
 public static class ChatChannelCenterComponentSystem
 {
     /// <summary>
-    /// 获取
+    /// 获取一个频道
     /// </summary>
     /// <param name="self"></param>
     /// <param name="channelId"></param>
-    /// <param name="channel"></param>
     /// <returns></returns>
-    public static bool TryGet(this ChatChannelCenterComponent self, long channelId, out ChatChannel? channel)
+    public static async FTask<ChatChannel?> Get(this ChatChannelCenterComponent self, long channelId)
     {
-        return self.Channels.TryGetValue(channelId, out channel);
+        if (self.Channels.TryGetValue(channelId, out var channel))
+        {
+            return channel;
+        }
+
+        //查数据库
+        channel = await self.Scene.World.DataBase.Query<ChatChannel>(channelId, true);
+        self.Channels.Add(channel.Id, channel);
+        return channel;
     }
 
     /// <summary>
@@ -38,22 +46,20 @@ public static class ChatChannelCenterComponentSystem
     /// </summary>
     /// <param name="self"></param>
     /// <param name="unit"></param>
-    /// <param name="channelId"></param>
     /// <returns></returns>
-    public static ChatChannel Apply(this ChatChannelCenterComponent self, ChatUnit unit, long channelId)
+    public static async FTask<ChatChannel> Create(this ChatChannelCenterComponent self, ChatUnit unit)
     {
-        if (self.Channels.TryGetValue(channelId, out var channel))
-        {
-            return channel;
-        }
-
-        channel = Entity.Create<ChatChannel>(self.Scene, channelId, true, true);
+        var channel = Entity.Create<ChatChannel>(self.Scene, true, true);
         channel.Creator = unit.Role.RoleId;
         channel.CreateTime = TimeHelper.Now;
-        self.Channels.Add(channelId, channel);
+        self.Channels.Add(channel.Id, channel);
+        //保存到数据库
+        await self.Scene.World.DataBase.Save(channel);
+
         return channel;
     }
 
+
     /// <summary>
     /// 解散
     /// </summary>