add isAllOnField

src/service/duel/selectUnselectCard.ts

@@ -3,6 +3,7 @@ import { cardStore, matStore } from "@/stores";
 import { displaySelectActionsModal } from "@/ui/Duel/Message/SelectActionsModal";
 
 import { fetchCheckCardMeta } from "../utils";
+import { isAllOnField } from "./util";
 type MsgSelectUnselectCard = ygopro.StocGameMessage.MsgSelectUnselectCard;
 const { MZONE, SZONE, HAND } = ygopro.CardZone;
 
@@ -15,9 +16,9 @@ export default async ({
   selected_cards: selectedCards,
 }: MsgSelectUnselectCard) => {
   if (
-    selectableCards
-      .concat(selectedCards)
-      .find((info) => !isOnField(info.location)) === undefined
+    isAllOnField(
+      selectableCards.concat(selectedCards).map((info) => info.location),
+    )
   ) {
     // 所有可选卡和已选卡都是在场上或手牌
     // 通过让玩家点击场上的卡来进行选择
@@ -65,7 +66,3 @@ export default async ({
     });
   }
 };
-
-function isOnField(location: ygopro.CardLocation): boolean {
-  return [MZONE, SZONE, HAND].includes(location.zone);
-}

src/service/duel/util.ts

+import { ygopro } from "@/api";
+const { MZONE, SZONE, HAND } = ygopro.CardZone;
+
+export function isAllOnField(locations: ygopro.CardLocation[]): boolean {
+  const isOnField = (location: ygopro.CardLocation) => {
+    return [MZONE, SZONE, HAND].includes(location.zone);
+  };
+
+  return locations.find((location) => !isOnField(location)) === undefined;
+}