Skip to content

apk_product / ForFun

Go to a project
Toggle navigation
Toggle navigation pinning
Commit 2bf98ed9 2bf98ed9b8b4f665b4a894c5c86496a3c959535c by 金学艇
Options

1.修改详情页

1 parent 224549ff
Inline Side-by-side
Showing 7 changed files with 757 additions and 97 deletions
...@@ -189,7 +189,7 @@ ...@@ -189,7 +189,7 @@
189 "array": [ 189 "array": [
190 0, 190 0,
191 0, 191 0,
192 271.0659484863281, 192 250.28134155273438,
193 0, 193 0,
194 0, 194 0,
195 0, 195 0,
...@@ -802,7 +802,7 @@ ...@@ -802,7 +802,7 @@
802 "_contentSize": { 802 "_contentSize": {
803 "__type__": "cc.Size", 803 "__type__": "cc.Size",
804 "width": 250, 804 "width": 250,
805 "height": 550 805 "height": 565
806 }, 806 },
807 "_anchorPoint": { 807 "_anchorPoint": {
808 "__type__": "cc.Vec2", 808 "__type__": "cc.Vec2",
......
...@@ -108,16 +108,19 @@ ...@@ -108,16 +108,19 @@
108 "__id__": 76 108 "__id__": 76
109 }, 109 },
110 { 110 {
111 "__id__": 78 111 "__id__": 90
112 },
113 {
114 "__id__": 92
112 } 115 }
113 ], 116 ],
114 "_active": true, 117 "_active": true,
115 "_components": [ 118 "_components": [
116 { 119 {
117 "__id__": 83 120 "__id__": 97
118 }, 121 },
119 { 122 {
120 "__id__": 84 123 "__id__": 98
121 } 124 }
122 ], 125 ],
123 "_prefab": null, 126 "_prefab": null,
...@@ -207,7 +210,7 @@ ...@@ -207,7 +210,7 @@
207 "array": [ 210 "array": [
208 0, 211 0,
209 0, 212 0,
210 271.0659484863281, 213 250.28134155273438,
211 0, 214 0,
212 0, 215 0,
213 0, 216 0,
...@@ -2137,7 +2140,7 @@ ...@@ -2137,7 +2140,7 @@
2137 "_contentSize": { 2140 "_contentSize": {
2138 "__type__": "cc.Size", 2141 "__type__": "cc.Size",
2139 "width": 564, 2142 "width": 564,
2140 "height": 120 2143 "height": 90
2141 }, 2144 },
2142 "_anchorPoint": { 2145 "_anchorPoint": {
2143 "__type__": "cc.Vec2", 2146 "__type__": "cc.Vec2",
...@@ -2149,7 +2152,7 @@ ...@@ -2149,7 +2152,7 @@
2149 "ctor": "Float32Array", 2152 "ctor": "Float32Array",
2150 "array": [ 2153 "array": [
2151 294, 2154 294,
2152 161, 2155 176,
2153 0, 2156 0,
2154 0, 2157 0,
2155 0, 2158 0,
...@@ -3460,20 +3463,98 @@ ...@@ -3460,20 +3463,98 @@
3460 }, 3463 },
3461 { 3464 {
3462 "__type__": "cc.Node", 3465 "__type__": "cc.Node",
3463 "_name": "LoadingLabel", 3466 "_name": "FullDesc",
3464 "_objFlags": 0, 3467 "_objFlags": 0,
3465 "_parent": { 3468 "_parent": {
3466 "__id__": 2 3469 "__id__": 2
3467 }, 3470 },
3471 "_children": [
3472 {
3473 "__id__": 77
3474 },
3475 {
3476 "__id__": 80
3477 },
3478 {
3479 "__id__": 83
3480 },
3481 {
3482 "__id__": 86
3483 }
3484 ],
3485 "_active": false,
3486 "_components": [
3487 {
3488 "__id__": 89
3489 }
3490 ],
3491 "_prefab": null,
3492 "_opacity": 204,
3493 "_color": {
3494 "__type__": "cc.Color",
3495 "r": 255,
3496 "g": 255,
3497 "b": 255,
3498 "a": 255
3499 },
3500 "_contentSize": {
3501 "__type__": "cc.Size",
3502 "width": 1280,
3503 "height": 720
3504 },
3505 "_anchorPoint": {
3506 "__type__": "cc.Vec2",
3507 "x": 0.5,
3508 "y": 0.5
3509 },
3510 "_trs": {
3511 "__type__": "TypedArray",
3512 "ctor": "Float32Array",
3513 "array": [
3514 0,
3515 0,
3516 0,
3517 0,
3518 0,
3519 0,
3520 1,
3521 1,
3522 1,
3523 1
3524 ]
3525 },
3526 "_eulerAngles": {
3527 "__type__": "cc.Vec3",
3528 "x": 0,
3529 "y": 0,
3530 "z": 0
3531 },
3532 "_skewX": 0,
3533 "_skewY": 0,
3534 "_is3DNode": false,
3535 "_groupIndex": 0,
3536 "groupIndex": 0,
3537 "_id": "b9ou39SchOnrYLAtLQepFY"
3538 },
3539 {
3540 "__type__": "cc.Node",
3541 "_name": "New Sprite(Splash)",
3542 "_objFlags": 0,
3543 "_parent": {
3544 "__id__": 76
3545 },
3468 "_children": [], 3546 "_children": [],
3469 "_active": true, 3547 "_active": true,
3470 "_components": [ 3548 "_components": [
3471 { 3549 {
3472 "__id__": 77 3550 "__id__": 78
3551 },
3552 {
3553 "__id__": 79
3473 } 3554 }
3474 ], 3555 ],
3475 "_prefab": null, 3556 "_prefab": null,
3476 "_opacity": 0, 3557 "_opacity": 76,
3477 "_color": { 3558 "_color": {
3478 "__type__": "cc.Color", 3559 "__type__": "cc.Color",
3479 "r": 255, 3560 "r": 255,
...@@ -3483,8 +3564,8 @@ ...@@ -3483,8 +3564,8 @@
3483 }, 3564 },
3484 "_contentSize": { 3565 "_contentSize": {
3485 "__type__": "cc.Size", 3566 "__type__": "cc.Size",
3486 "width": 60, 3567 "width": 1040,
3487 "height": 25.2 3568 "height": 1
3488 }, 3569 },
3489 "_anchorPoint": { 3570 "_anchorPoint": {
3490 "__type__": "cc.Vec2", 3571 "__type__": "cc.Vec2",
...@@ -3495,8 +3576,8 @@ ...@@ -3495,8 +3576,8 @@
3495 "__type__": "TypedArray", 3576 "__type__": "TypedArray",
3496 "ctor": "Float32Array", 3577 "ctor": "Float32Array",
3497 "array": [ 3578 "array": [
3498 404.135986328125, 3579 0,
3499 315.010986328125, 3580 229.5,
3500 0, 3581 0,
3501 0, 3582 0,
3502 0, 3583 0,
...@@ -3518,14 +3599,14 @@ ...@@ -3518,14 +3599,14 @@
3518 "_is3DNode": false, 3599 "_is3DNode": false,
3519 "_groupIndex": 0, 3600 "_groupIndex": 0,
3520 "groupIndex": 0, 3601 "groupIndex": 0,
3521 "_id": "33+kvP1K5KYriv+RzNXWOo" 3602 "_id": "71L4ImABxBvJm8ltxXTNin"
3522 }, 3603 },
3523 { 3604 {
3524 "__type__": "cc.Label", 3605 "__type__": "cc.Sprite",
3525 "_name": "", 3606 "_name": "",
3526 "_objFlags": 0, 3607 "_objFlags": 0,
3527 "node": { 3608 "node": {
3528 "__id__": 76 3609 "__id__": 77
3529 }, 3610 },
3530 "_enabled": true, 3611 "_enabled": true,
3531 "_materials": [ 3612 "_materials": [
...@@ -3533,38 +3614,66 @@ ...@@ -3533,38 +3614,66 @@
3533 "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" 3614 "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
3534 } 3615 }
3535 ], 3616 ],
3536 "_useOriginalSize": false, 3617 "_srcBlendFactor": 770,
3537 "_string": "加载中", 3618 "_dstBlendFactor": 771,
3538 "_N$string": "加载中", 3619 "_spriteFrame": {
3539 "_fontSize": 20, 3620 "__uuid__": "a23235d1-15db-4b95-8439-a2e005bfff91"
3540 "_lineHeight": 20, 3621 },
3541 "_enableWrapText": true, 3622 "_type": 0,
3542 "_N$file": null, 3623 "_sizeMode": 0,
3543 "_isSystemFontUsed": true, 3624 "_fillType": 0,
3544 "_spacingX": 0, 3625 "_fillCenter": {
3545 "_batchAsBitmap": false, 3626 "__type__": "cc.Vec2",
3546 "_N$horizontalAlign": 1, 3627 "x": 0,
3547 "_N$verticalAlign": 1, 3628 "y": 0
3548 "_N$fontFamily": "Arial", 3629 },
3549 "_N$overflow": 0, 3630 "_fillStart": 0,
3550 "_N$cacheMode": 0, 3631 "_fillRange": 0,
3551 "_id": "0c7WXtuplLNJYfEbLlM04K" 3632 "_isTrimmedMode": true,
3633 "_atlas": null,
3634 "_id": "6aJ3M1HuRJg6UL+3UYsjeb"
3635 },
3636 {
3637 "__type__": "cc.Widget",
3638 "_name": "",
3639 "_objFlags": 0,
3640 "node": {
3641 "__id__": 77
3642 },
3643 "_enabled": true,
3644 "alignMode": 1,
3645 "_target": null,
3646 "_alignFlags": 1,
3647 "_left": 0,
3648 "_right": 0,
3649 "_top": 130,
3650 "_bottom": 0,
3651 "_verticalCenter": 0,
3652 "_horizontalCenter": 0,
3653 "_isAbsLeft": true,
3654 "_isAbsRight": true,
3655 "_isAbsTop": true,
3656 "_isAbsBottom": true,
3657 "_isAbsHorizontalCenter": true,
3658 "_isAbsVerticalCenter": true,
3659 "_originalWidth": 0,
3660 "_originalHeight": 0,
3661 "_id": "c0iyPOG0lC1aRx6Vxdp7FB"
3552 }, 3662 },
3553 { 3663 {
3554 "__type__": "cc.Node", 3664 "__type__": "cc.Node",
3555 "_name": "Loading", 3665 "_name": "Title",
3556 "_objFlags": 0, 3666 "_objFlags": 0,
3557 "_parent": { 3667 "_parent": {
3558 "__id__": 2 3668 "__id__": 76
3559 }, 3669 },
3560 "_children": [ 3670 "_children": [],
3561 {
3562 "__id__": 79
3563 }
3564 ],
3565 "_active": true, 3671 "_active": true,
3566 "_components": [ 3672 "_components": [
3567 { 3673 {
3674 "__id__": 81
3675 },
3676 {
3568 "__id__": 82 3677 "__id__": 82
3569 } 3678 }
3570 ], 3679 ],
...@@ -3579,20 +3688,20 @@ ...@@ -3579,20 +3688,20 @@
3579 }, 3688 },
3580 "_contentSize": { 3689 "_contentSize": {
3581 "__type__": "cc.Size", 3690 "__type__": "cc.Size",
3582 "width": 100, 3691 "width": 0,
3583 "height": 20 3692 "height": 63
3584 }, 3693 },
3585 "_anchorPoint": { 3694 "_anchorPoint": {
3586 "__type__": "cc.Vec2", 3695 "__type__": "cc.Vec2",
3587 "x": 0, 3696 "x": 0.5,
3588 "y": 0.5 3697 "y": 0.5
3589 }, 3698 },
3590 "_trs": { 3699 "_trs": {
3591 "__type__": "TypedArray", 3700 "__type__": "TypedArray",
3592 "ctor": "Float32Array", 3701 "ctor": "Float32Array",
3593 "array": [ 3702 "array": [
3594 438.4960021972656, 3703 0,
3595 313.9849853515625, 3704 272.5,
3596 0, 3705 0,
3597 0, 3706 0,
3598 0, 3707 0,
...@@ -3614,23 +3723,516 @@ ...@@ -3614,23 +3723,516 @@
3614 "_is3DNode": false, 3723 "_is3DNode": false,
3615 "_groupIndex": 0, 3724 "_groupIndex": 0,
3616 "groupIndex": 0, 3725 "groupIndex": 0,
3617 "_id": "18DGk1y4tPN4NY5JQjm9fm" 3726 "_id": "079KCCpUZIO5fYNk9ydZFO"
3727 },
3728 {
3729 "__type__": "cc.Label",
3730 "_name": "",
3731 "_objFlags": 0,
3732 "node": {
3733 "__id__": 80
3734 },
3735 "_enabled": true,
3736 "_materials": [
3737 {
3738 "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
3739 }
3740 ],
3741 "_useOriginalSize": false,
3742 "_string": "",
3743 "_N$string": "",
3744 "_fontSize": 36,
3745 "_lineHeight": 50,
3746 "_enableWrapText": true,
3747 "_N$file": null,
3748 "_isSystemFontUsed": true,
3749 "_spacingX": 0,
3750 "_batchAsBitmap": false,
3751 "_N$horizontalAlign": 1,
3752 "_N$verticalAlign": 1,
3753 "_N$fontFamily": "Arial",
3754 "_N$overflow": 0,
3755 "_N$cacheMode": 0,
3756 "_id": "0eooH3aE1B7ru+g0wK7KRl"
3757 },
3758 {
3759 "__type__": "cc.Widget",
3760 "_name": "",
3761 "_objFlags": 0,
3762 "node": {
3763 "__id__": 80
3764 },
3765 "_enabled": true,
3766 "alignMode": 1,
3767 "_target": null,
3768 "_alignFlags": 1,
3769 "_left": 0,
3770 "_right": 0,
3771 "_top": 56,
3772 "_bottom": 0,
3773 "_verticalCenter": 0,
3774 "_horizontalCenter": 0,
3775 "_isAbsLeft": true,
3776 "_isAbsRight": true,
3777 "_isAbsTop": true,
3778 "_isAbsBottom": true,
3779 "_isAbsHorizontalCenter": true,
3780 "_isAbsVerticalCenter": true,
3781 "_originalWidth": 0,
3782 "_originalHeight": 0,
3783 "_id": "fb1vmj8wlKX5zVG4Yw5kgF"
3618 }, 3784 },
3619 { 3785 {
3620 "__type__": "cc.Node", 3786 "__type__": "cc.Node",
3621 "_name": "LoadingIcon", 3787 "_name": "Desc",
3622 "_objFlags": 0, 3788 "_objFlags": 0,
3623 "_parent": { 3789 "_parent": {
3624 "__id__": 78 3790 "__id__": 76
3625 }, 3791 },
3626 "_children": [], 3792 "_children": [],
3627 "_active": true, 3793 "_active": true,
3628 "_components": [ 3794 "_components": [
3629 { 3795 {
3630 "__id__": 80 3796 "__id__": 84
3631 }, 3797 },
3632 { 3798 {
3633 "__id__": 81 3799 "__id__": 85
3800 }
3801 ],
3802 "_prefab": null,
3803 "_opacity": 255,
3804 "_color": {
3805 "__type__": "cc.Color",
3806 "r": 255,
3807 "g": 255,
3808 "b": 255,
3809 "a": 255
3810 },
3811 "_contentSize": {
3812 "__type__": "cc.Size",
3813 "width": 780,
3814 "height": 192
3815 },
3816 "_anchorPoint": {
3817 "__type__": "cc.Vec2",
3818 "x": 0.5,
3819 "y": 0.5
3820 },
3821 "_trs": {
3822 "__type__": "TypedArray",
3823 "ctor": "Float32Array",
3824 "array": [
3825 0,
3826 109,
3827 0,
3828 0,
3829 0,
3830 0,
3831 1,
3832 1,
3833 1,
3834 1
3835 ]
3836 },
3837 "_eulerAngles": {
3838 "__type__": "cc.Vec3",
3839 "x": 0,
3840 "y": 0,
3841 "z": 0
3842 },
3843 "_skewX": 0,
3844 "_skewY": 0,
3845 "_is3DNode": false,
3846 "_groupIndex": 0,
3847 "groupIndex": 0,
3848 "_id": "17Vu9sbF5D+qONcUePBxO7"
3849 },
3850 {
3851 "__type__": "cc.Label",
3852 "_name": "",
3853 "_objFlags": 0,
3854 "node": {
3855 "__id__": 83
3856 },
3857 "_enabled": true,
3858 "_materials": [
3859 {
3860 "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
3861 }
3862 ],
3863 "_useOriginalSize": false,
3864 "_string": "",
3865 "_N$string": "",
3866 "_fontSize": 24,
3867 "_lineHeight": 48,
3868 "_enableWrapText": true,
3869 "_N$file": null,
3870 "_isSystemFontUsed": true,
3871 "_spacingX": 0,
3872 "_batchAsBitmap": false,
3873 "_N$horizontalAlign": 0,
3874 "_N$verticalAlign": 0,
3875 "_N$fontFamily": "Arial",
3876 "_N$overflow": 1,
3877 "_N$cacheMode": 0,
3878 "_id": "f39mYY+65IKIXCwqKFZ7nB"
3879 },
3880 {
3881 "__type__": "cc.Widget",
3882 "_name": "",
3883 "_objFlags": 0,
3884 "node": {
3885 "__id__": 83
3886 },
3887 "_enabled": true,
3888 "alignMode": 1,
3889 "_target": null,
3890 "_alignFlags": 1,
3891 "_left": 0,
3892 "_right": 0,
3893 "_top": 155,
3894 "_bottom": 0,
3895 "_verticalCenter": 0,
3896 "_horizontalCenter": 0,
3897 "_isAbsLeft": true,
3898 "_isAbsRight": true,
3899 "_isAbsTop": true,
3900 "_isAbsBottom": true,
3901 "_isAbsHorizontalCenter": true,
3902 "_isAbsVerticalCenter": true,
3903 "_originalWidth": 0,
3904 "_originalHeight": 0,
3905 "_id": "b0bmcNPmZOjrpmPPQvwX2J"
3906 },
3907 {
3908 "__type__": "cc.Node",
3909 "_name": "New Sprite(Splash)",
3910 "_objFlags": 0,
3911 "_parent": {
3912 "__id__": 76
3913 },
3914 "_children": [],
3915 "_active": true,
3916 "_components": [
3917 {
3918 "__id__": 87
3919 },
3920 {
3921 "__id__": 88
3922 }
3923 ],
3924 "_prefab": null,
3925 "_opacity": 76,
3926 "_color": {
3927 "__type__": "cc.Color",
3928 "r": 255,
3929 "g": 255,
3930 "b": 255,
3931 "a": 255
3932 },
3933 "_contentSize": {
3934 "__type__": "cc.Size",
3935 "width": 1040,
3936 "height": 1
3937 },
3938 "_anchorPoint": {
3939 "__type__": "cc.Vec2",
3940 "x": 0.5,
3941 "y": 0.5
3942 },
3943 "_trs": {
3944 "__type__": "TypedArray",
3945 "ctor": "Float32Array",
3946 "array": [
3947 0,
3948 -259.5,
3949 0,
3950 0,
3951 0,
3952 0,
3953 1,
3954 1,
3955 1,
3956 1
3957 ]
3958 },
3959 "_eulerAngles": {
3960 "__type__": "cc.Vec3",
3961 "x": 0,
3962 "y": 0,
3963 "z": 0
3964 },
3965 "_skewX": 0,
3966 "_skewY": 0,
3967 "_is3DNode": false,
3968 "_groupIndex": 0,
3969 "groupIndex": 0,
3970 "_id": "4fwTm9RZlLDYNPrzWa59sd"
3971 },
3972 {
3973 "__type__": "cc.Sprite",
3974 "_name": "",
3975 "_objFlags": 0,
3976 "node": {
3977 "__id__": 86
3978 },
3979 "_enabled": true,
3980 "_materials": [
3981 {
3982 "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
3983 }
3984 ],
3985 "_srcBlendFactor": 770,
3986 "_dstBlendFactor": 771,
3987 "_spriteFrame": {
3988 "__uuid__": "a23235d1-15db-4b95-8439-a2e005bfff91"
3989 },
3990 "_type": 0,
3991 "_sizeMode": 0,
3992 "_fillType": 0,
3993 "_fillCenter": {
3994 "__type__": "cc.Vec2",
3995 "x": 0,
3996 "y": 0
3997 },
3998 "_fillStart": 0,
3999 "_fillRange": 0,
4000 "_isTrimmedMode": true,
4001 "_atlas": null,
4002 "_id": "1agL+bubxF/pN0zOVYqbBb"
4003 },
4004 {
4005 "__type__": "cc.Widget",
4006 "_name": "",
4007 "_objFlags": 0,
4008 "node": {
4009 "__id__": 86
4010 },
4011 "_enabled": true,
4012 "alignMode": 1,
4013 "_target": null,
4014 "_alignFlags": 1,
4015 "_left": 0,
4016 "_right": 0,
4017 "_top": 619,
4018 "_bottom": 0,
4019 "_verticalCenter": 0,
4020 "_horizontalCenter": 0,
4021 "_isAbsLeft": true,
4022 "_isAbsRight": true,
4023 "_isAbsTop": true,
4024 "_isAbsBottom": true,
4025 "_isAbsHorizontalCenter": true,
4026 "_isAbsVerticalCenter": true,
4027 "_originalWidth": 0,
4028 "_originalHeight": 0,
4029 "_id": "e79AV5x4VGd4xbeXZYxXW7"
4030 },
4031 {
4032 "__type__": "cc.Sprite",
4033 "_name": "",
4034 "_objFlags": 0,
4035 "node": {
4036 "__id__": 76
4037 },
4038 "_enabled": true,
4039 "_materials": [
4040 {
4041 "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
4042 }
4043 ],
4044 "_srcBlendFactor": 770,
4045 "_dstBlendFactor": 771,
4046 "_spriteFrame": {
4047 "__uuid__": "a66022bd-b80b-4cc3-b128-72e532329459"
4048 },
4049 "_type": 0,
4050 "_sizeMode": 0,
4051 "_fillType": 0,
4052 "_fillCenter": {
4053 "__type__": "cc.Vec2",
4054 "x": 0,
4055 "y": 0
4056 },
4057 "_fillStart": 0,
4058 "_fillRange": 0,
4059 "_isTrimmedMode": true,
4060 "_atlas": null,
4061 "_id": "54Hd89eq5CuK0tLbPaG/Dt"
4062 },
4063 {
4064 "__type__": "cc.Node",
4065 "_name": "LoadingLabel",
4066 "_objFlags": 0,
4067 "_parent": {
4068 "__id__": 2
4069 },
4070 "_children": [],
4071 "_active": true,
4072 "_components": [
4073 {
4074 "__id__": 91
4075 }
4076 ],
4077 "_prefab": null,
4078 "_opacity": 0,
4079 "_color": {
4080 "__type__": "cc.Color",
4081 "r": 255,
4082 "g": 255,
4083 "b": 255,
4084 "a": 255
4085 },
4086 "_contentSize": {
4087 "__type__": "cc.Size",
4088 "width": 60,
4089 "height": 25.2
4090 },
4091 "_anchorPoint": {
4092 "__type__": "cc.Vec2",
4093 "x": 0.5,
4094 "y": 0.5
4095 },
4096 "_trs": {
4097 "__type__": "TypedArray",
4098 "ctor": "Float32Array",
4099 "array": [
4100 404.135986328125,
4101 315.010986328125,
4102 0,
4103 0,
4104 0,
4105 0,
4106 1,
4107 1,
4108 1,
4109 1
4110 ]
4111 },
4112 "_eulerAngles": {
4113 "__type__": "cc.Vec3",
4114 "x": 0,
4115 "y": 0,
4116 "z": 0
4117 },
4118 "_skewX": 0,
4119 "_skewY": 0,
4120 "_is3DNode": false,
4121 "_groupIndex": 0,
4122 "groupIndex": 0,
4123 "_id": "33+kvP1K5KYriv+RzNXWOo"
4124 },
4125 {
4126 "__type__": "cc.Label",
4127 "_name": "",
4128 "_objFlags": 0,
4129 "node": {
4130 "__id__": 90
4131 },
4132 "_enabled": true,
4133 "_materials": [
4134 {
4135 "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
4136 }
4137 ],
4138 "_useOriginalSize": false,
4139 "_string": "加载中",
4140 "_N$string": "加载中",
4141 "_fontSize": 20,
4142 "_lineHeight": 20,
4143 "_enableWrapText": true,
4144 "_N$file": null,
4145 "_isSystemFontUsed": true,
4146 "_spacingX": 0,
4147 "_batchAsBitmap": false,
4148 "_N$horizontalAlign": 1,
4149 "_N$verticalAlign": 1,
4150 "_N$fontFamily": "Arial",
4151 "_N$overflow": 0,
4152 "_N$cacheMode": 0,
4153 "_id": "0c7WXtuplLNJYfEbLlM04K"
4154 },
4155 {
4156 "__type__": "cc.Node",
4157 "_name": "Loading",
4158 "_objFlags": 0,
4159 "_parent": {
4160 "__id__": 2
4161 },
4162 "_children": [
4163 {
4164 "__id__": 93
4165 }
4166 ],
4167 "_active": true,
4168 "_components": [
4169 {
4170 "__id__": 96
4171 }
4172 ],
4173 "_prefab": null,
4174 "_opacity": 255,
4175 "_color": {
4176 "__type__": "cc.Color",
4177 "r": 255,
4178 "g": 255,
4179 "b": 255,
4180 "a": 255
4181 },
4182 "_contentSize": {
4183 "__type__": "cc.Size",
4184 "width": 100,
4185 "height": 20
4186 },
4187 "_anchorPoint": {
4188 "__type__": "cc.Vec2",
4189 "x": 0,
4190 "y": 0.5
4191 },
4192 "_trs": {
4193 "__type__": "TypedArray",
4194 "ctor": "Float32Array",
4195 "array": [
4196 438.4960021972656,
4197 313.9849853515625,
4198 0,
4199 0,
4200 0,
4201 0,
4202 1,
4203 1,
4204 1,
4205 1
4206 ]
4207 },
4208 "_eulerAngles": {
4209 "__type__": "cc.Vec3",
4210 "x": 0,
4211 "y": 0,
4212 "z": 0
4213 },
4214 "_skewX": 0,
4215 "_skewY": 0,
4216 "_is3DNode": false,
4217 "_groupIndex": 0,
4218 "groupIndex": 0,
4219 "_id": "18DGk1y4tPN4NY5JQjm9fm"
4220 },
4221 {
4222 "__type__": "cc.Node",
4223 "_name": "LoadingIcon",
4224 "_objFlags": 0,
4225 "_parent": {
4226 "__id__": 92
4227 },
4228 "_children": [],
4229 "_active": true,
4230 "_components": [
4231 {
4232 "__id__": 94
4233 },
4234 {
4235 "__id__": 95
3634 } 4236 }
3635 ], 4237 ],
3636 "_prefab": null, 4238 "_prefab": null,
...@@ -3686,7 +4288,7 @@ ...@@ -3686,7 +4288,7 @@
3686 "_name": "", 4288 "_name": "",
3687 "_objFlags": 0, 4289 "_objFlags": 0,
3688 "node": { 4290 "node": {
3689 "__id__": 79 4291 "__id__": 93
3690 }, 4292 },
3691 "_enabled": true, 4293 "_enabled": true,
3692 "_materials": [ 4294 "_materials": [
...@@ -3718,7 +4320,7 @@ ...@@ -3718,7 +4320,7 @@
3718 "_name": "", 4320 "_name": "",
3719 "_objFlags": 0, 4321 "_objFlags": 0,
3720 "node": { 4322 "node": {
3721 "__id__": 79 4323 "__id__": 93
3722 }, 4324 },
3723 "_enabled": true, 4325 "_enabled": true,
3724 "_defaultClip": { 4326 "_defaultClip": {
...@@ -3737,7 +4339,7 @@ ...@@ -3737,7 +4339,7 @@
3737 "_name": "", 4339 "_name": "",
3738 "_objFlags": 0, 4340 "_objFlags": 0,
3739 "node": { 4341 "node": {
3740 "__id__": 78 4342 "__id__": 92
3741 }, 4343 },
3742 "_enabled": true, 4344 "_enabled": true,
3743 "_materials": [ 4345 "_materials": [
......
...@@ -27,7 +27,7 @@ cc.Class({ ...@@ -27,7 +27,7 @@ cc.Class({
27 this._oInit = {}; 27 this._oInit = {};
28 this._lastFocus = null; 28 this._lastFocus = null;
29 this._oSceneContext._iCurrentLeftIndex = 0; 29 this._oSceneContext._iCurrentLeftIndex = 0;
30 this._oSceneContext.focusPath = "TypeListArea/TypeListWrapper/TypeList/topNavi" + this._oSceneContext._iCurrentLeftIndex; 30 // this._oSceneContext.focusPath = "TypeListArea/TypeListWrapper/TypeList/topNavi" + this._oSceneContext._iCurrentLeftIndex;
31 this._bIsDataListMoving = false; 31 this._bIsDataListMoving = false;
32 this._bInitCategoryListSuccess = false; 32 this._bInitCategoryListSuccess = false;
33 33
...@@ -42,6 +42,14 @@ cc.Class({ ...@@ -42,6 +42,14 @@ cc.Class({
42 this._cApplication.setBackStatus(false); 42 this._cApplication.setBackStatus(false);
43 } 43 }
44 44
45 let aSceneParameter = this._cApplication.getSceneParameter();
46 cc.log("gameDetail->aSceneParameter..." + JSON.stringify(aSceneParameter));
47 if (aSceneParameter.length) {
48 this._oSceneContext._iCurrentLeftIndex = aSceneParameter[aSceneParameter.length - 1].currentIndex || 0;
49 } else if (aSceneParameter) {
50 this._oSceneContext._iCurrentLeftIndex = aSceneParameter.currentIndex || 0;
51 }
52
45 this._nodeTypeListWrapper = cc.find("TypeListArea/TypeListWrapper", this.node); 53 this._nodeTypeListWrapper = cc.find("TypeListArea/TypeListWrapper", this.node);
46 this._nodeTypeList = cc.find("TypeList", this._nodeTypeListWrapper); 54 this._nodeTypeList = cc.find("TypeList", this._nodeTypeListWrapper);
47 this._nodeTypeList.addComponent(TVScrollParameter); 55 this._nodeTypeList.addComponent(TVScrollParameter);
...@@ -99,7 +107,7 @@ cc.Class({ ...@@ -99,7 +107,7 @@ cc.Class({
99 function (texture, iRequestId) { 107 function (texture, iRequestId) {
100 node.getChildByName("Pic").getComponent(cc.Sprite).spriteFrame = new cc.SpriteFrame(texture, cc.rect(0, 0, oProgram.image[0].width, oProgram.image[0].height)); 108 node.getChildByName("Pic").getComponent(cc.Sprite).spriteFrame = new cc.SpriteFrame(texture, cc.rect(0, 0, oProgram.image[0].width, oProgram.image[0].height));
101 if (i == self._oSceneContext._iCurrentLeftIndex) { 109 if (i == self._oSceneContext._iCurrentLeftIndex) {
102 node.getChildByName("Pic").getComponent(cc.Sprite).spriteFrame = new cc.SpriteFrame(texture, cc.rect(0, oProgram.image[0].height, oProgram.image[0].width, oProgram.image[0].height)); 110 node.getChildByName("Pic").getComponent(cc.Sprite).spriteFrame = new cc.SpriteFrame(texture, cc.rect(0, oProgram.image[0].height * 2, oProgram.image[0].width, oProgram.image[0].height));
103 } 111 }
104 }, function () { }, this 112 }, function () { }, this
105 ); 113 );
...@@ -142,7 +150,7 @@ cc.Class({ ...@@ -142,7 +150,7 @@ cc.Class({
142 150
143 getSimulateRequest: function () { 151 getSimulateRequest: function () {
144 var self = this; 152 var self = this;
145 var aJsonList = ["catetory_jtdr_list.json", "catetory_all_list.json", "catetory_nlbz_list.json", "catetory_3dyx_list.json", "catetory_xyx_list.json", "catetory_tyjj_list.json"]; 153 var aJsonList = ["catetory_jtdr_list.json", "catetory_all_list.json", "catetory_nlbz_list.json", "catetory_3dyx_list.json", "catetory_xyx_list.json", "catetory_dfdj_list.json"];
146 if (this._oInit[this._oSceneContext._iCurrentLeftIndex]) { //已经加载过数据直接取 154 if (this._oInit[this._oSceneContext._iCurrentLeftIndex]) { //已经加载过数据直接取
147 self.requestMediaList(1); 155 self.requestMediaList(1);
148 } else { 156 } else {
...@@ -174,7 +182,7 @@ cc.Class({ ...@@ -174,7 +182,7 @@ cc.Class({
174 // let strAppId = this._oInit.aNavList[this._oSceneContext.iNaviIndex].appId; 182 // let strAppId = this._oInit.aNavList[this._oSceneContext.iNaviIndex].appId;
175 // switch (strAppId) { 183 // switch (strAppId) {
176 // case BusinessParameter.CARTOON_APPID: 184 // case BusinessParameter.CARTOON_APPID:
177 // this._oSceneContext.focusPath = this._oSceneContext.focusPath || "SongList/DataContainerMask/DataContainer/ListCell0/SongTitleContainer"; 185 this._oSceneContext.focusPath = this._oSceneContext.focusPath || "CategoryList/DataContainerMask/DataContainer/CategoryListCell0";
178 this._strSongListCellComponentName = "pfbCategoryListCell"; 186 this._strSongListCellComponentName = "pfbCategoryListCell";
179 this._iBeginPositionX = -350; 187 this._iBeginPositionX = -350;
180 this._iBeginPositionY = 196; 188 this._iBeginPositionY = 196;
...@@ -317,6 +325,12 @@ cc.Class({ ...@@ -317,6 +325,12 @@ cc.Class({
317 this._cFocus.hide(); 325 this._cFocus.hide();
318 } 326 }
319 327
328 if (0 == nodeInitFocus.getName().indexOf('CategoryListCell')) {
329 nodeInitFocus.getChildByName("Normal").active = false;
330 nodeInitFocus.getChildByName("Name").active = true;
331 nodeInitFocus.getComponent(ListCell).setUIWithFocus();
332 }
333
320 //处理焦点位于下方问题 334 //处理焦点位于下方问题
321 if (this._oSceneContext.typeListY) { 335 if (this._oSceneContext.typeListY) {
322 this._nodeTypeList.y = this._oSceneContext.typeListY; 336 this._nodeTypeList.y = this._oSceneContext.typeListY;
...@@ -377,7 +391,7 @@ cc.Class({ ...@@ -377,7 +391,7 @@ cc.Class({
377 onKeyUp: function (event) { 391 onKeyUp: function (event) {
378 // cc.log(this._lastFocus.node.name + " down->抬起。。。" + this._fiCurrentFocus.node.name); 392 // cc.log(this._lastFocus.node.name + " down->抬起。。。" + this._fiCurrentFocus.node.name);
379 cc.log("抬起：" + event.keyCode); 393 cc.log("抬起：" + event.keyCode);
380 if (0 == this._lastFocus.node.getName().indexOf('topNavi') 394 if (this._lastFocus != null && 0 == this._lastFocus.node.getName().indexOf('topNavi')
381 && 0 == this._fiCurrentFocus.node.getName().indexOf('topNavi') 395 && 0 == this._fiCurrentFocus.node.getName().indexOf('topNavi')
382 && event.keyCode != (Common.ANDROID_KEY.left || cc.macro.KEY.left)) { 396 && event.keyCode != (Common.ANDROID_KEY.left || cc.macro.KEY.left)) {
383 this.scheduleOnce(function () { 397 this.scheduleOnce(function () {
......
...@@ -73,6 +73,7 @@ cc.Class({ ...@@ -73,6 +73,7 @@ cc.Class({
73 cc.find("ButtonOpen", this.node).getComponent(cc.Sprite).spriteFrame.setRect(cc.rect(0, 0, 264, 100)); 73 cc.find("ButtonOpen", this.node).getComponent(cc.Sprite).spriteFrame.setRect(cc.rect(0, 0, 264, 100));
74 // cc.find("ButtonVip", this.node).getComponent(cc.Sprite).spriteFrame.setRect(cc.rect(0, 0, 572, 72)); 74 // cc.find("ButtonVip", this.node).getComponent(cc.Sprite).spriteFrame.setRect(cc.rect(0, 0, 572, 72));
75 cc.find("FullView", this.node).zIndex = 100; 75 cc.find("FullView", this.node).zIndex = 100;
76 cc.find("FullDesc", this.node).zIndex = 100;
76 77
77 this._nodeTypeListWrapper = cc.find("TypeListArea/TypeListWrapper", this.node); 78 this._nodeTypeListWrapper = cc.find("TypeListArea/TypeListWrapper", this.node);
78 this._nodeTypeList = cc.find("TypeList", this._nodeTypeListWrapper); 79 this._nodeTypeList = cc.find("TypeList", this._nodeTypeListWrapper);
...@@ -279,10 +280,14 @@ cc.Class({ ...@@ -279,10 +280,14 @@ cc.Class({
279 cc.find("Desc/LabelVersion", this.node).getComponent(cc.Label).string = oJSONResult.resultSet[0].versions; 280 cc.find("Desc/LabelVersion", this.node).getComponent(cc.Label).string = oJSONResult.resultSet[0].versions;
280 cc.find("Desc/LabelSize", this.node).getComponent(cc.Label).string = oJSONResult.resultSet[0].size; 281 cc.find("Desc/LabelSize", this.node).getComponent(cc.Label).string = oJSONResult.resultSet[0].size;
281 cc.find("Desc/LabelTime", this.node).getComponent(cc.Label).string = oJSONResult.resultSet[0].updateTime; 282 cc.find("Desc/LabelTime", this.node).getComponent(cc.Label).string = oJSONResult.resultSet[0].updateTime;
283 //==========放到大屏显示问题
284 cc.find("FullDesc/Title", this.node).getComponent(cc.Label).string = oJSONResult.resultSet[0].name;
285 cc.find("FullDesc/Desc", this.node).getComponent(cc.Label).string = oJSONResult.resultSet[0].description;
286 //==========end
282 //这里给描述做拦截，防止字数多超出栏目 287 //这里给描述做拦截，防止字数多超出栏目
283 var description = oJSONResult.resultSet[0].description; 288 var description = oJSONResult.resultSet[0].description;
284 if (description.length > 110) { 289 if (description.length > 80) {
285 description = description.substring(0, 110) + "..."; 290 description = description.substring(0, 80) + "...";
286 } 291 }
287 cc.find("Desc/LabelDesc", this.node).getComponent(cc.Label).string = description; 292 cc.find("Desc/LabelDesc", this.node).getComponent(cc.Label).string = description;
288 //搞标签 293 //搞标签
...@@ -341,9 +346,17 @@ cc.Class({ ...@@ -341,9 +346,17 @@ cc.Class({
341 initFocus: function () { 346 initFocus: function () {
342 this._aFocusTargets[1] = []; 347 this._aFocusTargets[1] = [];
343 348
344 // let fiPic = cc.find('Pic', this.node).addComponent(FocusInfo); // 349 let fiPic = cc.find('Pic', this.node).addComponent(FocusInfo); //
345 // fiPic.init('', true, null, null, 1.0); 350 if (this._oSceneContext._downloadUrl && this._oSceneContext._downloadUrl != "undefined") {
346 // this._aFocusTargets[0]['pic'] = cc.find('Pic', this.node); 351 fiPic.init("{\"click\":[{\"action\":\"ChangeScene\",\"parameters\":{\"sceneName\":\"sceneGameLoading\",\"packageName\":\"" + this._oSceneContext._packageName + "\",\"className\":\"" + this._oSceneContext._className + "\",\"downloadUrl\":\"" + Common.TOPDRAW_API_SERVER + this._oSceneContext._downloadUrl + "\"}}]}", true, null, null, 1.0);
352 } else {
353 fiPic.init("{\"click\":[{\"action\":\"ChangeScene\",\"parameters\":{\"sceneName\":\"sceneGameLoading\",\"packageName\":\"" + this._oSceneContext._packageName + "\",\"className\":\"" + this._oSceneContext._className + "\",\"downloadUrl\":\"" + this._oSceneContext._downloadUrl + "\"}}]}", true, null, null, 1.0);
354 }
355 this._aFocusTargets[0]['pic'] = cc.find('Pic', this.node);
356
357 let fiDesc = cc.find('Desc/LabelDesc', this.node).addComponent(FocusInfo); //
358 fiDesc.init('', true, null, null, 1.0);
359 this._aFocusTargets[0]['desc'] = cc.find('Desc/LabelDesc', this.node);
347 360
348 let fiOpen = cc.find('ButtonOpen', this.node).addComponent(FocusInfo); // 361 let fiOpen = cc.find('ButtonOpen', this.node).addComponent(FocusInfo); //
349 if (this._oSceneContext._downloadUrl && this._oSceneContext._downloadUrl != "undefined") { 362 if (this._oSceneContext._downloadUrl && this._oSceneContext._downloadUrl != "undefined") {
...@@ -416,6 +429,7 @@ cc.Class({ ...@@ -416,6 +429,7 @@ cc.Class({
416 var fiFocusTarget = null; 429 var fiFocusTarget = null;
417 var fiCurrentFocus = this._fiCurrentFocus; 430 var fiCurrentFocus = this._fiCurrentFocus;
418 cc.find("FullView", this.node).active = false; 431 cc.find("FullView", this.node).active = false;
432 cc.find("FullDesc", this.node).active = false;
419 switch (event.keyCode) { 433 switch (event.keyCode) {
420 case cc.macro.KEY.up: 434 case cc.macro.KEY.up:
421 case Common.ANDROID_KEY.up: 435 case Common.ANDROID_KEY.up:
...@@ -445,9 +459,11 @@ cc.Class({ ...@@ -445,9 +459,11 @@ cc.Class({
445 cc.loader.loadRes(icon, cc.Texture2D, function (err, texture) { 459 cc.loader.loadRes(icon, cc.Texture2D, function (err, texture) {
446 self._fiCurrentFocus.node.getComponent(cc.Sprite).spriteFrame = new cc.SpriteFrame(texture, cc.rect(0, 56, self._fiCurrentFocus.node.width, 56)); 460 self._fiCurrentFocus.node.getComponent(cc.Sprite).spriteFrame = new cc.SpriteFrame(texture, cc.rect(0, 56, self._fiCurrentFocus.node.width, 56));
447 }); 461 });
448 } else if (0 == this._fiCurrentFocus.node.name.indexOf('Pic')) { 462 } else if (0 == this._fiCurrentFocus.node.name.indexOf('TypeListCell')) {
449 cc.find("FullView", this.node).active = true; 463 cc.find("FullView", this.node).active = true;
450 } else if (0 == this._fiCurrentFocus.node.name.indexOf('ButtonOpen')) { 464 } else if (0 == this._fiCurrentFocus.node.name.indexOf('LabelDesc')) {
465 cc.find("FullDesc", this.node).active = true;
466 } else if (0 == this._fiCurrentFocus.node.name.indexOf('ButtonOpen') || 0 == this._fiCurrentFocus.node.name.indexOf('Pic')) {
451 // this.commonSimpleTip("是否拿到数据： " + this._bInitExistApk); 467 // this.commonSimpleTip("是否拿到数据： " + this._bInitExistApk);
452 if (!this._bInitExistApk) { //还未拿到判断数据 468 if (!this._bInitExistApk) { //还未拿到判断数据
453 return; 469 return;
...@@ -530,7 +546,7 @@ cc.Class({ ...@@ -530,7 +546,7 @@ cc.Class({
530 }, 546 },
531 547
532 onAfterFocusChange: function (event) { 548 onAfterFocusChange: function (event) {
533 549 var self = this;
534 let fiTo = event.detail.to; 550 let fiTo = event.detail.to;
535 let fiFrom = event.detail.from; 551 let fiFrom = event.detail.from;
536 552
...@@ -555,6 +571,17 @@ cc.Class({ ...@@ -555,6 +571,17 @@ cc.Class({
555 fiTo.node.getComponent(cc.Sprite).spriteFrame = new cc.SpriteFrame(texture, cc.rect(0, 72, 572, 72)); 571 fiTo.node.getComponent(cc.Sprite).spriteFrame = new cc.SpriteFrame(texture, cc.rect(0, 72, 572, 72));
556 }); 572 });
557 } 573 }
574
575 if (0 == fiTo.node.getName().indexOf('TypeListCell')) {
576 let iIndex = fiTo.node.name.replace("TypeListCell", '');
577 if (this._oInit.aListImage[iIndex]) {
578 Network.loadImageInNativeRuntime(Common.TOPDRAW_IMAGE_SERVER + this._oInit.aListImage[iIndex].fileUrl, null,
579 function (texture) {
580 cc.find("FullView", self.node).getComponent(cc.Sprite).spriteFrame = new cc.SpriteFrame(texture);
581 }, function () { }, this
582 );
583 }
584 }
558 }, 585 },
559 586
560 }); 587 });
......
...@@ -75,7 +75,7 @@ cc.Class({ ...@@ -75,7 +75,7 @@ cc.Class({
75 this._bInitCategoryListSuccess = false; 75 this._bInitCategoryListSuccess = false;
76 this._bInitRecommendDataSuccess = false; 76 this._bInitRecommendDataSuccess = false;
77 this._scrollview = this.node.getComponent(cc.ScrollView); 77 this._scrollview = this.node.getComponent(cc.ScrollView);
78 this._oSceneContext.focusPath = "scrollContent/TopNavi/topNavi1"; 78 this._oSceneContext.focusPath = "scrollContent/RecommendLayout/ViewPager/Carousel0";
79 this._oSceneContext._iPageIndex = 1; 79 this._oSceneContext._iPageIndex = 1;
80 this._oSceneContext._iCurrentLeftIndex = 1; 80 this._oSceneContext._iCurrentLeftIndex = 1;
81 this._oSceneContext._iViewPagerIndex = 0; 81 this._oSceneContext._iViewPagerIndex = 0;
...@@ -116,7 +116,7 @@ cc.Class({ ...@@ -116,7 +116,7 @@ cc.Class({
116 116
117 //轮播图相关 117 //轮播图相关
118 initViewPager: function () { 118 initViewPager: function () {
119 var self=this; 119 var self = this;
120 this._pageView = cc.find('scrollContent/ViewPagerArea', this.node).getComponent(cc.PageView); 120 this._pageView = cc.find('scrollContent/ViewPagerArea', this.node).getComponent(cc.PageView);
121 Network.ajax("GET", Common.TOPDRAW_API_SERVER + "main/main_viewpager.json", null, null, 121 Network.ajax("GET", Common.TOPDRAW_API_SERVER + "main/main_viewpager.json", null, null,
122 function (strResponse) { 122 function (strResponse) {
...@@ -281,10 +281,10 @@ cc.Class({ ...@@ -281,10 +281,10 @@ cc.Class({
281 function (texture, iRequestId) { 281 function (texture, iRequestId) {
282 if (strCellName == "topNavi") { 282 if (strCellName == "topNavi") {
283 nodeNav.getChildByName("Pic").getComponent(cc.Sprite).spriteFrame = new cc.SpriteFrame(texture, cc.rect(0, 0, aTopNaviJson[i].width, aTopNaviJson[i].height)); 283 nodeNav.getChildByName("Pic").getComponent(cc.Sprite).spriteFrame = new cc.SpriteFrame(texture, cc.rect(0, 0, aTopNaviJson[i].width, aTopNaviJson[i].height));
284 if (i == 1 && 1 == this._oSceneContext._iCurrentLeftIndex && this._oSceneContext.focusPath != "scrollContent/TopNavi/topNavi1") {//恢复光标记忆不需要选中状态,将i先改为1，其他导航暂时不做光标记忆，有点复杂，后续考虑做。。。 284 if (i == this._oSceneContext._iCurrentLeftIndex && 1 != this._oSceneContext._iCurrentLeftIndex) {//恢复光标记忆不需要选中状态,将i先改为1，其他导航暂时不做光标记忆，有点复杂，后续考虑做。。。
285 nodeNav.getChildByName("Pic").getComponent(cc.Sprite).spriteFrame = new cc.SpriteFrame(texture, cc.rect(0, aTopNaviJson[i].height * 2, aTopNaviJson[i].width, aTopNaviJson[i].height));
286 } else if (i == this._oSceneContext._iCurrentLeftIndex) {
287 nodeNav.getChildByName("Pic").getComponent(cc.Sprite).spriteFrame = new cc.SpriteFrame(texture, cc.rect(0, aTopNaviJson[i].height, aTopNaviJson[i].width, aTopNaviJson[i].height)); 285 nodeNav.getChildByName("Pic").getComponent(cc.Sprite).spriteFrame = new cc.SpriteFrame(texture, cc.rect(0, aTopNaviJson[i].height, aTopNaviJson[i].width, aTopNaviJson[i].height));
286 } else if (i == this._oSceneContext._iCurrentLeftIndex) {
287 nodeNav.getChildByName("Pic").getComponent(cc.Sprite).spriteFrame = new cc.SpriteFrame(texture, cc.rect(0, aTopNaviJson[i].height * 2, aTopNaviJson[i].width, aTopNaviJson[i].height));
288 } 288 }
289 } else { 289 } else {
290 nodeNav.getChildByName("Pic").getComponent(cc.Sprite).spriteFrame = new cc.SpriteFrame(texture, cc.rect(0, 0, aTopNaviJson[i].width, aTopNaviJson[i].height)); 290 nodeNav.getChildByName("Pic").getComponent(cc.Sprite).spriteFrame = new cc.SpriteFrame(texture, cc.rect(0, 0, aTopNaviJson[i].width, aTopNaviJson[i].height));
...@@ -1018,11 +1018,11 @@ cc.Class({ ...@@ -1018,11 +1018,11 @@ cc.Class({
1018 this._oSceneContext._iPageIndex--; 1018 this._oSceneContext._iPageIndex--;
1019 let height = this._aBgHeight[this._oSceneContext._iPageIndex - 1] || 0; //520,750,1177,1463,1737,2119,2239 1019 let height = this._aBgHeight[this._oSceneContext._iPageIndex - 1] || 0; //520,750,1177,1463,1737,2119,2239
1020 this.onScrollViewScrollStart(); 1020 this.onScrollViewScrollStart();
1021 this._scrollview.scrollToOffset(cc.v2(0, height), 0.5); 1021 this._scrollview.scrollToOffset(cc.v2(0, height), 0.4);
1022 // cc.log("滚动到：" + height); 1022 // cc.log("滚动到：" + height);
1023 this.scheduleOnce(function () { 1023 this.scheduleOnce(function () {
1024 this.keyDownDirection(Common.MOVE_DIRECTION_UP); 1024 this.keyDownDirection(Common.MOVE_DIRECTION_UP);
1025 }, 0.4); 1025 }, 0.3);
1026 // setTimeout(function () { 1026 // setTimeout(function () {
1027 // this.keyDownDirection(Common.MOVE_DIRECTION_UP); 1027 // this.keyDownDirection(Common.MOVE_DIRECTION_UP);
1028 // }.bind(this), 300); 1028 // }.bind(this), 300);
...@@ -1082,12 +1082,12 @@ cc.Class({ ...@@ -1082,12 +1082,12 @@ cc.Class({
1082 //---------------------------------------------------------------------- 1082 //----------------------------------------------------------------------
1083 let height = this._aBgHeight[this._oSceneContext._iPageIndex] || 0; //520,750,1177,1463,1737,2119,2239 1083 let height = this._aBgHeight[this._oSceneContext._iPageIndex] || 0; //520,750,1177,1463,1737,2119,2239
1084 this.onScrollViewScrollStart(); 1084 this.onScrollViewScrollStart();
1085 this._scrollview.scrollToOffset(cc.v2(0, height), 0.5); 1085 this._scrollview.scrollToOffset(cc.v2(0, height), 0.4);
1086 // cc.log("滚动到："+height); 1086 // cc.log("滚动到："+height);
1087 this._oSceneContext._iPageIndex++; 1087 this._oSceneContext._iPageIndex++;
1088 this.scheduleOnce(function () { 1088 this.scheduleOnce(function () {
1089 this.keyDownDirection(Common.MOVE_DIRECTION_DOWN); 1089 this.keyDownDirection(Common.MOVE_DIRECTION_DOWN);
1090 }, 0.4); 1090 }, 0.3);
1091 // setTimeout(function () { 1091 // setTimeout(function () {
1092 // this.keyDownDirection(Common.MOVE_DIRECTION_DOWN); 1092 // this.keyDownDirection(Common.MOVE_DIRECTION_DOWN);
1093 // }.bind(this), 300); 1093 // }.bind(this), 300);
......
...@@ -14,11 +14,11 @@ ...@@ -14,11 +14,11 @@
14 "size": 74263, 14 "size": 74263,
15 "enable": true, 15 "enable": true,
16 "name": "b2b1bb5f-a956-4930-9273-eb72920a9faa.png", 16 "name": "b2b1bb5f-a956-4930-9273-eb72920a9faa.png",
17 "fileUrl": "upload/image/category//icon_top1.png", 17 "fileUrl": "upload/image/category/icon_top1.png",
18 "id": 7509, 18 "id": 7509,
19 "type": 2, 19 "type": 2,
20 "width": 236, 20 "width": 202,
21 "height": 100 21 "height": 94
22 } 22 }
23 ] 23 ]
24 }, 24 },
...@@ -31,11 +31,11 @@ ...@@ -31,11 +31,11 @@
31 "size": 74263, 31 "size": 74263,
32 "enable": true, 32 "enable": true,
33 "name": "b2b1bb5f-a956-4930-9273-eb72920a9faa.png", 33 "name": "b2b1bb5f-a956-4930-9273-eb72920a9faa.png",
34 "fileUrl": "upload/image/category//icon_top2.png", 34 "fileUrl": "upload/image/category/icon_top2.png",
35 "id": 7509, 35 "id": 7509,
36 "type": 2, 36 "type": 2,
37 "width": 236, 37 "width": 202,
38 "height": 100 38 "height": 94
39 } 39 }
40 ] 40 ]
41 }, 41 },
...@@ -48,11 +48,11 @@ ...@@ -48,11 +48,11 @@
48 "size": 74263, 48 "size": 74263,
49 "enable": true, 49 "enable": true,
50 "name": "b2b1bb5f-a956-4930-9273-eb72920a9faa.png", 50 "name": "b2b1bb5f-a956-4930-9273-eb72920a9faa.png",
51 "fileUrl": "upload/image/category//icon_top3.png", 51 "fileUrl": "upload/image/category/icon_top3.png",
52 "id": 7509, 52 "id": 7509,
53 "type": 2, 53 "type": 2,
54 "width": 236, 54 "width": 202,
55 "height": 100 55 "height": 94
56 } 56 }
57 ] 57 ]
58 }, 58 },
...@@ -65,11 +65,11 @@ ...@@ -65,11 +65,11 @@
65 "size": 74263, 65 "size": 74263,
66 "enable": true, 66 "enable": true,
67 "name": "b2b1bb5f-a956-4930-9273-eb72920a9faa.png", 67 "name": "b2b1bb5f-a956-4930-9273-eb72920a9faa.png",
68 "fileUrl": "upload/image/category//icon_top4.png", 68 "fileUrl": "upload/image/category/icon_top4.png",
69 "id": 7509, 69 "id": 7509,
70 "type": 2, 70 "type": 2,
71 "width": 236, 71 "width": 202,
72 "height": 100 72 "height": 94
73 } 73 }
74 ] 74 ]
75 }, 75 },
...@@ -82,11 +82,28 @@ ...@@ -82,11 +82,28 @@
82 "size": 74263, 82 "size": 74263,
83 "enable": true, 83 "enable": true,
84 "name": "b2b1bb5f-a956-4930-9273-eb72920a9faa.png", 84 "name": "b2b1bb5f-a956-4930-9273-eb72920a9faa.png",
85 "fileUrl": "upload/image/category//icon_top5.png", 85 "fileUrl": "upload/image/category/icon_top5.png",
86 "id": 7509, 86 "id": 7509,
87 "type": 2, 87 "type": 2,
88 "width": 236, 88 "width": 202,
89 "height": 100 89 "height": 94
90 }
91 ]
92 },
93 {
94 "name": "巅峰对决",
95 "image": [
96 {
97 "extension": ".png",
98 "code": "image_e9fea105-0412-4600-a0f1-f606a003c63f",
99 "size": 74263,
100 "enable": true,
101 "name": "b2b1bb5f-a956-4930-9273-eb72920a9faa.png",
102 "fileUrl": "upload/image/category/icon_top6.png",
103 "id": 7509,
104 "type": 2,
105 "width": 202,
106 "height": 94
90 } 107 }
91 ] 108 ]
92 } 109 }
......
...@@ -125,37 +125,37 @@ ...@@ -125,37 +125,37 @@
125 { 125 {
126 "name": "Subject1", 126 "name": "Subject1",
127 "imageURL": "upload/image/main/block4_1.png", 127 "imageURL": "upload/image/main/block4_1.png",
128 "tvlink": "{\"click\":[{\"action\":\"ChangeScene\",\"parameters\":{\"sceneName\":\"sceneGameCategory\"}}]}", 128 "tvlink": "{\"click\":[{\"action\":\"ChangeScene\",\"parameters\":{\"sceneName\":\"sceneGameCategory\",\"currentIndex\":\"0\"}}]}",
129 "code": "promotionItem_e432ac2d-c1f3-4daehr4w5g4w5yh4w5yh" 129 "code": "promotionItem_e432ac2d-c1f3-4daehr4w5g4w5yh4w5yh"
130 }, 130 },
131 { 131 {
132 "name": "Subject2", 132 "name": "Subject2",
133 "imageURL": "upload/image/main/block4_2.png", 133 "imageURL": "upload/image/main/block4_2.png",
134 "tvlink": "{\"click\":[{\"action\":\"ChangeScene\",\"parameters\":{\"sceneName\":\"sceneGameCategory\"}}]}", 134 "tvlink": "{\"click\":[{\"action\":\"ChangeScene\",\"parameters\":{\"sceneName\":\"sceneGameCategory\",\"currentIndex\":\"1\"}}]}",
135 "code": "promotionItem_f90b7ff3-1f36-401erhb54wyh4th" 135 "code": "promotionItem_f90b7ff3-1f36-401erhb54wyh4th"
136 }, 136 },
137 { 137 {
138 "name": "Subject3", 138 "name": "Subject3",
139 "imageURL": "upload/image/main/block4_3.png", 139 "imageURL": "upload/image/main/block4_3.png",
140 "tvlink": "{\"click\":[{\"action\":\"ChangeScene\",\"parameters\":{\"sceneName\":\"sceneGameCategory\"}}]}", 140 "tvlink": "{\"click\":[{\"action\":\"ChangeScene\",\"parameters\":{\"sceneName\":\"sceneGameCategory\",\"currentIndex\":\"2\"}}]}",
141 "code": "promotionItem_e29b33e4-8954-4eerthy6rthg54er" 141 "code": "promotionItem_e29b33e4-8954-4eerthy6rthg54er"
142 }, 142 },
143 { 143 {
144 "name": "Subject4", 144 "name": "Subject4",
145 "imageURL": "upload/image/main/block4_4.png", 145 "imageURL": "upload/image/main/block4_4.png",
146 "tvlink": "{\"click\":[{\"action\":\"ChangeScene\",\"parameters\":{\"sceneName\":\"sceneGameCategory\"}}]}", 146 "tvlink": "{\"click\":[{\"action\":\"ChangeScene\",\"parameters\":{\"sceneName\":\"sceneGameCategory\",\"currentIndex\":\"3\"}}]}",
147 "code": "promotionItem_e29b33e4-8954-vwregv54thw6" 147 "code": "promotionItem_e29b33e4-8954-vwregv54thw6"
148 }, 148 },
149 { 149 {
150 "name": "Subject5", 150 "name": "Subject5",
151 "imageURL": "upload/image/main/block4_5.png", 151 "imageURL": "upload/image/main/block4_5.png",
152 "tvlink": "{\"click\":[{\"action\":\"ChangeScene\",\"parameters\":{\"sceneName\":\"sceneGameCategory\"}}]}", 152 "tvlink": "{\"click\":[{\"action\":\"ChangeScene\",\"parameters\":{\"sceneName\":\"sceneGameCategory\",\"currentIndex\":\"4\"}}]}",
153 "code": "promotionItem_e29b33e4-8954-bq4wrjhwbt4t" 153 "code": "promotionItem_e29b33e4-8954-bq4wrjhwbt4t"
154 }, 154 },
155 { 155 {
156 "name": "Subject6", 156 "name": "Subject6",
157 "imageURL": "upload/image/main/block4_6.png", 157 "imageURL": "upload/image/main/block4_6.png",
158 "tvlink": "{\"click\":[{\"action\":\"ChangeScene\",\"parameters\":{\"sceneName\":\"sceneGameCategory\"}}]}", 158 "tvlink": "{\"click\":[{\"action\":\"ChangeScene\",\"parameters\":{\"sceneName\":\"sceneGameCategory\",\"currentIndex\":\"5\"}}]}",
159 "code": "promotionItem_57aea4b3-7716-4we5j56trhgser2" 159 "code": "promotionItem_57aea4b3-7716-4we5j56trhgser2"
160 } 160 }
161 ] 161 ]
......