fix: trigger move from move.ts derectly

src/env.d.ts

@@ -12,11 +12,9 @@ interface ImportMeta {
   readonly env: ImportMetaEnv;
 }
 
-// 定义一个全局的myExtraDeckCodes变量
-declare var myExtraDeckCodes: number[];
-
 import { EventEmitter } from "eventemitter3";
 
 declare global {
   var eventBus: EventEmitter;
+  var myExtraDeckCodes: number[];
 }

src/service/duel/move.ts

@@ -7,6 +7,7 @@ import { useConfig } from "@/config";
 import { sleep } from "@/infra";
 
 import { REASON_MATERIAL } from "../../common";
+import { ReportEnum } from "@/ui/Duel/NewPlayMat/Card/springs/types";
 
 const { matStore } = store;
 const NeosConfig = useConfig();
@@ -171,6 +172,21 @@ export default async (move: MsgMove) => {
   const toZone =
     move.to.toArray()[1] === undefined ? ygopro.CardZone.TZONE : to.location;
 
+  // log出来看看，后期删掉即可
+  (async () => {
+    const { text } = await fetchCard(code);
+    console.warn(
+      "move",
+      text.name,
+      ygopro.CardZone[fromZone],
+      from.sequence,
+      "->",
+      ygopro.CardZone[toZone],
+      to.sequence
+    );
+    console.warn("overlay", from.overlay_sequence, to.overlay_sequence);
+  })();
+
   // 处理token
   let target: CardType;
 
@@ -186,24 +202,6 @@ export default async (move: MsgMove) => {
     target = cardStore.at(fromZone, from.controler, from.sequence);
   }
 
-  (async () => {
-    const { text } = await fetchCard(code);
-    console.warn("---");
-    console.log(
-      "move",
-      text.name,
-      ygopro.CardZone[fromZone],
-      from.sequence,
-      "->",
-      ygopro.CardZone[toZone],
-      to.sequence
-    );
-    console.log("over", from.overlay_sequence, to.overlay_sequence);
-    console.log({ fromCards });
-    console.log({ target });
-    console.warn("---");
-  })();
-
   if (toZone === OVERLAY) {
     // 准备超量召唤，超量素材入栈
     if (reason == REASON_MATERIAL) overlayStack.push(target);
@@ -225,12 +223,25 @@ export default async (move: MsgMove) => {
   if ([HAND, GRAVE, REMOVED, DECK, EXTRA].includes(toZone))
     toCards.forEach((c) => c.sequence >= to.sequence && c.sequence++);
 
+  // 更新信息
   target.zone = toZone;
   target.controller = to.controler;
   target.sequence = to.sequence;
   target.code = code;
   target.position = to.position;
 
+  // 维护完了之后，开始动画
+  eventBus.emit(ReportEnum.Move, target.uuid);
+  // 如果from或者to是手卡，那么需要刷新除了这张卡之外，这个玩家的所有手卡
+  if ([fromZone, toZone].includes(HAND)) {
+    cardStore.at(HAND, target.controller).forEach((card) => {
+      if (card.uuid !== target.uuid) {
+        console.log("refresh hand", card.uuid);
+        eventBus.emit(ReportEnum.Move, card.uuid);
+      }
+    });
+  }
+
   // 注意，一个monster的overlayMaterials中的每一项都是一个cardType，
   // 并且，overlayMaterials的idx就是超量素材的sequence。
   // 如果一个card的zone是OVERLAY，那么它本身的sequence项是无意义的。

src/service/duel/selectIdleCmd.ts

@@ -41,6 +41,14 @@ export default (selectIdleCmd: MsgSelectIdleCmd) => {
             interactType,
             response: data.response,
           });
+        console.log(
+          "idleTypeToInteractType",
+          cardStore.at(location, player)[sequence],
+          {
+            location: ygopro.CardZone[location],
+            sequence,
+          }
+        );
         cardStore.at(location, player)[sequence].idleInteractivities.push({
           ...tmp,
           interactType,

src/service/duel/start.ts

@@ -104,7 +104,6 @@ export default (start: ygopro.StocGameMessage.MsgStart) => {
 
   /** 自动从code推断出occupant */
   const genCard = (o: CardType) => {
-    // FIXME 还没处理超量
     const t = proxy(o);
     subscribeKey(t, "code", async (code) => {
       const { text, data } = await fetchCard(code ?? 0);
@@ -115,6 +114,7 @@ export default (start: ygopro.StocGameMessage.MsgStart) => {
   };
 
   const TOKEN_SIZE = 13; // 每人场上最多就只可能有13个token
+  let uuid = 0;
   const cards = flatten(
     [
       start.deckSize1,
@@ -126,7 +126,7 @@ export default (start: ygopro.StocGameMessage.MsgStart) => {
     ].map((length, i) =>
       Array.from({ length }).map((_, sequence) =>
         genCard({
-          // uuid: v4uuid(),
+          uuid: uuid++,
           code: 0,
           controller: i < 3 ? 1 - opponent : opponent, // 前3个是自己的卡组，后3个是对手的卡组
           originController: i < 3 ? 1 - opponent : opponent,
@@ -142,6 +142,7 @@ export default (start: ygopro.StocGameMessage.MsgStart) => {
           text: {},
           isToken: !((i + 1) % 3),
           overlayMaterials: [],
+          position: ygopro.CardPosition.FACEDOWN,
         })
       )
     )

src/stores/cardStore.ts

@@ -7,14 +7,14 @@ import type { Interactivity } from "./matStore/types";
  * 以后会更名为 BlockState
  */
 export interface CardType {
-  // uuid: string; // FIXME 一张卡的唯一标识 一定需要这个吗？list的idx是不是就够了？
-  code: number;
+  uuid: number; // 一张卡的唯一标识
+  code: number; // 卡号
   data: CardData;
   text: CardText;
   controller: number; // 控制这个位置的玩家，0或1
   originController: number; // 在卡组构建之中持有这张卡的玩家，方便reloadField的使用
   zone: ygopro.CardZone; // 怪兽区/魔法陷阱区/手牌/卡组/墓地/除外区
-  position?: ygopro.CardPosition; // 卡片的姿势：攻击还是守备
+  position: ygopro.CardPosition; // 卡片的姿势：攻击还是守备
   sequence: number; // 卡片在区域中的序号
   idleInteractivities: Interactivity<number>[]; // IDLE状态下的互动信息
   placeInteractivity?: Interactivity<{

src/ui/Duel/NewPlayMat/Card/index.tsx

 import React, { useEffect, type CSSProperties, type FC, useState } from "react";
 import { cardStore, messageStore, CardType } from "@/stores";
 import "./index.scss";
-import { useSnapshot } from "valtio";
+import { useSnapshot, subscribe } from "valtio";
+import { subscribeKey } from "valtio/utils";
 import { watch } from "valtio/utils";
 import { useSpring, animated, to } from "@react-spring/web";
 import { ygopro } from "@/api";
@@ -31,57 +32,41 @@ export const Card: FC<{ idx: number }> = React.memo(({ idx }) => {
     height: 0,
   }));
 
-  const reload = (zone: ygopro.CardZone, report: boolean) => {
+  const reload = async (zone: ygopro.CardZone) => {
     switch (zone) {
       case MZONE:
       case SZONE:
       case OVERLAY:
-        moveToGround({ card: state, api, report });
+        await moveToGround({ card: state, api });
         break;
       case HAND:
-        moveToHand({ card: state, api, report });
+        await moveToHand({ card: state, api });
         break;
       case DECK:
       case EXTRA:
-        moveToDeck({ card: state, api, report });
+        await moveToDeck({ card: state, api });
         break;
       case GRAVE:
       case REMOVED:
-        moveToOutside({ card: state, api, report });
+        await moveToOutside({ card: state, api });
         break;
     }
   };
   useEffect(() => {
-    reload(state.zone, false);
+    reload(state.zone);
   }, []);
 
   const [highlight, setHighlight] = useState(false);
   const [shadowOpacity, setShadowOpacity] = useState(0);
 
-  watch((get) => {
-    const { zone, sequence, controller, xyzMonster, idleInteractivities } =
-      get(state);
-    reload(zone, true);
+  eventBus.on(ReportEnum.Move, (uuid) => {
+    if (uuid === state.uuid) reload(state.zone);
   });
 
   useEffect(() => {
     setHighlight(!!snap.idleInteractivities.length);
   }, [snap.idleInteractivities]);
 
-  // 在别的手卡更改时候，刷新这张手卡
-  eventBus.on(
-    ReportEnum.ReloadHand,
-    ({ sequence, controller }: { sequence: number; controller: number }) => {
-      if (
-        state.zone === HAND &&
-        state.sequence !== sequence &&
-        state.controller === controller
-      ) {
-        reload(state.zone, false);
-      }
-    }
-  );
-
   return (
     <animated.div
       className={classnames("mat-card", { highlight })}

src/ui/Duel/NewPlayMat/Card/springs/toDeck.ts

@@ -25,12 +25,8 @@ const {
 const { HAND, GRAVE, REMOVED, DECK, EXTRA, MZONE, SZONE, TZONE, OVERLAY } =
   ygopro.CardZone;
 
-export const moveToDeck = async (props: {
-  card: CardType;
-  api: SpringApi;
-  report: boolean;
-}) => {
-  const { card, api, report } = props;
+export const moveToDeck = async (props: { card: CardType; api: SpringApi }) => {
+  const { card, api } = props;
   // report
   const { zone, sequence, controller, xyzMonster, position } = card;
 

src/ui/Duel/NewPlayMat/Card/springs/toGround.ts

@@ -27,9 +27,8 @@ const { HAND, GRAVE, REMOVED, DECK, EXTRA, MZONE, SZONE, TZONE, OVERLAY } =
 export const moveToGround = async (props: {
   card: CardType;
   api: SpringApi;
-  report: boolean;
 }) => {
-  const { card, api, report } = props;
+  const { card, api } = props;
   // report
   const { zone, sequence, controller, xyzMonster, position, overlayMaterials } =
     card;

src/ui/Duel/NewPlayMat/Card/springs/toHand.ts

@@ -24,20 +24,9 @@ const {
 const { HAND, GRAVE, REMOVED, DECK, EXTRA, MZONE, SZONE, TZONE, OVERLAY } =
   ygopro.CardZone;
 
-export const moveToHand = async (props: {
-  card: CardType;
-  api: SpringApi;
-  report: boolean;
-}) => {
-  const { card, api, report } = props;
+export const moveToHand = async (props: { card: CardType; api: SpringApi }) => {
+  const { card, api } = props;
   const { zone, sequence, controller } = card;
-  // 得刷新除了这个卡以外所有的自己的手卡
-  if (report) {
-    eventBus.emit(ReportEnum.ReloadHand, {
-      controller,
-      sequence,
-    });
-  }
   // 手卡会有很复杂的计算...
   const hand_circle_center_x = 0;
   const hand_circle_center_y =

src/ui/Duel/NewPlayMat/Card/springs/toOutside.ts

@@ -27,9 +27,8 @@ const { HAND, GRAVE, REMOVED, DECK, EXTRA, MZONE, SZONE, TZONE, OVERLAY } =
 export const moveToOutside = async (props: {
   card: CardType;
   api: SpringApi;
-  report: boolean;
 }) => {
-  const { card, api, report } = props;
+  const { card, api } = props;
   // report
   const { zone, sequence, controller, xyzMonster, position, overlayMaterials } =
     card;
@@ -46,5 +45,6 @@ export const moveToOutside = async (props: {
     z: 0,
     height: BLOCK_HEIGHT_S.value,
     rz: isMe(controller) ? 0 : 180,
+    ry: [ygopro.CardPosition.FACEDOWN].includes(position) ? 180 : 0,
   });
 };

src/ui/Duel/NewPlayMat/Card/springs/types.ts

@@ -12,5 +12,5 @@ export type SpringApi = SpringRef<{
 }>;
 
 export enum ReportEnum {
-  ReloadHand = "reload-hand",
+  Move = "move",
 }