From c925df67fcd2ee5a203dcf9a28916d0fce01c33d Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期二, 19 十二月 2023 09:31:37 +0800
Subject: [PATCH] #map latest test
---
src/main/webapp/views/console4.html | 39 +++++++++++++++++++++++++++++++--------
1 files changed, 31 insertions(+), 8 deletions(-)
diff --git a/src/main/webapp/views/console4.html b/src/main/webapp/views/console4.html
index ada2d4e..72837bd 100644
--- a/src/main/webapp/views/console4.html
+++ b/src/main/webapp/views/console4.html
@@ -131,9 +131,11 @@
let pixiShuttleMap = new Map();
let pixiShuttleMoveAdvancePathMap = new Map();
let pixiShuttleMoveAdvancePathList = [];
+ let pixiShuttleLockPathMap = new Map();
let pixiStaMap = new Map();
let objectsContainer;
let objectsContainer2;
+ let objectsContainer3;
let graphics0;
let graphics3;
let graphics4;
@@ -200,10 +202,10 @@
// this.getSystemRunningStatus() //鑾峰彇绯荤粺杩愯鐘舵��
this.consoleInterval = setInterval(() => {
+ this.getMap(this.currentLev) //鑾峰彇瀹炴椂鍦板浘鏁版嵁
this.getShuttleStateInfo() //鑾峰彇鍥涘悜绌挎杞︿俊鎭�
this.getLiftStateInfo() //鑾峰彇鎻愬崌鏈轰俊鎭�
this.getSiteInfo() //鑾峰彇杈撻�佺珯鐐规暟鎹�
- this.getMap(this.currentLev) //鑾峰彇瀹炴椂鍦板浘鏁版嵁
// this.getCodeData()//鑾峰彇鏉＄爜
}, 1000)
@@ -342,6 +344,10 @@
objectsContainer2 = new PIXI.Container();
pixiApp.stage.addChild(objectsContainer2);
+ // 鍒涘缓涓�涓鍣ㄦ潵绠＄悊澶ф壒閲忕殑鏄剧ず瀵硅薄
+ objectsContainer3 = new PIXI.Container();
+ pixiApp.stage.addChild(objectsContainer3);
+
//*******************鎷栧姩鐢诲竷*******************
let stageOriginalPos;
let mouseDownPoint;
@@ -453,7 +459,7 @@
this.openDrawerLift(val)
}else{
//搴撲綅
- this.rightEvent(index, idx, e);
+ this.rightEvent(index + 1, idx, e);
updateColor(sprite, 0x9900ff);
}
});
@@ -488,7 +494,12 @@
pixiStaMap.set(parseInt(val.data), sprite);//绔欑偣鏁版嵁娣诲姞鍒癿ap涓�
}
- objectsContainer.addChild(sprite);
+ if (val.value == -999) {
+ pixiShuttleLockPathMap.set(this.getLocNoByXYZ(index + 1, idx, this.currentLev), sprite);
+ objectsContainer3.addChild(sprite);
+ }else {
+ objectsContainer.addChild(sprite);
+ }
pixiStageList[index][idx] = sprite
}
});
@@ -497,15 +508,26 @@
diff.forEach((item, index) => {
//鑾峰彇old鍏冪礌
let oldSprite = pixiStageList[item.x][item.y]
- //绉婚櫎old鍏冪礌
- objectsContainer.removeChild(oldSprite)
+ if (item.originData == -999) {
+ //绉婚櫎old璺緞鍏冪礌
+ objectsContainer3.removeChild(oldSprite);
+ }else {
+ //绉婚櫎old鍏冪礌
+ objectsContainer.removeChild(oldSprite);
+ }
let sprite = getSprite(item.data, item.y * width, item.x * height, (e) => {
- this.rightEvent(item.x, item.y, e);
+ this.rightEvent(item.x + 1, item.y, e);
updateColor(sprite, 0x9900ff);
});
- objectsContainer.addChild(sprite);
+ if (item.data == -999) {
+ //娣诲姞璺緞鍏冪礌
+ objectsContainer3.addChild(sprite);
+ }else {
+ //娣诲姞鍏冪礌
+ objectsContainer.addChild(sprite);
+ }
//淇濆瓨鏂板厓绱�
pixiStageList[item.x][item.y] = sprite
@@ -527,7 +549,8 @@
diff.push({
x: index,
y: idx,
- data: arr2[index][idx].value
+ data: arr2[index][idx].value,
+ originData: val.value
})
}
})
--
Gitblit v1.9.1