Game/Fishing2Server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://git.bobsong.cn/Game/Fishing2Server

Browse Source 
# Conflicts:
#	Config/NetworkProtocol/Outer/data/MapProtoData.proto
#	Entity/Generate/NetworkProtocol/MapProtoData.cs
#	Entity/Generate/NetworkProtocol/OuterOpcode.cs
This commit is contained in:
BobSong
2025-09-25 23:23:18 +08:00
parent 5218bc7585 f3d82df793
commit 74964ca3d4
22 changed files with 521 additions and 229 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Entity/Game/Item/Item.cs
View File

@@ -46,5 +46,5 @@ public class Item : Entity
/// <summary>
/// 物品所属的容器
/// </summary>
[BsonIgnore] ItemContainer Container;
[BsonIgnore] PlayerItemContainer Container;
}

2
Entity/Game/Item/ItemContainer.cs → Entity/Game/Item/PlayerItemContainer.cs
View File

@@ -6,7 +6,7 @@ using NB.Game;
namespace NB;
public sealed class ItemContainer : Entity
public sealed class PlayerItemContainer : Entity
{
/// <summary>
/// 最大格子数量

32
Entity/Game/Player/Child/PlayerBasic.cs
View File

@@ -1,32 +0,0 @@
using Fantasy.Entitas;
using MongoDB.Bson.Serialization.Attributes;
namespace NB.Game;
// public class PlayerBasic : Entity
// {
// /// <summary>
// /// 昵称
// /// </summary>
// public string NickName;
//
// /// <summary>
// /// 头像
// /// </summary>
// public string Head;
//
// /// <summary>
// /// 国家
// /// </summary>
// public string Country;
//
// /// <summary>
// /// 等级
// /// </summary>
// public int Level;
//
// /// <summary>
// /// 当前经验
// /// </summary>
// public int Exp;
// }

34
Entity/Game/Player/Child/PlayerSlot.cs
View File

@@ -1,34 +0,0 @@
using Fantasy.Entitas;
namespace NB.Game;
public enum SlotType
{
None,
/// <summary>
/// 物品
/// </summary>
Item,
/// <summary>
/// 钓组
/// </summary>
Tackle
}
/// <summary>
/// 快速使用插槽
/// </summary>
public class PlayerSlot : Entity
{
/// <summary>
/// 插槽类型
/// </summary>
public SlotType SlotType;
/// <summary>
/// 绑定快速使用的id
/// </summary>
public long BindId;
}

11
Entity/Game/Player/Child/PlayerTackle.cs
View File

@@ -1,11 +0,0 @@
using Fantasy.Entitas;
namespace NB;
/// <summary>
/// 玩家钓组
/// </summary>
public class PlayerTackle : Entity
{
}

13
Entity/Game/Player/Player.cs
View File

@@ -59,7 +59,7 @@ public sealed class Player : Entity
/// <summary>
/// 背包
/// </summary>
[BsonElement("bag")] public ItemContainer ItemContainer;
[BsonElement("bag")] public PlayerItemContainer ItemContainer;
/// <summary>
/// 鱼护
@@ -83,14 +83,5 @@ public sealed class Player : Entity
public bool IsVip => Vip != null && Vip.ExpirationTime > TimeHelper.Now;
[BsonIgnore] public long SessionRunTimeId;
/// <summary>
/// 需要保存数据库
/// </summary>
[BsonIgnore] public bool NeedSave;
/// <summary>
/// 需要保存数据库时间
/// </summary>
[BsonIgnore] public long NeedSaveTime;
}

2
Entity/Game/Player/PlayerManageComponent.cs
View File

@@ -4,7 +4,5 @@ namespace NB.Game;
public sealed class PlayerManageComponent : Entity
{
public long AutoSaveTimerId;
public readonly Dictionary<long, Player> Players = new();
}

0
Entity/Game/Player/Child/PlayerVip.cs → Entity/Game/Player/PlayerVip.cs
View File

0
Entity/Game/Player/Child/PlayerWallet.cs → Entity/Game/Player/PlayerWallet.cs
View File

0
Entity/Game/Player/Child/PlayerStatistics.cs → Entity/Game/Statistics/PlayerStatistics.cs
View File

