【修改】 修改追梦界面

assets/resources/edt_prefab/Dream/DreamBrilliant.prefab

@@ -170,7 +170,7 @@
       "__id__": 1
     },
     "asset": {
-      "__id__": 0
+      "__uuid__": "162988ad-a925-4a36-8cd8-93aa2f510bbf"
     },
     "fileId": "0e4oCQTV9AGpwAZZJDM6nX",
     "sync": false
@@ -181,7 +181,7 @@
       "__id__": 1
     },
     "asset": {
-      "__id__": 0
+      "__uuid__": "162988ad-a925-4a36-8cd8-93aa2f510bbf"
     },
     "fileId": "4eiuNmIiNOCIDEOSZbXjyl",
     "sync": false

assets/resources/edt_prefab/Dream/DreamBrilliantCell.prefab

@@ -72,8 +72,8 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        0.3,
-        981,
+        0,
+        0,
         0,
         0,
         0,
@@ -199,7 +199,7 @@
       "__id__": 1
     },
     "asset": {
-      "__id__": 0
+      "__uuid__": "c553aa50-1ceb-47c3-b0f9-0bb3eafd631a"
     },
     "fileId": "dd1hVjDoZNl4BHCPykWoJa",
     "sync": false
@@ -448,7 +448,7 @@
       "__id__": 1
     },
     "asset": {
-      "__id__": 0
+      "__uuid__": "c553aa50-1ceb-47c3-b0f9-0bb3eafd631a"
     },
     "fileId": "3fNg/HCbtHHYr3QAdRqgMa",
     "sync": false
@@ -481,7 +481,7 @@
       "__id__": 1
     },
     "asset": {
-      "__id__": 0
+      "__uuid__": "c553aa50-1ceb-47c3-b0f9-0bb3eafd631a"
     },
     "fileId": "abYBoZ1tVI9I44zSEW/scy",
     "sync": false
@@ -588,7 +588,7 @@
       "__id__": 1
     },
     "asset": {
-      "__id__": 0
+      "__uuid__": "c553aa50-1ceb-47c3-b0f9-0bb3eafd631a"
     },
     "fileId": "c7NcHEkzBLFLvL6aLSPG7Y",
     "sync": false
@@ -702,7 +702,7 @@
       "__id__": 1
     },
     "asset": {
-      "__id__": 0
+      "__uuid__": "c553aa50-1ceb-47c3-b0f9-0bb3eafd631a"
     },
     "fileId": "62iRz/kUxJAKXNTYFs+iBg",
     "sync": false
@@ -809,7 +809,7 @@
       "__id__": 1
     },
     "asset": {
-      "__id__": 0
+      "__uuid__": "c553aa50-1ceb-47c3-b0f9-0bb3eafd631a"
     },
     "fileId": "999KW5/GFDPbH46hvoa6ka",
     "sync": false
@@ -916,7 +916,7 @@
       "__id__": 1
     },
     "asset": {
-      "__id__": 0
+      "__uuid__": "c553aa50-1ceb-47c3-b0f9-0bb3eafd631a"
     },
     "fileId": "20LtarpztIwrTb1sAE/fKo",
     "sync": false
@@ -1021,7 +1021,7 @@
       "__id__": 1
     },
     "asset": {
-      "__id__": 0
+      "__uuid__": "c553aa50-1ceb-47c3-b0f9-0bb3eafd631a"
     },
     "fileId": "fa1B+9kltE4oZBYTs5aDd6",
     "sync": false
@@ -1128,7 +1128,7 @@
       "__id__": 1
     },
     "asset": {
-      "__id__": 0
+      "__uuid__": "c553aa50-1ceb-47c3-b0f9-0bb3eafd631a"
     },
     "fileId": "7fil3nc/dBfYhKgT9hDeNB",
     "sync": false
@@ -1235,7 +1235,7 @@
       "__id__": 1
     },
     "asset": {
-      "__id__": 0
+      "__uuid__": "c553aa50-1ceb-47c3-b0f9-0bb3eafd631a"
     },
     "fileId": "3aobmgejpAz6bqGHA4wJWn",
     "sync": false
