fix(ui,net): Campaign LA gate round 2 — char-select exit confirmation, authored row justify, world name
Finding 1 (Exit button dead): retail's gmCharacterManagementUI Exit
button (element 0x100003A4, offset 7 from the listbox base in
ListenToElementMessage@0x004ed5a0) opens MakeConfirmExitDialog
(0x004ed250), whose exact ID_CharacterManagement_ConfirmExit text
(table 0x23000002) and m_confirmExitDialogContext re-entry guard are
now ported. On confirm (matching RecvNotice_CloseDialog@0x004ed760
case 1's ConfirmationResult check) the client exits through the
EXISTING graceful window-close seam (CharacterSelectionRuntimeBindings
.RequestExit -> d.Window.Close, the same delegate
GameplayInputCommandController's Escape fallback already uses) so
disconnected/exited status events still fire via GameWindow.OnClosing
-> CompleteShutdown. Retail's real post-confirm destination is
QueueUIMode(0x10000009) -> gmEpilogueUI, an epilogue screen this round
does not port — recorded as AD-99. Credits (element 0x100003A3,
QueueUIMode(0x10000005) -> gmCreditsUI) stays visibly ghosted like
Create, same treatment, out of scope this round.
Finding 2 (row names center-aligned, retail is left): the character
row template (LayoutDesc 0x21000004, element 0x100003A5, live-DAT
confirmed HJustify=Left with three stateful Type-3 highlight-art
children and no Type-12 caption child) authors its OWN justify
directly, with no separate text child to lift a label from.
DatWidgetFactory.BuildButton's Left-justify branch required
!ReferenceEquals(labelInfo, info) — true only when a label was LIFTED
from a distinct child — so a button's own direct HJustify=Left was
silently dropped to UiButton's Center default. Widened the branch to
also honor the direct case, preserving the existing lifted-child
LabelOffsetX behavior and leaving genuinely-centered buttons
(CREATE/ENTER/DELETE/RESTORE) untouched.
Finding 3 (World box empty): parsed ACE's GameMessageServerName
(opcode 0xF7E1, ACE.Server/Network/GameMessages/Messages/
GameMessageServerName.cs; retail CM_Login::DispatchUI_WorldInfo
@0x006ad860 -> ClientUISystem::Handle_Login__WorldInfo@0x005641a0 ->
ECM_Login::SendNotice_WorldName@0x00692b10, notice 0x186a2, consumed
by gmCharacterManagementUI::UpdateWorldName@0x004ec120 /
RecvNotice_WorldName@0x004ec360 onto element 0x1000039B) as
src/AcDream.Core.Net/Messages/ServerName.cs, cross-checked against
holtburger's ServerNameData. WorldSession.ServerNameReceived fires
alongside CharacterListReceived (ACE sends both in one
SendConnectResponse batch); RuntimeCharacterSelectionState.
ApplyWorldName is the new J-owner field (ungated by lifecycle, since
either message can arrive first); CharacterManagementUiController
binds it onto the WorldTextElementId UiText. Per the LA1 status
vocabulary, the characterList STATUS event's worldName field is
intentionally NOT added this round (kept bounded to the client-side
fix) — a follow-up if the launcher UI wants it.
Also corrects AD-44, discovered stale while filing AD-99: its opening
claim ("acdream has no retained character-management screen") was
false as of this session — LA7/LA8 shipped the screen in earlier
commits without updating this row.
Tests: exit-confirm open/cancel/confirm/re-entry-guard flow;
DatWidgetFactory own-HJustify-Left/Center regression tests plus the
live-DAT pinned row-justify assertion; ServerName parse round-trip
(byte-exact vs ACE's AceWireWriter fixture, truncation/wrong-opcode
cases); WorldSession dispatch test (roster+world in one wire batch);
RuntimeCharacterSelectionState.ApplyWorldName tests (order-independent
of ApplyRoster, unchanged-value no-op, Reset clears); controller test
binding the World text element to the live snapshot. Extended the
shared RetailDialogFactoryTests.BuildDialogLayout test fixture with a
Confirmation-type branch (Accept/Reject buttons) since this is its
first RetailDialogType.Confirmation consumer.
Suites: full solution Release build green; AcDream.App.Tests 5100/6
skips, AcDream.Core.Net.Tests 965/0, AcDream.Runtime.Tests 1665/0, all
Release, 0 failures; live-DAT probes (ACDREAM_PROBE_LIVE_MOUNT=1)
green.
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
parent
308f40a3fb
commit
ef96c55489
18 changed files with 724 additions and 13 deletions
|
|
@ -305,6 +305,67 @@ public class DatWidgetFactoryTests
|
|||
Assert.IsType<UiButton>(e);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Campaign LA gate round 2 finding 2: the retail character-select row
|
||||
/// template (LayoutDesc 0x21000004, element 0x100003A5, live-DAT
|
||||
/// confirmed) authors HJustify=Left DIRECTLY on the row's own
|
||||
/// UIElement_Button — no separate Type-12 caption child (its label comes
|
||||
/// from the runtime-bound character name, not an authored string), just
|
||||
/// three stateful Type-3 highlight-art children. The old guard
|
||||
/// (<c>!ReferenceEquals(labelInfo, info)</c>) only honored HJustify when
|
||||
/// the label was LIFTED from a distinct Type-12 child, so a button
|
||||
/// authoring its own justify with no such child fell through to
|
||||
/// UiButton's Center default. This reproduces that exact shape.
|
||||
/// </summary>
|
||||
[Fact]
|
||||
public void BuildButton_OwnHJustifyLeft_NoTextChild_MultipleStatefulFaces_LabelAlignsLeft()
|
||||
{
|
||||
var info = new ElementInfo
|
||||
{
|
||||
Type = 1,
|
||||
Width = 160,
|
||||
Height = 16,
|
||||
HJustify = HJustify.Left,
|
||||
};
|
||||
info.States[1u] = new UiStateInfo { Id = 1u, Name = "Normal" };
|
||||
info.States[2u] = new UiStateInfo { Id = 2u, Name = "Normal_rollover" };
|
||||
info.States[3u] = new UiStateInfo { Id = 3u, Name = "Highlight" };
|
||||
for (int i = 0; i < 3; i++)
|
||||
{
|
||||
var face = new ElementInfo { Type = 3, ReadOrder = (uint)i };
|
||||
face.StateMedia["Normal_rollover"] = (0x06000000u + (uint)i, 1);
|
||||
info.Children.Add(face);
|
||||
}
|
||||
|
||||
var button = Assert.IsType<UiButton>(DatWidgetFactory.Create(info, NoTex, null));
|
||||
|
||||
Assert.Equal(UiButton.LabelAlignment.Left, button.LabelAlign);
|
||||
// Direct (non-lifted) case: LabelOffsetX stays at UiButton's own
|
||||
// default small left padding, not a bogus inner offset.
|
||||
Assert.Equal(3f, button.LabelOffsetX);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// A button whose own authored HJustify really is Center (the normal
|
||||
/// case — CREATE/ENTER/DELETE/RESTORE captions) must stay centered; the
|
||||
/// fix only widens the Left branch, it must not force every button left.
|
||||
/// </summary>
|
||||
[Fact]
|
||||
public void BuildButton_OwnHJustifyCenter_NoTextChild_StaysCentered()
|
||||
{
|
||||
var info = new ElementInfo
|
||||
{
|
||||
Type = 1,
|
||||
Width = 160,
|
||||
Height = 16,
|
||||
HJustify = HJustify.Center,
|
||||
};
|
||||
|
||||
var button = Assert.IsType<UiButton>(DatWidgetFactory.Create(info, NoTex, null));
|
||||
|
||||
Assert.Equal(UiButton.LabelAlignment.Center, button.LabelAlign);
|
||||
}
|
||||
|
||||
// ── Test 5b: Type 11 → UiScrollbar ──────────────────────────────────────
|
||||
|
||||
[Fact]
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue