浏览代码

【修改】 修改场景main跳转问题

Hua 1 年之前
父节点
当前提交
b5fab9bc97

+ 160 - 63
assets/edt_scene/scene_main.fire

@@ -17,7 +17,7 @@
17 17
         "__id__": 2
18 18
       },
19 19
       {
20
-        "__id__": 38
20
+        "__id__": 40
21 21
       }
22 22
     ],
23 23
     "_active": false,
@@ -78,22 +78,22 @@
78 78
         "__id__": 5
79 79
       },
80 80
       {
81
-        "__id__": 17
81
+        "__id__": 19
82 82
       },
83 83
       {
84
-        "__id__": 20
84
+        "__id__": 22
85 85
       },
86 86
       {
87
-        "__id__": 33
87
+        "__id__": 35
88 88
       }
89 89
     ],
90 90
     "_active": true,
91 91
     "_components": [
92 92
       {
93
-        "__id__": 36
93
+        "__id__": 38
94 94
       },
95 95
       {
96
-        "__id__": 37
96
+        "__id__": 39
97 97
       }
98 98
     ],
99 99
     "_prefab": null,
@@ -183,7 +183,7 @@
183 183
       "array": [
184 184
         0,
185 185
         0,
186
-        347.2761869175599,
186
+        422.6203970468061,
187 187
         0,
188 188
         0,
189 189
         0,
@@ -252,12 +252,15 @@
252 252
     "_children": [
253 253
       {
254 254
         "__id__": 6
255
+      },
256
+      {
257
+        "__id__": 8
255 258
       }
256 259
     ],
257 260
     "_active": true,
258 261
     "_components": [
259 262
       {
260
-        "__id__": 16
263
+        "__id__": 18
261 264
       }
262 265
     ],
263 266
     "_prefab": null,
@@ -310,15 +313,106 @@
310 313
   },
311 314
   {
312 315
     "__type__": "cc.Node",
313
-    "_name": "UIRoot",
316
+    "_name": "ImageBg",
314 317
     "_objFlags": 0,
315 318
     "_parent": {
316 319
       "__id__": 5
317 320
     },
318
-    "_children": [
321
+    "_children": [],
322
+    "_active": true,
323
+    "_components": [
319 324
       {
320 325
         "__id__": 7
321
-      },
326
+      }
327
+    ],
328
+    "_prefab": null,
329
+    "_opacity": 255,
330
+    "_color": {
331
+      "__type__": "cc.Color",
332
+      "r": 255,
333
+      "g": 255,
334
+      "b": 255,
335
+      "a": 255
336
+    },
337
+    "_contentSize": {
338
+      "__type__": "cc.Size",
339
+      "width": 810,
340
+      "height": 1440
341
+    },
342
+    "_anchorPoint": {
343
+      "__type__": "cc.Vec2",
344
+      "x": 0.5,
345
+      "y": 0.5
346
+    },
347
+    "_trs": {
348
+      "__type__": "TypedArray",
349
+      "ctor": "Float64Array",
350
+      "array": [
351
+        0,
352
+        0,
353
+        0,
354
+        0,
355
+        0,
356
+        0,
357
+        1,
358
+        1,
359
+        1,
360
+        1
361
+      ]
362
+    },
363
+    "_eulerAngles": {
364
+      "__type__": "cc.Vec3",
365
+      "x": 0,
366
+      "y": 0,
367
+      "z": 0
368
+    },
369
+    "_skewX": 0,
370
+    "_skewY": 0,
371
+    "_is3DNode": false,
372
+    "_groupIndex": 0,
373
+    "groupIndex": 0,
374
+    "_id": "36PZ1zwAxBAot9VGBqVPxZ"
375
+  },
376
+  {
377
+    "__type__": "cc.Sprite",
378
+    "_name": "",
379
+    "_objFlags": 0,
380
+    "node": {
381
+      "__id__": 6
382
+    },
383
+    "_enabled": true,
384
+    "_materials": [
385
+      {
386
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
387
+      }
388
+    ],
389
+    "_srcBlendFactor": 770,
390
+    "_dstBlendFactor": 771,
391
+    "_spriteFrame": {
392
+      "__uuid__": "9f73f70a-5ff0-421e-a7c1-1e81b178830c"
393
+    },
394
+    "_type": 0,
395
+    "_sizeMode": 1,
396
+    "_fillType": 0,
397
+    "_fillCenter": {
398
+      "__type__": "cc.Vec2",
399
+      "x": 0,
400
+      "y": 0
401
+    },
402
+    "_fillStart": 0,
403
+    "_fillRange": 0,
404
+    "_isTrimmedMode": true,
405
+    "_atlas": null,
406
+    "_id": "7drEPW8/lJoKrAdWrxyobQ"
407
+  },
408
+  {
409
+    "__type__": "cc.Node",
410
+    "_name": "UIRoot",
411
+    "_objFlags": 0,
412
+    "_parent": {
413
+      "__id__": 5
414
+    },
415
+    "_children": [
322 416
       {
323 417
         "__id__": 9
324 418
       },
@@ -327,12 +421,15 @@
327 421
       },
328 422
       {
329 423
         "__id__": 13
424
+      },
425
+      {
426
+        "__id__": 15
330 427
       }
331 428
     ],
332 429
     "_active": true,
333 430
     "_components": [
334 431
       {
335
-        "__id__": 15
432
+        "__id__": 17
336 433
       }
337 434
     ],
338 435
     "_prefab": null,
@@ -388,13 +485,13 @@
388 485
     "_name": "Main",
389 486
     "_objFlags": 0,
390 487
     "_parent": {
391
-      "__id__": 6
488
+      "__id__": 8
392 489
     },
393 490
     "_children": [],
394 491
     "_active": true,
395 492
     "_components": [
396 493
       {
397
-        "__id__": 8
494
+        "__id__": 10
398 495
       }
399 496
     ],
400 497
     "_prefab": null,
