From ba40737d35c0cfabef319a1e0c93ed0be3f9bada Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 22 三月 2024 09:43:16 +0800
Subject: [PATCH] #
---
zy-asrs-flow/src/pages/map/player.js | 9 ++-------
zy-asrs-flow/src/pages/map/components/settings.jsx | 2 --
zy-asrs-flow/src/pages/map/index.jsx | 13 +++----------
zy-asrs-flow/src/pages/map/components/mapSettings.jsx | 2 +-
zy-asrs-flow/src/pages/map/utils.js | 4 +---
5 files changed, 7 insertions(+), 23 deletions(-)
diff --git a/zy-asrs-flow/src/pages/map/components/mapSettings.jsx b/zy-asrs-flow/src/pages/map/components/mapSettings.jsx
index 114584c..ff3a782 100644
--- a/zy-asrs-flow/src/pages/map/components/mapSettings.jsx
+++ b/zy-asrs-flow/src/pages/map/components/mapSettings.jsx
@@ -171,7 +171,7 @@
break;
}
Utils.getMapContainer().addChild(copiedSprite);
- Utils.beSettings(copiedSprite, props.setSpriteBySettings, props.setDidClickSprite);
+ Utils.beSettings(copiedSprite, props.setSpriteBySettings);
setLastCopiedSprites(prevArr => [...prevArr, copiedSprite]);
}
diff --git a/zy-asrs-flow/src/pages/map/components/settings.jsx b/zy-asrs-flow/src/pages/map/components/settings.jsx
index 13cda00..0362981 100644
--- a/zy-asrs-flow/src/pages/map/components/settings.jsx
+++ b/zy-asrs-flow/src/pages/map/components/settings.jsx
@@ -48,7 +48,6 @@
refCurr={props.refCurr}
curSprite={props.curSprite}
setSpriteBySettings={props.setSpriteBySettings}
- setDidClickSprite={props.setDidClickSprite}
onSubmit={finishSettings}
mapForm={mapForm}
/>
@@ -58,7 +57,6 @@
refCurr={props.refCurr}
curSprite={props.curSprite}
setSpriteBySettings={props.setSpriteBySettings}
- setDidClickSprite={props.setDidClickSprite}
onSubmit={finishSettings}
configForm={configForm}
/>
diff --git a/zy-asrs-flow/src/pages/map/index.jsx b/zy-asrs-flow/src/pages/map/index.jsx
index 9d4895f..a0745fd 100644
--- a/zy-asrs-flow/src/pages/map/index.jsx
+++ b/zy-asrs-flow/src/pages/map/index.jsx
@@ -79,7 +79,6 @@
});
const [app, setApp] = React.useState(null);
const [mapContainer, setMapContainer] = React.useState(null);
- const [didClickSprite, setDidClickSprite] = React.useState(false);
const [spriteBySettings, setSpriteBySettings] = React.useState(null);
const prevSpriteBySettingsRef = React.useRef();
const [drawerVisible, setDrawerVisible] = React.useState(false);
@@ -95,7 +94,7 @@
// init func
React.useEffect(() => {
const initialize = async () => {
- player = new Player(mapRef.current, styles.dark, didClickSprite);
+ player = new Player(mapRef.current, styles.dark);
setApp(player.app);
setMapContainer(player.mapContainer);
Utils.syncApp(player.app);
@@ -168,7 +167,7 @@
});
mapContainer.children.forEach(child => {
- Utils.beMovable(child, setDidClickSprite);
+ Utils.beMovable(child);
})
break
case MapModel.SETTINGS_MODEL:
@@ -205,7 +204,7 @@
Utils.initSprite(sprite, type);
mapContainer.addChild(sprite);
- Utils.beMovable(sprite, setDidClickSprite);
+ Utils.beMovable(sprite);
};
// watch curSprite
@@ -246,11 +245,6 @@
}
switchFloor(curFloor);
}, [curFloor]);
-
- // didClickSprite, stop triggers both sprite click and play's selection boxs
- React.useEffect(() => {
- player.updateDidClickSprite(didClickSprite);
- }, [didClickSprite])
// watch spriteBySettings
React.useEffect(() => {
@@ -456,7 +450,6 @@
setSpriteBySettings(null);
}}
setSpriteBySettings={setSpriteBySettings}
- setDidClickSprite={setDidClickSprite}
refCurr={mapRef.current}
/>
</>
diff --git a/zy-asrs-flow/src/pages/map/player.js b/zy-asrs-flow/src/pages/map/player.js
index 8d4d231..17eb4df 100644
--- a/zy-asrs-flow/src/pages/map/player.js
+++ b/zy-asrs-flow/src/pages/map/player.js
@@ -5,10 +5,9 @@
export default class Player {
- constructor(dom, dark, didClickSprite) {
+ constructor(dom, dark) {
// not dynamic
this.darkModel = dark;
- this.didClickSprite = didClickSprite;
// init
this.app = generatePixiApp(dark);
dom.appendChild(this.app.view);
@@ -75,7 +74,7 @@
}
const handleMouseMove = (event) => {
- if (isSelecting && !this.didClickSprite) {
+ if (isSelecting) {
// select end pos
const endPoint = new PIXI.Point();
this.app.renderer.events.mapPositionToPoint(endPoint, event.clientX, event.clientY);
@@ -377,10 +376,6 @@
x: this.app.renderer.width / 2 - centerPoint.x * this.scale,
y: this.app.renderer.height / 2 - centerPoint.y * this.scale
}, 200).start();
- }
-
- updateDidClickSprite = (value) => {
- this.didClickSprite = value;
}
getStartedTicker = () => {
diff --git a/zy-asrs-flow/src/pages/map/utils.js b/zy-asrs-flow/src/pages/map/utils.js
index 227f565..6865dbc 100644
--- a/zy-asrs-flow/src/pages/map/utils.js
+++ b/zy-asrs-flow/src/pages/map/utils.js
@@ -72,7 +72,7 @@
}
// sprite be movable from sprite click event
-export const beMovable = (sprite, setDidClickSprite) => {
+export const beMovable = (sprite) => {
sprite.off('pointerup');
sprite.off('pointermove');
sprite.off('pointerdown');
@@ -83,7 +83,6 @@
let dragTarget;
function onDragStart(event) {
if (event.button === 0) {
- setDidClickSprite(true);
dragTarget = event.currentTarget;
mapContainer.parent.off('pointermove');
mapContainer.parent.on('pointermove', onDragMove, dragTarget);
@@ -101,7 +100,6 @@
function onDragEnd() {
if (dragTarget) {
- setDidClickSprite(false);
this.parent.off('pointermove');
this.parent.off('pointerup');
dragTarget.alpha = 1;
--
Gitblit v1.9.1