feat: Upgrade server with HyNB v2.4 modular architecture, minigames, admin GM web panel, companion summons, and car radio
This commit is contained in:
CAtlas0784 committed
1 parent
74e2963a12
commit
3e5adf1dc5
1571 files changed
+336468
-6348
No files matched your search
@@ -1,143 +1,58 @@
|
||||
using Ananta.SDK.Network;
|
||||
using Ananta.SDK.Rpc;
|
||||
using Ananta.SDK.Serialization;
|
||||
using Ananta.Server.Configuration;
|
||||
using Ananta.Server.Protocol.Client4229938;
|
||||
using Ananta.Server.RpcTypes.Client4229938;
|
||||
using SceneMethods = Ananta.Server.RpcTypes.Client4229938.Methods.GameScene;
|
||||
using GameMethods = Ananta.Server.RpcTypes.Client4229938.Methods.Game;
|
||||
|
||||
namespace Ananta.Server.Handlers.Game;
|
||||
|
||||
/// <summary>
|
||||
/// S011 vehicle boarding story channel (build 4229938). Ported from the proven
|
||||
/// Server_V2 flow: the client only offers the F-enter prompt and drives the
|
||||
/// enter/exit animation phases once the S011 root node exists; without the root
|
||||
/// bootstrap, pressing F near a spawned vehicle sends nothing.
|
||||
/// Flow: root bootstrap (once per session) → client S011PlayerNetEnterVehicleRequest →
|
||||
/// S011 vehicle boarding story channel. The client only offers the F-enter prompt and
|
||||
/// drives the enter/exit animation phases once the S011 root node exists; without it,
|
||||
/// pressing F near a spawned vehicle sends nothing (observed live). Ported from the
|
||||
/// proven sibling build, with 4229938 framing (StoryboardGuid) applied.
|
||||
/// Flow: root bootstrap (once per load) → client S011PlayerNetEnterVehicleRequest →
|
||||
/// enter child + controller + status 2 → phase 2 (status 3) → phase 3 (status 4,
|
||||
/// seated) → exit request → exit child + status 5 → phase 1 (status 0, done).
|
||||
/// Vehicle records live in the shared static SummonedVehicles registry (extended
|
||||
/// with seat state); the boarding transaction itself is per-session.
|
||||
/// Lock order everywhere: story state, then SummonedVehiclesSync.
|
||||
/// </summary>
|
||||
internal sealed partial class GameRouter
|
||||
{
|
||||
private const string VehicleStoryKey = "client4229938-vehicle-story";
|
||||
private const uint VehicleStoryRootNid = 1;
|
||||
private const uint VehicleStoryEnterNid = 2;
|
||||
private const uint VehicleStoryExitNid = 3;
|
||||
|
||||
internal sealed class VehicleStoryState
|
||||
{
|
||||
internal object SyncRoot { get; } = new();
|
||||
internal bool RootSent;
|
||||
internal bool SeenAnyRpc;
|
||||
internal long HighestConfirmedRpcId = -1;
|
||||
internal SortedSet<long> PendingRpcIds { get; } = new();
|
||||
internal HashSet<long> CommittedRpcIds { get; } = new();
|
||||
internal ulong EnterVehicleId;
|
||||
internal byte EnterSeat;
|
||||
internal bool ExitInProgress;
|
||||
internal ulong CurrentVehicleId;
|
||||
internal int CurrentSeat = -1;
|
||||
internal ulong BoardingUnitId;
|
||||
}
|
||||
|
||||
internal static VehicleStoryState GetVehicleStoryState(TcpSession session)
|
||||
{
|
||||
if (session.Items.TryGetValue(VehicleStoryKey, out var raw) && raw is VehicleStoryState existing)
|
||||
return existing;
|
||||
var created = new VehicleStoryState();
|
||||
session.Items[VehicleStoryKey] = created;
|
||||
return created;
|
||||
}
|
||||
|
||||
internal static WorldEntryState? GetVehicleWorldState(TcpSession session)
|
||||
=> session.Items.TryGetValue(WorldStateKey, out var raw) && raw is WorldEntryState existing
|
||||
? existing
|
||||
: null;
|
||||
|
||||
internal static (ulong VehicleId, int Seat) VehicleSeatSnapshot(TcpSession session)
|
||||
{
|
||||
var story = GetVehicleStoryState(session);
|
||||
lock (story.SyncRoot)
|
||||
return (story.CurrentVehicleId, story.CurrentSeat);
|
||||
}
|
||||
|
||||
internal static async Task EnsureVehicleStoryRoot(RpcContext ctx)
|
||||
{
|
||||
if (!PrivateServerConfigStore.Current.Gameplay.Vehicles.Enabled)
|
||||
if (!Configuration.PrivateServerConfigStore.Current.Gameplay.Vehicles.Enabled)
|
||||
return;
|
||||
var story = GetVehicleStoryState(ctx.Session);
|
||||
var runtime = GetVehicleRuntime(ctx);
|
||||
long confirm;
|
||||
lock (story.SyncRoot)
|
||||
lock (runtime.SyncRoot)
|
||||
{
|
||||
if (story.RootSent)
|
||||
if (runtime.StoryRootSent)
|
||||
return;
|
||||
story.RootSent = true;
|
||||
story.BoardingUnitId = GetVehicleWorldState(ctx.Session)?.ActiveSpiritUnitId
|
||||
runtime.StoryRootSent = true;
|
||||
runtime.StoryBoardingUnitId = GetStateIfExists(ctx.Session)?.ActiveSpiritUnitId
|
||||
?? Profile.InitialUnitId;
|
||||
confirm = story.SeenAnyRpc ? Math.Max(0, story.HighestConfirmedRpcId) : -1;
|
||||
confirm = runtime.StorySeenAnyRpc ? Math.Max(0, runtime.StoryHighestConfirmedRpcId) : -1;
|
||||
}
|
||||
await ctx.NotifyAsync(MethodId.SyncStoryCoreServerInfo,
|
||||
StoryS011Codec4229938.BuildRootBootstrap(VehicleStoryRootNid, confirm));
|
||||
ctx.Session.Log.Info($"[VEHICLE-STORY] S011 root ready nid={VehicleStoryRootNid} confirm={confirm}");
|
||||
}
|
||||
|
||||
internal static void ResetVehicleStoryForEntity(TcpSession session, ulong entityId)
|
||||
{
|
||||
var story = GetVehicleStoryState(session);
|
||||
lock (story.SyncRoot)
|
||||
{
|
||||
if (story.CurrentVehicleId == entityId)
|
||||
{
|
||||
story.CurrentVehicleId = 0;
|
||||
story.CurrentSeat = -1;
|
||||
}
|
||||
if (story.EnterVehicleId == entityId)
|
||||
story.EnterVehicleId = 0;
|
||||
story.ExitInProgress = false;
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Fresh scene load (login / airport travel): the client builds a new story
|
||||
/// instance and drops all server-made nodes, so the S011 root must be sent
|
||||
/// again by the post-load finalization. Called from OnLoadingFinished for each
|
||||
/// accepted generation, next to the garage/aether one-shot resets. The early
|
||||
/// root pushed on the pre-load story hello (if any) is harmless — the client
|
||||
/// discards it with the old story instance.
|
||||
/// </summary>
|
||||
internal static void ResetVehicleStory(TcpSession session)
|
||||
{
|
||||
var story = GetVehicleStoryState(session);
|
||||
lock (story.SyncRoot)
|
||||
{
|
||||
story.RootSent = false;
|
||||
story.SeenAnyRpc = false;
|
||||
story.HighestConfirmedRpcId = -1;
|
||||
story.PendingRpcIds.Clear();
|
||||
story.CommittedRpcIds.Clear();
|
||||
story.EnterVehicleId = 0;
|
||||
story.EnterSeat = 0;
|
||||
story.ExitInProgress = false;
|
||||
story.CurrentVehicleId = 0;
|
||||
story.CurrentSeat = -1;
|
||||
}
|
||||
}
|
||||
|
||||
[Handler(MethodId.SyncStoryCoreClientInfo, HandlerPacketKind.Notify)]
|
||||
private async Task SyncStoryCoreClientInfo(Connection conn, UxRpcMessage msg)
|
||||
{
|
||||
await EnsureVehicleStoryRoot(msg.Context);
|
||||
var story = GetVehicleStoryState(msg.Context.Session);
|
||||
lock (story.SyncRoot)
|
||||
story.BoardingUnitId = GetVehicleWorldState(msg.Context.Session)?.ActiveSpiritUnitId
|
||||
?? Profile.InitialUnitId;
|
||||
var runtime = GetVehicleRuntime(msg.Context);
|
||||
lock (runtime.SyncRoot)
|
||||
runtime.StoryBoardingUnitId = GetWorldState(msg.Context).ActiveSpiritUnitId;
|
||||
|
||||
var commands = StoryVehicleCodec4229938.Parse(msg.Body, out var full);
|
||||
if (!full)
|
||||
conn.Log.Warn($"[VEHICLE-STORY] partial parse commands={commands.Count} bytes={msg.Body.Length} hex={BitConverter.ToString(msg.Body)}");
|
||||
conn.Log.Warn($"[VEHICLE-STORY] partial parse commands={commands.Count} bytes={msg.Body.Length}");
|
||||
foreach (var summary in commands)
|
||||
{
|
||||
// Non-heartbeat story traffic is rare; log it so new flows are visible.
|
||||
@@ -151,17 +66,17 @@ internal sealed partial class GameRouter
|
||||
long duplicateConfirm = -1;
|
||||
if (cmd.HasRpcId && cmd.RpcId >= 0)
|
||||
{
|
||||
lock (story.SyncRoot)
|
||||
lock (runtime.SyncRoot)
|
||||
{
|
||||
story.SeenAnyRpc = true;
|
||||
if (cmd.RpcId <= story.HighestConfirmedRpcId)
|
||||
runtime.StorySeenAnyRpc = true;
|
||||
if (cmd.RpcId <= runtime.StoryHighestConfirmedRpcId)
|
||||
{
|
||||
duplicateCommitted = true;
|
||||
duplicateConfirm = story.HighestConfirmedRpcId;
|
||||
duplicateConfirm = runtime.StoryHighestConfirmedRpcId;
|
||||
}
|
||||
else
|
||||
{
|
||||
story.PendingRpcIds.Add(cmd.RpcId);
|
||||
runtime.StoryPendingRpcIds.Add(cmd.RpcId);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -174,88 +89,112 @@ internal sealed partial class GameRouter
|
||||
|
||||
if (cmd.TypeMark is 3 or 6)
|
||||
{
|
||||
await ConfirmVehicleStoryRpc(conn, story, cmd.HasRpcId ? cmd.RpcId : null);
|
||||
await ConfirmVehicleStoryRpc(conn, runtime, cmd.HasRpcId ? cmd.RpcId : null);
|
||||
continue;
|
||||
}
|
||||
|
||||
if (cmd.Name == "S011PlayerNetEnterVehicleRequest" && cmd.PayloadKind == "S011EnterVehicleRequest")
|
||||
await BeginVehicleEnter(conn, story, cmd);
|
||||
// ================================================================
|
||||
// ★★ 里希盘查 / 押送 / 收押舞台（2026-10-02 逐字对齐捐赠端
|
||||
// GameRouter.VehicleStory.cs:99）。整条 S002 状态机在捐赠端的
|
||||
// HandlePoliceStory4229938（GameRouter.LixiPolice.cs:529）里：
|
||||
// Root(10)=10 上的 PoliceFRequest / PolicePrisonRequest / PolicePrepared / NpcInteract，
|
||||
// 以及子节点上的 Interaction(tag24) / InteractEnd，全部由它接管。
|
||||
// ⛑ 命中就 swallow（捐赠端是 `if (...) { }` 空体），不落车辆逻辑；
|
||||
// 未命中才走下面的上下车/相位链，最后由同一个 ConfirmVehicleStoryRpc 收口。
|
||||
// ⛑ 位置必须在这两道之后（与捐赠端一致）：先去重、再 TypeMark 3/6。
|
||||
// ================================================================
|
||||
if (await HandlePoliceStory4229938(conn.Session, cmd)) { }
|
||||
else if (cmd.Name == "S011PlayerNetEnterVehicleRequest" && cmd.PayloadKind == "S011EnterVehicleRequest")
|
||||
await BeginVehicleEnter(conn, runtime, cmd);
|
||||
else if (cmd.Name == "S011PlayerNetExitVehicleRequest" && cmd.PayloadKind == "Bool")
|
||||
await BeginVehicleExit(conn, story, cmd.PayloadBool ?? true);
|
||||
await BeginVehicleExit(conn, runtime, cmd.PayloadBool ?? true);
|
||||
else if (cmd.Nid == VehicleStoryEnterNid && cmd.Name == "MsgrChangePhaseRequest" && cmd.PayloadKind is "Byte" or "Int")
|
||||
await AdvanceVehicleEnter(conn, story, (int)(cmd.PayloadInt ?? 0));
|
||||
await AdvanceVehicleEnter(conn, runtime, (int)(cmd.PayloadInt ?? 0));
|
||||
else if (cmd.Nid == VehicleStoryExitNid && cmd.Name == "MsgrChangePhaseRequest" && cmd.PayloadKind is "Byte" or "Int")
|
||||
await AdvanceVehicleExit(conn, story, (int)(cmd.PayloadInt ?? 0));
|
||||
await AdvanceVehicleExit(conn, runtime, (int)(cmd.PayloadInt ?? 0));
|
||||
|
||||
await ConfirmVehicleStoryRpc(conn, story, cmd.HasRpcId ? cmd.RpcId : null);
|
||||
await ConfirmVehicleStoryRpc(conn, runtime, cmd.HasRpcId ? cmd.RpcId : null);
|
||||
}
|
||||
}
|
||||
|
||||
private async Task BeginVehicleEnter(Connection conn, VehicleStoryState story, StoryClientCommand4229938 cmd)
|
||||
{
|
||||
var vehicleId = cmd.PayloadVehicleId ?? 0;
|
||||
var seat = cmd.PayloadSeatIndices is { Count: > 0 } ? cmd.PayloadSeatIndices[0] : (byte)0;
|
||||
var pid = Profile.PlayerPid;
|
||||
ulong unitId;
|
||||
var ok = false;
|
||||
var lazyRegistered = false;
|
||||
lock (story.SyncRoot)
|
||||
{
|
||||
unitId = story.BoardingUnitId != 0 ? story.BoardingUnitId : Profile.InitialUnitId;
|
||||
lock (SummonedVehiclesSync)
|
||||
{
|
||||
// GM-console cars are spawned client-locally with client-side ids the
|
||||
// server has never seen: adopt them on first enter attempt instead of
|
||||
// leaving the client stuck with a hidden prompt. Seat layout is grown
|
||||
// from the requested index; real counts arrive via SyncSpawnVehicle.
|
||||
if (vehicleId != 0 && !SummonedVehicles.ContainsKey(vehicleId))
|
||||
{
|
||||
SummonedVehicles[vehicleId] = new SummonedVehicle
|
||||
{
|
||||
SeatCount = (int)Math.Min(16, Math.Max(2, (int)seat + 1)),
|
||||
Interactable = true,
|
||||
};
|
||||
lazyRegistered = true;
|
||||
}
|
||||
if (vehicleId != 0 && story.CurrentVehicleId == 0
|
||||
&& story.EnterVehicleId == 0 && !story.ExitInProgress
|
||||
&& SummonedVehicles.TryGetValue(vehicleId, out var vehicle) && vehicle.Interactable
|
||||
&& seat < vehicle.SeatCount
|
||||
&& !vehicle.SeatReservations.ContainsKey(seat) && !vehicle.SeatOccupants.ContainsKey(seat))
|
||||
{
|
||||
vehicle.SeatReservations[seat] = pid;
|
||||
story.EnterVehicleId = vehicleId;
|
||||
story.EnterSeat = seat;
|
||||
vehicle.ControllerPid = pid;
|
||||
ok = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (!ok)
|
||||
{
|
||||
conn.Log.Warn($"[VEHICLE-STORY] enter rejected vehicle={vehicleId} seat={seat}");
|
||||
return;
|
||||
}
|
||||
|
||||
await SendStoryAsync(conn.Session, StoryS011Codec4229938.BuildEnterChildBootstrap(VehicleStoryEnterNid, vehicleId, seat));
|
||||
await conn.NotifyAsync(MethodId.SyncChangeVehicleController, new SceneMethods.SyncChangeVehicleController
|
||||
{ VehicleInstanceId = vehicleId, ControllerPid = pid });
|
||||
await SendVehicleBoardingStatus(conn, unitId, vehicleId, seat, 2);
|
||||
conn.Log.Info($"[VEHICLE-STORY] enter begin vehicle={vehicleId} seat={seat} unit={unitId} status=2 lazy={lazyRegistered}");
|
||||
await ForceEnterVehicleAsync(conn.Session, vehicleId);
|
||||
}
|
||||
|
||||
private async Task AdvanceVehicleEnter(Connection conn, VehicleStoryState story, int phase)
|
||||
private async Task BeginVehicleEnter(Connection conn, VehicleRuntimeState runtime, StoryClientCommand4229938 cmd)
|
||||
{
|
||||
ulong vehicleId;
|
||||
byte seat;
|
||||
ulong unitId;
|
||||
lock (story.SyncRoot)
|
||||
bool lazyRegistered = false;
|
||||
VehicleRecord? trafficVehicle = null;
|
||||
lock (runtime.SyncRoot)
|
||||
{
|
||||
vehicleId = story.EnterVehicleId;
|
||||
seat = story.EnterSeat;
|
||||
unitId = story.BoardingUnitId != 0 ? story.BoardingUnitId : Profile.InitialUnitId;
|
||||
vehicleId = cmd.PayloadVehicleId ?? 0;
|
||||
seat = cmd.PayloadSeatIndices is { Count: > 0 } ? cmd.PayloadSeatIndices[0] : (byte)0;
|
||||
unitId = runtime.StoryBoardingUnitId != 0 ? runtime.StoryBoardingUnitId : Profile.InitialUnitId;
|
||||
|
||||
// Lazy registration: client-local vehicles (GM console, client-spawned) may have
|
||||
// ids the server has never recorded. Adopt them on first enter attempt instead of
|
||||
// leaving the client stuck with a hidden F-prompt. Seat layout grows from the
|
||||
// requested index; real counts arrive via SyncSpawnVehicle.
|
||||
if (vehicleId != 0 && !runtime.Vehicles.ContainsKey(vehicleId))
|
||||
{
|
||||
runtime.Vehicles[vehicleId] = new VehicleRecord
|
||||
{
|
||||
EntityId = vehicleId,
|
||||
ConfigId = 0,
|
||||
SeatCount = Math.Min(16, Math.Max(2, (int)seat + 1)),
|
||||
Interactable = true,
|
||||
Position = new Vec3(0, 0, 0),
|
||||
Facing = 0,
|
||||
ControllerPid = 0,
|
||||
};
|
||||
lazyRegistered = true;
|
||||
}
|
||||
|
||||
if (vehicleId == 0 || runtime.CurrentVehicleId != 0
|
||||
|| runtime.StoryEnterVehicleId != 0 || runtime.StoryExitInProgress
|
||||
|| !runtime.Vehicles.TryGetValue(vehicleId, out var vehicle) || !vehicle.Interactable || seat >= vehicle.SeatCount
|
||||
|| vehicle.SeatReservations.ContainsKey(seat) || vehicle.SeatOccupants.ContainsKey(seat))
|
||||
{
|
||||
conn.Log.Warn($"[VEHICLE-STORY] enter rejected vehicle={vehicleId} seat={seat}");
|
||||
return;
|
||||
}
|
||||
vehicle.SeatReservations[seat] = Profile.PlayerPid;
|
||||
runtime.StoryEnterVehicleId = vehicleId;
|
||||
runtime.StoryEnterSeat = seat;
|
||||
vehicle.ControllerPid = Profile.PlayerPid;
|
||||
if (vehicle.IsTraffic)
|
||||
trafficVehicle = vehicle;
|
||||
}
|
||||
|
||||
// ★ 车流车（T3-7）：上车**之前**必须先摘出车道流。
|
||||
// 走这条路的是 S011PlayerNetEnterVehicleRequest（剧情通道），
|
||||
// 不是 AskPlayerStartEnterOrExitVehicle —— 后者已挂过同一个钩子，这里不能漏。
|
||||
//
|
||||
// 漏掉的后果（2026-09-22 实锤）：车仍在 owner.Cars 里，服务端每 50ms 继续推
|
||||
// SyncAetherAIVehicleLaneDatas 覆盖它的里程 ⇒
|
||||
// ① 玩家坐进去后车被车道钉住，「有些车上去不能开」；
|
||||
// ② 玩家开着它跑出 despawn 半径后，被车流当成「跑太远」回收 —— 开着开着车没了
|
||||
// （日志：[VEHICLE] topspeed … v=132 之后紧跟 [TRAFFIC] despawn id=… (out of range)）。
|
||||
// 摘出后车完全交给玩家，两个问题一起消失。
|
||||
if (trafficVehicle is not null)
|
||||
await DetachTrafficVehicleFromLaneAsync(conn.Session, trafficVehicle);
|
||||
|
||||
await SendStoryAsync(conn.Session, StoryS011Codec4229938.BuildEnterChildBootstrap(VehicleStoryEnterNid, vehicleId, seat));
|
||||
await conn.NotifyAsync(MethodId.SyncChangeVehicleController, new GameMethods.SyncChangeVehicleController4229938
|
||||
{ vehicleInstanceId = vehicleId, controllerPid = Profile.PlayerPid });
|
||||
await SendVehicleBoardingStatus(conn, unitId, vehicleId, seat, 2);
|
||||
conn.Log.Info($"[VEHICLE-STORY] enter begin vehicle={vehicleId} seat={seat} unit={unitId} status=2 lazy={lazyRegistered}");
|
||||
}
|
||||
|
||||
private async Task AdvanceVehicleEnter(Connection conn, VehicleRuntimeState runtime, int phase)
|
||||
{
|
||||
ulong vehicleId;
|
||||
byte seat;
|
||||
ulong unitId;
|
||||
lock (runtime.SyncRoot)
|
||||
{
|
||||
vehicleId = runtime.StoryEnterVehicleId;
|
||||
seat = runtime.StoryEnterSeat;
|
||||
unitId = runtime.StoryBoardingUnitId != 0 ? runtime.StoryBoardingUnitId : Profile.InitialUnitId;
|
||||
}
|
||||
if (vehicleId == 0)
|
||||
return;
|
||||
@@ -267,9 +206,9 @@ internal sealed partial class GameRouter
|
||||
case 2:
|
||||
{
|
||||
var committed = false;
|
||||
lock (SummonedVehiclesSync)
|
||||
lock (runtime.SyncRoot)
|
||||
{
|
||||
if (SummonedVehicles.TryGetValue(vehicleId, out var vehicle)
|
||||
if (runtime.Vehicles.TryGetValue(vehicleId, out var vehicle)
|
||||
&& vehicle.SeatReservations.TryGetValue(seat, out var owner) && owner == Profile.PlayerPid
|
||||
&& !vehicle.SeatOccupants.ContainsKey(seat))
|
||||
{
|
||||
@@ -290,37 +229,31 @@ internal sealed partial class GameRouter
|
||||
case 3:
|
||||
await SendVehicleBoardingStatus(conn, unitId, vehicleId, seat, 4);
|
||||
await SendStoryAsync(conn.Session, StoryS011Codec4229938.BuildDeleteNode(VehicleStoryEnterNid));
|
||||
lock (story.SyncRoot)
|
||||
lock (runtime.SyncRoot)
|
||||
{
|
||||
story.CurrentVehicleId = vehicleId;
|
||||
story.CurrentSeat = seat;
|
||||
story.EnterVehicleId = 0;
|
||||
lock (SummonedVehiclesSync)
|
||||
{
|
||||
if (SummonedVehicles.TryGetValue(vehicleId, out var v))
|
||||
v.ControllerPid = Profile.PlayerPid;
|
||||
}
|
||||
runtime.CurrentVehicleId = vehicleId;
|
||||
runtime.CurrentVehicleSeat = seat;
|
||||
runtime.StoryEnterVehicleId = 0;
|
||||
if (runtime.Vehicles.TryGetValue(vehicleId, out var v))
|
||||
v.ControllerPid = Profile.PlayerPid;
|
||||
}
|
||||
conn.Log.Info($"[VEHICLE-STORY] enter complete vehicle={vehicleId} seat={seat} status=4");
|
||||
return;
|
||||
case 4:
|
||||
await SendVehicleBoardingStatus(conn, unitId, vehicleId, 0, 0);
|
||||
await conn.NotifyAsync(MethodId.SyncChangeVehicleController, new SceneMethods.SyncChangeVehicleController
|
||||
{ VehicleInstanceId = vehicleId, ControllerPid = 0 });
|
||||
await conn.NotifyAsync(MethodId.SyncChangeVehicleController, new GameMethods.SyncChangeVehicleController4229938
|
||||
{ vehicleInstanceId = vehicleId, controllerPid = 0 });
|
||||
await SendStoryAsync(conn.Session, StoryS011Codec4229938.BuildDeleteNode(VehicleStoryEnterNid));
|
||||
lock (story.SyncRoot)
|
||||
lock (runtime.SyncRoot)
|
||||
{
|
||||
story.EnterVehicleId = 0;
|
||||
lock (SummonedVehiclesSync)
|
||||
runtime.StoryEnterVehicleId = 0;
|
||||
if (runtime.Vehicles.TryGetValue(vehicleId, out var v))
|
||||
{
|
||||
if (SummonedVehicles.TryGetValue(vehicleId, out var v))
|
||||
{
|
||||
if (v.SeatReservations.TryGetValue(seat, out var reservedBy) && reservedBy == Profile.PlayerPid)
|
||||
v.SeatReservations.Remove(seat);
|
||||
if (v.SeatOccupants.TryGetValue(seat, out var occupiedBy) && occupiedBy == Profile.PlayerPid)
|
||||
v.SeatOccupants.Remove(seat);
|
||||
v.ControllerPid = 0;
|
||||
}
|
||||
if (v.SeatReservations.TryGetValue(seat, out var reservedBy) && reservedBy == Profile.PlayerPid)
|
||||
v.SeatReservations.Remove(seat);
|
||||
if (v.SeatOccupants.TryGetValue(seat, out var occupiedBy) && occupiedBy == Profile.PlayerPid)
|
||||
v.SeatOccupants.Remove(seat);
|
||||
v.ControllerPid = 0;
|
||||
}
|
||||
}
|
||||
conn.Log.Info($"[VEHICLE-STORY] enter cancelled vehicle={vehicleId}");
|
||||
@@ -328,35 +261,35 @@ internal sealed partial class GameRouter
|
||||
}
|
||||
}
|
||||
|
||||
private async Task BeginVehicleExit(Connection conn, VehicleStoryState story, bool stopBeforeLeave)
|
||||
private async Task BeginVehicleExit(Connection conn, VehicleRuntimeState runtime, bool stopBeforeLeave)
|
||||
{
|
||||
ulong vehicleId;
|
||||
byte seat;
|
||||
ulong unitId;
|
||||
lock (story.SyncRoot)
|
||||
lock (runtime.SyncRoot)
|
||||
{
|
||||
vehicleId = story.CurrentVehicleId;
|
||||
seat = (byte)Math.Max(0, story.CurrentSeat);
|
||||
unitId = story.BoardingUnitId != 0 ? story.BoardingUnitId : Profile.InitialUnitId;
|
||||
if (vehicleId == 0 || story.ExitInProgress)
|
||||
vehicleId = runtime.CurrentVehicleId;
|
||||
seat = (byte)Math.Max(0, runtime.CurrentVehicleSeat);
|
||||
unitId = runtime.StoryBoardingUnitId != 0 ? runtime.StoryBoardingUnitId : Profile.InitialUnitId;
|
||||
if (vehicleId == 0 || runtime.StoryExitInProgress)
|
||||
return;
|
||||
story.ExitInProgress = true;
|
||||
runtime.StoryExitInProgress = true;
|
||||
}
|
||||
await SendStoryAsync(conn.Session, StoryS011Codec4229938.BuildExitChildBootstrap(VehicleStoryExitNid, vehicleId, seat, stopBeforeLeave));
|
||||
await SendVehicleBoardingStatus(conn, unitId, vehicleId, seat, 5);
|
||||
conn.Log.Info($"[VEHICLE-STORY] exit begin vehicle={vehicleId} seat={seat} status=5");
|
||||
}
|
||||
|
||||
private async Task AdvanceVehicleExit(Connection conn, VehicleStoryState story, int phase)
|
||||
private async Task AdvanceVehicleExit(Connection conn, VehicleRuntimeState runtime, int phase)
|
||||
{
|
||||
ulong vehicleId;
|
||||
byte seat;
|
||||
ulong unitId;
|
||||
lock (story.SyncRoot)
|
||||
lock (runtime.SyncRoot)
|
||||
{
|
||||
vehicleId = story.CurrentVehicleId;
|
||||
seat = (byte)Math.Max(0, story.CurrentSeat);
|
||||
unitId = story.BoardingUnitId != 0 ? story.BoardingUnitId : Profile.InitialUnitId;
|
||||
vehicleId = runtime.CurrentVehicleId;
|
||||
seat = (byte)Math.Max(0, runtime.CurrentVehicleSeat);
|
||||
unitId = runtime.StoryBoardingUnitId != 0 ? runtime.StoryBoardingUnitId : Profile.InitialUnitId;
|
||||
}
|
||||
if (vehicleId == 0)
|
||||
return;
|
||||
@@ -365,25 +298,22 @@ internal sealed partial class GameRouter
|
||||
if (phase == 1)
|
||||
{
|
||||
await SendVehicleBoardingStatus(conn, unitId, vehicleId, 0, 0);
|
||||
await conn.NotifyAsync(MethodId.SyncChangeVehicleController, new SceneMethods.SyncChangeVehicleController
|
||||
{ VehicleInstanceId = vehicleId, ControllerPid = 0 });
|
||||
await conn.NotifyAsync(MethodId.SyncChangeVehicleController, new GameMethods.SyncChangeVehicleController4229938
|
||||
{ vehicleInstanceId = vehicleId, controllerPid = 0 });
|
||||
await SendStoryAsync(conn.Session, StoryS011Codec4229938.BuildDeleteNode(VehicleStoryExitNid));
|
||||
lock (story.SyncRoot)
|
||||
lock (runtime.SyncRoot)
|
||||
{
|
||||
story.CurrentVehicleId = 0;
|
||||
story.CurrentSeat = -1;
|
||||
story.ExitInProgress = false;
|
||||
lock (SummonedVehiclesSync)
|
||||
runtime.CurrentVehicleId = 0;
|
||||
runtime.CurrentVehicleSeat = -1;
|
||||
runtime.StoryExitInProgress = false;
|
||||
if (runtime.Vehicles.TryGetValue(vehicleId, out var v))
|
||||
{
|
||||
if (SummonedVehicles.TryGetValue(vehicleId, out var v))
|
||||
{
|
||||
if (v.SeatOccupants.TryGetValue(seat, out var occupiedBy) && occupiedBy == Profile.PlayerPid)
|
||||
v.SeatOccupants.Remove(seat);
|
||||
if (v.SeatReservations.TryGetValue(seat, out var reservedBy) && reservedBy == Profile.PlayerPid)
|
||||
v.SeatReservations.Remove(seat);
|
||||
v.ControllerPid = 0;
|
||||
v.Interactable = true;
|
||||
}
|
||||
if (v.SeatOccupants.TryGetValue(seat, out var occupiedBy) && occupiedBy == Profile.PlayerPid)
|
||||
v.SeatOccupants.Remove(seat);
|
||||
if (v.SeatReservations.TryGetValue(seat, out var reservedBy) && reservedBy == Profile.PlayerPid)
|
||||
v.SeatReservations.Remove(seat);
|
||||
v.ControllerPid = 0;
|
||||
v.Interactable = true;
|
||||
}
|
||||
}
|
||||
conn.Log.Info($"[VEHICLE-STORY] exit complete vehicle={vehicleId} status=0");
|
||||
@@ -392,42 +322,61 @@ internal sealed partial class GameRouter
|
||||
{
|
||||
await SendVehicleBoardingStatus(conn, unitId, vehicleId, seat, 4);
|
||||
await SendStoryAsync(conn.Session, StoryS011Codec4229938.BuildDeleteNode(VehicleStoryExitNid));
|
||||
lock (story.SyncRoot)
|
||||
story.ExitInProgress = false;
|
||||
lock (runtime.SyncRoot)
|
||||
runtime.StoryExitInProgress = false;
|
||||
conn.Log.Info($"[VEHICLE-STORY] exit cancelled vehicle={vehicleId} status=4");
|
||||
}
|
||||
}
|
||||
|
||||
[Handler(MethodId.AskClaimVehicleSeat, HandlerPacketKind.Invoke)]
|
||||
[Handler(MethodId.AskClaimVehicleSeat)]
|
||||
private async Task AskClaimVehicleSeatStory(Connection conn, UxRpcMessage msg)
|
||||
{
|
||||
ulong vehicleId = 0;
|
||||
if (!msg.TryGetArgs<GameMethods.AskClaimVehicleSeatArgs4229938>(out var args) || args is null)
|
||||
{
|
||||
conn.Log.Warn($"[VEHICLE] AskClaimVehicleSeat undecodable bytes={msg.Body.Length}");
|
||||
await conn.ReturnEmptyOkAsync(msg);
|
||||
return;
|
||||
}
|
||||
var runtime = GetVehicleRuntime(msg.Context);
|
||||
byte selected = 0;
|
||||
if (msg.TryGetArgs<SceneMethods.AskClaimVehicleSeatArgs>(out var args) && args is not null)
|
||||
var valid = false;
|
||||
lock (runtime.SyncRoot)
|
||||
{
|
||||
vehicleId = args.VehicleEntityId;
|
||||
if (args.SeatIndices is { Count: > 0 })
|
||||
selected = args.SeatIndices[0];
|
||||
if (runtime.StoryEnterVehicleId == args.vehicleEntityId
|
||||
&& runtime.Vehicles.TryGetValue(args.vehicleEntityId, out var vehicle))
|
||||
{
|
||||
foreach (var seat in args.seatIndices)
|
||||
{
|
||||
var reservedByOther = vehicle.SeatReservations.TryGetValue(seat, out var reservedBy) && reservedBy != Profile.PlayerPid;
|
||||
var occupiedByOther = vehicle.SeatOccupants.TryGetValue(seat, out var occupiedBy) && occupiedBy != Profile.PlayerPid;
|
||||
if (seat < vehicle.SeatCount && !reservedByOther && !occupiedByOther)
|
||||
{
|
||||
selected = seat;
|
||||
valid = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (valid)
|
||||
{
|
||||
var oldSeat = runtime.StoryEnterSeat;
|
||||
if (vehicle.SeatReservations.TryGetValue(oldSeat, out var oldOwner) && oldOwner == Profile.PlayerPid)
|
||||
vehicle.SeatReservations.Remove(oldSeat);
|
||||
vehicle.SeatReservations[selected] = Profile.PlayerPid;
|
||||
runtime.StoryEnterSeat = selected;
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
if (!valid)
|
||||
{
|
||||
vehicleId = LastSummonedEntity();
|
||||
await conn.ReturnEmptyAsync(msg, 1);
|
||||
return;
|
||||
}
|
||||
|
||||
var story = GetVehicleStoryState(msg.Context.Session);
|
||||
lock (story.SyncRoot)
|
||||
{
|
||||
story.EnterVehicleId = vehicleId;
|
||||
story.EnterSeat = selected;
|
||||
}
|
||||
|
||||
conn.Log.Info($"[VEHICLE-STORY] seat claim vehicle={vehicleId} seat={selected}");
|
||||
await conn.ReturnAsync(msg, selected);
|
||||
await ForceEnterVehicleAsync(conn.Session, vehicleId);
|
||||
conn.Log.Info($"[VEHICLE-STORY] seat claim vehicle={args.vehicleEntityId} seat={selected}");
|
||||
}
|
||||
|
||||
private Task SendVehicleBoardingStatus(Connection conn, ulong unitId, ulong vehicleId, byte seat, byte status)
|
||||
=> conn.NotifyAsync(MethodId.SyncUnitVehicleStatus, new SceneMethods.NewClientBoardingInfo
|
||||
=> conn.NotifyAsync(MethodId.SyncUnitVehicleStatus, new GameMethods.NewClientBoardingInfo4229938
|
||||
{
|
||||
EntityId = unitId,
|
||||
Status = status,
|
||||
@@ -437,37 +386,36 @@ internal sealed partial class GameRouter
|
||||
});
|
||||
|
||||
/// <summary>
|
||||
/// Server-forced enter (debug panel path): seats the player without any client
|
||||
/// Server-forced enter (admin button path): seats the player without any client
|
||||
/// F-press. Mirrors the enter-complete leg — move-to-seat, controller, boarding
|
||||
/// status seated, start/state-change/finish drive-state notifies — plus an S011
|
||||
/// enter child so the story side agrees, deleted right after like a phase-3 commit.
|
||||
/// </summary>
|
||||
internal static async Task<(bool Ok, string Message)> ForceEnterVehicleAsync(TcpSession session, ulong entityId = 0)
|
||||
{
|
||||
var story = GetVehicleStoryState(session);
|
||||
var unitId = GetVehicleWorldState(session)?.ActiveSpiritUnitId ?? Profile.InitialUnitId;
|
||||
var pid = Profile.PlayerPid;
|
||||
ulong vehicleId = entityId != 0 ? entityId : LastSummonedEntity();
|
||||
const byte seat = 0;
|
||||
lock (story.SyncRoot)
|
||||
var runtime = GetVehicleRuntimeState(session);
|
||||
var state = GetStateIfExists(session);
|
||||
ulong unitId = state?.ActiveSpiritUnitId ?? Profile.InitialUnitId;
|
||||
ulong pid = Profile.PlayerPid;
|
||||
ulong vehicleId;
|
||||
byte seat = 0;
|
||||
lock (runtime.SyncRoot)
|
||||
{
|
||||
lock (SummonedVehiclesSync)
|
||||
{
|
||||
if (vehicleId == 0 || !SummonedVehicles.TryGetValue(vehicleId, out var vehicle))
|
||||
return (false, "no spawned vehicle (spawn one first)");
|
||||
if (story.CurrentVehicleId != 0)
|
||||
return (false, $"already in vehicle {story.CurrentVehicleId} (exit first)");
|
||||
if (!vehicle.Interactable || vehicle.SeatOccupants.ContainsKey(seat))
|
||||
return (false, "vehicle is not enterable right now");
|
||||
vehicle.SeatReservations.Remove(seat);
|
||||
vehicle.SeatOccupants[seat] = pid;
|
||||
vehicle.ControllerPid = pid;
|
||||
story.CurrentVehicleId = vehicleId;
|
||||
story.CurrentSeat = seat;
|
||||
story.EnterVehicleId = 0;
|
||||
}
|
||||
vehicleId = entityId != 0 ? entityId : runtime.SummonedEntity;
|
||||
if (vehicleId == 0 || !runtime.Vehicles.TryGetValue(vehicleId, out var vehicle))
|
||||
return (false, "no spawned vehicle (spawn one first)");
|
||||
if (runtime.CurrentVehicleId != 0)
|
||||
return (false, $"already in vehicle {runtime.CurrentVehicleId} (exit first)");
|
||||
if (!vehicle.Interactable || vehicle.SeatOccupants.ContainsKey(seat))
|
||||
return (false, "vehicle is not enterable right now");
|
||||
vehicle.SeatReservations.Remove(seat);
|
||||
vehicle.SeatOccupants[seat] = pid;
|
||||
vehicle.ControllerPid = pid;
|
||||
runtime.CurrentVehicleId = vehicleId;
|
||||
runtime.CurrentVehicleSeat = seat;
|
||||
runtime.StoryEnterVehicleId = 0;
|
||||
}
|
||||
var drive = new SceneMethods.PlayerVehicleDriveStateInfo
|
||||
var drive = new GameMethods.PlayerVehicleDriveStateInfo4229938
|
||||
{
|
||||
Pid = pid, EnterOrLeave = true, VehicleEntityId = vehicleId, SeatIndex = seat,
|
||||
IfForce = true, OpenDoorTypeId = 0, OpenDoorActionSpeed = 0, OpenDoorActionClipLength = 0,
|
||||
@@ -476,19 +424,20 @@ internal sealed partial class GameRouter
|
||||
{
|
||||
var ct = CancellationToken.None;
|
||||
await session.NotifyAsync(MethodId.SyncChangeVehicleInteractable, UxSerializer.Serialize(
|
||||
new SceneMethods.SyncChangeVehicleInteractable { VehicleInstanceId = vehicleId, Interactable = false }), ct);
|
||||
new GameMethods.SyncChangeVehicleInteractable4229938 { vehicleInstanceId = vehicleId, interactable = false }), ct);
|
||||
await session.NotifyAsync(MethodId.SyncPlayerMoveToDriveSeat, UxSerializer.Serialize(
|
||||
new SceneMethods.SyncPlayerMoveToDriveSeat { Pid = pid, VehicleEntityId = vehicleId }), ct);
|
||||
new GameMethods.SyncPlayerMoveToDriveSeat4229938 { pid = pid, vehicleEntityId = vehicleId }), ct);
|
||||
await session.NotifyAsync(MethodId.SyncUnitVehicleStatus, UxSerializer.Serialize(
|
||||
new SceneMethods.NewClientBoardingInfo { EntityId = unitId, Status = 4, VehicleUId = vehicleId, SeatIndex = seat, ExtInfo = null }), ct);
|
||||
new GameMethods.NewClientBoardingInfo4229938 { EntityId = unitId, Status = 4, VehicleUId = vehicleId, SeatIndex = seat, ExtInfo = null }), ct);
|
||||
await session.NotifyAsync(MethodId.SyncPlayerStartEnterOrExitVehicl, UxSerializer.Serialize(drive), ct);
|
||||
await session.NotifyAsync(MethodId.SyncPlayerVehicleStateChange, UxSerializer.Serialize(drive), ct);
|
||||
await session.NotifyAsync(MethodId.SyncChangeVehicleController, UxSerializer.Serialize(
|
||||
new SceneMethods.SyncChangeVehicleController { VehicleInstanceId = vehicleId, ControllerPid = pid }), ct);
|
||||
new GameMethods.SyncChangeVehicleController4229938 { vehicleInstanceId = vehicleId, controllerPid = pid }), ct);
|
||||
await session.NotifyAsync(MethodId.SyncPlayerFinishEnterOrExitVehic, UxSerializer.Serialize(drive), ct);
|
||||
await SendStoryAsync(session, StoryS011Codec4229938.BuildEnterChildBootstrap(VehicleStoryEnterNid, vehicleId, seat));
|
||||
await SendStoryAsync(session, StoryS011Codec4229938.BuildDeleteNode(VehicleStoryEnterNid));
|
||||
session.Log.Info($"[VEHICLE-STORY] force enter vehicle={vehicleId} seat={seat} unit={unitId} status=4");
|
||||
return (true, $"seated in vehicle {vehicleId} (seat 0) — drive with normal keys, exit with F or the Exit button");
|
||||
return (true, $"seated in vehicle {vehicleId} (seat 0) — drive with normal keys, exit with the Exit button or F");
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
@@ -496,15 +445,16 @@ internal sealed partial class GameRouter
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>Server-forced exit (debug panel path).</summary>
|
||||
/// <summary>Server-forced exit (admin button path).</summary>
|
||||
internal static async Task<(bool Ok, string Message)> ForceExitVehicleAsync(TcpSession session)
|
||||
{
|
||||
var story = GetVehicleStoryState(session);
|
||||
var unitId = GetVehicleWorldState(session)?.ActiveSpiritUnitId ?? Profile.InitialUnitId;
|
||||
var runtime = GetVehicleRuntimeState(session);
|
||||
var state = GetStateIfExists(session);
|
||||
ulong unitId = state?.ActiveSpiritUnitId ?? Profile.InitialUnitId;
|
||||
ulong vehicleId;
|
||||
lock (story.SyncRoot)
|
||||
lock (runtime.SyncRoot)
|
||||
{
|
||||
vehicleId = story.CurrentVehicleId;
|
||||
vehicleId = runtime.CurrentVehicleId;
|
||||
if (vehicleId == 0)
|
||||
return (false, "not in a vehicle");
|
||||
}
|
||||
@@ -512,30 +462,27 @@ internal sealed partial class GameRouter
|
||||
{
|
||||
var ct = CancellationToken.None;
|
||||
await session.NotifyAsync(MethodId.SyncPlayerExitVehicle, UxSerializer.Serialize(
|
||||
new SceneMethods.SyncPlayerExitVehicle { VehicleEntityId = vehicleId, Force = true, StopBeforeLeave = true }), ct);
|
||||
new GameMethods.SyncPlayerExitVehicle4229938 { vehicleEntityId = vehicleId, force = true, stopBeforeLeave = true }), ct);
|
||||
await session.NotifyAsync(MethodId.SyncUnitVehicleStatus, UxSerializer.Serialize(
|
||||
new SceneMethods.NewClientBoardingInfo { EntityId = unitId, Status = 0, VehicleUId = vehicleId, SeatIndex = 0, ExtInfo = null }), ct);
|
||||
new GameMethods.NewClientBoardingInfo4229938 { EntityId = unitId, Status = 0, VehicleUId = vehicleId, SeatIndex = 0, ExtInfo = null }), ct);
|
||||
await session.NotifyAsync(MethodId.SyncChangeVehicleController, UxSerializer.Serialize(
|
||||
new SceneMethods.SyncChangeVehicleController { VehicleInstanceId = vehicleId, ControllerPid = 0 }), ct);
|
||||
new GameMethods.SyncChangeVehicleController4229938 { vehicleInstanceId = vehicleId, controllerPid = 0 }), ct);
|
||||
await session.NotifyAsync(MethodId.SyncChangeVehicleInteractable, UxSerializer.Serialize(
|
||||
new SceneMethods.SyncChangeVehicleInteractable { VehicleInstanceId = vehicleId, Interactable = true }), ct);
|
||||
new GameMethods.SyncChangeVehicleInteractable4229938 { vehicleInstanceId = vehicleId, interactable = true }), ct);
|
||||
await SendStoryAsync(session, StoryS011Codec4229938.BuildDeleteNode(VehicleStoryEnterNid));
|
||||
await SendStoryAsync(session, StoryS011Codec4229938.BuildDeleteNode(VehicleStoryExitNid));
|
||||
lock (story.SyncRoot)
|
||||
lock (runtime.SyncRoot)
|
||||
{
|
||||
story.CurrentVehicleId = 0;
|
||||
story.CurrentSeat = -1;
|
||||
story.EnterVehicleId = 0;
|
||||
story.ExitInProgress = false;
|
||||
lock (SummonedVehiclesSync)
|
||||
runtime.CurrentVehicleId = 0;
|
||||
runtime.CurrentVehicleSeat = -1;
|
||||
runtime.StoryEnterVehicleId = 0;
|
||||
runtime.StoryExitInProgress = false;
|
||||
if (runtime.Vehicles.TryGetValue(vehicleId, out var v))
|
||||
{
|
||||
if (SummonedVehicles.TryGetValue(vehicleId, out var v))
|
||||
{
|
||||
v.SeatOccupants.Clear();
|
||||
v.SeatReservations.Clear();
|
||||
v.ControllerPid = 0;
|
||||
v.Interactable = true;
|
||||
}
|
||||
v.SeatOccupants.Clear();
|
||||
v.SeatReservations.Clear();
|
||||
v.ControllerPid = 0;
|
||||
v.Interactable = true;
|
||||
}
|
||||
}
|
||||
session.Log.Info($"[VEHICLE-STORY] force exit vehicle={vehicleId}");
|
||||
@@ -547,28 +494,59 @@ internal sealed partial class GameRouter
|
||||
}
|
||||
}
|
||||
|
||||
private async Task ConfirmVehicleStoryRpc(Connection conn, VehicleStoryState story, long? commitRpcId)
|
||||
/// <summary>Best-effort eject before scene switches: client state must not keep a stale seat.</summary>
|
||||
internal static async Task ForceLeaveVehicleAsync(TcpSession session) {
|
||||
try
|
||||
{
|
||||
var runtime = GetVehicleRuntimeState(session);
|
||||
ulong vehicleId;
|
||||
lock (runtime.SyncRoot)
|
||||
{
|
||||
vehicleId = runtime.CurrentVehicleId != 0 ? runtime.CurrentVehicleId : runtime.StoryEnterVehicleId;
|
||||
if (vehicleId == 0)
|
||||
return;
|
||||
}
|
||||
var state = GetStateIfExists(session);
|
||||
ulong unitId = state?.ActiveSpiritUnitId ?? Profile.InitialUnitId;
|
||||
await session.NotifyAsync(MethodId.SyncUnitVehicleStatus, UxSerializer.Serialize(
|
||||
new GameMethods.NewClientBoardingInfo4229938 { EntityId = unitId, Status = 0, VehicleUId = vehicleId, SeatIndex = 0, ExtInfo = null }),
|
||||
CancellationToken.None);
|
||||
await session.NotifyAsync(MethodId.SyncChangeVehicleController, UxSerializer.Serialize(
|
||||
new GameMethods.SyncChangeVehicleController4229938 { vehicleInstanceId = vehicleId, controllerPid = 0 }),
|
||||
CancellationToken.None);
|
||||
await SendStoryAsync(session, StoryS011Codec4229938.BuildDeleteNode(VehicleStoryEnterNid));
|
||||
await SendStoryAsync(session, StoryS011Codec4229938.BuildDeleteNode(VehicleStoryExitNid));
|
||||
runtime.Clear();
|
||||
session.Log.Info($"[VEHICLE-STORY] force leave before scene switch vehicle={vehicleId}");
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
session.Log.Warn($"[VEHICLE-STORY] force leave failed: {ex.Message}");
|
||||
}
|
||||
}
|
||||
|
||||
private async Task ConfirmVehicleStoryRpc(Connection conn, VehicleRuntimeState runtime, long? commitRpcId)
|
||||
{
|
||||
long highest;
|
||||
lock (story.SyncRoot)
|
||||
lock (runtime.SyncRoot)
|
||||
{
|
||||
if (commitRpcId is long id && id >= 0)
|
||||
story.CommittedRpcIds.Add(id);
|
||||
highest = story.HighestConfirmedRpcId;
|
||||
while (story.PendingRpcIds.Count > 0)
|
||||
runtime.StoryCommittedRpcIds.Add(id);
|
||||
highest = runtime.StoryHighestConfirmedRpcId;
|
||||
while (runtime.StoryPendingRpcIds.Count > 0)
|
||||
{
|
||||
var next = highest + 1;
|
||||
if (next >= 0 && story.CommittedRpcIds.Contains(next))
|
||||
if (next >= 0 && runtime.StoryCommittedRpcIds.Contains(next))
|
||||
{
|
||||
highest = next;
|
||||
story.PendingRpcIds.Remove(next);
|
||||
story.CommittedRpcIds.Remove(next);
|
||||
runtime.StoryPendingRpcIds.Remove(next);
|
||||
runtime.StoryCommittedRpcIds.Remove(next);
|
||||
}
|
||||
else break;
|
||||
}
|
||||
if (highest <= story.HighestConfirmedRpcId)
|
||||
if (highest <= runtime.StoryHighestConfirmedRpcId)
|
||||
return;
|
||||
story.HighestConfirmedRpcId = highest;
|
||||
runtime.StoryHighestConfirmedRpcId = highest;
|
||||
}
|
||||
await SendStoryAsync(conn.Session, StoryS011Codec4229938.BuildConfirmRpc(highest));
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user