From 3392c554a5e76a75a1daf4a9261be0d794043b5d Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 09 十二月 2024 16:17:27 +0800
Subject: [PATCH] #
---
zy-acs-flow/src/map/http.js | 2 +-
zy-acs-manager/src/main/resources/application.yml | 22 ++++++++++++----------
zy-acs-flow/src/map/player.js | 13 +++++++++++--
3 files changed, 24 insertions(+), 13 deletions(-)
diff --git a/zy-acs-flow/src/map/http.js b/zy-acs-flow/src/map/http.js
index 3a66580..a581384 100644
--- a/zy-acs-flow/src/map/http.js
+++ b/zy-acs-flow/src/map/http.js
@@ -49,7 +49,7 @@
// support
switch (item.type) {
case DEVICE_TYPE.POINT:
- sprite.scale.set(0.85, 0.85);
+ sprite.scale.set(1);
break
default:
break
diff --git a/zy-acs-flow/src/map/player.js b/zy-acs-flow/src/map/player.js
index 8aff09e..a828a64 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 } from './constants';
export default class Player {
@@ -152,7 +153,15 @@
this.mapContainer.scale.set(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
+ // }
});
});
}
diff --git a/zy-acs-manager/src/main/resources/application.yml b/zy-acs-manager/src/main/resources/application.yml
index ef186e0..93fdf6e 100644
--- a/zy-acs-manager/src/main/resources/application.yml
+++ b/zy-acs-manager/src/main/resources/application.yml
@@ -8,6 +8,7 @@
datasource:
driver-class-name: com.mysql.jdbc.Driver
url: jdbc:mysql://127.0.0.1:3306/zy_rcs1?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+# url: jdbc:mysql://127.0.0.1:33066/zy_rcs1?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
# url: jdbc:mysql://mysql:3306/zy_rcs1?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
username: root
password: xltys1995
@@ -53,6 +54,17 @@
class: javax.net.ssl.SSLSocketFactory
port: 465
+redis:
+ host: 127.0.0.1
+ # host: redis
+ password: xltys1995
+ port: 6379
+# port: 63799
+ max: 30
+ min: 10
+ timeout: 5000
+ index: 3
+
eureka:
client:
enabled: false
@@ -77,16 +89,6 @@
logging:
file:
path: /stock/out/rcs-manager/logs
-
-redis:
- host: 127.0.0.1
-# host: redis
- password: xltys1995
- port: 6379
- max: 30
- min: 10
- timeout: 5000
- index: 3
config:
open-office-home: C
--
Gitblit v1.9.1