update pos change service

src/reducers/duel/generic.ts

@@ -251,3 +251,14 @@ export function clearIdleInteractivities<T extends DuelFieldState>(
     });
   }
 }
+
+export function setPosition<T extends DuelFieldState>(
+  state: T | undefined,
+  sequence: number,
+  position: ygopro.CardPosition
+) {
+  const target = state?.inner.find((_, idx) => idx == sequence);
+  if (target && target.occupant) {
+    target.location.position = position;
+  }
+}

src/reducers/duel/magicSlice.ts

@@ -17,6 +17,7 @@ import {
   Interactivity,
   extendIdleInteractivities,
   clearIdleInteractivities,
+  setPosition,
 } from "./generic";
 
 export interface MagicState extends DuelFieldState {}
@@ -172,6 +173,23 @@ export const removeMagicImpl: CaseReducer<
   removeOccupant(magics, action.payload.sequence);
 };
 
+// 改变魔法表示形式
+export const setMagicPositionImpl: CaseReducer<
+  DuelState,
+  PayloadAction<{
+    controler: number;
+    sequence: number;
+    position: ygopro.CardPosition;
+  }>
+> = (state, action) => {
+  const controler = action.payload.controler;
+  const sequence = action.payload.sequence;
+  const position = action.payload.position;
+
+  const magics = judgeSelf(controler, state) ? state.meMagics : state.opMagics;
+  setPosition(magics, sequence, position);
+};
+
 export const selectMeMagics = (state: RootState) =>
   state.duel.meMagics || { inner: [] };
 export const selectOpMagics = (state: RootState) =>

src/reducers/duel/mod.ts

@@ -66,6 +66,7 @@ import {
   addMagicIdleInteractivitiesImpl,
   clearMagicIdleInteractivitiesImpl,
   removeMagicImpl,
+  setMagicPositionImpl,
   magicCase,
 } from "./magicSlice";
 import { CemeteryState, initCemeteryImpl, cemeteryCase } from "./cemeretySlice";
@@ -166,6 +167,7 @@ const duelSlice = createSlice({
     clearMagicPlaceInteractivities: clearMagicPlaceInteractivitiesImpl,
     addMagicIdleInteractivities: addMagicIdleInteractivitiesImpl,
     clearMagicIdleInteractivities: clearMagicIdleInteractivitiesImpl,
+    setMagicPosition: setMagicPositionImpl,
     removeMagic: removeMagicImpl,
 
     // 墓地相关`Reducer`
@@ -250,6 +252,7 @@ export const {
   clearMagicPlaceInteractivities,
   addMagicIdleInteractivities,
   clearMagicIdleInteractivities,
+  setMagicPosition,
   removeMagic,
   removeHand,
   initCemetery,

src/reducers/duel/monstersSlice.ts

@@ -17,6 +17,7 @@ import {
   removeOccupant,
   extendIdleInteractivities,
   clearIdleInteractivities,
+  setPosition,
 } from "./generic";
 
 export interface MonsterState extends DuelFieldState {}
@@ -190,21 +191,17 @@ export const setMonsterPositionImpl: CaseReducer<
   PayloadAction<{
     controler: number;
     sequence: number;
-    currentPosition: ygopro.CardPosition;
+    position: ygopro.CardPosition;
   }>
 > = (state, action) => {
   const controler = action.payload.controler;
   const sequence = action.payload.sequence;
-  const currentPosition = action.payload.currentPosition;
+  const position = action.payload.position;
 
   const monsters = judgeSelf(controler, state)
     ? state.meMonsters
     : state.opMonsters;
-  const monster = monsters?.inner.find((_, idx) => idx == sequence);
-
-  if (monster && monster.occupant) {
-    monster.location.position = currentPosition;
-  }
+  setPosition(monsters, sequence, position);
 };
 
 export const selectMeMonsters = (state: RootState) =>

src/service/duel/posChange.ts

 import { ygopro } from "../../api/ocgcore/idl/ocgcore";
-import { setMonsterPosition } from "../../reducers/duel/mod";
+import { setMagicPosition, setMonsterPosition } from "../../reducers/duel/mod";
 import { AppDispatch } from "../../store";
 import MsgPosChange = ygopro.StocGameMessage.MsgPosChange;
 
@@ -12,7 +12,18 @@ export default (posChange: MsgPosChange, dispatch: AppDispatch) => {
         setMonsterPosition({
           controler: cardInfo.controler,
           sequence: cardInfo.sequence,
-          currentPosition: posChange.cur_position,
+          position: posChange.cur_position,
+        })
+      );
+
+      break;
+    }
+    case ygopro.CardZone.SZONE: {
+      dispatch(
+        setMagicPosition({
+          controler: cardInfo.controler,
+          sequence: cardInfo.sequence,
+          position: posChange.cur_position,
         })
       );