37
Entity/Generate/NetworkProtocol/CommonProtoData.cs
View File

@@ -90,12 +90,12 @@ namespace Fantasy
BaseInfo = default;
RoleId = default;
Items.Clear();
ItemBinds.Clear();
Fishs.Clear();
Activities.Clear();
Currency.Clear();
Slots.Clear();
Skills.Clear();
Gears.Clear();
MapId = default;
#if FANTASY_NET || FANTASY_UNITY
GetScene().MessagePoolComponent.Return<RoleInfo>(this);
@@ -108,17 +108,17 @@ namespace Fantasy
[ProtoMember(3)]
public List<ItemInfo> Items = new List<ItemInfo>();
[ProtoMember(4)]
public List<FishInfo> Fishs = new List<FishInfo>();
public List<ItemBindInfo> ItemBinds = new List<ItemBindInfo>();
[ProtoMember(5)]
public List<ActivityInfo> Activities = new List<ActivityInfo>();
public List<FishInfo> Fishs = new List<FishInfo>();
[ProtoMember(6)]
public List<KeyValueInt64> Currency = new List<KeyValueInt64>();
public List<ActivityInfo> Activities = new List<ActivityInfo>();
[ProtoMember(7)]
public List<KeyValueInt64> Slots = new List<KeyValueInt64>();
public List<KeyValueInt64> Currency = new List<KeyValueInt64>();
[ProtoMember(8)]
public List<SkillInfo> Skills = new List<SkillInfo>();
public List<KeyValueInt64> Slots = new List<KeyValueInt64>();
[ProtoMember(9)]
public List<GearInfo> Gears = new List<GearInfo>();
public List<SkillInfo> Skills = new List<SkillInfo>();
[ProtoMember(10)]
public int MapId { get; set; }
}
@@ -207,6 +207,29 @@ namespace Fantasy
public int Count { get; set; }
}
/// <summary>
/// 玩家当前使用钓组信息
/// </summary>
[ProtoContract]
public partial class ItemBindInfo : AMessage, IProto
{
public static ItemBindInfo Create(Scene scene)
{
return scene.MessagePoolComponent.Rent<ItemBindInfo>();
}
public override void Dispose()
{
Item = default;
BindItems.Clear();
#if FANTASY_NET || FANTASY_UNITY
GetScene().MessagePoolComponent.Return<ItemBindInfo>(this);
#endif
}
[ProtoMember(1)]
public long Item { get; set; }
[ProtoMember(2)]
public List<long> BindItems = new List<long>();
}
/// <summary>
/// 物品信息
/// </summary>
[ProtoContract]

300
Entity/Generate/NetworkProtocol/GameMessage.cs
View File

