Merge branch 'fix/move' into 'main'

fix small

See merge request !199

src/infra/stream.ts

-import handleSocketMessage from "@/service/onSocketMessage";
-
 import { sleep } from "./sleep";
 
 const SLEEP_INTERVAL = 200;

src/service/duel/draw.ts

 import { ygopro } from "@/api";
+import { sleep } from "@/infra";
 import { fetchEsHintMeta, matStore } from "@/stores";
 import { zip } from "@/ui/Duel/utils";
 
-export default (draw: ygopro.StocGameMessage.MsgDraw) => {
+export default async (draw: ygopro.StocGameMessage.MsgDraw) => {
   fetchEsHintMeta({ originMsg: "玩家抽卡时" });
 
   const deckLength = matStore.decks.of(draw.player).length;
@@ -19,9 +20,9 @@ export default (draw: ygopro.StocGameMessage.MsgDraw) => {
     .of(draw.player)
     .add(data, ygopro.CardPosition.FACEUP_ATTACK, true);
 
-  setTimeout(() => {
-    for (const hand of matStore.hands.of(draw.player)) {
-      hand.focus = false;
-    }
-  }, 500);
+  await sleep(500);
+
+  for (const hand of matStore.hands.of(draw.player)) {
+    hand.focus = false;
+  }
 };

src/service/duel/gameMsg.ts

@@ -70,7 +70,7 @@ export default async function handleGameMsg(pb: ygopro.YgoStocMsg) {
       break;
     }
     case "draw": {
-      onMsgDraw(msg.draw);
+      await onMsgDraw(msg.draw);
 
       break;
     }

src/service/duel/move.ts

@@ -110,10 +110,7 @@ export default async (move: MsgMove) => {
           );
 
         await sleep(NeosConfig.ui.moveDelay);
-        // 因为手牌可能会洗牌，sequence就对不上了，所以这里把所有手牌的focus字段都设置成false
-        for (const hand of matStore.in(to.location).of(to.controler)) {
-          hand.focus = false;
-        }
+        matStore.in(to.location).of(to.controler)[to.sequence].focus = false;
       }
       break;
     }