diff --git a/demo/assets/script/GameEntry.ts b/demo/assets/script/GameEntry.ts index 155384b..40d40b5 100644 --- a/demo/assets/script/GameEntry.ts +++ b/demo/assets/script/GameEntry.ts @@ -36,21 +36,22 @@ export class GameEntry extends kunpo.CocosEntry { let paths: KunpoAssets.IAssetConfig[] = [ { path: "ui/manual", type: cc.Asset }, // 手动加载UI基础资源 ]; - let loader = new KunpoAssets.AssetLoader("load"); - loader.start({ - configs: paths, + let loader = new KunpoAssets.AssetLoader("basic"); + loader.setCallbacks({ complete: () => { + kunpo.log("load basic 加载成功"); fgui.UIPackage.addPackage("ui/manual/Basics"); fgui.UIPackage.addPackage("ui/manual/Home"); this.loadResources(); }, - fail: (msg: string, err: Error) => { - + fail: (code: number, msg: string) => { + kunpo.log("load basic 加载失败:", code, msg); }, progress: (percent: number) => { - + kunpo.log("load basic 加载进度:", percent); } }); + loader.start(paths); } /** 2. 加载剩余资源 */ @@ -62,19 +63,20 @@ export class GameEntry extends kunpo.CocosEntry { // { path: "texture/6101/spriteFrame", type: cc.SpriteFrame, isFile: true }, // { path: "pet", type: cc.SpriteFrame, bundle: "bundle_res" }, ]; - let loader = new KunpoAssets.AssetLoader("load"); - loader.start({ - configs: paths, + let loader = new KunpoAssets.AssetLoader("resources"); + loader.setCallbacks({ complete: () => { + kunpo.log("load resources 加载成功"); this.loadComplete(); }, - fail: (msg: string, err: Error) => { - + fail: (code: number, msg: string) => { + kunpo.log("load resources 加载失败:", code, msg); }, progress: (percent: number) => { - + kunpo.log("load resources 加载进度:", percent); } }); + loader.start(paths); } diff --git a/demo/assets/script/UI/HomeWindow.ts b/demo/assets/script/UI/HomeWindow.ts index e804194..ef7952d 100644 --- a/demo/assets/script/UI/HomeWindow.ts +++ b/demo/assets/script/UI/HomeWindow.ts @@ -75,12 +75,9 @@ export class HomeWindow extends kunpo.Window { let paths: KunpoAssets.IAssetConfig[] = [ { path: "config/buffer", type: cc.BufferAsset }, ]; - let loader = new KunpoAssets.AssetLoader("load"); - loader.start({ - configs: paths, + let loader = new KunpoAssets.AssetLoader("buffer"); + loader.setCallbacks({ complete: () => { - kunpo.log("加载成功"); - let basic = AssetPool.get("config/buffer/basic"); kunpo.log("basic", JSON.stringify(kunpo.Binary.toJson(basic.buffer()))); @@ -99,13 +96,14 @@ export class HomeWindow extends kunpo.Window { }; kunpo.log("aaa", JSON.stringify(kunpo.Binary.toJson(aaa))); }, - fail: (msg: string, err: Error) => { - kunpo.log("加载失败", msg, err); + fail: (code: number, msg: string) => { + kunpo.log("load buffer 加载失败:", code, msg); }, progress: (percent: number) => { - + kunpo.log("load buffer 加载进度:", percent); } }); + loader.start(paths); } @uiclick diff --git a/demo/package.json b/demo/package.json index 2cf6e1c..265ee76 100755 --- a/demo/package.json +++ b/demo/package.json @@ -7,8 +7,8 @@ "dependencies": { "fairygui-cc": "^1.2.2", "kunpocc": "^1.1.5", - "kunpocc-assets": "^0.0.1", - "kunpocc-event": "^0.0.2", + "kunpocc-assets": "^0.1.1", + "kunpocc-event": "^0.0.3", "kunpocc-net": "^0.0.2", "ts-node": "^10.9.2" } diff --git a/demo/settings/v2/packages/information.json b/demo/settings/v2/packages/information.json index 94848de..62fccb5 100644 --- a/demo/settings/v2/packages/information.json +++ b/demo/settings/v2/packages/information.json @@ -4,19 +4,19 @@ "customSplash": { "id": "customSplash", "label": "customSplash", - "enable": false, + "enable": true, "customSplash": { "complete": false, - "form": "https://creator-api.cocos.com/api/form/show?" + "form": "https://creator-api.cocos.com/api/form/show?sid=39d299030f31eb42b71bc53d67bdc54e" } }, "removeSplash": { "id": "removeSplash", "label": "removeSplash", - "enable": false, + "enable": true, "removeSplash": { "complete": false, - "form": "https://creator-api.cocos.com/api/form/show?" + "form": "https://creator-api.cocos.com/api/form/show?sid=39d299030f31eb42b71bc53d67bdc54e" } } }