From 1173e7f809980e10f1f0c30a0357ada8f9a416ac Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 21 三月 2024 17:08:08 +0800
Subject: [PATCH] #
---
zy-asrs-flow/src/pages/map/player.js | 4 ++--
zy-asrs-flow/src/pages/map/index.jsx | 6 +++---
zy-asrs-flow/src/pages/map/utils.js | 11 +++++++----
3 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/zy-asrs-flow/src/pages/map/index.jsx b/zy-asrs-flow/src/pages/map/index.jsx
index 273a85e..b8515e5 100644
--- a/zy-asrs-flow/src/pages/map/index.jsx
+++ b/zy-asrs-flow/src/pages/map/index.jsx
@@ -156,8 +156,8 @@
player.showGridlines();
player.hideStarryBackground();
- player.activateMapEvent(Utils.MapEvent.SELECTION_BOX, (selectedSprites, scale, resetFn) => {
- Utils.spriteListBeMovable(selectedSprites, scale, () => {
+ player.activateMapEvent(Utils.MapEvent.SELECTION_BOX, (selectedSprites, resetFn) => {
+ Utils.spriteListBeMovable(selectedSprites, () => {
resetFn();
});
});
@@ -171,7 +171,7 @@
player.showStarryBackground();
setDeviceVisible(false);
- player.activateMapEvent(Utils.MapEvent.SELECTION_BOX, (selectedSprites, scale, resetFn) => {
+ player.activateMapEvent(Utils.MapEvent.SELECTION_BOX, (selectedSprites, resetFn) => {
console.log(selectedSprites);
if (selectedSprites.length > 0) {
setDrawerVisible(true);
diff --git a/zy-asrs-flow/src/pages/map/player.js b/zy-asrs-flow/src/pages/map/player.js
index 2d19b38..1fe0c56 100644
--- a/zy-asrs-flow/src/pages/map/player.js
+++ b/zy-asrs-flow/src/pages/map/player.js
@@ -103,7 +103,7 @@
// after selectbox complete
if (fn) {
- fn(this.selectedSprites, this.scale, () => {
+ fn(this.selectedSprites, () => {
// trigger at end of selectionBox when fn happen mouseup
this.selectedSprites = [];
this.activateMapEvent(Utils.MapEvent.SELECTION_BOX, fn);
@@ -111,7 +111,7 @@
}
// sprites batch move
- // Utils.spriteListBeMovable(this.selectedSprites, this.scale, () => {
+ // Utils.spriteListBeMovable(this.selectedSprites, () => {
// this.activateMapEvent(Utils.MapEvent.SELECTION_BOX, fn);
// });
diff --git a/zy-asrs-flow/src/pages/map/utils.js b/zy-asrs-flow/src/pages/map/utils.js
index 7d8761f..227f565 100644
--- a/zy-asrs-flow/src/pages/map/utils.js
+++ b/zy-asrs-flow/src/pages/map/utils.js
@@ -127,12 +127,13 @@
// sprites be movable from select box
// the scale was dynamic
-export const spriteListBeMovable = (selectedSprites, scale, resetFn) => {
+export const spriteListBeMovable = (selectedSprites, resetFn) => {
if (selectedSprites && selectedSprites.length > 0) {
let batchMove = false;
let batchMoveStartPos = null;
const batchMoving = (event) => {
+ const scale = mapContainer.scale.x;
if (batchMove && batchMoveStartPos) {
// offset move val
var mouseMovement = {
@@ -157,7 +158,9 @@
mapContainer.parent.off('mousemove');
mapContainer.parent.off('mouseup');
- resetFn();
+ if (resetFn) {
+ resetFn();
+ }
}
const batchMoveStart = (event) => {
@@ -396,10 +399,10 @@
})
const closeLoading = message.loading({ content: intl.formatMessage({ id: 'common.loading.api.message', defaultMessage: '绛夊緟鏈嶅姟鍣�......' }), duration: API_TIMEOUT });
- await Http.doPostPromise('api/map/save', {
+ await Http.doPostPromise('api/map/save', {
itemList: mapItemList,
floor: floor
- }, (res) => {
+ }, (res) => {
closeLoading();
}).catch((error) => {
closeLoading();
--
Gitblit v1.9.1