freeguy2006 Claude Opus 4.8 commited on
Commit
a736735
·
1 Parent(s): 88630de

fix: bug 獵捕修正(計數器/死旗標/draft防雙擊/鬼影/PvP訊息等)

Browse files

對抗式 bug 獵捕後確認並修正:
- 過關計數器歸零:initStates 補 newmoon/training/playCardCount=0(原會讓 新月/強化/最後決斷 跨關滾雪球)。
- 移除死旗標 狂戰士之魂(卡26 已改用 失控侵蝕):清 player/pvpResolve/types/test 的無效讀取。
- draft 防快速雙擊:伺服器以 pickIndex 守門(只認當前抽)+ 前端帶 pickIndex + 按鈕鎖定。
- 除錯局(maxLevel≠11)不上傳鬼影,避免重播驗證誤判。
- 已鎖定玩家出牌不再廣播/重入結算(play 加 !res.ok 守門)。
- RESOLVE_RESULT 不夾帶 view(避免與 result.turnNo 錯位);view 由 PHASE_START 提供。
- ResolveReveal 加 key(連續回合揭示動畫不失效)。
- draft 階段對手斷線 → 客戶端轉終局(不再卡死在組牌畫面)。
- 移除對戰中恆不顯示的死「返回」按鈕。
- 修正 pvpDraft(5/3/2、10 抽)與卡17 烈空斬 cap(綁 maxHP)過時註解。

消耗堆(exhaust):單機進下一關回牌庫(每場戰鬥一次);PvP 整局耗盡不回收。
驗證:typecheck 乾淨;battle-core 155 / server 35 全綠;build 成功。

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

