From bd5c76aa213d959081d598c41045d7d36fb86ace Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 16 三月 2024 13:45:39 +0800
Subject: [PATCH] #
---
zy-asrs-flow/src/pages/map/index.jsx | 44 +++++++++++++++++++++++---------------------
zy-asrs-flow/src/pages/map/utils.js | 1 -
2 files changed, 23 insertions(+), 22 deletions(-)
diff --git a/zy-asrs-flow/src/pages/map/index.jsx b/zy-asrs-flow/src/pages/map/index.jsx
index 986dc96..e562807 100644
--- a/zy-asrs-flow/src/pages/map/index.jsx
+++ b/zy-asrs-flow/src/pages/map/index.jsx
@@ -125,10 +125,10 @@
if (!mapContainer && !dataFetched) {
return;
}
-
+
switch (model) {
case MapModel.OBSERVER_MODEL:
-
+
player.hideGridlines();
player.hideStarryBackground();
@@ -137,7 +137,7 @@
Utils.removeSelectedEffect();
setDeviceVisible(false);
setSettingsVisible(false);
-
+
mapContainer.children.forEach(child => {
Utils.viewFeature(child, setCurSPrite);
})
@@ -188,6 +188,26 @@
Utils.beMovable(sprite, setDidClickSprite);
};
+ // watch curSprite
+ React.useEffect(() => {
+ if (!mapContainer) {
+ return;
+ }
+ prevCurSpriteRef.current = curSprite;
+ if (curSprite && prevCurSprite !== curSprite) {
+ Utils.removeSelectedEffect();
+ }
+ if (curSprite) {
+ if (model === MapModel.OBSERVER_MODEL) {
+ Utils.showSelectedEffect(curSprite)
+ setDrawerVisible(true)
+ }
+ } else {
+ Utils.removeSelectedEffect();
+ }
+ }, [curSprite]);
+ const prevCurSprite = prevCurSpriteRef.current;
+
// didClickSprite, stop triggers both sprite click and play's selection boxs
React.useEffect(() => {
player.updateDidClickSprite(didClickSprite);
@@ -216,24 +236,6 @@
// setSettingsVisible(false);
// setSpriteBySettings(null);
}
-
- React.useEffect(() => {
- prevCurSpriteRef.current = curSprite;
-
- if (curSprite && prevCurSprite !== curSprite) {
- Utils.removeSelectedEffect();
- }
-
- if (curSprite) {
- if (model === MapModel.OBSERVER_MODEL) {
- Utils.showSelectedEffect(curSprite)
- setDrawerVisible(true)
- }
- } else {
- Utils.removeSelectedEffect();
- }
- }, [curSprite]);
- const prevCurSprite = prevCurSpriteRef.current;
return (
<>
diff --git a/zy-asrs-flow/src/pages/map/utils.js b/zy-asrs-flow/src/pages/map/utils.js
index 61be79d..dfeee52 100644
--- a/zy-asrs-flow/src/pages/map/utils.js
+++ b/zy-asrs-flow/src/pages/map/utils.js
@@ -56,7 +56,6 @@
sprite.off('pointerdown');
sprite.off('click');
- let viewTarget;
sprite.on("click", onClick);
function onClick(event) {
--
Gitblit v1.9.1