sganggs
e8d2b45ad4
Official: research 09 §3.1 — after elimination the client keeps observing (self_dead_dialog KEEP_WATCH,
DeadAutoObDn { obIndex, state, preparation }, FindFirstAvailObTarget). Until 0.2.0 every phase reset cleared
an eliminated player's watch: in 回合开始 / 机变 / 休整期 it saw its own empty board, in battle the first field.
Server (server/match/match/watch.js): Match.watchPref (viewer → the player of its last manual g.watch: a prep
scout, a single-player field, or the new optional g.watch playerId on a shared 联防 / boss pair field — PR
#189's review point); _watchTargetOf = that player while still in, else the first player still in (seat
order, AI seats included); startRound scouts its board (_followScout, kept through 机变 and 休整期), both
combat modes and the boss fields start on its field, a resync / a spectator joining in prep gets the board,
a followed player who quits hands over at once. Client: the screen adopts the pushed board like a 前往查看 tap
(battle/observe.js followedScout; the stale-field fix of PR #189), keeps it through the prep phases (no camera
flight home and back), a spectator no longer asks for the first player itself; g.watch sends the tapped row.
Overlap with PR #189 (not merged): the same preference chain; differences — the fallback includes AI seats
(a lone human with AI teammates had nobody to follow), shared fields record the tapped playerId.
Golden unchanged. Tests: test/match/feedback5-watch-follow.test.js (new, 9), spectator.test.js updated (the
spectator follows the player it scouted). Docs: design/network.md, PLAYING.md.
76 lines
3.5 KiB
JavaScript
76 lines
3.5 KiB
JavaScript
// In-match intents (`g.*`, DESIGN §8.2) with uniform error handling: every request goes through
|
|
// `act()`, which plays a UI sound on success, shows the ERR_TEXT toast on failure and never throws.
|
|
// The UI never mutates state optimistically — it waits for the next m.private / m.public push.
|
|
// `net.request` is looked up at call time so the dev mock harness can stub it.
|
|
|
|
import { net } from '../net.js';
|
|
import { toastError } from './toasts.js';
|
|
import { audio } from '../audio.js';
|
|
|
|
const SUCCESS_SFX = {
|
|
'g.buy': 'buy', 'g.sell': 'sell', 'g.refresh': 'refresh', 'g.freeze': 'freeze', 'g.levelUp': 'levelup',
|
|
'g.move': 'drop', 'g.equip': 'equip', 'g.art': 'artPlace', 'g.reward': 'pick', 'g.choice': 'pick',
|
|
'g.band': 'confirm', 'g.bandSkip': 'back', 'g.infoReady': 'ready', 'g.emote': 'emote', 'g.destroy': 'back',
|
|
};
|
|
|
|
let inflight = 0;
|
|
const busyListeners = new Set();
|
|
const emitBusy = () => { for (const fn of [...busyListeners]) { try { fn(inflight); } catch { /* ignore */ } } };
|
|
|
|
/** Subscribe to the number of in-flight intents (for subtle busy indicators). */
|
|
export function onBusy(fn) { busyListeners.add(fn); return () => busyListeners.delete(fn); }
|
|
|
|
/**
|
|
* Send an intent. Resolves true on `ok`, false on error (already toasted).
|
|
* @param {string} t
|
|
* @param {object} [fields]
|
|
* @param {{ sfx?: string|false, quiet?: boolean }} [opts]
|
|
* @returns {Promise<boolean>}
|
|
*/
|
|
export async function act(t, fields = {}, opts = {}) {
|
|
inflight += 1;
|
|
emitBusy();
|
|
try {
|
|
await net.request(t, fields);
|
|
const s = opts.sfx === undefined ? SUCCESS_SFX[t] : opts.sfx;
|
|
if (s) audio.sfx(s);
|
|
return true;
|
|
} catch (err) {
|
|
if (!opts.quiet) {
|
|
toastError(err);
|
|
audio.sfx('error', { volume: 0.6 });
|
|
}
|
|
return false;
|
|
} finally {
|
|
inflight = Math.max(0, inflight - 1);
|
|
emitBusy();
|
|
}
|
|
}
|
|
|
|
export const actions = {
|
|
infoReady: () => act('g.infoReady'),
|
|
band: (bandId) => act('g.band', { bandId }),
|
|
bandSkip: () => act('g.bandSkip'),
|
|
buy: (slot) => act('g.buy', { slot }),
|
|
refresh: () => act('g.refresh'),
|
|
freeze: () => act('g.freeze'),
|
|
levelUp: () => act('g.levelUp'),
|
|
sell: (uid) => act('g.sell', { uid }),
|
|
// `dir` (UP|RIGHT|DOWN|LEFT): the direction chosen with the deploy wheel (research 09 §6.1 — g.move / g.art carry it;
|
|
// the server defaults to RIGHT when absent)
|
|
move: (uid, to, dir) => act('g.move', dir ? { uid, to, dir } : { uid, to }),
|
|
// `replaceUid`: the equipped item the replace dialog picked (ui/equipReplace.js) — it is destroyed; absent ⇒ none needed
|
|
equip: (itemUid, targetUid, replaceUid) => act('g.equip', Number.isInteger(replaceUid) ? { itemUid, targetUid, replaceUid } : { itemUid, targetUid }),
|
|
art: (itemUid, row, col, dir) => act('g.art', dir ? { itemUid, row, col, dir } : { itemUid, row, col }),
|
|
destroy: (uid) => act('g.destroy', { uid }),
|
|
reward: (idx) => act('g.reward', { idx }),
|
|
choice: (idx) => act('g.choice', { idx }),
|
|
ready: (ready) => act('g.ready', { ready }, { sfx: ready ? 'ready' : 'back' }),
|
|
emote: (id) => act('g.emote', { id }, { quiet: true }),
|
|
// `playerId`: the player tapped in the team panel (a shared field shows two) — what an eliminated viewer follows
|
|
watch: (fieldId, playerId = null) => act('g.watch', typeof playerId === 'string' && playerId ? { fieldId, playerId } : { fieldId }, { sfx: 'tab' }),
|
|
autoplay: (on) => act('g.autoplay', { on }),
|
|
// solo battles only (ui/matchStatus.js pauseAvailable): m.public.paused follows
|
|
pause: (on) => act('g.pause', { on: !!on }, { sfx: on ? 'click' : 'confirm' }),
|
|
};
|