From d80b76565c47fe14732bfc72a1254cfef44b8330 Mon Sep 17 00:00:00 2001 From: liuxianghui <519646741@qq.com> Date: Wed, 24 Nov 2021 11:02:00 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=20=E5=B9=B2=E7=B2=89?= =?UTF-8?q?=E7=81=AD=E7=81=AB=E5=99=A825?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/babylon/controller/config-manager.ts | 1 + src/app/babylon/controller/data-manager.ts | 5 +++-- .../model/data/model-data/model-data-facility.ts | 4 ++++ .../view/facility-window/facility-window.ts | 3 +++ src/assets/images/facility/in/XF_MHQ_GF_25.png | Bin 0 -> 2715 bytes 5 files changed, 11 insertions(+), 2 deletions(-) create mode 100644 src/assets/images/facility/in/XF_MHQ_GF_25.png 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 0000000000000000000000000000000000000000..1814a1185a7115c8886245bda620dc8fd55818e6 GIT binary patch literal 2715 zcmV;M3S{+(P)Px)fNApXD5ywyZNr2u8EtnQCikEP7$z8sBCC#VnY1i!Ye_v6dINiFdu*mgmS5# zF$^HdKor0+5FcZW4g;yzLrqNs#WazMA$&z=Gcg)Di#bX%&=N#**ak^|bf$16|G+Aw^Tquk-BHo);GLIf;QVY@!qSof|`*@gjV>5SgUs=AYiN{uQj zGX01O?dHS&1y35$qaOff3Uu~7N{kzgC^+4;On5BV;Jpb%tVg#l09L*GZi!aAa4!+Q zt4HV=r(x`)<6YMsJny`*e758VfZ5*C(epBZZ{-s<$DaTBP@{JZh%yE30)h6(J|e8o zCFHCUJN9_1aC9_-7vf30nM%V{O12t7#=b*~d>c#y&>Zf$PXTYqXV)r637+(x+zC6! zRJ@Q#;^jmNDb^K=`Ba#G&Y=5(e(xRG1Y`|?=8nh}#CVB-{9yv%>=HZHdtA7*ybKN+ zXNhYX_79KX*`Xx5)ibjuSiC?It_(H${xBN|vpTmt+_Tuue2@s0Mxn2C zH8z`M&oJYcu^|b@nHUV}XH9DfHPyGz)ITc#E$xxNf$-Hrj4dVLGM5t@E6U-u+pvE) zg>8L9vx;13x50Y?tjv9tu$epEC&4|==a_|@#iD}%c4=YBc+C|KH1F#z)6IyRUTaIa=@eHz9$(_HM}&O z!mfdYW$zW@1er|P7kzk6U0i@L2|%Fzv)hQ2omN9X6M&yq&%@Pjry(`>#fH$DNEzbE zMa)c_gNwWmP6r?yIYPiP%e0&jG!uaR3u>{zKE6Hb9dD)5*wky?)gS{$gMQz+lK?cg zbu}xBJ*d|pBXm{(aByT48>0nX{G4L4rey-5riCFH0?i%W4=7Bx8*xl8Z8iY5_YL7d zI(Meu;BjG{$AzK*0J=Zq_imK{1j3OZ0nK`yGD4RPfQ>yd98Bjvt%{eZA62-E0ssS{ zpx+lDd8vt!<7Tg}^MNsk0njoPWwo^OlkT-P8@-Uv5wp+dDgeSCP1CNVKsa(Q0a=fW zW*wj4o67(&@Ed9gN5t%}E!5F${Mi8beLRVOkLJz+m%7UEWv8PkIY8LUgy+QyC|Uv( zO6KY|C;x{V;hwE865(EeuD9f54{e|?G?Z=3bc2pi&^BD%K!iv z5lK*-GRpMMs8PB(4?rN?-DmX?cq&M9830*a4TK|Y1S~Q-vwG?0HUMa+mX65VU|guz zA)|D282}LeMS+gUKH}V!AEQqH|AYYTrIv8d-2iVZ#K~N|b9n_Y(_Pfu_SqUmQC>P- z0Nh_&fiISp$XbEkQLGmsc^FzgFi>S5JUz$ZCk90~9MGq#vTAgBd6_Jy<+~g$1^}W1 zO&*7ZLB%`|OoYJH*-kUd1J2V!!|2SYvM{pTQId5*6bXRw3lX8UIUIRN0dCQ|B=yp* z^|-LP(hd8GV(Dyr;#Bz9U;+=<$0i!2c2Bwz9ZjAQJFc5cuGsi2*5!`uv zFrQle&zV0sw5VSCdJ=$+$gN<=VnLx}Q>7c%&MQafSO!;h_epVEs^;Nx_jvDsxaZ#% z8$zF|VS7ylE-Np?J0qhKs6Q>Jou)piF*ZhHI5uiwv6OJzp+?_B(*UrtH1@2o8cRw` zu%kbY=i*6OBEQ(_z|Z@JFraDJTWa$Ha4O^TqB8JmazrLd zs|JIQrxUiOqvy^~Oanmtu&OxvR>OQb(-T+UFV@%K;r=+@I8pJfR200nunre@MP*KS zyTL2{>&d9I)&NDP$=2h8mH@#-cLf{0+a~~>Rvlg*4p-UP@d1%+XE!}w{amfw=O@bC zt-c!U9!gABeH-jH2vAmc^-3LYHsn|L-?0p?jl>G=If{%pl`kBfKR)}XtN`)H%8uxD zHrAdp?LB~}z11?IJwA}Yo}pog9YKV_&i({M#rMaRZhSO4hF|x`aei4TcFnJnD`C?t zi{AcWqlOnsFZ+VQ z4}|>nTlLDy8v-*0HMd2sAO%ksvz(^a_!)G4nuhB`O|v&en@fUOxMVXm@l(WDZPHjv z*_iotX#B(A;ss%&f(@^LsR~42F_?E0dUh~s^htW^W>vc*xVYYQZ*xHa2t$?~iMq?m zwVOe>6+n%7XY_N*k`~c}BXQ-CiDRvP?&*{T127?ONpG*mnbdA0=3C5sXQ0OcW(+XV z!zq{Y;D>eNt*(U*%K(@(gqfP#BdbC9jzaWJ0E-JW@)HpKg`u_v8|vTC`#GFmoz?>| zL-WdyyUw=RY+q+6=K|~p!A}hFfzhd-&lAK4(P0pUNz;y~s{OBr&#L=KuQO)o{s(-y V^kX%wWCH*I002ovPDHLkV1g%#7F_@U literal 0 HcmV?d00001