diff --git a/README.md b/README.md index 81cb8db..1644865 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,30 @@ # 中国石化加油站项目 +## 🌼v1.0.3 主要变化 修改 bug，部署测试 + +### 🌻 简介 + +> 时间：2021、12、8 周三 +> 修复 bug，三维优化 + +### 🌻 详情 + +> 前端部分 + +- [🚩 重大变更] 无 +- [🌱 新增] 无 +- [🍀 完善] 无 + +> 三维部分 + +- [🚩 重大变更] 无 +- [🌱 新增] 无 +- [🍀 完善] 修复分块上传路径拼接使用错误变量的问题 +- [🍀 完善] 优化应急中的操作： 取消模型不可见的外框可以被选中的问题。 增加右键取消高亮的功能。 非选中状态下，不再允许拖拽。 +- [🍀 完善] 尝试修复因升级 obs（解决大小写变换问题）而导致的消防车和消防员加载不出来的问题 +- [🍀 完善] 延迟应急中人物任务 ui 的更新时间，尝试修复背景框自适应不正确的问题 +- [🍀 完善] 限制应急处置下、上传视频的格式 + ## 🌼v1.0.2 主要变化 修改 bug，部署测试 ### 🌻 简介 diff --git a/src/app/babylon/controller/event-manager/event-manager.ts b/src/app/babylon/controller/event-manager/event-manager.ts index c623545..854b93d 100644 --- a/src/app/babylon/controller/event-manager/event-manager.ts +++ b/src/app/babylon/controller/event-manager/event-manager.ts @@ -74,7 +74,6 @@ export class EventManager { let instance = EventManager.getEvent(c); - console.log("添加监听", instance.key); return instance.observable.add(callback, mask, insertFirst, scope, unregisterOnFirstCall); } @@ -136,7 +135,6 @@ class EventContainer { //this.key = c.name; this.key = obj.getTypeKey(); - console.log("EventContainer===" + this.key); this.observable = new Observable(); } } \ No newline at end of file diff --git a/src/app/babylon/controller/serve-manager.ts b/src/app/babylon/controller/serve-manager.ts index 327df3d..99f774d 100644 --- a/src/app/babylon/controller/serve-manager.ts +++ b/src/app/babylon/controller/serve-manager.ts @@ -213,9 +213,10 @@ export class ServeManager { let dataObj = data as any; let fileName = dataObj.fileName; let filePath: string = dataObj.objectName;//此路径不全，前面缺少ObjectsService.baseUrl，这部分不可序列化，要在运行时拼接 - //console.log("上传完成，地址为", filePath); + filePath = filePath.replace(fileName, "");//去掉结尾的文件名 //filePath = ObjectsService.baseUrl + filePath; + console.log("上传完成，地址为", filePath, fileName); ServeManager.instance.onGetPostFileResult(fileName, filePath, file); resolve('success') }); @@ -243,7 +244,8 @@ export class ServeManager { ServeManager.instance.objectsSrv.postFile_MultipartUpload(this.postFilePath, file).then((value) => { let dataObj = value as any; console.log("分块上传完成", dataObj.filePath); - dataObj.filePath = dataObj.filePath.replace(dataObj.name, ""); //去掉结尾的文件名 + dataObj.filePath = dataObj.filePath.replace(dataObj.fileName, ""); //去掉结尾的文件名 + console.log(dataObj.filePath, dataObj.fileName, dataObj.name); ServeManager.instance.onGetPostFileResult(dataObj.fileName, dataObj.filePath, file); }); diff --git a/src/app/babylon/model/info/mark/model-info-mark.ts b/src/app/babylon/model/info/mark/model-info-mark.ts index 8a79389..d6dc2e3 100644 --- a/src/app/babylon/model/info/mark/model-info-mark.ts +++ b/src/app/babylon/model/info/mark/model-info-mark.ts @@ -207,12 +207,13 @@ export class ModelInfo_mark extends ModelInfo { }) } else { - //this.pointerDragBehavior.enabled = true; + this.pointerDragBehavior.enabled = true; } - //特效类、灭火器类，要出现坐标轴 + //特效类、灭火器类、文字标注，要出现坐标轴 if (this.markData.markKindType == MarkKindType.Effect - || TsTool.stringContain(this.markData.type, "MHQ")) { + || TsTool.stringContain(this.markData.type, "MHQ") + || this.markData.type == MarkType.WZ) { GizmoTool.onPickMeshInfoObservable.notifyObservers(this); } else { @@ -227,7 +228,7 @@ export class ModelInfo_mark extends ModelInfo { //GizmoTool.onPickMeshInfoObservable.notifyObservers(null); SceneManager.Instance.removeFromHighLight(this.modelBox as Mesh) if (this.pointerDragBehavior != null) { - //this.pointerDragBehavior.enabled = false; //停止拖拽 + this.pointerDragBehavior.enabled = false; //停止拖拽 } } @@ -264,7 +265,7 @@ export class ModelInfo_mark extends ModelInfo { let maxWidth = Math.max(numWidth, taskWidth, this.c_uiDefaultWidth); instance.uiFollowHead.widthInPixels = maxWidth; // instance.uiFollowHeadBg.widthInPixels = maxWidth; - }, (50)); + }, (100)); // console.log("喷水", this.taskNeedWaterParticle()); if (this.taskNeedWaterParticle()) { diff --git a/src/app/babylon/view/building-window/building-window.ts b/src/app/babylon/view/building-window/building-window.ts index 5669b94..ac5c905 100644 --- a/src/app/babylon/view/building-window/building-window.ts +++ b/src/app/babylon/view/building-window/building-window.ts @@ -249,8 +249,9 @@ export class BuildingWindow extends UIBase { } else {//恢复查看状态 - this.recoverMoudleShow(type); + } + this.recoverMoudleShow(type); } else { if (type == JYZInfoMoudleType.YJCZ) { diff --git a/src/app/babylon/view/mark-window/mark-window.ts b/src/app/babylon/view/mark-window/mark-window.ts index 9533696..9d9390f 100644 --- a/src/app/babylon/view/mark-window/mark-window.ts +++ b/src/app/babylon/view/mark-window/mark-window.ts @@ -856,6 +856,10 @@ export class MarkWindow extends UIBase { // instance.selectMarkDataFrom3d(instance.currentMarkInfo, false); //暂时没有右键取消选中实例的功能 if (!SceneManager.s_isPointerDrag) { instance.selectMarkDataPrefabFrom3d(instance.currentMarkDataPrefab, false) + if (instance.currentMarkNodeInfo != null) { + //取消选中 + instance.selectMarkDataFrom3d(instance.currentMarkInfo, false); + } } @@ -1161,8 +1165,8 @@ export class MarkWindow extends UIBase { markInfo = meshPoolInfo.modelInfo as ModelInfo_mark; markInfo.belongToBuilding = buildingInfo; instance.setMarkTransform(isLocalPos, isNew, buildingInfo, markInfo.modelBox, markInfo); - markInfo.modelBox.isPickable = true; - console.log("成功创建模型", markInfo); + // markInfo.modelBox.isPickable = true; //避免超大的透明选中区 + // console.log("成功创建模型", markInfo); instance.currentMarkNodeInfo.addMarkInfo(markInfo, isNew); markInfo.onCreate(isNew); Event_MarkInfoChange.dispatch(MarkInfoChangeType.Create, markInfo);