Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13485 from VisualSJ/v3.8-webIndex 

Update Studio js parser
This commit is contained in:
pandamicro 2015-08-20 18:02:55 +08:00
parent 918d7ce5d6 a4fec3a5e0
commit a54f01ce2b
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cocos/scripting/js-bindings/script/studio/parsers/action-2.x.js
View File

@ -268,6 +268,7 @@
var blendFunc = options["BlendFunc"]; var blendFunc = options["BlendFunc"];
if(blendFunc) if(blendFunc)
frame.setBlendFunc(new cc.BlendFunc(blendFunc["Src"], blendFunc["Dst"])); frame.setBlendFunc(new cc.BlendFunc(blendFunc["Src"], blendFunc["Dst"]));
return frame;
} }
} }
]; ];

6
cocos/scripting/js-bindings/script/studio/parsers/timelineParser-2.x.js
View File

@ -1312,12 +1312,18 @@
node.setBlendFunc(new cc.BlendFunc(blendFunc["Src"] || 0, blendFunc["Dst"] || 0)); node.setBlendFunc(new cc.BlendFunc(blendFunc["Src"] || 0, blendFunc["Dst"] || 0));
parser.generalAttributes(node, json); parser.generalAttributes(node, json);
var color = json["CColor"];
if(color && (color["R"] !== undefined || color["G"] !== undefined || color["B"] !== undefined))
node.setColor(getColor(color));
return node; return node;
}; };
parser.initSkeletonNode = function(json){ parser.initSkeletonNode = function(json){
var node = new ccs.SkeletonNode(); var node = new ccs.SkeletonNode();
parser.generalAttributes(node, json); parser.generalAttributes(node, json);
var color = json["CColor"];
if(color && (color["R"] !== undefined || color["G"] !== undefined || color["B"] !== undefined))
node.setColor(getColor(color));
return node; return node;
}; };