Skip to content

Commit 86bfa1f

Browse files
committed
refactor(玩家状态): 重命名玩家上下线消息类以统一命名规范
将 ReqDiscoverCenterPlayerOnline/Offline 重命名为 NotifyPlayerOnLine/OffLine 新增 Player_-10.cs 协议文件定义玩家注册相关消息
1 parent a816f7b commit 86bfa1f

File tree

3 files changed

+64
-15
lines changed

3 files changed

+64
-15
lines changed

GameFrameX.Hotfix/Logic/Player/Login/PlayerComponentAgent.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public async Task OnLogout()
4747
var serverComp = await ActorManager.GetComponentAgent<ServerComponentAgent>();
4848
await serverComp.RemoveOnlineRole(ActorId);
4949

50-
var reqRegisterPlayer = new ReqDiscoverCenterPlayerOffline
50+
var reqRegisterPlayer = new NotifyPlayerOffLine
5151
{
5252
PlayerId = ActorId,
5353
ServerId = GlobalSettings.CurrentSetting.ServerId,
@@ -96,7 +96,7 @@ public async Task OnPlayerLogin(INetWorkChannel workChannel, ReqPlayerLogin reqL
9696
var serverComp = await ActorManager.GetComponentAgent<ServerComponentAgent>();
9797
await serverComp.AddOnlineRole(ActorId);
9898

99-
var reqRegisterPlayer = new ReqDiscoverCenterPlayerOnline()
99+
var reqRegisterPlayer = new NotifyPlayerOnLine()
100100
{
101101
PlayerId = ActorId,
102102
ServerId = GlobalSettings.CurrentSetting.ServerId,

GameFrameX.Launcher/StartUp/Discovery/AppStartUpDiscoveryCenter.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,15 +162,15 @@ protected override ValueTask PackageHandler(IAppSession session, IMessage messag
162162

163163
case (byte)MessageOperationType.NotifyPlayerOnLine:
164164
{
165-
var reqRegisterPlayer = (ReqDiscoverCenterPlayerOnline)messageObject.DeserializeMessageObject();
165+
var reqRegisterPlayer = (NotifyPlayerOnLine)messageObject.DeserializeMessageObject();
166166
// 注册玩家
167167
NamingPlayerManager.Instance.Add(reqRegisterPlayer.PlayerId, reqRegisterPlayer.ServerId, reqRegisterPlayer.ServerInstanceId);
168168
LogHelper.Info($"注册玩家成功:{reqRegisterPlayer.PlayerId} {reqRegisterPlayer}");
169169
return ValueTask.CompletedTask;
170170
}
171171
case (byte)MessageOperationType.NotifyPlayerOffLine:
172172
{
173-
var reqRegisterPlayer = (ReqDiscoverCenterPlayerOffline)messageObject.DeserializeMessageObject();
173+
var reqRegisterPlayer = (NotifyPlayerOffLine)messageObject.DeserializeMessageObject();
174174
// 注销玩家
175175
NamingPlayerManager.Instance.TryRemove(reqRegisterPlayer.PlayerId, out var playerInfo);
176176
LogHelper.Info($"注销玩家成功:{reqRegisterPlayer.PlayerId} {reqRegisterPlayer}");

GameFrameX.Proto/BuiltIn/PlayerManager_-10.cs renamed to GameFrameX.Proto/BuiltIn/Player_-10.cs

Lines changed: 60 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -31,16 +31,15 @@
3131

3232
using GameFrameX.NetWork.Abstractions;
3333
using GameFrameX.NetWork.Messages;
34-
using GameFrameX.Utility.Setting;
3534
using ProtoBuf;
3635

3736
namespace GameFrameX.Proto.BuiltIn;
3837

3938
/// <summary>
40-
/// 请求注册玩家在线
39+
/// 请求注册服务(模块-10,协议101)
4140
/// </summary>
42-
[MessageTypeHandler(((-10) << 16) + 101, MessageOperationType.PlayerRegisterOnLine)]
43-
public partial class ReqDiscoverCenterPlayerOnline : MessageObject, IRequestMessage
41+
[MessageTypeHandler(((-10) << 16) + 101, (byte)MessageOperationType.PlayerRegister)]
42+
public partial class ReqPlayerRegister : MessageObject, IRequestMessage
4443
{
4544
/// <summary>
4645
/// 玩家ID
@@ -51,21 +50,21 @@ public partial class ReqDiscoverCenterPlayerOnline : MessageObject, IRequestMess
5150
/// <summary>
5251
/// 服务器ID
5352
/// </summary>
54-
[ProtoMember(7)]
53+
[ProtoMember(2)]
5554
public long ServerId { get; set; }
5655

5756
/// <summary>
5857
/// 服务器实例ID
5958
/// </summary>
60-
[ProtoMember(8)]
59+
[ProtoMember(3)]
6160
public long ServerInstanceId { get; set; }
6261
}
6362

6463
/// <summary>
65-
/// 请求注册玩家离线
64+
/// 请求注销服务(模块-10,协议102)
6665
/// </summary>
67-
[MessageTypeHandler(((-10) << 16) + 102, MessageOperationType.PlayerRegisterOffLine)]
68-
public partial class ReqDiscoverCenterPlayerOffline : MessageObject, IRequestMessage
66+
[MessageTypeHandler(((-10) << 16) + 102, (byte)MessageOperationType.PlayerUnRegister)]
67+
public partial class ReqPlayerUnRegister : MessageObject, IRequestMessage
6968
{
7069
/// <summary>
7170
/// 玩家ID
@@ -76,12 +75,62 @@ public partial class ReqDiscoverCenterPlayerOffline : MessageObject, IRequestMes
7675
/// <summary>
7776
/// 服务器ID
7877
/// </summary>
79-
[ProtoMember(7)]
78+
[ProtoMember(2)]
8079
public long ServerId { get; set; }
8180

8281
/// <summary>
8382
/// 服务器实例ID
8483
/// </summary>
85-
[ProtoMember(8)]
84+
[ProtoMember(3)]
85+
public long ServerInstanceId { get; set; }
86+
}
87+
88+
/// <summary>
89+
/// 通知玩家上线(模块-10,协议111)
90+
/// </summary>
91+
[MessageTypeHandler(((-10) << 16) + 111, (byte)MessageOperationType.NotifyPlayerOnLine)]
92+
public partial class NotifyPlayerOnLine : MessageObject, IRequestMessage
93+
{
94+
/// <summary>
95+
/// 玩家ID
96+
/// </summary>
97+
[ProtoMember(1)]
98+
public long PlayerId { get; set; }
99+
100+
/// <summary>
101+
/// 服务器ID
102+
/// </summary>
103+
[ProtoMember(2)]
104+
public long ServerId { get; set; }
105+
106+
/// <summary>
107+
/// 服务器实例ID
108+
/// </summary>
109+
[ProtoMember(3)]
110+
public long ServerInstanceId { get; set; }
111+
}
112+
113+
/// <summary>
114+
/// 通知玩家下线(模块-10,协议112)
115+
/// </summary>
116+
[MessageTypeHandler(((-10) << 16) + 112, (byte)MessageOperationType.NotifyPlayerOffLine)]
117+
public partial class NotifyPlayerOffLine : MessageObject, IRequestMessage
118+
{
119+
/// <summary>
120+
/// 玩家ID
121+
/// </summary>
122+
[ProtoMember(1)]
123+
public long PlayerId { get; set; }
124+
125+
/// <summary>
126+
/// 服务器ID
127+
/// </summary>
128+
[ProtoMember(2)]
129+
public long ServerId { get; set; }
130+
131+
/// <summary>
132+
/// 服务器实例ID
133+
/// </summary>
134+
[ProtoMember(3)]
86135
public long ServerInstanceId { get; set; }
87136
}

0 commit comments

Comments
 (0)