diff --git a/src/app/babylon/controller/data-manager.ts b/src/app/babylon/controller/data-manager.ts index c83168a..4befcff 100644 --- a/src/app/babylon/controller/data-manager.ts +++ b/src/app/babylon/controller/data-manager.ts @@ -63,7 +63,7 @@ export class DataManager { */ static allMarkPlanData: AllMarkPlanData; - static initDebugData(institutionKey: string, onSuccess?: (key: string) => void, onError?: (key: string, error: string) => void) { + static initDebugData(institutionID: number, onSuccess?: (key: string) => void, onError?: (key: string, error: string) => void) { //本地捏造消防设备列表信息 DataManager.initDebugData_facility(); @@ -75,7 +75,7 @@ export class DataManager { if (dataFromServe) { - ServeManager.instance.getInstitutionData(institutionKey, (key, result) => { + ServeManager.instance.getInstitutionData(institutionID, (key, result) => { if (onSuccess) { DataManager.institutionData = plainToClass(InstitutionData, result); DataManager.institutionData.normalData.name = DataManager.institutionData_simple.name; @@ -352,7 +352,7 @@ export class DataManager { static init(simpleData: InsitutionDataSimple, onSuccess?: (key: string) => void) { DataManager.institutionData_simple = simpleData; - DataManager.initDebugData(simpleData.key, onSuccess); + DataManager.initDebugData(simpleData.id, onSuccess); } /** diff --git a/src/app/babylon/controller/serve-manager.ts b/src/app/babylon/controller/serve-manager.ts index 87a3a9e..6047f84 100644 --- a/src/app/babylon/controller/serve-manager.ts +++ b/src/app/babylon/controller/serve-manager.ts @@ -29,19 +29,19 @@ export class ServeManager { } //从服务器获取单位信息 - getInstitutionData(key: string = 'test', onSuccess?: (key: string, + getInstitutionData(id: number = 1, onSuccess?: (key: string, data: string ) => void, onError?: (key: string, error: any) => void) { - this.buildingBISrv.getBuildingBasicInfos(key) + this.buildingBISrv.getBuildingBasicInfos(id) .subscribe(data => { //console.log("得到单位信息" + key, data); if (onSuccess) { - onSuccess(key, JSON.parse((data as any).result)); + onSuccess(id.toString(), JSON.parse((data as any).result)); } }, error => { - console.error("From serve" + key + "===" + error); + console.error("From serve:" + id, error); if (onError) { - onError(key, error); + onError(id.toString(), error); } }) } diff --git a/src/app/babylon/controller/status/login-status.ts b/src/app/babylon/controller/status/login-status.ts index fb86051..2d17a32 100644 --- a/src/app/babylon/controller/status/login-status.ts +++ b/src/app/babylon/controller/status/login-status.ts @@ -61,7 +61,8 @@ export class LoginSatus extends StatusBase { // testIns1.key = "test"; // testIns1.name = "测试单位1"; // debugList.push(testIns1); - ServeManager.instance.getInstitutionData("InsList", (key, data) => { + // -1 = InsList + ServeManager.instance.getInstitutionData(-1, (key, data) => { debugList = plainToClass(InsitutionDataSimple, data); this.institutionList = debugList; if (onSuccess) { 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 16d1592..d3f5f6d 100644 --- a/src/app/babylon/model/info/mark/model-info-mark.ts +++ b/src/app/babylon/model/info/mark/model-info-mark.ts @@ -267,7 +267,9 @@ export class ModelInfo_mark extends ModelInfo { // instance.uiFollowHeadBg.widthInPixels = maxWidth; }, (50)); + console.log("喷水", this.taskNeedWaterParticle()); if (this.taskNeedWaterParticle()) { + this.sprinklingWater(true); } else { @@ -423,6 +425,9 @@ export class ModelInfo_mark extends ModelInfo { // } // } } + + console.log("喷头", this.node_pz); + if (this.node_pz == null) { result = false; } diff --git a/src/app/babylon/model/info/mark/other/mark-plan-particle-info.ts b/src/app/babylon/model/info/mark/other/mark-plan-particle-info.ts index 7222579..e7dd2de 100644 --- a/src/app/babylon/model/info/mark/other/mark-plan-particle-info.ts +++ b/src/app/babylon/model/info/mark/other/mark-plan-particle-info.ts @@ -68,6 +68,7 @@ export class ModelInfo_mark_particle extends ModelInfo_mark { // instance.modelBox.scaling = new Vector3(100, 300, 100); ps.emitter = root; instance.particleSet.systems.push(ps); + console.log(ps.name, instance.isPlaying); if (instance.isPlaying) { instance.particleSet.start(); } @@ -127,6 +128,7 @@ export class ModelInfo_mark_particle extends ModelInfo_mark { dispose() { if (this.particleSet != null) { + console.log("释放粒子", this.particleSet); this.particleSet.dispose(); } super.dispose(); diff --git a/src/app/babylon/tool/particle-system-tool.ts b/src/app/babylon/tool/particle-system-tool.ts index 28d7f8f..fdf13fc 100644 --- a/src/app/babylon/tool/particle-system-tool.ts +++ b/src/app/babylon/tool/particle-system-tool.ts @@ -40,6 +40,7 @@ export class ParticleSystemTool { let instance = this; ParticleHelper.ParseFromFileAsync(null, path, this.scene, false).then((value: ParticleSystem) => { value.stop(); + value.name += "(prefab)"; instance.psPool.set(path, value); if (clone) { let result = instance.cloneParticle(value, name); @@ -65,10 +66,11 @@ export class ParticleSystemTool { if (instance.psPool.has(path)) { let set = instance.psPool.get(path); let result = instance.cloneParticle(set, name); + console.log("克隆特效", name); onSuccess(result); } else { - + console.log("加载特效", name); instance.loadPrefab(null, path, true, (value: ParticleSystem) => { onSuccess(value); }) diff --git a/src/app/service/babylon/building-basic-infos.service.ts b/src/app/service/babylon/building-basic-infos.service.ts index 5b54c29..0a410c2 100644 --- a/src/app/service/babylon/building-basic-infos.service.ts +++ b/src/app/service/babylon/building-basic-infos.service.ts @@ -27,8 +27,8 @@ export class BuildingBasicInfosService { /** * 获取三维信息 */ - getBuildingBasicInfos(name: string): Observable { - return this.getInfos(this.api_buildingInfo, name); + getBuildingBasicInfos(id: number): Observable { + return this.getInfos(this.api_buildingInfo, { gasStationId: id }); } /** * 保存三维信息 @@ -44,7 +44,7 @@ export class BuildingBasicInfosService { * @param name */ getMarkData(name: string): Observable { - return this.getInfos(this.api_sandBox, name); + return this.getInfos(this.api_sandBox, { "name": name }); } /** @@ -78,10 +78,10 @@ export class BuildingBasicInfosService { * @param api * @param name */ - getInfos(api: string, name: string) { - let id = { "name": name }; + getInfos(api: string, params = {}) { - return this.http.get(api + this.c_get, { params: id }).pipe( + + return this.http.get(api + this.c_get, { params: params }).pipe( catchError((err) => this.handleError(err)) ); }