From bd17a8f68645cfc291a9efbb8a26eeb32c67ab81 Mon Sep 17 00:00:00 2001
From: dgflash <dgflash@qq.com>
Date: Tue, 9 Aug 2022 18:17:30 +0800
Subject: [PATCH] .

---
 assets/resources/demo.meta                    |  12 --
 assets/resources/demo/loader.meta             |  12 --
 assets/resources/demo/loader/oops.jpg         | Bin 4705 -> 0 bytes
 assets/resources/demo/loader/oops.jpg.meta    | 134 -----------------
 assets/resources/demo/loader/prefab.prefab    | 142 ------------------
 .../resources/demo/loader/prefab.prefab.meta  |  13 --
 assets/script/game/demo/Demo.ts               |  18 +--
 7 files changed, 7 insertions(+), 324 deletions(-)
 delete mode 100644 assets/resources/demo.meta
 delete mode 100644 assets/resources/demo/loader.meta
 delete mode 100644 assets/resources/demo/loader/oops.jpg
 delete mode 100644 assets/resources/demo/loader/oops.jpg.meta
 delete mode 100644 assets/resources/demo/loader/prefab.prefab
 delete mode 100644 assets/resources/demo/loader/prefab.prefab.meta

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 fc2479ac953eb953b17653e031278a8e2278a552..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4705
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

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);
     }