Adjustments

This commit is contained in:
2026-03-02 16:33:56 +01:00
committed by Alexandru Macocian
parent a966906d6e
commit 7a665491f1
7 changed files with 65 additions and 15 deletions
+6 -2
View File
@@ -3,9 +3,13 @@
"configurations": [
{
"name": "Debug Daybreak.Linux",
"type": "dotnet",
"type": "coreclr",
"request": "launch",
"projectPath": "${workspaceFolder}/Daybreak.Linux/Daybreak.Linux.csproj"
"program": "${workspaceFolder}/Daybreak.Linux/bin/x64/Debug/net10.0/linux-x64/Daybreak.dll",
"cwd": "${workspaceFolder}/Daybreak.Linux/bin/x64/Debug/net10.0/linux-x64",
"preLaunchTask": "build-linux",
"console": "integratedTerminal",
"stopAtEntry": false
},
{
"name": "Debug Daybreak.Windows",
+36
View File
@@ -24,6 +24,42 @@
"/consoleloggerparameters:NoSummary"
],
"problemMatcher": "$msCompile"
},
{
"label": "build",
"command": "dotnet",
"type": "process",
"args": [
"build",
"${workspaceFolder}/Daybreak.slnx",
"/property:GenerateFullPaths=true",
"/consoleloggerparameters:NoSummary;ForceNoAlign"
],
"problemMatcher": "$msCompile"
},
{
"label": "publish",
"command": "dotnet",
"type": "process",
"args": [
"publish",
"${workspaceFolder}/Daybreak.slnx",
"/property:GenerateFullPaths=true",
"/consoleloggerparameters:NoSummary;ForceNoAlign"
],
"problemMatcher": "$msCompile"
},
{
"label": "watch",
"command": "dotnet",
"type": "process",
"args": [
"watch",
"run",
"--project",
"${workspaceFolder}/Daybreak.slnx"
],
"problemMatcher": "$msCompile"
}
]
}
@@ -1,2 +1,10 @@
{
"Logging": {
"MinimumLevel": {
"Default": "Debug",
"Override": {
"Microsoft": "Warning"
}
}
}
}
@@ -1,10 +0,0 @@
{
"Logging": {
"MinimumLevel": {
"Default": "Debug",
"Override": {
"Microsoft": "Warning"
}
}
}
}
@@ -1,2 +1,10 @@
{
"Logging": {
"MinimumLevel": {
"Default": "Debug",
"Override": {
"Microsoft": "Warning"
}
}
}
}
@@ -144,10 +144,9 @@ public sealed class SkillbarContextService : IHostedService, IInteropHealthServi
private unsafe byte DecodeTemplateHeaderDetour(SkillTemplate* outTemplate, BitReader* bitReader)
{
var scopedLogger = this.logger.CreateScopedLogger();
if (this.decodeTemplateHeaderCallbacks.Count > 0)
{
var scopedLogger = this.logger.CreateScopedLogger();
// Read the full raw buffer before the game consumes it
var rawBytes = ReadBitReaderBuffer(bitReader);
var templateString = ReencodeToBase64(rawBytes);
+6 -1
View File
@@ -299,6 +299,7 @@ public sealed class PartyService : IHostedService
private unsafe bool DecodeTemplateHeader(string templateCode, WrappedPointer<SkillTemplate> skillTemplate)
{
var scopedLogger = this.logger.CreateScopedLogger();
this.cachedTemplateCode = default;
if (!this.buildTemplateManager.TryDecodeTemplate(templateCode, out var build) ||
build is not TeamBuildEntry teamBuildEntry ||
teamBuildEntry.Builds.Count is 0)
@@ -324,7 +325,11 @@ public sealed class PartyService : IHostedService
this.cachedTemplateCode = default;
scopedLogger.LogDebug("Loading skill template from cached template code: {templateCode}", pendingLoadout);
Task.Run(async () => await this.SetPartyLoadout(pendingLoadout, CancellationToken.None));
return true;
// Return false to allow the normal template loading to continue.
// Returning true would block the original LoadSkillTemplate call chain,
// leaving the game with uninitialized template data and causing
// TemplatesSkillsCanApply assertion failures.
return false;
}
private async Task<bool> IsInValidOutpost(CancellationToken cancellationToken)