|
|
|
@ -415,13 +415,8 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV
|
|
|
|
|
}); |
|
|
|
|
this.on('createIcon', obj => { |
|
|
|
|
if (obj.assetData.GameMode === GameMode.BasicInformation) { |
|
|
|
|
// if (obj.assetData.IsFromBuilding) {
|
|
|
|
|
// this.canvasData.originalcompanyBuildingData.data[obj.assetData.Id] = obj.assetData;
|
|
|
|
|
// } else {
|
|
|
|
|
this.canvasData.originaleveryStoreyData.data[obj.assetData.Id] = obj.assetData; |
|
|
|
|
// }
|
|
|
|
|
} else { |
|
|
|
|
// console.log();
|
|
|
|
|
if (this.canvasData.selectPanelPoint.Data === undefined |
|
|
|
|
|| this.canvasData.selectPanelPoint.Data === null) { |
|
|
|
|
this.canvasData.selectPanelPoint.Data = new FloorNodeData(); |
|
|
|
@ -506,10 +501,11 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV
|
|
|
|
|
this.setPaintMode(PaintMode.endPaint); |
|
|
|
|
this.resetCanvas(); |
|
|
|
|
this.destroyBackgroundImage(); |
|
|
|
|
if (this.canvasData.selectStorey.imageUrl === null) { |
|
|
|
|
if (this.canvasData.selectStorey.imageUrl === null |
|
|
|
|
||this.canvasData.selectStorey.imageUrl === undefined) { |
|
|
|
|
return; |
|
|
|
|
} |
|
|
|
|
console.log(this.canvasData.selectStorey.imageUrl); |
|
|
|
|
|
|
|
|
|
await this.createBackgroundImage(this.canvasData.selectStorey.imageUrl); |
|
|
|
|
this.createFloorShape(); |
|
|
|
|
if (this.canvasData.gameMode === GameMode.Assignment) { |
|
|
|
@ -1179,6 +1175,7 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV
|
|
|
|
|
case PaintMode.Pipeline: |
|
|
|
|
if (this.canvasData.selectTemplateData.name !== '水带') { |
|
|
|
|
this.emit('createIcon', this.paintingShape); |
|
|
|
|
console.log("1"); |
|
|
|
|
this.paintingShape = null; |
|
|
|
|
} |
|
|
|
|
break; |
|
|
|
|