@@ -450,7 +547,7 @@
450 547
     "_name": "",
451 548
     "_objFlags": 0,
452 549
     "node": {
453
-      "__id__": 7
550
+      "__id__": 9
454 551
     },
455 552
     "_enabled": true,
456 553
     "alignMode": 1,
@@ -477,13 +574,13 @@
477 574
     "_name": "Navigation",
478 575
     "_objFlags": 0,
479 576
     "_parent": {
480
-      "__id__": 6
577
+      "__id__": 8
481 578
     },
482 579
     "_children": [],
483 580
     "_active": true,
484 581
     "_components": [
485 582
       {
486
-        "__id__": 10
583
+        "__id__": 12
487 584
       }
488 585
     ],
489 586
     "_prefab": null,
@@ -539,7 +636,7 @@
539 636
     "_name": "",
540 637
     "_objFlags": 0,
541 638
     "node": {
542
-      "__id__": 9
639
+      "__id__": 11
543 640
     },
544 641
     "_enabled": true,
545 642
     "alignMode": 1,
@@ -566,13 +663,13 @@
566 663
     "_name": "Toast",
567 664
     "_objFlags": 0,
568 665
     "_parent": {
569
-      "__id__": 6
666
+      "__id__": 8
570 667
     },
571 668
     "_children": [],
572 669
     "_active": true,
573 670
     "_components": [
574 671
       {
575
-        "__id__": 12
672
+        "__id__": 14
576 673
       }
577 674
     ],
578 675
     "_prefab": null,
@@ -628,7 +725,7 @@
628 725
     "_name": "",
629 726
     "_objFlags": 0,
630 727
     "node": {
631
-      "__id__": 11
728
+      "__id__": 13
632 729
     },
633 730
     "_enabled": true,
634 731
     "alignMode": 1,
@@ -655,13 +752,13 @@
655 752
     "_name": "UI",
656 753
     "_objFlags": 0,
657 754
     "_parent": {
658
-      "__id__": 6
755
+      "__id__": 8
659 756
     },
660 757
     "_children": [],
661 758
     "_active": true,
662 759
     "_components": [
663 760
       {
664
-        "__id__": 14
761
+        "__id__": 16
665 762
       }
666 763
     ],
667 764
     "_prefab": null,
@@ -717,7 +814,7 @@
717 814
     "_name": "",
718 815
     "_objFlags": 0,
719 816
     "node": {
720
-      "__id__": 13
817
+      "__id__": 15
721 818
     },
722 819
     "_enabled": true,
723 820
     "alignMode": 1,
@@ -744,7 +841,7 @@
744 841
     "_name": "",
745 842
     "_objFlags": 0,
746 843
     "node": {
747
-      "__id__": 6
844
+      "__id__": 8
748 845
     },
749 846
     "_enabled": true,
750 847
     "alignMode": 1,
@@ -804,10 +901,10 @@
804 901
     "_active": true,
805 902
     "_components": [
806 903
       {
807
-        "__id__": 18
904
+        "__id__": 20
808 905
       },
809 906
       {
810
-        "__id__": 19
907
+        "__id__": 21
811 908
       }
812 909
     ],
813 910
     "_prefab": null,
@@ -863,7 +960,7 @@
863 960
     "_name": "",
864 961
     "_objFlags": 0,
865 962
     "node": {
866
-      "__id__": 17
963
+      "__id__": 19
867 964
     },
868 965
     "_enabled": true,
869 966
     "_alertList": [],
@@ -874,7 +971,7 @@
874 971
     "_name": "",
875 972
     "_objFlags": 0,
876 973
     "node": {
877
-      "__id__": 17
974
+      "__id__": 19
878 975
     },
879 976
     "_enabled": true,
880 977
     "alignMode": 1,
@@ -905,25 +1002,25 @@
905 1002
     },
906 1003
     "_children": [
907 1004
       {
908
-        "__id__": 21
1005
+        "__id__": 23
909 1006
       },
910 1007
       {
911
-        "__id__": 24
1008
+        "__id__": 26
912 1009
       },
913 1010
       {
914
-        "__id__": 27
1011
+        "__id__": 29
915 1012
       }
916 1013
     ],
917 1014
     "_active": false,
918 1015
     "_components": [
919 1016
       {
920
-        "__id__": 30
1017
+        "__id__": 32
921 1018
       },
922 1019
       {
923
-        "__id__": 31
1020
+        "__id__": 33
924 1021
       },
925 1022
       {
926
-        "__id__": 32
1023
+        "__id__": 34
927 1024
       }
928 1025
     ],
929 1026
     "_prefab": null,
@@ -979,16 +1076,16 @@
979 1076
     "_name": "bg",
980 1077
     "_objFlags": 0,
981 1078
     "_parent": {
982
-      "__id__": 20
1079
+      "__id__": 22
983 1080
     },
984 1081
     "_children": [],
985 1082
     "_active": true,
986 1083
     "_components": [
987 1084
       {
988
-        "__id__": 22
1085
+        "__id__": 24
989 1086
       },
990 1087
       {
991
-        "__id__": 23
1088
+        "__id__": 25
992 1089
       }
993 1090
     ],
994 1091
     "_prefab": null,
@@ -1044,7 +1141,7 @@
1044 1141
     "_name": "",
1045 1142
     "_objFlags": 0,
1046 1143
     "node": {
1047
-      "__id__": 21
1144
+      "__id__": 23
1048 1145
     },
1049 1146
     "_enabled": true,
1050 1147
     "_materials": [],
@@ -1072,7 +1169,7 @@
1072 1169
     "_name": "",
1073 1170
     "_objFlags": 0,
1074 1171
     "node": {
1075
-      "__id__": 21
1172
+      "__id__": 23
1076 1173
     },
1077 1174
     "_enabled": true,
1078 1175
     "alignMode": 1,
@@ -1099,16 +1196,16 @@
1099 1196
     "_name": "icon",
1100 1197
     "_objFlags": 0,
