Skip to content

N
Neos
Commit a7340d82 authored by Chunchi Che's avatar Chunchi Che
Browse files
Options

Merge branch 'fix/reset' into 'main' 

修复无法结束回合的问题。

See merge request !364
parents c2dd78e6 80d2c890
Pipeline #26665 passed with stages
              in 9 minutes and 39 seconds
              Show whitespace changes
              Inline Side-by-side
              Showing with 5 additions and 3 deletions
              src/ui/Duel/PlayMat/Menu/index.tsx
              View file @ a7340d82
              ...@@ -33,7 +33,6 @@ import styles from "./index.module.scss"; ...@@ -33,7 +33,6 @@ import styles from "./index.module.scss";
              import PhaseType = ygopro.StocGameMessage.MsgNewPhase.PhaseType; import PhaseType = ygopro.StocGameMessage.MsgNewPhase.PhaseType;
              import { openChatBox } from "../ChatBox"; import { openChatBox } from "../ChatBox";
              const { phase: store } = matStore;
              const { useToken } = theme; const { useToken } = theme;
              const clearAllIdleInteractivities = () => { const clearAllIdleInteractivities = () => {
              for (const card of cardStore.inner) { for (const card of cardStore.inner) {
              ...@@ -63,8 +62,11 @@ const initialPhaseBind: [ ...@@ -63,8 +62,11 @@ const initialPhaseBind: [
              ]; ];
              export const Menu = () => { export const Menu = () => {
              const { enableBp, enableM2, enableEp, currentPhase } = useSnapshot(store); const {
              const { currentPlayer, chainSetting } = useSnapshot(matStore); currentPlayer,
              chainSetting,
              phase: { enableBp, enableM2, enableEp, currentPhase },
              } = useSnapshot(matStore);
              const [phaseBind, setPhaseBind] = useState(initialPhaseBind); const [phaseBind, setPhaseBind] = useState(initialPhaseBind);
              const [phaseSwitchItems, setPhaseSwitchItems] = useState<MenuProps["items"]>( const [phaseSwitchItems, setPhaseSwitchItems] = useState<MenuProps["items"]>(
              [], [],
              ......
              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