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

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]