packages/battle-core/src/data/cards.ts CHANGED
@@ -135,7 +135,7 @@ export const CARDS: readonly CardData[] = [
135
  {
136
  id: 17, name: "烈空斬", tag: "A", nextReq: "Any", atk: 6, def: 0, rarity: "epic",
137
  onPlay: [{ op: "SET_FLAG", flag: "烈空斬" }],
138
- modeOverride: { PVP: { notes: "烈空斬 上限 ≤ 40(07 §4.2);M3+ 實作" } },
139
  },
140
  {
141
  id: 18, name: "盾牆", tag: "B", nextReq: "B", atk: 0, def: 3, rarity: "epic",
 
135
  {
136
  id: 17, name: "烈空斬", tag: "A", nextReq: "Any", atk: 6, def: 0, rarity: "epic",
137
  onPlay: [{ op: "SET_FLAG", flag: "烈空斬" }],
138
+ modeOverride: { PVP: { notes: "烈空斬上限綁對手 maxHP=floor(maxHP×3/10)(maxHP=200→60),見 pvpResolve outgoing()" } },
139
  },
140
  {
141
  id: 18, name: "盾牆", tag: "B", nextReq: "B", atk: 0, def: 3, rarity: "epic",
packages/battle-core/src/player.ts CHANGED
@@ -192,10 +192,7 @@ export function onDealDamage(player: PlayerState, opponent: OpponentState, event
192
  player.flags.生命汲取 = false;
193
  events.push({ type: "HEAL", amount: heal, hpAfter: player.hp });
194
  }
195
- if (player.flags.狂戰士之魂) {
196
- player.def = 0; // 出傷時把自己防禦歸零
197
- player.flags.狂戰士之魂 = false;
198
- }
199
  return dmg;
200
  }
201
 
@@ -268,9 +265,9 @@ export function resetForNextTurn(
268
  }
269
 
270
  /**
271
- * 進新關卡的玩家重置(01 §7 註:InitStates)。
272
- * 重置旗標 / 上限 / 職業狀態;不重置本場累積計數器(newmoon/training)與升級計數(broken/blood,於升級時才歸零)。
273
- * baseDef 於怪物死亡時歸零(01 §7 註),於此一併處理。
274
  */
275
  export function initStates(player: PlayerState): void {
276
  player.flags = {};
@@ -282,6 +279,10 @@ export function initStates(player: PlayerState): void {
282
  player.coin = player.maxCoin;
283
  player.lucky = 0;
284
  player.baseDef = 0; // 怪物死亡時 BaseDEF 歸零
 
 
 
 
285
  // 消耗堆(burn)整批回牌庫:消耗 = 本關移除、進下一關歸還(原版 InitStates 行為、規格 05 §8.3)。
286
  if (player.burn.length > 0) {
287
  player.deck.push(...player.burn);
 
192
  player.flags.生命汲取 = false;
193
  events.push({ type: "HEAL", amount: heal, hpAfter: player.hp });
194
  }
195
+ // 註:卡26 已改用「失控侵蝕」機制(鎖 DEF=0 + DEF→ATK),原「狂戰士之魂 出傷歸零 DEF」已被取代而移除。
 
 
 
196
  return dmg;
197
  }
198
 
 
265
  }
266
 
267
  /**
268
+ * 進新關卡的玩家重置(01 §7 註:InitStates,比照原版 Entity.cpp)。
269
+ * 重置旗標 / 上限 / 職業狀態 / 本場累積計數器(newmoon/training/playCardCount)/ winValue。
270
+ * 升級計數 broken/blood 於升級時才歸零(此處不動);baseDef 於怪物死亡時歸零(01 §7 註),於此一併處理。
271
  */
272
  export function initStates(player: PlayerState): void {
273
  player.flags = {};
 
279
  player.coin = player.maxCoin;
280
  player.lucky = 0;
281
  player.baseDef = 0; // 怪物死亡時 BaseDEF 歸零
282
+ // 本場累積計數器每關歸零(原版 InitStates):否則 新月訓練/強化訓練/最後的決斷 的加成會跨關無限滾雪球。
283
+ player.newmoon = 0;
284
+ player.training = 0;
285
+ player.playCardCount = 0;
286
  // 消耗堆(burn)整批回牌庫:消耗 = 本關移除、進下一關歸還(原版 InitStates 行為、規格 05 §8.3)。
287
  if (player.burn.length > 0) {
288
  player.deck.push(...player.burn);
packages/battle-core/src/pvpDraft.ts CHANGED
@@ -1,6 +1,6 @@
1
  /**
2
  * PvP 開局 Draft(07 §6.1 DRAFT 的具體版)。
3
- * 在「基礎牌組」之上,玩家三選一挑 4 普通 + 2 史詩 + 2 傳說(共 8 抽),組成自己的對戰牌組。
4
  * 純函式、決定性、可注入種子:choice 生成在 battle-core;UI 負責呈現、伺服器負責驗證。
5
  */
6
  import type { RngState } from "./types.js";
@@ -49,14 +49,14 @@ export function draftChoices(
49
  return { tier, choices: shuffled.slice(0, PVP_DRAFT_CHOICES), rng: next };
50
  }
51
 
52
- /** 組出 PvP 最終牌組:基礎牌組(STARTING_DECK,10 張)+ 已選 8 張 = 18 張。 */
53
  export function buildPvpDeck(picked: readonly number[]): number[] {
54
  return [...STARTING_DECK, ...picked];
55
  }
56
 
57
  /**
58
- * 反作弊:驗證玩家提交的 8 張選擇是否合法。
59
- * 需「恰 4 普通 + 2 史詩 + 2 傳說」,且每張都來自對應卡池(三池互斥)。允許重複(同卡可多抽)。
60
  */
61
  export function validateDraftPicks(picked: readonly number[]): boolean {
62
  if (!Array.isArray(picked) || picked.length !== PVP_DRAFT_PICKS) return false;
 
1
  /**
2
  * PvP 開局 Draft(07 §6.1 DRAFT 的具體版)。
3
+ * 在「基礎牌組」之上,玩家三選一挑 5 普通 + 3 史詩 + 2 傳說(共 10 抽),組成自己的對戰牌組。
4
  * 純函式、決定性、可注入種子:choice 生成在 battle-core;UI 負責呈現、伺服器負責驗證。
5
  */
6
  import type { RngState } from "./types.js";
 
49
  return { tier, choices: shuffled.slice(0, PVP_DRAFT_CHOICES), rng: next };
50
  }
51
 
52
+ /** 組出 PvP 最終牌組:基礎牌組(STARTING_DECK,10 張)+ 已選 10 張 = 20 張。 */
53
  export function buildPvpDeck(picked: readonly number[]): number[] {
54
  return [...STARTING_DECK, ...picked];
55
  }
56
 
57
  /**
58
+ * 反作弊:驗證玩家提交的 10 張選擇是否合法。
59
+ * 需「恰 5 普通 + 3 史詩 + 2 傳說」(PVP_DRAFT_COUNTS),且每張都來自對應卡池。普通可重複,史詩/傳說同稀有不重複。
60
  */
61
  export function validateDraftPicks(picked: readonly number[]): boolean {
62
  if (!Array.isArray(picked) || picked.length !== PVP_DRAFT_PICKS) return false;
packages/battle-core/src/pvpResolve.ts CHANGED
@@ -72,7 +72,6 @@ export interface PvpSnap {
72
  air: boolean;
73
  ready: boolean;
74
  recover: boolean;
75
- comboChange: boolean;
76
  buffEnemy: boolean;
77
  coinToHp: boolean;
78
  coin: number;
@@ -92,7 +91,6 @@ function snap(p: PlayerState): PvpSnap {
92
  air: p.flags.烈空斬 === true,
93
  ready: p.flags.蓄勢 === true,
94
  recover: p.flags.生命汲取 === true,
95
- comboChange: p.flags.狂戰士之魂 === true,
96
  buffEnemy: p.flags.挑釁 === true,
97
  coinToHp: p.flags.餘裕 === true,
98
  coin: p.coin,
@@ -189,9 +187,9 @@ export function resolveSimultaneous(
189
  if (snapA.coinToHp && snapA.coin > 0) { a.hp += 5; a.maxHp += 5; }
190
  if (snapB.coinToHp && snapB.coin > 0) { b.hp += 5; b.maxHp += 5; }
191
 
192
- // 4) 護盾延續消耗:狂戰士之魂 歸零自己 DEF;否則被對手 atkUsed 消耗(WIN 無視 → 不消耗)
193
- const defAafter = snapA.comboChange ? 0 : outB.win ? snapA.def : pvpDefAfter(snapA.def, outB.atkUsed);
194
- const defBafter = snapB.comboChange ? 0 : outA.win ? snapB.def : pvpDefAfter(snapB.def, outA.atkUsed);
195
 
196
  // 5) §4.6 無視 DEF 灼燒(雙方對稱、直接扣 HP)
197
  const chip = pvpChip(turnNo, cfg.rampTurn);
@@ -239,6 +237,7 @@ export function resolveSimultaneous(
239
  if (snapB.buffEnemy) a.baseAtk += 1;
240
  a.flags.挑釁 = false;
241
  b.flags.挑釁 = false;
 
242
  rngA = resetForNextTurn(a, rngA, events, { keepDef: true });
243
  rngB = resetForNextTurn(b, rngB, events, { keepDef: true });
244
  checkCardUpgrades(a, events);
@@ -265,7 +264,6 @@ function pvpClearDamageFlags(p: PlayerState): void {
265
  p.flags.烈空斬 = false;
266
  p.flags.蓄勢 = false;
267
  p.flags.生命汲取 = false;
268
- p.flags.狂戰士之魂 = false;
269
  p.flags.終極一擊 = false;
270
  p.flags.餘裕 = false;
271
  }
 
72
  air: boolean;
73
  ready: boolean;
74
  recover: boolean;
 
75
  buffEnemy: boolean;
76
  coinToHp: boolean;
77
  coin: number;
 
91
  air: p.flags.烈空斬 === true,
92
  ready: p.flags.蓄勢 === true,
93
  recover: p.flags.生命汲取 === true,
 
94
  buffEnemy: p.flags.挑釁 === true,
95
  coinToHp: p.flags.餘裕 === true,
96
  coin: p.coin,
 
187
  if (snapA.coinToHp && snapA.coin > 0) { a.hp += 5; a.maxHp += 5; }
188
  if (snapB.coinToHp && snapB.coin > 0) { b.hp += 5; b.maxHp += 5; }
189
 
190
+ // 4) 護盾延續消耗:被對手 atkUsed 消耗(WIN 無視 → 不消耗)。失控侵蝕 26 已使 DEF 全程鎖 0,故無需特例。
191
+ const defAafter = outB.win ? snapA.def : pvpDefAfter(snapA.def, outB.atkUsed);
192
+ const defBafter = outA.win ? snapB.def : pvpDefAfter(snapB.def, outA.atkUsed);
193
 
194
  // 5) §4.6 無視 DEF 灼燒(雙方對稱、直接扣 HP)
195
  const chip = pvpChip(turnNo, cfg.rampTurn);
 
237
  if (snapB.buffEnemy) a.baseAtk += 1;
238
  a.flags.挑釁 = false;
239
  b.flags.挑釁 = false;
240
+ // 註:PvP 消耗堆(burn)不回收 — exhaust 卡整場單局耗盡(規格 05/07);與單機「每場戰鬥用一次、進下一關 initStates 才回牌庫」不同。
241
  rngA = resetForNextTurn(a, rngA, events, { keepDef: true });
242
  rngB = resetForNextTurn(b, rngB, events, { keepDef: true });
243
  checkCardUpgrades(a, events);
 
264
  p.flags.烈空斬 = false;
265
  p.flags.蓄勢 = false;
266
  p.flags.生命汲取 = false;
 
267
  p.flags.終極一擊 = false;
268
  p.flags.餘裕 = false;
269
  }
packages/battle-core/src/types.ts CHANGED
@@ -20,7 +20,6 @@ export type FlagName =
20
  | "蓄勢"
21
  | "絕對防禦"
22
  | "命運"
23
- | "狂戰士之魂"
24
  | "傳說之證"
25
  | "黃金律動"
26
  | "挑釁"
 
20
  | "蓄勢"
21
  | "絕對防禦"
22
  | "命運"
 
23
  | "傳說之證"
24
  | "黃金律動"
25
  | "挑釁"
packages/battle-core/test/battle-core.test.ts CHANGED
@@ -152,12 +152,7 @@ describe("OnDealDamage 旗標(01 §5.1)", () => {
152
  expect(dmg).toBe(20 + 5); // 25
153
  });
154
 
155
- it("狂戰士之魂:出傷時自己 DEF 歸零", () => {
156
- const p = makePlayer({ atk: 10, def: 8, flags: { 狂戰士之魂: true } });
157
- const m = createMonster();
158
- onDealDamage(p, m, []);
159
- expect(p.def).toBe(0);
160
- });
161
  });
162
 
163
  describe("FATE(01 §4.2 / §5.6)", () => {
 
152
  expect(dmg).toBe(20 + 5); // 25
153
  });
154
 
155
+ // 註:原「狂戰士之魂 出傷歸零 DEF」已由卡26「失控侵蝕」機制取代(鎖 DEF=0 + DEF→ATK),該旗標已移除。
 
 
 
 
 
156
  });
157
 
158
  describe("FATE(01 §4.2 / §5.6)", () => {
packages/server/src/pvpHub.ts CHANGED
@@ -18,7 +18,7 @@ export type PvpServerMsg =
18
  | { type: "PLAY_RESULT"; events: GameEvent[]; view: PvpView }
19
  | { type: "LOCKED"; view: PvpView } // 確認「你」已鎖定(更新自己畫面)
20
  | { type: "OPP_LOCKED" }
21
- | { type: "RESOLVE_RESULT"; turnNo: number; result: PvpResolveResult; view: PvpView }
22
  | { type: "GAME_END"; outcome: "WIN" | "LOSE" | "DRAW"; reason: string }
23
  | { type: "OPP_DISCONNECTED" }
24
  | { type: "ERROR"; message: string };
@@ -171,21 +171,23 @@ export class PvpHub {
171
  d.timer[side] = this.scheduler.set(this.tDraftMs, () => this.onDraftTimeout(room.code, side));
172
  }
173
 
174
- /** 玩家在 draft 階段選第 choiceIndex 張(0..2)。只能從伺服器發的 3 張裡選。 */
175
- draftPick(playerId: string, choiceIndex: number): void {
 
176
  const code = this.playerRoom.get(playerId);
177
  if (!code) return;
178
  const room = this.rooms.get(code);
179
  if (!room?.draft) return;
180
  const side = this.sideOfConn(room, playerId);
181
  if (!side) return;
182
- this.applyDraftPick(room, side, choiceIndex);
183
  }
184
 
185
  /** 套用一次選牌(玩家手動或逾時自動共用)。 */
186
- private applyDraftPick(room: Room, side: Side, choiceIndex: number): void {
187
  const d = room.draft;
188
  if (!d || d.done[side]) return;
 
189
  const choices = d.choices[side];
190
  if (!Number.isInteger(choiceIndex) || choiceIndex < 0 || choiceIndex >= choices.length) return;
191
  this.clearDraftTimer(room, side);
@@ -261,6 +263,7 @@ export class PvpHub {
261
  if (!ctx) return;
262
  const { room, side } = ctx;
263
  const res = room.match!.play(side, handIndex);
 
264
  room.conns[side]?.send({ type: "PLAY_RESULT", events: res.newEvents, view: room.match!.viewFor(side) });
265
  if (res.forcedEnd) this.afterLockMaybeResolve(room, side); // 重擊 soft auto-lock
266
  }
@@ -302,8 +305,9 @@ export class PvpHub {
302
 
303
  private broadcastResolve(room: Room): void {
304
  const m = room.match!;
 
305
  (["A", "B"] as Side[]).forEach((side) => {
306
- room.conns[side]?.send({ type: "RESOLVE_RESULT", turnNo: m.lastResolve!.turnNo, result: m.lastResolve!, view: m.viewFor(side) });
307
  });
308
  if (m.phase === "ENDED") {
309
  this.endMatch(room);
 
18
  | { type: "PLAY_RESULT"; events: GameEvent[]; view: PvpView }
19
  | { type: "LOCKED"; view: PvpView } // 確認「你」已鎖定(更新自己畫面)
20
  | { type: "OPP_LOCKED" }
21
+ | { type: "RESOLVE_RESULT"; turnNo: number; result: PvpResolveResult }
22
  | { type: "GAME_END"; outcome: "WIN" | "LOSE" | "DRAW"; reason: string }
23
  | { type: "OPP_DISCONNECTED" }
24
  | { type: "ERROR"; message: string };
 
171
  d.timer[side] = this.scheduler.set(this.tDraftMs, () => this.onDraftTimeout(room.code, side));
172
  }
173
 
174
+ /** 玩家在 draft 階段選第 choiceIndex 張(0..2)。只能從伺服器發的 3 張裡選。
175
+ * expectedPickIndex:client 認知的第幾抽;不符當前抽 → 忽略(防延遲的雙擊套用到下一抽)。 */
176
+ draftPick(playerId: string, choiceIndex: number, expectedPickIndex?: number): void {
177
  const code = this.playerRoom.get(playerId);
178
  if (!code) return;
179
  const room = this.rooms.get(code);
180
  if (!room?.draft) return;
181
  const side = this.sideOfConn(room, playerId);
182
  if (!side) return;
183
+ this.applyDraftPick(room, side, choiceIndex, expectedPickIndex);
184
  }
185
 
186
  /** 套用一次選牌(玩家手動或逾時自動共用)。 */
187
+ private applyDraftPick(room: Room, side: Side, choiceIndex: number, expectedPickIndex?: number): void {
188
  const d = room.draft;
189
  if (!d || d.done[side]) return;
190
+ if (expectedPickIndex !== undefined && expectedPickIndex !== d.pickIndex[side]) return; // 過期點擊 → 忽略
191
  const choices = d.choices[side];
192
  if (!Number.isInteger(choiceIndex) || choiceIndex < 0 || choiceIndex >= choices.length) return;
193
  this.clearDraftTimer(room, side);
 
263
  if (!ctx) return;
264
  const { room, side } = ctx;
265
  const res = room.match!.play(side, handIndex);
266
+ if (!res.ok) return; // 已鎖定 / 非規劃相 / 超量 → 忽略,避免重複 PLAY_RESULT 與重入結算(07 §2.2)
267
  room.conns[side]?.send({ type: "PLAY_RESULT", events: res.newEvents, view: room.match!.viewFor(side) });
268
  if (res.forcedEnd) this.afterLockMaybeResolve(room, side); // 重擊 soft auto-lock
269
  }
 
305
 
306
  private broadcastResolve(room: Room): void {
307
  const m = room.match!;
308
+ // 不夾帶 view:此時已推進到下一回合,view 與 result.turnNo 會錯位;view 由隨後的 PHASE_START 提供。
309
  (["A", "B"] as Side[]).forEach((side) => {
310
+ room.conns[side]?.send({ type: "RESOLVE_RESULT", turnNo: m.lastResolve!.turnNo, result: m.lastResolve! });
311
  });
312
  if (m.phase === "ENDED") {
313
  this.endMatch(room);
packages/server/src/server.ts CHANGED
@@ -30,6 +30,7 @@ interface PvpClientMsg {
30
  code?: string;
31
  handIndex?: number;
32
  choiceIndex?: number; // draft 三選一:選第幾張(0..2)
 
33
  }
34
 
35
  export function buildServer(opts: ServerOptions): FastifyInstance {
@@ -97,7 +98,10 @@ export function buildServer(opts: ServerOptions): FastifyInstance {
97
  }
98
  case "DRAFT_PICK": {
99
  const ci = Number(msg.choiceIndex);
100
- if (Number.isInteger(ci) && ci >= 0 && ci < 3) hub.draftPick(playerId, ci);
 
 
 
101
  break;
102
  }
103
  case "LOCK": hub.lock(playerId); break;
 
30
  code?: string;
31
  handIndex?: number;
32
  choiceIndex?: number; // draft 三選一:選第幾張(0..2)
33
+ pickIndex?: number; // 這是第幾抽(防延遲雙擊套用到下一抽)
34
  }
35
 
36
  export function buildServer(opts: ServerOptions): FastifyInstance {
 
98
  }
99
  case "DRAFT_PICK": {
100
  const ci = Number(msg.choiceIndex);
101
+ const pi = Number(msg.pickIndex);
102
+ if (Number.isInteger(ci) && ci >= 0 && ci < 3) {
103
+ hub.draftPick(playerId, ci, Number.isInteger(pi) ? pi : undefined);
104
+ }
105
  break;
106
  }
107
  case "LOCK": hub.lock(playerId); break;
packages/web/src/App.tsx CHANGED
@@ -2,6 +2,7 @@ import { useCallback, useMemo, useRef, useState } from "react";
2
  import {
3
  createGame,
4
  step,
 
5
  getCard,
6
  buildGhostRecord,
7
  enterGhostBattle,
@@ -39,8 +40,8 @@ export function App() {
39
  const { state, events } = step(prev, action);
40
  actionsRef.current.push(action);
41
  setMessage(describeEvents(events));
42
- // 破第 11 關 → 打包整場 GhostRecord 上傳(模式 A,03 §4)
43
- if (state.phase === "VICTORY" && !uploadedRef.current) {
44
  uploadedRef.current = true;
45
  const record = buildGhostRecord(state, { seed: seedRef.current, actions: actionsRef.current.slice() });
46
  setUploadStatus("上傳鬼影中…");
 
2
  import {
3
  createGame,
4
  step,
5
+ MAX_LEVEL,
6
  getCard,
7
  buildGhostRecord,
8
  enterGhostBattle,
 
40
  const { state, events } = step(prev, action);
41
  actionsRef.current.push(action);
42
  setMessage(describeEvents(events));
43
+ // 破第 11 關 → 打包整場 GhostRecord 上傳(模式 A,03 §4)。除錯局(maxLevel≠11)不上傳,避免重播驗證誤判。
44
+ if (state.phase === "VICTORY" && !uploadedRef.current && state.maxLevel === MAX_LEVEL) {
45
  uploadedRef.current = true;
46
  const record = buildGhostRecord(state, { seed: seedRef.current, actions: actionsRef.current.slice() });
47
  setUploadStatus("上傳鬼影中…");
packages/web/src/PvpScreen.tsx CHANGED
@@ -58,13 +58,13 @@ export function PvpScreen({ onExit }: { onExit: () => void }) {
58
  </Centered>
59
  );
60
  } else {
61
- main = <PvpBattle pvp={pvp} onExit={onExit} />;
62
  }
63
 
64
  return (
65
  <>
66
  {main}
67
- {reveal && <ResolveReveal result={reveal} you={state.you ?? "A"} />}
68
  </>
69
  );
70
  }
@@ -129,10 +129,18 @@ function DraftView({
129
  }: {
130
  draft: { pickIndex: number; total: number; tier: DraftTier; choices: number[] };
131
  deadlineTs?: number;
132
- onPick: (choiceIndex: number) => void;
133
  onExit: () => void;
134
  }) {
135
  const left = useCountdown(deadlineTs);
 
 
 
 
 
 
 
 
136
  return (
137
  <Centered>
138
  <h2 className="title">組牌 Draft</h2>
@@ -142,7 +150,7 @@ function DraftView({
142
  </p>
143
  <div className="hand">
144
  {draft.choices.map((id, i) => (
145
- <button key={`${id}-${i}`} className="card big" onClick={() => onPick(i)} title={getCard(id).name}>
146
  <img src={`${RES}/${id}.png`} alt={getCard(id).name} draggable={false} />
147
  </button>
148
  ))}
@@ -176,7 +184,7 @@ function Lobby({ pvp, onExit }: { pvp: ReturnType<typeof usePvp>; onExit: () =>
176
  );
177
  }
178
 
179
- function PvpBattle({ pvp, onExit }: { pvp: ReturnType<typeof usePvp>; onExit: () => void }) {
180
  const { state } = pvp;
181
  const v = state.view!;
182
  const you = v.you;
@@ -237,7 +245,6 @@ function PvpBattle({ pvp, onExit }: { pvp: ReturnType<typeof usePvp>; onExit: ()
237
  )}
238
  </button>
239
  <button className="btn surrender-btn" onClick={() => { if (confirm("確定投降?")) pvp.surrender(); }}>投降</button>
240
- {!pvp.state.view && <button className="btn" onClick={onExit}>返回</button>}
241
  </div>
242
  );
243
  }
 
58
  </Centered>
59
  );
60
  } else {
61
+ main = <PvpBattle pvp={pvp} />;
62
  }
63
 
64
  return (
65
  <>
66
  {main}
67
+ {reveal && <ResolveReveal key={reveal.turnNo} result={reveal} you={state.you ?? "A"} />}
68
  </>
69
  );
70
  }
 
129
  }: {
130
  draft: { pickIndex: number; total: number; tier: DraftTier; choices: number[] };
131
  deadlineTs?: number;
132
+ onPick: (choiceIndex: number, pickIndex: number) => void;
133
  onExit: () => void;
134
  }) {
135
  const left = useCountdown(deadlineTs);
136
+ // 防快速雙擊:送出後鎖住本抽按鈕,直到伺服器發下一抽(pickIndex 前進)才解鎖
137
+ const [pendingIndex, setPendingIndex] = useState<number | null>(null);
138
+ const locked = pendingIndex === draft.pickIndex;
139
+ const choose = (i: number) => {
140
+ if (locked) return;
141
+ setPendingIndex(draft.pickIndex);
142
+ onPick(i, draft.pickIndex);
143
+ };
144
  return (
145
  <Centered>
146
  <h2 className="title">組牌 Draft</h2>
 
150
  </p>
151
  <div className="hand">
152
  {draft.choices.map((id, i) => (
153
+ <button key={`${id}-${i}`} className="card big" disabled={locked} onClick={() => choose(i)} title={getCard(id).name}>
154
  <img src={`${RES}/${id}.png`} alt={getCard(id).name} draggable={false} />
155
  </button>
156
  ))}
 
184
  );
185
  }
186
 
187
+ function PvpBattle({ pvp }: { pvp: ReturnType<typeof usePvp> }) {
188
  const { state } = pvp;
189
  const v = state.view!;
190
  const you = v.you;
 
245
  )}
246
  </button>
247
  <button className="btn surrender-btn" onClick={() => { if (confirm("確定投降?")) pvp.surrender(); }}>投降</button>
 
248
  </div>
249
  );
250
  }
packages/web/src/pvpClient.ts CHANGED
@@ -27,7 +27,7 @@ type ServerMsg =
27
  | { type: "PLAY_RESULT"; events: GameEvent[]; view: PvpView }
28
  | { type: "LOCKED"; view: PvpView }
29
  | { type: "OPP_LOCKED" }
30
- | { type: "RESOLVE_RESULT"; turnNo: number; result: PvpResolveResult; view: PvpView }
31
  | { type: "GAME_END"; outcome: "WIN" | "LOSE" | "DRAW"; reason: string }
32
  | { type: "OPP_DISCONNECTED" }
33
  | { type: "ERROR"; message: string };
@@ -55,7 +55,7 @@ export interface PvpApi {
55
  state: PvpState;
56
  createRoom: () => void;
57
  join: (code: string) => void;
58
- draftPick: (choiceIndex: number) => void;
59
  play: (handIndex: number) => void;
60
  lock: () => void;
61
  surrender: () => void;
@@ -92,7 +92,7 @@ export function usePvp(): PvpApi {
92
  state,
93
  createRoom: useCallback(() => send({ type: "CREATE_ROOM" }), [send]),
94
  join: useCallback((code: string) => send({ type: "JOIN", code }), [send]),
95
- draftPick: useCallback((choiceIndex: number) => send({ type: "DRAFT_PICK", choiceIndex }), [send]),
96
  play: useCallback((handIndex: number) => send({ type: "PLAY_CARD", handIndex }), [send]),
97
  lock: useCallback(() => send({ type: "LOCK" }), [send]),
98
  surrender: useCallback(() => send({ type: "SURRENDER" }), [send]),
@@ -123,11 +123,15 @@ function reduce(s: PvpState, m: ServerMsg): PvpState {
123
  case "OPP_LOCKED":
124
  return { ...s, oppLocked: true };
125
  case "RESOLVE_RESULT":
126
- return { ...s, lastResolve: m.result, view: m.view, oppLocked: false };
 
127
  case "GAME_END":
128
  return { ...s, status: "ended", outcome: m.outcome, reason: m.reason };
129
  case "OPP_DISCONNECTED":
130
- return { ...s, oppGone: true };
 
 
 
131
  case "ERROR":
132
  return { ...s, error: m.message };
133
  default:
 
27
  | { type: "PLAY_RESULT"; events: GameEvent[]; view: PvpView }
28
  | { type: "LOCKED"; view: PvpView }
29
  | { type: "OPP_LOCKED" }
30
+ | { type: "RESOLVE_RESULT"; turnNo: number; result: PvpResolveResult }
31
  | { type: "GAME_END"; outcome: "WIN" | "LOSE" | "DRAW"; reason: string }
32
  | { type: "OPP_DISCONNECTED" }
33
  | { type: "ERROR"; message: string };
 
55
  state: PvpState;
56
  createRoom: () => void;
57
  join: (code: string) => void;
58
+ draftPick: (choiceIndex: number, pickIndex: number) => void;
59
  play: (handIndex: number) => void;
60
  lock: () => void;
61
  surrender: () => void;
 
92
  state,
93
  createRoom: useCallback(() => send({ type: "CREATE_ROOM" }), [send]),
94
  join: useCallback((code: string) => send({ type: "JOIN", code }), [send]),
95
+ draftPick: useCallback((choiceIndex: number, pickIndex: number) => send({ type: "DRAFT_PICK", choiceIndex, pickIndex }), [send]),
96
  play: useCallback((handIndex: number) => send({ type: "PLAY_CARD", handIndex }), [send]),
97
  lock: useCallback(() => send({ type: "LOCK" }), [send]),
98
  surrender: useCallback(() => send({ type: "SURRENDER" }), [send]),
 
123
  case "OPP_LOCKED":
124
  return { ...s, oppLocked: true };
125
  case "RESOLVE_RESULT":
126
+ // 不從 RESOLVE_RESULT 更新 view(會與 result.turnNo 錯位);view 由隨後的 PHASE_START 提供。
127
+ return { ...s, lastResolve: m.result, oppLocked: false };
128
  case "GAME_END":
129
  return { ...s, status: "ended", outcome: m.outcome, reason: m.reason };
130
  case "OPP_DISCONNECTED":
131
+ // 對局中:隨後伺服器會送 GAME_END(不動 status);draft/等待中:伺服器已清房,自行轉終局避免卡死。
132
+ return s.status === "playing"
133
+ ? { ...s, oppGone: true }
134
+ : { ...s, oppGone: true, status: "ended", reason: "對手已離開" };
135
  case "ERROR":
136
  return { ...s, error: m.message };
137
  default: