Commit 4c983063 authored by Chunchi Che's avatar Chunchi Che

fix monster.tsx and magic.tsx

parent 10a2248d
Pipeline #19762 passed with stages
in 7 minutes
import { clearIdleInteractivities, clearPlaceInteractivities, DuelReducer } from "./generic"; import {
clearIdleInteractivities,
clearPlaceInteractivities,
DuelReducer,
} from "./generic";
import { judgeSelf } from "./util"; import { judgeSelf } from "./util";
export const clearAllIdleInteractivitiesImpl: DuelReducer<number> = ( export const clearAllIdleInteractivitiesImpl: DuelReducer<number> = (
......
...@@ -90,7 +90,10 @@ import { ...@@ -90,7 +90,10 @@ import {
exclusionCase, exclusionCase,
} from "./exclusionSlice"; } from "./exclusionSlice";
import { DeckState, initDeckImpl } from "./deckSlice"; import { DeckState, initDeckImpl } from "./deckSlice";
import { clearAllIdleInteractivitiesImpl, clearAllPlaceInteractivitiesImpl } from "./commonSlice"; import {
clearAllIdleInteractivitiesImpl,
clearAllPlaceInteractivitiesImpl,
} from "./commonSlice";
export interface DuelState { export interface DuelState {
selfType?: number; selfType?: number;
...@@ -301,7 +304,7 @@ export const { ...@@ -301,7 +304,7 @@ export const {
resetCheckCardModalV2, resetCheckCardModalV2,
setCheckCardModalV2ResponseAble, setCheckCardModalV2ResponseAble,
clearAllIdleInteractivities, clearAllIdleInteractivities,
clearAllPlaceInteractivities clearAllPlaceInteractivities,
} = duelSlice.actions; } = duelSlice.actions;
export const selectDuelHsStart = (state: RootState) => { export const selectDuelHsStart = (state: RootState) => {
return state.duel.meInitInfo != null; return state.duel.meInitInfo != null;
......
...@@ -20,7 +20,9 @@ const Magics = () => { ...@@ -20,7 +20,9 @@ const Magics = () => {
return ( return (
<> <>
{zip(meMagics, meMagicPositions).map(([magic, position], sequence) => { {zip(meMagics, meMagicPositions)
.slice(0, 5)
.map(([magic, position], sequence) => {
return ( return (
<FixedSlot <FixedSlot
state={magic} state={magic}
...@@ -32,7 +34,9 @@ const Magics = () => { ...@@ -32,7 +34,9 @@ const Magics = () => {
/> />
); );
})} })}
{zip(opMagics, opMagicPositions).map(([magic, position], sequence) => { {zip(opMagics, opMagicPositions)
.slice(0, 5)
.map(([magic, position], sequence) => {
return ( return (
<FixedSlot <FixedSlot
state={magic} state={magic}
......
...@@ -23,9 +23,9 @@ const Monsters = () => { ...@@ -23,9 +23,9 @@ const Monsters = () => {
return ( return (
<> <>
{zip(meMonsters, meMonsterPositions).map( {zip(meMonsters, meMonsterPositions)
([monster, position], sequence) => { .slice(0, 5)
return sequence < 5 ? ( .map(([monster, position], sequence) => (
<FixedSlot <FixedSlot
state={monster} state={monster}
key={sequence} key={sequence}
...@@ -35,14 +35,10 @@ const Monsters = () => { ...@@ -35,14 +35,10 @@ const Monsters = () => {
deffenseRotation={CONFIG.CardSlotDefenceRotation()} deffenseRotation={CONFIG.CardSlotDefenceRotation()}
clearPlaceInteractivitiesAction={clearMonsterPlaceInteractivities} clearPlaceInteractivitiesAction={clearMonsterPlaceInteractivities}
/> />
) : ( ))}
<></> {zip(opMonsters, opMonsterPositions)
); .slice(0, 5)
} .map(([monster, position], sequence) => (
)}
{zip(opMonsters, opMonsterPositions).map(
([monster, position], sequence) => {
return sequence < 5 ? (
<FixedSlot <FixedSlot
state={monster} state={monster}
key={sequence} key={sequence}
...@@ -52,11 +48,7 @@ const Monsters = () => { ...@@ -52,11 +48,7 @@ const Monsters = () => {
deffenseRotation={CONFIG.CardSlotDefenceRotation()} deffenseRotation={CONFIG.CardSlotDefenceRotation()}
clearPlaceInteractivitiesAction={clearMonsterPlaceInteractivities} clearPlaceInteractivitiesAction={clearMonsterPlaceInteractivities}
/> />
) : ( ))}
<></>
);
}
)}
<ExtraMonsters meMonsters={meMonsters} opMonsters={opMonsters} /> <ExtraMonsters meMonsters={meMonsters} opMonsters={opMonsters} />
</> </>
); );
......
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