@@ -17,4 +17,304 @@ using Fantasy.Serialize;
namespace Fantasy
{
/// <summary>
/// /////////// ******** 物品信息 *******/////////////
/// </summary>
/// <summary>
/// 请求背包列表
/// </summary>
[ProtoContract]
public partial class C2Game_GetItemsRequest : AMessage, ICustomRouteRequest, IProto
{
public static C2Game_GetItemsRequest Create(Scene scene)
{
return scene.MessagePoolComponent.Rent<C2Game_GetItemsRequest>();
}
public override void Dispose()
{
#if FANTASY_NET || FANTASY_UNITY
GetScene().MessagePoolComponent.Return<C2Game_GetItemsRequest>(this);
#endif
}
[ProtoIgnore]
public Game2C_GetItemsResponse ResponseType { get; set; }
public uint OpCode() { return OuterOpcode.C2Game_GetItemsRequest; }
[ProtoIgnore]
public int RouteType => Fantasy.RouteType.GameRoute;
}
/// <summary>
/// 请求背包列表响应
/// </summary>
[ProtoContract]
public partial class Game2C_GetItemsResponse : AMessage, ICustomRouteResponse, IProto
{
public static Game2C_GetItemsResponse Create(Scene scene)
{
return scene.MessagePoolComponent.Rent<Game2C_GetItemsResponse>();
}
public override void Dispose()
{
ErrorCode = default;
Items.Clear();
Rigs.Clear();
#if FANTASY_NET || FANTASY_UNITY
GetScene().MessagePoolComponent.Return<Game2C_GetItemsResponse>(this);
#endif
}
public uint OpCode() { return OuterOpcode.Game2C_GetItemsResponse; }
[ProtoMember(1)]
public List<ItemInfo> Items = new List<ItemInfo>();
[ProtoMember(2)]
public List<ItemBindInfo> Rigs = new List<ItemBindInfo>();
[ProtoMember(3)]
public uint ErrorCode { get; set; }
}
/// <summary>
/// 请求使用物品
/// </summary>
[ProtoContract]
public partial class C2Game_UseItemRequest : AMessage, ICustomRouteRequest, IProto
{
public static C2Game_UseItemRequest Create(Scene scene)
{
return scene.MessagePoolComponent.Rent<C2Game_UseItemRequest>();
}
public override void Dispose()
{
#if FANTASY_NET || FANTASY_UNITY
GetScene().MessagePoolComponent.Return<C2Game_UseItemRequest>(this);
#endif
}
[ProtoIgnore]
public Game2C_UseItemResponse ResponseType { get; set; }
public uint OpCode() { return OuterOpcode.C2Game_UseItemRequest; }
[ProtoIgnore]
public int RouteType => Fantasy.RouteType.GameRoute;
}
/// <summary>
/// 请求使用物品响应
/// </summary>
[ProtoContract]
public partial class Game2C_UseItemResponse : AMessage, ICustomRouteResponse, IProto
{
public static Game2C_UseItemResponse Create(Scene scene)
{
return scene.MessagePoolComponent.Rent<Game2C_UseItemResponse>();
}
public override void Dispose()
{
ErrorCode = default;
#if FANTASY_NET || FANTASY_UNITY
GetScene().MessagePoolComponent.Return<Game2C_UseItemResponse>(this);
#endif
}
public uint OpCode() { return OuterOpcode.Game2C_UseItemResponse; }
[ProtoMember(1)]
public uint ErrorCode { get; set; }
}
/// <summary>
/// 物品变化
/// </summary>
[ProtoContract]
public partial class Game2C_ItemChange : AMessage, ICustomRouteMessage, IProto
{
public static Game2C_ItemChange Create(Scene scene)
{
return scene.MessagePoolComponent.Rent<Game2C_ItemChange>();
}
public override void Dispose()
{
Type = default;
Items.Clear();
Removes.Clear();
#if FANTASY_NET || FANTASY_UNITY
GetScene().MessagePoolComponent.Return<Game2C_ItemChange>(this);
#endif
}
public uint OpCode() { return OuterOpcode.Game2C_ItemChange; }
[ProtoIgnore]
public int RouteType => Fantasy.RouteType.GameRoute;
[ProtoMember(1)]
public int Type { get; set; }
[ProtoMember(2)]
public List<ItemInfo> Items = new List<ItemInfo>();
[ProtoMember(3)]
public List<long> Removes = new List<long>();
}
/// <summary>
/// /////////// ******** 鱼护 *******/////////////
/// </summary>
/// <summary>
/// 请求鱼护列表
/// </summary>
[ProtoContract]
public partial class C2Game_GetFishsRequest : AMessage, ICustomRouteRequest, IProto
{
public static C2Game_GetFishsRequest Create(Scene scene)
{
return scene.MessagePoolComponent.Rent<C2Game_GetFishsRequest>();
}
public override void Dispose()
{
#if FANTASY_NET || FANTASY_UNITY
GetScene().MessagePoolComponent.Return<C2Game_GetFishsRequest>(this);
#endif
}
[ProtoIgnore]
public Game2C_GetFishsResponse ResponseType { get; set; }
public uint OpCode() { return OuterOpcode.C2Game_GetFishsRequest; }
[ProtoIgnore]
public int RouteType => Fantasy.RouteType.GameRoute;
}
/// <summary>
/// 请求鱼护列表响应
/// </summary>
[ProtoContract]
public partial class Game2C_GetFishsResponse : AMessage, ICustomRouteResponse, IProto
{
public static Game2C_GetFishsResponse Create(Scene scene)
{
return scene.MessagePoolComponent.Rent<Game2C_GetFishsResponse>();
}
public override void Dispose()
{
ErrorCode = default;
Fishs.Clear();
#if FANTASY_NET || FANTASY_UNITY
GetScene().MessagePoolComponent.Return<Game2C_GetFishsResponse>(this);
#endif
}
public uint OpCode() { return OuterOpcode.Game2C_GetFishsResponse; }
[ProtoMember(1)]
public List<FishInfo> Fishs = new List<FishInfo>();
[ProtoMember(2)]
public uint ErrorCode { get; set; }
}
/// <summary>
/// 鱼护变化
/// </summary>
[ProtoContract]
public partial class Game2C_FishChange : AMessage, ICustomRouteMessage, IProto
{
public static Game2C_FishChange Create(Scene scene)
{
return scene.MessagePoolComponent.Rent<Game2C_FishChange>();
}
public override void Dispose()
{
Type = default;
Fishs.Clear();
Removes.Clear();
#if FANTASY_NET || FANTASY_UNITY
GetScene().MessagePoolComponent.Return<Game2C_FishChange>(this);
#endif
}
public uint OpCode() { return OuterOpcode.Game2C_FishChange; }
[ProtoIgnore]
public int RouteType => Fantasy.RouteType.GameRoute;
[ProtoMember(1)]
public int Type { get; set; }
[ProtoMember(2)]
public List<FishInfo> Fishs = new List<FishInfo>();
[ProtoMember(3)]
public List<long> Removes = new List<long>();
}
/// <summary>
/// 请求出售
/// </summary>
[ProtoContract]
public partial class C2Game_SellFishRequest : AMessage, ICustomRouteRequest, IProto
{
public static C2Game_SellFishRequest Create(Scene scene)
{
return scene.MessagePoolComponent.Rent<C2Game_SellFishRequest>();
}
public override void Dispose()
{
Ids.Clear();
#if FANTASY_NET || FANTASY_UNITY
GetScene().MessagePoolComponent.Return<C2Game_SellFishRequest>(this);
#endif
}
[ProtoIgnore]
public Game2C_SellFishResponse ResponseType { get; set; }
public uint OpCode() { return OuterOpcode.C2Game_SellFishRequest; }
[ProtoIgnore]
public int RouteType => Fantasy.RouteType.GameRoute;
[ProtoMember(1)]
public List<long> Ids = new List<long>();
}
/// <summary>
/// 请求出售响应
/// </summary>
[ProtoContract]
public partial class Game2C_SellFishResponse : AMessage, ICustomRouteResponse, IProto
{
public static Game2C_SellFishResponse Create(Scene scene)
{
return scene.MessagePoolComponent.Rent<Game2C_SellFishResponse>();
}
public override void Dispose()
{
ErrorCode = default;
Awards.Clear();
#if FANTASY_NET || FANTASY_UNITY
GetScene().MessagePoolComponent.Return<Game2C_SellFishResponse>(this);
#endif
}
public uint OpCode() { return OuterOpcode.Game2C_SellFishResponse; }
[ProtoMember(1)]
public List<AwardInfo> Awards = new List<AwardInfo>();
[ProtoMember(2)]
public uint ErrorCode { get; set; }
}
/// <summary>
/// /////////// ******** 商店 *******/////////////
/// </summary>
/// <summary>
/// 请求购买
/// </summary>
[ProtoContract]
public partial class C2Game_BuyRequest : AMessage, ICustomRouteRequest, IProto
{
public static C2Game_BuyRequest Create(Scene scene)
{
return scene.MessagePoolComponent.Rent<C2Game_BuyRequest>();
}
public override void Dispose()
{
#if FANTASY_NET || FANTASY_UNITY
GetScene().MessagePoolComponent.Return<C2Game_BuyRequest>(this);
#endif
}
[ProtoIgnore]
public Game2C_GetFishsResponse ResponseType { get; set; }
public uint OpCode() { return OuterOpcode.C2Game_BuyRequest; }
[ProtoIgnore]
public int RouteType => Fantasy.RouteType.GameRoute;
}
/// <summary>
/// 请求购买响应
/// </summary>
[ProtoContract]
public partial class Game2C_BuyResponse : AMessage, ICustomRouteResponse, IProto
{
public static Game2C_BuyResponse Create(Scene scene)
{
return scene.MessagePoolComponent.Rent<Game2C_BuyResponse>();
}
public override void Dispose()
{
ErrorCode = default;
Awards.Clear();
#if FANTASY_NET || FANTASY_UNITY
GetScene().MessagePoolComponent.Return<Game2C_BuyResponse>(this);
#endif
}
public uint OpCode() { return OuterOpcode.Game2C_BuyResponse; }
[ProtoMember(1)]
public List<AwardInfo> Awards = new List<AwardInfo>();
[ProtoMember(2)]
public uint ErrorCode { get; set; }
}
}

