Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/Sinopec-Anxin

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;

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;
 

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",
     /**
      * 灭火毯
      */

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);
         }