From 1d5e294112c74d532fd222adbc70b8d3537054d2 Mon Sep 17 00:00:00 2001 From: liuxianghui <519646741@qq.com> Date: Wed, 8 Dec 2021 11:30:52 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=88=86=E5=9D=97=E4=B8=8A?= =?UTF-8?q?=E4=BC=A0=E8=B7=AF=E5=BE=84=E6=8B=BC=E6=8E=A5=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=E9=94=99=E8=AF=AF=E5=8F=98=E9=87=8F=E7=9A=84=E9=97=AE=E9=A2=98?= =?UTF-8?q?=20=E4=BC=98=E5=8C=96=E5=BA=94=E6=80=A5=E4=B8=AD=E7=9A=84?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=EF=BC=9A=20=E5=8F=96=E6=B6=88=E6=A8=A1?= =?UTF-8?q?=E5=9E=8B=E4=B8=8D=E5=8F=AF=E8=A7=81=E7=9A=84=E5=A4=96=E6=A1=86?= =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E8=A2=AB=E9=80=89=E4=B8=AD=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E3=80=82=20=E5=A2=9E=E5=8A=A0=E5=8F=B3=E9=94=AE?= =?UTF-8?q?=E5=8F=96=E6=B6=88=E9=AB=98=E4=BA=AE=E7=9A=84=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E3=80=82=20=E9=9D=9E=E9=80=89=E4=B8=AD=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E4=B8=8B=EF=BC=8C=E4=B8=8D=E5=86=8D=E5=85=81=E8=AE=B8=E6=8B=96?= =?UTF-8?q?=E6=8B=BD=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../babylon/controller/event-manager/event-manager.ts | 2 -- src/app/babylon/controller/serve-manager.ts | 6 ++++-- src/app/babylon/model/info/mark/model-info-mark.ts | 11 ++++++----- .../babylon/view/building-window/building-window.ts | 3 ++- src/app/babylon/view/mark-window/mark-window.ts | 8 ++++++-- 5 files changed, 18 insertions(+), 12 deletions(-) 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);