rerange Card

src/api/cards.ts

@@ -19,27 +19,6 @@ export interface CardMeta {
   };
 }
 
-interface CardTransform {
-  position?: {
-    x: number;
-    y: number;
-    z: number;
-  };
-  rotation?: {
-    x: number;
-    y: number;
-    z: number;
-  };
-}
-
-/*
- * `Neos`中表示卡牌的通用结构
- * */
-export interface Card {
-  meta: CardMeta;
-  transform: CardTransform;
-}
-
 /*
  * 返回卡片元数据
  *

src/reducers/duel/handsSlice.ts

 import { createAsyncThunk, ActionReducerMapBuilder } from "@reduxjs/toolkit";
 import { DuelState } from "./mod";
 import { RootState } from "../../store";
-import { Card, fetchCard, CardMeta } from "../../api/cards";
+import { fetchCard, CardMeta } from "../../api/cards";
 import { judgeSelf } from "./util";
 import * as UICONFIG from "../../config/ui";
+import { Card } from "./util";
 
 export interface Hands {
   cards: Card[];

src/reducers/duel/util.ts

 /*
- * 对局内状态更新逻辑的一些共用函数
+ * 对局内状态更新逻辑的一些共用函数和数据结构
  *
  * */
 
+import { CardMeta } from "../../api/cards";
+
 /*
  * 通过`player`和`selfType`判断是应该处理自己还是对手
  * */
@@ -21,3 +23,24 @@ export function judgeSelf(
     return false;
   }
 }
+
+/*
+ * `Neos`中表示卡牌的通用结构
+ * */
+export interface Card {
+  meta: CardMeta;
+  transform: CardTransform;
+}
+
+interface CardTransform {
+  position?: {
+    x: number;
+    y: number;
+    z: number;
+  };
+  rotation?: {
+    x: number;
+    y: number;
+    z: number;
+  };
+}

src/ui/Duel/duel.ts

@@ -16,7 +16,7 @@
 
 import React from "react";
 import type { RootState } from "../../store";
-import { Card } from "../../api/cards";
+import { Card } from "../../reducers/duel/util";
 
 /*
  * 通用的决斗界面抽象接口

src/ui/Duel/simpleDuel/hands.ts

 import * as BABYLON from "@babylonjs/core";
 import * as CONFIG from "../../../config/ui";
-import { Card } from "../../../api/cards";
+import { Card } from "../../../reducers/duel/util";
 
 export default (hands: Card[], scene: BABYLON.Scene) => {
   const handShape = CONFIG.HandShape();

src/ui/Duel/simpleDuel/mod.tsx

@@ -17,7 +17,7 @@ import renderCemetery from "./cemetery";
 import renderExclusion from "./exclusion";
 import renderField from "./field";
 import * as CONFIG from "../../../config/ui";
-import { Card } from "../../../api/cards";
+import { Card } from "../../../reducers/duel/util";
 import { selectCurrentPlayer } from "../../../reducers/duel/turnSlice";
 import { selectCurrentPhase } from "../../../reducers/duel/phaseSlice";