Merge branch 'fix/idle_cmd' into 'main'

Fix/idle cmd

See merge request mycard/Neos!34

src/reducers/duel/handsSlice.ts

@@ -38,12 +38,17 @@ export const fetchHandsMeta = createAsyncThunk(
 );
 
 export const handsCase = (builder: ActionReducerMapBuilder<DuelState>) => {
-  builder.addCase(fetchHandsMeta.fulfilled, (state, action) => {
-    const player = action.payload[0];
-    const hands = action.payload[1];
-
-    const cards = hands.map((meta) => {
-      return { meta, transform: {}, interactivities: [] };
+  builder.addCase(fetchHandsMeta.pending, (state, action) => {
+    // Meta结果没返回之前先更新手牌`ID`
+    const player = action.meta.arg[0];
+    const ids = action.meta.arg[1];
+
+    const cards = ids.map((id) => {
+      return {
+        meta: { id, data: {}, text: {} },
+        transform: {},
+        interactivities: [],
+      };
     });
     if (judgeSelf(player, state)) {
       if (state.meHands) {
@@ -60,6 +65,22 @@ export const handsCase = (builder: ActionReducerMapBuilder<DuelState>) => {
       }
     }
   });
+  builder.addCase(fetchHandsMeta.fulfilled, (state, action) => {
+    // `Meta`结果回来后更新手牌的`Meta`结果
+    const player = action.payload[0];
+    const metas = action.payload[1];
+
+    const hands = judgeSelf(player, state) ? state.meHands : state.opHands;
+    if (hands) {
+      for (let hand of hands.cards) {
+        for (let meta of metas) {
+          if (hand.meta.id === meta.id) {
+            hand.meta = meta;
+          }
+        }
+      }
+    }
+  });
 };
 
 // 更新手牌的位置和旋转信息

src/reducers/duel/util.ts

@@ -48,17 +48,17 @@ interface CardTransform {
 
 export enum InteractType {
   // 可普通召唤
-  SUMMON,
+  SUMMON = 1,
   // 可特殊召唤
-  SP_SUMMON,
+  SP_SUMMON = 2,
   // 可改变表示形式
-  POS_CHANGE,
+  POS_CHANGE = 3,
   // 可前场放置
-  MSET,
+  MSET = 4,
   // 可后场放置
-  SSET,
+  SSET = 5,
   // 可发动效果
-  ACTIVATE,
+  ACTIVATE = 6,
 }
 
 export interface Interactivity {