From efabc6ba991acfd01d38bb0bf4e8cfd772416617 Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期一, 05 一月 2026 13:07:39 +0800
Subject: [PATCH] #
---
zy-acs-flow/src/map/player.js | 47 ++++++++++++++++++++++++++++++++++++-----------
1 files changed, 36 insertions(+), 11 deletions(-)
diff --git a/zy-acs-flow/src/map/player.js b/zy-acs-flow/src/map/player.js
index 2f8b87d..09a7d64 100644
--- a/zy-acs-flow/src/map/player.js
+++ b/zy-acs-flow/src/map/player.js
@@ -1,7 +1,8 @@
import * as PIXI from 'pixi.js';
import * as TWEEDLE from 'tweedle.js';
import * as Tool from './tool';
-import star from '/img/map/star.png'
+import star from '/img/map/star.png';
+import { DEVICE_TYPE, MAP_MIRROR } from './constants';
export default class Player {
@@ -89,6 +90,9 @@
// sprite show style which be selected
this.mapContainer.children.forEach(child => {
+ if (child?.data?.type === DEVICE_TYPE.AREA) {
+ return;
+ }
if (Tool.isSpriteInSelectionBox(child, this.selectionBox)) {
this.selectedSprites.push(child);
Tool.markSprite(child);
@@ -114,6 +118,19 @@
this.mapContainer.parent.off('mousedown');
this.mapContainer.parent.on('mousedown', mapMultiSelectHandle)
+ }
+
+ deactivateMapMultiSelect = () => {
+ if (!this.mapContainer?.parent) {
+ return;
+ }
+ this.mapContainer.parent.off('mousedown');
+ this.clearSelectedSprites();
+ if (this.selectionBox) {
+ this.selectionBox.clear();
+ this.app?.stage.removeChild(this.selectionBox);
+ this.selectionBox = null;
+ }
}
clearSelectedSprites = () => {
@@ -149,10 +166,18 @@
this.scale = newScale;
- this.mapContainer.scale.set(this.scale);
+ this.mapContainer.scale.set(this.scale, Math.abs(this.scale));
this.mapContainer.children.forEach(child => {
- // child.scale.set(1 / this.scale); // 闃叉鍥炬爣鍙樺皬
+ // child.scale.set(1 / (this.scale * 1)); // 闃叉鍥炬爣鍙樺皬
+
+ // switch (child.data?.type) {
+ // case DEVICE_TYPE.POINT:
+ // child.scale.set(1 / (this.scale * 20));
+ // break
+ // default:
+ // break
+ // }
});
});
}
@@ -206,8 +231,8 @@
}
this.scale = Math.min(
- this.app.renderer.width / (maxX - minX) * 0.8,
- this.app.renderer.height / (maxY - minY) * 0.8
+ this.app.renderer.width / (maxX - minX) * 0.55,
+ this.app.renderer.height / (maxY - minY) * 0.55,
);
let centerPoint = {
@@ -217,7 +242,7 @@
new TWEEDLE.Tween(this.mapContainer.scale).easing(TWEEDLE.Easing.Quadratic.Out)
.to({
- x: this.scale,
+ x: MAP_MIRROR ? -this.scale : this.scale,
y: this.scale
}, 200).start();
@@ -238,7 +263,7 @@
const newRotation = this.mapContainer.rotation + value;
const rotationDegrees = (newRotation * 180 / Math.PI) % 360;
- this.rotationText.text = `{ rotation: ${rotationDegrees.toFixed(1)}掳 }`;
+ this.rotationText.text = `{ ROTATION: ${rotationDegrees.toFixed(1)}掳 }`;
new TWEEDLE.Tween(this.mapContainer)
.to({ rotation: newRotation }, 200)
@@ -250,7 +275,7 @@
}
showCoordinates = () => {
- this.coordinatesText = new PIXI.Text('{ x: 0, y: 0 }', {
+ this.coordinatesText = new PIXI.Text('{ X: 0, Y: 0 }', {
fill: this.themeMode === 'dark' ? 0xdddddd : 0x333333,
fontSize: 13,
fontFamily: 'Microsoft YaHei',
@@ -260,7 +285,7 @@
this.coordinatesText.position.set(10, 10);
this.app.stage.addChild(this.coordinatesText);
- this.rotationText = new PIXI.Text('Rotation: 0掳', {
+ this.rotationText = new PIXI.Text('ROTATION: 0掳', {
fill: this.themeMode === 'dark' ? 0xdddddd : 0x333333,
fontSize: 13,
fontFamily: 'Microsoft YaHei',
@@ -272,7 +297,7 @@
this.app.stage.on('pointermove', (event) => {
const worldPos = event.data.getLocalPosition(this.mapContainer);
- this.coordinatesText.text = `{ x: ${worldPos.x.toFixed(2)}, y: ${worldPos.y.toFixed(2)} }`;
+ this.coordinatesText.text = `{ X: ${worldPos.x.toFixed(2)}, Y: ${worldPos.y.toFixed(2)} }`;
});
}
@@ -462,4 +487,4 @@
mapContainer.name = name;
mapContainer.data = {};
return mapContainer;
-}
\ No newline at end of file
+}
--
Gitblit v1.9.1