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
2025-08-27 18:05:55 +08:00
parent f6d85a1e0a
commit 94af0e5ddb
31 changed files with 562 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
Hotfix/Gate/Handler/Outer/C2G_EnterRoomRequestHandler.cs
View File

@@ -3,10 +3,9 @@ using Fantasy.Async;
using Fantasy.Network;
using Fantasy.Network.Interface;
using Fantasy.Platform.Net;
using NB.Common;
using NB.Map;
namespace NB.Gate.Handler;
namespace NB.Gate;
public class C2G_EnterRoomRequestHandler : MessageRPC<C2G_EnterRoomRequest, G2C_EnterRoomResponse>
{
@@ -41,6 +40,13 @@ 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)
{
@@ -55,9 +61,44 @@ public class C2G_EnterRoomRequestHandler : MessageRPC<C2G_EnterRoomRequest, G2C_
return;
}
//先判断是否需要更好地图服务器
var mapRouteId = gateUnit.GetAddress(RouteType.MapRoute);
//先判断是否需要更换地图服务器
var oldServerRouteId = gateUnit.GetAddress(sceneConfig.SceneType);
Log.Info($"进入房间信息，mapRouteId={oldServerRouteId}-{sceneConfig.RouteId} serviceId={serviceId}");
if (oldServerRouteId != sceneConfig.RouteId)
{
//先退出旧的服务
var ret = await gateUnit.Offline(session.RuntimeId, RouteType.MapRoute);
if (ret != 0)
{
response.ErrorCode = ErrorCode.MapRoomIdError;
return;
}
//再进入新的服务
ret = await gateUnit.Online(RouteType.MapRoute, sceneConfig);
if (ret != 0)
{
response.ErrorCode = ErrorCode.MapRoomIdError;
return;
}
}
//执行进入房间操作
var roomResponse = (Map2G_EnterRoomResponse)await session.Scene.NetworkMessagingComponent.CallInnerRoute(
sceneConfig.RouteId, new G2Map_EnterRoomRequest()
{
AccountId = gateUnit.Id,
RoomCode = request.RoomCode,
});
if (roomResponse.ErrorCode != 0)
{
response.ErrorCode = ErrorCode.MapRoomIdError;
return;
}
gateUnit.RoomCode = request.RoomCode;
response.RoomCode = request.RoomCode;
response.ErrorCode = ErrorCode.Successful;
}
}

82
Hotfix/Gate/Handler/Outer/C2G_ExitRoomRequestHandler.cs Normal file
View File

@@ -0,0 +1,82 @@
using Fantasy;
using Fantasy.Async;
using Fantasy.Network;
using Fantasy.Network.Interface;
using Fantasy.Platform.Net;
using NB.Map;
namespace NB.Gate;
public class C2G_ExitRoomRequestHandler : MessageRPC<C2G_ExitRoomRequest, G2C_ExitRoomResponse>
{
protected override async FTask Run(Session session, C2G_ExitRoomRequest request, G2C_ExitRoomResponse response,
Action reply)
{
if (string.IsNullOrEmpty(request.RoomCode))
{
response.ErrorCode = ErrorCode.MapRoomIdError;
return;
}
var gateUnitSessionComponent = session.GetComponent<GateUnitSessionComponent>();
if (gateUnitSessionComponent == null)
{
response.ErrorCode = ErrorCode.ErrServer;
return;
}
// 在缓存中检查该账号是否存在
var gateUnitManageComponent = session.Scene.GetComponent<GateUnitManageComponent>();
if (gateUnitManageComponent == null)
{
response.ErrorCode = ErrorCode.ErrServer;
return;
}
var gateUnit = gateUnitManageComponent.Get(gateUnitSessionComponent.AccountID);
if (gateUnit == null)
{
response.ErrorCode = ErrorCode.ErrServer;
return;
}
if (gateUnit.RoomCode != request.RoomCode)
{
response.ErrorCode = ErrorCode.MapRoomIdError;
return;
}
RoomHelper.ParseCode(request.RoomCode, out var serviceId, out var roomId);
if (serviceId < 1 || roomId < 1)
{
response.ErrorCode = ErrorCode.MapRoomIdError;
return;
}
var sceneConfig = SceneConfigData.Instance.Get(serviceId);
if (sceneConfig == null)
{
response.ErrorCode = ErrorCode.MapRoomIdError;
return;
}
//执行退出房间操作
var roomResponse = (Map2G_ExiRoomResponse)await session.Scene.NetworkMessagingComponent.CallInnerRoute(
sceneConfig.RouteId, new G2Map_ExitRoomRequest()
{
AccountId = gateUnit.Id,
RoomCode = request.RoomCode,
});
if (roomResponse.ErrorCode != 0)
{
response.ErrorCode = ErrorCode.MapRoomIdError;
return;
}
gateUnit.RoomCode = string.Empty;
response.RoomCode = request.RoomCode;
response.ErrorCode = ErrorCode.Successful;
}
}

