diff --git a/src/app/babylon/controller/config-manager.ts b/src/app/babylon/controller/config-manager.ts index 1db46f5..a8801b0 100644 --- a/src/app/babylon/controller/config-manager.ts +++ b/src/app/babylon/controller/config-manager.ts @@ -87,6 +87,7 @@ export class ConfigManager { case FacilityType.XF_MHQ_PT_35: result = "35kg普通灭火器"; break; case FacilityType.XF_MHQ_GF_4: result = "4kg干粉灭火器"; 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_MHT: result = "灭火毯"; break; case FacilityType.XF_XFQ: result = "消防锹"; break; diff --git a/src/app/babylon/controller/data-manager.ts b/src/app/babylon/controller/data-manager.ts index de28f8a..4602630 100644 --- a/src/app/babylon/controller/data-manager.ts +++ b/src/app/babylon/controller/data-manager.ts @@ -442,9 +442,10 @@ export class DataManager { case FacilityType.XF_MHQ_PT_35: case FacilityType.XF_MHQ_GF_4: 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; - case FacilityType.JY_JYJ: result = new PropertyData_JYJ(key,"", "","", "","",); break; - case FacilityType.JY_YG: result = new PropertyData_YG(key,"", "","", "","",""); break; + case FacilityType.JY_JYJ: result = new PropertyData_JYJ(key, "", "", "", "", "",); break; + case FacilityType.JY_YG: result = new PropertyData_YG(key, "", "", "", "", "", ""); break; case FacilityType.JY_SYGX: result = new PropertyData_SYGX(key); break; case FacilityType.JY_YQHSGX: result = new PropertyData_YQHSGX(key); 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 aa080af..9cd43be 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 @@ -181,6 +181,10 @@ export enum FacilityType { * 干粉灭火器 - 36kg(手推) */ XF_MHQ_GF_35 = "XF_MHQ_GF_35", + /** + * 干粉灭火器 - 36kg(手推) + */ + XF_MHQ_GF_25 = "XF_MHQ_GF_25", /** * 灭火毯 */ diff --git a/src/app/babylon/view/facility-window/facility-window.ts b/src/app/babylon/view/facility-window/facility-window.ts index 619f341..bce8d59 100644 --- a/src/app/babylon/view/facility-window/facility-window.ts +++ b/src/app/babylon/view/facility-window/facility-window.ts @@ -577,6 +577,9 @@ export class FacilityWindow extends UIBase { else if (TsTool.stringContain(mesh.name, FacilityType.XF_MHQ_GF_8)) { this.createNewFacilityByMesh(mesh, FacilityType.XF_MHQ_GF_8); } + else if (TsTool.stringContain(mesh.name, FacilityType.XF_MHQ_GF_25)) { + this.createNewFacilityByMesh(mesh, FacilityType.XF_MHQ_GF_25); + } else if (TsTool.stringContain(mesh.name, FacilityType.XF_MHQ_GF_35)) { this.createNewFacilityByMesh(mesh, FacilityType.XF_MHQ_GF_35); } diff --git a/src/assets/images/facility/in/XF_MHQ_GF_25.png b/src/assets/images/facility/in/XF_MHQ_GF_25.png new file mode 100644 index 0000000..1814a11 Binary files /dev/null and b/src/assets/images/facility/in/XF_MHQ_GF_25.png differ