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

Synchronize Scheduler.PRIORITY_NON_SYSTEM const

This commit is contained in:
pandamicro 2016-12-13 09:53:44 +08:00
parent d4618e60ef
commit 6b25a73a93
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
cocos/scripting/js-bindings/script/jsb_cocos2d.js
View File

@ -128,7 +128,8 @@ cc.MENU_STATE_TRACKING_TOUCH = 1;
cc.MENU_HANDLER_PRIORITY = -128; cc.MENU_HANDLER_PRIORITY = -128;
cc.DEFAULT_PADDING = 5; cc.DEFAULT_PADDING = 5;
cc.Scheduler.PRIORITY_SYSTEM = -2147483648; cc.Scheduler.PRIORITY_SYSTEM = -2147483648;
cc.Scheduler.PRIORITY_NON_SYSTEM = cc.Scheduler.PRIORITY_SYSTEM + 1;
var _Class = cc.Texture2D; var _Class = cc.Texture2D;
@ -229,8 +230,6 @@ cc.stencilBits = -1; //CCClippingNode.js
cc.g_NumberOfDraws = 0; //CCDirector.js cc.g_NumberOfDraws = 0; //CCDirector.js
cc.PRIORITY_NON_SYSTEM = cc.PRIORITY_SYSTEM + 1; //CCScheduler.js
cc.s_globalOrderOfArrival = 1; cc.s_globalOrderOfArrival = 1;
cc.Event.TOUCH = 0; //CCEvent.js cc.Event.TOUCH = 0; //CCEvent.js
@ -1776,6 +1775,8 @@ cc.DrawNode = cc._DrawNode.extend({
_drawColor: cc.color(255, 255, 255, 255), _drawColor: cc.color(255, 255, 255, 255),
_lineWidth: 1, _lineWidth: 1,
release: function () {},
setLineWidth: function (width) { setLineWidth: function (width) {
this._lineWidth = width; this._lineWidth = width;
}, },
@ -2611,17 +2612,17 @@ _p.setNormalSpriteFrame = function(frame) {
if (frame[0] == "#") if (frame[0] == "#")
frame = cc.spriteFrameCache.getSpriteFrame(frame.substr(1)); frame = cc.spriteFrameCache.getSpriteFrame(frame.substr(1));
this._setNormalSpriteFrame(frame); this._setNormalSpriteFrame(frame);
} };
_p.setSelectedSpriteFrame = function(frame) { _p.setSelectedSpriteFrame = function(frame) {
if (frame[0] == "#") if (frame[0] == "#")
frame = cc.spriteFrameCache.getSpriteFrame(frame.substr(1)); frame = cc.spriteFrameCache.getSpriteFrame(frame.substr(1));
this._setSelectedSpriteFrame(frame); this._setSelectedSpriteFrame(frame);
} };
_p.setDisabledSpriteFrame = function(frame) { _p.setDisabledSpriteFrame = function(frame) {
if (frame[0] == "#") if (frame[0] == "#")
frame = cc.spriteFrameCache.getSpriteFrame(frame.substr(1)); frame = cc.spriteFrameCache.getSpriteFrame(frame.substr(1));
this._setDisabledSpriteFrame(frame); this._setDisabledSpriteFrame(frame);
} };
cc.MenuItemToggle.prototype.selectedItem = cc.MenuItemToggle.prototype.getSelectedItem; cc.MenuItemToggle.prototype.selectedItem = cc.MenuItemToggle.prototype.getSelectedItem;
@ -2661,7 +2662,7 @@ cc.LabelTTF.prototype._enableShadow = cc.LabelTTF.prototype.enableShadow;
cc.LabelTTF.prototype.enableShadow = function (shadowColor, offset, blurRadius) { cc.LabelTTF.prototype.enableShadow = function (shadowColor, offset, blurRadius) {
var opacity = 1; var opacity = 1;
this._enableShadow(offset, opacity, blurRadius); this._enableShadow(offset, opacity, blurRadius);
} };
cc.LabelTTF.prototype.setDrawMode = function () {}; cc.LabelTTF.prototype.setDrawMode = function () {};
@ -2723,7 +2724,7 @@ _p.schedule = function (callback, target, interval, repeat, delay, paused, key)
key = target.__instanceId + ""; key = target.__instanceId + "";
} }
this._schedule(callback, target, interval, repeat, delay, paused, key); this._schedule(callback, target, interval, repeat, delay, paused, key);
} };
cc._NodeGrid = cc.NodeGrid; cc._NodeGrid = cc.NodeGrid;