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

进入和离开地图和房间协议合并

Browse Source
This commit is contained in:
BobSong
2025-09-09 00:17:50 +08:00
parent ebb1a467c4
commit a2c5b61ba8
16 changed files with 228 additions and 287 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
Hotfix/Gate/Handler/Outer/C2G_EnterRoomRequestHandler.cs → Hotfix/Gate/Handler/Outer/C2G_EnterMapRequestHandler.cs
View File

@@ -7,9 +7,9 @@ using NB.Map;
namespace NB.Gate;
public class C2G_EnterRoomRequestHandler : MessageRPC<C2G_EnterRoomRequest, G2C_EnterRoomResponse>
public class C2G_EnterMapRequestHandler : MessageRPC<C2G_EnterMapRequest, G2C_EnterMapResponse>
{
protected override async FTask Run(Session session, C2G_EnterRoomRequest request, G2C_EnterRoomResponse response,
protected override async FTask Run(Session session, C2G_EnterMapRequest request, G2C_EnterMapResponse response,
Action reply)
{
if (string.IsNullOrEmpty(request.RoomCode))
@@ -40,18 +40,23 @@ public class C2G_EnterRoomRequestHandler : MessageRPC<C2G_EnterRoomRequest, G2C_
return;
}
if (gateUnit.RoomCode == request.RoomCode)
{
response.ErrorCode = ErrorCode.MapRoomEnterRepeated;
return;
}
RoomHelper.ParseCode(request.RoomCode, out var serviceId, out var roomId);
if (serviceId < 1 || roomId < 1)
uint serviceId = 0;
int roomId = 0;
if (!string.IsNullOrEmpty(request.RoomCode))
{
response.ErrorCode = ErrorCode.MapRoomIdError;
return;
RoomHelper.ParseCode(request.RoomCode, out serviceId, out roomId);
if (serviceId < 1 || roomId < 1)
{
response.ErrorCode = ErrorCode.MapRoomIdError;
return;
}
}
if (serviceId == 0)
{
var mapScenes = SceneConfigData.Instance.GetSceneBySceneType(SceneType.Map);
serviceId = mapScenes.First().Id;
}
var sceneConfig = SceneConfigData.Instance.Get(serviceId);
@@ -63,7 +68,6 @@ public class C2G_EnterRoomRequestHandler : MessageRPC<C2G_EnterRoomRequest, G2C_
//先判断是否需要更换地图服务器
var oldServerRouteId = gateUnit.GetAddress(sceneConfig.SceneType);
Log.Info($"进入房间信息，mapRouteId={oldServerRouteId}-{sceneConfig.RouteId} serviceId={serviceId}");
if (oldServerRouteId != sceneConfig.RouteId)
{
//先退出旧的服务
@@ -84,11 +88,12 @@ public class C2G_EnterRoomRequestHandler : MessageRPC<C2G_EnterRoomRequest, G2C_
}
//执行进入房间操作
var roomResponse = (Map2G_EnterRoomResponse)await session.Scene.NetworkMessagingComponent.CallInnerRoute(
sceneConfig.RouteId, new G2Map_EnterRoomRequest()
var roomResponse = (Map2G_EnterMapResponse)await session.Scene.NetworkMessagingComponent.CallInnerRoute(
sceneConfig.RouteId, new G2Map_EnterMapRequest()
{
AccountId = gateUnit.Id,
RoomCode = request.RoomCode,
MapId = request.MapId
});
if (roomResponse.ErrorCode != 0)
{
@@ -100,6 +105,7 @@ public class C2G_EnterRoomRequestHandler : MessageRPC<C2G_EnterRoomRequest, G2C_
response.Units = roomResponse.Units;
response.RoomCode = request.RoomCode;
request.MapId = request.MapId;
response.ErrorCode = ErrorCode.Successful;
}
}

21
Hotfix/Map/Handler/C2Map_EnterMapRequestHandler.cs
View File

@@ -1,21 +0,0 @@
using Fantasy;
using Fantasy.Async;
using Fantasy.Network.Interface;
namespace NB.Map;
public class C2Map_EnterMapRequestHandler : RouteRPC<MapUnit, C2Map_EnterMapRequest, Map2C_EnterMapResponse>
{
protected override async FTask Run(MapUnit entity, C2Map_EnterMapRequest request, Map2C_EnterMapResponse response,
Action reply)
{
var roomManageComponent = entity.Scene.GetComponent<RoomManageComponent>();
if (roomManageComponent == null)
{
response.ErrorCode = ErrorCode.ErrServer;
return;
}
response.ErrorCode = await entity.EnterMap(request.MapId);
}
}

36
Hotfix/Map/Handler/Inner/G2Map_EnterRoomRequestHandler.cs → Hotfix/Map/Handler/Inner/G2Map_EnterMapRequestHandler.cs
View File

@@ -4,9 +4,12 @@ using Fantasy.Network.Interface;
namespace NB.Map.Inner;
public class G2Map_EnterRoomRequestHandler : RouteRPC<Scene, G2Map_EnterRoomRequest, Map2G_EnterRoomResponse>
/// <summary>
/// 请求进入地图
/// </summary>
public class G2Map_EnterMapRequestHandler : RouteRPC<Scene, G2Map_EnterMapRequest, Map2G_EnterMapResponse>
{
protected override async FTask Run(Scene entity, G2Map_EnterRoomRequest request, Map2G_EnterRoomResponse response,
protected override async FTask Run(Scene entity, G2Map_EnterMapRequest request, Map2G_EnterMapResponse response,
Action reply)
{
var roomManageComponent = entity.GetComponent<RoomManageComponent>();
@@ -31,32 +34,32 @@ public class G2Map_EnterRoomRequestHandler : RouteRPC<Scene, G2Map_EnterRoomRequ
}
//进入地图
response.ErrorCode = await mapUnit.EnterMap(request.MapId);
if (response.ErrorCode != 0)
{
return;
}
// 如果没有房间代码，则只是进入地图，直接返回，不执行后续逻辑
if (string.IsNullOrEmpty(request.RoomCode))
{
response.Units = [mapUnit.ToMapUnitInfo()];
return;
}
RoomHelper.ParseCode(request.RoomCode, out var serviceId, out var roomId);
if (serviceId < 1 || roomId < 1)
{
response.ErrorCode = ErrorCode.MapRoomIdError;
return;
}
var room = roomManageComponent.Get(roomId);
if (room == null)
{
response.ErrorCode = ErrorCode.MapRoomIdError;
return;
}
if (mapUnit.MapId != room.Map)
{
//切换地图
response.ErrorCode = await mapUnit.EnterMap(mapUnit.MapId);
if (response.ErrorCode != 0)
{
return;
}
}
response.ErrorCode = await room.Enter(mapUnit);
response.RoomCode = room.Code;
if (response.ErrorCode == ErrorCode.Successful)
@@ -64,6 +67,5 @@ public class G2Map_EnterRoomRequestHandler : RouteRPC<Scene, G2Map_EnterRoomRequ
mapUnit.RoomId = room.Id;
response.Units = room.ToMapUnitInfo();
}
}
}

16
Hotfix/Map/System/MapUnitSystem.cs
View File

@@ -28,12 +28,18 @@ public static class MapUnitSystem
return ErrorCode.MapIdError;
}
// 同步客户端
self.Scene.NetworkMessagingComponent.SendInnerRoute(self.GateRouteId, new Map2C_ChangeMap()
if (map.Units.TryAdd(self.Id, self))
{
Node = 1,
MapId = mapId
});
// 同步客户端
// self.Scene.NetworkMessagingComponent.SendInnerRoute(self.GateRouteId, new Map2C_ChangeMap()
// {
// Node = 1,
// MapId = mapId
// });
}
self.MapId = mapId;
await FTask.CompletedTask;