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

服务合并

Browse Source
This commit is contained in:
Bob.Song
2026-03-11 10:15:34 +08:00
parent 945ffe9861
commit c2ec7226c0
68 changed files with 866 additions and 1032 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Entity/Fantasy.config
View File

@@ -57,14 +57,6 @@
networkProtocol=""
outerPort="0" innerPort="11031" />
<scene id="1006"
processConfigId="1"
worldConfigId="1"
sceneRuntimeMode="MultiThread"
sceneTypeString="Social"
networkProtocol=""
outerPort="0" innerPort="11051" />
<!-- <scene id="1007" -->
<!-- processConfigId="1" -->
<!-- worldConfigId="1" -->

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

@@ -2,6 +2,7 @@ using Fantasy.Entitas;
using Fantasy.Helper;
using MongoDB.Bson.Serialization.Attributes;
using MongoDB.Bson.Serialization.Options;
using NB.Chat;
namespace NB.Game;
@@ -63,5 +64,8 @@ public sealed class Player : Entity
[BsonIgnore] public long SessionRunTimeId;
[BsonIgnore] public readonly Dictionary<long, ChatChannelComponent> Channels = new();
[BsonIgnore] public readonly Dictionary<int, long> SendTime = new Dictionary<int, long>();
}

0
Entity/Social/Chat/Components/ChatChannelCenterComponent.cs → Entity/Game/Social/Chat/Components/ChatChannelCenterComponent.cs
View File

0
Entity/Social/Chat/Components/ChatChannelComponent.cs → Entity/Game/Social/Chat/Components/ChatChannelComponent.cs
View File

0
Entity/Social/Chat/Enum/ChatChannelType.cs → Entity/Game/Social/Chat/Enum/ChatChannelType.cs
View File

0
Entity/Social/Chat/Model/ChatInfoTree.cs → Entity/Game/Social/Chat/Model/ChatInfoTree.cs
View File

0
Entity/Social/Chat/Model/ChatUnit.cs → Entity/Game/Social/Chat/Model/ChatUnit.cs
View File

0
Entity/Social/Club/Club.cs → Entity/Game/Social/Club/Club.cs
View File

0
Entity/Social/Club/ClubManageComponent.cs → Entity/Game/Social/Club/ClubManageComponent.cs
View File

0
Entity/Social/Mail/Components/MailComponent.cs → Entity/Game/Social/Mail/Components/MailComponent.cs
View File

0
Entity/Social/Mail/Components/MailManageComponent.cs → Entity/Game/Social/Mail/Components/MailManageComponent.cs
View File

0
Entity/Social/Mail/Entity/Mail.cs → Entity/Game/Social/Mail/Entity/Mail.cs
View File

0
Entity/Social/Mail/Entity/MailBox.cs → Entity/Game/Social/Mail/Entity/MailBox.cs
View File

0
Entity/Social/Mail/Entity/MailConversation.cs → Entity/Game/Social/Mail/Entity/MailConversation.cs
View File

0
Entity/Social/Mail/Enum/MailEnum.cs → Entity/Game/Social/Mail/Enum/MailEnum.cs
View File

33
Entity/Game/Social/SocialUnit.cs Normal file
View File

@@ -0,0 +1,33 @@
// using Fantasy;
// using Fantasy.Entitas;
//
// namespace NB.Chat;
//
// public sealed class SocialUnit : Entity
// {
// public long GateRouteId;
//
// public RoleSimpleInfo Role;
//
// /// <summary>
// /// 当前所在地图
// /// </summary>
// public long MapId;
//
//
// public readonly Dictionary<long, ChatChannelComponent> Channels = new();
// public readonly Dictionary<int, long> SendTime = new Dictionary<int, long>();
//
//
// public override void Dispose()
// {
// if (IsDisposed)
// {
// return;
// }
//
// GateRouteId = 0;
// Role = null;
// base.Dispose();
// }
// }

17
Entity/Game/Social/SocialUnitManageComponent.cs Normal file
View File

@@ -0,0 +1,17 @@
// using System.Collections.Generic;
// using Fantasy;
// using Fantasy.DataStructure.Collection;
// using Fantasy.Entitas;
//
// namespace NB.Chat;
//
// public class SocialUnitManageComponent : Entity
// {
// public readonly Dictionary<long, SocialUnit> Units = new();
//
// // public List<MailBox>
// // /// <summary>
// // /// 不在线消息缓存
// // /// </summary>
// // public readonly OneToManyList<long, ChatMessageInfo> NotSendMessage = new();
// }

