【修改】 修改追梦界面

assets/resources/edt_prefab/Bag/BagMain.prefab

@@ -2336,7 +2336,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 15.57,
+      "width": 9.32,
       "height": 50.4
     },
     "_anchorPoint": {
@@ -2387,8 +2387,8 @@
       }
     ],
     "_useOriginalSize": false,
-    "_string": "3",
-    "_N$string": "3",
+    "_string": "-",
+    "_N$string": "-",
     "_fontSize": 28,
     "_lineHeight": 40,
     "_enableWrapText": true,
@@ -2550,7 +2550,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 54.5,
+      "width": 9.32,
       "height": 50.4
     },
     "_anchorPoint": {
@@ -2601,8 +2601,8 @@
       }
     ],
     "_useOriginalSize": false,
-    "_string": "6.14",
-    "_N$string": "6.14",
+    "_string": "-",
+    "_N$string": "-",
     "_fontSize": 28,
     "_lineHeight": 40,
     "_enableWrapText": true,
@@ -3141,7 +3141,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 15.57,
+      "width": 9.32,
       "height": 50.4
     },
     "_anchorPoint": {
@@ -3192,8 +3192,8 @@
       }
     ],
     "_useOriginalSize": false,
-    "_string": "0",
-    "_N$string": "0",
+    "_string": "-",
+    "_N$string": "-",
     "_fontSize": 28,
     "_lineHeight": 40,
     "_enableWrapText": true,
@@ -3252,8 +3252,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 100,
-      "height": 40
+      "width": 250,
+      "height": 110
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -3571,21 +3571,11 @@
     "_N$normalSprite": {
       "__uuid__": "b366a9f1-db10-4652-adfb-4b95ed5df3b6"
     },
-    "_N$pressedSprite": {
-      "__uuid__": "e9ec654c-97a2-4787-9325-e6a10375219a"
-    },
-    "pressedSprite": {
-      "__uuid__": "e9ec654c-97a2-4787-9325-e6a10375219a"
-    },
-    "_N$hoverSprite": {
-      "__uuid__": "f0048c10-f03e-4c97-b9d3-3506e1d58952"
-    },
-    "hoverSprite": {
-      "__uuid__": "f0048c10-f03e-4c97-b9d3-3506e1d58952"
-    },
-    "_N$disabledSprite": {
-      "__uuid__": "29158224-f8dd-4661-a796-1ffab537140e"
-    },
+    "_N$pressedSprite": null,
+    "pressedSprite": null,
+    "_N$hoverSprite": null,
+    "hoverSprite": null,
+    "_N$disabledSprite": null,
     "_N$target": {
       "__id__": 85
     },
@@ -3633,8 +3623,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 100,
-      "height": 40
+      "width": 250,
+      "height": 110
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -3952,21 +3942,11 @@
     "_N$normalSprite": {
       "__uuid__": "b366a9f1-db10-4652-adfb-4b95ed5df3b6"
     },
-    "_N$pressedSprite": {
-      "__uuid__": "e9ec654c-97a2-4787-9325-e6a10375219a"
-    },
-    "pressedSprite": {
-      "__uuid__": "e9ec654c-97a2-4787-9325-e6a10375219a"
-    },
-    "_N$hoverSprite": {
-      "__uuid__": "f0048c10-f03e-4c97-b9d3-3506e1d58952"
-    },
-    "hoverSprite": {
-      "__uuid__": "f0048c10-f03e-4c97-b9d3-3506e1d58952"
-    },
-    "_N$disabledSprite": {
-      "__uuid__": "29158224-f8dd-4661-a796-1ffab537140e"
-    },
+    "_N$pressedSprite": null,
+    "pressedSprite": null,
+    "_N$hoverSprite": null,
+    "hoverSprite": null,
+    "_N$disabledSprite": null,
     "_N$target": {
       "__id__": 94
     },
