From 9d0acfb65c80c4948c305ca01338f894b87346a0 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 08 四月 2024 09:44:37 +0800
Subject: [PATCH] Merge branch 'Four-Way-Rack' of http://47.97.1.152:5880/r/zy-asrs-master into Four-Way-Rack
---
zy-asrs-flow/src/pages/map/player.js | 27 ++++++++++++++++-----------
1 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/zy-asrs-flow/src/pages/map/player.js b/zy-asrs-flow/src/pages/map/player.js
index 17eb4df..ea4a8dc 100644
--- a/zy-asrs-flow/src/pages/map/player.js
+++ b/zy-asrs-flow/src/pages/map/player.js
@@ -27,11 +27,11 @@
if (this.mapEvent) {
this.mapContainer.parent.off('mousedown');
this.mapEvent = null;
- if (this.selectedSprites && this.selectedSprites.length > 0) {
- this.selectedSprites.forEach(child => {
- Utils.unMarkSprite(child);
- })
- }
+ // if (this.selectedSprites && this.selectedSprites.length > 0) {
+ // this.selectedSprites.forEach(child => {
+ // Utils.unMarkSprite(child);
+ // })
+ // }
}
this.mapEvent = (event) => {
if (eventType && event.button === 0) {
@@ -95,12 +95,7 @@
this.mapContainer.parent.on('mouseup', (event) => {
if (isSelecting) {
- if (this.selectedSprites && this.selectedSprites.length > 0) {
- this.selectedSprites.forEach(child => {
- Utils.unMarkSprite(child);
- })
- }
- this.selectedSprites = [];
+ this.clearSelectedSprites();
// sprite show style which be selected
this.mapContainer.children.forEach(child => {
@@ -125,6 +120,15 @@
this.mapContainer.parent.off('mousemove', handleMouseMove);
});
+ }
+
+ clearSelectedSprites = () => {
+ if (this.selectedSprites && this.selectedSprites.length > 0) {
+ this.selectedSprites.forEach(child => {
+ Utils.unMarkSprite(child);
+ })
+ }
+ this.selectedSprites = [];
}
activateMapPan = () => {
@@ -401,6 +405,7 @@
function generatePixiContainer(name) {
const mapContainer = new PIXI.Container();
+ mapContainer.sortableChildren = true;
mapContainer.name = name;
mapContainer.data = {};
return mapContainer;
--
Gitblit v1.9.1