965
Entity/Generate/NetworkProtocol/OuterMessage.cs
View File

File diff suppressed because it is too large Load Diff

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

@@ -27,13 +27,13 @@ namespace Fantasy
public const uint Game2C_RewardNotify = 2147493651;
public const uint C2Game_GMRequest = 2281711385;
public const uint Game2C_GMResponse = 2415929113;
public const uint C2Map_CreateRoomRequest = 2281711386;
public const uint Map2C_CreateRoomResponse = 2415929114;
public const uint C2Game_CreateRoomRequest = 2281711386;
public const uint Game2C_CreateRoomResponse = 2415929114;
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 = 2147493652;
public const uint Game2C_ChangeMap = 2147493652;
public const uint C2A_LoginRequest = 268445459;
public const uint A2C_LoginResponse = 402663187;
public const uint C2G_LoginRequest = 268445460;
@@ -41,52 +41,49 @@ namespace Fantasy
public const uint G2C_RepeatLogin = 134227729;
public const uint C2Game_GetRoleInfoRequest = 2281711387;
public const uint Game2C_GetRoleInfoResponse = 2415929115;
public const uint Map2C_RoleEnterRoomNotify = 2147493653;
public const uint Map2C_RoleExitRoomNotify = 2147493654;
public const uint C2Map_TakeItemRequest = 2281711388;
public const uint Map2C_TakeItemResponse = 2415929116;
public const uint C2Map_RolePropertyChange = 2147493655;
public const uint Map2C_RoleStateNotify = 2147493656;
public const uint Map2C_RoleGearChangeNotify = 2147493657;
public const uint Map2C_RolePropertyChangeNotify = 2147493658;
public const uint C2Map_Move = 2147493659;
public const uint C2Map_Look = 2147493660;
public const uint Map2C_MoveNotify = 2147493661;
public const uint Map2C_LookeNotify = 2147493662;
public const uint C2S_GetConversationsRequest = 2281711389;
public const uint S2C_GetConversationsResponse = 2415929117;
public const uint C2S_SendMailRequest = 2281711390;
public const uint S2C_SendMailResponse = 2415929118;
public const uint C2S_DeleteMailRequest = 2281711391;
public const uint S2C_DeleteMailResponse = 2415929119;
public const uint S2C_HaveMail = 2147493663;
public const uint S2C_MailState = 2147493664;
public const uint C2Chat_SendMessageRequest = 2281711392;
public const uint Chat2C_SendMessageResponse = 2415929120;
public const uint Chat2C_Message = 2147493665;
public const uint C2S_CreateChannelRequest = 2281711393;
public const uint S2C_CreateChannelResponse = 2415929121;
public const uint C2S_JoinChannelRequest = 2281711394;
public const uint S2C_JoinChannelResponse = 2415929122;
public const uint C2S_SendMessageRequest = 2281711395;
public const uint S2C_SendMessageResponse = 2415929123;
public const uint S2C_Message = 2147493666;
public const uint C2S_CreateClubRequest = 2281711396;
public const uint S2C_CreateClubResponse = 2415929124;
public const uint C2S_GetClubInfoRequest = 2281711397;
public const uint S2C_GetClubInfoResponse = 2415929125;
public const uint C2S_GetMemberListRequest = 2281711398;
public const uint S2C_GetMemberListResponse = 2415929126;
public const uint C2S_GetClubListRequest = 2281711399;
public const uint S2C_GetClubListResponse = 2415929127;
public const uint C2S_JoinClubRequest = 2281711400;
public const uint S2C_JoinClubResponse = 2415929128;
public const uint C2S_LeaveClubRequest = 2281711401;
public const uint S2C_LeaveClubResponse = 2415929129;
public const uint C2S_DissolveClubRequest = 2281711402;
public const uint S2C_DissolveClubResponse = 2415929130;
public const uint C2S_DisposeJoinRequest = 2281711403;
public const uint S2C_DisposeJoinResponse = 2415929131;
public const uint S2C_ClubChange = 2147493667;
public const uint Game2C_RoleEnterRoomNotify = 2147493653;
public const uint Game2C_RoleExitRoomNotify = 2147493654;
public const uint C2Game_TakeItemRequest = 2281711388;
public const uint Game2C_TakeItemResponse = 2415929116;
public const uint C2Game_RolePropertyChange = 2147493655;
public const uint Game2C_RoleStateNotify = 2147493656;
public const uint Game2C_RoleGearChangeNotify = 2147493657;
public const uint Game2C_RolePropertyChangeNotify = 2147493658;
public const uint C2Game_Move = 2147493659;
public const uint C2Game_Look = 2147493660;
public const uint Game2C_MoveNotify = 2147493661;
public const uint Game2C_LookeNotify = 2147493662;
public const uint C2Game_GetConversationsRequest = 2281711389;
public const uint Game2C_GetConversationsResponse = 2415929117;
public const uint C2Game_SendMailRequest = 2281711390;
public const uint Game2C_SendMailResponse = 2415929118;
public const uint C2Game_DeleteMailRequest = 2281711391;
public const uint Game2C_DeleteMailResponse = 2415929119;
public const uint Game2C_HaveMail = 2147493663;
public const uint Game2C_MailState = 2147493664;
public const uint C2Game_SendMessageRequest = 2281711392;
public const uint Game2C_SendMessageResponse = 2415929120;
public const uint Game2C_Message = 2147493665;
public const uint C2Game_CreateChannelRequest = 2281711393;
public const uint Game2C_CreateChannelResponse = 2415929121;
public const uint C2Game_JoinChannelRequest = 2281711394;
public const uint Game2C_JoinChannelResponse = 2415929122;
public const uint C2Game_CreateClubRequest = 2281711395;
public const uint Game2C_CreateClubResponse = 2415929123;
public const uint C2Game_GetClubInfoRequest = 2281711396;
public const uint Game2C_GetClubInfoResponse = 2415929124;
public const uint C2Game_GetMemberListRequest = 2281711397;
public const uint Game2C_GetMemberListResponse = 2415929125;
public const uint C2Game_GetClubListRequest = 2281711398;
public const uint Game2C_GetClubListResponse = 2415929126;
public const uint C2Game_JoinClubRequest = 2281711399;
public const uint Game2C_JoinClubResponse = 2415929127;
public const uint C2Game_LeaveClubRequest = 2281711400;
public const uint Game2C_LeaveClubResponse = 2415929128;
public const uint C2Game_DissolveClubRequest = 2281711401;
public const uint Game2C_DissolveClubResponse = 2415929129;
public const uint C2Game_DisposeJoinRequest = 2281711402;
public const uint Game2C_DisposeJoinResponse = 2415929130;
public const uint Game2C_ClubChange = 2147493666;
}
}

