From f5a90a314b3575d84806b0ee0504f45c8641eadd Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 06 三月 2024 13:33:38 +0800
Subject: [PATCH] #
---
zy-asrs-flow/src/pages/map/player.js | 1
zy-asrs-flow/src/pages/map/components/settings.jsx | 45 ++++++++++++++++++++++
zy-asrs-flow/src/pages/map/index.jsx | 23 +++++++++--
zy-asrs-flow/src/pages/map/utils.js | 4 +
4 files changed, 67 insertions(+), 6 deletions(-)
diff --git a/zy-asrs-flow/src/pages/map/components/settings.jsx b/zy-asrs-flow/src/pages/map/components/settings.jsx
index e69de29..a3b122e 100644
--- a/zy-asrs-flow/src/pages/map/components/settings.jsx
+++ b/zy-asrs-flow/src/pages/map/components/settings.jsx
@@ -0,0 +1,45 @@
+import React, { useState, useRef, useEffect } from 'react';
+import { Col, Form, Modal, Row, Checkbox, Image, Tree, Drawer, Space, Button, Card, Divider } from 'antd';
+import { FormattedMessage, useIntl, useModel } from '@umijs/max';
+import * as PIXI from 'pixi.js';
+import { createStyles } from 'antd-style';
+import './index.css'
+
+const useStyles = createStyles(({ token, css }) => {
+
+})
+
+const SpriteSettings = (props) => {
+ const { styles } = useStyles();
+
+ useEffect(() => {
+
+ }, []);
+
+
+ return (
+ <>
+ <Drawer
+ open={props.open}
+ onClose={() => {
+ props.onCancel();
+ }}
+ getContainer={props.refCurr}
+ rootStyle={{ position: "absolute" }}
+ mask={false}
+ width={378}
+ extra={
+ <Space>
+ <Button onClick={() => props.onCancel()}><FormattedMessage id='common.cancel' defaultMessage='鍙栨秷' /></Button>
+ </Space>
+ }
+ >
+ <Card>
+
+ </Card>
+ </Drawer>
+ </>
+ )
+}
+
+export default SpriteSettings;
\ No newline at end of file
diff --git a/zy-asrs-flow/src/pages/map/index.jsx b/zy-asrs-flow/src/pages/map/index.jsx
index 4e502de..275a47f 100644
--- a/zy-asrs-flow/src/pages/map/index.jsx
+++ b/zy-asrs-flow/src/pages/map/index.jsx
@@ -11,7 +11,8 @@
} from '@ant-design/icons';
import './index.css'
import { createStyles } from 'antd-style';
-import Edit from './components/device'
+import Edit from './components/device';
+import Settings from './components/settings'
import * as Utils from './utils'
import Player from './player';
@@ -49,6 +50,7 @@
const contentRef = React.useRef();
const [deviceVisible, setDeviceVisible] = React.useState(false);
+ const [settingsVisible, setSettingsVisible] = React.useState(false);
const [windowSize, setWindowSize] = React.useState({
width: window.innerWidth,
height: window.innerHeight,
@@ -119,11 +121,11 @@
player.activateMapEvent(null);
mapContainer.children.forEach(child => {
- Utils.beSettings(child, setDidClickSprite);
+ Utils.beSettings(child, setSettingsVisible, setDidClickSprite);
})
} else {
player.hideStarryBackground();
-
+
player.activateMapEvent(Utils.MapEvent.SELECTION_BOX);
mapContainer.children.forEach(child => {
Utils.beMovable(child, setDidClickSprite);
@@ -141,6 +143,10 @@
mapContainer.addChild(sprite);
Utils.beMovable(sprite, setDidClickSprite);
};
+
+ const settingsFinish = () => {
+
+ }
// didClickSprite, stop triggers both sprite click and play's selection boxs
React.useEffect(() => {
@@ -198,7 +204,7 @@
}}
/>
<FloatButton
- type={deviceSettingModel?'primary':'default'}
+ type={deviceSettingModel ? 'primary' : 'default'}
tooltip={<div><FormattedMessage id='map.device.oper' defaultMessage='鍙傛暟璁剧疆' /></div>}
icon={<SettingOutlined />}
onClick={() => {
@@ -217,6 +223,15 @@
refCurr={mapRef.current}
onDrop={onDrop}
/>
+
+ <Settings
+ open={settingsVisible}
+ onCancel={() => {
+ setSettingsVisible(false);
+ }}
+ refCurr={mapRef.current}
+ onDrop={settingsFinish}
+ />
</>
)
}
diff --git a/zy-asrs-flow/src/pages/map/player.js b/zy-asrs-flow/src/pages/map/player.js
index 995da29..35edc66 100644
--- a/zy-asrs-flow/src/pages/map/player.js
+++ b/zy-asrs-flow/src/pages/map/player.js
@@ -260,7 +260,6 @@
this.starryTicker = (delta) => {
- console.log(1);
speed += (warpSpeed - speed) / 20;
cameraZ += delta * 10 * (speed + baseSpeed);
for (let i = 0; i < starAmount; i++) {
diff --git a/zy-asrs-flow/src/pages/map/utils.js b/zy-asrs-flow/src/pages/map/utils.js
index f55ad8b..9abcd8a 100644
--- a/zy-asrs-flow/src/pages/map/utils.js
+++ b/zy-asrs-flow/src/pages/map/utils.js
@@ -68,7 +68,7 @@
}
// sprite be beSettings from sprite click event
-export const beSettings = (sprite, setDidClickSprite) => {
+export const beSettings = (sprite, setSettingsVisible, setDidClickSprite) => {
sprite.off('pointerup');
sprite.off('pointermove');
sprite.off('pointerdown');
@@ -77,6 +77,8 @@
sprite.on("click", onClick);
function onClick(event) {
+ console.log(1);
+ setSettingsVisible(true);
// setDidClickSprite(true);
}
}
--
Gitblit v1.9.1