diff --git a/README.md b/README.md index ef6b6a6..8dccd4d 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ ### 🌻 简介 > 时间:2022、4、1 周五 -> 根据中化要求,尽心优化和调整 +> 根据中化要求,进行优化和调整 ### 🌻 详情 @@ -282,8 +282,5 @@ - [🌱 新增] 无 - [🍀 完善] 无 - - > 时间:2022、7、8 周五 -> 迁移新的git仓库 测试 - +> 迁移新的 git 仓库 测试 diff --git a/proxy.config.json b/proxy.config.json index 58c7199..b4931e3 100644 --- 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" + } } \ No newline at end of file diff --git a/src/app/babylon/controller/mode-manager.ts b/src/app/babylon/controller/mode-manager.ts index 8b28322..4dceece 100644 --- 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 演示单单位 //未指定演示单位,正常打开 diff --git a/src/assets/mesh/mark/inside/jyy/JYY.gltf.manifest b/src/assets/mesh/mark/inside/jyy/JYY.gltf.manifest index 1781cb5..e369002 100644 --- 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 } \ No newline at end of file diff --git a/src/assets/mesh/mark/inside/jyy/JiaYouYuan.jpg b/src/assets/mesh/mark/inside/jyy/JiaYouYuan.jpg index 0ba8a30..9571e6a 100644 Binary files a/src/assets/mesh/mark/inside/jyy/JiaYouYuan.jpg and b/src/assets/mesh/mark/inside/jyy/JiaYouYuan.jpg differ diff --git a/src/assets/mesh/mark/inside/syy/JiaYouYuan.jpg b/src/assets/mesh/mark/inside/syy/JiaYouYuan.jpg index 0ba8a30..9571e6a 100644 Binary files a/src/assets/mesh/mark/inside/syy/JiaYouYuan.jpg and b/src/assets/mesh/mark/inside/syy/JiaYouYuan.jpg differ diff --git a/src/assets/mesh/mark/inside/syy/SYY.gltf.manifest b/src/assets/mesh/mark/inside/syy/SYY.gltf.manifest index 1781cb5..e369002 100644 --- 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 } \ No newline at end of file diff --git a/src/assets/mesh/mark/inside/xyy/JiaYouYuan.jpg b/src/assets/mesh/mark/inside/xyy/JiaYouYuan.jpg index 0ba8a30..9571e6a 100644 Binary files a/src/assets/mesh/mark/inside/xyy/JiaYouYuan.jpg and b/src/assets/mesh/mark/inside/xyy/JiaYouYuan.jpg differ diff --git a/src/assets/mesh/mark/inside/xyy/XYY.gltf.manifest b/src/assets/mesh/mark/inside/xyy/XYY.gltf.manifest index 1781cb5..e369002 100644 --- 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 } \ No newline at end of file diff --git a/src/assets/mesh/mark/inside/ygcsj/JiaYouYuan.jpg b/src/assets/mesh/mark/inside/ygcsj/JiaYouYuan.jpg index 0ba8a30..9571e6a 100644 Binary files a/src/assets/mesh/mark/inside/ygcsj/JiaYouYuan.jpg and b/src/assets/mesh/mark/inside/ygcsj/JiaYouYuan.jpg differ diff --git a/src/assets/mesh/mark/inside/ygcsj/MaJia_BaseColor_png.png b/src/assets/mesh/mark/inside/ygcsj/MaJia_BaseColor_png.png index c2f7b95..470514f 100644 Binary files a/src/assets/mesh/mark/inside/ygcsj/MaJia_BaseColor_png.png and b/src/assets/mesh/mark/inside/ygcsj/MaJia_BaseColor_png.png differ diff --git a/src/assets/mesh/mark/inside/ygcsj/YGCSJ.gltf.manifest b/src/assets/mesh/mark/inside/ygcsj/YGCSJ.gltf.manifest index 1781cb5..e369002 100644 --- 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 } \ No newline at end of file diff --git a/src/assets/mesh/mark/inside/yzzg/JiaYouYuan.jpg b/src/assets/mesh/mark/inside/yzzg/JiaYouYuan.jpg index 0ba8a30..9571e6a 100644 Binary files a/src/assets/mesh/mark/inside/yzzg/JiaYouYuan.jpg and b/src/assets/mesh/mark/inside/yzzg/JiaYouYuan.jpg differ diff --git a/src/assets/mesh/mark/inside/yzzg/YZZG.gltf.manifest b/src/assets/mesh/mark/inside/yzzg/YZZG.gltf.manifest index 1781cb5..e369002 100644 --- 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 } \ No newline at end of file