Merge branch 'master' of http://121.36.37.70:3000/shaojiahao/Sinopec-Anxin

2 years ago · 76edcc814c
14 changed files with 20 additions and 23 deletions
--- a/README.md
+++ b/README.md
@ -5,7 +5,7 @@
 ### 🌻 简介

 > 时间：2022、4、1 周五
-> 根据中化要求，尽心优化和调整
+> 根据中化要求，进行优化和调整

 ### 🌻 详情

@ -282,8 +282,5 @@
 - [🌱 新增] 无
 - [🍀 完善] 无

-
-
 > 时间：2022、7、8 周五
-> 迁移新的git仓库 测试
-
+> 迁移新的 git 仓库 测试
--- a/proxy.config.json
+++ b/proxy.config.json
@ -1,13 +1,15 @@
 {
-  "/api": {
-    "target": "http://121.36.37.70:8906/",
-    "secure": false,
-    "changeOrigin": true
-  },
-  "/signalr": {
-    "target": "http://121.36.37.70:8906/",
-    "secure": false,
-    "ws": true,
-    "logLevel": "debug"
-  }
+    "/api": {
+        "生产": "https://znaq.sinochemoilmarketing.com/",
+        "target": "http://121.36.37.70:8906/",
+        "secure": false,
+        "changeOrigin": true
+    },
+    "/signalr": {
+        "生产": "https://znaq.sinochemoilmarketing.com/",
+        "target": "http://121.36.37.70:8906/",
+        "secure": false,
+        "ws": true,
+        "logLevel": "debug"
+    }
 }
--- a/src/app/babylon/controller/mode-manager.ts
+++ b/src/app/babylon/controller/mode-manager.ts
@ -31,8 +31,6 @@ export class ModeManager {
    public static isDebug = false;


-
-
    //#region 演示单单位

    //未指定演示单位，正常打开
--- a/src/assets/mesh/mark/inside/jyy/JYY.gltf.manifest
+++ b/src/assets/mesh/mark/inside/jyy/JYY.gltf.manifest
@ -1,5 +1,5 @@
 {
-  "version" : 1,
+  "version" : 2,
  "enableSceneOffline" : true,
  "enableTexturesOffline" : true
 }
--- a/src/assets/mesh/mark/inside/jyy/JiaYouYuan.jpg
+++ b/src/assets/mesh/mark/inside/jyy/JiaYouYuan.jpg
--- a/src/assets/mesh/mark/inside/syy/JiaYouYuan.jpg
+++ b/src/assets/mesh/mark/inside/syy/JiaYouYuan.jpg
--- a/src/assets/mesh/mark/inside/syy/SYY.gltf.manifest
+++ b/src/assets/mesh/mark/inside/syy/SYY.gltf.manifest
@ -1,5 +1,5 @@
 {
-  "version" : 1,
+  "version" : 2,
  "enableSceneOffline" : true,
  "enableTexturesOffline" : true
 }
--- a/src/assets/mesh/mark/inside/xyy/JiaYouYuan.jpg
+++ b/src/assets/mesh/mark/inside/xyy/JiaYouYuan.jpg
--- a/src/assets/mesh/mark/inside/xyy/XYY.gltf.manifest
+++ b/src/assets/mesh/mark/inside/xyy/XYY.gltf.manifest
@ -1,5 +1,5 @@
 {
-  "version" : 1,
+  "version" : 2,
  "enableSceneOffline" : true,
  "enableTexturesOffline" : true
 }
--- a/src/assets/mesh/mark/inside/ygcsj/JiaYouYuan.jpg
+++ b/src/assets/mesh/mark/inside/ygcsj/JiaYouYuan.jpg
--- a/src/assets/mesh/mark/inside/ygcsj/MaJia_BaseColor_png.png
+++ b/src/assets/mesh/mark/inside/ygcsj/MaJia_BaseColor_png.png
--- a/src/assets/mesh/mark/inside/ygcsj/YGCSJ.gltf.manifest
+++ b/src/assets/mesh/mark/inside/ygcsj/YGCSJ.gltf.manifest
@ -1,5 +1,5 @@
 {
-  "version" : 1,
+  "version" : 2,
  "enableSceneOffline" : true,
  "enableTexturesOffline" : true
 }
--- a/src/assets/mesh/mark/inside/yzzg/JiaYouYuan.jpg
+++ b/src/assets/mesh/mark/inside/yzzg/JiaYouYuan.jpg
--- a/src/assets/mesh/mark/inside/yzzg/YZZG.gltf.manifest
+++ b/src/assets/mesh/mark/inside/yzzg/YZZG.gltf.manifest
@ -1,5 +1,5 @@
 {
-  "version" : 1,
+  "version" : 2,
  "enableSceneOffline" : true,
  "enableTexturesOffline" : true
 }