prefab should be synced if jit can not be used

This commit is contained in:
Jare Guo
2017-11-03 01:20:51 +08:00
parent 234220fbcb
commit bd585d4a5c
4 changed files with 26 additions and 8 deletions
+1 -1
View File
@@ -340,7 +340,7 @@ if (CC_DEBUG) {
"3700": "internal error: _prefab is undefined", //_doInstantiate
"3701": "Failed to load prefab asset for node '%s'", //syncWithPrefab
//Game: 3800
"3800": "The target can not be made persist because it\'s not a cc.Node or it doesn\'t have _id property.", //addPersistRootNode
"3800": "The target can not be made persist because it\'s invalid or it doesn\'t have _id property.", //addPersistRootNode
"3801": "The node can not be made persist because it\'s not under root node.", //addPersistRootNode_2
"3802": "The node can not be made persist because it\'s not in current scene.", //addPersistRootNode_3
"3803": "The target can not be made persist because it\'s not a cc.Node or it doesn\'t have _id property.", //addPersistRootNode_4
+8 -6
View File
@@ -96,14 +96,16 @@ var Prefab = cc.Class({
_instantiate: function () {
var node;
if (cc.supportJit) {
// instantiate node
node = this._doInstantiate();
// initialize node
this.data._instantiate(node);
// instantiate node
node = this._doInstantiate();
// initialize node
this.data._instantiate(node);
}
else {
// instantiate node
node = this.data._instantiate();
// prefab asset is always synced
this.data._prefab._synced = true;
// instantiate node
node = this.data._instantiate();
}
// link prefab in editor
+14 -1
View File
@@ -81,7 +81,20 @@ module.exports = {
// instantiate prefab
cc.game._isCloning = true;
_prefab.asset._doInstantiate(node);
if (cc.supportJit) {
_prefab.asset._doInstantiate(node);
}
else {
// root in prefab asset is always synced
var prefabRoot = _prefab.asset.data;
prefabRoot._prefab._synced = true;
// use node as the instantiated prefabRoot to make references to prefabRoot in prefab redirect to node
prefabRoot._iN$t = node;
// instantiate prefab and apply to node
cc.instantiate._clone(prefabRoot, prefabRoot);
}
cc.game._isCloning = false;
// restore preserved props
+3
View File
@@ -227,6 +227,9 @@ if (CC_DEV) {
});
function deprecateEnum (obj, oldPath, newPath, hasTypePrefixBefore) {
if (!cc.supportJit) {
return;
}
hasTypePrefixBefore = hasTypePrefixBefore !== false;
var enumDef = Function('return ' + newPath)();
var entries = cc.Enum.getList(enumDef);