dgflash 3 éve
szülő
commit
a77eec0ddc

+ 0 - 0
assets/resources/gui/prefab.meta → assets/resources/gui/demo.meta


+ 0 - 0
assets/resources/gui/prefab/demo.prefab → assets/resources/gui/demo/demo.prefab


+ 0 - 0
assets/resources/gui/prefab/demo.prefab.meta → assets/resources/gui/demo/demo.prefab.meta


+ 0 - 0
assets/resources/loading.meta → assets/resources/gui/loading.meta


+ 0 - 0
assets/resources/loading/prefab/loading.prefab → assets/resources/gui/loading/loading.prefab


+ 0 - 0
assets/resources/loading/prefab/loading.prefab.meta → assets/resources/gui/loading/loading.prefab.meta


+ 0 - 12
assets/resources/loading/prefab.meta

@@ -1,12 +0,0 @@
-{
-  "ver": "1.1.0",
-  "importer": "directory",
-  "imported": true,
-  "uuid": "9e4a59af-22c3-4c0b-b864-98193db88d5f",
-  "files": [],
-  "subMetas": {},
-  "userData": {
-    "compressionType": {},
-    "isRemoteBundle": {}
-  }
-}

+ 3 - 3
assets/script/game/common/config/GameUIConfig.ts

@@ -1,7 +1,7 @@
 /*
  * @Date: 2021-08-12 09:33:37
  * @LastEditors: dgflash
- * @LastEditTime: 2022-08-03 10:12:03
+ * @LastEditTime: 2022-08-08 11:40:33
  */
 
 import { LayerType, UIConfig } from "../../../../../extensions/oops-plugin-framework/assets/core/gui/layer/LayerManager";
@@ -20,8 +20,8 @@ export enum UIID {
 
 /** 打开界面方式的配置数据 */
 export var UIConfigData: { [key: number]: UIConfig } = {
-    [UIID.Loading]: { layer: LayerType.UI, prefab: "loading/prefab/loading", bundle: "resources" },
+    [UIID.Loading]: { layer: LayerType.UI, prefab: "gui/loading/loading", bundle: "resources" },
     [UIID.Netinstable]: { layer: LayerType.PopUp, prefab: "common/prefab/netinstable" },
     [UIID.Window]: { layer: LayerType.Dialog, prefab: "common/prefab/window" },
-    [UIID.Demo]: { layer: LayerType.UI, prefab: "gui/prefab/demo" },
+    [UIID.Demo]: { layer: LayerType.UI, prefab: "gui/demo/demo" },
 }

+ 1 - 1
assets/script/game/initialize/view/LoadingViewComp.ts

@@ -2,7 +2,7 @@
  * @Author: dgflash
  * @Date: 2021-07-03 16:13:17
  * @LastEditors: dgflash
- * @LastEditTime: 2022-08-08 09:59:48
+ * @LastEditTime: 2022-08-08 11:43:37
  */
 import { _decorator } from "cc";
 import { resLoader } from "../../../../../extensions/oops-plugin-framework/assets/core/common/loader/ResLoader";

+ 1 - 1
extensions/oops-plugin-framework

@@ -1 +1 @@
-Subproject commit 27138767c60ace4a58bcf81abb6dbe83507becc5
+Subproject commit 58288c584e3700dbca167f5b812c631f67e9970a