Spatial config
This commit is contained in:
@@ -337,6 +337,7 @@ public sealed partial class DungeonHandler
|
||||
session.State = PlayerState.InDungeon;
|
||||
session.CurrentDungeonId = instance.Id;
|
||||
session.PlayerInstance = player;
|
||||
session.InitialMobCatalogDungeonId = null;
|
||||
|
||||
// Build visual tile data if V2 layout available
|
||||
object? tileSheets = null;
|
||||
@@ -414,6 +415,7 @@ public sealed partial class DungeonHandler
|
||||
mobs = instance.Simulation.Mobs.Values.Where(m => m.IsAlive).Select(m => new
|
||||
{
|
||||
id = m.Id,
|
||||
definitionId = m.DefinitionId,
|
||||
name = m.Name,
|
||||
x = m.X,
|
||||
y = m.Y,
|
||||
|
||||
@@ -742,6 +742,7 @@ public sealed partial class DungeonHandler : IClientMessageHandler
|
||||
session.State = PlayerState.InDungeon;
|
||||
session.CurrentDungeonId = dungeonId;
|
||||
session.PlayerInstance = player;
|
||||
session.InitialMobCatalogDungeonId = null;
|
||||
|
||||
// Build visual tile data if V2 layout available
|
||||
object? tileSheets = null;
|
||||
@@ -822,11 +823,16 @@ public sealed partial class DungeonHandler : IClientMessageHandler
|
||||
mobs = instance.Simulation.Mobs.Values.Select(m => new
|
||||
{
|
||||
id = m.Id,
|
||||
definitionId = m.DefinitionId,
|
||||
name = m.Name,
|
||||
x = m.X,
|
||||
y = m.Y,
|
||||
health = m.Health,
|
||||
maxHealth = m.MaxHealth
|
||||
maxHealth = m.MaxHealth,
|
||||
spriteConfig = string.IsNullOrEmpty(m.SpriteConfigJson) ? null :
|
||||
System.Text.Json.JsonSerializer.Deserialize<object>(m.SpriteConfigJson),
|
||||
tintColor = m.TintColor,
|
||||
scale = m.Scale
|
||||
}),
|
||||
chests = instance.Simulation.Chests.Values.Select(c => new
|
||||
{
|
||||
@@ -2792,6 +2798,8 @@ public sealed partial class DungeonHandler : IClientMessageHandler
|
||||
? nearbyOrRelevantMobs
|
||||
: nearbyOrRelevantMobs.Where(m => m.TargetId == session.CharacterId).ToList();
|
||||
var visibleMobIds = visibleMobs.Select(m => m.Id).ToHashSet();
|
||||
bool sendMobCatalog = session.CurrentDungeonId.HasValue &&
|
||||
session.InitialMobCatalogDungeonId != session.CurrentDungeonId;
|
||||
|
||||
bool IsSelfPlayerEvent(EntityType type, int id)
|
||||
{
|
||||
@@ -2835,6 +2843,7 @@ public sealed partial class DungeonHandler : IClientMessageHandler
|
||||
mobs = visibleMobs.Select(m => new
|
||||
{
|
||||
id = m.Id,
|
||||
definitionId = m.DefinitionId,
|
||||
name = m.Name,
|
||||
x = m.X,
|
||||
y = m.Y,
|
||||
@@ -2847,6 +2856,16 @@ public sealed partial class DungeonHandler : IClientMessageHandler
|
||||
tintColor = m.TintColor,
|
||||
scale = m.Scale
|
||||
}),
|
||||
mobCatalog = sendMobCatalog ? sim.Mobs.Values.Select(m => new
|
||||
{
|
||||
id = m.Id,
|
||||
definitionId = m.DefinitionId,
|
||||
name = m.Name,
|
||||
spriteConfig = string.IsNullOrEmpty(m.SpriteConfigJson) ? null :
|
||||
System.Text.Json.JsonSerializer.Deserialize<object>(m.SpriteConfigJson),
|
||||
tintColor = m.TintColor,
|
||||
scale = m.Scale
|
||||
}) : null,
|
||||
|
||||
chests = (sendSpatialThisTick ? sim.Chests.Values.Where(c => !spatialFiltering || IsNearby(c.X, c.Y)) : Enumerable.Empty<ChestInstance>())
|
||||
.Select(c => new
|
||||
@@ -2979,6 +2998,10 @@ public sealed partial class DungeonHandler : IClientMessageHandler
|
||||
};
|
||||
|
||||
await SendAsync(session.Connection, DungeonOpCodes.DUNGEON_STATE, state, CancellationToken.None);
|
||||
if (sendMobCatalog && session.CurrentDungeonId.HasValue)
|
||||
{
|
||||
session.InitialMobCatalogDungeonId = session.CurrentDungeonId.Value;
|
||||
}
|
||||
}
|
||||
|
||||
private async Task CompleteEscapeAsync(DungeonPlayerSession session)
|
||||
@@ -3041,6 +3064,7 @@ public sealed partial class DungeonHandler : IClientMessageHandler
|
||||
session.State = PlayerState.InHub;
|
||||
session.CurrentDungeonId = null;
|
||||
session.PlayerInstance = null;
|
||||
session.InitialMobCatalogDungeonId = null;
|
||||
session.IsEscaping = false;
|
||||
}
|
||||
|
||||
|
||||
@@ -18,6 +18,7 @@ public class DungeonPlayerSession
|
||||
public PlayerState State { get; set; } = PlayerState.InHub;
|
||||
public Guid? CurrentDungeonId { get; set; }
|
||||
public PlayerInstance? PlayerInstance { get; set; }
|
||||
public Guid? InitialMobCatalogDungeonId { get; set; }
|
||||
|
||||
public bool IsEscaping { get; set; }
|
||||
public long EscapeStartTick { get; set; }
|
||||
|
||||
@@ -114,6 +114,37 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="card p-6">
|
||||
<h2 class="text-lg font-semibold text-white mb-4">Spatial Update Controls</h2>
|
||||
<p class="text-sm text-gray-400 mb-4">Tune live dungeon state filtering to reduce client movement packet load.</p>
|
||||
|
||||
<form method="post" asp-page-handler="UpdateSpatial" class="grid grid-cols-1 md:grid-cols-4 gap-3 items-end">
|
||||
@Html.AntiForgeryToken()
|
||||
|
||||
<div class="md:col-span-1">
|
||||
<label class="label">Enabled</label>
|
||||
<select name="spatialFilterEnabled" class="input">
|
||||
<option value="true" selected="@(Model.SpatialFilterEnabled ? "selected" : null)">Enabled</option>
|
||||
<option value="false" selected="@(!Model.SpatialFilterEnabled ? "selected" : null)">Disabled</option>
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<div class="md:col-span-1">
|
||||
<label class="label">Radius (px)</label>
|
||||
<input name="spatialRadiusPx" type="number" min="128" max="8192" step="32" value="@Model.SpatialRadiusPx" class="input" />
|
||||
</div>
|
||||
|
||||
<div class="md:col-span-1">
|
||||
<label class="label">Interval (ticks)</label>
|
||||
<input name="spatialIntervalTicks" type="number" min="1" max="20" step="1" value="@Model.SpatialIntervalTicks" class="input" />
|
||||
</div>
|
||||
|
||||
<div class="md:col-span-1">
|
||||
<button type="submit" class="btn btn-primary w-full">Apply Spatial Settings</button>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
|
||||
<!-- Cache Management -->
|
||||
<div class="card p-6">
|
||||
|
||||
@@ -3,6 +3,7 @@ using Microsoft.EntityFrameworkCore;
|
||||
using DataServer.Data;
|
||||
using Server.Redis;
|
||||
using System.Text.Json;
|
||||
using GameServer.Dungeon;
|
||||
|
||||
namespace GameServices.Admin.Pages.Server;
|
||||
|
||||
@@ -10,15 +11,17 @@ public class IndexModel : AdminPageModel
|
||||
{
|
||||
private readonly GameDbContext _db;
|
||||
private readonly IRedisManager _redis;
|
||||
private readonly DungeonHandler? _dungeonHandler;
|
||||
private readonly ILogger<IndexModel> _logger;
|
||||
private static readonly List<BroadcastRecord> _recentBroadcasts = new();
|
||||
private static readonly object _lock = new();
|
||||
|
||||
public IndexModel(GameDbContext db, IRedisManager redis, ILogger<IndexModel> logger)
|
||||
public IndexModel(GameDbContext db, IRedisManager redis, ILogger<IndexModel> logger, DungeonHandler? dungeonHandler = null)
|
||||
{
|
||||
_db = db;
|
||||
_redis = redis;
|
||||
_logger = logger;
|
||||
_dungeonHandler = dungeonHandler;
|
||||
}
|
||||
|
||||
public int ActiveConnections { get; set; }
|
||||
@@ -28,6 +31,9 @@ public class IndexModel : AdminPageModel
|
||||
public int TrackedAssets { get; set; }
|
||||
|
||||
public List<BroadcastRecord> RecentBroadcasts { get; set; } = new();
|
||||
public bool SpatialFilterEnabled { get; set; } = true;
|
||||
public float SpatialRadiusPx { get; set; } = 896f;
|
||||
public int SpatialIntervalTicks { get; set; } = 1;
|
||||
|
||||
[TempData]
|
||||
public string? Message { get; set; }
|
||||
@@ -60,6 +66,43 @@ public class IndexModel : AdminPageModel
|
||||
{
|
||||
RecentBroadcasts = _recentBroadcasts.OrderByDescending(b => b.SentAt).Take(10).ToList();
|
||||
}
|
||||
|
||||
if (_dungeonHandler != null)
|
||||
{
|
||||
var tuning = _dungeonHandler.GetSpatialUpdateTuning();
|
||||
SpatialFilterEnabled = tuning.enabled;
|
||||
SpatialRadiusPx = tuning.radiusPx;
|
||||
SpatialIntervalTicks = tuning.intervalTicks;
|
||||
}
|
||||
}
|
||||
|
||||
public IActionResult OnPostUpdateSpatialAsync(bool spatialFilterEnabled, float spatialRadiusPx, int spatialIntervalTicks)
|
||||
{
|
||||
if (_dungeonHandler == null)
|
||||
{
|
||||
Message = "DungeonHandler is not available on this pod.";
|
||||
IsError = true;
|
||||
return RedirectToPage();
|
||||
}
|
||||
|
||||
try
|
||||
{
|
||||
_dungeonHandler.SetSpatialFilterEnabled(spatialFilterEnabled);
|
||||
_dungeonHandler.SetSpatialUpdateRangePx(spatialRadiusPx);
|
||||
_dungeonHandler.SetSpatialUpdateIntervalTicks(spatialIntervalTicks);
|
||||
|
||||
var updated = _dungeonHandler.GetSpatialUpdateTuning();
|
||||
Message = $"Spatial tuning updated: enabled={updated.enabled}, radius={updated.radiusPx:0}px, interval={updated.intervalTicks} tick(s)";
|
||||
IsError = false;
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
_logger.LogError(ex, "Failed to update spatial tuning");
|
||||
Message = $"Failed to update spatial tuning: {ex.Message}";
|
||||
IsError = true;
|
||||
}
|
||||
|
||||
return RedirectToPage();
|
||||
}
|
||||
|
||||
public async Task<IActionResult> OnPostBroadcastAsync(string message, string messageType)
|
||||
|
||||
Reference in New Issue
Block a user