Commit 2c7f40eb authored by chechunchi's avatar chechunchi

fix FixedSlot.tsx

parent e6e7bab4
Pipeline #19533 failed with stages
in 2 minutes and 39 seconds
......@@ -7,12 +7,12 @@ import { useClick } from "./hook";
import { sendSelectPlaceResponse } from "../../api/ocgcore/ocgHelper";
import { ygopro } from "../../api/ocgcore/idl/ocgcore";
import {
clearMonsterPlaceInteractivities,
setCardModalImgUrl,
setCardModalInteractivies,
setCardModalIsOpen,
setCardModalText,
} from "../../reducers/duel/mod";
import { ActionCreatorWithPayload } from "@reduxjs/toolkit";
const shape = CONFIG.CardSlotShape();
......@@ -22,6 +22,7 @@ const FixedSlot = (props: {
position: BABYLON.Vector3;
rotation: BABYLON.Vector3;
deffenseRotation?: BABYLON.Vector3;
clearPlaceInteractivitiesAction: ActionCreatorWithPayload<number, string>;
}) => {
const planeRef = useRef(null);
......@@ -44,8 +45,8 @@ const FixedSlot = (props: {
(_event) => {
if (props.state.placeInteractivities) {
sendSelectPlaceResponse(props.state.placeInteractivities.response);
dispatch(clearMonsterPlaceInteractivities(0));
dispatch(clearMonsterPlaceInteractivities(1));
dispatch(props.clearPlaceInteractivitiesAction(0));
dispatch(props.clearPlaceInteractivitiesAction(1));
} else if (props.state.occupant) {
dispatch(
setCardModalText([
......
......@@ -5,6 +5,7 @@ import { CardState } from "../../reducers/duel/generic";
import { useAppSelector } from "../../hook";
import { zip } from "./util";
import FixedSlot from "./fixedSlot";
import { clearMagicPlaceInteractivities } from "../../reducers/duel/mod";
// TODO: use config
const left = -2.15;
......@@ -27,6 +28,7 @@ const Magics = () => {
sequence={sequence}
position={position}
rotation={CONFIG.CardSlotRotation(false)}
clearPlaceInteractivitiesAction={clearMagicPlaceInteractivities}
/>
);
})}
......@@ -38,6 +40,7 @@ const Magics = () => {
sequence={sequence}
position={position}
rotation={CONFIG.CardSlotRotation(true)}
clearPlaceInteractivitiesAction={clearMagicPlaceInteractivities}
/>
);
})}
......
......@@ -9,6 +9,7 @@ import {
} from "../../reducers/duel/monstersSlice";
import { zip } from "./util";
import FixedSlot from "./fixedSlot";
import { clearMonsterPlaceInteractivities } from "../../reducers/duel/mod";
const shape = CONFIG.CardSlotShape();
const left = -2.15; // TODO: config
......@@ -32,6 +33,7 @@ const Monsters = () => {
position={position}
rotation={CONFIG.CardSlotRotation(false)}
deffenseRotation={CONFIG.CardSlotDefenceRotation()}
clearPlaceInteractivitiesAction={clearMonsterPlaceInteractivities}
/>
);
}
......@@ -46,6 +48,7 @@ const Monsters = () => {
position={position}
rotation={CONFIG.CardSlotRotation(true)}
deffenseRotation={CONFIG.CardSlotDefenceRotation()}
clearPlaceInteractivitiesAction={clearMonsterPlaceInteractivities}
/>
);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment