【修改】 添加UI管理器

assets/edt_scene/scene_main.fire

@@ -17,7 +17,7 @@
         "__id__": 2
       },
       {
-        "__id__": 124
+        "__id__": 127
       }
     ],
     "_active": false,
@@ -78,22 +78,22 @@
         "__id__": 5
       },
       {
-        "__id__": 103
+        "__id__": 106
       },
       {
-        "__id__": 106
+        "__id__": 109
       },
       {
-        "__id__": 119
+        "__id__": 122
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 122
+        "__id__": 125
       },
       {
-        "__id__": 123
+        "__id__": 126
       }
     ],
     "_prefab": null,
@@ -183,7 +183,7 @@
       "array": [
         0,
         0,
-        527.4094709047232,
+        336.01785666836224,
         0,
         0,
         0,
@@ -257,7 +257,7 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 102
+        "__id__": 105
       }
     ],
     "_prefab": null,
@@ -324,12 +324,15 @@
       },
       {
         "__id__": 100
+      },
+      {
+        "__id__": 102
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 101
+        "__id__": 104
       }
     ],
     "_prefab": null,
@@ -4133,6 +4136,95 @@
   },
   {
     "__type__": "cc.Node",
+    "_name": "Toast",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 6
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 101
+      }
+    ],
+    "_prefab": null,
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 810,
+      "height": 1440
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": "ccYwTn75lEXb/Ea+5EyORl"
+  },
+  {
+    "__type__": "cc.Widget",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 100
+    },
+    "_enabled": true,
+    "alignMode": 1,
+    "_target": null,
+    "_alignFlags": 45,
+    "_left": 0,
+    "_right": 0,
+    "_top": 0,
+    "_bottom": 0,
+    "_verticalCenter": 0,
+    "_horizontalCenter": 0,
+    "_isAbsLeft": true,
+    "_isAbsRight": true,
+    "_isAbsTop": true,
+    "_isAbsBottom": true,
+    "_isAbsHorizontalCenter": true,
+    "_isAbsVerticalCenter": true,
+    "_originalWidth": 0,
+    "_originalHeight": 0,
+    "_id": "13JGuAVupJ6rcG4E9YoixL"
+  },
+  {
+    "__type__": "cc.Node",
     "_name": "UI",
     "_objFlags": 0,
     "_parent": {
@@ -4140,7 +4232,11 @@
     },
     "_children": [],
     "_active": true,
-    "_components": [],
+    "_components": [
+      {
+        "__id__": 103
+      }
+    ],
     "_prefab": null,
     "_opacity": 255,
     "_color": {
@@ -4152,8 +4248,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 0,
-      "height": 0
+      "width": 810,
+      "height": 1440
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -4194,6 +4290,33 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
+      "__id__": 102
+    },
+    "_enabled": true,
+    "alignMode": 1,
+    "_target": null,
+    "_alignFlags": 45,
+    "_left": 0,
+    "_right": 0,
+    "_top": 0,
+    "_bottom": 0,
+    "_verticalCenter": 0,
+    "_horizontalCenter": 0,
+    "_isAbsLeft": true,
+    "_isAbsRight": true,
+    "_isAbsTop": true,
+    "_isAbsBottom": true,
+    "_isAbsHorizontalCenter": true,
+    "_isAbsVerticalCenter": true,
+    "_originalWidth": 0,
+    "_originalHeight": 0,
+    "_id": "e8WegFKIBE9qDRBXqsVnGF"
+  },
+  {
+    "__type__": "cc.Widget",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
       "__id__": 6
     },
     "_enabled": true,
@@ -4254,10 +4377,10 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 104
+        "__id__": 107
       },
       {
-        "__id__": 105
+        "__id__": 108
       }
     ],
     "_prefab": null,
@@ -4313,7 +4436,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 103
+      "__id__": 106
     },
     "_enabled": true,
     "_alertList": [],
@@ -4324,7 +4447,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 103
+      "__id__": 106
     },
     "_enabled": true,
     "alignMode": 1,
@@ -4355,25 +4478,25 @@
     },
     "_children": [
       {
-        "__id__": 107
-      },
-      {
         "__id__": 110
       },
       {
         "__id__": 113
+      },
+      {
+        "__id__": 116
       }
     ],
     "_active": false,
     "_components": [
       {
-        "__id__": 116
+        "__id__": 119
       },
       {
-        "__id__": 117
+        "__id__": 120
       },
       {
-        "__id__": 118
+        "__id__": 121
       }
     ],
     "_prefab": null,
