erik/acdream
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

fix(ui): refresh live skill rows

Browse source
This commit is contained in:
Erik 2026-07-31 08:22:46 +02:00
parent 461a1fb7b4
commit 1d8371dbe5
3 changed files with 55 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/AcDream.App/UI/Layout/CharacterStatController.cs
View file

@ -776,12 +776,14 @@ public static class CharacterStatController
foreach (var skill in skills)
{
int rowIndex = bindings.Count;
CharacterSkill LiveSkill() =>
FindSkill(data(), skill.Id) ?? skill;
var row = AddRow(list, datFont, spriteResolve,
left: 0f, top: y, width: listW, height: SkillRowHeight,
iconDid: skill.IconDid,
nameText: skill.Name,
valueProvider: () => skill.CurrentLevel.ToString(),
valueColorProvider: () => SkillValueColor(skill),
valueProvider: () => LiveSkill().CurrentLevel.ToString(),
valueColorProvider: () => SkillValueColor(LiveSkill()),
nameColor: Vector4.One);
row.OnClick = () =>
{
@ -857,6 +859,18 @@ public static class CharacterStatController
return result;
}
private static CharacterSkill? FindSkill(CharacterSheet sheet, uint skillId)
{
IReadOnlyList<CharacterSkill> skills = sheet.Skills;
for (int i = 0; i < skills.Count; i++)
{
CharacterSkill skill = skills[i];
if (skill.Id == skillId)
return skill;
}
return null;
}
private static CharacterSkill? SkillAtDisplayIndex(CharacterSheet sheet, int index)
{
if (index < 0) return null;

12
src/AcDream.App/UI/RetailUiRuntime.cs
View file

@ -209,6 +209,7 @@ public sealed class RetailUiRuntime : IDisposable
private UiShortcutDigitGraphics? _shortcutDigitGraphics;
private ItemCooldownUiController? _itemCooldownController;
private VividTargetIndicatorController? _vividTargetIndicator;
private IDisposable? _characterSheetSubscription;
private ResourceShutdownTransaction? _shutdown;
private bool _disposed;
@ -1676,9 +1677,12 @@ public sealed class RetailUiRuntime : IDisposable
return;
}
CharacterSheetProvider provider = _bindings.Character.Provider;
CharacterSheet currentSheet = provider.BuildSheet();
_characterSheetSubscription = provider.SubscribeChanged(
() => currentSheet = provider.BuildSheet());
CharacterStatController.Bind(
layout,
provider.BuildSheet,
() => currentSheet,
_bindings.Assets.DefaultFont,
_bindings.Assets.ResolveFont(0x40000001u) ?? _bindings.Assets.DefaultFont,
_bindings.Assets.ResolveSprite,
@ -1922,7 +1926,11 @@ public sealed class RetailUiRuntime : IDisposable
_shutdown ??= CreateShutdownTransaction(
() => _automation?.Dispose(),
() => _persistence?.Dispose(),
() => Host.WindowManager.WindowVisibilityChanged -= OnWindowVisibilityChanged,
() =>
{
_characterSheetSubscription?.Dispose();
Host.WindowManager.WindowVisibilityChanged -= OnWindowVisibilityChanged;
},
() => _itemConfirmationController?.Dispose(),
() => _gameplayConfirmationController?.Dispose(),
() => DialogFactory?.Dispose(),

29
tests/AcDream.App.Tests/UI/Layout/CharacterStatControllerTests.cs
View file

@ -1476,6 +1476,35 @@ public class CharacterStatControllerTests
Assert.Equal((" (+50)", buff), (runs[2].Text, runs[2].Color));
}
[Fact]
public void SkillRow_ValueAndColorFollowLiveSheetWithoutTabRebuild()
{
var list = new UiPanel { Width = 300 };
var layout = Fake((CharacterStatController.ListBoxId, list));
CharacterSheet sheet = VitaeSkillSheet(
currentLevel: 300,
baseLevel: 300,
vitaeModifier: 0);
CharacterStatController.Bind(
layout,
() => sheet,
spriteResolve: id => (id, 16, 16));
ClickTab(layout, left: 92f);
UiText value = SkillRows(list)[0].Children.OfType<UiText>().ToList()[2];
Assert.Equal("300", value.LinesProvider()[0].Text);
Assert.Equal(Vector4.One, value.LinesProvider()[0].Color);
sheet = VitaeSkillSheet(
currentLevel: 350,
baseLevel: 300,
vitaeModifier: 0);
Assert.Equal("350", value.LinesProvider()[0].Text);
Assert.Equal(new Vector4(0f, 1f, 0f, 1f), value.LinesProvider()[0].Color);
}
[Fact]
public void SkillClick_ZeroDelta_NoParentheticals()
{