Commit f5be29dc f5be29dc709a29dbaa84bce8b26a8cb31b921fa3 by 金学艇

1.准备集成福建相关SDK

1 parent 21afd251
...@@ -84,22 +84,25 @@ ...@@ -84,22 +84,25 @@
84 "__id__": 13 84 "__id__": 13
85 }, 85 },
86 { 86 {
87 "__id__": 20 87 "__id__": 16
88 }, 88 },
89 { 89 {
90 "__id__": 45 90 "__id__": 23
91 }, 91 },
92 { 92 {
93 "__id__": 48 93 "__id__": 48
94 },
95 {
96 "__id__": 51
94 } 97 }
95 ], 98 ],
96 "_active": true, 99 "_active": true,
97 "_components": [ 100 "_components": [
98 { 101 {
99 "__id__": 50 102 "__id__": 53
100 }, 103 },
101 { 104 {
102 "__id__": 51 105 "__id__": 54
103 } 106 }
104 ], 107 ],
105 "_prefab": null, 108 "_prefab": null,
...@@ -467,13 +470,13 @@ ...@@ -467,13 +470,13 @@
467 }, 470 },
468 { 471 {
469 "__type__": "cc.Node", 472 "__type__": "cc.Node",
470 "_name": "TitleLabel", 473 "_name": "EmptyBtn",
471 "_objFlags": 0, 474 "_objFlags": 0,
472 "_parent": { 475 "_parent": {
473 "__id__": 2 476 "__id__": 2
474 }, 477 },
475 "_children": [], 478 "_children": [],
476 "_active": false, 479 "_active": true,
477 "_components": [ 480 "_components": [
478 { 481 {
479 "__id__": 11 482 "__id__": 11
...@@ -486,15 +489,15 @@ ...@@ -486,15 +489,15 @@
486 "_opacity": 255, 489 "_opacity": 255,
487 "_color": { 490 "_color": {
488 "__type__": "cc.Color", 491 "__type__": "cc.Color",
489 "r": 246, 492 "r": 255,
490 "g": 254, 493 "g": 255,
491 "b": 255, 494 "b": 255,
492 "a": 255 495 "a": 255
493 }, 496 },
494 "_contentSize": { 497 "_contentSize": {
495 "__type__": "cc.Size", 498 "__type__": "cc.Size",
496 "width": 60, 499 "width": 156,
497 "height": 37.8 500 "height": 84
498 }, 501 },
499 "_anchorPoint": { 502 "_anchorPoint": {
500 "__type__": "cc.Vec2", 503 "__type__": "cc.Vec2",
...@@ -505,8 +508,8 @@ ...@@ -505,8 +508,8 @@
505 "__type__": "TypedArray", 508 "__type__": "TypedArray",
506 "ctor": "Float32Array", 509 "ctor": "Float32Array",
507 "array": [ 510 "array": [
508 -530, 511 368,
509 317.1000061035156, 512 290,
510 0, 513 0,
511 0, 514 0,
512 0, 515 0,
...@@ -528,10 +531,10 @@ ...@@ -528,10 +531,10 @@
528 "_is3DNode": false, 531 "_is3DNode": false,
529 "_groupIndex": 0, 532 "_groupIndex": 0,
530 "groupIndex": 0, 533 "groupIndex": 0,
531 "_id": "95N43/51NONrtOFqzxEAah" 534 "_id": "92hXMvPEtGaq1p63YOnMkZ"
532 }, 535 },
533 { 536 {
534 "__type__": "cc.Label", 537 "__type__": "cc.Sprite",
535 "_name": "", 538 "_name": "",
536 "_objFlags": 0, 539 "_objFlags": 0,
537 "node": { 540 "node": {
...@@ -543,22 +546,24 @@ ...@@ -543,22 +546,24 @@
543 "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" 546 "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
544 } 547 }
545 ], 548 ],
546 "_useOriginalSize": false, 549 "_srcBlendFactor": 770,
547 "_string": "分类", 550 "_dstBlendFactor": 771,
548 "_N$string": "分类", 551 "_spriteFrame": {
549 "_fontSize": 30, 552 "__uuid__": "40d1bd90-26f0-463d-b61f-12ccfa857e02"
550 "_lineHeight": 30, 553 },
551 "_enableWrapText": true, 554 "_type": 0,
552 "_N$file": null, 555 "_sizeMode": 0,
553 "_isSystemFontUsed": true, 556 "_fillType": 0,
554 "_spacingX": 0, 557 "_fillCenter": {
555 "_batchAsBitmap": false, 558 "__type__": "cc.Vec2",
556 "_N$horizontalAlign": 1, 559 "x": 0,
557 "_N$verticalAlign": 1, 560 "y": 0
558 "_N$fontFamily": "Arial", 561 },
559 "_N$overflow": 0, 562 "_fillStart": 0,
560 "_N$cacheMode": 0, 563 "_fillRange": 0,
561 "_id": "ackt/J+XZNZp/rJVq2csxX" 564 "_isTrimmedMode": true,
565 "_atlas": null,
566 "_id": "b5yFIqZSdGyLGm9BRQtEbM"
562 }, 567 },
563 { 568 {
564 "__type__": "cc.Widget", 569 "__type__": "cc.Widget",
...@@ -571,9 +576,133 @@ ...@@ -571,9 +576,133 @@
571 "alignMode": 1, 576 "alignMode": 1,
572 "_target": null, 577 "_target": null,
573 "_alignFlags": 9, 578 "_alignFlags": 9,
574 "_left": 80, 579 "_left": 930,
580 "_right": 0,
581 "_top": 28,
582 "_bottom": 0,
583 "_verticalCenter": 0,
584 "_horizontalCenter": 0,
585 "_isAbsLeft": true,
586 "_isAbsRight": true,
587 "_isAbsTop": true,
588 "_isAbsBottom": true,
589 "_isAbsHorizontalCenter": true,
590 "_isAbsVerticalCenter": true,
591 "_originalWidth": 0,
592 "_originalHeight": 0,
593 "_id": "e2OIC6fVxCw6p+mfsAArq4"
594 },
595 {
596 "__type__": "cc.Node",
597 "_name": "ExitBtn",
598 "_objFlags": 0,
599 "_parent": {
600 "__id__": 2
601 },
602 "_children": [],
603 "_active": true,
604 "_components": [
605 {
606 "__id__": 14
607 },
608 {
609 "__id__": 15
610 }
611 ],
612 "_prefab": null,
613 "_opacity": 255,
614 "_color": {
615 "__type__": "cc.Color",
616 "r": 255,
617 "g": 255,
618 "b": 255,
619 "a": 255
620 },
621 "_contentSize": {
622 "__type__": "cc.Size",
623 "width": 156,
624 "height": 84
625 },
626 "_anchorPoint": {
627 "__type__": "cc.Vec2",
628 "x": 0.5,
629 "y": 0.5
630 },
631 "_trs": {
632 "__type__": "TypedArray",
633 "ctor": "Float32Array",
634 "array": [
635 534,
636 290,
637 0,
638 0,
639 0,
640 0,
641 1,
642 1,
643 1,
644 1
645 ]
646 },
647 "_eulerAngles": {
648 "__type__": "cc.Vec3",
649 "x": 0,
650 "y": 0,
651 "z": 0
652 },
653 "_skewX": 0,
654 "_skewY": 0,
655 "_is3DNode": false,
656 "_groupIndex": 0,
657 "groupIndex": 0,
658 "_id": "5fuvr6hQNBfISGxc21Osz+"
659 },
660 {
661 "__type__": "cc.Sprite",
662 "_name": "",
663 "_objFlags": 0,
664 "node": {
665 "__id__": 13
666 },
667 "_enabled": true,
668 "_materials": [
669 {
670 "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
671 }
672 ],
673 "_srcBlendFactor": 770,
674 "_dstBlendFactor": 771,
675 "_spriteFrame": {
676 "__uuid__": "8e2a3bec-3d1f-4294-a693-1c758345cc79"
677 },
678 "_type": 0,
679 "_sizeMode": 0,
680 "_fillType": 0,
681 "_fillCenter": {
682 "__type__": "cc.Vec2",
683 "x": 0,
684 "y": 0
685 },
686 "_fillStart": 0,
687 "_fillRange": 0,
688 "_isTrimmedMode": true,
689 "_atlas": null,
690 "_id": "a76cLFqg1MB6CJT+hOvzEP"
691 },
692 {
693 "__type__": "cc.Widget",
694 "_name": "",
695 "_objFlags": 0,
696 "node": {
697 "__id__": 13
698 },
699 "_enabled": true,
700 "alignMode": 1,
701 "_target": null,
702 "_alignFlags": 9,
703 "_left": 1096,
575 "_right": 0, 704 "_right": 0,
576 "_top": 24, 705 "_top": 28,
577 "_bottom": 0, 706 "_bottom": 0,
578 "_verticalCenter": 0, 707 "_verticalCenter": 0,
579 "_horizontalCenter": 0, 708 "_horizontalCenter": 0,
...@@ -585,7 +714,7 @@ ...@@ -585,7 +714,7 @@
585 "_isAbsVerticalCenter": true, 714 "_isAbsVerticalCenter": true,
586 "_originalWidth": 0, 715 "_originalWidth": 0,
587 "_originalHeight": 0, 716 "_originalHeight": 0,
588 "_id": "51VlCee69C7I5r1KIUrxz0" 717 "_id": "8eyZejQLhLUJyrGmxsla1B"
589 }, 718 },
590 { 719 {
591 "__type__": "cc.Node", 720 "__type__": "cc.Node",
...@@ -596,16 +725,16 @@ ...@@ -596,16 +725,16 @@
596 }, 725 },
597 "_children": [ 726 "_children": [
598 { 727 {
599 "__id__": 14 728 "__id__": 17
600 }, 729 },
601 { 730 {
602 "__id__": 16 731 "__id__": 19
603 } 732 }
604 ], 733 ],
605 "_active": true, 734 "_active": true,
606 "_components": [ 735 "_components": [
607 { 736 {
608 "__id__": 19 737 "__id__": 22
609 } 738 }
610 ], 739 ],
611 "_prefab": null, 740 "_prefab": null,
...@@ -673,13 +802,13 @@ ...@@ -673,13 +802,13 @@
673 "_name": "Bg", 802 "_name": "Bg",
674 "_objFlags": 0, 803 "_objFlags": 0,
675 "_parent": { 804 "_parent": {
676 "__id__": 13 805 "__id__": 16
677 }, 806 },
678 "_children": [], 807 "_children": [],
679 "_active": true, 808 "_active": true,
680 "_components": [ 809 "_components": [
681 { 810 {
682 "__id__": 15 811 "__id__": 18
683 } 812 }
684 ], 813 ],
685 "_prefab": null, 814 "_prefab": null,
...@@ -747,7 +876,7 @@ ...@@ -747,7 +876,7 @@
747 "_name": "", 876 "_name": "",
748 "_objFlags": 0, 877 "_objFlags": 0,
749 "node": { 878 "node": {
750 "__id__": 14 879 "__id__": 17
751 }, 880 },
752 "_enabled": true, 881 "_enabled": true,
753 "_materials": [ 882 "_materials": [
...@@ -777,17 +906,17 @@ ...@@ -777,17 +906,17 @@
777 "_name": "TypeListWrapper", 906 "_name": "TypeListWrapper",
778 "_objFlags": 0, 907 "_objFlags": 0,
779 "_parent": { 908 "_parent": {
780 "__id__": 13 909 "__id__": 16
781 }, 910 },
782 "_children": [ 911 "_children": [
783 { 912 {
784 "__id__": 17 913 "__id__": 20
785 } 914 }
786 ], 915 ],
787 "_active": true, 916 "_active": true,
788 "_components": [ 917 "_components": [
789 { 918 {
790 "__id__": 18 919 "__id__": 21
791 } 920 }
792 ], 921 ],
793 "_prefab": null, 922 "_prefab": null,
...@@ -855,7 +984,7 @@ ...@@ -855,7 +984,7 @@
855 "_name": "TypeList", 984 "_name": "TypeList",
856 "_objFlags": 0, 985 "_objFlags": 0,
857 "_parent": { 986 "_parent": {
858 "__id__": 16 987 "__id__": 19
859 }, 988 },
860 "_children": [], 989 "_children": [],
861 "_active": true, 990 "_active": true,
...@@ -925,7 +1054,7 @@ ...@@ -925,7 +1054,7 @@
925 "_name": "", 1054 "_name": "",
926 "_objFlags": 0, 1055 "_objFlags": 0,
927 "node": { 1056 "node": {
928 "__id__": 16 1057 "__id__": 19
929 }, 1058 },
930 "_enabled": true, 1059 "_enabled": true,
931 "_materials": [ 1060 "_materials": [
...@@ -945,7 +1074,7 @@ ...@@ -945,7 +1074,7 @@
945 "_name": "", 1074 "_name": "",
946 "_objFlags": 0, 1075 "_objFlags": 0,
947 "node": { 1076 "node": {
948 "__id__": 13 1077 "__id__": 16
949 }, 1078 },
950 "_enabled": true, 1079 "_enabled": true,
951 "alignMode": 2, 1080 "alignMode": 2,
...@@ -976,16 +1105,16 @@ ...@@ -976,16 +1105,16 @@
976 }, 1105 },
977 "_children": [ 1106 "_children": [
978 { 1107 {
979 "__id__": 21 1108 "__id__": 24
980 }, 1109 },
981 { 1110 {
982 "__id__": 24 1111 "__id__": 27
983 } 1112 }
984 ], 1113 ],
985 "_active": true, 1114 "_active": true,
986 "_components": [ 1115 "_components": [
987 { 1116 {
988 "__id__": 44 1117 "__id__": 47
989 } 1118 }
990 ], 1119 ],
991 "_prefab": null, 1120 "_prefab": null,
...@@ -1053,17 +1182,17 @@ ...@@ -1053,17 +1182,17 @@
1053 "_name": "DataContainerMask", 1182 "_name": "DataContainerMask",
1054 "_objFlags": 0, 1183 "_objFlags": 0,
1055 "_parent": { 1184 "_parent": {
1056 "__id__": 20 1185 "__id__": 23
1057 }, 1186 },
1058 "_children": [ 1187 "_children": [
1059 { 1188 {
1060 "__id__": 22 1189 "__id__": 25
1061 } 1190 }
1062 ], 1191 ],
1063 "_active": true, 1192 "_active": true,
1064 "_components": [ 1193 "_components": [
1065 { 1194 {
1066 "__id__": 23 1195 "__id__": 26
1067 } 1196 }
1068 ], 1197 ],
1069 "_prefab": null, 1198 "_prefab": null,
...@@ -1131,7 +1260,7 @@ ...@@ -1131,7 +1260,7 @@
1131 "_name": "DataContainer", 1260 "_name": "DataContainer",
1132 "_objFlags": 0, 1261 "_objFlags": 0,
1133 "_parent": { 1262 "_parent": {
1134 "__id__": 21 1263 "__id__": 24
1135 }, 1264 },
1136 "_children": [], 1265 "_children": [],
1137 "_active": true, 1266 "_active": true,
...@@ -1201,7 +1330,7 @@ ...@@ -1201,7 +1330,7 @@
1201 "_name": "", 1330 "_name": "",
1202 "_objFlags": 0, 1331 "_objFlags": 0,
1203 "node": { 1332 "node": {
1204 "__id__": 21 1333 "__id__": 24
1205 }, 1334 },
1206 "_enabled": true, 1335 "_enabled": true,
1207 "_materials": [ 1336 "_materials": [
...@@ -1221,23 +1350,23 @@ ...@@ -1221,23 +1350,23 @@
1221 "_name": "ScrollBarContainer", 1350 "_name": "ScrollBarContainer",
1222 "_objFlags": 0, 1351 "_objFlags": 0,
1223 "_parent": { 1352 "_parent": {
1224 "__id__": 20 1353 "__id__": 23
1225 }, 1354 },
1226 "_children": [ 1355 "_children": [
1227 { 1356 {
1228 "__id__": 25 1357 "__id__": 28
1229 }, 1358 },
1230 { 1359 {
1231 "__id__": 27 1360 "__id__": 30
1232 } 1361 }
1233 ], 1362 ],
1234 "_active": false, 1363 "_active": false,
1235 "_components": [ 1364 "_components": [
1236 { 1365 {
1237 "__id__": 42 1366 "__id__": 45
1238 }, 1367 },
1239 { 1368 {
1240 "__id__": 43 1369 "__id__": 46
1241 } 1370 }
1242 ], 1371 ],
1243 "_prefab": null, 1372 "_prefab": null,
...@@ -1305,13 +1434,13 @@ ...@@ -1305,13 +1434,13 @@
1305 "_name": "ScrollBarHight", 1434 "_name": "ScrollBarHight",
1306 "_objFlags": 0, 1435 "_objFlags": 0,
1307 "_parent": { 1436 "_parent": {
1308 "__id__": 24 1437 "__id__": 27
1309 }, 1438 },
1310 "_children": [], 1439 "_children": [],
1311 "_active": true, 1440 "_active": true,
1312 "_components": [ 1441 "_components": [
1313 { 1442 {
1314 "__id__": 26 1443 "__id__": 29
1315 } 1444 }
1316 ], 1445 ],
1317 "_prefab": null, 1446 "_prefab": null,
...@@ -1379,7 +1508,7 @@ ...@@ -1379,7 +1508,7 @@
1379 "_name": "", 1508 "_name": "",
1380 "_objFlags": 0, 1509 "_objFlags": 0,
1381 "node": { 1510 "node": {
1382 "__id__": 25 1511 "__id__": 28
1383 }, 1512 },
1384 "_enabled": true, 1513 "_enabled": true,
1385 "_materials": [], 1514 "_materials": [],
...@@ -1405,20 +1534,20 @@ ...@@ -1405,20 +1534,20 @@
1405 "_name": "ScrollBarShadow", 1534 "_name": "ScrollBarShadow",
1406 "_objFlags": 0, 1535 "_objFlags": 0,
1407 "_parent": { 1536 "_parent": {
1408 "__id__": 24 1537 "__id__": 27
1409 }, 1538 },
1410 "_children": [ 1539 "_children": [
1411 { 1540 {
1412 "__id__": 28 1541 "__id__": 31
1413 } 1542 }
1414 ], 1543 ],
1415 "_active": true, 1544 "_active": true,
1416 "_components": [ 1545 "_components": [
1417 { 1546 {
1418 "__id__": 40 1547 "__id__": 43
1419 }, 1548 },
1420 { 1549 {
1421 "__id__": 41 1550 "__id__": 44
1422 } 1551 }
1423 ], 1552 ],
1424 "_prefab": null, 1553 "_prefab": null,
...@@ -1486,26 +1615,26 @@ ...@@ -1486,26 +1615,26 @@
1486 "_name": "ScrollBarBlock", 1615 "_name": "ScrollBarBlock",
1487 "_objFlags": 0, 1616 "_objFlags": 0,
1488 "_parent": { 1617 "_parent": {
1489 "__id__": 27 1618 "__id__": 30
1490 }, 1619 },
1491 "_children": [ 1620 "_children": [
1492 { 1621 {
1493 "__id__": 29
1494 },
1495 {
1496 "__id__": 32 1622 "__id__": 32
1497 }, 1623 },
1498 { 1624 {
1499 "__id__": 35 1625 "__id__": 35
1626 },
1627 {
1628 "__id__": 38
1500 } 1629 }
1501 ], 1630 ],
1502 "_active": true, 1631 "_active": true,
1503 "_components": [ 1632 "_components": [
1504 { 1633 {
1505 "__id__": 38 1634 "__id__": 41
1506 }, 1635 },
1507 { 1636 {
1508 "__id__": 39 1637 "__id__": 42
1509 } 1638 }
1510 ], 1639 ],
1511 "_prefab": null, 1640 "_prefab": null,
...@@ -1573,16 +1702,16 @@ ...@@ -1573,16 +1702,16 @@
1573 "_name": "AU", 1702 "_name": "AU",
1574 "_objFlags": 0, 1703 "_objFlags": 0,
1575 "_parent": { 1704 "_parent": {
1576 "__id__": 28 1705 "__id__": 31
1577 }, 1706 },
1578 "_children": [], 1707 "_children": [],
1579 "_active": true, 1708 "_active": true,
1580 "_components": [ 1709 "_components": [
1581 { 1710 {
1582 "__id__": 30 1711 "__id__": 33
1583 }, 1712 },
1584 { 1713 {
1585 "__id__": 31 1714 "__id__": 34
1586 } 1715 }
1587 ], 1716 ],
1588 "_prefab": null, 1717 "_prefab": null,
...@@ -1650,7 +1779,7 @@ ...@@ -1650,7 +1779,7 @@
1650 "_name": "", 1779 "_name": "",
1651 "_objFlags": 0, 1780 "_objFlags": 0,
1652 "node": { 1781 "node": {
1653 "__id__": 29 1782 "__id__": 32
1654 }, 1783 },
1655 "_enabled": true, 1784 "_enabled": true,
1656 "_materials": [], 1785 "_materials": [],
...@@ -1676,7 +1805,7 @@ ...@@ -1676,7 +1805,7 @@
1676 "_name": "", 1805 "_name": "",
1677 "_objFlags": 0, 1806 "_objFlags": 0,
1678 "node": { 1807 "node": {
1679 "__id__": 29 1808 "__id__": 32
1680 }, 1809 },
1681 "_enabled": true, 1810 "_enabled": true,
1682 "alignMode": 0, 1811 "alignMode": 0,
...@@ -1703,16 +1832,16 @@ ...@@ -1703,16 +1832,16 @@
1703 "_name": "AD", 1832 "_name": "AD",
1704 "_objFlags": 0, 1833 "_objFlags": 0,
1705 "_parent": { 1834 "_parent": {
1706 "__id__": 28 1835 "__id__": 31
1707 }, 1836 },
1708 "_children": [], 1837 "_children": [],
1709 "_active": true, 1838 "_active": true,
1710 "_components": [ 1839 "_components": [
1711 { 1840 {
1712 "__id__": 33 1841 "__id__": 36
1713 }, 1842 },
1714 { 1843 {
1715 "__id__": 34 1844 "__id__": 37
1716 } 1845 }
1717 ], 1846 ],
1718 "_prefab": null, 1847 "_prefab": null,
...@@ -1780,7 +1909,7 @@ ...@@ -1780,7 +1909,7 @@
1780 "_name": "", 1909 "_name": "",
1781 "_objFlags": 0, 1910 "_objFlags": 0,
1782 "node": { 1911 "node": {
1783 "__id__": 32 1912 "__id__": 35
1784 }, 1913 },
1785 "_enabled": true, 1914 "_enabled": true,
1786 "_materials": [], 1915 "_materials": [],
...@@ -1806,7 +1935,7 @@ ...@@ -1806,7 +1935,7 @@
1806 "_name": "", 1935 "_name": "",
1807 "_objFlags": 0, 1936 "_objFlags": 0,
1808 "node": { 1937 "node": {
1809 "__id__": 32 1938 "__id__": 35
1810 }, 1939 },
1811 "_enabled": true, 1940 "_enabled": true,
1812 "alignMode": 0, 1941 "alignMode": 0,
...@@ -1833,16 +1962,16 @@ ...@@ -1833,16 +1962,16 @@
1833 "_name": "Page", 1962 "_name": "Page",
1834 "_objFlags": 0, 1963 "_objFlags": 0,
1835 "_parent": { 1964 "_parent": {
1836 "__id__": 28 1965 "__id__": 31
1837 }, 1966 },
1838 "_children": [], 1967 "_children": [],
1839 "_active": true, 1968 "_active": true,
1840 "_components": [ 1969 "_components": [
1841 { 1970 {
1842 "__id__": 36 1971 "__id__": 39
1843 }, 1972 },
1844 { 1973 {
1845 "__id__": 37 1974 "__id__": 40
1846 } 1975 }
1847 ], 1976 ],
1848 "_prefab": null, 1977 "_prefab": null,
...@@ -1910,7 +2039,7 @@ ...@@ -1910,7 +2039,7 @@
1910 "_name": "", 2039 "_name": "",
1911 "_objFlags": 0, 2040 "_objFlags": 0,
1912 "node": { 2041 "node": {
1913 "__id__": 35 2042 "__id__": 38
1914 }, 2043 },
1915 "_enabled": true, 2044 "_enabled": true,
1916 "_fontFamily": "Arial", 2045 "_fontFamily": "Arial",
...@@ -1930,7 +2059,7 @@ ...@@ -1930,7 +2059,7 @@
1930 "_name": "", 2059 "_name": "",
1931 "_objFlags": 0, 2060 "_objFlags": 0,
1932 "node": { 2061 "node": {
1933 "__id__": 35 2062 "__id__": 38
1934 }, 2063 },
1935 "_enabled": true, 2064 "_enabled": true,
1936 "alignMode": 0, 2065 "alignMode": 0,
...@@ -1957,7 +2086,7 @@ ...@@ -1957,7 +2086,7 @@
1957 "_name": "", 2086 "_name": "",
1958 "_objFlags": 0, 2087 "_objFlags": 0,
1959 "node": { 2088 "node": {
1960 "__id__": 28 2089 "__id__": 31
1961 }, 2090 },
1962 "_enabled": true, 2091 "_enabled": true,
1963 "_materials": [], 2092 "_materials": [],
...@@ -1983,12 +2112,12 @@ ...@@ -1983,12 +2112,12 @@
1983 "_name": "", 2112 "_name": "",
1984 "_objFlags": 0, 2113 "_objFlags": 0,
1985 "node": { 2114 "node": {
1986 "__id__": 28 2115 "__id__": 31
1987 }, 2116 },
1988 "_enabled": true, 2117 "_enabled": true,
1989 "alignMode": 2, 2118 "alignMode": 2,
1990 "_target": { 2119 "_target": {
1991 "__id__": 27 2120 "__id__": 30
1992 }, 2121 },
1993 "_alignFlags": 4, 2122 "_alignFlags": 4,
1994 "_left": -4, 2123 "_left": -4,
...@@ -2012,7 +2141,7 @@ ...@@ -2012,7 +2141,7 @@
2012 "_name": "", 2141 "_name": "",
2013 "_objFlags": 0, 2142 "_objFlags": 0,
2014 "node": { 2143 "node": {
2015 "__id__": 27 2144 "__id__": 30
2016 }, 2145 },
2017 "_enabled": true, 2146 "_enabled": true,
2018 "_materials": [], 2147 "_materials": [],
...@@ -2038,7 +2167,7 @@ ...@@ -2038,7 +2167,7 @@
2038 "_name": "", 2167 "_name": "",
2039 "_objFlags": 0, 2168 "_objFlags": 0,
2040 "node": { 2169 "node": {
2041 "__id__": 27 2170 "__id__": 30
2042 }, 2171 },
2043 "_enabled": true, 2172 "_enabled": true,
2044 "alignMode": 2, 2173 "alignMode": 2,
...@@ -2065,7 +2194,7 @@ ...@@ -2065,7 +2194,7 @@
2065 "_name": "", 2194 "_name": "",
2066 "_objFlags": 0, 2195 "_objFlags": 0,
2067 "node": { 2196 "node": {
2068 "__id__": 24 2197 "__id__": 27
2069 }, 2198 },
2070 "_enabled": true, 2199 "_enabled": true,
2071 "alignMode": 0, 2200 "alignMode": 0,
...@@ -2092,7 +2221,7 @@ ...@@ -2092,7 +2221,7 @@
2092 "_name": "", 2221 "_name": "",
2093 "_objFlags": 0, 2222 "_objFlags": 0,
2094 "node": { 2223 "node": {
2095 "__id__": 24 2224 "__id__": 27
2096 }, 2225 },
2097 "_enabled": false, 2226 "_enabled": false,
2098 "_materials": [], 2227 "_materials": [],
...@@ -2108,7 +2237,7 @@ ...@@ -2108,7 +2237,7 @@
2108 "_name": "", 2237 "_name": "",
2109 "_objFlags": 0, 2238 "_objFlags": 0,
2110 "node": { 2239 "node": {
2111 "__id__": 20 2240 "__id__": 23
2112 }, 2241 },
2113 "_enabled": true, 2242 "_enabled": true,
2114 "alignMode": 1, 2243 "alignMode": 1,
...@@ -2141,10 +2270,10 @@ ...@@ -2141,10 +2270,10 @@
2141 "_active": true, 2270 "_active": true,
2142 "_components": [ 2271 "_components": [
2143 { 2272 {
2144 "__id__": 46 2273 "__id__": 49
2145 }, 2274 },
2146 { 2275 {
2147 "__id__": 47 2276 "__id__": 50
2148 } 2277 }
2149 ], 2278 ],
2150 "_prefab": null, 2279 "_prefab": null,
...@@ -2212,7 +2341,7 @@ ...@@ -2212,7 +2341,7 @@
2212 "_name": "", 2341 "_name": "",
2213 "_objFlags": 0, 2342 "_objFlags": 0,
2214 "node": { 2343 "node": {
2215 "__id__": 45 2344 "__id__": 48
2216 }, 2345 },
2217 "_enabled": true, 2346 "_enabled": true,
2218 "_materials": [ 2347 "_materials": [
...@@ -2242,7 +2371,7 @@ ...@@ -2242,7 +2371,7 @@
2242 "_name": "", 2371 "_name": "",
2243 "_objFlags": 0, 2372 "_objFlags": 0,
2244 "node": { 2373 "node": {
2245 "__id__": 45 2374 "__id__": 48
2246 }, 2375 },
2247 "_enabled": true, 2376 "_enabled": true,
2248 "alignMode": 1, 2377 "alignMode": 1,
...@@ -2275,7 +2404,7 @@ ...@@ -2275,7 +2404,7 @@
2275 "_active": true, 2404 "_active": true,
2276 "_components": [ 2405 "_components": [
2277 { 2406 {
2278 "__id__": 49 2407 "__id__": 52
2279 } 2408 }
2280 ], 2409 ],
2281 "_prefab": null, 2410 "_prefab": null,
...@@ -2343,7 +2472,7 @@ ...@@ -2343,7 +2472,7 @@
2343 "_name": "", 2472 "_name": "",
2344 "_objFlags": 0, 2473 "_objFlags": 0,
2345 "node": { 2474 "node": {
2346 "__id__": 48 2475 "__id__": 51
2347 }, 2476 },
2348 "_enabled": true, 2477 "_enabled": true,
2349 "_materials": [ 2478 "_materials": [
......
...@@ -64,6 +64,13 @@ cc.Class({ ...@@ -64,6 +64,13 @@ cc.Class({
64 this.getNavList(); //获取导航栏信息 64 this.getNavList(); //获取导航栏信息
65 }, 65 },
66 66
67 start: function () {
68 let emptyBtn = cc.find("EmptyBtn", this.node);
69 let exitBtn = cc.find("ExitBtn", this.node);
70 emptyBtn.getComponent(cc.Sprite).spriteFrame.setRect(cc.rect(0, 0, emptyBtn.width, emptyBtn.height));
71 exitBtn.getComponent(cc.Sprite).spriteFrame.setRect(cc.rect(0, 0, exitBtn.width, exitBtn.height));
72 },
73
67 getNavList: function () { 74 getNavList: function () {
68 var self = this; 75 var self = this;
69 this._nodeTypeList.y = 0; 76 this._nodeTypeList.y = 0;
...@@ -153,7 +160,8 @@ cc.Class({ ...@@ -153,7 +160,8 @@ cc.Class({
153 var self = this; 160 var self = this;
154 try { 161 try {
155 if (this._oSceneContext._iCurrentLeftIndex == 0 162 if (this._oSceneContext._iCurrentLeftIndex == 0
156 && (this._oInit[this._oSceneContext._iCurrentLeftIndex] == null || this._oInit[this._oSceneContext._iCurrentLeftIndex].resultSet == 0)) { 163 && (this._oInit[this._oSceneContext._iCurrentLeftIndex] == null
164 || this._oInit[this._oSceneContext._iCurrentLeftIndex].resultSet == 0)) {
157 this._oInit[this._oSceneContext._iCurrentLeftIndex] = cc.sys.localStorage.getItem("gameHistoryList"); 165 this._oInit[this._oSceneContext._iCurrentLeftIndex] = cc.sys.localStorage.getItem("gameHistoryList");
158 if (this._oInit[this._oSceneContext._iCurrentLeftIndex] == null) { 166 if (this._oInit[this._oSceneContext._iCurrentLeftIndex] == null) {
159 let oData = {}; 167 let oData = {};
...@@ -320,6 +328,15 @@ cc.Class({ ...@@ -320,6 +328,15 @@ cc.Class({
320 328
321 //初始化焦点框 329 //初始化焦点框
322 initFocus: function () { 330 initFocus: function () {
331
332 let fiBtnEmpty = cc.find("EmptyBtn", this.node).addComponent(FocusInfo); //
333 fiBtnEmpty.init('', true, null, null, 1.0);
334 this._aFocusTargets[0]['node_button_empty'] = cc.find("EmptyBtn", this.node);
335
336 let fiBtnExit = cc.find("ExitBtn", this.node).addComponent(FocusInfo); //
337 fiBtnExit.init('', true, null, null, 1.0);
338 this._aFocusTargets[0]['node_button_exit'] = cc.find("ExitBtn", this.node);
339
323 var nodeInitFocus = cc.find(this._oSceneContext.focusPath, this.node); 340 var nodeInitFocus = cc.find(this._oSceneContext.focusPath, this.node);
324 cc.log("初始化 " + nodeInitFocus.name); 341 cc.log("初始化 " + nodeInitFocus.name);
325 var nodeFocus = new cc.Node('nodeFocus'); 342 var nodeFocus = new cc.Node('nodeFocus');
...@@ -368,10 +385,10 @@ cc.Class({ ...@@ -368,10 +385,10 @@ cc.Class({
368 }, 385 },
369 386
370 checkFocusTarget: function (fiFocusTarget, oScrollParameter, Direct) { 387 checkFocusTarget: function (fiFocusTarget, oScrollParameter, Direct) {
371 this._cFocus.show(); 388 // this._cFocus.show();
372 // cc.log("目标节点:" + fiFocusTarget.node.x); 389 // cc.log("目标节点:" + fiFocusTarget.node.x);
373 if (fiFocusTarget && 0 == fiFocusTarget.node.name.indexOf("topNavi")) { 390 if (fiFocusTarget && 0 == fiFocusTarget.node.name.indexOf("topNavi")) {
374 this._cFocus.hide(); 391 // this._cFocus.hide();
375 if (0 != this._fiCurrentFocus.node.name.indexOf("topNavi")) {//如果不是TypeList之间跳转,则哪里来回哪里去 392 if (0 != this._fiCurrentFocus.node.name.indexOf("topNavi")) {//如果不是TypeList之间跳转,则哪里来回哪里去
376 fiFocusTarget = cc.find("topNavi" + this._oSceneContext._iCurrentLeftIndex, this._nodeTypeList).getComponent(FocusInfo); 393 fiFocusTarget = cc.find("topNavi" + this._oSceneContext._iCurrentLeftIndex, this._nodeTypeList).getComponent(FocusInfo);
377 } 394 }
...@@ -380,7 +397,7 @@ cc.Class({ ...@@ -380,7 +397,7 @@ cc.Class({
380 //打补丁,焦点在TypeList向下滑动,会找到category的焦点,禁掉这种 397 //打补丁,焦点在TypeList向下滑动,会找到category的焦点,禁掉这种
381 if (0 == this._fiCurrentFocus.node.name.indexOf("topNavi") && 0 != fiFocusTarget.node.name.indexOf("topNavi") 398 if (0 == this._fiCurrentFocus.node.name.indexOf("topNavi") && 0 != fiFocusTarget.node.name.indexOf("topNavi")
382 && Direct == Common.MOVE_DIRECTION_DOWN) { 399 && Direct == Common.MOVE_DIRECTION_DOWN) {
383 this._cFocus.hide(); 400 // this._cFocus.hide();
384 fiFocusTarget = null; 401 fiFocusTarget = null;
385 } 402 }
386 403
...@@ -551,6 +568,22 @@ cc.Class({ ...@@ -551,6 +568,22 @@ cc.Class({
551 fiFrom.node.getComponent(ListCell).setUIWithoutFocus(); 568 fiFrom.node.getComponent(ListCell).setUIWithoutFocus();
552 } 569 }
553 570
571
572 if (0 == fiFrom.node.getName().indexOf('EmptyBtn')) {
573 // fiTo.node.getComponent(cc.Sprite).spriteFrame.setRect(cc.rect(0, fiTo.node.height, fiTo.node.width, fiTo.node.height));
574 cc.loader.loadRes('HistoryAndCollect/icon_empty', cc.Texture2D, function (err, texture) {
575 fiFrom.node.getComponent(cc.Sprite).spriteFrame = new cc.SpriteFrame(texture, cc.rect(0, 0, fiFrom.node.width, fiFrom.node.height));
576 // spriteFrame._calculateUV();
577 });
578 }
579 if (0 == fiFrom.node.getName().indexOf('ExitBtn')) {
580 // fiTo.node.getComponent(cc.Sprite).spriteFrame.setRect(cc.rect(0, fiTo.node.height, fiTo.node.width, fiTo.node.height));
581 cc.loader.loadRes('HistoryAndCollect/icon_exit', cc.Texture2D, function (err, texture) {
582 fiFrom.node.getComponent(cc.Sprite).spriteFrame = new cc.SpriteFrame(texture, cc.rect(0, 0, fiFrom.node.width, fiFrom.node.height));
583 // spriteFrame._calculateUV();
584 });
585 }
586
554 // if (0 == this._fiCurrentFocus.node.getName().indexOf('TopCell')) { 587 // if (0 == this._fiCurrentFocus.node.getName().indexOf('TopCell')) {
555 // // fiFrom.node.getChildByName("Pic").getComponent(cc.Sprite).spriteFrame.setRect(cc.rect(0, 0, fiFrom.node.width, fiFrom.node.height)); 588 // // fiFrom.node.getChildByName("Pic").getComponent(cc.Sprite).spriteFrame.setRect(cc.rect(0, 0, fiFrom.node.width, fiFrom.node.height));
556 // let iIndex = fiFrom.node.name.replace("TopCell", ''); 589 // let iIndex = fiFrom.node.name.replace("TopCell", '');
...@@ -610,6 +643,27 @@ cc.Class({ ...@@ -610,6 +643,27 @@ cc.Class({
610 fiTo.node.getComponent(ListCell).setUIWithFocus(); 643 fiTo.node.getComponent(ListCell).setUIWithFocus();
611 } 644 }
612 645
646 if (0 == fiTo.node.getName().indexOf('EmptyBtn')) {
647 // fiTo.node.getComponent(cc.Sprite).spriteFrame.setRect(cc.rect(0, fiTo.node.height, fiTo.node.width, fiTo.node.height));
648 cc.loader.loadRes('HistoryAndCollect/icon_empty', cc.Texture2D, function (err, texture) {
649 fiTo.node.getComponent(cc.Sprite).spriteFrame = new cc.SpriteFrame(texture, cc.rect(0, fiTo.node.height, fiTo.node.width, fiTo.node.height));
650 // spriteFrame._calculateUV();
651 });
652 }
653 if (0 == fiTo.node.getName().indexOf('ExitBtn')) {
654 // fiTo.node.getComponent(cc.Sprite).spriteFrame.setRect(cc.rect(0, fiTo.node.height, fiTo.node.width, fiTo.node.height));
655 cc.loader.loadRes('HistoryAndCollect/icon_exit', cc.Texture2D, function (err, texture) {
656 fiTo.node.getComponent(cc.Sprite).spriteFrame = new cc.SpriteFrame(texture, cc.rect(0, fiTo.node.height, fiTo.node.width, fiTo.node.height));
657 // spriteFrame._calculateUV();
658 });
659 }
660
661 if (0 == fiTo.node.getName().indexOf('EmptyBtn') || 0 == fiTo.node.getName().indexOf('ExitBtn') || 0 == fiTo.node.getName().indexOf('topNavi')) {
662 this._cFocus.hide();
663 } else {
664 this._cFocus.show();
665 }
666
613 // if (0 == fiTo.node.getName().indexOf('TopCell')) { 667 // if (0 == fiTo.node.getName().indexOf('TopCell')) {
614 // let iIndex = fiTo.node.name.replace("TopCell", ''); 668 // let iIndex = fiTo.node.name.replace("TopCell", '');
615 // // fiTo.node.getChildByName("Pic").getComponent(cc.Sprite).spriteFrame.setRect(cc.rect(0, fiTo.node.height, fiTo.node.width, fiTo.node.height)); 669 // // fiTo.node.getChildByName("Pic").getComponent(cc.Sprite).spriteFrame.setRect(cc.rect(0, fiTo.node.height, fiTo.node.width, fiTo.node.height));
......
...@@ -21,6 +21,7 @@ cc.Class({ ...@@ -21,6 +21,7 @@ cc.Class({
21 this.node.height = data.height; 21 this.node.height = data.height;
22 this.node.getChildByName('Pic').width = data.width; 22 this.node.getChildByName('Pic').width = data.width;
23 this.node.getChildByName('Pic').height = data.height; 23 this.node.getChildByName('Pic').height = data.height;
24 // this.node.getChildByName('Pic').getComponent(cc.Sprite)._sgNode.setState(1);
24 if (data.imageURL) { 25 if (data.imageURL) {
25 var self = this; 26 var self = this;
26 // cc.loader.loadRes(data.imageURL, cc.Texture2D, function (err, texture) { 27 // cc.loader.loadRes(data.imageURL, cc.Texture2D, function (err, texture) {
......