Fix AssetLibrary cache issue and uuid loader this issue

This commit is contained in:
pandamicro
2016-02-26 11:41:35 +08:00
parent fa2d62605d
commit c478ae6b67
2 changed files with 6 additions and 6 deletions
+2 -2
View File
@@ -94,7 +94,7 @@ function loadUuid (item, callback) {
}
var pipeline = this.pipeline;
if (depends.length > 0) {
this.pipeline.flowInDeps(depends, function (items) {
pipeline.flowInDeps(depends, function (items) {
var item;
for (var src in items) {
item = items[src];
@@ -113,7 +113,7 @@ function loadUuid (item, callback) {
obj[dependProp] = value;
}
else {
this.getItems().add(dependSrc, function (item) {
pipeline.getItems().add(dependSrc, function (item) {
var value = item.isRawAsset ? (item.url || item.src) : item.content;
this.obj[this.prop] = value;
}, {
+4 -4
View File
@@ -170,14 +170,14 @@ var AssetLibrary = {
}
if (thisTick) {
callInNextTick(function () {
if (isScene(asset)) {
if (isScene(asset) || CC_EDITOR) {
Loader.removeItem(uuid);
}
callback(error, asset);
});
}
else {
if (isScene(asset)) {
if (isScene(asset) || CC_EDITOR) {
Loader.removeItem(uuid);
}
callback(error, asset);
@@ -208,7 +208,7 @@ var AssetLibrary = {
}
if (thisTick) {
callInNextTick(function () {
if (isScene(asset)) {
if (isScene(asset) || CC_EDITOR) {
Loader.removeItem(randomUuid);
}
asset._uuid = '';
@@ -216,7 +216,7 @@ var AssetLibrary = {
});
}
else {
if (isScene(asset)) {
if (isScene(asset) || CC_EDITOR) {
Loader.removeItem(randomUuid);
}
asset._uuid = '';