From 7784a181068066342814e6b614ec2d3825b26cc7 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 14 十月 2024 13:15:48 +0800
Subject: [PATCH] #

---
 zy-acs-flow/src/map/batch/index.jsx |    2 +-
 zy-acs-flow/src/map/player.js       |   19 +++++++++++--------
 zy-acs-flow/src/map/MapPage.jsx     |   10 ++++++----
 3 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/zy-acs-flow/src/map/MapPage.jsx b/zy-acs-flow/src/map/MapPage.jsx
index 1837b61..9fc6df7 100644
--- a/zy-acs-flow/src/map/MapPage.jsx
+++ b/zy-acs-flow/src/map/MapPage.jsx
@@ -242,12 +242,13 @@
                 sx={{
                     display: 'flex',
                     alignItems: 'center',
-                    backgroundColor: '#f5f5f5',
-                    color: '#000',
+                    backgroundColor: theme.palette.background.default,
+                    color: theme.palette.text.primary,
                     padding: '0 16px',
                     height: '64px',
                     flexShrink: 0, // keep height
                     zIndex: 200,
+                    boxShadow: theme.shadows[1],
                 }}
             >
                 <TextField
@@ -256,7 +257,7 @@
                     placeholder="鎼滅储..."
                     sx={{
                         width: '200px',
-                        backgroundColor: '#fff',
+                        backgroundColor: theme.palette.background.paper,
                         borderRadius: 1,
                     }}
                 />
@@ -337,7 +338,8 @@
                     size="small"
                     sx={{
                         ml: 2,
-                        backgroundColor: '#fff',
+                        backgroundColor: theme.palette.background.paper,
+                        color: theme.palette.text.primary,
                         borderRadius: 1,
                     }}
                 >
diff --git a/zy-acs-flow/src/map/batch/index.jsx b/zy-acs-flow/src/map/batch/index.jsx
index f238cc0..35c945f 100644
--- a/zy-acs-flow/src/map/batch/index.jsx
+++ b/zy-acs-flow/src/map/batch/index.jsx
@@ -33,7 +33,7 @@
                     }}>
                         <Stack direction="row" p={2}>
                             <Typography variant="h6" flex="1">
-                                {batchSprites?.length || 0} items {translate('common.action.selected')}
+                                {batchSprites?.length || 0} {translate('common.action.selected')}
                             </Typography>
                             <IconButton onClick={handleClose} size="small">
                                 <CloseIcon />
diff --git a/zy-acs-flow/src/map/player.js b/zy-acs-flow/src/map/player.js
index a4fd83b..ef7978b 100644
--- a/zy-acs-flow/src/map/player.js
+++ b/zy-acs-flow/src/map/player.js
@@ -229,20 +229,20 @@
     }
 
     showCoordinates = () => {
-        const coordinatesText = new PIXI.Text('{ x: 0, y: 0 }', {
-            fill: this.themeMode === 'dark' ? 0xffffff : 0x000000,
+        this.coordinatesText = new PIXI.Text('{ x: 0, y: 0 }', {
+            fill: this.themeMode === 'dark' ? 0xdddddd : 0x333333,
             fontSize: 13,
             fontFamily: 'MicrosoftYaHei',
             fontWeight: 'bold',
         });
-        coordinatesText.name = 'xyStr'
-        coordinatesText.position.set(10, 10);
-        this.app.stage.addChild(coordinatesText);
+        this.coordinatesText.name = 'xyStr'
+        this.coordinatesText.position.set(10, 10);
+        this.app.stage.addChild(this.coordinatesText);
 
         const mouseMoveInfoTextHandler = (event) => {
             const mouseX = (event.clientX - this.mapContainer.position.x) / this.scale;
             const mouseY = (event.clientY - this.mapContainer.position.y) / this.scale;
-            coordinatesText.text = `{ x: ${mouseX.toFixed(2)}, y: ${mouseY.toFixed(2)} }`;
+            this.coordinatesText.text = `{ x: ${mouseX.toFixed(2)}, y: ${mouseY.toFixed(2)} }`;
         };
         this.app.view.addEventListener('mousemove', mouseMoveInfoTextHandler);
     }
@@ -391,14 +391,17 @@
     }
 
     setTheme = (themeMode) => {
-        this.app.renderer.background.color = themeMode === 'dark' ? 0x2f3542 : 0xf1f2f6;
+        this.app.renderer.background.color = themeMode === 'dark' ? '#3a3f44' : '#f1f2f6';
+        if (this.coordinatesText) {
+            this.coordinatesText.style.fill = themeMode === 'dark' ? 0xdddddd : 0x333333;
+        }
     }
 
 }
 
 const generateApp = (dom, themeMode) => {
     const app = new PIXI.Application({
-        background: themeMode === 'dark' ? '#2f3542' : '#f1f2f6',
+        background: themeMode === 'dark' ? '#3b4148' : '#f1f2f6',
         antialias: true,
         // resizeTo: dom,
     })

--
Gitblit v1.9.1