@@ -1342,7 +1342,7 @@
       "__id__": 1
     },
     "asset": {
-      "__id__": 0
+      "__uuid__": "c553aa50-1ceb-47c3-b0f9-0bb3eafd631a"
     },
     "fileId": "3atQ+wv5JDF5tIZD3bgo3B",
     "sync": false
@@ -1520,7 +1520,7 @@
       "__id__": 1
     },
     "asset": {
-      "__id__": 0
+      "__uuid__": "c553aa50-1ceb-47c3-b0f9-0bb3eafd631a"
     },
     "fileId": "fdlJLHyBlMbJCzFvEzLFC8",
     "sync": false
@@ -1627,7 +1627,7 @@
       "__id__": 1
     },
     "asset": {
-      "__id__": 0
+      "__uuid__": "c553aa50-1ceb-47c3-b0f9-0bb3eafd631a"
     },
     "fileId": "fdFDmrTBBPVKKu8KdtBwZT",
     "sync": false
@@ -1654,7 +1654,7 @@
       "__id__": 1
     },
     "asset": {
-      "__id__": 0
+      "__uuid__": "c553aa50-1ceb-47c3-b0f9-0bb3eafd631a"
     },
     "fileId": "81abvMC6RLc7Z6r5+KHdWC",
     "sync": false
@@ -1665,7 +1665,7 @@
       "__id__": 1
     },
     "asset": {
-      "__id__": 0
+      "__uuid__": "c553aa50-1ceb-47c3-b0f9-0bb3eafd631a"
     },
     "fileId": "5aYtojorhBfqoIJWz2FJXJ",
     "sync": false

assets/resources/edt_prefab/Dream/DreamDropRecord.prefab

@@ -0,0 +1,189 @@
+[
+  {
+    "__type__": "cc.Prefab",
+    "_name": "",
+    "_objFlags": 0,
+    "_native": "",
+    "data": {
+      "__id__": 1
+    },
+    "optimizationPolicy": 0,
+    "asyncLoadAssets": false,
+    "readonly": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "DreamBrilliant",
+    "_objFlags": 0,
+    "_parent": null,
+    "_children": [
+      {
+        "__id__": 2
+      }
+    ],
+    "_active": true,
+    "_components": [],
+    "_prefab": {
+      "__id__": 5
+    },
+    "_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": ""
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "Bottom",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 3
+      }
+    ],
+    "_prefab": {
+      "__id__": 4
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 810,
+      "height": 1063
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        -720,
+        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": ""
+  },
+  {
+    "__type__": "cc.Widget",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 2
+    },
+    "_enabled": true,
+    "alignMode": 1,
+    "_target": null,
+    "_alignFlags": 45,
+    "_left": 0,
+    "_right": 0,
+    "_top": 377,
+    "_bottom": 0,
+    "_verticalCenter": 0,
+    "_horizontalCenter": 0,
+    "_isAbsLeft": true,
+    "_isAbsRight": true,
+    "_isAbsTop": true,
+    "_isAbsBottom": true,
+    "_isAbsHorizontalCenter": true,
+    "_isAbsVerticalCenter": true,
+    "_originalWidth": 0,
+    "_originalHeight": 300,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "0e4oCQTV9AGpwAZZJDM6nX",
+    "sync": false
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "4eiuNmIiNOCIDEOSZbXjyl",
+    "sync": false
+  }
+]

assets/resources/edt_prefab/Dream/DreamDropRecord.prefab.meta

@@ -0,0 +1,8 @@
+{
+  "ver": "1.2.6",
+  "uuid": "9575aabc-d4c7-4082-a65a-6524ffa49cc5",
+  "optimizationPolicy": "AUTO",
+  "asyncLoadAssets": false,
+  "readonly": false,
+  "subMetas": {}
+}

assets/script/app/view/UIInfo.js

@@ -11,20 +11,33 @@
 		BoxContainsMain:8,
 		BoxItem:9,
 		ButtonSelect1:10,
