update move service

src/reducers/duel/monstersSlice.ts

@@ -169,6 +169,7 @@ export const fetchOverlayMeta = createAsyncThunk(
     controler: number;
     sequence: number;
     overlayCodes: number[];
+    append?: boolean;
   }) => {
     const controler = param.controler;
     const sequence = param.sequence;
@@ -221,6 +222,7 @@ export const monsterCase = (builder: ActionReducerMapBuilder<DuelState>) => {
     const controler = action.meta.arg.controler;
     const sequence = action.meta.arg.sequence;
     const overlayCodes = action.meta.arg.overlayCodes;
+    const append = action.meta.arg.append;
 
     const metas = overlayCodes.map((id) => {
       return { id, data: {}, text: {} };
@@ -231,7 +233,13 @@ export const monsterCase = (builder: ActionReducerMapBuilder<DuelState>) => {
     if (monsters) {
       const target = monsters.inner.find((_, idx) => idx == sequence);
       if (target && target.occupant) {
-        target.overlay_materials = metas;
+        if (append) {
+          target.overlay_materials = (target.overlay_materials || []).concat(
+            metas
+          );
+        } else {
+          target.overlay_materials = metas;
+        }
       }
     }
   });
@@ -245,8 +253,13 @@ export const monsterCase = (builder: ActionReducerMapBuilder<DuelState>) => {
       : state.opMonsters;
     if (monsters) {
       const target = monsters.inner.find((_, idx) => idx == sequence);
-      if (target && target.occupant) {
-        target.overlay_materials = overlayMetas;
+      for (const meta of overlayMetas) {
+        for (const overlay of target?.overlay_materials || []) {
+          if (meta.id == overlay.id) {
+            overlay.data = meta.data;
+            overlay.text = meta.text;
+          }
+        }
       }
     }
   });

src/service/duel/move.ts

@@ -165,7 +165,21 @@ export default (move: MsgMove, dispatch: AppDispatch) => {
       break;
     }
     case ygopro.CardZone.OVERLAY: {
-      OVERLAY_STACK.push({ code, sequence: to.overlay_sequence });
+      if (to.sequence > 6) {
+        // 超量素材在进行超量召唤时，若玩家未选择超量怪兽的位置，会“沉到决斗盘下面”，这时候素材们的sequence会暂时大于6
+        // 这时候将它们放到一个栈中，待超量怪兽的Move消息到来时从栈中获取超量素材补充到状态中
+        OVERLAY_STACK.push({ code, sequence: to.overlay_sequence });
+      } else {
+        // 其他情况下，比如“宵星的机神 丁吉尔苏”的“补充超量素材”效果，直接更新状态中
+        dispatch(
+          fetchOverlayMeta({
+            controler: to.controler,
+            sequence: to.sequence,
+            overlayCodes: [code],
+            append: true,
+          })
+        );
+      }
 
       break;
     }