Merge branch 'feature/add_preview' into dev

This commit is contained in:
caizhitao 2020-01-09 16:47:49 +08:00
commit a6749d9449
5 changed files with 2719 additions and 2 deletions

View File

@ -11,7 +11,7 @@
"USE_MOSAIC": true "USE_MOSAIC": true
}, },
"_props": { "_props": {
"xBlockCount": 50, "xBlockCount": 40,
"yBlockCount": 50 "yBlockCount": 40
} }
} }

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,7 @@
{
"ver": "1.2.5",
"uuid": "3bf0537b-ca38-4d1d-9c51-4e6c8a6369b0",
"asyncLoadAssets": false,
"autoReleaseAssets": false,
"subMetas": {}
}

View File

@ -0,0 +1,9 @@
const { ccclass, property } = cc._decorator;
@ccclass
export default class PreviewEffectScene extends cc.Component {
onLoad() {
// 关闭动态合图
cc.dynamicAtlasManager.enabled = false;
}
}

View File

@ -0,0 +1,9 @@
{
"ver": "1.0.5",
"uuid": "7d1a13dd-0ba0-4812-b685-31d59a70ecef",
"isPlugin": false,
"loadPluginInWeb": true,
"loadPluginInNative": true,
"loadPluginInEditor": false,
"subMetas": {}
}