troytt
/
diablo2-web
1
0
Fork 0
Code Issues 24 Pull Requests Packages Projects Releases Wiki Activity

chore: resolve merge types in world-panels, hud-manager and client-world

This commit is contained in:
troytt 2026-10-02 10:53:45 +00:00
parent e31e1b561a
commit 773e3be117
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/client/ui/hud-manager.ts
View File

@ -563,8 +563,8 @@ export class HudManager {
/** Server-authoritative death / mercenary / party / trade state synced by `HudModel`. */ /** Server-authoritative death / mercenary / party / trade state synced by `HudModel`. */
isDead = false isDead = false
merc: any = null merc: any = null
hireList: any[] = [] hireList: readonly any[] = []
mercHireList: any[] = [] mercHireList: readonly any[] = []
partyMembers: any[] = [] partyMembers: any[] = []
summonPortraits: any[] = [] summonPortraits: any[] = []
trade: any = null trade: any = null

7
src/client/ui/world-panels.ts
View File

@ -49,6 +49,7 @@ import {
type VendorNpcId, type VendorNpcId,
getTownNpcDescriptorByName, getTownNpcDescriptorByName,
getTownNpcDescriptorByVendorId, getTownNpcDescriptorByVendorId,
getTownNpcDescriptorByHcIdx,
getLocalizedNpcName, getLocalizedNpcName,
getLocalizedNpcGreetings, getLocalizedNpcGreetings,
} from '../../common/units/npc-table.ts' } from '../../common/units/npc-table.ts'
@ -863,8 +864,8 @@ export class WorldPanelsHud {
private _activePanel: WorldPanelType = 'none' private _activePanel: WorldPanelType = 'none'
isDead = false isDead = false
merc: any = null merc: any = null
hireList: any[] = [] hireList: readonly any[] = []
mercHireList: any[] = [] mercHireList: readonly any[] = []
hireScrollOffset = 0 hireScrollOffset = 0
hireSelectedIndex = -1 hireSelectedIndex = -1
hireHoveredIndex: number | null = null hireHoveredIndex: number | null = null
@ -3686,7 +3687,7 @@ export class WorldPanelsHud {
// Warning text: "This Mercenary will replace your current one." (VerifyTransaction9) // Warning text: "This Mercenary will replace your current one." (VerifyTransaction9)
const warnText = lookupTbl('VerifyTransaction9', this.lang) ?? (this.lang === 'ENG' ? 'This Mercenary will replace your current one.' : '這個傭兵會換掉前一位。') const warnText = lookupTbl('VerifyTransaction9', this.lang) ?? (this.lang === 'ENG' ? 'This Mercenary will replace your current one.' : '這個傭兵會換掉前一位。')
if (font) { if (font) {
this.drawWrappedText(ctx, font, warnText, cx + 24, cy + 32, confirmW - 48, 16, 4, 'font16', 'gold', 'center') this.drawWrappedText(ctx, font, warnText, cx + 24, cy + 32, confirmW - 48, 16, 4, 'fontformal12')
} else { } else {
fillTextSafe(warnText, cx + 24, cy + 32, '#e8c26b') fillTextSafe(warnText, cx + 24, cy + 32, '#e8c26b')
} }

2
src/client/world/client-world.ts
View File

@ -932,7 +932,7 @@ export class ClientWorld {
this._containers.clearShop() this._containers.clearShop()
this._npcInteraction = { ...cur, npcId: cmd.npcId, window: 'gamble', activeWindow: 'gamble' } this._npcInteraction = { ...cur, npcId: cmd.npcId, window: 'gamble', activeWindow: 'gamble' }
} else if (cmd.action === 3) { } else if (cmd.action === 3) {
this._npcInteraction = { ...cur, npcId: cmd.npcId, window: 'hire', activeWindow: 'hire' } this._npcInteraction = { ...cur, npcId: cmd.npcId, window: 'none', activeWindow: 'hire' }
} }
break break
case 'NpcCancel': case 'NpcCancel':