-		DreamBrilliant:11,
-		DreamBrilliantCell:12,
-		DreamMain:13,
-		DreamPopular:14,
-		DreamStatistics:15,
-		DreamStatisticsCell:16,
-		DreamStatisticsFilter:17,
-		DropPercentageItem:18,
-		DropRecordMain:19,
-		DropWastageItem:20,
-		FilterMain:21,
-		HeadIcon:22,
-		ItemIcon:23,
-		NavigationMain:24
+		ButtonSelect2:11,
+		debug_alert:12,
+		debug_enter:13,
+		DreamBrilliant:14,
+		DreamBrilliantCell:15,
+		DreamDropRecord:16,
+		DreamMain:17,
+		DreamPopular:18,
+		DreamStatistics:19,
+		DreamStatisticsCell:20,
+		DreamStatisticsFilter:21,
+		DropPercentageItem:22,
+		DropRecordMain:23,
+		DropWastageItem:24,
+		FilterMain:25,
+		HeadIcon:26,
+		ItemIcon:27,
+		NavigationMain:28,
+		prefab_headicon_change:29,
+		prefab_headIcon_choose_item:30,
+		prefab_identitycard_change:31,
+		prefab_nick_change:32,
+		prefab_password_change:33,
+		prefab_personal_alert:34,
+		prefab_steam_change:35,
+		ShopItem:36,
+		ShopMain:37
 
 }
 window.JMC.UIPath = {
@@ -39,8 +52,12 @@ window.JMC.UIPath = {
 		[window.JMC.UIEnum.BoxContainsMain] : "BoxContains/BoxContainsMain",
 		[window.JMC.UIEnum.BoxItem] : "BoxContains/BoxItem",
 		[window.JMC.UIEnum.ButtonSelect1] : "Common/ButtonSelect1",
+		[window.JMC.UIEnum.ButtonSelect2] : "Common/ButtonSelect2",
+		[window.JMC.UIEnum.debug_alert] : "Debug/debug_alert",
+		[window.JMC.UIEnum.debug_enter] : "Debug/debug_enter",
 		[window.JMC.UIEnum.DreamBrilliant] : "Dream/DreamBrilliant",
 		[window.JMC.UIEnum.DreamBrilliantCell] : "Dream/DreamBrilliantCell",
+		[window.JMC.UIEnum.DreamDropRecord] : "Dream/DreamDropRecord",
 		[window.JMC.UIEnum.DreamMain] : "Dream/DreamMain",
 		[window.JMC.UIEnum.DreamPopular] : "Dream/DreamPopular",
 		[window.JMC.UIEnum.DreamStatistics] : "Dream/DreamStatistics",
@@ -52,6 +69,15 @@ window.JMC.UIPath = {
 		[window.JMC.UIEnum.FilterMain] : "Filter/FilterMain",
 		[window.JMC.UIEnum.HeadIcon] : "Common/HeadIcon",
 		[window.JMC.UIEnum.ItemIcon] : "Common/ItemIcon",
-		[window.JMC.UIEnum.NavigationMain] : "Navigation/NavigationMain"
+		[window.JMC.UIEnum.NavigationMain] : "Navigation/NavigationMain",
+		[window.JMC.UIEnum.prefab_headicon_change] : "Personal/prefab_headicon_change",
+		[window.JMC.UIEnum.prefab_headIcon_choose_item] : "Personal/prefab_headIcon_choose_item",
+		[window.JMC.UIEnum.prefab_identitycard_change] : "Personal/prefab_identitycard_change",
+		[window.JMC.UIEnum.prefab_nick_change] : "Personal/prefab_nick_change",
+		[window.JMC.UIEnum.prefab_password_change] : "Personal/prefab_password_change",
+		[window.JMC.UIEnum.prefab_personal_alert] : "Personal/prefab_personal_alert",
+		[window.JMC.UIEnum.prefab_steam_change] : "Personal/prefab_steam_change",
+		[window.JMC.UIEnum.ShopItem] : "Shop/ShopItem",
+		[window.JMC.UIEnum.ShopMain] : "Shop/ShopMain"
 
 }

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

@@ -20,23 +20,9 @@ cc.Class({
             type: cc.Label,
             serializable: true,
         },
-        // bar: {
-        //     get () {
-        //         return this._bar;
-        //     },
-        //     set (value) {
-        //         this._bar = value;
-        //     }
-        // },
     },
 
-    // LIFE-CYCLE CALLBACKS:
-
-    // onLoad () {},
-
-    start () {
-
-    },
-
-    // update (dt) {},
+    setSelect(b) {
+        this.imageLight.node.active = b
+    }
 });

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

