From 1d2c1c337ef3f3fc2b6db8e4c9e625074fe0ec57 Mon Sep 17 00:00:00 2001 From: joylink_fanyuhong <18706759286@163.com> Date: Mon, 11 Nov 2024 17:56:21 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/graphics/FAS/fireShutter/FireShutter.json | 21 ------------------ src/graphics/FAS/fireShutter/FireShutter.png | Bin 988 -> 0 bytes src/graphics/FAS/fireShutter/FireShutter.ts | 18 ++++++++++----- .../FAS/smokeDetector/SmokeDetector.json | 21 ------------------ .../FAS/smokeDetector/SmokeDetector.png | Bin 650 -> 0 bytes src/graphics/FAS/sprayPump/SprayPump.json | 21 ------------------ src/graphics/FAS/sprayPump/SprayPump.png | Bin 1755 -> 0 bytes src/graphics/FAS/sprayPump/SprayPump.ts | 20 +++++++++++------ 8 files changed, 26 insertions(+), 75 deletions(-) delete mode 100644 src/graphics/FAS/fireShutter/FireShutter.json delete mode 100644 src/graphics/FAS/fireShutter/FireShutter.png delete mode 100644 src/graphics/FAS/smokeDetector/SmokeDetector.json delete mode 100644 src/graphics/FAS/smokeDetector/SmokeDetector.png delete mode 100644 src/graphics/FAS/sprayPump/SprayPump.json delete mode 100644 src/graphics/FAS/sprayPump/SprayPump.png diff --git a/src/graphics/FAS/fireShutter/FireShutter.json b/src/graphics/FAS/fireShutter/FireShutter.json deleted file mode 100644 index c39d0da..0000000 --- a/src/graphics/FAS/fireShutter/FireShutter.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "frames": { - "normal.png": { - "frame": { "x": 0, "y": 0, "w": 33, "h": 33 }, - "rotated": false, - "trimmed": false, - "spriteSourceSize": { "x": 0, "y": 0, "w": 33, "h": 33 }, - "sourceSize": { "w": 33, "h": 33 }, - "anchor": { "x": 0.5, "y": 0.5 } - } - }, - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "1.1", - "image": "FireShutter.png", - "format": "RGBA8888", - "size": { "w": 33, "h": 33 }, - "scale": "1", - "smartupdate": "$TexturePacker:SmartUpdate:e7620bd2d73cc0b3e2deea9704e7eefc:f129a1d9e4b9ba57720b3861c22b155b:eb2d421f7759984b7713aa4aa5354134$" - } -} diff --git a/src/graphics/FAS/fireShutter/FireShutter.png b/src/graphics/FAS/fireShutter/FireShutter.png deleted file mode 100644 index 8fca74f887a0be0e8fdcbf61861da88cfcf52ba1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 988 zcmV<210(#2P)+(*4M)A$(6K32(aud#nc|?**^V%2)~@OLWd=s<^0C-a zDofgA$;t7eq*y_A0>ygK|IInP@AL8F{GSJo(AU?e7z_s1N^^5_ND~tiu#Q(+-{joI9zw!2d0Ui> z0a~=j0g%!M!JjfKB1itj;~wXWoru@0QAkCKQd$k~vss!n8N=_zz~cPoHuJLWwC&GiTP?w2zZER=EiGcTeb z^3W66>CCjG zdI&iNN)l`jJGeajBRK~6b;b+8v~Qe_7v9EcZ{m}0-p?39)nLj|*kAt~k2f^Z{`vt< z9Q%-(^4)CI6#%fW*}=yr&!H#^Gvl))Ln?>-pM&}Jd-MMqt0)Seo_?37pK2lG*Whwp z#crPqCXU|?Bl}Z6H zI5>nhUr#I+2f${tpeUKGyXu(;-29E|>PiX>My%GIh~iReGMU6XBI!ZqMFAlLMPK8;Qpvw6-=c-?gQAg zO^tY`MpXf*hFDyPpx5WGIJkx1b6`T)@Bv@9-0X=tcheF#w$k!2Zxv9W0Y z3$=#?!0GArU39i`O#g6NNXJ;t#ydBq!ITJ0QHWS{`2PP-hTm*={y^bV;7qM0000< KMNUMnLSTZe@yWLU diff --git a/src/graphics/FAS/fireShutter/FireShutter.ts b/src/graphics/FAS/fireShutter/FireShutter.ts index 1f5104a..cabeb67 100644 --- a/src/graphics/FAS/fireShutter/FireShutter.ts +++ b/src/graphics/FAS/fireShutter/FireShutter.ts @@ -1,8 +1,8 @@ import { GraphicData, JlGraphic, JlGraphicTemplate } from 'jl-graphic'; import { Assets, Sprite, Spritesheet, Texture } from 'pixi.js'; // import { iscsGraphicData } from 'src/protos/iscs_graphic_data'; -import FireShutterJson from './fireShutter.json'; -import FireShutterAssets from './fireShutter.png'; +import FasDeviceJson from '../pndDevice/PngDevice.json'; +import FasDeviceAssets from '../pndDevice/FasDevice.png'; export interface IFireShutterData extends GraphicData { get code(): string; @@ -11,6 +11,10 @@ export interface IFireShutterData extends GraphicData { interface FireShutterTextures { normal: Texture; + alarm: Texture; + fall: Texture; + interruption: Texture; + halfFall: Texture; } export class FireShutter extends JlGraphic { @@ -52,11 +56,15 @@ export class FireShutterTemplate extends JlGraphicTemplate { throw new Error('资源未加载/加载失败'); } async loadAssets(): Promise { - const texture = await Assets.load(FireShutterAssets); - const fireShutterSheet = new Spritesheet(texture, FireShutterJson); + const texture = await Assets.load(FasDeviceAssets); + const fireShutterSheet = new Spritesheet(texture, FasDeviceJson); const result = await fireShutterSheet.parse(); this.fireShutterTextures = { - normal: result['normal.png'], + normal: result['fireShutterNormal.png'], + alarm: result['fireShutterAlarm.png'], + fall: result['fireShutterFall.png'], + interruption: result['fireShutterInterruption.png'], + halfFall: result['fireShutterHalfFall.png'], }; return this.fireShutterTextures as FireShutterTextures; } diff --git a/src/graphics/FAS/smokeDetector/SmokeDetector.json b/src/graphics/FAS/smokeDetector/SmokeDetector.json deleted file mode 100644 index f3f9546..0000000 --- a/src/graphics/FAS/smokeDetector/SmokeDetector.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "frames": { - "normal.png": { - "frame": { "x": 0, "y": 0, "w": 21, "h": 11 }, - "rotated": false, - "trimmed": false, - "spriteSourceSize": { "x": 0, "y": 0, "w": 21, "h": 11 }, - "sourceSize": { "w": 21, "h": 11 }, - "anchor": { "x": 0.5, "y": 0.5 } - } - }, - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "1.1", - "image": "SmokeDetector.png", - "format": "RGBA8888", - "size": { "w": 21, "h": 11 }, - "scale": "1", - "smartupdate": "$TexturePacker:SmartUpdate:e7620bd2d73cc0b3e2deea9704e7eefc:f129a1d9e4b9ba57720b3861c22b155b:eb2d421f7759984b7713aa4aa5354134$" - } -} diff --git a/src/graphics/FAS/smokeDetector/SmokeDetector.png b/src/graphics/FAS/smokeDetector/SmokeDetector.png deleted file mode 100644 index debcf835afd7333a371c9018f302534472c95048..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 650 zcmV;50(Jd~P)VHAh)|61?6ojsrFq>NzB=ond9iu83*K}2Gq zG;>f;9YoM=bQRq|2SGv9LD5kWL0}k!6+sCimf#0DjgF)9vG;!0>R`HnAJ0QG561R0 zm3V&$->E8#iC6()Wg#IUf(ToNQ&oZ$QigzSPz}0va(3zOPZ+Tcf~YtMvvI;;B`Aad zB|xD7gH;6p7{rhUw<^o_Qs!nMUpziB;-?epR3M}vB83APapVz19WzIOaA?H?h^$*% z*;)*L*kb&2{d?p0dfT(sh#@i*kb+3N#6+G^*YcH{P-9^tpDB{i3uC^i?wCUS6gd~Z zc=_tx>$hJQKh?Pwgl!ybs2H+QxNFTG=|G!9%YazHS|XP6yjE(oaN^dT+tmvv z)WheWZ8GT=1}pKZO4t+Snk^eXN=JKboA9&lkcr~0C7L;Z(T^Db05bpp3QS+S(w`h? zrZ@VsMSsY}2Vr}o^norj5XJN27qutZ9c6dBO<(!OEVSc<0Re%)xm@n@nXB!Z+i%pd zl4@>8;XZ<9;I_C~bKZLQ_Rg+r)48J;@`Yhg$Fl`G3j%PdRQgbVmPn_LAXgb(j{nLA z8=jjq)_Q%bhbw#AwQ8+2TZRJk|G)xJRU!s3GBP}_)AMgW`egO}u?CP7nb90CY1CeSl2MH2?qr07*qoM6N<$f;#^q0{{R3 diff --git a/src/graphics/FAS/sprayPump/SprayPump.json b/src/graphics/FAS/sprayPump/SprayPump.json deleted file mode 100644 index 9ce17f2..0000000 --- a/src/graphics/FAS/sprayPump/SprayPump.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "frames": { - "normal.png": { - "frame": { "x": 0, "y": 0, "w": 22, "h": 46 }, - "rotated": false, - "trimmed": false, - "spriteSourceSize": { "x": 0, "y": 0, "w": 22, "h": 46 }, - "sourceSize": { "w": 22, "h": 46 }, - "anchor": { "x": 0.5, "y": 0.5 } - } - }, - "meta": { - "app": "https://www.codeandweb.com/texturepacker", - "version": "1.1", - "image": "SprayPump.png", - "format": "RGBA8888", - "size": { "w": 27, "h": 26 }, - "scale": "1", - "smartupdate": "$TexturePacker:SmartUpdate:e7620bd2d73cc0b3e2deea9704e7eefc:f129a1d9e4b9ba57720b3861c22b155b:eb2d421f7759984b7713aa4aa5354134$" - } -} diff --git a/src/graphics/FAS/sprayPump/SprayPump.png b/src/graphics/FAS/sprayPump/SprayPump.png deleted file mode 100644 index 01acaf835209ec1c089c9817d4b7ddc1a6ee7fe3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1755 zcmV<11|<23P)5500009a7bBm000ie z000ie0hKEb8vpKm&=bFR~3i9b8kJmyLx)YGqxN?juWI{JIIj`F^`x> z5D5#StRgvrZNw_sl0PBdut8+W9!HA8ir54x0x1UB0Yog>kxcA`jmeBX?V0IEb$8vW zdk>51879-iWEQaFN~La8u_72%h$2>sg8Nsm zqU|2 z=*$`7EW?&%t(!4mE#dZUSYHQgnN@fX@Yd4d5IJ&$#q;M$jvuGm+}sAFk3UZTjW;OX zd=sX5ePA$v7z25Z?{*2pVSSU6+l3MfAh{KC1H)x;51tHrp{z%&|2qk*I;635syC8!dd!;QzdvZNf3VKCq)osNF+ z+xNKn@eP>)uiU-MV@ZrpQ(T%djv^XyOcKW=QG~G;Ri*SESC&l5l5thx@|+vSFzWZW zSu?8tAddBPS#HbFm_B`H1Y2@UfZ_D>7rR(98sCf)PRB9cm^x2IFd`W0R;bh|hbpL| zs@zjxlz)aZ)0Xaza`_Wdx63JHXCWwcKk?IEoU8KdQ9g6>JuC0(D3?=ds`J*O#!#t} zPW{gVlc{s8hroxkY65#`{L2KZ1?1?h&{DyOjP+BFhcl42(0GAZQe}8 z&xvp%iddXFL!j;tX8K*G`Wa)0MfjdE{6m%NMZxNRQUqft%aWmU1Z&X{YH$byRg5u+ z2r?~kNfN3g!S6c!tb+`PoNu@J^0UwK#bd{qZ?$MPo3yixG)>7zBgW$~d7iU6neg$& zi@dP9%KaqWADmVdfA@iGd71fBr?88QNT);d&>_e&%FRv2{XV^o4L%)>_~haxocFAc zK4)O@K-(JHlY++PW^JU-VagI|HnIIa(Qru8>(QD_n44zH?lo(#|E2YR@c$khEiN2V z8%4OXq}SWr!@Ul^=I1(^BnhgD`RVJgbNlu!zV_{J0re~vf}$ZD2o`qqzV^ZbSFT>+ z;-yPOWm(ee_j&D=SNPGZuj;2SzR35V{Vq#So?jJue`RB8)No^1=n& z+8T{U1Ls@~URzt^=FOYj?soaHwb(euT1#XtaU7GTDa~e+R;z`o;+!K%65?mSueBsizpc^A65hiqQ!1o}wri3J5Ji*WtgHH`QC{=MJv&%1Z2y#IGow-#dz zA%yLhx;YwgE&GfZ)TOX+^ z4oxPssAsr2Yw5IF#MUx#j^SiNF9asQdXlh`ru=L$*uT*q6=5k!=p;$q7o{{(1 zs-iT8&~Df6ty(*{Dqm=2y0XJXX28qF@R%_)MF=AGi!cU>V*(H}b?T{e7@()h;mWhJ xU&I4d)>Ub3 { throw new Error('资源未加载/加载失败'); } async loadAssets(): Promise { - const texture = await Assets.load(SparyPumpAssets); - const sprayPumpSheet = new Spritesheet(texture, SprayPumpJson); + const texture = await Assets.load(FasDeviceAssets); + const sprayPumpSheet = new Spritesheet(texture, FasDeviceJson); const result = await sprayPumpSheet.parse(); this.sprayPumpTextures = { - normal: result['normal.png'], + run: result['sprayPumpRun.png'], + stop: result['sprayPumpStop.png'], + fault: result['sprayPumpFault.png'], + interruption: result['sprayPumpInterruption.png'], }; return this.sprayPumpTextures as SprayPumpTextures; }