4
Entity/Generate/NetworkProtocol/RouteType.cs
View File

@@ -8,15 +8,13 @@ namespace Fantasy
public static partial class RouteType
{
public const int GateRoute = 1001; // Gate
public const int SocialRoute = 1002; // Social
public const int GameRoute = 1003; // Game
public const int GameRoute = 1002; // Game
public static IEnumerable<int> RoamingTypes
{
get
{
yield return GateRoute;
yield return SocialRoute;
yield return GameRoute;
}
}

33
Entity/Social/SocialUnit.cs
View File

@@ -1,33 +0,0 @@
using Fantasy;
using Fantasy.Entitas;
namespace NB.Chat;
public sealed class SocialUnit : Entity
{
public long GateRouteId;
public RoleSimpleInfo Role;
/// <summary>
/// 当前所在地图
/// </summary>
public long MapId;
public readonly Dictionary<long, ChatChannelComponent> Channels = new();
public readonly Dictionary<int, long> SendTime = new Dictionary<int, long>();
public override void Dispose()
{
if (IsDisposed)
{
return;
}
GateRouteId = 0;
Role = null;
base.Dispose();
}
}

17
Entity/Social/SocialUnitManageComponent.cs
View File

@@ -1,17 +0,0 @@
using System.Collections.Generic;
using Fantasy;
using Fantasy.DataStructure.Collection;
using Fantasy.Entitas;
namespace NB.Chat;
public class SocialUnitManageComponent : Entity
{
public readonly Dictionary<long, SocialUnit> Units = new();
// public List<MailBox>
// /// <summary>
// /// 不在线消息缓存
// /// </summary>
// public readonly OneToManyList<long, ChatMessageInfo> NotSendMessage = new();
}