update ui

src/reducers/duel/phaseSlice.ts

@@ -55,5 +55,7 @@ export const selectCurrentPhase = (state: RootState) =>
   state.duel.phase?.currentPhase;
 export const selectEnableBp = (state: RootState) =>
   state.duel.phase?.enableBp || false;
+export const selectEnableM2 = (state: RootState) =>
+  state.duel.phase?.enableBp || false;
 export const selectEnableEp = (state: RootState) =>
   state.duel.phase?.enableEp || false;

src/ui/Duel/monsters.tsx

@@ -54,19 +54,6 @@ const Monsters = () => {
         }
       )}
       <ExtraMonsters />
-      <adtFullscreenUi name="ui">
-        <rectangle name="rect" height="20px" width="60px">
-          <babylon-button name="close-icon">
-            <textBlock
-              text="bp"
-              fontFamily="FontAwesome"
-              fontStyle="bold"
-              fontSize={15}
-              color="white"
-            />
-          </babylon-button>
-        </rectangle>
-      </adtFullscreenUi>
       <ExtraMonsters />
     </>
   );

src/ui/Duel/phase.tsx

 import React from "react";
 import { store } from "../../store";
 import { useAppSelector } from "../../hook";
-import { selectEnableBp, selectEnableEp } from "../../reducers/duel/phaseSlice";
-import { sendSelectIdleCmdResponse } from "../../api/ocgcore/ocgHelper";
+import {
+  selectCurrentPhase,
+  selectEnableBp,
+  selectEnableEp,
+  selectEnableM2,
+} from "../../reducers/duel/phaseSlice";
+import {
+  sendSelectBattleCmdResponse,
+  sendSelectIdleCmdResponse,
+} from "../../api/ocgcore/ocgHelper";
 import {
   clearFieldIdleInteractivities,
   clearHandsIdleInteractivity,
@@ -10,6 +18,7 @@ import {
   clearMonsterIdleInteractivities,
   setEnableBp,
   setEnableEp,
+  setEnableM2,
 } from "../../reducers/duel/mod";
 import { Button2D } from "./2d";
 
@@ -31,13 +40,45 @@ const Bp = () => {
     dispatch(setEnableBp(false));
   };
 
-  return <Button2D text="bp" left={0} enable={enable} onClick={onClick} />;
+  return <Button2D text="bp" left={-200} enable={enable} onClick={onClick} />;
+};
+
+const M2 = () => {
+  const dispatch = store.dispatch;
+  const enable = useAppSelector(selectEnableM2);
+  const onClick = () => {
+    // 清除一堆东西的互动性
+    dispatch(clearHandsIdleInteractivity(0));
+    dispatch(clearHandsIdleInteractivity(1));
+    dispatch(clearMonsterIdleInteractivities(0));
+    dispatch(clearMonsterIdleInteractivities(1));
+    dispatch(clearMagicIdleInteractivities(0));
+    dispatch(clearMagicIdleInteractivities(1));
+    dispatch(clearFieldIdleInteractivities(0));
+    dispatch(clearFieldIdleInteractivities(1));
+
+    sendSelectBattleCmdResponse(2);
+    dispatch(setEnableM2(false));
+  };
+
+  return <Button2D text="m2" left={0} enable={enable} onClick={onClick} />;
 };
 
 const Ep = () => {
   const dispatch = store.dispatch;
   const enable = useAppSelector(selectEnableEp);
-  const onClick = () => {
+  const currentPhase = useAppSelector(selectCurrentPhase);
+
+  const response =
+    currentPhase === "BATTLE_START" ||
+    currentPhase === "BATTLE_STEP" ||
+    currentPhase === "DAMAGE" ||
+    currentPhase === "DAMAGE_GAL" ||
+    currentPhase === "BATTLE"
+      ? 3
+      : 7;
+
+  const onClick = (response: number) => () => {
     // 清除一堆东西的互动性
     dispatch(clearHandsIdleInteractivity(0));
     dispatch(clearHandsIdleInteractivity(1));
@@ -48,16 +89,24 @@ const Ep = () => {
     dispatch(clearFieldIdleInteractivities(0));
     dispatch(clearFieldIdleInteractivities(1));
 
-    sendSelectIdleCmdResponse(7);
+    sendSelectIdleCmdResponse(response);
     dispatch(setEnableEp(false));
   };
 
-  return <Button2D text="ep" left={200} enable={enable} onClick={onClick} />;
+  return (
+    <Button2D
+      text="ep"
+      left={200}
+      enable={enable}
+      onClick={onClick(response)}
+    />
+  );
 };
 
 const Phase = () => (
   <>
     <Bp />
+    <M2 />
     <Ep />
   </>
 );