From 64fd068aecc4ed76cfa01b7335a4b936c4b94455 Mon Sep 17 00:00:00 2001 From: Teoxoy <28601907+Teoxoy@users.noreply.github.com> Date: Thu, 29 Mar 2018 08:42:51 +0200 Subject: [PATCH] fixed wrong filename --- src/app.ts | 12 ++++++------ src/spritesheets/entitySpritesheet.json | 4 ++-- src/spritesheets/extra_iconSpritesheet.json | 2 +- src/spritesheets/iconSpritesheet.json | 4 ++-- webpack.prod.js | 1 + 5 files changed, 12 insertions(+), 11 deletions(-) diff --git a/src/app.ts b/src/app.ts index 81660d65..03382e72 100644 --- a/src/app.ts +++ b/src/app.ts @@ -64,15 +64,15 @@ G.app.stage.addChild(infoContainer) PIXI.loader .add([ - { name: 'extra_iconSprites', url: 'spritesheets/extra_iconSpritesheet.json' }, - { name: 'iconSprites', url: 'spritesheets/iconSpritesheet.json' }, - { name: 'entitySprites', url: 'spritesheets/entitySpritesheet.json' } + { name: 'extra_iconSpritesheet', url: 'spritesheets/extra_iconSpritesheet.json' }, + { name: 'iconSpritesheet', url: 'spritesheets/iconSpritesheet.json' }, + { name: 'entitySpritesheet', url: 'spritesheets/entitySpritesheet.json' } ]) .load((_: any, resources: any) => { G.app.renderer.plugins.prepare - .add(resources.extra_iconSprites.spritesheet.baseTexture) - .add(resources.iconSprites.spritesheet.baseTexture) - .add(resources.entitySprites.spritesheet.baseTexture) + .add(resources.extra_iconSpritesheet.spritesheet.baseTexture) + .add(resources.iconSpritesheet.spritesheet.baseTexture) + .add(resources.entitySpritesheet.spritesheet.baseTexture) .upload(setup) }) diff --git a/src/spritesheets/entitySpritesheet.json b/src/spritesheets/entitySpritesheet.json index 68709540..28aec52b 100644 --- a/src/spritesheets/entitySpritesheet.json +++ b/src/spritesheets/entitySpritesheet.json @@ -1724,7 +1724,7 @@ "frame": { "x": 5765, "y": 311, "w": 2, "h": 2 }, "sourceSize": { "w": 2, "h": 2 } } - + }, - "meta": { "image": "entitySprites.png" } + "meta": { "image": "entitySpritesheet.png" } } diff --git a/src/spritesheets/extra_iconSpritesheet.json b/src/spritesheets/extra_iconSpritesheet.json index 839328b6..2a1af168 100644 --- a/src/spritesheets/extra_iconSpritesheet.json +++ b/src/spritesheets/extra_iconSpritesheet.json @@ -61,5 +61,5 @@ "sourceSize": { "w": 64, "h": 64 } } }, - "meta": { "image": "extra_iconSprites.png" } + "meta": { "image": "extra_iconSpritesheet.png" } } diff --git a/src/spritesheets/iconSpritesheet.json b/src/spritesheets/iconSpritesheet.json index 29241b26..9b3fd65c 100644 --- a/src/spritesheets/iconSpritesheet.json +++ b/src/spritesheets/iconSpritesheet.json @@ -1104,7 +1104,7 @@ "frame": { "x": 607, "y": 409, "w": 32, "h": 32 }, "sourceSize": { "w": 32, "h": 32 } } - + }, - "meta": { "image": "iconSprites.png" } + "meta": { "image": "iconSpritesheet.png" } } diff --git a/webpack.prod.js b/webpack.prod.js index 5bf29086..045cb9f6 100644 --- a/webpack.prod.js +++ b/webpack.prod.js @@ -4,6 +4,7 @@ const merge = require('webpack-merge') const common = require('./webpack.common.js') const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin const Visualizer = require('webpack-visualizer-plugin') +const OptimizeCssAssetsPlugin = require('optimize-css-assets-webpack-plugin') //const ClosureCompilerPlugin = require('webpack-closure-compiler') // https://webpack.github.io/analyse/