From 7dad49bf5f6804ebdb38785ae84352a1064ecac6 Mon Sep 17 00:00:00 2001 From: BobSong <605277374@qq.com> Date: Sun, 7 Sep 2025 23:51:17 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=92=E8=89=B2=E6=8E=A7=E5=88=B6=E5=92=8C?= =?UTF-8?q?=E6=88=BF=E9=97=B4=E8=BF=9B=E5=85=A5=E6=8E=A8=E9=80=81?= 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 16971 -> 16894 bytes Config/Excel/Version.txt | 2 +- Config/Json/Server/SceneConfigData.Json | 3 +- Config/NetworkProtocol/Outer/MapMessage.proto | 2 +- .../NetworkProtocol/Outer/OuterMessage.proto | 4 +- .../NetworkProtocol/Outer/RoomMessage.proto | 63 +++--- .../Outer/data/MapProtoData.proto | 23 +- Entity/Generate/NetworkProtocol/MapMessage.cs | 2 +- .../Generate/NetworkProtocol/MapProtoData.cs | 53 ++--- .../Generate/NetworkProtocol/OuterMessage.cs | 4 +- .../Generate/NetworkProtocol/OuterOpcode.cs | 81 +++---- .../Generate/NetworkProtocol/RoomMessage.cs | 199 ++++++++++-------- Entity/Map/Component/RoomManageComponent.cs | 2 + Entity/Map/Entity/MapUnit.cs | 7 +- .../C2Game_GetRoleInfoRequestHandler.cs | 2 +- .../Outer/C2G_EnterRoomRequestHandler.cs | 3 +- .../Handler/Outer/C2G_LoginRequestHandler.cs | 2 +- .../Handler/C2Map_CreateRoomRequestHandler.cs | 13 +- Hotfix/Map/Handler/C2Map_LookHandler.cs | 33 +++ Hotfix/Map/Handler/C2Map_MoveHandler.cs | 38 ++++ ...er.cs => G2Map_EnterRoomRequestHandler.cs} | 13 +- .../Inner/G2Map_ExitRoomRequestHandler.cs | 13 ++ Hotfix/Map/System/MapRoomSystem.cs | 27 ++- Hotfix/Map/System/MapUnitSystem.cs | 23 +- .../Map/System/RoomManageComponentSystem.cs | 25 ++- Hotfix/OnCreateSceneEvent.cs | 3 + Hotfix/OnSceneCreate_Init.cs | 10 +- 28 files changed, 432 insertions(+), 221 deletions(-) create mode 100644 Hotfix/Map/Handler/C2Map_LookHandler.cs create mode 100644 Hotfix/Map/Handler/C2Map_MoveHandler.cs rename Hotfix/Map/Handler/Inner/{G2Map_EnterRequestHandler.cs => G2Map_EnterRoomRequestHandler.cs} (81%) create mode 100644 Hotfix/Map/Handler/Inner/G2Map_ExitRoomRequestHandler.cs diff --git a/Config/Binary/SceneConfigData.bytes b/Config/Binary/SceneConfigData.bytes index f3973aa..aecb47b 100644 --- a/Config/Binary/SceneConfigData.bytes +++ b/Config/Binary/SceneConfigData.bytes @@ -4,5 +4,4 @@ (" MultiThread*Gate2KCP8@VH " MultiThread*Game@VH " MultiThread*Chat@VH -" MultiThread*Map@VH -" MultiThread*Map@VH \ No newline at end of file +" MultiThread*Map@VH \ No newline at end of file diff --git a/Config/Excel/Server/SceneConfig.xlsx b/Config/Excel/Server/SceneConfig.xlsx index c1a40f69e11b7ea5dd193e79d0339bb6148cfd83..e2fbd61b90b96f2c2e01d517308d4ef3ac938029 100644 GIT binary patch delta 7047 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 aG@+g$AXxkfF$=077-49?^@?O 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 diff --git a/Config/Excel/Version.txt b/Config/Excel/Version.txt index a31803f..bf43dff 100644 --- a/Config/Excel/Version.txt +++ b/Config/Excel/Version.txt @@ -1 +1 @@ -{"WorksheetNames":[-8419147776733210060,-3495952183970875596,1720330851179383898,3730651590607244245],"Tables":{"-3495952183970875596":1756269765285,"-1088042625810372120":1748918712210,"1720330851179383898":1753770985781,"3730651590607244245":1748918712210,"5812538452563588342":1751250727840}} \ No newline at end of file +{"WorksheetNames":[-8419147776733210060,-3495952183970875596,-1088042625810372120,1720330851179383898],"Tables":{"-3495952183970875596":1757242691062,"-1088042625810372120":1753532052628,"1720330851179383898":1753711757684,"3730651590607244245":1753532052629,"5812538452563588342":1753532052630}} \ No newline at end of file diff --git a/Config/Json/Server/SceneConfigData.Json b/Config/Json/Server/SceneConfigData.Json index 95751da..60bce78 100644 --- a/Config/Json/Server/SceneConfigData.Json +++ b/Config/Json/Server/SceneConfigData.Json @@ -4,6 +4,5 @@ {"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":1008,"ProcessConfigId":1,"WorldConfigId":1,"SceneRuntimeMode":"MultiThread","SceneTypeString":"Map","NetworkProtocol":null,"OuterPort":0,"InnerPort":11062,"SceneType":5} +{"Id":1007,"ProcessConfigId":1,"WorldConfigId":1,"SceneRuntimeMode":"MultiThread","SceneTypeString":"Map","NetworkProtocol":null,"OuterPort":0,"InnerPort":11061,"SceneType":5} ]} diff --git a/Config/NetworkProtocol/Outer/MapMessage.proto b/Config/NetworkProtocol/Outer/MapMessage.proto index a85299b..d2c7271 100644 --- a/Config/NetworkProtocol/Outer/MapMessage.proto +++ b/Config/NetworkProtocol/Outer/MapMessage.proto @@ -42,7 +42,7 @@ message G2C_ExitRoomResponse // IResponse message C2Map_EnterMapRequest // ICustomRouteRequest,Map2C_EnterMapResponse,MapRoute { int32 MapId = 1;//地图id - int64 RoomId = 2;//房间id，如果联机则有 + string RoomId = 2;//房间id，如果联机则有 } message Map2C_EnterMapResponse // ICustomRouteResponse diff --git a/Config/NetworkProtocol/Outer/OuterMessage.proto b/Config/NetworkProtocol/Outer/OuterMessage.proto index efc4d42..33ff081 100644 --- a/Config/NetworkProtocol/Outer/OuterMessage.proto +++ b/Config/NetworkProtocol/Outer/OuterMessage.proto @@ -47,6 +47,6 @@ message C2Game_GetRoleInfoRequest // ICustomRouteRequest,Game2C_GetRoleInfoRespo message Game2C_GetRoleInfoResponse // ICustomRouteResponse { - RoleInfo RoleInfo = 1; //账号信息 - int64 RoomId = 2; //所在房间 + RoleInfo RoleInfo = 1; //账号信息 + string RoomCode = 2; //所在房间 } \ No newline at end of file diff --git a/Config/NetworkProtocol/Outer/RoomMessage.proto b/Config/NetworkProtocol/Outer/RoomMessage.proto index a066192..f93990c 100644 --- a/Config/NetworkProtocol/Outer/RoomMessage.proto +++ b/Config/NetworkProtocol/Outer/RoomMessage.proto @@ -2,36 +2,15 @@ syntax = "proto3"; package Fantasy.Network.Message; -message C2Map_EnterRoomRequest // ICustomRouteRequest,Map2C_EnterRoomResponse,MapRoute -{ - int32 MapId = 1;//房间id - string Password = 2;//进入密码 -} - -message Map2C_EnterRoomResponse // ICustomRouteResponse -{ - int32 MapId = 1;//地图id - int64 RoomId = 2;//房间id -} - - - - -message C2Map_Move // ICustomRouteMessage,MapRoute -{ - MapUnitPositionInfo Location = 1; - bool IsStop = 2; -} - ///用户进入地图 -message Map2C_RoleEnterMapNotify // ICustomRouteMessage,MapRoute +message Map2C_RoleEnterRoomNotify // ICustomRouteMessage,MapRoute { MapUnitInfo Info = 1; } ///用户离开地图 -message Map2C_RoleExitMapNotify // ICustomRouteMessage,MapRoute +message Map2C_RoleExitRoomNotify // ICustomRouteMessage,MapRoute { int64 Id = 1;//离开人员 } @@ -57,9 +36,39 @@ message Map2C_RoleGearChangeNotify // ICustomRouteMessage,MapRoute GearInfo Gears = 2; //钓组数据 } -///玩家位置变化 -message Map2C_MoveNotify +//************** 移动 旋转 ********************** +// 角色移动 +message C2Map_Move // ICustomRouteMessage,MapRoute { - int64 Id = 1; - MapUnitPositionInfo Location = 2; + Vector3Info Position = 1; //当前位置 + Vector3Info Rotation = 2; //角色方向 + Vector3Info Direction = 3; // 移动方向 + bool IsStop = 4; // 是否是停止移动 + int64 Timestamp = 5; // 时间点 +} + +// 角色朝向变化 +message C2Map_Look // ICustomRouteMessage,MapRoute +{ + Vector3Info Rotation = 1; //角色方向 + int64 Timestamp = 2; // 时间点 +} + +///玩家移动推送 +message Map2C_MoveNotify // ICustomRouteMessage,MapRoute +{ + int64 Id = 1; // id + Vector3Info Position = 2; //当前位置 + Vector3Info Rotation = 3; //角色方向 + Vector3Info Direction = 4; // 移动方向 + bool IsStop = 5; // 是否停止移动 + int64 Timestamp = 6; // 时间点 +} + +///玩家旋转推送 +message Map2C_LookeNotify // ICustomRouteMessage,MapRoute +{ + int64 Id = 1; // id + Vector3Info Rotation = 2; //角色方向 + int64 Timestamp = 3; // 时间点 } \ No newline at end of file diff --git a/Config/NetworkProtocol/Outer/data/MapProtoData.proto b/Config/NetworkProtocol/Outer/data/MapProtoData.proto index d99c696..74678d3 100644 --- a/Config/NetworkProtocol/Outer/data/MapProtoData.proto +++ b/Config/NetworkProtocol/Outer/data/MapProtoData.proto @@ -4,6 +4,13 @@ message Vector3Info float y = 2; float z = 3; } + +message Vector2Info +{ + float x = 1; + float y = 2; +} + message QuaternionInfo { float x = 1; @@ -30,15 +37,11 @@ message MapUnitInfo { int64 Id = 1; //用户id RoleSimpleInfo RoleInfo = 2; //基础信息 - MapUnitPositionInfo Location = 3; //位置信息 - UnitStateInfo State = 4; //状态信息 - GearInfo Gears = 5; //钓组数据 - UnitFishingInfo FishingInfo = 6; //钓鱼状态信息 - repeated KeyValueInt32 KV = 7; //属性信息 + Vector3Info Position = 3; //当前位置 + Vector3Info Rotation = 4; //角色方向 + UnitStateInfo State = 5; //状态信息 + GearInfo Gears = 6; //钓组数据 + UnitFishingInfo FishingInfo = 7; //钓鱼状态信息 + repeated KeyValueInt32 KV = 8; //属性信息 } -message MapUnitPositionInfo -{ - Vector3Info Position = 1; - QuaternionInfo Rotation = 2; -} diff --git a/Entity/Generate/NetworkProtocol/MapMessage.cs b/Entity/Generate/NetworkProtocol/MapMessage.cs index 826bf4a..afd2283 100644 --- a/Entity/Generate/NetworkProtocol/MapMessage.cs +++ b/Entity/Generate/NetworkProtocol/MapMessage.cs @@ -189,7 +189,7 @@ namespace Fantasy [ProtoMember(1)] public int MapId { get; set; } [ProtoMember(2)] - public long RoomId { get; set; } + public string RoomId { get; set; } } [ProtoContract] public partial class Map2C_EnterMapResponse : AMessage, ICustomRouteResponse, IProto diff --git a/Entity/Generate/NetworkProtocol/MapProtoData.cs b/Entity/Generate/NetworkProtocol/MapProtoData.cs index 3206a8c..1d7a095 100644 --- a/Entity/Generate/NetworkProtocol/MapProtoData.cs +++ b/Entity/Generate/NetworkProtocol/MapProtoData.cs @@ -41,6 +41,26 @@ namespace Fantasy public float z { get; set; } } [ProtoContract] + public partial class Vector2Info : AMessage, IProto + { + public static Vector2Info Create(Scene scene) + { + return scene.MessagePoolComponent.Rent(); + } + public override void Dispose() + { + x = default; + y = default; +#if FANTASY_NET || FANTASY_UNITY + GetScene().MessagePoolComponent.Return(this); +#endif + } + [ProtoMember(1)] + public float x { get; set; } + [ProtoMember(2)] + public float y { get; set; } + } + [ProtoContract] public partial class QuaternionInfo : AMessage, IProto { public static QuaternionInfo Create(Scene scene) @@ -123,7 +143,8 @@ namespace Fantasy { Id = default; RoleInfo = default; - Location = default; + Position = default; + Rotation = default; State = default; Gears = default; FishingInfo = default; @@ -137,34 +158,16 @@ namespace Fantasy [ProtoMember(2)] public RoleSimpleInfo RoleInfo { get; set; } [ProtoMember(3)] - public MapUnitPositionInfo Location { get; set; } + public Vector3Info Position { get; set; } [ProtoMember(4)] - public UnitStateInfo State { get; set; } + public Vector3Info Rotation { get; set; } [ProtoMember(5)] - public GearInfo Gears { get; set; } + public UnitStateInfo State { get; set; } [ProtoMember(6)] - public UnitFishingInfo FishingInfo { get; set; } + public GearInfo Gears { get; set; } [ProtoMember(7)] + public UnitFishingInfo FishingInfo { get; set; } + [ProtoMember(8)] public List KV = new List(); } - [ProtoContract] - public partial class MapUnitPositionInfo : AMessage, IProto - { - public static MapUnitPositionInfo Create(Scene scene) - { - return scene.MessagePoolComponent.Rent(); - } - public override void Dispose() - { - Position = default; - Rotation = default; -#if FANTASY_NET || FANTASY_UNITY - GetScene().MessagePoolComponent.Return(this); -#endif - } - [ProtoMember(1)] - public Vector3Info Position { get; set; } - [ProtoMember(2)] - public QuaternionInfo Rotation { get; set; } - } } diff --git a/Entity/Generate/NetworkProtocol/OuterMessage.cs b/Entity/Generate/NetworkProtocol/OuterMessage.cs index cb9c2d8..4af2453 100644 --- a/Entity/Generate/NetworkProtocol/OuterMessage.cs +++ b/Entity/Generate/NetworkProtocol/OuterMessage.cs @@ -159,7 +159,7 @@ namespace Fantasy { ErrorCode = default; RoleInfo = default; - RoomId = default; + RoomCode = default; #if FANTASY_NET || FANTASY_UNITY GetScene().MessagePoolComponent.Return(this); #endif @@ -168,7 +168,7 @@ namespace Fantasy [ProtoMember(1)] public RoleInfo RoleInfo { get; set; } [ProtoMember(2)] - public long RoomId { get; set; } + public string RoomCode { get; set; } [ProtoMember(3)] public uint ErrorCode { get; set; } } diff --git a/Entity/Generate/NetworkProtocol/OuterOpcode.cs b/Entity/Generate/NetworkProtocol/OuterOpcode.cs index 99f7913..ff1527b 100644 --- a/Entity/Generate/NetworkProtocol/OuterOpcode.cs +++ b/Entity/Generate/NetworkProtocol/OuterOpcode.cs @@ -18,45 +18,46 @@ namespace Fantasy public const uint G2C_RepeatLogin = 134227729; public const uint C2Game_GetRoleInfoRequest = 2281711379; public const uint Game2C_GetRoleInfoResponse = 2415929107; - public const uint C2Map_EnterRoomRequest = 2281711380; - public const uint Map2C_EnterRoomResponse = 2415929108; - public const uint C2Map_Move = 2147493650; - public const uint Map2C_RoleEnterMapNotify = 2147493651; - public const uint Map2C_RoleExitMapNotify = 2147493652; - public const uint Map2C_RoleStateNotify = 2147493653; - public const uint Map2C_RoleGearStateNotify = 2147493654; - public const uint Map2C_RoleGearChangeNotify = 2147493655; - public const uint C2S_GetConversationsRequest = 2281711381; - public const uint S2C_GetConversationsResponse = 2415929109; - public const uint C2S_SendMailRequest = 2281711382; - public const uint S2C_SendMailResponse = 2415929110; - public const uint C2S_DeleteMailRequest = 2281711383; - public const uint S2C_DeleteMailResponse = 2415929111; - public const uint S2C_HaveMail = 2147493656; - public const uint S2C_MailState = 2147493657; - public const uint C2S_CreateChannelRequest = 2281711384; - public const uint S2C_CreateChannelResponse = 2415929112; - public const uint C2S_JoinChannelRequest = 2281711385; - public const uint S2C_JoinChannelResponse = 2415929113; - public const uint C2S_SendMessageRequest = 2281711386; - public const uint S2C_SendMessageResponse = 2415929114; - public const uint S2C_Message = 2147493658; - public const uint C2S_CreateClubRequest = 2281711387; - public const uint S2C_CreateClubResponse = 2415929115; - public const uint C2S_GetClubInfoRequest = 2281711388; - public const uint S2C_GetClubInfoResponse = 2415929116; - public const uint C2S_GetMemberListRequest = 2281711389; - public const uint S2C_GetMemberListResponse = 2415929117; - public const uint C2S_GetClubListRequest = 2281711390; - public const uint S2C_GetClubListResponse = 2415929118; - public const uint C2S_JoinClubRequest = 2281711391; - public const uint S2C_JoinClubResponse = 2415929119; - public const uint C2S_LeaveClubRequest = 2281711392; - public const uint S2C_LeaveClubResponse = 2415929120; - public const uint C2S_DissolveClubRequest = 2281711393; - public const uint S2C_DissolveClubResponse = 2415929121; - public const uint C2S_DisposeJoinRequest = 2281711394; - public const uint S2C_DisposeJoinResponse = 2415929122; - public const uint S2C_ClubChange = 2147493659; + public const uint Map2C_RoleEnterRoomNotify = 2147493650; + public const uint Map2C_RoleExitRoomNotify = 2147493651; + public const uint Map2C_RoleStateNotify = 2147493652; + public const uint Map2C_RoleGearStateNotify = 2147493653; + public const uint Map2C_RoleGearChangeNotify = 2147493654; + public const uint C2Map_Move = 2147493655; + public const uint C2Map_Look = 2147493656; + public const uint Map2C_MoveNotify = 2147493657; + public const uint Map2C_LookeNotify = 2147493658; + public const uint C2S_GetConversationsRequest = 2281711380; + public const uint S2C_GetConversationsResponse = 2415929108; + public const uint C2S_SendMailRequest = 2281711381; + public const uint S2C_SendMailResponse = 2415929109; + public const uint C2S_DeleteMailRequest = 2281711382; + public const uint S2C_DeleteMailResponse = 2415929110; + public const uint S2C_HaveMail = 2147493659; + public const uint S2C_MailState = 2147493660; + public const uint C2S_CreateChannelRequest = 2281711383; + public const uint S2C_CreateChannelResponse = 2415929111; + public const uint C2S_JoinChannelRequest = 2281711384; + public const uint S2C_JoinChannelResponse = 2415929112; + public const uint C2S_SendMessageRequest = 2281711385; + public const uint S2C_SendMessageResponse = 2415929113; + public const uint S2C_Message = 2147493661; + public const uint C2S_CreateClubRequest = 2281711386; + public const uint S2C_CreateClubResponse = 2415929114; + public const uint C2S_GetClubInfoRequest = 2281711387; + public const uint S2C_GetClubInfoResponse = 2415929115; + public const uint C2S_GetMemberListRequest = 2281711388; + public const uint S2C_GetMemberListResponse = 2415929116; + public const uint C2S_GetClubListRequest = 2281711389; + public const uint S2C_GetClubListResponse = 2415929117; + public const uint C2S_JoinClubRequest = 2281711390; + public const uint S2C_JoinClubResponse = 2415929118; + public const uint C2S_LeaveClubRequest = 2281711391; + public const uint S2C_LeaveClubResponse = 2415929119; + public const uint C2S_DissolveClubRequest = 2281711392; + public const uint S2C_DissolveClubResponse = 2415929120; + public const uint C2S_DisposeJoinRequest = 2281711393; + public const uint S2C_DisposeJoinResponse = 2415929121; + public const uint S2C_ClubChange = 2147493662; } } diff --git a/Entity/Generate/NetworkProtocol/RoomMessage.cs b/Entity/Generate/NetworkProtocol/RoomMessage.cs index f4c6b52..29835f9 100644 --- a/Entity/Generate/NetworkProtocol/RoomMessage.cs +++ b/Entity/Generate/NetworkProtocol/RoomMessage.cs @@ -17,96 +17,24 @@ using Fantasy.Serialize; namespace Fantasy { - [ProtoContract] - public partial class C2Map_EnterRoomRequest : AMessage, ICustomRouteRequest, IProto - { - public static C2Map_EnterRoomRequest Create(Scene scene) - { - return scene.MessagePoolComponent.Rent(); - } - public override void Dispose() - { - MapId = default; - Password = default; -#if FANTASY_NET || FANTASY_UNITY - GetScene().MessagePoolComponent.Return(this); -#endif - } - [ProtoIgnore] - public Map2C_EnterRoomResponse ResponseType { get; set; } - public uint OpCode() { return OuterOpcode.C2Map_EnterRoomRequest; } - [ProtoIgnore] - public int RouteType => Fantasy.RouteType.MapRoute; - [ProtoMember(1)] - public int MapId { get; set; } - [ProtoMember(2)] - public string Password { get; set; } - } - [ProtoContract] - public partial class Map2C_EnterRoomResponse : AMessage, ICustomRouteResponse, IProto - { - public static Map2C_EnterRoomResponse Create(Scene scene) - { - return scene.MessagePoolComponent.Rent(); - } - public override void Dispose() - { - ErrorCode = default; - MapId = default; - RoomId = default; -#if FANTASY_NET || FANTASY_UNITY - GetScene().MessagePoolComponent.Return(this); -#endif - } - public uint OpCode() { return OuterOpcode.Map2C_EnterRoomResponse; } - [ProtoMember(1)] - public int MapId { get; set; } - [ProtoMember(2)] - public long RoomId { get; set; } - [ProtoMember(3)] - public uint ErrorCode { get; set; } - } - [ProtoContract] - public partial class C2Map_Move : AMessage, ICustomRouteMessage, IProto - { - public static C2Map_Move Create(Scene scene) - { - return scene.MessagePoolComponent.Rent(); - } - public override void Dispose() - { - Location = default; - IsStop = default; -#if FANTASY_NET || FANTASY_UNITY - GetScene().MessagePoolComponent.Return(this); -#endif - } - public uint OpCode() { return OuterOpcode.C2Map_Move; } - [ProtoIgnore] - public int RouteType => Fantasy.RouteType.MapRoute; - [ProtoMember(1)] - public MapUnitPositionInfo Location { get; set; } - [ProtoMember(2)] - public bool IsStop { get; set; } - } /// /// 用户进入地图 /// [ProtoContract] - public partial class Map2C_RoleEnterMapNotify : AMessage, ICustomRouteMessage, IProto + public partial class Map2C_RoleEnterRoomNotify : AMessage, ICustomRouteMessage, IProto { - public static Map2C_RoleEnterMapNotify Create(Scene scene) + public static Map2C_RoleEnterRoomNotify Create(Scene scene) { - return scene.MessagePoolComponent.Rent(); + return scene.MessagePoolComponent.Rent(); } public override void Dispose() { Info = default; #if FANTASY_NET || FANTASY_UNITY - GetScene().MessagePoolComponent.Return(this); + GetScene().MessagePoolComponent.Return(this); #endif } - public uint OpCode() { return OuterOpcode.Map2C_RoleEnterMapNotify; } + public uint OpCode() { return OuterOpcode.Map2C_RoleEnterRoomNotify; } [ProtoIgnore] public int RouteType => Fantasy.RouteType.MapRoute; [ProtoMember(1)] @@ -116,20 +44,20 @@ namespace Fantasy /// 用户离开地图 /// [ProtoContract] - public partial class Map2C_RoleExitMapNotify : AMessage, ICustomRouteMessage, IProto + public partial class Map2C_RoleExitRoomNotify : AMessage, ICustomRouteMessage, IProto { - public static Map2C_RoleExitMapNotify Create(Scene scene) + public static Map2C_RoleExitRoomNotify Create(Scene scene) { - return scene.MessagePoolComponent.Rent(); + return scene.MessagePoolComponent.Rent(); } public override void Dispose() { Id = default; #if FANTASY_NET || FANTASY_UNITY - GetScene().MessagePoolComponent.Return(this); + GetScene().MessagePoolComponent.Return(this); #endif } - public uint OpCode() { return OuterOpcode.Map2C_RoleExitMapNotify; } + public uint OpCode() { return OuterOpcode.Map2C_RoleExitRoomNotify; } [ProtoIgnore] public int RouteType => Fantasy.RouteType.MapRoute; [ProtoMember(1)] @@ -213,11 +141,66 @@ namespace Fantasy [ProtoMember(2)] public GearInfo Gears { get; set; } } + [ProtoContract] + public partial class C2Map_Move : AMessage, ICustomRouteMessage, IProto + { + public static C2Map_Move Create(Scene scene) + { + return scene.MessagePoolComponent.Rent(); + } + public override void Dispose() + { + Position = default; + Rotation = default; + Direction = default; + IsStop = default; + Timestamp = default; +#if FANTASY_NET || FANTASY_UNITY + GetScene().MessagePoolComponent.Return(this); +#endif + } + public uint OpCode() { return OuterOpcode.C2Map_Move; } + [ProtoIgnore] + public int RouteType => Fantasy.RouteType.MapRoute; + [ProtoMember(1)] + public Vector3Info Position { get; set; } + [ProtoMember(2)] + public Vector3Info Rotation { get; set; } + [ProtoMember(3)] + public Vector3Info Direction { get; set; } + [ProtoMember(4)] + public bool IsStop { get; set; } + [ProtoMember(5)] + public long Timestamp { get; set; } + } + [ProtoContract] + public partial class C2Map_Look : AMessage, ICustomRouteMessage, IProto + { + public static C2Map_Look Create(Scene scene) + { + return scene.MessagePoolComponent.Rent(); + } + public override void Dispose() + { + Rotation = default; + Timestamp = default; +#if FANTASY_NET || FANTASY_UNITY + GetScene().MessagePoolComponent.Return(this); +#endif + } + public uint OpCode() { return OuterOpcode.C2Map_Look; } + [ProtoIgnore] + public int RouteType => Fantasy.RouteType.MapRoute; + [ProtoMember(1)] + public Vector3Info Rotation { get; set; } + [ProtoMember(2)] + public long Timestamp { get; set; } + } /// - /// 玩家位置变化 + /// 玩家移动推送 /// [ProtoContract] - public partial class Map2C_MoveNotify : AMessage, IProto + public partial class Map2C_MoveNotify : AMessage, ICustomRouteMessage, IProto { public static Map2C_MoveNotify Create(Scene scene) { @@ -226,14 +209,58 @@ namespace Fantasy public override void Dispose() { Id = default; - Location = default; + Position = default; + Rotation = default; + Direction = default; + IsStop = default; + Timestamp = default; #if FANTASY_NET || FANTASY_UNITY GetScene().MessagePoolComponent.Return(this); #endif } + public uint OpCode() { return OuterOpcode.Map2C_MoveNotify; } + [ProtoIgnore] + public int RouteType => Fantasy.RouteType.MapRoute; [ProtoMember(1)] public long Id { get; set; } [ProtoMember(2)] - public MapUnitPositionInfo Location { get; set; } + public Vector3Info Position { get; set; } + [ProtoMember(3)] + public Vector3Info Rotation { get; set; } + [ProtoMember(4)] + public Vector3Info Direction { get; set; } + [ProtoMember(5)] + public bool IsStop { get; set; } + [ProtoMember(6)] + public long Timestamp { get; set; } + } + /// + /// 玩家旋转推送 + /// + [ProtoContract] + public partial class Map2C_LookeNotify : AMessage, ICustomRouteMessage, IProto + { + public static Map2C_LookeNotify Create(Scene scene) + { + return scene.MessagePoolComponent.Rent(); + } + public override void Dispose() + { + Id = default; + Rotation = default; + Timestamp = default; +#if FANTASY_NET || FANTASY_UNITY + GetScene().MessagePoolComponent.Return(this); +#endif + } + public uint OpCode() { return OuterOpcode.Map2C_LookeNotify; } + [ProtoIgnore] + public int RouteType => Fantasy.RouteType.MapRoute; + [ProtoMember(1)] + public long Id { get; set; } + [ProtoMember(2)] + public Vector3Info Rotation { get; set; } + [ProtoMember(3)] + public long Timestamp { get; set; } } } diff --git a/Entity/Map/Component/RoomManageComponent.cs b/Entity/Map/Component/RoomManageComponent.cs index 84bc787..5583847 100644 --- a/Entity/Map/Component/RoomManageComponent.cs +++ b/Entity/Map/Component/RoomManageComponent.cs @@ -8,4 +8,6 @@ public class RoomManageComponent : Entity public readonly PriorityQueue FreeIds = new(); public readonly HashSet InUseID = new(); + + public string TestRoomCode; } \ No newline at end of file diff --git a/Entity/Map/Entity/MapUnit.cs b/Entity/Map/Entity/MapUnit.cs index bab9391..93d6509 100644 --- a/Entity/Map/Entity/MapUnit.cs +++ b/Entity/Map/Entity/MapUnit.cs @@ -16,12 +16,17 @@ public class MapUnit : Entity /// /// 旋转 /// - public float4 Rotation; + public float3 Rotation; /// /// 当前所在地图id /// public int MapId; + /// + /// 当前所在的房间id + /// + public long RoomId; + public long GateRouteId; } \ No newline at end of file diff --git a/Hotfix/Game/Handler/C2Game_GetRoleInfoRequestHandler.cs b/Hotfix/Game/Handler/C2Game_GetRoleInfoRequestHandler.cs index 1d782db..c0ab71b 100644 --- a/Hotfix/Game/Handler/C2Game_GetRoleInfoRequestHandler.cs +++ b/Hotfix/Game/Handler/C2Game_GetRoleInfoRequestHandler.cs @@ -11,7 +11,7 @@ public class C2Game_GetRoleInfoRequestHandler : RouteRPC(entity.Scene, true, true); - room.Owner = entity.Id; - room.RoomId = roomId; - room.Code = RoomHelper.GenerateCode(entity.Scene.SceneConfigId, roomId); - roomManageComponent.Add(room); + Log.Info( $"创建房间=== sId={entity.Scene.SceneConfigId} map:{request.MapId} id={room.RoomId} code={room.Code}"); diff --git a/Hotfix/Map/Handler/C2Map_LookHandler.cs b/Hotfix/Map/Handler/C2Map_LookHandler.cs new file mode 100644 index 0000000..4278f25 --- /dev/null +++ b/Hotfix/Map/Handler/C2Map_LookHandler.cs @@ -0,0 +1,33 @@ +using Fantasy; +using Fantasy.Async; +using Fantasy.Network.Interface; + +namespace NB.Map; + +public class C2Map_LookHandler : Route +{ + protected override async FTask Run(MapUnit entity, C2Map_Look message) + { + var roomManageComponent = entity.Scene.GetComponent(); + var notifyMessage = new Map2C_LookeNotify() + { + Id = entity.Id, + Rotation = message.Rotation, + Timestamp = message.Timestamp + }; + + entity.Rotation.x = message.Rotation.x; + entity.Rotation.y = message.Rotation.y; + entity.Rotation.z = message.Rotation.z; + + var room = roomManageComponent.Get(entity.MapId); + + + // foreach (var (_, unit) in mapUnitManageComponent.Units) + // { + // entity.Scene.NetworkMessagingComponent.SendInnerRoute(unit.GateRouteId, notifyMessage); + // } + + await FTask.CompletedTask; + } +} \ No newline at end of file diff --git a/Hotfix/Map/Handler/C2Map_MoveHandler.cs b/Hotfix/Map/Handler/C2Map_MoveHandler.cs new file mode 100644 index 0000000..d465648 --- /dev/null +++ b/Hotfix/Map/Handler/C2Map_MoveHandler.cs @@ -0,0 +1,38 @@ +using Fantasy; +using Fantasy.Async; +using Fantasy.Helper; +using Fantasy.Network.Interface; + +namespace NB.Map; + +public class C2Map_MoveHandler : Route +{ + protected override async FTask Run(MapUnit entity, C2Map_Move message) + { + var mapUnitManageComponent = entity.Scene.GetComponent(); + var notifyMessage = new Map2C_MoveNotify() + { + Id = entity.Id, + Position = message.Position, + Rotation = message.Rotation, + IsStop = message.IsStop, + Direction = message.Direction, + Timestamp = TimeHelper.Now + }; + + entity.Position.x = message.Position.x; + entity.Position.y = message.Position.y; + entity.Position.z = message.Position.z; + + entity.Rotation.x = message.Rotation.x; + entity.Rotation.y = message.Rotation.y; + entity.Rotation.z = message.Rotation.z; + + foreach (var (_, unit) in mapUnitManageComponent.Units) + { + entity.Scene.NetworkMessagingComponent.SendInnerRoute(unit.GateRouteId, notifyMessage); + } + + await FTask.CompletedTask; + } +} \ No newline at end of file diff --git a/Hotfix/Map/Handler/Inner/G2Map_EnterRequestHandler.cs b/Hotfix/Map/Handler/Inner/G2Map_EnterRoomRequestHandler.cs similarity index 81% rename from Hotfix/Map/Handler/Inner/G2Map_EnterRequestHandler.cs rename to Hotfix/Map/Handler/Inner/G2Map_EnterRoomRequestHandler.cs index 8bc59cd..a51ee93 100644 --- a/Hotfix/Map/Handler/Inner/G2Map_EnterRequestHandler.cs +++ b/Hotfix/Map/Handler/Inner/G2Map_EnterRoomRequestHandler.cs @@ -4,7 +4,7 @@ using Fantasy.Network.Interface; namespace NB.Map.Inner; -public class G2Map_EnterRequestHandler : RouteRPC +public class G2Map_EnterRoomRequestHandler : RouteRPC { protected override async FTask Run(Scene entity, G2Map_EnterRoomRequest request, Map2G_EnterRoomResponse response, Action reply) @@ -54,9 +54,16 @@ public class G2Map_EnterRequestHandler : RouteRPC +{ + protected override async FTask Run(Scene entity, G2Map_ExitRoomRequest request, Map2G_ExiRoomResponse response, + Action reply) + { + } +} \ No newline at end of file diff --git a/Hotfix/Map/System/MapRoomSystem.cs b/Hotfix/Map/System/MapRoomSystem.cs index 149260e..eb6f25a 100644 --- a/Hotfix/Map/System/MapRoomSystem.cs +++ b/Hotfix/Map/System/MapRoomSystem.cs @@ -18,9 +18,34 @@ public class MapRoomDestroySystem : DestroySystem public static class MapRoomSystem { - public static async FTask Enter(this MapRoom self, long unitId) + public static async FTask Enter(this MapRoom self, MapUnit unit) { + self.Units.TryAdd(unit.Id, unit); + + var notifyMessage = new Map2C_RoleEnterRoomNotify() + { + Info = unit.ToMapUnitInfo(), + }; + + foreach (var (_, roomUnit) in self.Units) + { + // if (roomUnit.Id == unit.Id) continue; + // 同步其他客户端 + self.Scene.NetworkMessagingComponent.SendInnerRoute(roomUnit.GateRouteId, notifyMessage); + } + await FTask.CompletedTask; return ErrorCode.Successful; } + + public static List ToMapUnitInfo(this MapRoom self) + { + List ret = new List(); + foreach (var (_, unit) in self.Units) + { + ret.Add(unit.ToMapUnitInfo()); + } + + return ret; + } } \ No newline at end of file diff --git a/Hotfix/Map/System/MapUnitSystem.cs b/Hotfix/Map/System/MapUnitSystem.cs index 1969a07..752db8f 100644 --- a/Hotfix/Map/System/MapUnitSystem.cs +++ b/Hotfix/Map/System/MapUnitSystem.cs @@ -11,7 +11,7 @@ public class MapUnitSystemDestroySystem : DestroySystem { self.MapId = 0; self.Position = float3.zero; - self.Rotation = float4.zero; + self.Rotation = float3.zero; self.GateRouteId = 0L; } } @@ -40,4 +40,25 @@ public static class MapUnitSystem return ErrorCode.Successful; } + + + public static MapUnitInfo ToMapUnitInfo(this MapUnit self) + { + var ret = new MapUnitInfo() + { + Id = self.Id, + Position = Vector3Info.Create(self.Scene), + Rotation = Vector3Info.Create(self.Scene), + }; + + ret.Position.x = self.Position.x; + ret.Position.y = self.Position.y; + ret.Position.z = self.Position.z; + + ret.Rotation.x = self.Rotation.x; + ret.Rotation.y = self.Rotation.y; + ret.Rotation.z = self.Rotation.z; + + return ret; + } } \ No newline at end of file diff --git a/Hotfix/Map/System/RoomManageComponentSystem.cs b/Hotfix/Map/System/RoomManageComponentSystem.cs index 2f4d5e2..8ea6d1e 100644 --- a/Hotfix/Map/System/RoomManageComponentSystem.cs +++ b/Hotfix/Map/System/RoomManageComponentSystem.cs @@ -1,4 +1,5 @@ -using Fantasy.Entitas; +using Fantasy; +using Fantasy.Entitas; using Fantasy.Entitas.Interface; namespace NB.Map; @@ -31,6 +32,24 @@ public static class RoomManageComponentSystem { #region 增删 + public static MapRoom? Create(this RoomManageComponent self, long ownerId) + { + var roomId = self.AllocateId(); + if (roomId < 1) + { + return null; + } + + // roomManageComponent.on + var room = Entity.Create(self.Scene, true, true); + room.Owner = ownerId; + room.RoomId = roomId; + room.Code = RoomHelper.GenerateCode(self.Scene.SceneConfigId, roomId); + self.Add(room); + + return room; + } + public static void Add(this RoomManageComponent self, MapRoom room) { self.Rooms[room.RoomId] = room; @@ -46,10 +65,12 @@ public static class RoomManageComponentSystem return true; } + public static MapRoom? Get(this RoomManageComponent self, int roomId) { return self.Rooms.GetValueOrDefault(roomId); } + #endregion #region 房间Id @@ -81,6 +102,4 @@ public static class RoomManageComponentSystem } #endregion - - } \ No newline at end of file diff --git a/Hotfix/OnCreateSceneEvent.cs b/Hotfix/OnCreateSceneEvent.cs index 82d262e..be79858 100644 --- a/Hotfix/OnCreateSceneEvent.cs +++ b/Hotfix/OnCreateSceneEvent.cs @@ -67,6 +67,9 @@ public sealed class OnCreateSceneEvent : AsyncEventSystem case SceneType.Map: { Log.Debug($"Map Scene SceneRuntimeId:{scene.RuntimeId}"); + + var roomCode = RoomHelper.GenerateCode(scene.SceneConfigId, 1); + Log.Info($"测试 roomCode：{roomCode}"); // uint serverId = 25255; // for (int i = 1; i < 65535; i++) // { diff --git a/Hotfix/OnSceneCreate_Init.cs b/Hotfix/OnSceneCreate_Init.cs index 25f9913..fc47b32 100644 --- a/Hotfix/OnSceneCreate_Init.cs +++ b/Hotfix/OnSceneCreate_Init.cs @@ -52,8 +52,16 @@ public class OnSceneCreate_Init : AsyncEventSystem { Log.Info("创建地图场景==="); scene.AddComponent(); - scene.AddComponent(); + var roomManageComponent = scene.AddComponent(); scene.AddComponent(); + + var room = roomManageComponent.Create(361499030775398402); + if (room != null) + { + roomManageComponent.TestRoomCode = room.Code; + Log.Info($"测试房间代码 = {room.Code}"); + } + break; } }