diff --git a/cocos2d/core/platform/CCLoaders.js b/cocos2d/core/platform/CCLoaders.js index e27536d7c3..2ddd479e83 100644 --- a/cocos2d/core/platform/CCLoaders.js +++ b/cocos2d/core/platform/CCLoaders.js @@ -82,6 +82,7 @@ cc._fontLoader = { TYPE : { ".eot" : "embedded-opentype", ".ttf" : "truetype", + ".ttc" : "truetype", ".woff" : "woff", ".svg" : "svg" }, @@ -90,7 +91,11 @@ cc._fontLoader = { fontStyle.type = "text/css"; doc.body.appendChild(fontStyle); - var fontStr = "@font-face { font-family:" + name + "; src:"; + var fontStr = ""; + if(isNaN(name - 0)) + fontStr += "@font-face { font-family:" + name + "; src:"; + else + fontStr += "@font-face { font-family:'" + name + "'; src:"; if(srcs instanceof Array){ for(var i = 0, li = srcs.length; i < li; i++){ var src = srcs[i]; @@ -99,9 +104,10 @@ cc._fontLoader = { fontStr += (i === li - 1) ? ";" : ","; } }else{ + type = type.toLowerCase(); fontStr += "url('" + srcs + "') format('" + TYPE[type] + "');"; } - fontStyle.textContent += fontStr + "};"; + fontStyle.textContent += fontStr + "}"; //
.
var preloadDiv = cc.newElement("div"); @@ -126,7 +132,7 @@ cc._fontLoader = { cb(null, true); } }; -cc.loader.register(["font", "eot", "ttf", "woff", "svg"], cc._fontLoader); +cc.loader.register(["font", "eot", "ttf", "woff", "svg", "ttc"], cc._fontLoader); cc._binaryLoader = { load : function(realUrl, url, res, cb){ diff --git a/extensions/cocostudio/loader/parsers/timelineParser-2.x.js b/extensions/cocostudio/loader/parsers/timelineParser-2.x.js index 9e623418c8..f49c1e9073 100644 --- a/extensions/cocostudio/loader/parsers/timelineParser-2.x.js +++ b/extensions/cocostudio/loader/parsers/timelineParser-2.x.js @@ -631,7 +631,7 @@ if (cc.sys.isNative) { fontName = cc.path.join(cc.loader.resPath, resourcePath, path); } else { - fontName = path.match(/([^\/]+)\.ttf/); + fontName = path.match(/([^\/]+)\.(\S+)/); fontName = fontName ? fontName[1] : ""; } widget.setTitleFontName(fontName);