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 8fca74f..0000000 Binary files a/src/graphics/FAS/fireShutter/FireShutter.png and /dev/null differ 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 debcf83..0000000 Binary files a/src/graphics/FAS/smokeDetector/SmokeDetector.png and /dev/null differ 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 01acaf8..0000000 Binary files a/src/graphics/FAS/sprayPump/SprayPump.png and /dev/null differ diff --git a/src/graphics/FAS/sprayPump/SprayPump.ts b/src/graphics/FAS/sprayPump/SprayPump.ts index 5d95efc..a340adf 100644 --- a/src/graphics/FAS/sprayPump/SprayPump.ts +++ b/src/graphics/FAS/sprayPump/SprayPump.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 SprayPumpJson from './SprayPump.json'; -import SparyPumpAssets from './SprayPump.png'; +import FasDeviceJson from '../pndDevice/PngDevice.json'; +import FasDeviceAssets from '../pndDevice/FasDevice.png'; export interface ISprayPumpData extends GraphicData { get code(): string; @@ -10,7 +10,10 @@ export interface ISprayPumpData extends GraphicData { } interface SprayPumpTextures { - normal: Texture; + run: Texture; + stop: Texture; + fault: Texture; + interruption: Texture; } export class SprayPump extends JlGraphic { @@ -25,7 +28,7 @@ export class SprayPump extends JlGraphic { this.sprayPumpTextures = sprayPumpTextures; this._sprayPump.anchor.set(0.5); this.addChild(this._sprayPump); - this._sprayPump.texture = this.sprayPumpTextures.normal; + this._sprayPump.texture = this.sprayPumpTextures.run; } get code(): string { return this.datas.code; @@ -52,11 +55,14 @@ export class SprayPumpTemplate extends JlGraphicTemplate { 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; }