105
Entity/Generate/NetworkProtocol/OuterOpcode.cs
View File

@@ -2,61 +2,72 @@ namespace Fantasy
{
public static partial class OuterOpcode
{
public const uint C2Map_CreateRoomRequest = 2281711377;
public const uint Map2C_CreateRoomResponse = 2415929105;
public const uint C2Game_GetItemsRequest = 2281711377;
public const uint Game2C_GetItemsResponse = 2415929105;
public const uint C2Game_UseItemRequest = 2281711378;
public const uint Game2C_UseItemResponse = 2415929106;
public const uint Game2C_ItemChange = 2147493649;
public const uint C2Game_GetFishsRequest = 2281711379;
public const uint Game2C_GetFishsResponse = 2415929107;
public const uint Game2C_FishChange = 2147493650;
public const uint C2Game_SellFishRequest = 2281711380;
public const uint Game2C_SellFishResponse = 2415929108;
public const uint C2Game_BuyRequest = 2281711381;
public const uint Game2C_BuyResponse = 2415929109;
public const uint C2Map_CreateRoomRequest = 2281711382;
public const uint Map2C_CreateRoomResponse = 2415929110;
public const uint C2G_ExitRoomRequest = 268445457;
public const uint G2C_ExitRoomResponse = 402663185;
public const uint C2G_EnterMapRequest = 268445458;
public const uint G2C_EnterMapResponse = 402663186;
public const uint Map2C_ChangeMap = 2147493649;
public const uint Map2C_ChangeMap = 2147493651;
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 C2Game_GetRoleInfoRequest = 2281711378;
public const uint Game2C_GetRoleInfoResponse = 2415929106;
public const uint Map2C_RoleEnterRoomNotify = 2147493650;
public const uint Map2C_RoleExitRoomNotify = 2147493651;
public const uint C2Map_RolePropertyChange = 2147493652;
public const uint Map2C_RoleStateNotify = 2147493653;
public const uint Map2C_RoleGearChangeNotify = 2147493654;
public const uint Map2C_RolePropertyChangeNotify = 2147493655;
public const uint C2Map_Move = 2147493656;
public const uint C2Map_Look = 2147493657;
public const uint Map2C_MoveNotify = 2147493658;
public const uint Map2C_LookeNotify = 2147493659;
public const uint C2S_GetConversationsRequest = 2281711379;
public const uint S2C_GetConversationsResponse = 2415929107;
public const uint C2S_SendMailRequest = 2281711380;
public const uint S2C_SendMailResponse = 2415929108;
public const uint C2S_DeleteMailRequest = 2281711381;
public const uint S2C_DeleteMailResponse = 2415929109;
public const uint S2C_HaveMail = 2147493660;
public const uint S2C_MailState = 2147493661;
public const uint C2S_CreateChannelRequest = 2281711382;
public const uint S2C_CreateChannelResponse = 2415929110;
public const uint C2S_JoinChannelRequest = 2281711383;
public const uint S2C_JoinChannelResponse = 2415929111;
public const uint C2S_SendMessageRequest = 2281711384;
public const uint S2C_SendMessageResponse = 2415929112;
public const uint S2C_Message = 2147493662;
public const uint C2S_CreateClubRequest = 2281711385;
public const uint S2C_CreateClubResponse = 2415929113;
public const uint C2S_GetClubInfoRequest = 2281711386;
public const uint S2C_GetClubInfoResponse = 2415929114;
public const uint C2S_GetMemberListRequest = 2281711387;
public const uint S2C_GetMemberListResponse = 2415929115;
public const uint C2S_GetClubListRequest = 2281711388;
public const uint S2C_GetClubListResponse = 2415929116;
public const uint C2S_JoinClubRequest = 2281711389;
public const uint S2C_JoinClubResponse = 2415929117;
public const uint C2S_LeaveClubRequest = 2281711390;
public const uint S2C_LeaveClubResponse = 2415929118;
public const uint C2S_DissolveClubRequest = 2281711391;
public const uint S2C_DissolveClubResponse = 2415929119;
public const uint C2S_DisposeJoinRequest = 2281711392;
public const uint S2C_DisposeJoinResponse = 2415929120;
public const uint S2C_ClubChange = 2147493663;
public const uint C2Game_GetRoleInfoRequest = 2281711383;
public const uint Game2C_GetRoleInfoResponse = 2415929111;
public const uint Map2C_RoleEnterRoomNotify = 2147493652;
public const uint Map2C_RoleExitRoomNotify = 2147493653;
public const uint Map2C_RoleStateNotify = 2147493654;
public const uint Map2C_RoleGearChangeNotify = 2147493655;
public const uint Map2C_RolePropertyChangeNotify = 2147493656;
public const uint C2Map_Move = 2147493657;
public const uint C2Map_Look = 2147493658;
public const uint Map2C_MoveNotify = 2147493659;
public const uint Map2C_LookeNotify = 2147493660;
public const uint C2S_GetConversationsRequest = 2281711384;
public const uint S2C_GetConversationsResponse = 2415929112;
public const uint C2S_SendMailRequest = 2281711385;
public const uint S2C_SendMailResponse = 2415929113;
public const uint C2S_DeleteMailRequest = 2281711386;
public const uint S2C_DeleteMailResponse = 2415929114;
public const uint S2C_HaveMail = 2147493661;
public const uint S2C_MailState = 2147493662;
public const uint C2S_CreateChannelRequest = 2281711387;
public const uint S2C_CreateChannelResponse = 2415929115;
public const uint C2S_JoinChannelRequest = 2281711388;
public const uint S2C_JoinChannelResponse = 2415929116;
public const uint C2S_SendMessageRequest = 2281711389;
public const uint S2C_SendMessageResponse = 2415929117;
public const uint S2C_Message = 2147493663;
public const uint C2S_CreateClubRequest = 2281711390;
public const uint S2C_CreateClubResponse = 2415929118;
public const uint C2S_GetClubInfoRequest = 2281711391;
public const uint S2C_GetClubInfoResponse = 2415929119;
public const uint C2S_GetMemberListRequest = 2281711392;
public const uint S2C_GetMemberListResponse = 2415929120;
public const uint C2S_GetClubListRequest = 2281711393;
public const uint S2C_GetClubListResponse = 2415929121;
public const uint C2S_JoinClubRequest = 2281711394;
public const uint S2C_JoinClubResponse = 2415929122;
public const uint C2S_LeaveClubRequest = 2281711395;
public const uint S2C_LeaveClubResponse = 2415929123;
public const uint C2S_DissolveClubRequest = 2281711396;
public const uint S2C_DissolveClubResponse = 2415929124;
public const uint C2S_DisposeJoinRequest = 2281711397;
public const uint S2C_DisposeJoinResponse = 2415929125;
public const uint S2C_ClubChange = 2147493664;
}
}

3
Entity/Generate/NetworkProtocol/RoomMessage.cs
View File

@@ -233,6 +233,7 @@ namespace Fantasy
Rotation = default;
Direction = default;
IsStop = default;
IsRun = default;
Timestamp = default;
#if FANTASY_NET || FANTASY_UNITY
GetScene().MessagePoolComponent.Return<Map2C_MoveNotify>(this);
@@ -252,6 +253,8 @@ namespace Fantasy
[ProtoMember(5)]
public bool IsStop { get; set; }
[ProtoMember(6)]
public bool IsRun { get; set; }
[ProtoMember(7)]
public long Timestamp { get; set; }
}
/// <summary>