4
Hotfix/Gate/Helper/GateLoginHelper.cs
View File

@@ -62,10 +62,6 @@ public static class GateLoginHelper
//通知服务器下线
Log.Info($"断线的session id={sessionId}");
var ret = await gateUnit.Offline(sessionId, RouteType.GameRoute, RouteType.SocialRoute, RouteType.MapRoute);
// await GameSceneHelper.Offline(gateUnit.Scene, gateUnit.AccountID, sessionId);
// await SocialSceneHelper.Offline(gateUnit.Scene, gateUnit.AccountID, sessionId,
// gateUnit.ChatSceneRouteId);
return ret;
}

36
Hotfix/Gate/System/GateUnitSystem.cs
View File

@@ -2,6 +2,7 @@
using Fantasy.Async;
using Fantasy.Entitas.Interface;
using Fantasy.Network;
using Fantasy.Platform.Net;
using NB.Common;
// ReSharper disable ConditionIsAlwaysTrueOrFalseAccordingToNullableAPIContract
@@ -13,7 +14,9 @@ public class GateUnitDestroySystem : DestroySystem<GateUnit>
protected override void Destroy(GateUnit self)
{
self.AccountID = 0;
self.Kick = false;
self.Region = 0;
self.SceneRoutes.Clear();
self.RoomCode = string.Empty;
}
}
@@ -21,15 +24,9 @@ public static class GateUnitSystem
{
#region Address
public static void RemoveAddress(this GateUnit self, int routType, long routeId)
public static void RemoveAddress(this GateUnit self, int routType)
{
if (self.SceneRoutes.TryGetValue(routType, out var route))
{
if (route == routeId)
{
self.SceneRoutes.Remove(routType);
}
}
self.SceneRoutes.Remove(routType);
}
public static void AddAddress(this GateUnit self, int routType, long routeId)
@@ -61,7 +58,7 @@ public static class GateUnitSystem
return ErrorCode.Successful;
}
public static async FTask<uint> Online(this GateUnit self, int routeType)
public static async FTask<uint> Online(this GateUnit self, int routeType, SceneConfig? sceneConfig = null)
{
Session session = self.Session;
var routeComponent = session.GetComponent<RouteComponent>();
@@ -69,9 +66,13 @@ public static class GateUnitSystem
{
routeComponent = session.AddComponent<RouteComponent>();
}
var gameSceneConfig = SceneConfigHelper.GetConfigByRouteType(routeType);
var gameRouteId = gameSceneConfig.RouteId;
if (sceneConfig == null)
{
sceneConfig = SceneConfigHelper.GetConfigByRouteType(routeType);
}
var gameRouteId = sceneConfig.RouteId;
var gameResponse = (G2Common_EnterResponse)await self.Scene.NetworkMessagingComponent.CallInnerRoute(
gameRouteId, new G2Common_EnterRequest()
@@ -85,8 +86,10 @@ public static class GateUnitSystem
return gameResponse.ErrorCode;
}
routeComponent.RemoveAddress(routeType);
routeComponent.AddAddress(routeType, gameResponse.UnitRouteId);
self.AddAddress(routeType, gameResponse.UnitRouteId);
self.AddAddress(sceneConfig.SceneType, gameRouteId);
return ErrorCode.Successful;
}
@@ -111,7 +114,8 @@ public static class GateUnitSystem
public static async FTask<uint> Offline(this GateUnit self, long sessionId, int routeType)
{
var sceneRouteId = self.GetAddress(routeType);
var sceneConfig = SceneConfigHelper.GetConfigByRouteType(routeType);
var sceneRouteId = sceneConfig.RouteId;
if (sceneRouteId < 1) return ErrorCode.Successful;
for (int i = 0; i < 10; i++)
{
@@ -123,7 +127,9 @@ public static class GateUnitSystem
});
if (gameResponse.ErrorCode == 0)
{
self.RemoveAddress(routeType, sceneRouteId);
//TODO:这里需要清理掉记录的数据
self.RemoveAddress(routeType);
self.RemoveAddress(sceneConfig.SceneType);
return ErrorCode.Successful;
}
}