From ae2fc9979cb35e38878c8ffef1f99340a518b6ca Mon Sep 17 00:00:00 2001 From: knoxHuang <821686174@qq.com> Date: Thu, 10 Mar 2016 17:34:44 +0800 Subject: [PATCH] Development component menu --- cocos2d/core/components/CCComponent.js | 6 ++++++ cocos2d/core/platform/instantiate.js | 23 +++++++++++++++-------- 2 files changed, 21 insertions(+), 8 deletions(-) diff --git a/cocos2d/core/components/CCComponent.js b/cocos2d/core/components/CCComponent.js index 0a3a6d9562..da25394ff5 100644 --- a/cocos2d/core/components/CCComponent.js +++ b/cocos2d/core/components/CCComponent.js @@ -678,6 +678,12 @@ var Component = cc.Class({ } }, + _instantiate: function () { + var clone = cc.instantiate._clone(this, this); + clone.node = null; + return clone; + }, + // Scheduler isRunning: function () { diff --git a/cocos2d/core/platform/instantiate.js b/cocos2d/core/platform/instantiate.js index acd4054217..8ccdb7d5e2 100644 --- a/cocos2d/core/platform/instantiate.js +++ b/cocos2d/core/platform/instantiate.js @@ -143,7 +143,7 @@ var enumerateObject = function (obj, parent) { } } } - if (clone instanceof cc._BaseNode && CC_EDITOR) { + if (clone instanceof cc._BaseNode && clone instanceof cc.Component && CC_EDITOR) { clone._id = ''; } } @@ -219,16 +219,23 @@ function instantiateObj (obj, parent, ownerObj, ownerKey) { var ctor = obj.constructor; if (cc.Class._isCCClass(ctor)) { if (parent) { - if (obj instanceof cc._BaseNode) { - if (!obj.isChildOf(parent)) { - // should not clone other nodes if not descendant + if (parent instanceof cc.Component) { + if (obj instanceof cc._BaseNode || obj instanceof cc.Component) { return obj; } } - else if (obj instanceof cc.Component) { - if (!obj.node.isChildOf(parent)) { - // should not clone other component if not descendant - return obj; + else if (parent instanceof cc._BaseNode) { + if (obj instanceof cc._BaseNode) { + if (!obj.isChildOf(parent)) { + // should not clone other nodes if not descendant + return obj; + } + } + else if (obj instanceof cc.Component) { + if (!obj.node.isChildOf(parent)) { + // should not clone other component if not descendant + return obj; + } } } }