Commit c885c68f authored by 范雪寒's avatar 范雪寒
parents e3942566 aed34cf9
...@@ -189,24 +189,3 @@ export function initAir(_this) { ...@@ -189,24 +189,3 @@ export function initAir(_this) {
}; };
} }
export function timerManager () {
window.timerManager = {};
for(let i=0;i<20;i++){
window.timerManager[`timer${i}`] = {
handler: null,
type: null,
};
}
return {
freeAll() {
for (const key in window.timerManager) {
const obj = window.timerManager[key];
if(obj.handler){
window[obj.type](obj.handler);
}
}
}
}
}
import { initAir, timerManager } from './air'; import { initAir } from './air';
cc.Class({ cc.Class({
extends: cc.Component, extends: cc.Component,
properties: { properties: {
...@@ -45,12 +45,10 @@ cc.Class({ ...@@ -45,12 +45,10 @@ cc.Class({
loadedCount: null, loadedCount: null,
// 统一释放异步资源的方法 // 统一释放异步资源的方法
freeAll: null,
onLoad() { onLoad() {
this.preloadCount = 0; this.preloadCount = 0;
this.loadedCount = 0; this.loadedCount = 0;
initAir(this); initAir(this);
this.freeAll = timerManager().freeAll;
// this.preloadAll(); // this.preloadAll();
}, },
...@@ -137,7 +135,6 @@ cc.Class({ ...@@ -137,7 +135,6 @@ cc.Class({
cc.assetManager.loadBundle(scene.bondleUrl, { version: scene.version }, (err, bundle) => { cc.assetManager.loadBundle(scene.bondleUrl, { version: scene.version }, (err, bundle) => {
console.log(`${scene.bondleUrl}---场景开始loadBundle----`); console.log(`${scene.bondleUrl}---场景开始loadBundle----`);
if (!bundle) { if (!bundle) {
console.log("=====liu=======", JSON.stringify(err));
_this.loadedCount++; _this.loadedCount++;
_this.updateProcessBar(); _this.updateProcessBar();
i++; i++;
...@@ -222,10 +219,9 @@ cc.Class({ ...@@ -222,10 +219,9 @@ cc.Class({
.call(() => { .call(() => {
exitBtn.active = false; exitBtn.active = false;
cc.game.removePersistRootNode(this.node); cc.game.removePersistRootNode(this.node);
console.log("======mid========"); cc.director.getScene().destroy();
this.freeAll();
console.log("======mid1========"); cc.director.loadScene("debug_shell", null, null, (err, scene) => {
cc.director.loadScene("debug_shell", () => {
}); });
}) })
.start(); .start();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment