From 50bcc2c497bbe23789ca91dab9741fbb3bfdbfe5 Mon Sep 17 00:00:00 2001 From: "Bob.Song" <605277374@qq.com> Date: Tue, 26 Aug 2025 18:04:07 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=8F=E8=AE=AE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Generate/NetworkProtocol/Account.cs.meta | 2 - .../{Account.cs => CommonProtoData.cs} | 0 .../NetworkProtocol/CommonProtoData.cs.meta | 2 + .../Generate/NetworkProtocol/Friend.cs | 50 -- .../Generate/NetworkProtocol/Friend.cs.meta | 2 - .../Generate/NetworkProtocol/GameMessage.cs | 177 +++++++ .../NetworkProtocol/GameMessage.cs.meta | 2 + .../Generate/NetworkProtocol/MapMessage.cs | 482 ----------------- .../Generate/NetworkProtocol/OuterMessage.cs | 44 ++ .../Generate/NetworkProtocol/OuterOpcode.cs | 85 +-- .../Generate/NetworkProtocol/RoomMessage.cs | 494 ++++++++++++++++++ .../NetworkProtocol/RoomMessage.cs.meta | 2 + .../Generate/NetworkProtocol/RouteType.cs | 3 +- 13 files changed, 768 insertions(+), 577 deletions(-) delete mode 100644 Assets/Scripts/Generate/NetworkProtocol/Account.cs.meta rename Assets/Scripts/Generate/NetworkProtocol/{Account.cs => CommonProtoData.cs} (100%) create mode 100644 Assets/Scripts/Generate/NetworkProtocol/CommonProtoData.cs.meta delete mode 100644 Assets/Scripts/Generate/NetworkProtocol/Friend.cs delete mode 100644 Assets/Scripts/Generate/NetworkProtocol/Friend.cs.meta create mode 100644 Assets/Scripts/Generate/NetworkProtocol/GameMessage.cs create mode 100644 Assets/Scripts/Generate/NetworkProtocol/GameMessage.cs.meta create mode 100644 Assets/Scripts/Generate/NetworkProtocol/RoomMessage.cs create mode 100644 Assets/Scripts/Generate/NetworkProtocol/RoomMessage.cs.meta diff --git a/Assets/Scripts/Generate/NetworkProtocol/Account.cs.meta b/Assets/Scripts/Generate/NetworkProtocol/Account.cs.meta deleted file mode 100644 index 894c30f45..000000000 --- a/Assets/Scripts/Generate/NetworkProtocol/Account.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: 7c8232cfd90c0ea448f6ef652ac62da8 \ No newline at end of file diff --git a/Assets/Scripts/Generate/NetworkProtocol/Account.cs b/Assets/Scripts/Generate/NetworkProtocol/CommonProtoData.cs similarity index 100% rename from Assets/Scripts/Generate/NetworkProtocol/Account.cs rename to Assets/Scripts/Generate/NetworkProtocol/CommonProtoData.cs diff --git a/Assets/Scripts/Generate/NetworkProtocol/CommonProtoData.cs.meta b/Assets/Scripts/Generate/NetworkProtocol/CommonProtoData.cs.meta new file mode 100644 index 000000000..11d737a39 --- /dev/null +++ b/Assets/Scripts/Generate/NetworkProtocol/CommonProtoData.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: ead605724212fe740a92355b63de497b \ No newline at end of file diff --git a/Assets/Scripts/Generate/NetworkProtocol/Friend.cs b/Assets/Scripts/Generate/NetworkProtocol/Friend.cs deleted file mode 100644 index 5bcf16ec8..000000000 --- a/Assets/Scripts/Generate/NetworkProtocol/Friend.cs +++ /dev/null @@ -1,50 +0,0 @@ -using ProtoBuf; - -using System.Collections.Generic; -using Fantasy; -using NBC; -using NBC.Network.Interface; -using NBC.Serialize; -#pragma warning disable CS8618 - -namespace NBC -{ - /// - /// 好友信息 - /// - [ProtoContract] - public partial class FriendInfo : AMessage, IProto - { - public static FriendInfo Create(Scene scene) - { - return scene.MessagePoolComponent.Rent(); - } - public override void Dispose() - { - Id = default; - AddTime = default; - NickName = default; - Head = default; - Level = default; - Country = default; - OnlineStatus = default; -#if FANTASY_NET || FANTASY_UNITY - GetScene().MessagePoolComponent.Return(this); -#endif - } - [ProtoMember(1)] - public long Id { get; set; } - [ProtoMember(2)] - public long AddTime { get; set; } - [ProtoMember(3)] - public string NickName { get; set; } - [ProtoMember(4)] - public string Head { get; set; } - [ProtoMember(5)] - public int Level { get; set; } - [ProtoMember(6)] - public string Country { get; set; } - [ProtoMember(7)] - public int OnlineStatus { get; set; } - } -} diff --git a/Assets/Scripts/Generate/NetworkProtocol/Friend.cs.meta b/Assets/Scripts/Generate/NetworkProtocol/Friend.cs.meta deleted file mode 100644 index 9f41c24e7..000000000 --- a/Assets/Scripts/Generate/NetworkProtocol/Friend.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: 91a34da383344484da036f295b87a0ce \ No newline at end of file diff --git a/Assets/Scripts/Generate/NetworkProtocol/GameMessage.cs b/Assets/Scripts/Generate/NetworkProtocol/GameMessage.cs new file mode 100644 index 000000000..be0765bcb --- /dev/null +++ b/Assets/Scripts/Generate/NetworkProtocol/GameMessage.cs @@ -0,0 +1,177 @@ +using ProtoBuf; + +using System.Collections.Generic; +using Fantasy; +using NBC; +using NBC.Network.Interface; +using NBC.Serialize; +#pragma warning disable CS8618 + +namespace NBC +{ + /// + /// 请求创建房间 + /// + [ProtoContract] + public partial class C2Game_CreateRoomRequest : AMessage, ICustomRouteRequest, IProto + { + public static C2Game_CreateRoomRequest 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 Game2C_CreateRoomResponse ResponseType { get; set; } + public uint OpCode() { return OuterOpcode.C2Game_CreateRoomRequest; } + [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 Game2C_CreateRoomResponse : AMessage, ICustomRouteResponse, IProto + { + public static Game2C_CreateRoomResponse 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.Game2C_CreateRoomResponse; } + [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 C2Game_EnterMapRequest : AMessage, ICustomRouteRequest, IProto + { + public static C2Game_EnterMapRequest Create(Scene scene) + { + return scene.MessagePoolComponent.Rent(); + } + public override void Dispose() + { + MapId = default; + Type = default; +#if FANTASY_NET || FANTASY_UNITY + GetScene().MessagePoolComponent.Return(this); +#endif + } + [ProtoIgnore] + public Game2C_EnterMapResponse ResponseType { get; set; } + public uint OpCode() { return OuterOpcode.C2Game_EnterMapRequest; } + [ProtoIgnore] + public int RouteType => Fantasy.RouteType.MapRoute; + [ProtoMember(1)] + public int MapId { get; set; } + [ProtoMember(2)] + public int Type { get; set; } + } + /// + /// 请求进入地图响应 + /// + [ProtoContract] + public partial class Game2C_EnterMapResponse : AMessage, ICustomRouteResponse, IProto + { + public static Game2C_EnterMapResponse Create(Scene scene) + { + return scene.MessagePoolComponent.Rent(); + } + public override void Dispose() + { + ErrorCode = default; + MapId = default; + Pos = default; +#if FANTASY_NET || FANTASY_UNITY + GetScene().MessagePoolComponent.Return(this); +#endif + } + public uint OpCode() { return OuterOpcode.Game2C_EnterMapResponse; } + [ProtoMember(1)] + public int MapId { get; set; } + [ProtoMember(2)] + public int Pos { get; set; } + [ProtoMember(3)] + public uint ErrorCode { get; set; } + } + /// + /// 请求进入房间 + /// + [ProtoContract] + public partial class C2Game_EnterRoomRequest : AMessage, ICustomRouteRequest, IProto + { + public static C2Game_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 Game2C_EnterRoomResponse ResponseType { get; set; } + public uint OpCode() { return OuterOpcode.C2Game_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 Game2C_EnterRoomResponse : AMessage, ICustomRouteResponse, IProto + { + public static Game2C_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.Game2C_EnterRoomResponse; } + [ProtoMember(1)] + public int MapId { get; set; } + [ProtoMember(2)] + public long RoomId { get; set; } + [ProtoMember(3)] + public uint ErrorCode { get; set; } + } +} diff --git a/Assets/Scripts/Generate/NetworkProtocol/GameMessage.cs.meta b/Assets/Scripts/Generate/NetworkProtocol/GameMessage.cs.meta new file mode 100644 index 000000000..0f63c05dd --- /dev/null +++ b/Assets/Scripts/Generate/NetworkProtocol/GameMessage.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: ee6be5dd9300f414b96c696a3f0acfb8 \ No newline at end of file diff --git a/Assets/Scripts/Generate/NetworkProtocol/MapMessage.cs b/Assets/Scripts/Generate/NetworkProtocol/MapMessage.cs index d5456ebe1..b63f5ca3c 100644 --- a/Assets/Scripts/Generate/NetworkProtocol/MapMessage.cs +++ b/Assets/Scripts/Generate/NetworkProtocol/MapMessage.cs @@ -9,486 +9,4 @@ using NBC.Serialize; namespace NBC { - [ProtoContract] - public partial class UnitGearItemInfo : AMessage, IProto - { - public static UnitGearItemInfo Create(Scene scene) - { - return scene.MessagePoolComponent.Rent(); - } - public override void Dispose() - { - Id = default; - ConfigId = default; -#if FANTASY_NET || FANTASY_UNITY - GetScene().MessagePoolComponent.Return(this); -#endif - } - [ProtoMember(1)] - public long Id { get; set; } - [ProtoMember(2)] - public int ConfigId { get; set; } - } - [ProtoContract] - public partial class UnitGearInfo : AMessage, IProto - { - public static UnitGearInfo Create(Scene scene) - { - return scene.MessagePoolComponent.Rent(); - } - public override void Dispose() - { - Rod = default; - Reel = default; - Bobber = default; - Hook = default; - Bait = default; - Lure = default; - Weight = default; - Line = default; - Leader = default; - Feeder = default; -#if FANTASY_NET || FANTASY_UNITY - GetScene().MessagePoolComponent.Return(this); -#endif - } - [ProtoMember(1)] - public UnitGearItemInfo Rod { get; set; } - [ProtoMember(2)] - public UnitGearItemInfo Reel { get; set; } - [ProtoMember(3)] - public UnitGearItemInfo Bobber { get; set; } - [ProtoMember(4)] - public UnitGearItemInfo Hook { get; set; } - [ProtoMember(5)] - public UnitGearItemInfo Bait { get; set; } - [ProtoMember(6)] - public UnitGearItemInfo Lure { get; set; } - [ProtoMember(7)] - public UnitGearItemInfo Weight { get; set; } - [ProtoMember(8)] - public UnitGearItemInfo Line { get; set; } - [ProtoMember(9)] - public UnitGearItemInfo Leader { get; set; } - [ProtoMember(10)] - public UnitGearItemInfo Feeder { get; set; } - } - [ProtoContract] - public partial class Vector3Info : AMessage, IProto - { - public static Vector3Info Create(Scene scene) - { - return scene.MessagePoolComponent.Rent(); - } - public override void Dispose() - { - x = default; - y = default; - z = 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; } - [ProtoMember(3)] - public float z { get; set; } - } - [ProtoContract] - public partial class QuaternionInfo : AMessage, IProto - { - public static QuaternionInfo Create(Scene scene) - { - return scene.MessagePoolComponent.Rent(); - } - public override void Dispose() - { - x = default; - y = default; - z = default; - w = 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; } - [ProtoMember(3)] - public float z { get; set; } - [ProtoMember(4)] - public float w { get; set; } - } - [ProtoContract] - public partial class UnitFishingInfo : AMessage, IProto - { - public static UnitFishingInfo Create(Scene scene) - { - return scene.MessagePoolComponent.Rent(); - } - public override void Dispose() - { - LineLength = default; - ReelSpeed = default; - OpenLight = default; - RodSetting = default; -#if FANTASY_NET || FANTASY_UNITY - GetScene().MessagePoolComponent.Return(this); -#endif - } - [ProtoMember(1)] - public float LineLength { get; set; } - [ProtoMember(2)] - public float ReelSpeed { get; set; } - [ProtoMember(3)] - public bool OpenLight { get; set; } - [ProtoMember(4)] - public int RodSetting { get; set; } - } - [ProtoContract] - public partial class UnitStateInfo : AMessage, IProto - { - public static UnitStateInfo Create(Scene scene) - { - return scene.MessagePoolComponent.Rent(); - } - public override void Dispose() - { - State = default; - Args.Clear(); -#if FANTASY_NET || FANTASY_UNITY - GetScene().MessagePoolComponent.Return(this); -#endif - } - [ProtoMember(1)] - public int State { get; set; } - [ProtoMember(2)] - public List Args = new List(); - } - [ProtoContract] - public partial class MapUnitInfo : AMessage, IProto - { - public static MapUnitInfo Create(Scene scene) - { - return scene.MessagePoolComponent.Rent(); - } - public override void Dispose() - { - Id = default; - RoleInfo = default; - Location = default; - State = default; - Gears = default; - FishingInfo = default; - KV.Clear(); -#if FANTASY_NET || FANTASY_UNITY - GetScene().MessagePoolComponent.Return(this); -#endif - } - [ProtoMember(1)] - public long Id { get; set; } - [ProtoMember(2)] - public RoleSimpleInfo RoleInfo { get; set; } - [ProtoMember(3)] - public MapUnitPositionInfo Location { get; set; } - [ProtoMember(4)] - public UnitStateInfo State { get; set; } - [ProtoMember(5)] - public UnitGearInfo Gears { get; set; } - [ProtoMember(6)] - public UnitFishingInfo FishingInfo { get; set; } - [ProtoMember(7)] - 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; } - } - [ProtoContract] - public partial class C2Map_CreateRoomRequest : AMessage, ICustomRouteRequest, IProto - { - public static C2Map_CreateRoomRequest 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_CreateRoomResponse ResponseType { get; set; } - public uint OpCode() { return OuterOpcode.C2Map_CreateRoomRequest; } - [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_CreateRoomResponse : AMessage, ICustomRouteResponse, IProto - { - public static Map2C_CreateRoomResponse 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_CreateRoomResponse; } - [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_EnterMapRequest : AMessage, ICustomRouteRequest, IProto - { - public static C2Map_EnterMapRequest Create(Scene scene) - { - return scene.MessagePoolComponent.Rent(); - } - public override void Dispose() - { - MapId = default; - RoomId = default; -#if FANTASY_NET || FANTASY_UNITY - GetScene().MessagePoolComponent.Return(this); -#endif - } - [ProtoIgnore] - public Map2C_EnterMapResponse ResponseType { get; set; } - public uint OpCode() { return OuterOpcode.C2Map_EnterMapRequest; } - [ProtoIgnore] - public int RouteType => Fantasy.RouteType.MapRoute; - [ProtoMember(1)] - public int MapId { get; set; } - [ProtoMember(2)] - public long RoomId { get; set; } - } - [ProtoContract] - public partial class Map2C_EnterMapResponse : AMessage, ICustomRouteResponse, IProto - { - public static Map2C_EnterMapResponse Create(Scene scene) - { - return scene.MessagePoolComponent.Rent(); - } - public override void Dispose() - { - ErrorCode = default; - Roles.Clear(); - MapId = default; -#if FANTASY_NET || FANTASY_UNITY - GetScene().MessagePoolComponent.Return(this); -#endif - } - public uint OpCode() { return OuterOpcode.Map2C_EnterMapResponse; } - [ProtoMember(1)] - public List Roles = new List(); - [ProtoMember(2)] - public long MapId { 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 static Map2C_RoleEnterMapNotify Create(Scene scene) - { - return scene.MessagePoolComponent.Rent(); - } - public override void Dispose() - { - Info = default; -#if FANTASY_NET || FANTASY_UNITY - GetScene().MessagePoolComponent.Return(this); -#endif - } - public uint OpCode() { return OuterOpcode.Map2C_RoleEnterMapNotify; } - [ProtoIgnore] - public int RouteType => Fantasy.RouteType.MapRoute; - [ProtoMember(1)] - public MapUnitInfo Info { get; set; } - } - /// - /// 用户离开地图 - /// - [ProtoContract] - public partial class Map2C_RoleExitMapNotify : AMessage, ICustomRouteMessage, IProto - { - public static Map2C_RoleExitMapNotify Create(Scene scene) - { - return scene.MessagePoolComponent.Rent(); - } - public override void Dispose() - { - Id = default; -#if FANTASY_NET || FANTASY_UNITY - GetScene().MessagePoolComponent.Return(this); -#endif - } - public uint OpCode() { return OuterOpcode.Map2C_RoleExitMapNotify; } - [ProtoIgnore] - public int RouteType => Fantasy.RouteType.MapRoute; - [ProtoMember(1)] - public long Id { get; set; } - } - /// - /// 玩家状态变化同步 - /// - [ProtoContract] - public partial class Map2C_RoleStateNotify : AMessage, ICustomRouteMessage, IProto - { - public static Map2C_RoleStateNotify Create(Scene scene) - { - return scene.MessagePoolComponent.Rent(); - } - public override void Dispose() - { - Id = default; - State = default; -#if FANTASY_NET || FANTASY_UNITY - GetScene().MessagePoolComponent.Return(this); -#endif - } - public uint OpCode() { return OuterOpcode.Map2C_RoleStateNotify; } - [ProtoIgnore] - public int RouteType => Fantasy.RouteType.MapRoute; - [ProtoMember(1)] - public long Id { get; set; } - [ProtoMember(2)] - public UnitStateInfo State { get; set; } - } - /// - /// 玩家钓组状态变化 - /// - [ProtoContract] - public partial class Map2C_RoleGearStateNotify : AMessage, ICustomRouteMessage, IProto - { - public static Map2C_RoleGearStateNotify Create(Scene scene) - { - return scene.MessagePoolComponent.Rent(); - } - public override void Dispose() - { - Id = default; - State = default; -#if FANTASY_NET || FANTASY_UNITY - GetScene().MessagePoolComponent.Return(this); -#endif - } - public uint OpCode() { return OuterOpcode.Map2C_RoleGearStateNotify; } - [ProtoIgnore] - public int RouteType => Fantasy.RouteType.MapRoute; - [ProtoMember(1)] - public long Id { get; set; } - [ProtoMember(2)] - public UnitFishingInfo State { get; set; } - } - /// - /// 玩家钓组变化 - /// - [ProtoContract] - public partial class Map2C_RoleGearChangeNotify : AMessage, ICustomRouteMessage, IProto - { - public static Map2C_RoleGearChangeNotify Create(Scene scene) - { - return scene.MessagePoolComponent.Rent(); - } - public override void Dispose() - { - Id = default; - Gears = default; -#if FANTASY_NET || FANTASY_UNITY - GetScene().MessagePoolComponent.Return(this); -#endif - } - public uint OpCode() { return OuterOpcode.Map2C_RoleGearChangeNotify; } - [ProtoIgnore] - public int RouteType => Fantasy.RouteType.MapRoute; - [ProtoMember(1)] - public long Id { get; set; } - [ProtoMember(2)] - public UnitGearInfo Gears { get; set; } - } - /// - /// 玩家位置变化 - /// - [ProtoContract] - public partial class Map2C_MoveNotify : AMessage, IProto - { - public static Map2C_MoveNotify Create(Scene scene) - { - return scene.MessagePoolComponent.Rent(); - } - public override void Dispose() - { - Id = default; - Location = default; -#if FANTASY_NET || FANTASY_UNITY - GetScene().MessagePoolComponent.Return(this); -#endif - } - [ProtoMember(1)] - public long Id { get; set; } - [ProtoMember(2)] - public MapUnitPositionInfo Location { get; set; } - } } diff --git a/Assets/Scripts/Generate/NetworkProtocol/OuterMessage.cs b/Assets/Scripts/Generate/NetworkProtocol/OuterMessage.cs index d893fbd31..297c366b6 100644 --- a/Assets/Scripts/Generate/NetworkProtocol/OuterMessage.cs +++ b/Assets/Scripts/Generate/NetworkProtocol/OuterMessage.cs @@ -104,6 +104,50 @@ namespace NBC public uint ErrorCode { get; set; } } /// + /// 客户端登陆聊天服 + /// + [ProtoContract] + public partial class C2G_LoginChatRequest : AMessage, IProto + { + public static C2G_LoginChatRequest Create(Scene scene) + { + return scene.MessagePoolComponent.Rent(); + } + public override void Dispose() + { + Type = default; +#if FANTASY_NET || FANTASY_UNITY + GetScene().MessagePoolComponent.Return(this); +#endif + } + [ProtoMember(1)] + public int Type { get; set; } + } + /// + /// 客户端登陆聊天服响应 + /// + [ProtoContract] + public partial class G2C_LoginChatResponse : AMessage, IResponse, IProto + { + public static G2C_LoginChatResponse Create(Scene scene) + { + return scene.MessagePoolComponent.Rent(); + } + public override void Dispose() + { + ErrorCode = default; + RouteId = default; +#if FANTASY_NET || FANTASY_UNITY + GetScene().MessagePoolComponent.Return(this); +#endif + } + public uint OpCode() { return OuterOpcode.G2C_LoginChatResponse; } + [ProtoMember(1)] + public long RouteId { get; set; } + [ProtoMember(2)] + public uint ErrorCode { get; set; } + } + /// /// 通知客户端重复登录 /// [ProtoContract] diff --git a/Assets/Scripts/Generate/NetworkProtocol/OuterOpcode.cs b/Assets/Scripts/Generate/NetworkProtocol/OuterOpcode.cs index 9fc753987..425911b65 100644 --- a/Assets/Scripts/Generate/NetworkProtocol/OuterOpcode.cs +++ b/Assets/Scripts/Generate/NetworkProtocol/OuterOpcode.cs @@ -2,54 +2,61 @@ namespace Fantasy { public static partial class OuterOpcode { - public const uint C2Map_CreateRoomRequest = 2281711377; - public const uint Map2C_CreateRoomResponse = 2415929105; - public const uint C2Map_EnterMapRequest = 2281711378; - public const uint Map2C_EnterMapResponse = 2415929106; + public const uint C2Game_CreateRoomRequest = 2281711377; + public const uint Game2C_CreateRoomResponse = 2415929105; + public const uint C2Game_EnterMapRequest = 2281711378; + public const uint Game2C_EnterMapResponse = 2415929106; + public const uint C2Game_EnterRoomRequest = 2281711379; + public const uint Game2C_EnterRoomResponse = 2415929107; + public const uint C2A_LoginRequest = 268445457; + public const uint A2C_LoginResponse = 402663185; + public const uint C2G_LoginRequest = 268445458; + public const uint G2C_LoginResponse = 402663186; + public const uint G2C_LoginChatResponse = 402663187; + public const uint G2C_RepeatLogin = 134227729; + public const uint C2Game_GetRoleInfoRequest = 2281711380; + public const uint Game2C_GetRoleInfoResponse = 2415929108; + public const uint C2Map_EnterRoomRequest = 2281711381; + public const uint Map2C_EnterRoomResponse = 2415929109; + public const uint C2Map_EnterMapRequest = 2281711382; + public const uint Map2C_EnterMapResponse = 2415929110; public const uint C2Map_Move = 2147493649; public const uint Map2C_RoleEnterMapNotify = 2147493650; public const uint Map2C_RoleExitMapNotify = 2147493651; public const uint Map2C_RoleStateNotify = 2147493652; public const uint Map2C_RoleGearStateNotify = 2147493653; public const uint Map2C_RoleGearChangeNotify = 2147493654; - public const uint C2A_LoginRequest = 268445457; - public const uint A2C_LoginResponse = 402663185; - public const uint C2G_LoginRequest = 268445458; - public const uint G2C_LoginResponse = 402663186; - public const uint G2C_RepeatLogin = 134227729; - public const uint C2Game_GetRoleInfoRequest = 2281711379; - public const uint Game2C_GetRoleInfoResponse = 2415929107; - 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 C2S_GetConversationsRequest = 2281711383; + public const uint S2C_GetConversationsResponse = 2415929111; + public const uint C2S_SendMailRequest = 2281711384; + public const uint S2C_SendMailResponse = 2415929112; + public const uint C2S_DeleteMailRequest = 2281711385; + public const uint S2C_DeleteMailResponse = 2415929113; public const uint S2C_HaveMail = 2147493655; public const uint S2C_MailState = 2147493656; - 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 C2S_CreateChannelRequest = 2281711386; + public const uint S2C_CreateChannelResponse = 2415929114; + public const uint C2S_JoinChannelRequest = 2281711387; + public const uint S2C_JoinChannelResponse = 2415929115; + public const uint C2S_SendMessageRequest = 2281711388; + public const uint S2C_SendMessageResponse = 2415929116; public const uint S2C_Message = 2147493657; - 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 C2S_CreateClubRequest = 2281711389; + public const uint S2C_CreateClubResponse = 2415929117; + public const uint C2S_GetClubInfoRequest = 2281711390; + public const uint S2C_GetClubInfoResponse = 2415929118; + public const uint C2S_GetMemberListRequest = 2281711391; + public const uint S2C_GetMemberListResponse = 2415929119; + public const uint C2S_GetClubListRequest = 2281711392; + public const uint S2C_GetClubListResponse = 2415929120; + public const uint C2S_JoinClubRequest = 2281711393; + public const uint S2C_JoinClubResponse = 2415929121; + public const uint C2S_LeaveClubRequest = 2281711394; + public const uint S2C_LeaveClubResponse = 2415929122; + public const uint C2S_DissolveClubRequest = 2281711395; + public const uint S2C_DissolveClubResponse = 2415929123; + public const uint C2S_DisposeJoinRequest = 2281711396; + public const uint S2C_DisposeJoinResponse = 2415929124; public const uint S2C_ClubChange = 2147493658; } } diff --git a/Assets/Scripts/Generate/NetworkProtocol/RoomMessage.cs b/Assets/Scripts/Generate/NetworkProtocol/RoomMessage.cs new file mode 100644 index 000000000..0b8617c4e --- /dev/null +++ b/Assets/Scripts/Generate/NetworkProtocol/RoomMessage.cs @@ -0,0 +1,494 @@ +using ProtoBuf; + +using System.Collections.Generic; +using Fantasy; +using NBC; +using NBC.Network.Interface; +using NBC.Serialize; +#pragma warning disable CS8618 + +namespace NBC +{ + [ProtoContract] + public partial class UnitGearItemInfo : AMessage, IProto + { + public static UnitGearItemInfo Create(Scene scene) + { + return scene.MessagePoolComponent.Rent(); + } + public override void Dispose() + { + Id = default; + ConfigId = default; +#if FANTASY_NET || FANTASY_UNITY + GetScene().MessagePoolComponent.Return(this); +#endif + } + [ProtoMember(1)] + public long Id { get; set; } + [ProtoMember(2)] + public int ConfigId { get; set; } + } + [ProtoContract] + public partial class UnitGearInfo : AMessage, IProto + { + public static UnitGearInfo Create(Scene scene) + { + return scene.MessagePoolComponent.Rent(); + } + public override void Dispose() + { + Rod = default; + Reel = default; + Bobber = default; + Hook = default; + Bait = default; + Lure = default; + Weight = default; + Line = default; + Leader = default; + Feeder = default; +#if FANTASY_NET || FANTASY_UNITY + GetScene().MessagePoolComponent.Return(this); +#endif + } + [ProtoMember(1)] + public UnitGearItemInfo Rod { get; set; } + [ProtoMember(2)] + public UnitGearItemInfo Reel { get; set; } + [ProtoMember(3)] + public UnitGearItemInfo Bobber { get; set; } + [ProtoMember(4)] + public UnitGearItemInfo Hook { get; set; } + [ProtoMember(5)] + public UnitGearItemInfo Bait { get; set; } + [ProtoMember(6)] + public UnitGearItemInfo Lure { get; set; } + [ProtoMember(7)] + public UnitGearItemInfo Weight { get; set; } + [ProtoMember(8)] + public UnitGearItemInfo Line { get; set; } + [ProtoMember(9)] + public UnitGearItemInfo Leader { get; set; } + [ProtoMember(10)] + public UnitGearItemInfo Feeder { get; set; } + } + [ProtoContract] + public partial class Vector3Info : AMessage, IProto + { + public static Vector3Info Create(Scene scene) + { + return scene.MessagePoolComponent.Rent(); + } + public override void Dispose() + { + x = default; + y = default; + z = 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; } + [ProtoMember(3)] + public float z { get; set; } + } + [ProtoContract] + public partial class QuaternionInfo : AMessage, IProto + { + public static QuaternionInfo Create(Scene scene) + { + return scene.MessagePoolComponent.Rent(); + } + public override void Dispose() + { + x = default; + y = default; + z = default; + w = 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; } + [ProtoMember(3)] + public float z { get; set; } + [ProtoMember(4)] + public float w { get; set; } + } + [ProtoContract] + public partial class UnitFishingInfo : AMessage, IProto + { + public static UnitFishingInfo Create(Scene scene) + { + return scene.MessagePoolComponent.Rent(); + } + public override void Dispose() + { + LineLength = default; + ReelSpeed = default; + OpenLight = default; + RodSetting = default; +#if FANTASY_NET || FANTASY_UNITY + GetScene().MessagePoolComponent.Return(this); +#endif + } + [ProtoMember(1)] + public float LineLength { get; set; } + [ProtoMember(2)] + public float ReelSpeed { get; set; } + [ProtoMember(3)] + public bool OpenLight { get; set; } + [ProtoMember(4)] + public int RodSetting { get; set; } + } + [ProtoContract] + public partial class UnitStateInfo : AMessage, IProto + { + public static UnitStateInfo Create(Scene scene) + { + return scene.MessagePoolComponent.Rent(); + } + public override void Dispose() + { + State = default; + Args.Clear(); +#if FANTASY_NET || FANTASY_UNITY + GetScene().MessagePoolComponent.Return(this); +#endif + } + [ProtoMember(1)] + public int State { get; set; } + [ProtoMember(2)] + public List Args = new List(); + } + [ProtoContract] + public partial class MapUnitInfo : AMessage, IProto + { + public static MapUnitInfo Create(Scene scene) + { + return scene.MessagePoolComponent.Rent(); + } + public override void Dispose() + { + Id = default; + RoleInfo = default; + Location = default; + State = default; + Gears = default; + FishingInfo = default; + KV.Clear(); +#if FANTASY_NET || FANTASY_UNITY + GetScene().MessagePoolComponent.Return(this); +#endif + } + [ProtoMember(1)] + public long Id { get; set; } + [ProtoMember(2)] + public RoleSimpleInfo RoleInfo { get; set; } + [ProtoMember(3)] + public MapUnitPositionInfo Location { get; set; } + [ProtoMember(4)] + public UnitStateInfo State { get; set; } + [ProtoMember(5)] + public UnitGearInfo Gears { get; set; } + [ProtoMember(6)] + public UnitFishingInfo FishingInfo { get; set; } + [ProtoMember(7)] + 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; } + } + [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_EnterMapRequest : AMessage, ICustomRouteRequest, IProto + { + public static C2Map_EnterMapRequest Create(Scene scene) + { + return scene.MessagePoolComponent.Rent(); + } + public override void Dispose() + { + MapId = default; + RoomId = default; +#if FANTASY_NET || FANTASY_UNITY + GetScene().MessagePoolComponent.Return(this); +#endif + } + [ProtoIgnore] + public Map2C_EnterMapResponse ResponseType { get; set; } + public uint OpCode() { return OuterOpcode.C2Map_EnterMapRequest; } + [ProtoIgnore] + public int RouteType => Fantasy.RouteType.MapRoute; + [ProtoMember(1)] + public int MapId { get; set; } + [ProtoMember(2)] + public long RoomId { get; set; } + } + [ProtoContract] + public partial class Map2C_EnterMapResponse : AMessage, ICustomRouteResponse, IProto + { + public static Map2C_EnterMapResponse Create(Scene scene) + { + return scene.MessagePoolComponent.Rent(); + } + public override void Dispose() + { + ErrorCode = default; + Roles.Clear(); + MapId = default; +#if FANTASY_NET || FANTASY_UNITY + GetScene().MessagePoolComponent.Return(this); +#endif + } + public uint OpCode() { return OuterOpcode.Map2C_EnterMapResponse; } + [ProtoMember(1)] + public List Roles = new List(); + [ProtoMember(2)] + public long MapId { 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 static Map2C_RoleEnterMapNotify Create(Scene scene) + { + return scene.MessagePoolComponent.Rent(); + } + public override void Dispose() + { + Info = default; +#if FANTASY_NET || FANTASY_UNITY + GetScene().MessagePoolComponent.Return(this); +#endif + } + public uint OpCode() { return OuterOpcode.Map2C_RoleEnterMapNotify; } + [ProtoIgnore] + public int RouteType => Fantasy.RouteType.MapRoute; + [ProtoMember(1)] + public MapUnitInfo Info { get; set; } + } + /// + /// 用户离开地图 + /// + [ProtoContract] + public partial class Map2C_RoleExitMapNotify : AMessage, ICustomRouteMessage, IProto + { + public static Map2C_RoleExitMapNotify Create(Scene scene) + { + return scene.MessagePoolComponent.Rent(); + } + public override void Dispose() + { + Id = default; +#if FANTASY_NET || FANTASY_UNITY + GetScene().MessagePoolComponent.Return(this); +#endif + } + public uint OpCode() { return OuterOpcode.Map2C_RoleExitMapNotify; } + [ProtoIgnore] + public int RouteType => Fantasy.RouteType.MapRoute; + [ProtoMember(1)] + public long Id { get; set; } + } + /// + /// 玩家状态变化同步 + /// + [ProtoContract] + public partial class Map2C_RoleStateNotify : AMessage, ICustomRouteMessage, IProto + { + public static Map2C_RoleStateNotify Create(Scene scene) + { + return scene.MessagePoolComponent.Rent(); + } + public override void Dispose() + { + Id = default; + State = default; +#if FANTASY_NET || FANTASY_UNITY + GetScene().MessagePoolComponent.Return(this); +#endif + } + public uint OpCode() { return OuterOpcode.Map2C_RoleStateNotify; } + [ProtoIgnore] + public int RouteType => Fantasy.RouteType.MapRoute; + [ProtoMember(1)] + public long Id { get; set; } + [ProtoMember(2)] + public UnitStateInfo State { get; set; } + } + /// + /// 玩家钓组状态变化 + /// + [ProtoContract] + public partial class Map2C_RoleGearStateNotify : AMessage, ICustomRouteMessage, IProto + { + public static Map2C_RoleGearStateNotify Create(Scene scene) + { + return scene.MessagePoolComponent.Rent(); + } + public override void Dispose() + { + Id = default; + State = default; +#if FANTASY_NET || FANTASY_UNITY + GetScene().MessagePoolComponent.Return(this); +#endif + } + public uint OpCode() { return OuterOpcode.Map2C_RoleGearStateNotify; } + [ProtoIgnore] + public int RouteType => Fantasy.RouteType.MapRoute; + [ProtoMember(1)] + public long Id { get; set; } + [ProtoMember(2)] + public UnitFishingInfo State { get; set; } + } + /// + /// 玩家钓组变化 + /// + [ProtoContract] + public partial class Map2C_RoleGearChangeNotify : AMessage, ICustomRouteMessage, IProto + { + public static Map2C_RoleGearChangeNotify Create(Scene scene) + { + return scene.MessagePoolComponent.Rent(); + } + public override void Dispose() + { + Id = default; + Gears = default; +#if FANTASY_NET || FANTASY_UNITY + GetScene().MessagePoolComponent.Return(this); +#endif + } + public uint OpCode() { return OuterOpcode.Map2C_RoleGearChangeNotify; } + [ProtoIgnore] + public int RouteType => Fantasy.RouteType.MapRoute; + [ProtoMember(1)] + public long Id { get; set; } + [ProtoMember(2)] + public UnitGearInfo Gears { get; set; } + } + /// + /// 玩家位置变化 + /// + [ProtoContract] + public partial class Map2C_MoveNotify : AMessage, IProto + { + public static Map2C_MoveNotify Create(Scene scene) + { + return scene.MessagePoolComponent.Rent(); + } + public override void Dispose() + { + Id = default; + Location = default; +#if FANTASY_NET || FANTASY_UNITY + GetScene().MessagePoolComponent.Return(this); +#endif + } + [ProtoMember(1)] + public long Id { get; set; } + [ProtoMember(2)] + public MapUnitPositionInfo Location { get; set; } + } +} diff --git a/Assets/Scripts/Generate/NetworkProtocol/RoomMessage.cs.meta b/Assets/Scripts/Generate/NetworkProtocol/RoomMessage.cs.meta new file mode 100644 index 000000000..e29d2cea7 --- /dev/null +++ b/Assets/Scripts/Generate/NetworkProtocol/RoomMessage.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: eabb062bcc48ca545a804daefad2c16c \ No newline at end of file diff --git a/Assets/Scripts/Generate/NetworkProtocol/RouteType.cs b/Assets/Scripts/Generate/NetworkProtocol/RouteType.cs index ac5c3332e..01cebe1a1 100644 --- a/Assets/Scripts/Generate/NetworkProtocol/RouteType.cs +++ b/Assets/Scripts/Generate/NetworkProtocol/RouteType.cs @@ -6,7 +6,6 @@ namespace Fantasy public const int GateRoute = 1001; // Gate public const int SocialRoute = 1002; // Social public const int GameRoute = 1003; // Game - public const int MapRoute = 1004; // Map - public const int RoomRoute = 1005; // Room + public const int MapRoute = 1004; // 地图 } }