update

src/reducers/duel/generic.ts

@@ -170,3 +170,13 @@ export function removeOccupant<T extends DuelFieldState>(
     }
   }
 }
+
+export function insertCard<T extends DuelFieldState>(
+  state: T | undefined,
+  sequence: number,
+  card: CardState
+) {
+  if (state) {
+    state.inner.splice(sequence, 0, card);
+  }
+}

src/reducers/duel/handsSlice.ts

@@ -8,7 +8,14 @@ import { DuelState } from "./mod";
 import { RootState } from "../../store";
 import { fetchCard, CardMeta } from "../../api/cards";
 import { judgeSelf } from "./util";
-import { Interactivity, DuelFieldState } from "./generic";
+import {
+  Interactivity,
+  DuelFieldState,
+  removeCard,
+  createAsyncMetaThunk,
+  insertCard,
+  extendMeta,
+} from "./generic";
 import { ygopro } from "../../api/ocgcore/idl/ocgcore";
 
 export interface HandState extends DuelFieldState {}
@@ -35,6 +42,56 @@ export const fetchHandsMeta = createAsyncThunk(
   }
 );
 
+// 清空手牌互动性
+export const clearHandsIdleInteractivityImpl: CaseReducer<
+  DuelState,
+  PayloadAction<number>
+> = (state, action) => {
+  const player = action.payload;
+
+  const hands = judgeSelf(player, state) ? state.meHands : state.opHands;
+
+  if (hands) {
+    for (let hand of hands.inner) {
+      hand.idleInteractivities = [];
+    }
+  }
+};
+
+// 添加手牌互动性
+export const addHandsIdleInteractivityImpl: CaseReducer<
+  DuelState,
+  PayloadAction<{
+    player: number;
+    sequence: number;
+    interactivity: Interactivity<number>;
+  }>
+> = (state, action) => {
+  const player = action.payload.player;
+
+  const hands = judgeSelf(player, state) ? state.meHands : state.opHands;
+  if (hands) {
+    const sequence = action.payload.sequence;
+    const interactivity = action.payload.interactivity;
+
+    hands.inner[sequence].idleInteractivities.push(interactivity);
+  }
+};
+
+// 删除手牌
+export const removeHandImpl: CaseReducer<
+  DuelState,
+  PayloadAction<[number, number]>
+> = (state, action) => {
+  const controler = action.payload[0];
+  const sequence = action.payload[1];
+
+  const hands = judgeSelf(controler, state) ? state.meHands : state.opHands;
+  removeCard(hands, sequence);
+};
+
+export const insertHandMeta = createAsyncMetaThunk("duel/insertHandMeta");
+
 export const handsCase = (builder: ActionReducerMapBuilder<DuelState>) => {
   builder.addCase(fetchHandsMeta.pending, (state, action) => {
     // Meta结果没返回之前先更新手牌`ID`
@@ -82,58 +139,33 @@ export const handsCase = (builder: ActionReducerMapBuilder<DuelState>) => {
       }
     }
   });
-};
-
-// 清空手牌互动性
-export const clearHandsIdleInteractivityImpl: CaseReducer<
-  DuelState,
-  PayloadAction<number>
-> = (state, action) => {
-  const player = action.payload;
 
-  const hands = judgeSelf(player, state) ? state.meHands : state.opHands;
-
-  if (hands) {
-    for (let hand of hands.inner) {
-      hand.idleInteractivities = [];
-    }
-  }
-};
+  builder.addCase(insertHandMeta.pending, (state, action) => {
+    const controler = action.meta.arg.controler;
+    const sequence = action.meta.arg.sequence;
+    const code = action.meta.arg.code;
 
-// 添加手牌互动性
-export const addHandsIdleInteractivityImpl: CaseReducer<
-  DuelState,
-  PayloadAction<{
-    player: number;
-    sequence: number;
-    interactivity: Interactivity<number>;
-  }>
-> = (state, action) => {
-  const player = action.payload.player;
+    const hands = judgeSelf(controler, state) ? state.meHands : state.opHands;
 
-  const hands = judgeSelf(player, state) ? state.meHands : state.opHands;
-  if (hands) {
+    insertCard(hands, sequence, {
+      occupant: { id: code, data: {}, text: {} },
+      location: { controler },
+      idleInteractivities: [],
+    });
+  });
+  builder.addCase(insertHandMeta.fulfilled, (state, action) => {
+    const controler = action.payload.controler;
     const sequence = action.payload.sequence;
-    const interactivity = action.payload.interactivity;
-
-    hands.inner[sequence].idleInteractivities.push(interactivity);
-  }
-};
+    const meta = action.payload.meta;
 
-// 删除手牌
-export const removeHandImpl: CaseReducer<
-  DuelState,
-  PayloadAction<[number, number]>
-> = (state, action) => {
-  const controler = action.payload[0];
-  const sequence = action.payload[1];
+    const hands = judgeSelf(controler, state) ? state.meHands : state.opHands;
 
-  const hands = judgeSelf(controler, state) ? state.meHands : state.opHands;
-  if (hands) {
-    hands.inner = hands.inner.filter((_, idx) => idx != sequence);
-  }
+    extendMeta(hands, meta, sequence);
+  });
 };
 
+// 在特定位置增加手牌
+
 export const selectMeHands = (state: RootState) =>
   state.duel.meHands || { inner: [] };
 export const selectOpHands = (state: RootState) =>

src/service/duel/move.ts

@@ -9,6 +9,7 @@ import {
 } from "../../reducers/duel/mod";
 import { fetchMagicMeta } from "../../reducers/duel/magicSlice";
 import { fetchCemeteryMeta } from "../../reducers/duel/cemeretySlice";
+import { insertHandMeta } from "../../reducers/duel/handsSlice";
 
 export default (move: MsgMove, dispatch: AppDispatch) => {
   const code = move.code;
@@ -78,6 +79,13 @@ export default (move: MsgMove, dispatch: AppDispatch) => {
 
       break;
     }
+    case ygopro.CardZone.HAND: {
+      dispatch(
+        insertHandMeta({ controler: to.controler, sequence: to.sequence, code })
+      );
+
+      break;
+    }
     default: {
       console.log(`Unhandled zone type ${to.location}`);