add property 'url' to indecate the true url of native object

cocos2d/core/assets/CCAsset.js

@@ -102,6 +102,21 @@ cc.Asset = cc.Class({
             visible: false
         },
 
+        /**
+         * !#en
+         * Points to the true url of this asset's native object, only valid when asset is loaded and asyncLoadAsset is not enabled. 
+         * Url equals nativeUrl on web(web-mobile, web-desktop) or native(iOS, Android etc) platform. The difference between 
+         * nativeUrl and url is that url may points to temporary path or cached path on mini game platform which has cache mechanism (WeChat etc). 
+         * If you want to make use of the native file on those platforms, you should use url instead of nativeUrl.
+         * !#zh
+         * 资源的原生文件的真实url，只在资源被加载后以及没有启用延迟加载时才有效。在web平台（web-mobile, web-desktop）或者原生平台（iOS，安卓等）上url与
+         * nativeUrl是相等的，nativeUrl与url的区别在于，某些带缓存机制的小游戏平台（微信等）上url可能会指向临时文件路径或者缓存路径，如果你需要在这些平台上使用资源的原生文件，
+         * 请使用url，避免使用nativeUrl
+         * @property url
+         * @type {String}
+         */
+        url: '',
+
         /**
          * Serializable url for native asset.
          * @property {String} _native

cocos2d/core/assets/CCTexture2D.js

@@ -317,18 +317,6 @@ var Texture2D = cc.Class({
     ctor () {
         // Id for generate hash in material
         this._id = idGenerater.getNewId();
-
-        /**
-         * !#en
-         * The url of the texture, this could be empty if the texture wasn't created via a file.
-         * !#zh
-         * 贴图文件的 url，当贴图不是由文件创建时值可能为空
-         * @property url
-         * @type {String}
-         * @readonly
-         */
-        // TODO - use nativeUrl directly
-        this.url = "";
 
         /**
          * !#en
@@ -864,8 +852,6 @@ var Texture2D = cc.Class({
             let uuid = loadingItem && loadingItem.uuid;
             if (uuid) {
                 this._uuid = uuid;
-                var url = this.nativeUrl;
-                this.url = url;
             }
         }
         if (fields.length === 6) {

cocos2d/core/load-pipeline/CCLoader.js

@@ -816,17 +816,17 @@ proto.release = function (asset) {
         if (item) {
             var removed = this.removeItem(id);
             asset = item.content;
-            if (asset instanceof cc.Asset) {
-                let nativeUrl = asset.nativeUrl;
-                if (nativeUrl) {
-                    this.release(nativeUrl);  // uncache loading item of native asset
-                }
-                asset.destroy();
-            }
             if (CC_DEBUG && removed) {
                 this._releasedAssetChecker_DEBUG.setReleased(item, id);
             }
         }
+        if (asset instanceof cc.Asset) {
+            let nativeUrl = asset.nativeUrl;
+            if (nativeUrl) {
+                this.release(nativeUrl);  // uncache loading item of native asset
+            }
+            asset.destroy();
+        }
     }
 };
 

cocos2d/core/load-pipeline/font-loader.js

@@ -32,8 +32,8 @@ let _testString = "BES bswy:->@123\u4E01\u3041\u1101";
 let _fontFaces = {};
 let _intervalId = -1;
 let _loadingFonts = [];
-// 60 seconds timeout
-let _timeout = 60000;
+// 3 seconds timeout
+let _timeout = 3000;
 
 // Refer to https://github.com/typekit/webfontloader/blob/master/src/core/fontwatcher.js
 let useNativeCheck = (function () {

cocos2d/core/load-pipeline/loader.js

@@ -62,11 +62,10 @@ function loadImage (item) {
     } 
 
     // load cc.Texture2D
-    var rawUrl = item.rawUrl;
     var tex = item.texture || new Texture2D();
     tex._uuid = item.uuid;
-    tex.url = rawUrl;
-    tex._setRawAsset(rawUrl, false);
+    tex.url = item.url;
+    tex._setRawAsset(item.rawUrl, false);
     tex._nativeAsset = image;
     return tex;
 }
@@ -83,6 +82,7 @@ function loadAudioAsAsset (item, callback) {
     var audioClip = new cc.AudioClip();
     audioClip._setRawAsset(item.rawUrl, false);
     audioClip._nativeAsset = item.content;
+    audioClip.url = item.url;
     return audioClip;
 }
 

cocos2d/core/load-pipeline/uuid-loader.js

@@ -134,6 +134,9 @@ function loadDepends (pipeline, item, asset, depends, callback) {
                 if (this._stillUseUrl) {
                     value = (value && cc.RawAsset.wasRawAssetType(value.constructor)) ? value.nativeUrl : item.rawUrl;
                 }
+                if (this._ownerProp === '_nativeAsset') {
+                    this._owner.url = item.url;
+                }
                 this._owner[this._ownerProp] = value;
                 if (item.uuid !== asset._uuid && dependKeys.indexOf(item.id) < 0) {
                     dependKeys.push(item.id);
@@ -275,6 +278,7 @@ function loadUuid (item, callback) {
     }
 
     asset._uuid = item.uuid;
+    asset.url = asset.nativeUrl;
 
     if (CC_EDITOR && isScene && MissingClass.hasMissingClass) {
         MissingClass.reportMissingClass(asset);