diff --git a/assets/scene/main.scene b/assets/scene/main.scene index 74badc2..e0f9b38 100644 --- a/assets/scene/main.scene +++ b/assets/scene/main.scene @@ -227,7 +227,7 @@ "_priority": 1073741824, "_fov": 45, "_fovAxis": 0, - "_orthoHeight": 419.7772828507795, + "_orthoHeight": 602.8257456828885, "_near": 1, "_far": 2000, "_color": { diff --git a/assets/script/core/common/loader/ResLoader.ts b/assets/script/core/common/loader/ResLoader.ts index 74cb062..8f3387e 100644 --- a/assets/script/core/common/loader/ResLoader.ts +++ b/assets/script/core/common/loader/ResLoader.ts @@ -165,7 +165,8 @@ export default class ResLoader { var bundle: AssetManager.Bundle | null = assetManager.getBundle(bundleName); var infos = bundle?.getDirWithPath(path); infos?.map(function (info) { - bundle?.release(info.path); + var asset = assetManager.assets.get(info.uuid)!; + assetManager.releaseAsset(asset); }); if (path == "" && bundleName != "resources" && bundle) { diff --git a/assets/script/core/libs/animator/core/AnimatorBase.ts b/assets/script/core/libs/animator/core/AnimatorBase.ts index 97a282a..b5de6b1 100644 --- a/assets/script/core/libs/animator/core/AnimatorBase.ts +++ b/assets/script/core/libs/animator/core/AnimatorBase.ts @@ -141,8 +141,10 @@ export default class AnimatorBase extends Component { * 动画结束的回调 */ protected onAnimFinished() { - this._ac.onAnimationComplete(); - this._animationPlayer?.onFinishedCallback(this); + if (this._ac) { + this._ac.onAnimationComplete(); + this._animationPlayer?.onFinishedCallback(this); + } } /** diff --git a/assets/script/game/demo/Demo.ts b/assets/script/game/demo/Demo.ts index 2d24753..dfc7922 100644 --- a/assets/script/game/demo/Demo.ts +++ b/assets/script/game/demo/Demo.ts @@ -2,14 +2,12 @@ * @Author: dgflash * @Date: 2021-07-03 16:13:17 * @LastEditors: dgflash - * @LastEditTime: 2022-01-29 18:04:58 + * @LastEditTime: 2022-03-08 15:02:23 */ -import { Component, EventTouch, Prefab, _decorator } from "cc"; -import { resLoader } from "../../core/common/loader/ResLoader"; -import { oops } from "../../core/Oops"; +import { Component, EventTouch, _decorator } from "cc"; import { tips } from "../../core/gui/prompt/TipsManager"; import { ecs } from "../../core/libs/ECS"; -import { ViewUtil } from "../../core/utils/ViewUtil"; +import { oops } from "../../core/Oops"; import { UIID } from "../common/config/GameUIConfig"; import { SingletonModuleComp } from "../common/ecs/SingletonModuleComp"; @@ -31,6 +29,55 @@ export class Demo extends Component { private btn_level_up(event: EventTouch, data: any) { var role = ecs.getSingleton(SingletonModuleComp).account.AccountModel.role; role.upgrade(); + // role.destroy(); + // resLoader.releaseDir("content/role"); + } + + /** 攻击 */ + private btn_attack(event: EventTouch, data: any) { + var role = ecs.getSingleton(SingletonModuleComp).account.AccountModel.role; + role.attack(); + + // var data: any = { + // id: 1, + // name: "Oops", + // power: 10, + // agile: 10, + // physical: 10, + // lv: 1, + // jobId: 1 + // } + + // var role = ecs.getEntity(Role); + + // // 角色数据 + // role.RoleModel.id = data.id; + // role.RoleModel.name = data.name; + + // // 角色初始战斗属性 + // role.RoleBaseModel.power = data.power; + // role.RoleBaseModel.agile = data.agile; + // role.RoleBaseModel.physical = data.physical; + + // // 角色等级数据 + // role.upgrade(data.lv); + + // // 角色职业数据 + // role.RoleJobModel.id = data.jobId; + + // // 角色基础属性绑定到界面上显示 + // // VM.add(role.RoleModel.vm, "Role"); + // // // 角色等级属性绑定到界面上显示 + // // VM.add(role.RoleLevelModel.vm, "RoleLevel"); + // // // 角色初始基础属性绑定到界面上显示 + // // VM.add(role.RoleBaseModel.vm, "RoleBase"); + + // // 角色动画显示对象 + // role.load(); + // role.RoleView.node.parent = oops.gui.game; + // role.RoleView.node.setPosition(0, -300, 0); + + // ecs.getSingleton(SingletonModuleComp).account.AccountModel.role = role; } /** 转职弓箭 */ @@ -51,12 +98,6 @@ export class Demo extends Component { role.changeJob(1); } - /** 攻击 */ - private btn_attack(event: EventTouch, data: any) { - var role = ecs.getSingleton(SingletonModuleComp).account.AccountModel.role; - role.attack(); - } - /** 打开角色界面 */ private btn_open_role_info(event: EventTouch, data: any) { oops.gui.open(UIID.Demo_Role_Info); diff --git a/assets/script/game/initialize/view/LoadingViewComp.ts b/assets/script/game/initialize/view/LoadingViewComp.ts index dacf9d6..b6f360a 100644 --- a/assets/script/game/initialize/view/LoadingViewComp.ts +++ b/assets/script/game/initialize/view/LoadingViewComp.ts @@ -2,7 +2,7 @@ * @Author: dgflash * @Date: 2021-07-03 16:13:17 * @LastEditors: dgflash - * @LastEditTime: 2022-02-24 15:10:26 + * @LastEditTime: 2022-03-08 14:53:17 */ import { _decorator } from "cc"; import { resLoader } from "../../../core/common/loader/ResLoader"; diff --git a/assets/script/game/role/view/RoleViewComp.ts b/assets/script/game/role/view/RoleViewComp.ts index b90ffb2..28f18ea 100644 --- a/assets/script/game/role/view/RoleViewComp.ts +++ b/assets/script/game/role/view/RoleViewComp.ts @@ -2,10 +2,10 @@ * @Author: dgflash * @Date: 2021-11-18 17:42:59 * @LastEditors: dgflash - * @LastEditTime: 2022-02-28 14:31:54 + * @LastEditTime: 2022-03-08 14:57:40 */ -import { EventTouch, Node, sp, UITransform, v3, _decorator } from "cc"; +import { assetManager, EventTouch, Node, sp, UITransform, v3, _decorator } from "cc"; import { resLoader } from "../../../core/common/loader/ResLoader"; import { ecs } from "../../../core/libs/ECS"; import { oops } from "../../../core/Oops"; @@ -45,6 +45,8 @@ export class RoleViewComp extends CCComp { } this.spine!.skeletonData = sd; + // this.spine!.skeletonData.addRef(); + this.node.active = true; // 移动控制 @@ -67,7 +69,7 @@ export class RoleViewComp extends CCComp { } reset() { + // this.spine!.skeletonData.decRef(); this.node.destroy(); - resLoader.release(this.path); } } \ No newline at end of file