common-game
Advanced tools
Comparing version 0.0.30 to 0.0.31
{ | ||
"name": "common-game", | ||
"version": "0.0.30", | ||
"version": "0.0.31", | ||
"description": "", | ||
@@ -5,0 +5,0 @@ "main": "common-game.js", |
@@ -183,4 +183,4 @@ import * as PIXI from "@tbminiapp/pixi-miniprogram-engine"; | ||
// 2.遍历图片资源 并 去重 | ||
let imgArr = []; | ||
Utils.only(this.namespace, imgs, imgArr); | ||
let imgArr = [], afterLoadArr = []; | ||
Utils.only(this.namespace, imgs, imgArr, afterLoadArr); | ||
@@ -197,3 +197,8 @@ if (imgArr.length == 0) { | ||
}) | ||
this.pixiLoadFun(loader, callback); | ||
this.pixiLoadFun(loader, () => { | ||
if (callback) { | ||
callback(); | ||
} | ||
this.loadAfterImg(afterLoadArr); | ||
}); | ||
} else { | ||
@@ -203,4 +208,13 @@ if (callback) { | ||
} | ||
this.loadAfterImg(afterLoadArr); | ||
} | ||
} | ||
loadAfterImg(imgs) { | ||
if (imgs.length == 0) { return false; } | ||
let loader = new PIXI.loaders.Loader(); | ||
imgs.forEach(item => { | ||
loader.add(Utils.uniId(), item); | ||
}) | ||
this.pixiLoadFun(loader); | ||
} | ||
// 读取进度 | ||
@@ -207,0 +221,0 @@ pixiLoadFun(loader, callback) { |
12
utils.js
@@ -37,6 +37,10 @@ export default { | ||
// 去重 | ||
only: function (nameSpace, data, imgArr) { | ||
this.traverse(nameSpace, data, (k, v) => { | ||
only: function (nameSpace, data, imgArr, afterLoadArr) { | ||
this.traverse(nameSpace, data, (k, v, afterLoad) => { | ||
if (k == "src" && !!v && !imgArr.includes(v)) { | ||
imgArr.push(v); | ||
if (afterLoad) { | ||
afterLoadArr.push(v); | ||
} else { | ||
imgArr.push(v); | ||
} | ||
} | ||
@@ -92,3 +96,3 @@ }) | ||
RootObj[name] = v; | ||
callback(name, obj[name]); | ||
callback(name, obj[name], !!obj.afterLoad); | ||
} | ||
@@ -95,0 +99,0 @@ } |
48270
1374