@vpmedia/phaser 1.6.0 → 1.8.0

package/README.md

@@ -1,7 +1,7 @@
 @vpmedia/phaser
 ===============
 
-[![npm version](https://badge.fury.io/js/@vpmedia%2Fphaser.svg?v=1.6.0)](https://badge.fury.io/js/@vpmedia%2Fphaser)
+[![npm version](https://badge.fury.io/js/@vpmedia%2Fphaser.svg?v=1.8.0)](https://badge.fury.io/js/@vpmedia%2Fphaser)
 [![Node.js CI](https://github.com/vpmedia/phaser/actions/workflows/node.js.yml/badge.svg)](https://github.com/vpmedia/phaser/actions/workflows/node.js.yml)
 
 @vpmedia/phaser is the modern ECMAScript port of the popular Phaser game engine v2.6.2.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vpmedia/phaser",
-  "version": "1.6.0",
+  "version": "1.8.0",
   "description": "@vpmedia/phaser is the modern ECMAScript port of the popular Phaser game engine v2.6.2",
   "author": "Andras Csizmadia <andras@vpmedia.hu> (www.vpmedia.hu)",
   "license": "MIT",
@@ -21,16 +21,16 @@
   ],
   "main": "./src/index.js",
   "devDependencies": {
-    "eslint": "^8.33.0",
-    "eslint-config-prettier": "^8.6.0",
+    "eslint": "^8.36.0",
+    "eslint-config-prettier": "^8.7.0",
     "eslint-plugin-import": "^2.27.5",
     "eslint-plugin-jest": "^27.2.1",
-    "eslint-plugin-jsdoc": "^39.7.4",
+    "eslint-plugin-jsdoc": "^40.1.0",
     "eslint-plugin-prettier": "^4.2.1",
     "husky": "^8.0.3",
-    "jest": "^29.4.1",
-    "lint-staged": "^13.1.0",
-    "prettier": "^2.8.3"
+    "jest": "^29.5.0",
+    "lint-staged": "^13.2.0",
+    "prettier": "^2.8.5"
   },
   "scripts": {
     "test": "NODE_OPTIONS=--experimental-vm-modules jest --passWithNoTests",

package/src/phaser/core/loader.js

@@ -15,6 +15,9 @@ export default class {
     this.game = game;
     this.cache = game.cache;
     this.isLoading = false;
+    this.isLogging = false;
+    this.isUseRetry = false;
+    this.maxRetry = 1;
     this.hasLoaded = false;
     this.preloadSprite = null;
     this.crossOrigin = false;
@@ -456,10 +459,11 @@ export default class {
   asyncComplete(file, errorMessage = '') {
     file.loaded = true;
     file.error = !!errorMessage;
-    if (errorMessage) {
+    if (file.error) {
       file.errorMessage = errorMessage;
       console.warn(file, errorMessage);
     }
+    this.log('asyncComplete', file);
     this.processLoadQueue();
   }
 
@@ -552,6 +556,7 @@ export default class {
   }
 
   loadImageTag(file) {
+    this.log('loadImageTag', file);
     const _this = this;
     file.data = new Image();
     file.data.name = file.key;
@@ -566,7 +571,10 @@ export default class {
       }
     };
     file.data.onerror = () => {
-      if (file.data.onload) {
+      if (_this.isUseRetry && (!file.numRetry || file.numRetry < _this.maxRetry)) {
+        file.numRetry = !file.numRetry ? 1 : file.numRetry += 1;
+        _this.loadImageTag(file);
+      } else if (file.data.onload) {
         file.data.onload = null;
         file.data.onerror = null;
         _this.fileError(file);
@@ -576,6 +584,7 @@ export default class {
   }
 
   xhrLoad(file, url, type, onload, onerror) {
+    this.log('xhrLoad', file);
     const xhr = new XMLHttpRequest();
     xhr.open('GET', url, true);
     xhr.responseType = type;
@@ -814,6 +823,13 @@ export default class {
     }
   }
 
+  log(message, data = '') {
+    if (!this.isLogging) {
+      return;
+    }
+    console.log(`[Loader] ${message}`, data);
+  }
+
   totalLoadedFiles() {
     return this._loadedFileCount;
   }

package/src/phaser/display/bitmap_text.js

@@ -260,7 +260,7 @@ export default class extends DisplayObject {
   }
 
   get fill() {
-    return typeof this.tint === 'number' ? `#${this.tint.toString(16)}` : this.tint;
+    return typeof this.tint === 'number' ? `#${this.tint.toString(16).toUpperCase()}` : this.tint;
   }
 
   set fill(value) {