From 0e2cb2b4f0732f2dd83ddaa386067e083af495b9 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 09 十月 2024 14:14:53 +0800
Subject: [PATCH] #

---
 zy-acs-flow/src/map/tool.js     |    6 +++---
 zy-acs-flow/src/map/player.js   |    4 ++--
 zy-acs-flow/src/map/MapPage.jsx |    8 ++++----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/zy-acs-flow/src/map/MapPage.jsx b/zy-acs-flow/src/map/MapPage.jsx
index a668653..c67fcf4 100644
--- a/zy-acs-flow/src/map/MapPage.jsx
+++ b/zy-acs-flow/src/map/MapPage.jsx
@@ -78,7 +78,7 @@
                 setDeviceVisible(false);
                 player.hideGridLines();
 
-                player.activateMapMultiSelect((selectedSprites, resetFn) => {
+                player.activateMapMultiSelect((selectedSprites, restartFn) => {
                     console.log(selectedSprites);
                 });
 
@@ -86,9 +86,9 @@
             case MapMode.MOVABLE_MODE:
                 player.showGridLines();
 
-                player.activateMapMultiSelect((selectedSprites, resetFn) => {
+                player.activateMapMultiSelect((selectedSprites, restartFn) => {
                     Tool.spriteListBeMovable(selectedSprites, () => {
-                        // resetFn();
+                        restartFn();
                     });
                 });
                 break
@@ -96,7 +96,7 @@
                 player.hideGridLines();
                 setDeviceVisible(false);
 
-                player.activateMapMultiSelect((selectedSprites, resetFn) => {
+                player.activateMapMultiSelect((selectedSprites, restartFn) => {
                     console.log(selectedSprites);
                 });
                 break
diff --git a/zy-acs-flow/src/map/player.js b/zy-acs-flow/src/map/player.js
index 2dfc06d..4eb6bb7 100644
--- a/zy-acs-flow/src/map/player.js
+++ b/zy-acs-flow/src/map/player.js
@@ -32,8 +32,6 @@
 
     activateMapMultiSelect = (fn) => {
         const mapMultiSelectHandle = (event) => {
-            console.log(123);
-            
             if (event.button !== 0) {
                 return;
             }
@@ -102,6 +100,7 @@
                         fn(this.selectedSprites, () => {
                             // trigger at end of selectionBox when fn happen mouseup
                             this.selectedSprites = [];
+                            this.activateMapMultiSelect(fn);
                         });
                     }
 
@@ -111,6 +110,7 @@
             });
         }
 
+        this.mapContainer.parent.off('mousedown');
         this.mapContainer.parent.on('mousedown', mapMultiSelectHandle)
     }
 
diff --git a/zy-acs-flow/src/map/tool.js b/zy-acs-flow/src/map/tool.js
index d8ea096..8cf5173 100644
--- a/zy-acs-flow/src/map/tool.js
+++ b/zy-acs-flow/src/map/tool.js
@@ -117,7 +117,7 @@
 
 }
 
-export const spriteListBeMovable = (selectedSprites, resetFn) => {
+export const spriteListBeMovable = (selectedSprites, endFn) => {
     if (selectedSprites && selectedSprites.length > 0) {
         let batchMove = false;
         let batchMoveStartPos = null;
@@ -148,8 +148,8 @@
             mapContainer.parent.off('mousemove');
             mapContainer.parent.off('mouseup');
 
-            if (resetFn) {
-                resetFn();
+            if (endFn) {
+                endFn();
             }
         }
 

--
Gitblit v1.9.1