@@ -4014,8 +3994,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 100,
-      "height": 40
+      "width": 250,
+      "height": 110
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -4333,21 +4313,11 @@
     "_N$normalSprite": {
       "__uuid__": "b366a9f1-db10-4652-adfb-4b95ed5df3b6"
     },
-    "_N$pressedSprite": {
-      "__uuid__": "e9ec654c-97a2-4787-9325-e6a10375219a"
-    },
-    "pressedSprite": {
-      "__uuid__": "e9ec654c-97a2-4787-9325-e6a10375219a"
-    },
-    "_N$hoverSprite": {
-      "__uuid__": "f0048c10-f03e-4c97-b9d3-3506e1d58952"
-    },
-    "hoverSprite": {
-      "__uuid__": "f0048c10-f03e-4c97-b9d3-3506e1d58952"
-    },
-    "_N$disabledSprite": {
-      "__uuid__": "29158224-f8dd-4661-a796-1ffab537140e"
-    },
+    "_N$pressedSprite": null,
+    "pressedSprite": null,
+    "_N$hoverSprite": null,
+    "hoverSprite": null,
+    "_N$disabledSprite": null,
     "_N$target": {
       "__id__": 103
     },

assets/script/app/config/ConfigBase.js

@@ -9,17 +9,21 @@ cc.Class({
         multipleCache:null,
         table:null,
     },
-    
-    ctor(table, mainKey, multipleKey) {
+
+    ctor() {
+
+    },
+
+    initTable(table, mainKey, multipleKey) {
         this.table = table;
         this.mainKey = mainKey;
         this.multiple = multipleKey;
 
         this.indexsCache = {};
         this.multipleCache = {};
+        return this
     },
 
-
     // getObjectValue(object, key) {
     //     if (object.hasOwnProperty(key))
     //     {

assets/script/app/constants/AppConstants.js

@@ -35,7 +35,10 @@ window.JMC.ITEM_ID = cc.Enum({
 window.JMC.PUBLIC_MSG = cc.Enum({
     SWITCH_ACCOUNT: 'switch_account',       // 已经切换账号
     LOGIN_SUCCESS: 'login_success',         // 已经登录
-    DISCONNECTED: 'disconnected'           // 已经断网
+    DISCONNECTED: 'disconnected',           // 已经断网
+
+    BAG_INFO: "BAG_INFO",                   // 背包基本信息
+    
 });
 
 // 通用消息类型优先级
@@ -55,9 +58,3 @@ window.JMC.ORDER_STATUS = cc.Enum({
     SUBMIT_ORDER_FAILED: 5,    // 提交订单失败
     SUBMIT_ORDER_UNKOWN: 6    // 提交订单未知结果
 });
-
-
-// 背包事件
-window.JMC.BAG = cc.Enum({
-    INFO: "JMC.BAG.INFO",             // 基本信息
-});

assets/script/app/view/bag/BagMain.js

@@ -1,9 +1,4 @@
-// Learn cc.Class:
-//  - https://docs.cocos.com/creator/manual/en/scripting/class.html
-// Learn Attribute:
-//  - https://docs.cocos.com/creator/manual/en/scripting/reference/attributes.html
-// Learn life-cycle callbacks:
-//  - https://docs.cocos.com/creator/manual/en/scripting/life-cycle-callbacks.html
+
 let ButtonSelect2 = require('ButtonSelect2')
 cc.Class({
     extends: cc.Component,
@@ -15,7 +10,7 @@ cc.Class({
     onLoad () {
         G.BagMgr.requestInfo();
     },
-    
+
     start () {
 
     },

assets/script/app/view/common/ViewBase.js

@@ -0,0 +1,60 @@
+cc.Class({
+    extends: cc.Component,
+    properties: {
+    },
+
+    init(param) {
+        super.init()
+
+    },
+
+    createComponent(type, parent, param, cb) {
+        let prefabPath = G.UIMgr.defaultUIPath + JMC.UIPath[type];
+        this.creawteUI(prefabPath, parent, param)
+    },
+
+    creawteUI(prefabPath, parent, param, cb, cache = false) {
+        G.LogUtils.warn('showAlert', prefabPath);
+        let self = this;
+        cc.loader.loadRes(prefabPath, cc.Prefab, (completedCount, totalCount, item) => {
+        }, (err, prefab) => {
+            if (err) {
+                G.AppUtils.getSceneCtrl().addToast('网络异常！');
+                G.LogUtils.error('[showAlert]', err);
+                if (cb) {
+                    cb(undefined, 'error', err);
+                }
+                return;
+            }
+
+            let node = cc.instantiate(prefab);
+            if (cb) {
+                cb(alert, 'willShow', undefined);
+            }
+
+            let ret = self.safeAddChild(parent, node);
+            if (!ret) {
+                return;
+            }
+
+            let viewBase = node.getComponent(ViewBase);
+            if (viewBase) {
+                viewBase.init(param)
+            }
+
+            if (!cache) {
+                cc.loader.releaseRes(prefabPath);
+            }
+        });
+    },
+
+    safeAddChild(parent, node) {
+        if (!cc.isValid(node) || !cc.isValid(parent)) {
+            return false;
+        }
+
+        parent.addChild(node);
+        cc.game.emit('e_ui_push_alert', {node});
+        return true;
+    },
+});

assets/script/app/view/common/ViewBase.js.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "1.0.8",
+  "uuid": "e7fbb318-ca91-4c18-ae79-4e24c87711c3",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

assets/script/app/view/dream.meta

@@ -0,0 +1,7 @@
+{
+  "ver": "1.0.1",
+  "uuid": "de2d934e-3962-4f21-93dc-bd949372578b",
+  "isSubpackage": false,
+  "subpackageName": "",
+  "subMetas": {}
+}

assets/script/app/view/dream/DreamMain.js

@@ -0,0 +1,63 @@
+let ButtonSelect1 = require('ButtonSelect1')
+let ViewBase = require('ViewBase')
+
+cc.Class({
+    extends: cc.ViewBase,
+    properties: {
+        button1: {
+            default: null,
+            type: ButtonSelect1,
+            serializable: true,
+        },
+
+        button2: {
+            default: null,
+            type: ButtonSelect1,
+            serializable: true,
+        },
+
+        button3: {
+            default: null,
+            type: ButtonSelect1,
+            serializable: true,
+        },
+
+        button4: {
+            default: null,
+            type: ButtonSelect1,
+            serializable: true,
+        },
+    },
+
+    onLoad () {
+        self.buttons = [
+            this.button1,
+            this.button2,
+            this.button3,
+            this.button4,
+        ];
+
+        this.views = [
+            {type:JMC.UIEnum.DreamMain, view:null, initing:false},
+            {type:JMC.UIEnum.DreamMain, view:null, initing:false},
+            {type:JMC.UIEnum.DreamMain, view:null, initing:false},
+            {type:JMC.UIEnum.DreamMain, view:null, initing:false},
+        ];
+
+        this.curViewType = null
+        this.onClickTitle(null, "0")
+    },
+    
+    onClickTitle(event, customEventData) {
+        let index = parseInt(customEventData)
+        let viewType = this.views[index]
+
+        this.curViewType = viewType;
+        this.createOrShowView(this.curViewType)
+    },
+
+    createOrShowView(type) {
+
+    }
+    // update (dt) {},
+});

assets/script/app/view/dream/DreamMain.js.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "1.0.8",
+  "uuid": "2fd79d10-127e-4962-86e7-35ae0dc0aa1b",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

assets/script/app/view/navigation/NavigationMain.js

@@ -88,7 +88,6 @@ cc.Class({
             const button = this.buttons[i];
             button.setSelect(index == i)
         }
-
         G.UIMgr.open(this.views[index]);
     },
 

assets/script/core/model/UIMgr.js

@@ -4,6 +4,7 @@
 
 require("UIInfo")
 const Proxy = require('Proxy');
+const ViewBase = require('ViewBase');
 
 /**
  * 登录数据管理
@@ -20,11 +21,14 @@ let UIMgr = {
             return;
         }
 
-        this.UIRoots = {
-            [window.JMC.Proxy.Main]:"Main",
-            [window.JMC.Proxy.Navigation]:"Navigation",
-            [window.JMC.Proxy.Toast]:"Toast",
-            [window.JMC.Proxy.UI]:"UI",
+        // 常亮定义
+        this.defaultUIPath = 'edt_prefab/';
+
+        this.uiRoots = {
+            [JMC.Proxy.Main]:"Main",
+            [JMC.Proxy.Navigation]:"Navigation",
+            [JMC.Proxy.Toast]:"Toast",
+            [JMC.Proxy.UI]:"UI",
         };
     },
 
@@ -35,20 +39,15 @@ let UIMgr = {
     },
 
     open(type, param) {
-        let prefabPath = 'edt_prefab/' + window.JMC.UIPath[type];
+        let prefabPath = this.defaultUIPath + JMC.UIPath[type];
         this.showUI(prefabPath, param)
     },
 
-    showUI(prefabPath, alertData, cb, cache = false) {
+    showUI(prefabPath, param, 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);
-            G.AppUtils.getSceneCtrl().updateLoadingProgress(temp.precent * 100, 100, item);
+        cc.loader.loadRes(prefabPath, cc.Prefab, (completedCount, totalCount, item) => {
         }, (err, prefab) => {
-            G.AppUtils.getSceneCtrl().updateLoadingProgress(100, 100, undefined);
-
             if (err) {
                 G.AppUtils.getSceneCtrl().addToast('网络异常！');
                 G.LogUtils.error('[showAlert]', err);
@@ -64,33 +63,30 @@ let UIMgr = {
             }
 
             let uiRoot = self.getUIRoot();
+
             let proxy = node.getComponent(Proxy);
             if (proxy){
-                uiRoot = uiRoot.getChildByName(self.UIRoots[proxy.type])
-                self.clearUIType(proxy.type, proxy.type == window.JMC.Proxy.Main)
+                uiRoot = uiRoot.getChildByName(self.uiRoots[proxy.type])
+                self.clearUIType(proxy.type, proxy.type == JMC.Proxy.Main)
             }
-            
-            // let uiRoot = this.getUIRoot();
-            // .getChildByName(this.UIRoots[type])
-            let ret = self.pushUI(uiRoot, node);
+
+            let ret = self.safeAddChild(uiRoot, node);
             if (!ret) {
                 return;
             }
 
+            let viewBase = node.getComponent(ViewBase);
+            if (viewBase) {
+                viewBase.init(param)
+            }
+
             if (!cache) {
                 cc.loader.releaseRes(prefabPath);
             }
         });
     },
 
-    /**
-     * 弹出指定弹框
-     *
-     * @author Pyden
-     * @date 2019-03-22
-     * @param {JMAlertBase} alert 弹框
-     */
-    pushUI (uiRoot, node) {
+    safeAddChild(uiRoot, node) {
         if (!cc.isValid(node) || !cc.isValid(uiRoot)) {
             return false;
         }
@@ -106,7 +102,7 @@ let UIMgr = {
         }
 
         let uiRoot = this.getUIRoot();
-        let typeRoot = uiRoot.getChildByName(this.UIRoots[type]);
+        let typeRoot = uiRoot.getChildByName(this.uiRoots[type]);
         typeRoot.removeAllChildren();
     }
 }

assets/script/core/model/bag/BagMgr.js

@@ -25,7 +25,7 @@ let BagMgr = {
         if (responseInfo.code === 200) {
             // 玩家基础信息
             this._items = responseInfo.items;
-            G.PublicMgr.emit(JMC.BAG.INFO);
+            G.PublicMgr.emit(JMC.PUBLIC_MSG.BAG_INFO);
         } else {
             // 断开网络并且弹出重连窗口
             G.NetworkMgr.closeSocket();