From 8c93f751e6e5c224a06b401e63345f7927be1f8c Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 15 三月 2024 12:59:44 +0800
Subject: [PATCH] #

---
 zy-asrs-flow/src/pages/map/utils.js |   42 +++++++++++++++++++++++++++++++-----------
 1 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/zy-asrs-flow/src/pages/map/utils.js b/zy-asrs-flow/src/pages/map/utils.js
index 4582016..fcb9d12 100644
--- a/zy-asrs-flow/src/pages/map/utils.js
+++ b/zy-asrs-flow/src/pages/map/utils.js
@@ -279,6 +279,23 @@
     return options;
 }
 
+/**
+ *     // 
+    let sprite = mapContainer.children[0];
+    let bounds = sprite.getBounds();
+    console.log(bounds, sprite.getLocalBounds());
+    console.log(sprite.position);
+
+    console.log('-');
+
+    console.log(mapContainer.scale, mapContainer.position);
+
+    console.log('===========');
+
+
+    return;
+ */
+
 export const adaptScreen = () => {
     if (!mapContainer || !app) {
         return;
@@ -286,26 +303,29 @@
     if (mapContainer.children.length === 0) {
         return;
     }
+    mapContainer.scale.set(1);
+    mapContainer.position.set(0, 0);
 
     let minX, maxX, minY, maxY;
     for (let sprite of mapContainer.children) {
-        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;
+        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;
+        }
     }
 
-    // 鐭╁舰涓績
+    let newScale = Math.min(
+        app.renderer.width / (maxX - minX) * 0.8,
+        app.renderer.height / (maxY - minY) * 0.8
+    );
+
     let centerPoint = {
         x: (minX + maxX) / 2 * mapContainer.scale.x,
         y: (minY + maxY) / 2 * mapContainer.scale.y
     };
-
-    let newScale = Math.min(
-        app.renderer.width / (maxX - minX) * 0.9, // 90%鐨勫搴�
-        app.renderer.height / (maxY - minY) * 0.9 // 90%鐨勯珮搴�
-    );
 
     new TWEEDLE.Tween(mapContainer.scale).easing(TWEEDLE.Easing.Quadratic.Out)
         .to({

--
Gitblit v1.9.1