Skip to content

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

update duel/main.tsx

parent 6faa4ab4
Hide whitespace changes
Inline Side-by-side
Showing with 33 additions and 23 deletions
src/ui/Duel/main.tsx
View file @ 55e3775f
...@@ -19,6 +19,7 @@ import OptionModal from "./optionModal"; ...@@ -19,6 +19,7 @@ import OptionModal from "./optionModal";
import Phase from "./phase"; import Phase from "./phase";
import CheckCardModalV2 from "./checkCardModalV2"; import CheckCardModalV2 from "./checkCardModalV2";
import ExtraDeck from "./extraDeck"; import ExtraDeck from "./extraDeck";
import NeosLayout from "./layout";
import { initStrings } from "../../api/strings"; import { initStrings } from "../../api/strings";
import NeosConfig from "../../../neos.config.json"; import NeosConfig from "../../../neos.config.json";
...@@ -41,29 +42,12 @@ const NeosDuel = () => { ...@@ -41,29 +42,12 @@ const NeosDuel = () => {
return ( return (
<> <>
<ReactReduxContext.Consumer> <NeosLayout
{({ store }) => ( sider={<div>sider</div>}
<Engine antialias adaptToDeviceRatio canvasId="babylonJS"> header={<div>header</div>}
<Scene> content={<NeosCanvas />}
<Provider store={store}> footer={<div>footer</div>}
<Camera /> />
<Light />
<Hands />
<Monsters />
<Magics />
<Field />
<CommonDeck />
<ExtraDeck />
<Cemeteries />
<Exclusion />
<Field />
<Phase />
<Ground />
</Provider>
</Scene>
</Engine>
)}
</ReactReduxContext.Consumer>
<CardModal /> <CardModal />
<CardListModal /> <CardListModal />
<HintNotification /> <HintNotification />
...@@ -76,6 +60,32 @@ const NeosDuel = () => { ...@@ -76,6 +60,32 @@ const NeosDuel = () => {
); );
}; };
const NeosCanvas = () => (
<ReactReduxContext.Consumer>
{({ store }) => (
<Engine antialias adaptToDeviceRatio canvasId="babylonJS">
<Scene>
<Provider store={store}>
<Camera />
<Light />
<Hands />
<Monsters />
<Magics />
<Field />
<CommonDeck />
<ExtraDeck />
<Cemeteries />
<Exclusion />
<Field />
<Phase />
<Ground />
</Provider>
</Scene>
</Engine>
)}
</ReactReduxContext.Consumer>
);
const Camera = () => ( const Camera = () => (
<freeCamera <freeCamera
name="duel-camera" name="duel-camera"
......
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