update select battle cmd service

src/reducers/duel/generic.ts

@@ -38,12 +38,16 @@ export enum InteractType {
   ACTIVATE = 6,
   // 可作为位置选择
   PLACE_SELECTABLE = 7,
+  // 可攻击
+  ATTACK = 8,
 }
 
 export interface Interactivity<T> {
   interactType: InteractType;
   // 如果`interactType`是`ACTIVATE`，这个字段是对应的效果编号
   activateIndex?: number;
+  // 如果`interactType`是`ATTACK`，这个字段表示是否可以直接攻击
+  directAttackAble?: boolean;
   // 用户点击后，需要回传给服务端的`response`
   response: T;
 }

src/reducers/duel/mod.ts

@@ -18,6 +18,7 @@ import {
   newPhaseImpl,
   PhaseState,
   setEnableBpImpl,
+  setEnableM2Impl,
   setEnableEpImpl,
 } from "./phaseSlice";
 import { RootState } from "../../store";
@@ -184,6 +185,7 @@ const duelSlice = createSlice({
     // 阶段相关
     updatePhase: newPhaseImpl,
     setEnableBp: setEnableBpImpl,
+    setEnableM2: setEnableM2Impl,
     setEnableEp: setEnableEpImpl,
 
     // UI相关`Reducer`
@@ -225,6 +227,7 @@ export const {
   updateTurn,
   updatePhase,
   setEnableBp,
+  setEnableM2,
   setEnableEp,
   clearHandsIdleInteractivity,
   addHandsIdleInteractivity,

src/reducers/duel/phaseSlice.ts

@@ -5,6 +5,7 @@ import { DuelState } from "./mod";
 export interface PhaseState {
   currentPhase: string; // 当前的阶段
   enableBp: boolean; // 允许进入战斗阶段
+  enableM2: boolean; // 允许进入M2阶段
   enableEp: boolean; // 允许回合结束
 }
 export const newPhaseImpl: CaseReducer<DuelState, PayloadAction<string>> = (
@@ -17,6 +18,7 @@ export const newPhaseImpl: CaseReducer<DuelState, PayloadAction<string>> = (
     state.phase = {
       currentPhase: action.payload,
       enableBp: false,
+      enableM2: false,
       enableEp: false,
     };
   }
@@ -31,6 +33,15 @@ export const setEnableBpImpl: CaseReducer<DuelState, PayloadAction<boolean>> = (
   }
 };
 
+export const setEnableM2Impl: CaseReducer<DuelState, PayloadAction<boolean>> = (
+  state,
+  action
+) => {
+  if (state.phase) {
+    state.phase.enableM2 = action.payload;
+  }
+};
+
 export const setEnableEpImpl: CaseReducer<DuelState, PayloadAction<boolean>> = (
   state,
   action

src/service/duel/selectBattleCmd.ts

+import { ActionCreatorWithPayload } from "@reduxjs/toolkit";
 import { ygopro } from "../../api/ocgcore/idl/ocgcore";
+import { Interactivity, InteractType } from "../../reducers/duel/generic";
+import {
+  addFieldIdleInteractivities,
+  addHandsIdleInteractivity,
+  addMagicIdleInteractivities,
+  addMonsterIdleInteractivities,
+  clearFieldIdleInteractivities,
+  clearHandsIdleInteractivity,
+  clearMagicIdleInteractivities,
+  clearMonsterIdleInteractivities,
+  setEnableEp,
+  setEnableM2,
+} from "../../reducers/duel/mod";
 import { AppDispatch } from "../../store";
 import MsgSelectBattleCmd = ygopro.StocGameMessage.MsgSelectBattleCmd;
 
 export default (selectBattleCmd: MsgSelectBattleCmd, dispatch: AppDispatch) => {
-  console.log(selectBattleCmd);
+  const player = selectBattleCmd.player;
+  const cmds = selectBattleCmd.battle_cmds;
+
+  // 先清掉之前的互动性
+  dispatch(clearHandsIdleInteractivity(player));
+  dispatch(clearMonsterIdleInteractivities(player));
+  dispatch(clearMagicIdleInteractivities(player));
+  dispatch(clearFieldIdleInteractivities(player));
+
+  const dispatcher = (
+    battleData: MsgSelectBattleCmd.BattleCmd.BattleData,
+    interactType: InteractType | undefined,
+    actionCreator: ActionCreatorWithPayload<
+      {
+        player: number;
+        sequence: number;
+        interactivity: Interactivity<number>;
+      },
+      string
+    >
+  ) => {
+    const cardInfo = battleData.card_info;
+    if (interactType === InteractType.ACTIVATE) {
+      dispatch(
+        actionCreator({
+          player,
+          sequence: cardInfo.sequence,
+          interactivity: {
+            interactType,
+            activateIndex: battleData.effect_description,
+            response: battleData.response,
+          },
+        })
+      );
+    } else if (interactType === InteractType.ATTACK) {
+      dispatch(
+        actionCreator({
+          player,
+          sequence: cardInfo.sequence,
+          interactivity: {
+            interactType,
+            directAttackAble: battleData.direct_attackable,
+            response: battleData.response,
+          },
+        })
+      );
+    } else {
+      console.log(`Unhandled InteractType`);
+    }
+  };
+
+  cmds.forEach((cmd) => {
+    const interactType = battleTypeToInteracType(cmd.battle_type);
+
+    cmd.battle_datas.forEach((data) => {
+      const cardInfo = data.card_info;
+      switch (cardInfo.location) {
+        case ygopro.CardZone.HAND: {
+          dispatcher(data, interactType, addHandsIdleInteractivity);
+
+          break;
+        }
+        case ygopro.CardZone.MZONE: {
+          dispatcher(data, interactType, addMonsterIdleInteractivities);
+
+          break;
+        }
+        case ygopro.CardZone.SZONE: {
+          dispatcher(data, interactType, addMagicIdleInteractivities);
+
+          break;
+        }
+        case ygopro.CardZone.ONFIELD: {
+          dispatcher(data, interactType, addFieldIdleInteractivities);
+
+          break;
+        }
+        default: {
+        }
+      }
+    });
+  });
+
+  dispatch(setEnableM2(selectBattleCmd.enable_m2));
+  dispatch(setEnableEp(selectBattleCmd.enable_ep));
 };
+
+function battleTypeToInteracType(
+  battleType: MsgSelectBattleCmd.BattleCmd.BattleType
+): InteractType | undefined {
+  switch (battleType) {
+    case MsgSelectBattleCmd.BattleCmd.BattleType.ATTACK: {
+      return InteractType.ATTACK;
+    }
+    case MsgSelectBattleCmd.BattleCmd.BattleType.ACTIVATE: {
+      return InteractType.ACTIVATE;
+    }
+    default: {
+      return undefined;
+    }
+  }
+}