Skip to content

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

fix monster.tsx and magic.tsx

parent 10a2248d
Pipeline #19762 passed with stages
        in 7 minutes
        Hide whitespace changes
        Inline Side-by-side
        Showing with 64 additions and 61 deletions
        src/reducers/duel/commonSlice.ts
        View file @ 4c983063
        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> = (
        ......
        src/reducers/duel/mod.ts
        View file @ 4c983063
        ...@@ -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;
        ......
        src/ui/Duel/magics.tsx
        View file @ 4c983063
        ...@@ -20,30 +20,34 @@ const Magics = () => { ...@@ -20,30 +20,34 @@ const Magics = () => {
        return ( return (
        <> <>
        {zip(meMagics, meMagicPositions).map(([magic, position], sequence) => { {zip(meMagics, meMagicPositions)
        return ( .slice(0, 5)
        <FixedSlot .map(([magic, position], sequence) => {
        state={magic} return (
        key={sequence} <FixedSlot
        sequence={sequence} state={magic}
        position={position} key={sequence}
        rotation={CONFIG.CardSlotRotation(false)} sequence={sequence}
        clearPlaceInteractivitiesAction={clearMagicPlaceInteractivities} position={position}
        /> rotation={CONFIG.CardSlotRotation(false)}
        ); clearPlaceInteractivitiesAction={clearMagicPlaceInteractivities}
        })} />
        {zip(opMagics, opMagicPositions).map(([magic, position], sequence) => { );
        return ( })}
        <FixedSlot {zip(opMagics, opMagicPositions)
        state={magic} .slice(0, 5)
        key={sequence} .map(([magic, position], sequence) => {
        sequence={sequence} return (
        position={position} <FixedSlot
        rotation={CONFIG.CardSlotRotation(true)} state={magic}
        clearPlaceInteractivitiesAction={clearMagicPlaceInteractivities} key={sequence}
        /> sequence={sequence}
        ); position={position}
        })} rotation={CONFIG.CardSlotRotation(true)}
        clearPlaceInteractivitiesAction={clearMagicPlaceInteractivities}
        />
        );
        })}
        </> </>
        ); );
        }; };
        ......
        src/ui/Duel/monsters.tsx
        View file @ 4c983063
        ...@@ -23,40 +23,32 @@ const Monsters = () => { ...@@ -23,40 +23,32 @@ 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}
        sequence={sequence} sequence={sequence}
        position={position} position={position}
        rotation={CONFIG.CardSlotRotation(false)} rotation={CONFIG.CardSlotRotation(false)}
        deffenseRotation={CONFIG.CardSlotDefenceRotation()} deffenseRotation={CONFIG.CardSlotDefenceRotation()}
        clearPlaceInteractivitiesAction={clearMonsterPlaceInteractivities} clearPlaceInteractivitiesAction={clearMonsterPlaceInteractivities}
        /> />
        ) : ( ))}
        <></> {zip(opMonsters, opMonsterPositions)
        ); .slice(0, 5)
        } .map(([monster, position], sequence) => (
        )} <FixedSlot
        {zip(opMonsters, opMonsterPositions).map( state={monster}
        ([monster, position], sequence) => { key={sequence}
        return sequence < 5 ? ( sequence={sequence}
        <FixedSlot position={position}
        state={monster} rotation={CONFIG.CardSlotRotation(true)}
        key={sequence} deffenseRotation={CONFIG.CardSlotDefenceRotation()}
        sequence={sequence} clearPlaceInteractivitiesAction={clearMonsterPlaceInteractivities}
        position={position} />
        rotation={CONFIG.CardSlotRotation(true)} ))}
        deffenseRotation={CONFIG.CardSlotDefenceRotation()}
        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