diff --git a/assets/resources/demo.meta b/assets/resources/demo.meta deleted file mode 100644 index 61677f0..0000000 --- a/assets/resources/demo.meta +++ /dev/null @@ -1,12 +0,0 @@ -{ - "ver": "1.1.0", - "importer": "directory", - "imported": true, - "uuid": "f25ecbca-ec00-4be0-a0af-1b993f69c16b", - "files": [], - "subMetas": {}, - "userData": { - "compressionType": {}, - "isRemoteBundle": {} - } -} diff --git a/assets/resources/demo/loader.meta b/assets/resources/demo/loader.meta deleted file mode 100644 index aa5fa8c..0000000 --- a/assets/resources/demo/loader.meta +++ /dev/null @@ -1,12 +0,0 @@ -{ - "ver": "1.1.0", - "importer": "directory", - "imported": true, - "uuid": "b1649308-344d-4ca7-b97d-c60bce815994", - "files": [], - "subMetas": {}, - "userData": { - "compressionType": {}, - "isRemoteBundle": {} - } -} diff --git a/assets/resources/demo/loader/oops.jpg b/assets/resources/demo/loader/oops.jpg deleted file mode 100644 index fc2479a..0000000 Binary files a/assets/resources/demo/loader/oops.jpg and /dev/null differ diff --git a/assets/resources/demo/loader/oops.jpg.meta b/assets/resources/demo/loader/oops.jpg.meta deleted file mode 100644 index da60469..0000000 --- a/assets/resources/demo/loader/oops.jpg.meta +++ /dev/null @@ -1,134 +0,0 @@ -{ - "ver": "1.0.24", - "importer": "image", - "imported": true, - "uuid": "81c8eae8-5ce8-4513-ae7d-eb70ca95d309", - "files": [ - ".jpg", - ".json" - ], - "subMetas": { - "6c48a": { - "importer": "texture", - "uuid": "81c8eae8-5ce8-4513-ae7d-eb70ca95d309@6c48a", - "displayName": "oops", - "id": "6c48a", - "name": "texture", - "userData": { - "wrapModeS": "repeat", - "wrapModeT": "repeat", - "minfilter": "linear", - "magfilter": "linear", - "mipfilter": "none", - "anisotropy": 0, - "isUuid": true, - "imageUuidOrDatabaseUri": "81c8eae8-5ce8-4513-ae7d-eb70ca95d309", - "visible": false - }, - "ver": "1.0.22", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - }, - "f9941": { - "importer": "sprite-frame", - "uuid": "81c8eae8-5ce8-4513-ae7d-eb70ca95d309@f9941", - "displayName": "oops", - "id": "f9941", - "name": "spriteFrame", - "userData": { - "trimType": "auto", - "trimThreshold": 1, - "rotated": false, - "offsetX": 0, - "offsetY": 0, - "trimX": 0, - "trimY": 0, - "width": 256, - "height": 256, - "rawWidth": 256, - "rawHeight": 256, - "borderTop": 0, - "borderBottom": 0, - "borderLeft": 0, - "borderRight": 0, - "packable": true, - "pixelsToUnit": 100, - "pivotX": 0.5, - "pivotY": 0.5, - "meshType": 0, - "vertices": { - "rawPosition": [ - -128, - -128, - 0, - 128, - -128, - 0, - -128, - 128, - 0, - 128, - 128, - 0 - ], - "indexes": [ - 0, - 1, - 2, - 2, - 1, - 3 - ], - "uv": [ - 0, - 256, - 256, - 256, - 0, - 0, - 256, - 0 - ], - "nuv": [ - 0, - 0, - 1, - 0, - 0, - 1, - 1, - 1 - ], - "minPos": [ - -128, - -128, - 0 - ], - "maxPos": [ - 128, - 128, - 0 - ] - }, - "isUuid": true, - "imageUuidOrDatabaseUri": "81c8eae8-5ce8-4513-ae7d-eb70ca95d309@6c48a", - "atlasUuid": "" - }, - "ver": "1.0.11", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - } - }, - "userData": { - "type": "sprite-frame", - "fixAlphaTransparencyArtifacts": true, - "hasAlpha": true, - "redirect": "81c8eae8-5ce8-4513-ae7d-eb70ca95d309@f9941" - } -} diff --git a/assets/resources/demo/loader/prefab.prefab b/assets/resources/demo/loader/prefab.prefab deleted file mode 100644 index 02388f6..0000000 --- a/assets/resources/demo/loader/prefab.prefab +++ /dev/null @@ -1,142 +0,0 @@ -[ - { - "__type__": "cc.Prefab", - "_name": "prefab", - "_objFlags": 0, - "_native": "", - "data": { - "__id__": 1 - }, - "optimizationPolicy": 0, - "persistent": false, - "asyncLoadAssets": false - }, - { - "__type__": "cc.Node", - "_name": "prefab", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": null, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 2 - }, - { - "__id__": 4 - } - ], - "_prefab": { - "__id__": 6 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_lrot": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - }, - "_lscale": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - }, - "_layer": 33554432, - "_euler": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_id": "" - }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 3 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 58.93, - "height": 50.4 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "eboLkSr35DFqqMFL0eCrfu" - }, - { - "__type__": "cc.Label", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 5 - }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_string": "Prefab", - "_horizontalAlign": 1, - "_verticalAlign": 1, - "_actualFontSize": 20, - "_fontSize": 20, - "_fontFamily": "Arial", - "_lineHeight": 40, - "_overflow": 0, - "_enableWrapText": true, - "_font": null, - "_isSystemFontUsed": true, - "_spacingX": 0, - "_isItalic": false, - "_isBold": false, - "_isUnderline": false, - "_underlineHeight": 2, - "_cacheMode": 0, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "36D0aMsqVHeIMYNADGAvD0" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "67lX6JpExF9a/6SLb41L3u" - } -] \ No newline at end of file diff --git a/assets/resources/demo/loader/prefab.prefab.meta b/assets/resources/demo/loader/prefab.prefab.meta deleted file mode 100644 index 902e3d6..0000000 --- a/assets/resources/demo/loader/prefab.prefab.meta +++ /dev/null @@ -1,13 +0,0 @@ -{ - "ver": "1.1.39", - "importer": "prefab", - "imported": true, - "uuid": "a09fbcc7-4c2d-469b-bdfb-3b2f123f45bd", - "files": [ - ".json" - ], - "subMetas": {}, - "userData": { - "syncNodeName": "prefab" - } -} diff --git a/assets/script/game/demo/Demo.ts b/assets/script/game/demo/Demo.ts index c503d62..6bb164a 100644 --- a/assets/script/game/demo/Demo.ts +++ b/assets/script/game/demo/Demo.ts @@ -2,13 +2,12 @@ * @Author: dgflash * @Date: 2021-07-03 16:13:17 * @LastEditors: dgflash - * @LastEditTime: 2022-08-05 10:14:26 + * @LastEditTime: 2022-08-09 18:14:52 */ import { Component, dynamicAtlasManager, EventTouch, _decorator } from "cc"; import { oops } from "../../../../extensions/oops-plugin-framework/assets/core/Oops"; -import { ecs } from "../../../../extensions/oops-plugin-framework/assets/libs/ecs/ECS"; import { UIID } from "../common/config/GameUIConfig"; -import { SingletonModuleComp, smc } from "../common/ecs/SingletonModuleComp"; +import { smc } from "../common/ecs/SingletonModuleComp"; import { tips } from "../common/prompt/TipsManager"; const { ccclass, property } = _decorator; @@ -21,9 +20,6 @@ export class Demo extends Component { // var path = "gui/prefab/role_info_base"; // var node = await ViewUtil.createPrefabNodeAsync(path); // node.parent = this.node; - - // 释放实始化实体 - smc.initialize.destroy(); } start() { @@ -44,7 +40,7 @@ export class Demo extends Component { /** 升级 */ private btn_level_up(event: EventTouch, data: any) { - var role = ecs.getSingleton(SingletonModuleComp).account.AccountModel.role; + var role = smc.account.AccountModel.role; role.upgrade(); // role.remove(RoleViewComp); // resLoader.releaseDir("content/role"); @@ -52,7 +48,7 @@ export class Demo extends Component { /** 攻击 */ private btn_attack(event: EventTouch, data: any) { - var role = ecs.getSingleton(SingletonModuleComp).account.AccountModel.role; + var role = smc.account.AccountModel.role; role.attack(); // role.load(); @@ -61,19 +57,19 @@ export class Demo extends Component { /** 转职弓箭 */ private btn_change_job9(event: EventTouch, data: any) { - var role = ecs.getSingleton(SingletonModuleComp).account.AccountModel.role; + var role = smc.account.AccountModel.role; role.changeJob(9); } /** 转职匕首 */ private btn_change_job5(event: EventTouch, data: any) { - var role = ecs.getSingleton(SingletonModuleComp).account.AccountModel.role; + var role = smc.account.AccountModel.role; role.changeJob(5); } /** 转职刀 */ private btn_change_job1(event: EventTouch, data: any) { - var role = ecs.getSingleton(SingletonModuleComp).account.AccountModel.role; + var role = smc.account.AccountModel.role; role.changeJob(1); }