@@ -5,9 +5,13 @@ cc.Class({
 
     },
     
-    createComponent(type, parent, param, cb) {
+    initView(param) {
+
+    },
+
+    createComponent(type, parent, param, cb, cache = false) {
         let prefabPath = G.UIMgr.defaultUIPath + JMC.UIPath[type];
-        this.creawteUI(prefabPath, parent, param)
+        this.creawteUI(prefabPath, parent, param, cb, cache)
     },
 
     creawteUI(prefabPath, parent, param, cb, cache = false) {
@@ -25,23 +29,25 @@ cc.Class({
             }
 
             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);
+            let viewBase = node.getComponent("ViewBase");
             if (viewBase) {
-                viewBase.init(param)
+                viewBase.initView(param)
             }
 
             if (!cache) {
                 cc.loader.releaseRes(prefabPath);
             }
+
+            if (cb) {
+                cb(node, 'ok', undefined);
+            }
+
         });
     },
 

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

@@ -27,10 +27,16 @@ cc.Class({
             type: ButtonSelect1,
             serializable: true,
         },
+
+        viewContent: {
+            default: null,
+            type: cc.Node,
+            serializable: true,
+        }
     },
 
     onLoad () {
-        self.buttons = [
+        this.buttons = [
             this.button1,
             this.button2,
             this.button3,
@@ -38,10 +44,10 @@ cc.Class({
         ];
 
         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},
+            {type:JMC.UIEnum.DreamPopular, view:null, initing:false},
+            {type:JMC.UIEnum.DreamBrilliant, view:null, initing:false},
+            {type:JMC.UIEnum.DreamDropRecord, view:null, initing:false},
+            {type:JMC.UIEnum.DreamStatistics, view:null, initing:false},
         ];
 
         this.curViewType = null
@@ -50,17 +56,48 @@ cc.Class({
     
     onClickTitle(event, customEventData) {
         let index = parseInt(customEventData)
-        let viewType = this.views[index]
-
-        this.curViewType = viewType;
+        this.updateButtonSelect(index);
+        this.curViewType = index;
         this.createOrShowView(this.curViewType)
+    },
 
-        cc.log(G.CfgMgr.battleBoxAwardConfig.getByMultipleKey(2001, 10001));
-        cc.log(G.CfgMgr.battleBoxConfig.getByMainKey(2001));
+    updateButtonSelect(index) {
+        for (let i = 0; i < this.buttons.length; i++) {
+            const b = this.buttons[i];
+            b.setSelect(index == i)
+        }
     },
 
     createOrShowView(type) {
+        let viewData = this.views[type]
+        for (let vd of this.views) {
+            if (vd.view == null) {
+                continue
+            }
+            vd.view.active = false;
+        }
 
+        if (viewData.initing) {
+            return
+        }
+
+        if (viewData.view != null) {
+            viewData.view.active = true;
+            return
+        }
+
+        viewData.initing = true
+        let self = this
+        this.createComponent(viewData.type, this.viewContent, null, function(node, status) {
+            if (status != 'ok') {
+                return
+            }
+
+            viewData.view = node
+            viewData.initing = false
+            node.active = self.curViewType == type
+        })
     }
+
     // update (dt) {},
 });

assets/script/core/model/UIMgr.js

@@ -77,7 +77,7 @@ let UIMgr = {
 
             let viewBase = node.getComponent(ViewBase);
             if (viewBase) {
-                // viewBase.init(param)
+                viewBase.initView(param)
             }
 
             if (!cache) {