From ec2e79e0d510568d51714a7121e4a32c026e6d44 Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期二, 19 三月 2024 14:02:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 zy-asrs-flow/src/pages/map/player.js |   91 ++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 76 insertions(+), 15 deletions(-)

diff --git a/zy-asrs-flow/src/pages/map/player.js b/zy-asrs-flow/src/pages/map/player.js
index 35edc66..772f874 100644
--- a/zy-asrs-flow/src/pages/map/player.js
+++ b/zy-asrs-flow/src/pages/map/player.js
@@ -22,7 +22,7 @@
         this.activateMapScale();
         this.activateMapPan();
         this.showCoordinates();
-        this.appTicker();
+        this.getStartedTicker();
     }
 
     activateMapEvent = (leftEvent, rightEvent) => {
@@ -146,20 +146,34 @@
     }
 
     activateMapScale = () => {
-        this.scale = 1; // 缂╂斁
+        this.scale = 1;
         this.app.view.addEventListener('wheel', (event) => {
             event.preventDefault();
+            if (this.scale !== this.mapContainer.scale.x) {
+                this.scale = this.mapContainer.scale.x;
+            }
+
             const delta = Math.sign(event.deltaY);
 
-            if (delta === 1) {
-                this.scale *= 0.9;
-            } else if (delta === -1) {
-                this.scale *= 1.1;
-            }
+            const mousePosition = new PIXI.Point();
+            this.app.renderer.plugins.interaction.mapPositionToPoint(mousePosition, event.clientX, event.clientY);
+
+            const diffPositionX = mousePosition.x - this.mapContainer.x;
+            const diffPositionY = mousePosition.y - this.mapContainer.y;
+
+            const newScale = this.scale * (delta === 1 ? 0.9 : 1.1);
+            const scaleFactor = newScale / this.scale;
+
+            this.mapContainer.x = mousePosition.x - diffPositionX * scaleFactor;
+            this.mapContainer.y = mousePosition.y - diffPositionY * scaleFactor;
+
+            this.scale = newScale;
+
             this.mapContainer.scale.set(this.scale);
+
             this.mapContainer.children.forEach(child => {
                 // child.scale.set(1 / this.scale); // 闃叉鍥炬爣鍙樺皬
-            })
+            });
         });
     }
 
@@ -183,17 +197,18 @@
     }
 
     showGridlines = () => {
+        this.hideGridlines();
         if (!this.gridLineContainer) {
             this.gridLineContainer = generatePixiContainer('gridLineContainer');
             this.app.stage.addChild(this.gridLineContainer);
         }
 
         const inte = 30;
-        const lineDefaultAlpha = .5;;
+        const lineDefaultAlpha = .1;;
         const lineDefaultColor = 0x000000;
         for (let i = 0; i < this.app.view.width / inte; i++) {
             const graphics = new PIXI.Graphics();
-            graphics.lineStyle(.3, lineDefaultColor, lineDefaultAlpha);
+            graphics.lineStyle(1, lineDefaultColor, lineDefaultAlpha);
             graphics.beginFill(lineDefaultColor);
             graphics.moveTo(i * inte, 0);
             graphics.lineTo(i * inte, this.app.view.height);
@@ -203,7 +218,7 @@
 
         for (let i = 0; i < this.app.view.height / inte; i++) {
             const graphics = new PIXI.Graphics();
-            graphics.lineStyle(.3, lineDefaultColor, lineDefaultAlpha);
+            graphics.lineStyle(1, lineDefaultColor, lineDefaultAlpha);
             graphics.beginFill(lineDefaultColor);
             graphics.moveTo(0, i * inte);
             graphics.lineTo(this.app.view.width, i * inte);
@@ -258,7 +273,6 @@
             warpSpeed = warpSpeed > 0 ? 0 : 1;
         }, 5000);
 
-
         this.starryTicker = (delta) => {
             speed += (warpSpeed - speed) / 20;
             cameraZ += delta * 10 * (speed + baseSpeed);
@@ -294,7 +308,7 @@
     }
 
     hideStarryBackground = () => {
-        if(this.starryTicker) {
+        if (this.starryTicker) {
             this.app.ticker.remove(this.starryTicker);
             this.starryTicker = null;
         }
@@ -311,12 +325,59 @@
         }
     }
 
+    adaptScreen = () => {
+        if (!this.mapContainer || !this.app) {
+            return;
+        }
+        
+        this.mapContainer.scale.set(1);
+        this.mapContainer.position.set(0, 0);
+        if (this.mapContainer.children.length === 0) {
+            return;
+        }
+
+        let minX, maxX, minY, maxY;
+        for (let sprite of this.mapContainer.children) {
+            if (sprite?.data?.uuid) {
+                let bounds = sprite.getBounds();
+                minX = minX !== undefined ? Math.min(minX, bounds.x) : bounds.x;
+                minY = minY !== undefined ? Math.min(minY, bounds.y) : bounds.y;
+                maxX = maxX !== undefined ? Math.max(maxX, bounds.x + bounds.width) : bounds.x + bounds.width;
+                maxY = maxY !== undefined ? Math.max(maxY, bounds.y + bounds.height) : bounds.y + bounds.height;
+            }
+        }
+
+        this.scale = Math.min(
+            this.app.renderer.width / (maxX - minX) * 0.8,
+            this.app.renderer.height / (maxY - minY) * 0.8
+        );
+
+        let centerPoint = {
+            x: (minX + maxX) / 2 * this.mapContainer.scale.x,
+            y: (minY + maxY) / 2 * this.mapContainer.scale.y
+        };
+
+        new TWEEDLE.Tween(this.mapContainer.scale).easing(TWEEDLE.Easing.Quadratic.Out)
+            .to({
+                x: this.scale,
+                y: this.scale
+            }, 200).start();
+
+        new TWEEDLE.Tween(this.mapContainer.position).easing(TWEEDLE.Easing.Quadratic.Out)
+            .to({
+                x: this.app.renderer.width / 2 - centerPoint.x * this.scale,
+                y: this.app.renderer.height / 2 - centerPoint.y * this.scale
+            }, 200).start();
+    }
+
     updateDidClickSprite = (value) => {
         this.didClickSprite = value;
     }
 
-    appTicker = () => {
-        TWEEDLE.Group.shared.update();
+    getStartedTicker = () => {
+        this.app.ticker.add((delta) => {
+            TWEEDLE.Group.shared.update();
+        });
     }
 
 }

--
Gitblit v1.9.1