Browse Source

【修改】 修改主场景加载

Hua 1 year ago
parent
commit
290d9bcc35

File diff suppressed because it is too large
+ 128 - 3701
assets/edt_scene/scene_main.fire


+ 15 - 1
assets/resources/edt_prefab/Dream/DreamMain.prefab

@@ -34,10 +34,13 @@
34
       },
34
       },
35
       {
35
       {
36
         "__id__": 79
36
         "__id__": 79
37
+      },
38
+      {
39
+        "__id__": 80
37
       }
40
       }
38
     ],
41
     ],
39
     "_prefab": {
42
     "_prefab": {
40
-      "__id__": 80
43
+      "__id__": 81
41
     },
44
     },
42
     "_opacity": 255,
45
     "_opacity": 255,
43
     "_color": {
46
     "_color": {
@@ -3076,6 +3079,17 @@
3076
     "_id": ""
3079
     "_id": ""
3077
   },
3080
   },
3078
   {
3081
   {
3082
+    "__type__": "34c50r/l89GbL4vjuzGvS5f",
3083
+    "_name": "",
3084
+    "_objFlags": 0,
3085
+    "node": {
3086
+      "__id__": 1
3087
+    },
3088
+    "_enabled": true,
3089
+    "type": 0,
3090
+    "_id": ""
3091
+  },
3092
+  {
3079
     "__type__": "cc.PrefabInfo",
3093
     "__type__": "cc.PrefabInfo",
3080
     "root": {
3094
     "root": {
3081
       "__id__": 1
3095
       "__id__": 1

+ 15 - 1
assets/resources/edt_prefab/Navigation/NavigationMain.prefab

@@ -31,10 +31,13 @@
31
       },
31
       },
32
       {
32
       {
33
         "__id__": 88
33
         "__id__": 88
34
+      },
35
+      {
36
+        "__id__": 89
34
       }
37
       }
35
     ],
38
     ],
36
     "_prefab": {
39
     "_prefab": {
37
-      "__id__": 89
40
+      "__id__": 90
38
     },
41
     },
39
     "_opacity": 255,
42
     "_opacity": 255,
40
     "_color": {
43
     "_color": {
@@ -3568,6 +3571,17 @@
3568
     "_id": ""
3571
     "_id": ""
3569
   },
3572
   },
3570
   {
3573
   {
3574
+    "__type__": "34c50r/l89GbL4vjuzGvS5f",
3575
+    "_name": "",
3576
+    "_objFlags": 0,
3577
+    "node": {
3578
+      "__id__": 1
3579
+    },
3580
+    "_enabled": true,
3581
+    "type": 1,
3582
+    "_id": ""
3583
+  },
3584
+  {
3571
     "__type__": "cc.PrefabInfo",
3585
     "__type__": "cc.PrefabInfo",
3572
     "root": {
3586
     "root": {
3573
       "__id__": 1
3587
       "__id__": 1

+ 4 - 3
assets/script/app/ctrl/MainCtr.js

@@ -8,16 +8,17 @@ cc.Class({
8
     },
8
     },
9
 
9
 
10
     properties: {
10
     properties: {
11
-        
11
+
12
     },
12
     },
13
 
13
 
14
     onLoad () {
14
     onLoad () {
15
         this._super();
15
         this._super();
16
         this.initUI();
16
         this.initUI();
17
     },
17
     },
18
-
18
+  
19
     initUI() {
19
     initUI() {
20
-        // G.UIMgr.open(window.JMC.UIEnum.BagMain);
20
+        G.UIMgr.open(JMC.UIEnum.DreamMain);
21
+        G.UIMgr.open(JMC.UIEnum.NavigationMain);
21
         // G.UIMgr.open(window.JMC.UIEnum.BattleJoinRoomTip); 
22
         // G.UIMgr.open(window.JMC.UIEnum.BattleJoinRoomTip); 
22
     }
23
     }
23
 });
24
 });