1101 1198
     "_parent": {
1102
-      "__id__": 20
1199
+      "__id__": 22
1103 1200
     },
1104 1201
     "_children": [],
1105 1202
     "_active": true,
1106 1203
     "_components": [
1107 1204
       {
1108
-        "__id__": 25
1205
+        "__id__": 27
1109 1206
       },
1110 1207
       {
1111
-        "__id__": 26
1208
+        "__id__": 28
1112 1209
       }
1113 1210
     ],
1114 1211
     "_prefab": null,
@@ -1164,7 +1261,7 @@
1164 1261
     "_name": "",
1165 1262
     "_objFlags": 0,
1166 1263
     "node": {
1167
-      "__id__": 24
1264
+      "__id__": 26
1168 1265
     },
1169 1266
     "_enabled": true,
1170 1267
     "_materials": [],
@@ -1192,7 +1289,7 @@
1192 1289
     "_name": "",
1193 1290
     "_objFlags": 0,
1194 1291
     "node": {
1195
-      "__id__": 24
1292
+      "__id__": 26
1196 1293
     },
1197 1294
     "_enabled": true,
1198 1295
     "_defaultClip": {
@@ -1211,16 +1308,16 @@
1211 1308
     "_name": "precent",
1212 1309
     "_objFlags": 0,
1213 1310
     "_parent": {
1214
-      "__id__": 20
1311
+      "__id__": 22
1215 1312
     },
1216 1313
     "_children": [],
1217 1314
     "_active": true,
1218 1315
     "_components": [
1219 1316
       {
1220
-        "__id__": 28
1317
+        "__id__": 30
1221 1318
       },
1222 1319
       {
1223
-        "__id__": 29
1320
+        "__id__": 31
1224 1321
       }
1225 1322
     ],
1226 1323
     "_prefab": null,
@@ -1276,7 +1373,7 @@
1276 1373
     "_name": "",
1277 1374
     "_objFlags": 0,
1278 1375
     "node": {
1279
-      "__id__": 27
1376
+      "__id__": 29
1280 1377
     },
1281 1378
     "_enabled": true,
1282 1379
     "_materials": [],
@@ -1304,7 +1401,7 @@
1304 1401
     "_name": "",
1305 1402
     "_objFlags": 0,
1306 1403
     "node": {
1307
-      "__id__": 27
1404
+      "__id__": 29
1308 1405
     },
1309 1406
     "_enabled": true,
1310 1407
     "_color": {
@@ -1322,11 +1419,11 @@
1322 1419
     "_name": "",
1323 1420
     "_objFlags": 0,
1324 1421
     "node": {
1325
-      "__id__": 20
1422
+      "__id__": 22
1326 1423
     },
1327 1424
     "_enabled": true,
1328 1425
     "loadPrecentLabel": {
1329
-      "__id__": 28
1426
+      "__id__": 30
1330 1427
     },
1331 1428
     "_id": "51NDBXEXxFXphPs+dV4T9s"
1332 1429
   },
@@ -1335,7 +1432,7 @@
1335 1432
     "_name": "",
1336 1433
     "_objFlags": 0,
1337 1434
     "node": {
1338
-      "__id__": 20
1435
+      "__id__": 22
1339 1436
     },
1340 1437
     "_enabled": true,
1341 1438
     "alignMode": 1,
@@ -1362,7 +1459,7 @@
1362 1459
     "_name": "",
1363 1460
     "_objFlags": 0,
1364 1461
     "node": {
1365
-      "__id__": 20
1462
+      "__id__": 22
1366 1463
     },
1367 1464
     "_enabled": true,
1368 1465
     "_id": "3ekKTLjJxP+4/QG6ngUXhj"
@@ -1378,10 +1475,10 @@
1378 1475
     "_active": true,
1379 1476
     "_components": [
1380 1477
       {
1381
-        "__id__": 34
1478
+        "__id__": 36
1382 1479
       },
1383 1480
       {
1384
-        "__id__": 35
1481
+        "__id__": 37
1385 1482
       }
1386 1483
     ],
1387 1484
     "_prefab": null,
@@ -1437,7 +1534,7 @@
1437 1534
     "_name": "",
1438 1535
     "_objFlags": 0,
1439 1536
     "node": {
1440
-      "__id__": 33
1537
+      "__id__": 35
1441 1538
     },
1442 1539
     "_enabled": true,
1443 1540
     "itemPrefab": {
@@ -1454,7 +1551,7 @@
1454 1551
     "_name": "",
1455 1552
     "_objFlags": 0,
1456 1553
     "node": {
1457
-      "__id__": 33
1554
+      "__id__": 35
1458 1555
     },
1459 1556
     "_enabled": true,
1460 1557
     "alignMode": 1,
@@ -1531,7 +1628,7 @@
1531 1628
     "_active": true,
1532 1629
     "_components": [
1533 1630
       {
1534
-        "__id__": 39
1631
+        "__id__": 41
1535 1632
       }
1536 1633
     ],
1537 1634
     "_prefab": null,
@@ -1587,17 +1684,17 @@
1587 1684
     "_name": "",
1588 1685
     "_objFlags": 0,
1589 1686
     "node": {
1590
-      "__id__": 38
1687
+      "__id__": 40
1591 1688
     },
1592 1689
     "_enabled": true,
1593 1690
     "alertCtrl": {
1594
-      "__id__": 18
1691
+      "__id__": 20
1595 1692
     },
1596 1693
     "loadingCtrl": {
1597
-      "__id__": 30
1694
+      "__id__": 32
1598 1695
     },
1599 1696
     "toastCtrl": {
1600
-      "__id__": 34
1697
+      "__id__": 36
1601 1698
     },
1602 1699
     "reconnCtrl": null,
1603 1700
     "sceneName": "Main",

+ 1 - 1
assets/resources/edt_prefab/Bag/BagMain.prefab

@@ -199,7 +199,7 @@
199 199
   {
200 200
     "__type__": "cc.Node",
201 201
     "_name": "ImageBg2",
202
-    "_objFlags": 0,
202
+    "_objFlags": 512,
203 203
     "_parent": {
204 204
       "__id__": 1
205 205
     },

+ 15 - 1
assets/resources/edt_prefab/Battle/BattleMain.prefab

@@ -37,10 +37,13 @@
37 37
       },
38 38
       {
39 39
         "__id__": 178
40
+      },
41
+      {
42
+        "__id__": 179
40 43
       }
41 44
     ],
42 45
     "_prefab": {
43
-      "__id__": 179
46
+      "__id__": 180
44 47
     },
45 48
     "_opacity": 255,
46 49
     "_color": {
@@ -6752,6 +6755,17 @@
6752 6755
     "_id": ""
6753 6756
   },
6754 6757
   {
6758
+    "__type__": "34c50r/l89GbL4vjuzGvS5f",
6759
+    "_name": "",
6760
+    "_objFlags": 0,
6761
+    "node": {
6762
+      "__id__": 1
6763
+    },
6764
+    "_enabled": true,
6765
+    "type": 0,
6766
+    "_id": ""
6767
+  },
6768
+  {
6755 6769
     "__type__": "cc.PrefabInfo",
6756 6770
     "root": {
6757 6771
       "__id__": 1

+ 633 - 0
assets/resources/edt_prefab/Common/ButtonSelect2.prefab

@@ -0,0 +1,633 @@
1
+[
2
+  {
3
+    "__type__": "cc.Prefab",
4
+    "_name": "",
5
+    "_objFlags": 0,
6
+    "_native": "",
7
+    "data": {
8
+      "__id__": 1
9
+    },
10
+    "optimizationPolicy": 0,
11
+    "asyncLoadAssets": false,
12
+    "readonly": false
13
+  },
14
+  {
15
+    "__type__": "cc.Node",
16
+    "_name": "ButtonSelect2",
17
+    "_objFlags": 0,
18
+    "_parent": null,
19
+    "_children": [
20
+      {
21
+        "__id__": 2
22
+      },
23
+      {
24
+        "__id__": 8
25
+      }
26
+    ],
27
+    "_active": true,
28
+    "_components": [
29
+      {
30
+        "__id__": 14
31
+      },
32
+      {
33
+        "__id__": 15
34
+      }
35
+    ],
36
+    "_prefab": {
37
+      "__id__": 16
38
+    },
39
+    "_opacity": 255,
40
+    "_color": {
41
+      "__type__": "cc.Color",
42
+      "r": 255,
43
+      "g": 255,
44
+      "b": 255,
45
+      "a": 255
46
+    },
47
+    "_contentSize": {
48
+      "__type__": "cc.Size",
49
+      "width": 103,
50
+      "height": 138
51
+    },
52
+    "_anchorPoint": {
53
+      "__type__": "cc.Vec2",
54
+      "x": 0.5,
55
+      "y": 0.5
56
+    },
57
+    "_trs": {
58
+      "__type__": "TypedArray",
59
+      "ctor": "Float64Array",
60
+      "array": [
61
+        -5,
62
+        -17,
63
+        0,
64
+        0,
65
+        0,
66
+        0,
67
+        1,
68
+        1,
69
+        1,
70
+        1
71
+      ]
72
+    },
73
+    "_eulerAngles": {
74
+      "__type__": "cc.Vec3",
75
+      "x": 0,
76
+      "y": 0,
77
+      "z": 0
78
+    },
79
+    "_skewX": 0,
80
+    "_skewY": 0,
81
+    "_is3DNode": false,
82
+    "_groupIndex": 0,
83
+    "groupIndex": 0,
84
+    "_id": ""
85
+  },
86
+  {
87
+    "__type__": "cc.Node",
88
+    "_name": "ImageNormal",
89
+    "_objFlags": 0,
90
+    "_parent": {
91
+      "__id__": 1
92
+    },
93
+    "_children": [
94
+      {
95
+        "__id__": 3
96
+      }
97
+    ],
98
+    "_active": true,
99
+    "_components": [
100
+      {
101
+        "__id__": 6
102
+      }
103
+    ],
104
+    "_prefab": {
105
+      "__id__": 7
106
+    },
107
+    "_opacity": 255,
108
+    "_color": {
109
+      "__type__": "cc.Color",
110
+      "r": 255,
111
+      "g": 255,
112
+      "b": 255,
113
+      "a": 255
114
+    },
115
+    "_contentSize": {
116
+      "__type__": "cc.Size",
117
+      "width": 83,
118
+      "height": 84
119
+    },
120
+    "_anchorPoint": {
121
+      "__type__": "cc.Vec2",
122
+      "x": 0.5,
123
+      "y": 0.5
124
+    },
125
+    "_trs": {
126
+      "__type__": "TypedArray",
127
+      "ctor": "Float64Array",
128
+      "array": [
129
+        0,
130
+        15.935,
131
+        0,
132
+        0,
133
+        0,
134
+        0,
135
+        1,
136
+        1,
137
+        1,
138
+        1
139
+      ]
140
+    },
141
+    "_eulerAngles": {
142
+      "__type__": "cc.Vec3",
143
+      "x": 0,
144
+      "y": 0,
145
+      "z": 0
146
+    },
147
+    "_skewX": 0,
148
+    "_skewY": 0,
149
+    "_is3DNode": false,
150
+    "_groupIndex": 0,
151
+    "groupIndex": 0,
152
+    "_id": ""
153
+  },
154
+  {
155
+    "__type__": "cc.Node",
156
+    "_name": "TextContent1",
157
+    "_objFlags": 0,
158
+    "_parent": {
159
+      "__id__": 2
160
+    },
161
+    "_children": [],
162
+    "_active": true,
163
+    "_components": [
164
+      {
165
+        "__id__": 4
166
+      }
167
+    ],
168
+    "_prefab": {
169
+      "__id__": 5
170
+    },
171
+    "_opacity": 255,
172
+    "_color": {
173
+      "__type__": "cc.Color",
174
+      "r": 169,
175
+      "g": 201,
176
+      "b": 201,
177
+      "a": 255
178
+    },
179
+    "_contentSize": {
180
+      "__type__": "cc.Size",
181
+      "width": 64,
182
+      "height": 50.4
183
+    },
184
+    "_anchorPoint": {
185
+      "__type__": "cc.Vec2",
186
+      "x": 0.5,
187
+      "y": 0.5
188
+    },
189
+    "_trs": {
190
+      "__type__": "TypedArray",
191
+      "ctor": "Float64Array",
192
+      "array": [
193
+        -1.74,
194
+        -60.96,
195
+        0,
196
+        0,
197
+        0,
198
+        0,
199
+        1,
200
+        1,
201
+        1,
202
+        1
203
+      ]
204
+    },
205
+    "_eulerAngles": {
206
+      "__type__": "cc.Vec3",
207
+      "x": 0,
208
+      "y": 0,
209
+      "z": 0
210
+    },
211
+    "_skewX": 0,
212
+    "_skewY": 0,
213
+    "_is3DNode": false,
214
+    "_groupIndex": 0,
215
+    "groupIndex": 0,
216
+    "_id": ""
217
+  },
218
+  {
219
+    "__type__": "cc.Label",
220
+    "_name": "",
221
+    "_objFlags": 0,
222
+    "node": {
223
+      "__id__": 3
224
+    },
225
+    "_enabled": true,
226
+    "_materials": [
227
+      {
228
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
229
+      }
230
+    ],
231
+    "_useOriginalSize": false,
232
+    "_string": "追梦",
233
+    "_N$string": "追梦",
234
+    "_fontSize": 32,
235
+    "_lineHeight": 40,
236
+    "_enableWrapText": true,
237
+    "_N$file": null,
238
+    "_isSystemFontUsed": true,
239
+    "_spacingX": 0,
240
+    "_batchAsBitmap": false,
241
+    "_styleFlags": 0,
242
+    "_underlineHeight": 0,
243
+    "_N$horizontalAlign": 1,
244
+    "_N$verticalAlign": 1,
245
+    "_N$fontFamily": "Arial",
246
+    "_N$overflow": 0,
247
+    "_N$cacheMode": 0,
248
+    "_id": ""
249
+  },
250
+  {
251
+    "__type__": "cc.PrefabInfo",
252
+    "root": {
253
+      "__id__": 1
254
+    },
255
+    "asset": {
256
+      "__uuid__": "5c1c89a2-3a6d-4b33-9ec0-7f8f8df4c725"
257
+    },
258
+    "fileId": "272YeVmblIU54zsYg220k+",
259
+    "sync": false
260
+  },
261
+  {
262
+    "__type__": "cc.Sprite",
263
+    "_name": "",
264
+    "_objFlags": 0,
265
+    "node": {
266
+      "__id__": 2
267
+    },
268
+    "_enabled": true,
269
+    "_materials": [
270
+      {
271
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
272
+      }
273
+    ],
274
+    "_srcBlendFactor": 770,
275
+    "_dstBlendFactor": 771,
276
+    "_spriteFrame": {
277
+      "__uuid__": "250ff1b8-345b-455f-bfe6-fe9f29573bd1"
278
+    },
279
+    "_type": 1,
280
+    "_sizeMode": 1,
281
+    "_fillType": 0,
282
+    "_fillCenter": {
283
+      "__type__": "cc.Vec2",
284
+      "x": 0,
285
+      "y": 0
286
+    },
287
+    "_fillStart": 0,
288
+    "_fillRange": 0,
289
+    "_isTrimmedMode": true,
290
+    "_atlas": null,
291
+    "_id": ""
292
+  },
293
+  {
294
+    "__type__": "cc.PrefabInfo",
295
+    "root": {
296
+      "__id__": 1
297
+    },
298
+    "asset": {
299
+      "__uuid__": "5c1c89a2-3a6d-4b33-9ec0-7f8f8df4c725"
300
+    },
301
+    "fileId": "46E1c8KddP16HjuNajEpYc",
302
+    "sync": false
303
+  },
304
+  {
305
+    "__type__": "cc.Node",
306
+    "_name": "ImageLight",
307
+    "_objFlags": 0,
308
+    "_parent": {
309
+      "__id__": 1
310
+    },
311
+    "_children": [
312
+      {
313
+        "__id__": 9
314
+      }
315
+    ],
316
+    "_active": true,
317
+    "_components": [
318
+      {
319
+        "__id__": 12
320
+      }
321
+    ],
322
+    "_prefab": {
323
+      "__id__": 13
324
+    },
325
+    "_opacity": 255,
326
+    "_color": {
327
+      "__type__": "cc.Color",
328
+      "r": 255,
329
+      "g": 255,
330
+      "b": 255,
331
+      "a": 255
332
+    },
333
+    "_contentSize": {
334
+      "__type__": "cc.Size",
335
+      "width": 88,
336
+      "height": 89
337
+    },
338
+    "_anchorPoint": {
339
+      "__type__": "cc.Vec2",
340
+      "x": 0.5,
341
+      "y": 0.5
342
+    },
343
+    "_trs": {
344
+      "__type__": "TypedArray",
345
+      "ctor": "Float64Array",
346
+      "array": [
347
+        -2.612,
348
+        18.789,
349
+        0,
350
+        0,
351
+        0,
352
+        0,
353
+        1,
354
+        1,
355
+        1,
356
+        1
357
+      ]
358
+    },
359
+    "_eulerAngles": {
360
+      "__type__": "cc.Vec3",
361
+      "x": 0,
362
+      "y": 0,
363
+      "z": 0
364
+    },
365
+    "_skewX": 0,
366
+    "_skewY": 0,
367
+    "_is3DNode": false,
368
+    "_groupIndex": 0,
369
+    "groupIndex": 0,
370
+    "_id": ""
371
+  },
372
+  {
373
+    "__type__": "cc.Node",
374
+    "_name": "ImageContent2",
375
+    "_objFlags": 0,
376
+    "_parent": {
377
+      "__id__": 8
378
+    },
379
+    "_children": [],
380
+    "_active": true,
381
+    "_components": [
382
+      {
383
+        "__id__": 10
384
+      }
385
+    ],
386
+    "_prefab": {
387
+      "__id__": 11
388
+    },
389
+    "_opacity": 255,
390
+    "_color": {
391
+      "__type__": "cc.Color",
392
+      "r": 255,
393
+      "g": 255,
394
+      "b": 255,
395
+      "a": 255
396
+    },
397
+    "_contentSize": {
398
+      "__type__": "cc.Size",
399
+      "width": 78,
400
+      "height": 47
401
+    },
402
+    "_anchorPoint": {
403
+      "__type__": "cc.Vec2",
404
+      "x": 0.5,
405
+      "y": 0.5
406
+    },
407
+    "_trs": {
408
+      "__type__": "TypedArray",
409
+      "ctor": "Float64Array",
410
+      "array": [
411
+        0.809,
412
+        -65.102,
413
+        0,
414
+        0,
415
+        0,
416
+        0,
417
+        1,
418
+        1,
419
+        1,
420
+        1
421
+      ]
422
+    },
423
+    "_eulerAngles": {
424
+      "__type__": "cc.Vec3",
425
+      "x": 0,
426
+      "y": 0,
427
+      "z": 0
428
+    },
429
+    "_skewX": 0,
430
+    "_skewY": 0,
431
+    "_is3DNode": false,
432
+    "_groupIndex": 0,
433
+    "groupIndex": 0,
434
+    "_id": ""
435
+  },
436
+  {
437
+    "__type__": "cc.Sprite",
438
+    "_name": "",
439
+    "_objFlags": 0,
440
+    "node": {
441
+      "__id__": 9
442
+    },
443
+    "_enabled": true,
444
+    "_materials": [
445
+      {
446
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
447
+      }
448
+    ],
449
+    "_srcBlendFactor": 770,
450
+    "_dstBlendFactor": 771,
451
+    "_spriteFrame": {
452
+      "__uuid__": "832ebba8-81f9-4eeb-8394-3a38008a670e"
453
+    },
454
+    "_type": 0,
455
+    "_sizeMode": 1,
456
+    "_fillType": 0,
457
+    "_fillCenter": {
458
+      "__type__": "cc.Vec2",
459
+      "x": 0,
460
+      "y": 0
461
+    },
462
+    "_fillStart": 0,
463
+    "_fillRange": 0,
464
+    "_isTrimmedMode": true,
465
+    "_atlas": null,
466
+    "_id": ""
467
+  },
468
+  {
469
+    "__type__": "cc.PrefabInfo",
470
+    "root": {
471
+      "__id__": 1
472
+    },
473
+    "asset": {
474
+      "__uuid__": "5c1c89a2-3a6d-4b33-9ec0-7f8f8df4c725"
475
+    },
476
+    "fileId": "2cXrIJeD1DEKcFrZf9+KxX",
477
+    "sync": false
478
+  },
479
+  {
480
+    "__type__": "cc.Sprite",
481
+    "_name": "",
482
+    "_objFlags": 0,
483
+    "node": {
484
+      "__id__": 8
485
+    },
486
+    "_enabled": true,
487
+    "_materials": [
488
+      {
489
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
490
+      }
491
+    ],
492
+    "_srcBlendFactor": 770,
493
+    "_dstBlendFactor": 771,
494
+    "_spriteFrame": {
495
+      "__uuid__": "5fac7806-32d5-42d7-8d1f-63abe0c68d51"
496
+    },
497
+    "_type": 1,
498
+    "_sizeMode": 1,
499
+    "_fillType": 0,
500
+    "_fillCenter": {
501
+      "__type__": "cc.Vec2",
502
+      "x": 0,
503
+      "y": 0
504
+    },
505
+    "_fillStart": 0,
506
+    "_fillRange": 0,
507
+    "_isTrimmedMode": true,
508
+    "_atlas": null,
509
+    "_id": ""
510
+  },
511
+  {
512
+    "__type__": "cc.PrefabInfo",
513
+    "root": {
514
+      "__id__": 1
515
+    },
516
+    "asset": {
517
+      "__uuid__": "5c1c89a2-3a6d-4b33-9ec0-7f8f8df4c725"
518
+    },
519
+    "fileId": "d11deM+/xGi7Kpn+nItEku",
520
+    "sync": false
521
+  },
522
+  {
523
+    "__type__": "cc.Button",
524
+    "_name": "",
525
+    "_objFlags": 0,
526
+    "node": {
527
+      "__id__": 1
528
+    },
529
+    "_enabled": true,
530
+    "_normalMaterial": {
531
+      "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
532
+    },
533
+    "_grayMaterial": null,
534
+    "duration": 0.1,
535
+    "zoomScale": 1.2,
536
+    "clickEvents": [],
537
+    "_N$interactable": true,
538
+    "_N$enableAutoGrayEffect": false,
539
+    "_N$transition": 2,
540
+    "transition": 2,
541
+    "_N$normalColor": {
542
+      "__type__": "cc.Color",
543
+      "r": 230,
544
+      "g": 230,
545
+      "b": 230,
546
+      "a": 255
547
+    },
548
+    "_N$pressedColor": {
549
+      "__type__": "cc.Color",
550
+      "r": 200,
551
+      "g": 200,
552
+      "b": 200,
553
+      "a": 255
554
+    },
555
+    "pressedColor": {
556
+      "__type__": "cc.Color",
557
+      "r": 200,
558
+      "g": 200,
559
+      "b": 200,
560
+      "a": 255
561
+    },
562
+    "_N$hoverColor": {
563
+      "__type__": "cc.Color",
564
+      "r": 255,
565
+      "g": 255,
566
+      "b": 255,
567
+      "a": 255
568
+    },
569
+    "hoverColor": {
570
+      "__type__": "cc.Color",
571
+      "r": 255,
572
+      "g": 255,
573
+      "b": 255,
574
+      "a": 255
575
+    },
576
+    "_N$disabledColor": {
577
+      "__type__": "cc.Color",
578
+      "r": 120,
579
+      "g": 120,
580
+      "b": 120,
581
+      "a": 200
582
+    },
583
+    "_N$normalSprite": {
584
+      "__uuid__": "5fac7806-32d5-42d7-8d1f-63abe0c68d51"
585
+    },
586
+    "_N$pressedSprite": {
587
+      "__uuid__": "e9ec654c-97a2-4787-9325-e6a10375219a"
588
+    },
589
+    "pressedSprite": {
590
+      "__uuid__": "e9ec654c-97a2-4787-9325-e6a10375219a"
591
+    },
592
+    "_N$hoverSprite": {
593
+      "__uuid__": "f0048c10-f03e-4c97-b9d3-3506e1d58952"
594
+    },
595
+    "hoverSprite": {
596
+      "__uuid__": "f0048c10-f03e-4c97-b9d3-3506e1d58952"
597
+    },
598
+    "_N$disabledSprite": {
599
+      "__uuid__": "29158224-f8dd-4661-a796-1ffab537140e"
600
+    },
601
+    "_N$target": {
602
+      "__id__": 8
603
+    },
604
+    "_id": ""
605
+  },
606
+  {
607
+    "__type__": "64f2arc3P5Bw43Kyb+r6n5x",
608
+    "_name": "",
609
+    "_objFlags": 0,
610
+    "node": {
611
+      "__id__": 1
612
+    },
613
+    "_enabled": true,
614
+    "imageNormal": {
615
+      "__id__": 6
616
+    },
617
+    "imageLight": {
618
+      "__id__": 12
619
+    },
620
+    "_id": ""
621
+  },
622
+  {
623
+    "__type__": "cc.PrefabInfo",
624
+    "root": {
625
+      "__id__": 1
626
+    },
627
+    "asset": {
628
+      "__uuid__": "5c1c89a2-3a6d-4b33-9ec0-7f8f8df4c725"
629
+    },
630
+    "fileId": "e5vquiptRBhYBVsV18xxPq",
631
+    "sync": false
632
+  }
633
+]

+ 8 - 0
assets/resources/edt_prefab/Common/ButtonSelect2.prefab.meta

@@ -0,0 +1,8 @@
1
+{
2
+  "ver": "1.2.6",
3
+  "uuid": "5c1c89a2-3a6d-4b33-9ec0-7f8f8df4c725",
4
+  "optimizationPolicy": "AUTO",
5
+  "asyncLoadAssets": false,
6
+  "readonly": false,
7
+  "subMetas": {}
8
+}

文件差异内容过多而无法显示
+ 1871 - 647
assets/resources/edt_prefab/Navigation/NavigationMain.prefab


二进制
assets/resources/res_image/dream/drop-icon01.png


+ 36 - 0
assets/resources/res_image/dream/drop-icon01.png.meta

@@ -0,0 +1,36 @@
1
+{
2
+  "ver": "2.3.4",
3
+  "uuid": "473c9753-8fdb-42e8-a18d-3f24e615810d",
4
+  "type": "sprite",
5
+  "wrapMode": "clamp",
6
+  "filterMode": "bilinear",
7
+  "premultiplyAlpha": false,
8
+  "genMipmaps": false,
9
+  "packable": true,
10
+  "width": 84,
11
+  "height": 84,
12
+  "platformSettings": {},
13
+  "subMetas": {
14
+    "drop-icon01": {
15
+      "ver": "1.0.4",
16
+      "uuid": "8c9f63b0-92df-4721-a7e3-9c86b4991290",
17
+      "rawTextureUuid": "473c9753-8fdb-42e8-a18d-3f24e615810d",
18
+      "trimType": "auto",
19
+      "trimThreshold": 1,
20
+      "rotated": false,
21
+      "offsetX": -0.5,
22
+      "offsetY": 0,
23
+      "trimX": 0,
24
+      "trimY": 0,
25
+      "width": 83,
26
+      "height": 84,
27
+      "rawWidth": 84,
28
+      "rawHeight": 84,
29
+      "borderTop": 0,
30
+      "borderBottom": 0,
31
+      "borderLeft": 0,
32
+      "borderRight": 0,
33
+      "subMetas": {}
34
+    }
35
+  }
36
+}

二进制
assets/resources/res_image/drop/drop-bg4.png


+ 36 - 0
assets/resources/res_image/drop/drop-bg4.png.meta

@@ -0,0 +1,36 @@
1
+{
2
+  "ver": "2.3.4",
3
+  "uuid": "b0298273-d949-4fa5-a97a-c86d7186b832",
4
+  "type": "sprite",
5
+  "wrapMode": "clamp",
6
+  "filterMode": "bilinear",
7
+  "premultiplyAlpha": false,
8
+  "genMipmaps": false,
9
+  "packable": true,
10
+  "width": 18,
11
+  "height": 139,
12
+  "platformSettings": {},
13
+  "subMetas": {
14
+    "drop-bg4": {
15
+      "ver": "1.0.4",
16
+      "uuid": "f93c9b15-3170-4d92-ab7c-8c3025ecafbd",
17
+      "rawTextureUuid": "b0298273-d949-4fa5-a97a-c86d7186b832",
18
+      "trimType": "auto",
19
+      "trimThreshold": 1,
20
+      "rotated": false,
21
+      "offsetX": 0,
22
+      "offsetY": 0,
23
+      "trimX": 0,
24
+      "trimY": 0,
25
+      "width": 18,
26
+      "height": 139,
27
+      "rawWidth": 18,
28
+      "rawHeight": 139,
29
+      "borderTop": 0,
30
+      "borderBottom": 0,
31
+      "borderLeft": 0,
32
+      "borderRight": 0,
33
+      "subMetas": {}
34
+    }
35
+  }
36
+}

+ 0 - 1
assets/script/app/ctrl/MainCtr.js

@@ -17,7 +17,6 @@ cc.Class({
17 17
     },
18 18
   
19 19
     initUI() {
20
-        G.UIMgr.open(JMC.UIEnum.DreamMain);
21 20
         G.UIMgr.open(JMC.UIEnum.NavigationMain);
22 21
         // G.UIMgr.open(window.JMC.UIEnum.BattleJoinRoomTip); 
23 22
     }

+ 33 - 0
assets/script/app/view/common/ButtonSelect2.js

@@ -0,0 +1,33 @@
1
+cc.Class({
2
+    extends: cc.Component,
3
+
4
+    properties: {
5
+        imageNormal: {
6
+            default: null,
7
+            type: cc.Sprite,
8
+            serializable: true,
9
+        },
10
+
11
+        
12
+        imageLight: {
13
+            default: null,
14
+            type: cc.Sprite,
15
+            serializable: true,
16
+        },
17
+    },
18
+
19
+    // LIFE-CYCLE CALLBACKS:
20
+
21
+    // onLoad () {},
22
+
23
+    start () {
24
+
25
+    },
26
+
27
+    setSelect(b) {
28
+        this.imageNormal.node.active = !b
29
+        this.imageLight.node.active = b
30
+    },
31
+
32
+    // update (dt) {},
33
+});

+ 9 - 0
assets/script/app/view/common/ButtonSelect2.js.meta

@@ -0,0 +1,9 @@
1
+{
2
+  "ver": "1.0.8",
3
+  "uuid": "64f2aadc-dcfe-41c3-8dca-c9bfabea7e71",
4
+  "isPlugin": false,
5
+  "loadPluginInWeb": true,
6
+  "loadPluginInNative": true,
7
+  "loadPluginInEditor": false,
8
+  "subMetas": {}
9
+}

+ 35 - 8
assets/script/app/view/navigation/NavigationMain.js

@@ -4,7 +4,7 @@
4 4
 //  - https://docs.cocos.com/creator/manual/en/scripting/reference/attributes.html
5 5
 // Learn life-cycle callbacks:
6 6
 //  - https://docs.cocos.com/creator/manual/en/scripting/life-cycle-callbacks.html
7
-
7
+let ButtonSelect2 = require('ButtonSelect2')
8 8
 cc.Class({
9 9
     extends: cc.Component,
10 10
 
@@ -30,42 +30,69 @@ cc.Class({
30 30
 
31 31
         button1: {
32 32
             default: null,
33
-            type: cc.Button,
33
+            type: ButtonSelect2,
34 34
             serializable: true,
35 35
         },
36 36
 
37 37
         button2: {
38 38
             default: null,
39
-            type: cc.Button,
39
+            type: ButtonSelect2,
40 40
             serializable: true,
41 41
         },
42 42
 
43 43
         button3: {
44 44
             default: null,
45
-            type: cc.Button,
45
+            type: ButtonSelect2,
46 46
             serializable: true,
47 47
         },
48 48
 
49 49
         button4: {
50 50
             default: null,
51
-            type: cc.Button,
51
+            type: ButtonSelect2,
52 52
             serializable: true,
53 53
         },
54 54
 
55 55
         button5: {
56 56
             default: null,
57
-            type: cc.Button,
57
+            type: ButtonSelect2,
58 58
             serializable: true,
59 59
         },
60 60
     },
61 61
 
62
-    // LIFE-CYCLE CALLBACKS:
62
+    onLoad () {
63
+        this.buttons = [
64
+            this.button1,
65
+            this.button2,
66
+            this.button3,
67
+            this.button4,
68
+            this.button5
69
+        ];
63 70
 
64
-    // onLoad () {},
71
+        this.views = [
72
+            JMC.UIEnum.DreamMain,
73
+            JMC.UIEnum.BattleMain,
74
+            JMC.UIEnum.DreamMain,
75
+            JMC.UIEnum.BagMain,
76
+            JMC.UIEnum.DreamMain,
77
+        ];
78
+    },
65 79
 
66 80
     start () {
67 81
 
68 82
     },
69 83
 
84
+    onClickNavigation(event, customEventData){
85
+        let index = parseInt(customEventData) - 1
86
+        for (let i = 0; i < this.buttons.length; i++) {
87
+            const button = this.buttons[i];
88
+            button.setSelect(index == i)
89
+        }
90
+
91
+        G.UIMgr.open(this.views[index]);
92
+    },
93
+
94
+    onRecharge() {
95
+
96
+    },
70 97
     // update (dt) {},
71 98
 });

+ 12 - 1
assets/script/core/model/UIMgr.js

@@ -67,8 +67,9 @@ let UIMgr = {
67 67
             let proxy = node.getComponent(Proxy);
68 68
             if (proxy){
69 69
                 uiRoot = uiRoot.getChildByName(self.UIRoots[proxy.type])
70
+                self.clearUIType(proxy.type, proxy.type == window.JMC.Proxy.Main)
70 71
             }
71
-
72
+            
72 73
             // let uiRoot = this.getUIRoot();
73 74
             // .getChildByName(this.UIRoots[type])
74 75
             let ret = self.pushUI(uiRoot, node);
@@ -98,6 +99,16 @@ let UIMgr = {
98 99
         cc.game.emit('e_ui_push_alert', {node});
99 100
         return true;
100 101
     },
102
+
103
+    clearUIType(type, isClear) {
104
+        if (!isClear) {
105
+            return
106
+        }
107
+
108
+        let uiRoot = this.getUIRoot();
109
+        let typeRoot = uiRoot.getChildByName(this.UIRoots[type]);
110
+        typeRoot.removeAllChildren();
111
+    }
101 112
 }
102 113
 
103 114
 module.exports = UIMgr;