@@ -4429,16 +4552,16 @@
     "_name": "bg",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 106
+      "__id__": 109
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 108
+        "__id__": 111
       },
       {
-        "__id__": 109
+        "__id__": 112
       }
     ],
     "_prefab": null,
@@ -4494,7 +4617,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 107
+      "__id__": 110
     },
     "_enabled": true,
     "_materials": [],
@@ -4522,7 +4645,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 107
+      "__id__": 110
     },
     "_enabled": true,
     "alignMode": 1,
@@ -4549,16 +4672,16 @@
     "_name": "icon",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 106
+      "__id__": 109
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 111
+        "__id__": 114
       },
       {
-        "__id__": 112
+        "__id__": 115
       }
     ],
     "_prefab": null,
@@ -4614,7 +4737,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 110
+      "__id__": 113
     },
     "_enabled": true,
     "_materials": [],
@@ -4642,7 +4765,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 110
+      "__id__": 113
     },
     "_enabled": true,
     "_defaultClip": {
@@ -4661,16 +4784,16 @@
     "_name": "precent",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 106
+      "__id__": 109
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 114
+        "__id__": 117
       },
       {
-        "__id__": 115
+        "__id__": 118
       }
     ],
     "_prefab": null,
@@ -4726,7 +4849,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 113
+      "__id__": 116
     },
     "_enabled": true,
     "_materials": [],
@@ -4754,7 +4877,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 113
+      "__id__": 116
     },
     "_enabled": true,
     "_color": {
@@ -4772,11 +4895,11 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 106
+      "__id__": 109
     },
     "_enabled": true,
     "loadPrecentLabel": {
-      "__id__": 114
+      "__id__": 117
     },
     "_id": "51NDBXEXxFXphPs+dV4T9s"
   },
@@ -4785,7 +4908,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 106
+      "__id__": 109
     },
     "_enabled": true,
     "alignMode": 1,
@@ -4812,7 +4935,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 106
+      "__id__": 109
     },
     "_enabled": true,
     "_id": "3ekKTLjJxP+4/QG6ngUXhj"
@@ -4828,10 +4951,10 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 120
+        "__id__": 123
       },
       {
-        "__id__": 121
+        "__id__": 124
       }
     ],
     "_prefab": null,
@@ -4887,7 +5010,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 119
+      "__id__": 122
     },
     "_enabled": true,
     "itemPrefab": {
@@ -4904,7 +5027,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 119
+      "__id__": 122
     },
     "_enabled": true,
     "alignMode": 1,
@@ -4981,7 +5104,7 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 125
+        "__id__": 128
       }
     ],
     "_prefab": null,
@@ -5037,17 +5160,17 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 124
+      "__id__": 127
     },
     "_enabled": true,
     "alertCtrl": {
-      "__id__": 104
+      "__id__": 107
     },
     "loadingCtrl": {
-      "__id__": 116
+      "__id__": 119
     },
     "toastCtrl": {
-      "__id__": 120
+      "__id__": 123
     },
     "reconnCtrl": null,
     "sceneName": "Main",

assets/resources/edt_prefab/Bag/BagMain.prefab

@@ -1694,8 +1694,8 @@
       }
     ],
     "_useOriginalSize": true,
-    "_string": "---",
-    "_N$string": "---",
+    "_string": "",
+    "_N$string": "",
     "_fontSize": 20,
     "_lineHeight": 25,
     "_enableWrapText": false,
