Commit 0679fcf3 authored by Chunchi Che's avatar Chunchi Che

fix CardModal, EffectButton and Menu component

parent 0ce53436
...@@ -6,10 +6,7 @@ import { useSnapshot } from "valtio"; ...@@ -6,10 +6,7 @@ import { useSnapshot } from "valtio";
import { fetchStrings, sendSelectIdleCmdResponse } from "@/api"; import { fetchStrings, sendSelectIdleCmdResponse } from "@/api";
import { useConfig } from "@/config"; import { useConfig } from "@/config";
import { import { cardStore, messageStore } from "@/stores";
clearAllIdleInteractivities as clearAllIdleInteractivities,
messageStore,
} from "@/stores";
import { import {
Attribute2StringCodeMap, Attribute2StringCodeMap,
...@@ -77,8 +74,11 @@ export const CardModal = () => { ...@@ -77,8 +74,11 @@ export const CardModal = () => {
onClick={() => { onClick={() => {
sendSelectIdleCmdResponse(interactive.response); sendSelectIdleCmdResponse(interactive.response);
cardModal.isOpen = false; cardModal.isOpen = false;
clearAllIdleInteractivities(0);
clearAllIdleInteractivities(1); // 清空互动性
for (const card of cardStore.inner) {
card.idleInteractivities = [];
}
}} }}
> >
{interactive.desc} {interactive.desc}
......
...@@ -3,10 +3,7 @@ import "@/styles/card-modal.scss"; ...@@ -3,10 +3,7 @@ import "@/styles/card-modal.scss";
import React from "react"; import React from "react";
import { CardMeta, getCardStr, sendSelectIdleCmdResponse } from "@/api"; import { CardMeta, getCardStr, sendSelectIdleCmdResponse } from "@/api";
import { import { cardStore, messageStore } from "@/stores";
clearAllIdleInteractivities as clearAllIdleInteractivities,
messageStore,
} from "@/stores";
const { cardModal } = messageStore; const { cardModal } = messageStore;
export const EffectButton = (props: { export const EffectButton = (props: {
...@@ -26,8 +23,10 @@ export const EffectButton = (props: { ...@@ -26,8 +23,10 @@ export const EffectButton = (props: {
onClick={() => { onClick={() => {
sendSelectIdleCmdResponse(props.effectInteractivies[0].response); sendSelectIdleCmdResponse(props.effectInteractivies[0].response);
cardModal.isOpen = false; cardModal.isOpen = false;
clearAllIdleInteractivities(0); // 清空互动性
clearAllIdleInteractivities(1); for (const card of cardStore.inner) {
card.idleInteractivities = [];
}
}} }}
> >
{props.effectInteractivies[0].desc} {props.effectInteractivies[0].desc}
...@@ -48,8 +47,10 @@ export const EffectButton = (props: { ...@@ -48,8 +47,10 @@ export const EffectButton = (props: {
}); });
} }
cardModal.isOpen = false; cardModal.isOpen = false;
clearAllIdleInteractivities(0); // 清空互动性
clearAllIdleInteractivities(1); for (const card of cardStore.inner) {
card.idleInteractivities = [];
}
messageStore.optionModal.isOpen = true; messageStore.optionModal.isOpen = true;
}} }}
> >
......
...@@ -11,10 +11,7 @@ import { ...@@ -11,10 +11,7 @@ import {
sendSurrender, sendSurrender,
ygopro, ygopro,
} from "@/api"; } from "@/api";
import { import { cardStore, matStore } from "@/stores";
clearAllIdleInteractivities as clearAllIdleInteractivities,
matStore,
} from "@/stores";
import PhaseType = ygopro.StocGameMessage.MsgNewPhase.PhaseType; import PhaseType = ygopro.StocGameMessage.MsgNewPhase.PhaseType;
const { phase } = matStore; const { phase } = matStore;
...@@ -37,22 +34,25 @@ export const Menu = () => { ...@@ -37,22 +34,25 @@ export const Menu = () => {
? 3 ? 3
: 7; : 7;
const clearAllIdleInteractivities = () => {
for (const card of cardStore.inner) {
card.idleInteractivities = [];
}
};
const onBp = () => { const onBp = () => {
sendSelectIdleCmdResponse(6); sendSelectIdleCmdResponse(6);
clearAllIdleInteractivities(0); clearAllIdleInteractivities();
clearAllIdleInteractivities(1);
phase.enableBp = false; phase.enableBp = false;
}; };
const onM2 = () => { const onM2 = () => {
sendSelectBattleCmdResponse(2); sendSelectBattleCmdResponse(2);
clearAllIdleInteractivities(0); clearAllIdleInteractivities();
clearAllIdleInteractivities(1);
phase.enableM2 = false; phase.enableM2 = false;
}; };
const onEp = () => { const onEp = () => {
sendSelectIdleCmdResponse(response); sendSelectIdleCmdResponse(response);
clearAllIdleInteractivities(0); clearAllIdleInteractivities();
clearAllIdleInteractivities(1);
phase.enableEp = false; phase.enableEp = false;
}; };
const onSurrender = () => { const onSurrender = () => {
......
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