From 94af0e5ddbf30b63f206dca2040c806bb14a717d Mon Sep 17 00:00:00 2001 From: "Bob.Song" <605277374@qq.com> Date: Wed, 27 Aug 2025 18:05:55 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E8=BF=9B=E5=85=A5=E5=9C=B0?= =?UTF-8?q?=E5=9B=BE=E5=92=8C=E5=88=9B=E5=BB=BA=E6=88=BF=E9=97=B4=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E9=80=BB=E8=BE=91=E5=92=8C=E5=8D=8F=E8=AE=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Config/Binary/SceneConfigData.bytes | 3 +- Config/Excel/Server/SceneConfig.xlsx | Bin 16874 -> 16971 bytes Config/Excel/Version.txt | 2 +- Config/Json/Server/SceneConfigData.Json | 3 +- .../NetworkProtocol/Inner/InnerMessage.proto | 21 +++++ Config/NetworkProtocol/Outer/MapMessage.proto | 13 ++- .../NetworkProtocol/Outer/OuterMessage.proto | 8 ++ Entity/Gate/GateUnit.cs | 2 +- .../Generate/NetworkProtocol/InnerMessage.cs | 71 +++++++++++++++ .../Generate/NetworkProtocol/InnerOpcode.cs | 3 + Entity/Generate/NetworkProtocol/MapMessage.cs | 50 ++++++++++- .../Generate/NetworkProtocol/OuterMessage.cs | 24 +++++ .../Generate/NetworkProtocol/OuterOpcode.cs | 11 ++- Entity/Map/Entity/Map.cs | 9 ++ Entity/Map/Entity/MapUnit.cs | 5 -- Entity/Model/Def/ErrorCode.cs | 15 ++++ .../Outer/C2G_EnterRoomRequestHandler.cs | 49 ++++++++++- .../Outer/C2G_ExitRoomRequestHandler.cs | 82 ++++++++++++++++++ Hotfix/Gate/Helper/GateLoginHelper.cs | 4 - Hotfix/Gate/System/GateUnitSystem.cs | 36 ++++---- .../Handler/C2Map_CreateRoomRequestHandler.cs | 3 + .../Handler/C2Map_EnterMapRequestHandler.cs | 14 +-- .../Inner/G2Map_EnterRequestHandler.cs | 39 ++++++++- Hotfix/Map/Helper/MapFactory.cs | 20 +++++ Hotfix/Map/System/MapManageComponentSystem.cs | 61 +++++++++++++ Hotfix/Map/System/MapRoomSystem.cs | 9 +- Hotfix/Map/System/MapSystem.cs | 16 ++++ Hotfix/Map/System/MapUnitSystem.cs | 38 ++++++++ .../Map/System/RoomManageComponentSystem.cs | 17 ++-- Main/Properties/launchSettings.json | 1 + Server.sln.DotSettings.user | 1 + 31 files changed, 562 insertions(+), 68 deletions(-) create mode 100644 Hotfix/Gate/Handler/Outer/C2G_ExitRoomRequestHandler.cs create mode 100644 Hotfix/Map/Helper/MapFactory.cs create mode 100644 Hotfix/Map/System/MapManageComponentSystem.cs create mode 100644 Hotfix/Map/System/MapSystem.cs create mode 100644 Hotfix/Map/System/MapUnitSystem.cs diff --git a/Config/Binary/SceneConfigData.bytes b/Config/Binary/SceneConfigData.bytes index aecb47b..f3973aa 100644 --- a/Config/Binary/SceneConfigData.bytes +++ b/Config/Binary/SceneConfigData.bytes @@ -4,4 +4,5 @@ (" MultiThread*Gate2KCP8@VH " MultiThread*Game@VH " MultiThread*Chat@VH -" MultiThread*Map@VH \ No newline at end of file +" MultiThread*Map@VH +" MultiThread*Map@VH \ No newline at end of file diff --git a/Config/Excel/Server/SceneConfig.xlsx b/Config/Excel/Server/SceneConfig.xlsx index 56dbff95928d5aa22b29d3e2cb83ad7bdd04f0c2..c1a40f69e11b7ea5dd193e79d0339bb6148cfd83 100644 GIT binary patch delta 7132 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 U|M`FV?|2oALK=vADDoHdKUPi?KL7v# diff --git a/Config/Excel/Version.txt b/Config/Excel/Version.txt index c7407f0..a31803f 100644 --- a/Config/Excel/Version.txt +++ b/Config/Excel/Version.txt @@ -1 +1 @@ -{"WorksheetNames":[-8419147776733210060,-3495952183970875596,1720330851179383898,5812538452563588342],"Tables":{"-3495952183970875596":1756213540397,"-1088042625810372120":1753532052628,"1720330851179383898":1753711757684,"3730651590607244245":1753532052629,"5812538452563588342":1753532052630}} \ No newline at end of file +{"WorksheetNames":[-8419147776733210060,-3495952183970875596,1720330851179383898,3730651590607244245],"Tables":{"-3495952183970875596":1756269765285,"-1088042625810372120":1748918712210,"1720330851179383898":1753770985781,"3730651590607244245":1748918712210,"5812538452563588342":1751250727840}} \ No newline at end of file diff --git a/Config/Json/Server/SceneConfigData.Json b/Config/Json/Server/SceneConfigData.Json index 60bce78..95751da 100644 --- a/Config/Json/Server/SceneConfigData.Json +++ b/Config/Json/Server/SceneConfigData.Json @@ -4,5 +4,6 @@ {"Id":1003,"ProcessConfigId":1,"WorldConfigId":1,"SceneRuntimeMode":"MultiThread","SceneTypeString":"Gate","NetworkProtocol":"KCP","OuterPort":20000,"InnerPort":11021,"SceneType":3}, {"Id":1004,"ProcessConfigId":1,"WorldConfigId":1,"SceneRuntimeMode":"MultiThread","SceneTypeString":"Game","NetworkProtocol":null,"OuterPort":0,"InnerPort":11031,"SceneType":4}, {"Id":1006,"ProcessConfigId":1,"WorldConfigId":1,"SceneRuntimeMode":"MultiThread","SceneTypeString":"Chat","NetworkProtocol":null,"OuterPort":0,"InnerPort":11051,"SceneType":8}, -{"Id":1007,"ProcessConfigId":1,"WorldConfigId":1,"SceneRuntimeMode":"MultiThread","SceneTypeString":"Map","NetworkProtocol":null,"OuterPort":0,"InnerPort":11061,"SceneType":5} +{"Id":1007,"ProcessConfigId":1,"WorldConfigId":1,"SceneRuntimeMode":"MultiThread","SceneTypeString":"Map","NetworkProtocol":null,"OuterPort":0,"InnerPort":11061,"SceneType":5}, +{"Id":1008,"ProcessConfigId":1,"WorldConfigId":1,"SceneRuntimeMode":"MultiThread","SceneTypeString":"Map","NetworkProtocol":null,"OuterPort":0,"InnerPort":11062,"SceneType":5} ]} diff --git a/Config/NetworkProtocol/Inner/InnerMessage.proto b/Config/NetworkProtocol/Inner/InnerMessage.proto index 0709ff3..9b414cc 100644 --- a/Config/NetworkProtocol/Inner/InnerMessage.proto +++ b/Config/NetworkProtocol/Inner/InnerMessage.proto @@ -66,4 +66,25 @@ message Map2G_EnterRoomResponse // IRouteResponse { string RoomCode = 1; //房间代码 repeated MapUnitInfo Units = 2; //房间玩家列表 +} + + +/// 请求离开房间 +message G2Map_ExitRoomRequest // IRouteRequest,Map2G_ExiRoomResponse +{ + string RoomCode = 1; //房间代码 + int64 AccountId = 2; //账号id +} + +/// 请求离开房间响应 +message Map2G_ExiRoomResponse // IRouteResponse +{ +} + + +/// 通知网关切换地图 +message Map2G_ChangeMapMessage // IRouteMessage +{ + int32 MapId = 1; + int32 Node = 2; //站位节点 } \ No newline at end of file diff --git a/Config/NetworkProtocol/Outer/MapMessage.proto b/Config/NetworkProtocol/Outer/MapMessage.proto index 1180e62..53f04f4 100644 --- a/Config/NetworkProtocol/Outer/MapMessage.proto +++ b/Config/NetworkProtocol/Outer/MapMessage.proto @@ -27,6 +27,17 @@ message G2C_EnterRoomResponse // IResponse } +/// 请求网关离开房间 +message C2G_ExitRoomRequest // IRequest,G2C_ExitRoomResponse +{ + string RoomCode = 1; //房间代码 +} +/// 请求网关进入离开响应 +message G2C_ExitRoomResponse // IResponse +{ + string RoomCode = 1; //房间代码 +} + message C2Map_EnterMapRequest // ICustomRouteRequest,Map2C_EnterMapResponse,MapRoute { @@ -36,5 +47,5 @@ message C2Map_EnterMapRequest // ICustomRouteRequest,Map2C_EnterMapResponse,MapR message Map2C_EnterMapResponse // ICustomRouteResponse { - int32 MapId = 1; //地图id + } \ No newline at end of file diff --git a/Config/NetworkProtocol/Outer/OuterMessage.proto b/Config/NetworkProtocol/Outer/OuterMessage.proto index efc4d42..8684598 100644 --- a/Config/NetworkProtocol/Outer/OuterMessage.proto +++ b/Config/NetworkProtocol/Outer/OuterMessage.proto @@ -40,6 +40,14 @@ message G2C_RepeatLogin // IMessage } +/// 通知客户端切换地图 +message G2C_ChangeMap // IMessage +{ + int32 MapId = 1; //地图id + int32 Node = 2; //站位节点 +} + + message C2Game_GetRoleInfoRequest // ICustomRouteRequest,Game2C_GetRoleInfoResponse,GameRoute { diff --git a/Entity/Gate/GateUnit.cs b/Entity/Gate/GateUnit.cs index a37b9c6..de814d0 100644 --- a/Entity/Gate/GateUnit.cs +++ b/Entity/Gate/GateUnit.cs @@ -5,9 +5,9 @@ namespace NB.Gate; public class GateUnit : Entity { - public bool Kick; public long AccountID; public int Region; + public string RoomCode = string.Empty; public Dictionary SceneRoutes = new Dictionary(); public EntityReference Session; } \ No newline at end of file diff --git a/Entity/Generate/NetworkProtocol/InnerMessage.cs b/Entity/Generate/NetworkProtocol/InnerMessage.cs index 2519fb0..a799e68 100644 --- a/Entity/Generate/NetworkProtocol/InnerMessage.cs +++ b/Entity/Generate/NetworkProtocol/InnerMessage.cs @@ -253,4 +253,75 @@ namespace Fantasy [ProtoMember(3)] public uint ErrorCode { get; set; } } + /// + /// 请求离开房间 + /// + [ProtoContract] + public partial class G2Map_ExitRoomRequest : AMessage, IRouteRequest, IProto + { + public static G2Map_ExitRoomRequest Create(Scene scene) + { + return scene.MessagePoolComponent.Rent(); + } + public override void Dispose() + { + RoomCode = default; + AccountId = default; +#if FANTASY_NET || FANTASY_UNITY + GetScene().MessagePoolComponent.Return(this); +#endif + } + [ProtoIgnore] + public Map2G_ExiRoomResponse ResponseType { get; set; } + public uint OpCode() { return InnerOpcode.G2Map_ExitRoomRequest; } + [ProtoMember(1)] + public string RoomCode { get; set; } + [ProtoMember(2)] + public long AccountId { get; set; } + } + /// + /// 请求离开房间响应 + /// + [ProtoContract] + public partial class Map2G_ExiRoomResponse : AMessage, IRouteResponse, IProto + { + public static Map2G_ExiRoomResponse Create(Scene scene) + { + return scene.MessagePoolComponent.Rent(); + } + public override void Dispose() + { + ErrorCode = default; +#if FANTASY_NET || FANTASY_UNITY + GetScene().MessagePoolComponent.Return(this); +#endif + } + public uint OpCode() { return InnerOpcode.Map2G_ExiRoomResponse; } + [ProtoMember(1)] + public uint ErrorCode { get; set; } + } + /// + /// 通知网关切换地图 + /// + [ProtoContract] + public partial class Map2G_ChangeMapMessage : AMessage, IRouteMessage, IProto + { + public static Map2G_ChangeMapMessage Create(Scene scene) + { + return scene.MessagePoolComponent.Rent(); + } + public override void Dispose() + { + MapId = default; + Node = default; +#if FANTASY_NET || FANTASY_UNITY + GetScene().MessagePoolComponent.Return(this); +#endif + } + public uint OpCode() { return InnerOpcode.Map2G_ChangeMapMessage; } + [ProtoMember(1)] + public int MapId { get; set; } + [ProtoMember(2)] + public int Node { get; set; } + } } diff --git a/Entity/Generate/NetworkProtocol/InnerOpcode.cs b/Entity/Generate/NetworkProtocol/InnerOpcode.cs index 81c5c0b..d8c5cdf 100644 --- a/Entity/Generate/NetworkProtocol/InnerOpcode.cs +++ b/Entity/Generate/NetworkProtocol/InnerOpcode.cs @@ -12,5 +12,8 @@ namespace Fantasy public const uint Club2Chat_CreateChannel = 939534098; public const uint G2Map_EnterRoomRequest = 1073751828; public const uint Map2G_EnterRoomResponse = 1207969556; + public const uint G2Map_ExitRoomRequest = 1073751829; + public const uint Map2G_ExiRoomResponse = 1207969557; + public const uint Map2G_ChangeMapMessage = 939534099; } } diff --git a/Entity/Generate/NetworkProtocol/MapMessage.cs b/Entity/Generate/NetworkProtocol/MapMessage.cs index 9029d73..c440d81 100644 --- a/Entity/Generate/NetworkProtocol/MapMessage.cs +++ b/Entity/Generate/NetworkProtocol/MapMessage.cs @@ -119,6 +119,53 @@ namespace Fantasy [ProtoMember(3)] public uint ErrorCode { get; set; } } + /// + /// 请求网关离开房间 + /// + [ProtoContract] + public partial class C2G_ExitRoomRequest : AMessage, IRequest, IProto + { + public static C2G_ExitRoomRequest Create(Scene scene) + { + return scene.MessagePoolComponent.Rent(); + } + public override void Dispose() + { + RoomCode = default; +#if FANTASY_NET || FANTASY_UNITY + GetScene().MessagePoolComponent.Return(this); +#endif + } + [ProtoIgnore] + public G2C_ExitRoomResponse ResponseType { get; set; } + public uint OpCode() { return OuterOpcode.C2G_ExitRoomRequest; } + [ProtoMember(1)] + public string RoomCode { get; set; } + } + /// + /// 请求网关进入离开响应 + /// + [ProtoContract] + public partial class G2C_ExitRoomResponse : AMessage, IResponse, IProto + { + public static G2C_ExitRoomResponse Create(Scene scene) + { + return scene.MessagePoolComponent.Rent(); + } + public override void Dispose() + { + ErrorCode = default; + RoomCode = default; +#if FANTASY_NET || FANTASY_UNITY + GetScene().MessagePoolComponent.Return(this); +#endif + } + public uint OpCode() { return OuterOpcode.G2C_ExitRoomResponse; } + [ProtoMember(1)] + public string RoomCode { get; set; } + [ProtoMember(2)] + public uint ErrorCode { get; set; } + } [ProtoContract] public partial class C2Map_EnterMapRequest : AMessage, ICustomRouteRequest, IProto { @@ -154,15 +201,12 @@ namespace Fantasy public override void Dispose() { ErrorCode = default; - MapId = default; #if FANTASY_NET || FANTASY_UNITY GetScene().MessagePoolComponent.Return(this); #endif } public uint OpCode() { return OuterOpcode.Map2C_EnterMapResponse; } [ProtoMember(1)] - public int MapId { get; set; } - [ProtoMember(2)] public uint ErrorCode { get; set; } } } diff --git a/Entity/Generate/NetworkProtocol/OuterMessage.cs b/Entity/Generate/NetworkProtocol/OuterMessage.cs index cb9c2d8..d020beb 100644 --- a/Entity/Generate/NetworkProtocol/OuterMessage.cs +++ b/Entity/Generate/NetworkProtocol/OuterMessage.cs @@ -129,6 +129,30 @@ namespace Fantasy } public uint OpCode() { return OuterOpcode.G2C_RepeatLogin; } } + /// + /// 通知客户端切换地图 + /// + [ProtoContract] + public partial class G2C_ChangeMap : AMessage, IMessage, IProto + { + public static G2C_ChangeMap Create(Scene scene) + { + return scene.MessagePoolComponent.Rent(); + } + public override void Dispose() + { + MapId = default; + Node = default; +#if FANTASY_NET || FANTASY_UNITY + GetScene().MessagePoolComponent.Return(this); +#endif + } + public uint OpCode() { return OuterOpcode.G2C_ChangeMap; } + [ProtoMember(1)] + public int MapId { get; set; } + [ProtoMember(2)] + public int Node { get; set; } + } [ProtoContract] public partial class C2Game_GetRoleInfoRequest : AMessage, ICustomRouteRequest, IProto { diff --git a/Entity/Generate/NetworkProtocol/OuterOpcode.cs b/Entity/Generate/NetworkProtocol/OuterOpcode.cs index e380a2c..0936072 100644 --- a/Entity/Generate/NetworkProtocol/OuterOpcode.cs +++ b/Entity/Generate/NetworkProtocol/OuterOpcode.cs @@ -6,13 +6,16 @@ namespace Fantasy public const uint Map2C_CreateRoomResponse = 2415929105; public const uint C2G_EnterRoomRequest = 268445457; public const uint G2C_EnterRoomResponse = 402663185; + public const uint C2G_ExitRoomRequest = 268445458; + public const uint G2C_ExitRoomResponse = 402663186; public const uint C2Map_EnterMapRequest = 2281711378; public const uint Map2C_EnterMapResponse = 2415929106; - public const uint C2A_LoginRequest = 268445458; - public const uint A2C_LoginResponse = 402663186; - public const uint C2G_LoginRequest = 268445459; - public const uint G2C_LoginResponse = 402663187; + public const uint C2A_LoginRequest = 268445459; + public const uint A2C_LoginResponse = 402663187; + public const uint C2G_LoginRequest = 268445460; + public const uint G2C_LoginResponse = 402663188; public const uint G2C_RepeatLogin = 134227729; + public const uint G2C_ChangeMap = 134227730; public const uint C2Game_GetRoleInfoRequest = 2281711379; public const uint Game2C_GetRoleInfoResponse = 2415929107; public const uint C2Map_EnterRoomRequest = 2281711380; diff --git a/Entity/Map/Entity/Map.cs b/Entity/Map/Entity/Map.cs index 0a2046e..3bbc832 100644 --- a/Entity/Map/Entity/Map.cs +++ b/Entity/Map/Entity/Map.cs @@ -4,4 +4,13 @@ namespace NB.Map; public class Map : Entity { + /// + /// 地图配置id + /// + public int MapId; + + /// + /// 地图玩家 + /// + public Dictionary Units = new Dictionary(); } \ No newline at end of file diff --git a/Entity/Map/Entity/MapUnit.cs b/Entity/Map/Entity/MapUnit.cs index edf10b7..bab9391 100644 --- a/Entity/Map/Entity/MapUnit.cs +++ b/Entity/Map/Entity/MapUnit.cs @@ -23,10 +23,5 @@ public class MapUnit : Entity /// public int MapId; - /// - /// 当前所在房间id - /// - public int RoomId; - public long GateRouteId; } \ No newline at end of file diff --git a/Entity/Model/Def/ErrorCode.cs b/Entity/Model/Def/ErrorCode.cs index d57c45b..1c8b31f 100644 --- a/Entity/Model/Def/ErrorCode.cs +++ b/Entity/Model/Def/ErrorCode.cs @@ -69,4 +69,19 @@ public class ErrorCode /// 已在房间，不能加入另一个 /// public const uint MapRoomHave = 13004; + + /// + /// 加入服务失败 + /// + public const uint MapRoomEnterError = 13005; + + /// + /// 重复加入失败 + /// + public const uint MapRoomEnterRepeated = 13006; + + /// + /// 地图id错误 + /// + public const uint MapIdError = 13007; } \ No newline at end of file diff --git a/Hotfix/Gate/Handler/Outer/C2G_EnterRoomRequestHandler.cs b/Hotfix/Gate/Handler/Outer/C2G_EnterRoomRequestHandler.cs index bd56c76..aefa70c 100644 --- a/Hotfix/Gate/Handler/Outer/C2G_EnterRoomRequestHandler.cs +++ b/Hotfix/Gate/Handler/Outer/C2G_EnterRoomRequestHandler.cs @@ -3,10 +3,9 @@ using Fantasy.Async; using Fantasy.Network; using Fantasy.Network.Interface; using Fantasy.Platform.Net; -using NB.Common; using NB.Map; -namespace NB.Gate.Handler; +namespace NB.Gate; public class C2G_EnterRoomRequestHandler : MessageRPC { @@ -41,6 +40,13 @@ public class C2G_EnterRoomRequestHandler : MessageRPC +{ + protected override async FTask Run(Session session, C2G_ExitRoomRequest request, G2C_ExitRoomResponse response, + Action reply) + { + if (string.IsNullOrEmpty(request.RoomCode)) + { + response.ErrorCode = ErrorCode.MapRoomIdError; + return; + } + + var gateUnitSessionComponent = session.GetComponent(); + if (gateUnitSessionComponent == null) + { + response.ErrorCode = ErrorCode.ErrServer; + return; + } + + // 在缓存中检查该账号是否存在 + var gateUnitManageComponent = session.Scene.GetComponent(); + if (gateUnitManageComponent == null) + { + response.ErrorCode = ErrorCode.ErrServer; + return; + } + + var gateUnit = gateUnitManageComponent.Get(gateUnitSessionComponent.AccountID); + if (gateUnit == null) + { + response.ErrorCode = ErrorCode.ErrServer; + return; + } + + if (gateUnit.RoomCode != request.RoomCode) + { + response.ErrorCode = ErrorCode.MapRoomIdError; + return; + } + + + RoomHelper.ParseCode(request.RoomCode, out var serviceId, out var roomId); + if (serviceId < 1 || roomId < 1) + { + response.ErrorCode = ErrorCode.MapRoomIdError; + return; + } + + var sceneConfig = SceneConfigData.Instance.Get(serviceId); + if (sceneConfig == null) + { + response.ErrorCode = ErrorCode.MapRoomIdError; + return; + } + + //执行退出房间操作 + var roomResponse = (Map2G_ExiRoomResponse)await session.Scene.NetworkMessagingComponent.CallInnerRoute( + sceneConfig.RouteId, new G2Map_ExitRoomRequest() + { + AccountId = gateUnit.Id, + RoomCode = request.RoomCode, + }); + if (roomResponse.ErrorCode != 0) + { + response.ErrorCode = ErrorCode.MapRoomIdError; + return; + } + + gateUnit.RoomCode = string.Empty; + + response.RoomCode = request.RoomCode; + response.ErrorCode = ErrorCode.Successful; + } +} \ No newline at end of file diff --git a/Hotfix/Gate/Helper/GateLoginHelper.cs b/Hotfix/Gate/Helper/GateLoginHelper.cs index 05b0f03..79c30ef 100644 --- a/Hotfix/Gate/Helper/GateLoginHelper.cs +++ b/Hotfix/Gate/Helper/GateLoginHelper.cs @@ -62,10 +62,6 @@ public static class GateLoginHelper //通知服务器下线 Log.Info($"断线的session id={sessionId}"); var ret = await gateUnit.Offline(sessionId, RouteType.GameRoute, RouteType.SocialRoute, RouteType.MapRoute); - - // await GameSceneHelper.Offline(gateUnit.Scene, gateUnit.AccountID, sessionId); - // await SocialSceneHelper.Offline(gateUnit.Scene, gateUnit.AccountID, sessionId, - // gateUnit.ChatSceneRouteId); return ret; } diff --git a/Hotfix/Gate/System/GateUnitSystem.cs b/Hotfix/Gate/System/GateUnitSystem.cs index 6bbcc1e..2186177 100644 --- a/Hotfix/Gate/System/GateUnitSystem.cs +++ b/Hotfix/Gate/System/GateUnitSystem.cs @@ -2,6 +2,7 @@ using Fantasy.Async; using Fantasy.Entitas.Interface; using Fantasy.Network; +using Fantasy.Platform.Net; using NB.Common; // ReSharper disable ConditionIsAlwaysTrueOrFalseAccordingToNullableAPIContract @@ -13,7 +14,9 @@ public class GateUnitDestroySystem : DestroySystem protected override void Destroy(GateUnit self) { self.AccountID = 0; - self.Kick = false; + self.Region = 0; + self.SceneRoutes.Clear(); + self.RoomCode = string.Empty; } } @@ -21,15 +24,9 @@ public static class GateUnitSystem { #region Address - public static void RemoveAddress(this GateUnit self, int routType, long routeId) + public static void RemoveAddress(this GateUnit self, int routType) { - if (self.SceneRoutes.TryGetValue(routType, out var route)) - { - if (route == routeId) - { - self.SceneRoutes.Remove(routType); - } - } + self.SceneRoutes.Remove(routType); } public static void AddAddress(this GateUnit self, int routType, long routeId) @@ -61,7 +58,7 @@ public static class GateUnitSystem return ErrorCode.Successful; } - public static async FTask Online(this GateUnit self, int routeType) + public static async FTask Online(this GateUnit self, int routeType, SceneConfig? sceneConfig = null) { Session session = self.Session; var routeComponent = session.GetComponent(); @@ -69,9 +66,13 @@ public static class GateUnitSystem { routeComponent = session.AddComponent(); } - - var gameSceneConfig = SceneConfigHelper.GetConfigByRouteType(routeType); - var gameRouteId = gameSceneConfig.RouteId; + + if (sceneConfig == null) + { + sceneConfig = SceneConfigHelper.GetConfigByRouteType(routeType); + } + + var gameRouteId = sceneConfig.RouteId; var gameResponse = (G2Common_EnterResponse)await self.Scene.NetworkMessagingComponent.CallInnerRoute( gameRouteId, new G2Common_EnterRequest() @@ -85,8 +86,10 @@ public static class GateUnitSystem return gameResponse.ErrorCode; } + routeComponent.RemoveAddress(routeType); routeComponent.AddAddress(routeType, gameResponse.UnitRouteId); self.AddAddress(routeType, gameResponse.UnitRouteId); + self.AddAddress(sceneConfig.SceneType, gameRouteId); return ErrorCode.Successful; } @@ -111,7 +114,8 @@ public static class GateUnitSystem public static async FTask Offline(this GateUnit self, long sessionId, int routeType) { - var sceneRouteId = self.GetAddress(routeType); + var sceneConfig = SceneConfigHelper.GetConfigByRouteType(routeType); + var sceneRouteId = sceneConfig.RouteId; if (sceneRouteId < 1) return ErrorCode.Successful; for (int i = 0; i < 10; i++) { @@ -123,7 +127,9 @@ public static class GateUnitSystem }); if (gameResponse.ErrorCode == 0) { - self.RemoveAddress(routeType, sceneRouteId); + //TODO:这里需要清理掉记录的数据 + self.RemoveAddress(routeType); + self.RemoveAddress(sceneConfig.SceneType); return ErrorCode.Successful; } } diff --git a/Hotfix/Map/Handler/C2Map_CreateRoomRequestHandler.cs b/Hotfix/Map/Handler/C2Map_CreateRoomRequestHandler.cs index 3d60f11..325ae54 100644 --- a/Hotfix/Map/Handler/C2Map_CreateRoomRequestHandler.cs +++ b/Hotfix/Map/Handler/C2Map_CreateRoomRequestHandler.cs @@ -39,6 +39,9 @@ public class C2Map_CreateRoomRequestHandler : RouteRPC 0) - // { - // response.ErrorCode = ErrorCode.MapRoomHave; - // return; - // } - // - // roomManageComponent.Enter(entity, request.RoomId); - Log.Info($"进入地图=== map:{request.MapId}"); - entity.MapId = request.MapId; - response.MapId = request.MapId; - - await FTask.CompletedTask; + response.ErrorCode = await entity.EnterMap(request.MapId); } } \ No newline at end of file diff --git a/Hotfix/Map/Handler/Inner/G2Map_EnterRequestHandler.cs b/Hotfix/Map/Handler/Inner/G2Map_EnterRequestHandler.cs index eeb03a6..8bc59cd 100644 --- a/Hotfix/Map/Handler/Inner/G2Map_EnterRequestHandler.cs +++ b/Hotfix/Map/Handler/Inner/G2Map_EnterRequestHandler.cs @@ -15,13 +15,48 @@ public class G2Map_EnterRequestHandler : RouteRPC(); + if (mapUnitManage == null) + { + response.ErrorCode = ErrorCode.ErrServer; + return; + } + + var mapUnit = mapUnitManage.Get(request.AccountId); + if (mapUnit == null) + { + response.ErrorCode = ErrorCode.ErrServer; + return; + } + + RoomHelper.ParseCode(request.RoomCode, out var serviceId, out var roomId); if (serviceId < 1 || roomId < 1) { response.ErrorCode = ErrorCode.MapRoomIdError; return; } - // roomManageComponent.Enter(); + + var room = roomManageComponent.Get(roomId); + if (room == null) + { + response.ErrorCode = ErrorCode.MapRoomIdError; + return; + } + + if (mapUnit.MapId != room.Map) + { + //切换地图 + response.ErrorCode = await mapUnit.EnterMap(mapUnit.MapId); + if (response.ErrorCode != 0) + { + return; + } + } + + + response.ErrorCode = await room.Enter(request.AccountId); + response.RoomCode = room.Code; } } \ No newline at end of file diff --git a/Hotfix/Map/Helper/MapFactory.cs b/Hotfix/Map/Helper/MapFactory.cs new file mode 100644 index 0000000..dad3195 --- /dev/null +++ b/Hotfix/Map/Helper/MapFactory.cs @@ -0,0 +1,20 @@ +using Fantasy; +using Fantasy.Entitas; + +namespace NB.Map; + +public class MapFactory +{ + /// + /// 创建一个地图 + /// + /// + /// + /// + public static Map? Create(Scene scene, int mapId) + { + var map = Entity.Create(scene, true, true); + map.MapId = mapId; + return map; + } +} \ No newline at end of file diff --git a/Hotfix/Map/System/MapManageComponentSystem.cs b/Hotfix/Map/System/MapManageComponentSystem.cs new file mode 100644 index 0000000..900bc2c --- /dev/null +++ b/Hotfix/Map/System/MapManageComponentSystem.cs @@ -0,0 +1,61 @@ +using Fantasy.Entitas; +using Fantasy.Entitas.Interface; + +namespace NB.Map; + +public class MapManageComponentDestroySystem : DestroySystem +{ + protected override void Destroy(MapManageComponent self) + { + foreach (var (_, map) in self.Maps) + { + map.Dispose(); + } + + self.Maps.Clear(); + } +} + +public class MapManageComponentAwakeSystem : AwakeSystem +{ + protected override void Awake(MapManageComponent self) + { + //初始化所有地图 + for (int i = 1; i < 100; i++) + { + //初始化100个地图 + var map = MapFactory.Create(self.Scene, i); + if (map != null) + { + self.Add(map); + } + } + } +} + +public static class MapManageComponentSystem +{ + #region 增删 + + public static void Add(this MapManageComponent self, Map map) + { + self.Maps[map.MapId] = map; + } + + public static bool Remove(this MapManageComponent self, int mapId) + { + if (self.Maps.TryGetValue(mapId, out var map)) + { + map.Dispose(); + } + + return true; + } + + public static Map? Get(this MapManageComponent self, int mapId) + { + return self.Maps.GetValueOrDefault(mapId); + } + + #endregion +} \ No newline at end of file diff --git a/Hotfix/Map/System/MapRoomSystem.cs b/Hotfix/Map/System/MapRoomSystem.cs index 2b4cdfb..149260e 100644 --- a/Hotfix/Map/System/MapRoomSystem.cs +++ b/Hotfix/Map/System/MapRoomSystem.cs @@ -1,4 +1,6 @@ -using Fantasy.Entitas.Interface; +using Fantasy; +using Fantasy.Async; +using Fantasy.Entitas.Interface; namespace NB.Map; @@ -16,4 +18,9 @@ public class MapRoomDestroySystem : DestroySystem public static class MapRoomSystem { + public static async FTask Enter(this MapRoom self, long unitId) + { + await FTask.CompletedTask; + return ErrorCode.Successful; + } } \ No newline at end of file diff --git a/Hotfix/Map/System/MapSystem.cs b/Hotfix/Map/System/MapSystem.cs new file mode 100644 index 0000000..a27e3d5 --- /dev/null +++ b/Hotfix/Map/System/MapSystem.cs @@ -0,0 +1,16 @@ +using Fantasy.Entitas.Interface; + +namespace NB.Map; + +public class MapDestroySystem : DestroySystem +{ + protected override void Destroy(Map self) + { + self.MapId = 0; + self.Units.Clear(); + } +} + +public static class MapSystem +{ +} \ No newline at end of file diff --git a/Hotfix/Map/System/MapUnitSystem.cs b/Hotfix/Map/System/MapUnitSystem.cs new file mode 100644 index 0000000..529d1cd --- /dev/null +++ b/Hotfix/Map/System/MapUnitSystem.cs @@ -0,0 +1,38 @@ +using Fantasy; +using Fantasy.Async; +using Fantasy.Entitas.Interface; +using Unity.Mathematics; + +namespace NB.Map; + +public class MapUnitSystemDestroySystem : DestroySystem +{ + protected override void Destroy(MapUnit self) + { + self.MapId = 0; + self.Position = float3.zero; + self.Rotation = float4.zero; + self.GateRouteId = 0L; + } +} + +public static class MapUnitSystem +{ + public static async FTask EnterMap(this MapUnit self, int mapId) + { + var mapManageComponent = self.Scene.GetComponent(); + + var map = mapManageComponent.Get(mapId); + if (map == null) + { + return ErrorCode.MapIdError; + } + + // map.en + + await FTask.CompletedTask; + + + return ErrorCode.Successful; + } +} \ No newline at end of file diff --git a/Hotfix/Map/System/RoomManageComponentSystem.cs b/Hotfix/Map/System/RoomManageComponentSystem.cs index d759524..2f4d5e2 100644 --- a/Hotfix/Map/System/RoomManageComponentSystem.cs +++ b/Hotfix/Map/System/RoomManageComponentSystem.cs @@ -46,7 +46,10 @@ public static class RoomManageComponentSystem return true; } - + public static MapRoom? Get(this RoomManageComponent self, int roomId) + { + return self.Rooms.GetValueOrDefault(roomId); + } #endregion #region 房间Id @@ -79,15 +82,5 @@ public static class RoomManageComponentSystem #endregion - #region 进入退出 - - public static void Enter(this RoomManageComponent self, MapUnit unit, long roomId) - { - } - - public static void Exit(this RoomManageComponent self, MapUnit unit) - { - } - - #endregion + } \ No newline at end of file diff --git a/Main/Properties/launchSettings.json b/Main/Properties/launchSettings.json index b30e999..90a0233 100644 --- a/Main/Properties/launchSettings.json +++ b/Main/Properties/launchSettings.json @@ -3,6 +3,7 @@ "profiles": { "Main": { "commandName": "Project", + "workingDirectory": "$(OutputPath)", "environmentVariables": {}, "commandLineArgs": "--m Develop" } diff --git a/Server.sln.DotSettings.user b/Server.sln.DotSettings.user index 3d97d67..5c51dc1 100644 --- a/Server.sln.DotSettings.user +++ b/Server.sln.DotSettings.user @@ -21,6 +21,7 @@ ForceIncluded ForceIncluded ForceIncluded + ForceIncluded ForceIncluded ForceIncluded ForceIncluded