@@ -4983,17 +4983,6 @@
     "sync": false
   },
   {
-    "__type__": "d9d76Ag+vtEiKQviijW9rr0",
-    "_name": "",
-    "_objFlags": 0,
-    "node": {
-      "__id__": 1
-    },
-    "_enabled": true,
-    "_alertList": [],
-    "_id": ""
-  },
-  {
     "__type__": "cc.Widget",
     "_name": "",
     "_objFlags": 0,
@@ -5021,6 +5010,17 @@
     "_id": ""
   },
   {
+    "__type__": "34c50r/l89GbL4vjuzGvS5f",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "type": 0,
+    "_id": ""
+  },
+  {
     "__type__": "cc.PrefabInfo",
     "root": {
       "__id__": 1

assets/script/app/constants/AppConstants.js

@@ -46,4 +46,12 @@ window.JMC.ORDER_STATUS = cc.Enum({
     SUBMIT_ORDER_SUCCEEDED: 4, // 提交订单成功
     SUBMIT_ORDER_FAILED: 5,    // 提交订单失败
     SUBMIT_ORDER_UNKOWN: 6    // 提交订单未知结果
+});
+
+// 订单状态
+window.JMC.Proxy = cc.Enum({
+    Main: 0,
+    Navigation:1,
+    Toast:2,
+    UI:3,
 });

assets/script/app/ctrl/MainCtr.js

@@ -8,16 +8,16 @@ cc.Class({
     },
 
     properties: {
-    
+        
     },
 
-
     onLoad () {
         this._super();
         this.initUI();
     },
 
     initUI() {
-        G.UIMgr.open(window.JMC.UIEnum.BagMain); 
+        // G.UIMgr.open(window.JMC.UIEnum.BagMain);
+        // G.UIMgr.open(window.JMC.UIEnum.BattleJoinRoomTip); 
     }
 });

assets/script/app/view/UIInfo.js

@@ -1,5 +1,5 @@
 // 当前文件为手动导出文件.请勿修改.在预制体编辑界面点击右键导出即可.
-window.JMC.UIEnum = {
+ window.JMC.UIEnum = {
 		BagMain:0,
 		BattleJoinRoomTip:1,
 		BattleMain:2,
@@ -24,40 +24,34 @@ window.JMC.UIEnum = {
 		FilterMain:21,
 		HeadIcon:22,
 		ItemIcon:23,
-		NavigationMain:24,
-		prefab_alert_ctrl:25,
-		prefab_loading_ctrl:26,
-		prefab_toast_ctrl:27
+		NavigationMain:24
 
 }
 window.JMC.UIPath = {
-		[window.JMC.UIEnum.BagMain] : "Bag/BagMain.prefab",
-		[window.JMC.UIEnum.BattleJoinRoomTip] : "Battle/BattleJoinRoomTip.prefab",
-		[window.JMC.UIEnum.BattleMain] : "Battle/BattleMain.prefab",
-		[window.JMC.UIEnum.BattleRoom] : "Battle/BattleRoom.prefab",
-		[window.JMC.UIEnum.BattleRoomPlayer] : "Battle/BattleRoomPlayer.prefab",
-		[window.JMC.UIEnum.BattleRoomPlayerIcon] : "Battle/BattleRoomPlayerIcon.prefab",
-		[window.JMC.UIEnum.BattleRoomPreviweCell] : "Battle/BattleRoomPreviweCell.prefab",
-		[window.JMC.UIEnum.BoxChanceItem] : "BoxContains/BoxChanceItem.prefab",
-		[window.JMC.UIEnum.BoxContainsMain] : "BoxContains/BoxContainsMain.prefab",
-		[window.JMC.UIEnum.BoxItem] : "BoxContains/BoxItem.prefab",
-		[window.JMC.UIEnum.ButtonSelect1] : "Common/ButtonSelect1.prefab",
-		[window.JMC.UIEnum.DreamBrilliant] : "Dream/DreamBrilliant.prefab",
-		[window.JMC.UIEnum.DreamBrilliantCell] : "Dream/DreamBrilliantCell.prefab",
-		[window.JMC.UIEnum.DreamMain] : "Dream/DreamMain.prefab",
-		[window.JMC.UIEnum.DreamPopular] : "Dream/DreamPopular.prefab",
-		[window.JMC.UIEnum.DreamStatistics] : "Dream/DreamStatistics.prefab",
-		[window.JMC.UIEnum.DreamStatisticsCell] : "Dream/DreamStatisticsCell.prefab",
-		[window.JMC.UIEnum.DreamStatisticsFilter] : "Dream/DreamStatisticsFilter.prefab",
-		[window.JMC.UIEnum.DropPercentageItem] : "Drop/DropPercentageItem.prefab",
-		[window.JMC.UIEnum.DropRecordMain] : "Drop/DropRecordMain.prefab",
-		[window.JMC.UIEnum.DropWastageItem] : "Drop/DropWastageItem.prefab",
-		[window.JMC.UIEnum.FilterMain] : "Filter/FilterMain.prefab",
-		[window.JMC.UIEnum.HeadIcon] : "Common/HeadIcon.prefab",
-		[window.JMC.UIEnum.ItemIcon] : "Common/ItemIcon.prefab",
-		[window.JMC.UIEnum.NavigationMain] : "Navigation/NavigationMain.prefab",
-		[window.JMC.UIEnum.prefab_alert_ctrl] : "prefab_alert_ctrl.prefab",
-		[window.JMC.UIEnum.prefab_loading_ctrl] : "prefab_loading_ctrl.prefab",
-		[window.JMC.UIEnum.prefab_toast_ctrl] : "prefab_toast_ctrl.prefab"
+		[window.JMC.UIEnum.BagMain] : "Bag/BagMain",
+		[window.JMC.UIEnum.BattleJoinRoomTip] : "Battle/BattleJoinRoomTip",
+		[window.JMC.UIEnum.BattleMain] : "Battle/BattleMain",
+		[window.JMC.UIEnum.BattleRoom] : "Battle/BattleRoom",
+		[window.JMC.UIEnum.BattleRoomPlayer] : "Battle/BattleRoomPlayer",
+		[window.JMC.UIEnum.BattleRoomPlayerIcon] : "Battle/BattleRoomPlayerIcon",
+		[window.JMC.UIEnum.BattleRoomPreviweCell] : "Battle/BattleRoomPreviweCell",
+		[window.JMC.UIEnum.BoxChanceItem] : "BoxContains/BoxChanceItem",
+		[window.JMC.UIEnum.BoxContainsMain] : "BoxContains/BoxContainsMain",
+		[window.JMC.UIEnum.BoxItem] : "BoxContains/BoxItem",
+		[window.JMC.UIEnum.ButtonSelect1] : "Common/ButtonSelect1",
+		[window.JMC.UIEnum.DreamBrilliant] : "Dream/DreamBrilliant",
+		[window.JMC.UIEnum.DreamBrilliantCell] : "Dream/DreamBrilliantCell",
+		[window.JMC.UIEnum.DreamMain] : "Dream/DreamMain",
+		[window.JMC.UIEnum.DreamPopular] : "Dream/DreamPopular",
+		[window.JMC.UIEnum.DreamStatistics] : "Dream/DreamStatistics",
+		[window.JMC.UIEnum.DreamStatisticsCell] : "Dream/DreamStatisticsCell",
+		[window.JMC.UIEnum.DreamStatisticsFilter] : "Dream/DreamStatisticsFilter",
+		[window.JMC.UIEnum.DropPercentageItem] : "Drop/DropPercentageItem",
+		[window.JMC.UIEnum.DropRecordMain] : "Drop/DropRecordMain",
+		[window.JMC.UIEnum.DropWastageItem] : "Drop/DropWastageItem",
+		[window.JMC.UIEnum.FilterMain] : "Filter/FilterMain",
+		[window.JMC.UIEnum.HeadIcon] : "Common/HeadIcon",
+		[window.JMC.UIEnum.ItemIcon] : "Common/ItemIcon",
+		[window.JMC.UIEnum.NavigationMain] : "Navigation/NavigationMain"
 
 }

assets/script/core/model/UIMgr.js

@@ -3,7 +3,7 @@
  */
 
 require("UIInfo")
-
+const Proxy = require('Proxy');
 
 /**
  * 登录数据管理
@@ -14,25 +14,34 @@ let UIMgr = {
      * 初始化
      *
      */
+
     init () {
         if (CC_EDITOR) {
             return;
         }
+
+        this.UIRoots = {
+            [window.JMC.Proxy.Main]:"Main",
+            [window.JMC.Proxy.Navigation]:"Navigation",
+            [window.JMC.Proxy.Toast]:"Toast",
+            [window.JMC.Proxy.UI]:"UI",
+        };
     },
 
     getUIRoot () {
-        return cc.director.getScene().getChildByName('Root');
+        let curScene = cc.director.getScene();
+        let root = curScene.getChildByName('Canvas').getChildByName("Root").getChildByName("UIRoot");
+        return root;
     },
 
     open(type, param) {
-        // edt_prefab/ctrl/prefab_normal_alert
-        let prefabPath = 'edt_prefab/ctrl/' + window.JMC.UIPath[type];
+        let prefabPath = 'edt_prefab/' + window.JMC.UIPath[type];
         this.showUI(prefabPath, param)
     },
 
-    showUI (prefabPath, alertData, cb, cache = false) {
+    showUI(prefabPath, alertData, cb, cache = false) {
         G.LogUtils.warn('showAlert', prefabPath);
-
+        let self = this;
         let temp = undefined;
         cc.loader.loadRes(prefabPath, cc.Prefab, (completedCount, totalCount, item)=>{
             temp = G.AppUtils.getLoadProgressInfo(temp, completedCount, totalCount);
@@ -50,22 +59,21 @@ let UIMgr = {
             }
 
             let node = cc.instantiate(prefab);
-            let alert = node.getComponent('JMAlertBase');
             if (cb) {
                 cb(alert, 'willShow', undefined);
             }
 
-            let uiRoot = this.getUIRoot();
-            let ret = this.pushUI(uiRoot, alert);
-            if (!ret) {
-                return;
+            let uiRoot = self.getUIRoot();
+            let proxy = node.getComponent(Proxy);
+            if (proxy){
+                uiRoot = uiRoot.getChildByName(self.UIRoots[proxy.type])
             }
 
-            // 因为reloadData如果出错会导致游戏闪屏，所以加上try catch
-            try {
-                alert.reloadData(alertData, cb);
-            } catch (error) {
-                G.LogUtils.error('AlertCtrl showAlert error:', error);
+            // let uiRoot = this.getUIRoot();
+            // .getChildByName(this.UIRoots[type])
+            let ret = self.pushUI(uiRoot, node);
+            if (!ret) {
+                return;
             }
 
             if (!cache) {
@@ -81,15 +89,13 @@ let UIMgr = {
      * @date 2019-03-22
      * @param {JMAlertBase} alert 弹框
      */
-    pushUI (alert) {
-        if (!cc.isValid(alert) || !cc.isValid(uiRoot)) {
+    pushUI (uiRoot, node) {
+        if (!cc.isValid(node) || !cc.isValid(uiRoot)) {
             return false;
         }
 
-        let zIndex = alert.alertZIndex;
-        uiRoot.addChild(alert.node, zIndex);
-
-        cc.game.emit('e_ui_push_alert', {alert: alert});
+        uiRoot.addChild(node);
+        cc.game.emit('e_ui_push_alert', {node});
         return true;
     },
 }

assets/script/framework.meta

@@ -0,0 +1,7 @@
+{
+  "ver": "1.0.1",
+  "uuid": "7908a109-94ef-4bdc-bb9a-b0cbfd58e550",
+  "isSubpackage": false,
+  "subpackageName": "",
+  "subMetas": {}
+}

assets/script/framework/Proxy.js

@@ -0,0 +1,16 @@
+cc.Class({
+    extends: cc.Component,
+
+    properties: {
+        type: {
+            default: window.JMC.Proxy.UI,
+            type: cc.Enum(window.JMC.Proxy),
+            serializable: true,
+        },
+    },
+
+    start () {
+
+    },
+
+});

assets/script/framework/Proxy.js.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "1.0.8",
+  "uuid": "34c50aff-97cf-466c-be2f-8eecc6bd2e5f",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

packages/LuaExport/scene-walker.js

@@ -6,7 +6,7 @@ module.exports = {
     'exportInfo': function () {
         cc.log("export info");
 
-        let rootPath = Editor.url('db://assets/edt_prefab/ctrl', 'utf8')
+        let rootPath = Editor.url('db://assets/resources/edt_prefab', 'utf8')
         let allPrefabs = this.getAllUIPrefab(rootPath);
         let allPrefabInfos = this.getAllPrefabInfo(rootPath, allPrefabs);
         this.writeInfoFile(allPrefabInfos);
@@ -37,7 +37,7 @@ module.exports = {
         let result = [];
         allPrefabs.forEach((file) => {
             let prefabName = path.basename(file, path.extname(file));
-            let prefabPath = file.replace(rootPath, "").substring(1)
+            let prefabPath = file.replace(rootPath, "").replace(".prefab", "").substring(1)
             result.push({
                 "name":prefabName,
                 "path":prefabPath,