From 93ece83d6d9c3a01195b64cf28cf943cae029704 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 16 十月 2024 09:39:10 +0800
Subject: [PATCH] #
---
zy-acs-flow/src/map/MapPage.jsx | 35 ++++++++---------------------------
1 files changed, 8 insertions(+), 27 deletions(-)
diff --git a/zy-acs-flow/src/map/MapPage.jsx b/zy-acs-flow/src/map/MapPage.jsx
index 9fede93..e1bf3ce 100644
--- a/zy-acs-flow/src/map/MapPage.jsx
+++ b/zy-acs-flow/src/map/MapPage.jsx
@@ -56,8 +56,6 @@
const [curSprite, setCurSprite] = useState(null);
const prevCurSpriteRef = useRef();
- const [spriteSettings, setSpriteSettings] = useState(null);
- const prevSpriteSettingsRef = useRef();
const [batchSprites, setBatchSprites] = useState([]);
const [curZone, setCurZone] = useState(() => {
@@ -134,7 +132,6 @@
setBatchSelectionVisible(false);
setCurSprite(null);
- setSpriteSettings(null);
setBatchSprites([]);
switch (mode) {
@@ -173,7 +170,7 @@
});
mapContainer.children.forEach(child => {
- Tool.beSettings(child, setSpriteSettings);
+ Tool.beSettings(child, setCurSprite);
})
break
default:
@@ -212,29 +209,15 @@
Tool.showSelectedEffect(curSprite)
setInsightVisible(true)
}
+ if (mode === MAP_MODE.SETTINGS_MODE) {
+ Tool.showSelectedEffect(curSprite)
+ setSettingsVisible(true)
+ }
} else {
Tool.removeSelectedEffect();
}
}, [curSprite]);
const prevCurSprite = prevCurSpriteRef.current;
-
- // watch spriteSettings
- useEffect(() => {
- if (!mapContainer) {
- return;
- }
- prevSpriteSettingsRef.current = spriteSettings;
- if (spriteSettings && prevSpriteSettings !== spriteSettings) {
- Tool.removeSelectedEffect();
- }
- if (spriteSettings) {
- Tool.showSelectedEffect(spriteSettings)
- setSettingsVisible(true);
- } else {
- Tool.removeSelectedEffect();
- }
- }, [spriteSettings, mapContainer])
- const prevSpriteSettings = prevSpriteSettingsRef.current;
// watch batchSprites
React.useEffect(() => {
@@ -287,8 +270,6 @@
curZone={curZone}
curSprite={curSprite}
setCurSprite={setCurSprite}
- spriteSettings={spriteSettings}
- setSpriteSettings={setSpriteSettings}
/>
<Box sx={{ flexGrow: 1 }} />
@@ -463,11 +444,11 @@
<Settings
open={settingsVisible}
onCancel={() => {
- setSpriteSettings(null);
+ setCurSprite(null);
setSettingsVisible(false);
}}
- sprite={spriteSettings}
- setSpriteSettings={setSpriteSettings}
+ sprite={curSprite}
+ setSpriteSettings={setCurSprite}
width={570}
/>
--
Gitblit v1.9.1