From 355162c4b73f259a8ebe1c98411069a52284cc66 Mon Sep 17 00:00:00 2001 From: knoxHuang <821686174@qq.com> Date: Mon, 13 Nov 2017 14:44:08 +0800 Subject: [PATCH] fix Prefab nesting animation is invalid to csd-importer --- cocos2d/core/components/CCStudioComponent.js | 52 ++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/cocos2d/core/components/CCStudioComponent.js b/cocos2d/core/components/CCStudioComponent.js index db7253fa94..72ab3eda4e 100644 --- a/cocos2d/core/components/CCStudioComponent.js +++ b/cocos2d/core/components/CCStudioComponent.js @@ -264,3 +264,55 @@ var StudioComponent = cc.Class({ }); cc.StudioComponent = module.exports = StudioComponent; + +cc.PlaceHolder = cc.Class({ + name: 'cc.PlaceHolder', + extends: cc.Component, + editor: CC_EDITOR && { + executeInEditMode: true, + }, + + properties: { + basePrefab: cc.Prefab, + + _baseUrl: '', + }, + + onLoad: function () { + this._replace(); + }, + + _replace: !CC_EDITOR && function () { + var prefab = this.basePrefab; + var node = this.node; + var _objFlags = node._objFlags; + var _parent = node._parent; + var _id = node._id; + var _name = node._name; + var _active = node._active; + var x = node._position.x; + var y = node._position.y; + var _rotationX = node._rotationX; + var _rotationY = node._rotationY; + var _localZOrder = node._localZOrder; + var _globalZOrder = node._globalZOrder; + + var data = prefab.data; + data._iN$t = node; + + cc.instantiate._clone(data, data); + + node._objFlags = _objFlags; + node._parent = _parent; + node._id = _id; + node._prefab.asset = prefab; + node._name = _name; + node._active = _active; + node._position.x = x; + node._position.y = y; + node._rotationX = _rotationX; + node._rotationY = _rotationY; + node._localZOrder = _localZOrder; + node._globalZOrder = _globalZOrder; + } +});