This commit is contained in:
Jare Guo
2017-08-22 16:23:54 +08:00
parent 5811a6ff29
commit 92319bb2ce
2 changed files with 23 additions and 7 deletions
+1 -1
View File
@@ -589,9 +589,9 @@ cc.Director = Class.extend(/** @lends cc.Director# */{
sgScene = scene._sgNode;
// Re-attach or replace persist nodes
CC_BUILD && CC_DEBUG && console.time('AttachPersist');
for (let i = 0; i < persistNodeList.length; i++) {
let node = persistNodeList[i];
CC_BUILD && CC_DEBUG && console.time('AttachPersist');
var existNode = scene.getChildByUuid(node.uuid);
if (existNode) {
// scene also contains the persist node, select the old one
+22 -6
View File
@@ -203,14 +203,14 @@ function enableInEditor (comp) {
}
}
function createInvokeImpl (code, useDt) {
function createInvokeImpl (funcOrCode, useDt) {
if (CC_EDITOR) {
if (useDt) {
return function (iterator, dt) {
var array = iterator.array;
for (iterator.i = 0; iterator.i < array.length; ++iterator.i) {
var comp = array[iterator.i];
code(comp, dt);
funcOrCode(comp, dt);
}
};
}
@@ -219,7 +219,7 @@ function createInvokeImpl (code, useDt) {
var array = iterator.array;
for (iterator.i = 0; iterator.i < array.length; ++iterator.i) {
var comp = array[iterator.i];
code(comp);
funcOrCode(comp);
}
};
}
@@ -235,7 +235,7 @@ function createInvokeImpl (code, useDt) {
var body = 'var a=it.array;' +
'for(it.i=0;it.i<a.length;++it.i){' +
'var c=a[it.i];' +
code +
funcOrCode +
'}';
if (useDt) {
return Function('it', 'dt', body);
@@ -309,9 +309,10 @@ var ComponentScheduler = cc.Class({
// schedule
if (this._updating) {
this.scheduleInNextFrame.push(comp);
return;
}
this._scheduleImmediate(comp);
else {
this._scheduleImmediate(comp);
}
},
_onDisabled (comp) {
@@ -432,6 +433,21 @@ var ComponentScheduler = cc.Class({
// call start
this.startInvoker.invoke();
// if (CC_PREVIEW) {
// try {
// this.startInvoker.invoke();
// }
// catch (e) {
// // prevent start from getting into infinite loop
// this.startInvoker._neg.array.length = 0;
// this.startInvoker._zero.array.length = 0;
// this.startInvoker._pos.array.length = 0;
// throw e;
// }
// }
// else {
// this.startInvoker.invoke();
// }
},
updatePhase (dt) {