diff --git a/src/app/babylon/controller/config-manager.ts b/src/app/babylon/controller/config-manager.ts index ce1d165..1b36eb8 100644 --- a/src/app/babylon/controller/config-manager.ts +++ b/src/app/babylon/controller/config-manager.ts @@ -82,13 +82,16 @@ export class ConfigManager { case FacilityType.TPBZ: result = "图片"; break; case FacilityType.DWBZ: result = "点位"; break; //内建 + case FacilityType.XF_MHQ_PT_3: result = "3kg二氧化碳灭火器"; break; case FacilityType.XF_MHQ_PT_4: result = "4kg二氧化碳灭火器"; break; case FacilityType.XF_MHQ_PT_8: result = "8kg二氧化碳灭火器"; break; case FacilityType.XF_MHQ_PT_35: result = "35kg二氧化碳灭火器"; break; case FacilityType.XF_MHQ_GF_4: result = "4kg干粉灭火器"; break; + case FacilityType.XF_MHQ_GF_5: result = "5kg干粉灭火器"; break; case FacilityType.XF_MHQ_GF_8: result = "8kg干粉灭火器"; break; case FacilityType.XF_MHQ_GF_25: result = "25kg干粉灭火器"; break; case FacilityType.XF_MHQ_GF_35: result = "35kg干粉灭火器"; break; + case FacilityType.XF_MHQ_SJ_6: result = "6L水基灭火器"; break; case FacilityType.XF_MHT: result = "灭火毯"; break; case FacilityType.XF_XFQ: result = "消防锹"; break; case FacilityType.XF_XFT: result = "消防桶"; break; diff --git a/src/app/babylon/controller/data-manager.ts b/src/app/babylon/controller/data-manager.ts index 0d7a7aa..32aed92 100644 --- a/src/app/babylon/controller/data-manager.ts +++ b/src/app/babylon/controller/data-manager.ts @@ -476,10 +476,13 @@ export class DataManager { case FacilityType.TPBZ: result = new PropertyData_Base_IMG(key, "", "", "", facilityType); break; case FacilityType.DWBZ: result = new PropertyData_DWBZ(key, "", ""); break; //建筑模型内内置的 + case FacilityType.XF_MHQ_PT_3: case FacilityType.XF_MHQ_PT_4: case FacilityType.XF_MHQ_PT_8: case FacilityType.XF_MHQ_PT_35: + case FacilityType.XF_MHQ_SJ_6: case FacilityType.XF_MHQ_GF_4: + case FacilityType.XF_MHQ_GF_5: case FacilityType.XF_MHQ_GF_8: case FacilityType.XF_MHQ_GF_25: case FacilityType.XF_MHQ_GF_35: result = new PropertyData_MHQ(key, facilityType); break; diff --git a/src/app/babylon/model/data/model-data/model-data-facility.ts b/src/app/babylon/model/data/model-data/model-data-facility.ts index 109920a..8e1cee6 100644 --- a/src/app/babylon/model/data/model-data/model-data-facility.ts +++ b/src/app/babylon/model/data/model-data/model-data-facility.ts @@ -157,6 +157,10 @@ export enum FacilityType { //模型内置 + /** + * 二氧化碳灭火器 - 3kg + */ + XF_MHQ_PT_3 = "XF_MHQ_PT_3", /** * 二氧化碳灭火器 - 4kg */ @@ -174,6 +178,10 @@ export enum FacilityType { */ XF_MHQ_GF_4 = "XF_MHQ_GF_4", /** + * 干粉灭火器 - 5kg + */ + XF_MHQ_GF_5 = "XF_MHQ_GF_5", + /** * 干粉灭火器 - 8kg */ XF_MHQ_GF_8 = "XF_MHQ_GF_8", @@ -185,6 +193,10 @@ export enum FacilityType { * 干粉灭火器 - 36kg（手推） */ XF_MHQ_GF_25 = "XF_MHQ_GF_25", + /** + * 水基灭火器 - 6L + */ + XF_MHQ_SJ_6 = "XF_MHQ_SJ_6", /** * 灭火毯 */ diff --git a/src/app/babylon/view/facility-window/facility-window.ts b/src/app/babylon/view/facility-window/facility-window.ts index d34ee13..9d58f0a 100644 --- a/src/app/babylon/view/facility-window/facility-window.ts +++ b/src/app/babylon/view/facility-window/facility-window.ts @@ -592,6 +592,9 @@ export class FacilityWindow extends UIBase { if (TsTool.stringContain(mesh.name, FacilityType.XF_MHQ_GF_4)) { this.createNewFacilityByMesh(mesh, FacilityType.XF_MHQ_GF_4); } + else if (TsTool.stringContain(mesh.name, FacilityType.XF_MHQ_GF_5)) { + this.createNewFacilityByMesh(mesh, FacilityType.XF_MHQ_GF_5); + } else if (TsTool.stringContain(mesh.name, FacilityType.XF_MHQ_GF_8)) { this.createNewFacilityByMesh(mesh, FacilityType.XF_MHQ_GF_8); } @@ -601,6 +604,9 @@ export class FacilityWindow extends UIBase { else if (TsTool.stringContain(mesh.name, FacilityType.XF_MHQ_GF_35)) { this.createNewFacilityByMesh(mesh, FacilityType.XF_MHQ_GF_35); } + else if (TsTool.stringContain(mesh.name, FacilityType.XF_MHQ_PT_3)) { + this.createNewFacilityByMesh(mesh, FacilityType.XF_MHQ_PT_3); + } else if (TsTool.stringContain(mesh.name, FacilityType.XF_MHQ_PT_4)) { this.createNewFacilityByMesh(mesh, FacilityType.XF_MHQ_PT_4); } @@ -610,6 +616,9 @@ export class FacilityWindow extends UIBase { else if (TsTool.stringContain(mesh.name, FacilityType.XF_MHQ_PT_35)) { this.createNewFacilityByMesh(mesh, FacilityType.XF_MHQ_PT_35); } + else if (TsTool.stringContain(mesh.name, FacilityType.XF_MHQ_SJ_6)) { + this.createNewFacilityByMesh(mesh, FacilityType.XF_MHQ_SJ_6); + } else if (TsTool.stringContain(mesh.name, FacilityType.XF_MHT)) { this.createNewFacilityByMesh(mesh, FacilityType.XF_MHT); } @@ -746,7 +755,7 @@ export class FacilityWindow extends UIBase { for (let j = 0; j < infos.length; j++) { if (infos[j].modelData.resName == id) { result = true; - console.log("重复的设备，不添加"); + console.log("重复的设备，不添加", id); break; } } diff --git a/src/assets/images/facility/in/XF_MHQ_GF_5.png b/src/assets/images/facility/in/XF_MHQ_GF_5.png new file mode 100644 index 0000000..ab85f0d Binary files /dev/null and b/src/assets/images/facility/in/XF_MHQ_GF_5.png differ diff --git a/src/assets/images/facility/in/XF_MHQ_PT_3.png b/src/assets/images/facility/in/XF_MHQ_PT_3.png new file mode 100644 index 0000000..f46bcf0 Binary files /dev/null and b/src/assets/images/facility/in/XF_MHQ_PT_3.png differ diff --git a/src/assets/images/facility/in/XF_MHQ_SJ_6.png b/src/assets/images/facility/in/XF_MHQ_SJ_6.png new file mode 100644 index 0000000..53c1f8b Binary files /dev/null and b/src/assets/images/facility/in/XF_MHQ_SJ_6.png differ