Skip to content

apk_product / ForFun

Go to a project
Toggle navigation
Toggle navigation pinning
Commit 31fc8e35 31fc8e35e144fb6e411b78bb7125df9955ce5089 by 金学艇
Options

1.修改了视频详情页

1 parent 12218b03
Inline Side-by-side
Showing 3 changed files with 182 additions and 121 deletions
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
57 "_is3DNode": true, 57 "_is3DNode": true,
58 "_groupIndex": 0, 58 "_groupIndex": 0,
59 "groupIndex": 0, 59 "groupIndex": 0,
60 "autoReleaseAssets": false, 60 "autoReleaseAssets": true,
61 "_id": "704d4ab7-0300-44ac-9b6e-ba3076e019c9" 61 "_id": "704d4ab7-0300-44ac-9b6e-ba3076e019c9"
62 }, 62 },
63 { 63 {
...@@ -96,28 +96,28 @@ ...@@ -96,28 +96,28 @@
96 "__id__": 35 96 "__id__": 35
97 }, 97 },
98 { 98 {
99 "__id__": 40 99 "__id__": 41
100 }, 100 },
101 { 101 {
102 "__id__": 54 102 "__id__": 55
103 }, 103 },
104 { 104 {
105 "__id__": 62 105 "__id__": 63
106 }, 106 },
107 { 107 {
108 "__id__": 68 108 "__id__": 69
109 }, 109 },
110 { 110 {
111 "__id__": 57 111 "__id__": 58
112 } 112 }
113 ], 113 ],
114 "_active": true, 114 "_active": true,
115 "_components": [ 115 "_components": [
116 { 116 {
117 "__id__": 77 117 "__id__": 78
118 }, 118 },
119 { 119 {
120 "__id__": 78 120 "__id__": 79
121 } 121 }
122 ], 122 ],
123 "_prefab": null, 123 "_prefab": null,
...@@ -207,7 +207,7 @@ ...@@ -207,7 +207,7 @@
207 "array": [ 207 "array": [
208 0, 208 0,
209 0, 209 0,
210 265.0037841796875, 210 247.68325805664062,
211 0, 211 0,
212 0, 212 0,
213 0, 213 0,
...@@ -1542,7 +1542,7 @@ ...@@ -1542,7 +1542,7 @@
1542 "_active": true, 1542 "_active": true,
1543 "_components": [ 1543 "_components": [
1544 { 1544 {
1545 "__id__": 39 1545 "__id__": 40
1546 } 1546 }
1547 ], 1547 ],
1548 "_prefab": null, 1548 "_prefab": null,
...@@ -1620,7 +1620,7 @@ ...@@ -1620,7 +1620,7 @@
1620 "_active": true, 1620 "_active": true,
1621 "_components": [ 1621 "_components": [
1622 { 1622 {
1623 "__id__": 38 1623 "__id__": 39
1624 } 1624 }
1625 ], 1625 ],
1626 "_prefab": null, 1626 "_prefab": null,
...@@ -1634,7 +1634,7 @@ ...@@ -1634,7 +1634,7 @@
1634 }, 1634 },
1635 "_contentSize": { 1635 "_contentSize": {
1636 "__type__": "cc.Size", 1636 "__type__": "cc.Size",
1637 "width": 1236, 1637 "width": 1216,
1638 "height": 180 1638 "height": 180
1639 }, 1639 },
1640 "_anchorPoint": { 1640 "_anchorPoint": {
...@@ -1658,7 +1658,7 @@ ...@@ -1658,7 +1658,7 @@
1658 "__type__": "TypedArray", 1658 "__type__": "TypedArray",
1659 "ctor": "Float32Array", 1659 "ctor": "Float32Array",
1660 "array": [ 1660 "array": [
1661 -628, 1661 -608,
1662 0, 1662 0,
1663 0, 1663 0,
1664 0, 1664 0,
...@@ -1692,7 +1692,11 @@ ...@@ -1692,7 +1692,11 @@
1692 }, 1692 },
1693 "_children": [], 1693 "_children": [],
1694 "_active": true, 1694 "_active": true,
1695 "_components": [], 1695 "_components": [
1696 {
1697 "__id__": 38
1698 }
1699 ],
1696 "_prefab": null, 1700 "_prefab": null,
1697 "_opacity": 255, 1701 "_opacity": 255,
1698 "_color": { 1702 "_color": {
...@@ -1704,7 +1708,7 @@ ...@@ -1704,7 +1708,7 @@
1704 }, 1708 },
1705 "_contentSize": { 1709 "_contentSize": {
1706 "__type__": "cc.Size", 1710 "__type__": "cc.Size",
1707 "width": 1176, 1711 "width": 1216,
1708 "height": 0 1712 "height": 0
1709 }, 1713 },
1710 "_anchorPoint": { 1714 "_anchorPoint": {
...@@ -1728,7 +1732,7 @@ ...@@ -1728,7 +1732,7 @@
1728 "__type__": "TypedArray", 1732 "__type__": "TypedArray",
1729 "ctor": "Float32Array", 1733 "ctor": "Float32Array",
1730 "array": [ 1734 "array": [
1731 20, 1735 0,
1732 0, 1736 0,
1733 0, 1737 0,
1734 0, 1738 0,
...@@ -1754,6 +1758,39 @@ ...@@ -1754,6 +1758,39 @@
1754 "_id": "f5Z3KDl6xH3L5s0OCNIyOO" 1758 "_id": "f5Z3KDl6xH3L5s0OCNIyOO"
1755 }, 1759 },
1756 { 1760 {
1761 "__type__": "cc.Layout",
1762 "_name": "",
1763 "_objFlags": 0,
1764 "node": {
1765 "__id__": 37
1766 },
1767 "_enabled": true,
1768 "_layoutSize": {
1769 "__type__": "cc.Size",
1770 "width": 1216,
1771 "height": 0
1772 },
1773 "_resize": 1,
1774 "_N$layoutType": 1,
1775 "_N$padding": 0,
1776 "_N$cellSize": {
1777 "__type__": "cc.Size",
1778 "width": 40,
1779 "height": 40
1780 },
1781 "_N$startAxis": 0,
1782 "_N$paddingLeft": 0,
1783 "_N$paddingRight": 0,
1784 "_N$paddingTop": 0,
1785 "_N$paddingBottom": 0,
1786 "_N$spacingX": 0,
1787 "_N$spacingY": 0,
1788 "_N$verticalDirection": 1,
1789 "_N$horizontalDirection": 0,
1790 "_N$affectedByScale": false,
1791 "_id": "58UJyIFoBCB7aBzEf896AG"
1792 },
1793 {
1757 "__type__": "cc.Mask", 1794 "__type__": "cc.Mask",
1758 "_name": "", 1795 "_name": "",
1759 "_objFlags": 0, 1796 "_objFlags": 0,
...@@ -1811,22 +1848,22 @@ ...@@ -1811,22 +1848,22 @@
1811 }, 1848 },
1812 "_children": [ 1849 "_children": [
1813 { 1850 {
1814 "__id__": 41 1851 "__id__": 42
1815 }, 1852 },
1816 { 1853 {
1817 "__id__": 44 1854 "__id__": 45
1818 }, 1855 },
1819 { 1856 {
1820 "__id__": 47 1857 "__id__": 48
1821 }, 1858 },
1822 { 1859 {
1823 "__id__": 50 1860 "__id__": 51
1824 } 1861 }
1825 ], 1862 ],
1826 "_active": false, 1863 "_active": false,
1827 "_components": [ 1864 "_components": [
1828 { 1865 {
1829 "__id__": 53 1866 "__id__": 54
1830 } 1867 }
1831 ], 1868 ],
1832 "_prefab": null, 1869 "_prefab": null,
...@@ -1882,16 +1919,16 @@ ...@@ -1882,16 +1919,16 @@
1882 "_name": "New Sprite(Splash)", 1919 "_name": "New Sprite(Splash)",
1883 "_objFlags": 0, 1920 "_objFlags": 0,
1884 "_parent": { 1921 "_parent": {
1885 "__id__": 40 1922 "__id__": 41
1886 }, 1923 },
1887 "_children": [], 1924 "_children": [],
1888 "_active": true, 1925 "_active": true,
1889 "_components": [ 1926 "_components": [
1890 { 1927 {
1891 "__id__": 42 1928 "__id__": 43
1892 }, 1929 },
1893 { 1930 {
1894 "__id__": 43 1931 "__id__": 44
1895 } 1932 }
1896 ], 1933 ],
1897 "_prefab": null, 1934 "_prefab": null,
...@@ -1947,7 +1984,7 @@ ...@@ -1947,7 +1984,7 @@
1947 "_name": "", 1984 "_name": "",
1948 "_objFlags": 0, 1985 "_objFlags": 0,
1949 "node": { 1986 "node": {
1950 "__id__": 41 1987 "__id__": 42
1951 }, 1988 },
1952 "_enabled": true, 1989 "_enabled": true,
1953 "_materials": [ 1990 "_materials": [
...@@ -1979,7 +2016,7 @@ ...@@ -1979,7 +2016,7 @@
1979 "_name": "", 2016 "_name": "",
1980 "_objFlags": 0, 2017 "_objFlags": 0,
1981 "node": { 2018 "node": {
1982 "__id__": 41 2019 "__id__": 42
1983 }, 2020 },
1984 "_enabled": true, 2021 "_enabled": true,
1985 "alignMode": 1, 2022 "alignMode": 1,
...@@ -2006,16 +2043,16 @@ ...@@ -2006,16 +2043,16 @@
2006 "_name": "Title", 2043 "_name": "Title",
2007 "_objFlags": 0, 2044 "_objFlags": 0,
2008 "_parent": { 2045 "_parent": {
2009 "__id__": 40 2046 "__id__": 41
2010 }, 2047 },
2011 "_children": [], 2048 "_children": [],
2012 "_active": true, 2049 "_active": true,
2013 "_components": [ 2050 "_components": [
2014 { 2051 {
2015 "__id__": 45 2052 "__id__": 46
2016 }, 2053 },
2017 { 2054 {
2018 "__id__": 46 2055 "__id__": 47
2019 } 2056 }
2020 ], 2057 ],
2021 "_prefab": null, 2058 "_prefab": null,
...@@ -2071,7 +2108,7 @@ ...@@ -2071,7 +2108,7 @@
2071 "_name": "", 2108 "_name": "",
2072 "_objFlags": 0, 2109 "_objFlags": 0,
2073 "node": { 2110 "node": {
2074 "__id__": 44 2111 "__id__": 45
2075 }, 2112 },
2076 "_enabled": true, 2113 "_enabled": true,
2077 "_materials": [ 2114 "_materials": [
...@@ -2101,7 +2138,7 @@ ...@@ -2101,7 +2138,7 @@
2101 "_name": "", 2138 "_name": "",
2102 "_objFlags": 0, 2139 "_objFlags": 0,
2103 "node": { 2140 "node": {
2104 "__id__": 44 2141 "__id__": 45
2105 }, 2142 },
2106 "_enabled": true, 2143 "_enabled": true,
2107 "alignMode": 1, 2144 "alignMode": 1,
...@@ -2128,16 +2165,16 @@ ...@@ -2128,16 +2165,16 @@
2128 "_name": "Desc", 2165 "_name": "Desc",
2129 "_objFlags": 0, 2166 "_objFlags": 0,
2130 "_parent": { 2167 "_parent": {
2131 "__id__": 40 2168 "__id__": 41
2132 }, 2169 },
2133 "_children": [], 2170 "_children": [],
2134 "_active": true, 2171 "_active": true,
2135 "_components": [ 2172 "_components": [
2136 { 2173 {
2137 "__id__": 48 2174 "__id__": 49
2138 }, 2175 },
2139 { 2176 {
2140 "__id__": 49 2177 "__id__": 50
2141 } 2178 }
2142 ], 2179 ],
2143 "_prefab": null, 2180 "_prefab": null,
...@@ -2193,7 +2230,7 @@ ...@@ -2193,7 +2230,7 @@
2193 "_name": "", 2230 "_name": "",
2194 "_objFlags": 0, 2231 "_objFlags": 0,
2195 "node": { 2232 "node": {
2196 "__id__": 47 2233 "__id__": 48
2197 }, 2234 },
2198 "_enabled": true, 2235 "_enabled": true,
2199 "_materials": [ 2236 "_materials": [
...@@ -2223,7 +2260,7 @@ ...@@ -2223,7 +2260,7 @@
2223 "_name": "", 2260 "_name": "",
2224 "_objFlags": 0, 2261 "_objFlags": 0,
2225 "node": { 2262 "node": {
2226 "__id__": 47 2263 "__id__": 48
2227 }, 2264 },
2228 "_enabled": true, 2265 "_enabled": true,
2229 "alignMode": 1, 2266 "alignMode": 1,
...@@ -2250,16 +2287,16 @@ ...@@ -2250,16 +2287,16 @@
2250 "_name": "New Sprite(Splash)", 2287 "_name": "New Sprite(Splash)",
2251 "_objFlags": 0, 2288 "_objFlags": 0,
2252 "_parent": { 2289 "_parent": {
2253 "__id__": 40 2290 "__id__": 41
2254 }, 2291 },
2255 "_children": [], 2292 "_children": [],
2256 "_active": true, 2293 "_active": true,
2257 "_components": [ 2294 "_components": [
2258 { 2295 {
2259 "__id__": 51 2296 "__id__": 52
2260 }, 2297 },
2261 { 2298 {
2262 "__id__": 52 2299 "__id__": 53
2263 } 2300 }
2264 ], 2301 ],
2265 "_prefab": null, 2302 "_prefab": null,
...@@ -2315,7 +2352,7 @@ ...@@ -2315,7 +2352,7 @@
2315 "_name": "", 2352 "_name": "",
2316 "_objFlags": 0, 2353 "_objFlags": 0,
2317 "node": { 2354 "node": {
2318 "__id__": 50 2355 "__id__": 51
2319 }, 2356 },
2320 "_enabled": true, 2357 "_enabled": true,
2321 "_materials": [ 2358 "_materials": [
...@@ -2347,7 +2384,7 @@ ...@@ -2347,7 +2384,7 @@
2347 "_name": "", 2384 "_name": "",
2348 "_objFlags": 0, 2385 "_objFlags": 0,
2349 "node": { 2386 "node": {
2350 "__id__": 50 2387 "__id__": 51
2351 }, 2388 },
2352 "_enabled": true, 2389 "_enabled": true,
2353 "alignMode": 1, 2390 "alignMode": 1,
...@@ -2374,7 +2411,7 @@ ...@@ -2374,7 +2411,7 @@
2374 "_name": "", 2411 "_name": "",
2375 "_objFlags": 0, 2412 "_objFlags": 0,
2376 "node": { 2413 "node": {
2377 "__id__": 40 2414 "__id__": 41
2378 }, 2415 },
2379 "_enabled": true, 2416 "_enabled": true,
2380 "_materials": [ 2417 "_materials": [
...@@ -2412,10 +2449,10 @@ ...@@ -2412,10 +2449,10 @@
2412 "_active": true, 2449 "_active": true,
2413 "_components": [ 2450 "_components": [
2414 { 2451 {
2415 "__id__": 55 2452 "__id__": 56
2416 }, 2453 },
2417 { 2454 {
2418 "__id__": 61 2455 "__id__": 62
2419 } 2456 }
2420 ], 2457 ],
2421 "_prefab": null, 2458 "_prefab": null,
...@@ -2471,14 +2508,14 @@ ...@@ -2471,14 +2508,14 @@
2471 "_name": "", 2508 "_name": "",
2472 "_objFlags": 0, 2509 "_objFlags": 0,
2473 "node": { 2510 "node": {
2474 "__id__": 54 2511 "__id__": 55
2475 }, 2512 },
2476 "_enabled": true, 2513 "_enabled": true,
2477 "videoPlayer1": null, 2514 "videoPlayer1": null,
2478 "currentTime": null, 2515 "currentTime": null,
2479 "totalTime": null, 2516 "totalTime": null,
2480 "loadingIcon": { 2517 "loadingIcon": {
2481 "__id__": 56 2518 "__id__": 57
2482 }, 2519 },
2483 "now": 0, 2520 "now": 0,
2484 "duration": 0, 2521 "duration": 0,
...@@ -2492,16 +2529,16 @@ ...@@ -2492,16 +2529,16 @@
2492 "_name": "LoadingIcon", 2529 "_name": "LoadingIcon",
2493 "_objFlags": 0, 2530 "_objFlags": 0,
2494 "_parent": { 2531 "_parent": {
2495 "__id__": 57 2532 "__id__": 58
2496 }, 2533 },
2497 "_children": [], 2534 "_children": [],
2498 "_active": true, 2535 "_active": true,
2499 "_components": [ 2536 "_components": [
2500 { 2537 {
2501 "__id__": 59 2538 "__id__": 60
2502 }, 2539 },
2503 { 2540 {
2504 "__id__": 60 2541 "__id__": 61
2505 } 2542 }
2506 ], 2543 ],
2507 "_prefab": null, 2544 "_prefab": null,
...@@ -2561,13 +2598,13 @@ ...@@ -2561,13 +2598,13 @@
2561 }, 2598 },
2562 "_children": [ 2599 "_children": [
2563 { 2600 {
2564 "__id__": 56 2601 "__id__": 57
2565 } 2602 }
2566 ], 2603 ],
2567 "_active": true, 2604 "_active": true,
2568 "_components": [ 2605 "_components": [
2569 { 2606 {
2570 "__id__": 58 2607 "__id__": 59
2571 } 2608 }
2572 ], 2609 ],
2573 "_prefab": null, 2610 "_prefab": null,
...@@ -2623,7 +2660,7 @@ ...@@ -2623,7 +2660,7 @@
2623 "_name": "", 2660 "_name": "",
2624 "_objFlags": 0, 2661 "_objFlags": 0,
2625 "node": { 2662 "node": {
2626 "__id__": 57 2663 "__id__": 58
2627 }, 2664 },
2628 "_enabled": true, 2665 "_enabled": true,
2629 "alignMode": 1, 2666 "alignMode": 1,
...@@ -2650,7 +2687,7 @@ ...@@ -2650,7 +2687,7 @@
2650 "_name": "", 2687 "_name": "",
2651 "_objFlags": 0, 2688 "_objFlags": 0,
2652 "node": { 2689 "node": {
2653 "__id__": 56 2690 "__id__": 57
2654 }, 2691 },
2655 "_enabled": true, 2692 "_enabled": true,
2656 "_materials": [ 2693 "_materials": [
...@@ -2682,7 +2719,7 @@ ...@@ -2682,7 +2719,7 @@
2682 "_name": "", 2719 "_name": "",
2683 "_objFlags": 0, 2720 "_objFlags": 0,
2684 "node": { 2721 "node": {
2685 "__id__": 56 2722 "__id__": 57
2686 }, 2723 },
2687 "_enabled": true, 2724 "_enabled": true,
2688 "_defaultClip": { 2725 "_defaultClip": {
...@@ -2701,7 +2738,7 @@ ...@@ -2701,7 +2738,7 @@
2701 "_name": "", 2738 "_name": "",
2702 "_objFlags": 0, 2739 "_objFlags": 0,
2703 "node": { 2740 "node": {
2704 "__id__": 54 2741 "__id__": 55
2705 }, 2742 },
2706 "_enabled": true, 2743 "_enabled": true,
2707 "alignMode": 1, 2744 "alignMode": 1,
...@@ -2734,16 +2771,16 @@ ...@@ -2734,16 +2771,16 @@
2734 }, 2771 },
2735 "_children": [ 2772 "_children": [
2736 { 2773 {
2737 "__id__": 63 2774 "__id__": 64
2738 }, 2775 },
2739 { 2776 {
2740 "__id__": 65 2777 "__id__": 66
2741 } 2778 }
2742 ], 2779 ],
2743 "_active": true, 2780 "_active": true,
2744 "_components": [ 2781 "_components": [
2745 { 2782 {
2746 "__id__": 67 2783 "__id__": 68
2747 } 2784 }
2748 ], 2785 ],
2749 "_prefab": null, 2786 "_prefab": null,
...@@ -2811,13 +2848,13 @@ ...@@ -2811,13 +2848,13 @@
2811 "_name": "GraphicsLine", 2848 "_name": "GraphicsLine",
2812 "_objFlags": 0, 2849 "_objFlags": 0,
2813 "_parent": { 2850 "_parent": {
2814 "__id__": 62 2851 "__id__": 63
2815 }, 2852 },
2816 "_children": [], 2853 "_children": [],
2817 "_active": true, 2854 "_active": true,
2818 "_components": [ 2855 "_components": [
2819 { 2856 {
2820 "__id__": 64 2857 "__id__": 65
2821 } 2858 }
2822 ], 2859 ],
2823 "_prefab": null, 2860 "_prefab": null,
...@@ -2885,7 +2922,7 @@ ...@@ -2885,7 +2922,7 @@
2885 "_name": "", 2922 "_name": "",
2886 "_objFlags": 0, 2923 "_objFlags": 0,
2887 "node": { 2924 "node": {
2888 "__id__": 63 2925 "__id__": 64
2889 }, 2926 },
2890 "_enabled": true, 2927 "_enabled": true,
2891 "_materials": [ 2928 "_materials": [
...@@ -2918,11 +2955,11 @@ ...@@ -2918,11 +2955,11 @@
2918 "_name": "EpisodeListWrapper", 2955 "_name": "EpisodeListWrapper",
2919 "_objFlags": 0, 2956 "_objFlags": 0,
2920 "_parent": { 2957 "_parent": {
2921 "__id__": 62 2958 "__id__": 63
2922 }, 2959 },
2923 "_children": [ 2960 "_children": [
2924 { 2961 {
2925 "__id__": 66 2962 "__id__": 67
2926 } 2963 }
2927 ], 2964 ],
2928 "_active": true, 2965 "_active": true,
...@@ -2938,7 +2975,7 @@ ...@@ -2938,7 +2975,7 @@
2938 }, 2975 },
2939 "_contentSize": { 2976 "_contentSize": {
2940 "__type__": "cc.Size", 2977 "__type__": "cc.Size",
2941 "width": 1230, 2978 "width": 1216,
2942 "height": 80 2979 "height": 80
2943 }, 2980 },
2944 "_anchorPoint": { 2981 "_anchorPoint": {
...@@ -2962,7 +2999,7 @@ ...@@ -2962,7 +2999,7 @@
2962 "__type__": "TypedArray", 2999 "__type__": "TypedArray",
2963 "ctor": "Float32Array", 3000 "ctor": "Float32Array",
2964 "array": [ 3001 "array": [
2965 -14, 3002 0,
2966 0, 3003 0,
2967 0, 3004 0,
2968 0, 3005 0,
...@@ -2992,7 +3029,7 @@ ...@@ -2992,7 +3029,7 @@
2992 "_name": "EpisodeList", 3029 "_name": "EpisodeList",
2993 "_objFlags": 0, 3030 "_objFlags": 0,
2994 "_parent": { 3031 "_parent": {
2995 "__id__": 65 3032 "__id__": 66
2996 }, 3033 },
2997 "_children": [], 3034 "_children": [],
2998 "_active": true, 3035 "_active": true,
...@@ -3032,7 +3069,7 @@ ...@@ -3032,7 +3069,7 @@
3032 "__type__": "TypedArray", 3069 "__type__": "TypedArray",
3033 "ctor": "Float32Array", 3070 "ctor": "Float32Array",
3034 "array": [ 3071 "array": [
3035 14, 3072 0,
3036 0, 3073 0,
3037 0, 3074 0,
3038 0, 3075 0,
...@@ -3062,7 +3099,7 @@ ...@@ -3062,7 +3099,7 @@
3062 "_name": "", 3099 "_name": "",
3063 "_objFlags": 0, 3100 "_objFlags": 0,
3064 "node": { 3101 "node": {
3065 "__id__": 62 3102 "__id__": 63
3066 }, 3103 },
3067 "_enabled": true, 3104 "_enabled": true,
3068 "alignMode": 1, 3105 "alignMode": 1,
...@@ -3093,19 +3130,19 @@ ...@@ -3093,19 +3130,19 @@
3093 }, 3130 },
3094 "_children": [ 3131 "_children": [
3095 { 3132 {
3096 "__id__": 69 3133 "__id__": 70
3097 }, 3134 },
3098 { 3135 {
3099 "__id__": 72 3136 "__id__": 73
3100 }, 3137 },
3101 { 3138 {
3102 "__id__": 74 3139 "__id__": 75
3103 } 3140 }
3104 ], 3141 ],
3105 "_active": true, 3142 "_active": true,
3106 "_components": [ 3143 "_components": [
3107 { 3144 {
3108 "__id__": 76 3145 "__id__": 77
3109 } 3146 }
3110 ], 3147 ],
3111 "_prefab": null, 3148 "_prefab": null,
...@@ -3173,17 +3210,17 @@ ...@@ -3173,17 +3210,17 @@
3173 "_name": "NaviListWrapper", 3210 "_name": "NaviListWrapper",
3174 "_objFlags": 0, 3211 "_objFlags": 0,
3175 "_parent": { 3212 "_parent": {
3176 "__id__": 68 3213 "__id__": 69
3177 }, 3214 },
3178 "_children": [ 3215 "_children": [
3179 { 3216 {
3180 "__id__": 70 3217 "__id__": 71
3181 } 3218 }
3182 ], 3219 ],
3183 "_active": true, 3220 "_active": true,
3184 "_components": [ 3221 "_components": [
3185 { 3222 {
3186 "__id__": 71 3223 "__id__": 72
3187 } 3224 }
3188 ], 3225 ],
3189 "_prefab": null, 3226 "_prefab": null,
...@@ -3251,7 +3288,7 @@ ...@@ -3251,7 +3288,7 @@
3251 "_name": "NaviList", 3288 "_name": "NaviList",
3252 "_objFlags": 0, 3289 "_objFlags": 0,
3253 "_parent": { 3290 "_parent": {
3254 "__id__": 69 3291 "__id__": 70
3255 }, 3292 },
3256 "_children": [], 3293 "_children": [],
3257 "_active": true, 3294 "_active": true,
...@@ -3321,7 +3358,7 @@ ...@@ -3321,7 +3358,7 @@
3321 "_name": "", 3358 "_name": "",
3322 "_objFlags": 0, 3359 "_objFlags": 0,
3323 "node": { 3360 "node": {
3324 "__id__": 69 3361 "__id__": 70
3325 }, 3362 },
3326 "_enabled": true, 3363 "_enabled": true,
3327 "_materials": [ 3364 "_materials": [
...@@ -3341,13 +3378,13 @@ ...@@ -3341,13 +3378,13 @@
3341 "_name": "LeftIcon", 3378 "_name": "LeftIcon",
3342 "_objFlags": 0, 3379 "_objFlags": 0,
3343 "_parent": { 3380 "_parent": {
3344 "__id__": 68 3381 "__id__": 69
3345 }, 3382 },
3346 "_children": [], 3383 "_children": [],
3347 "_active": true, 3384 "_active": true,
3348 "_components": [ 3385 "_components": [
3349 { 3386 {
3350 "__id__": 73 3387 "__id__": 74
3351 } 3388 }
3352 ], 3389 ],
3353 "_prefab": null, 3390 "_prefab": null,
...@@ -3415,7 +3452,7 @@ ...@@ -3415,7 +3452,7 @@
3415 "_name": "", 3452 "_name": "",
3416 "_objFlags": 0, 3453 "_objFlags": 0,
3417 "node": { 3454 "node": {
3418 "__id__": 72 3455 "__id__": 73
3419 }, 3456 },
3420 "_enabled": true, 3457 "_enabled": true,
3421 "_materials": [], 3458 "_materials": [],
...@@ -3441,13 +3478,13 @@ ...@@ -3441,13 +3478,13 @@
3441 "_name": "RightIcon", 3478 "_name": "RightIcon",
3442 "_objFlags": 0, 3479 "_objFlags": 0,
3443 "_parent": { 3480 "_parent": {
3444 "__id__": 68 3481 "__id__": 69
3445 }, 3482 },
3446 "_children": [], 3483 "_children": [],
3447 "_active": true, 3484 "_active": true,
3448 "_components": [ 3485 "_components": [
3449 { 3486 {
3450 "__id__": 75 3487 "__id__": 76
3451 } 3488 }
3452 ], 3489 ],
3453 "_prefab": null, 3490 "_prefab": null,
...@@ -3515,7 +3552,7 @@ ...@@ -3515,7 +3552,7 @@
3515 "_name": "", 3552 "_name": "",
3516 "_objFlags": 0, 3553 "_objFlags": 0,
3517 "node": { 3554 "node": {
3518 "__id__": 74 3555 "__id__": 75
3519 }, 3556 },
3520 "_enabled": true, 3557 "_enabled": true,
3521 "_materials": [], 3558 "_materials": [],
...@@ -3541,7 +3578,7 @@ ...@@ -3541,7 +3578,7 @@
3541 "_name": "", 3578 "_name": "",
3542 "_objFlags": 0, 3579 "_objFlags": 0,
3543 "node": { 3580 "node": {
3544 "__id__": 68 3581 "__id__": 69
3545 }, 3582 },
3546 "_enabled": true, 3583 "_enabled": true,
3547 "alignMode": 1, 3584 "alignMode": 1,
......
...@@ -31,7 +31,15 @@ cc.Class({ ...@@ -31,7 +31,15 @@ cc.Class({
31 this._bIsDataListMoving = false; 31 this._bIsDataListMoving = false;
32 this._bInitCategoryListSuccess = false; 32 this._bInitCategoryListSuccess = false;
33 33
34 if (this._cApplication.getBackStatus()) { 34 let aSceneParameter = this._cApplication.getSceneParameter();
35 cc.log("gameDetail->aSceneParameter..." + JSON.stringify(aSceneParameter));
36 if (aSceneParameter.length) {
37 this._oSceneContext._iCurrentLeftIndex = aSceneParameter[aSceneParameter.length - 1].currentIndex || 0;
38 } else if (aSceneParameter) {
39 this._oSceneContext._iCurrentLeftIndex = aSceneParameter.currentIndex || 0;
40 }
41
42 if (this._cApplication.getBackStatus()) { //返回值放到下方，否则恢复的数据是首页带回来的数值
35 //恢复上下文 包括 43 //恢复上下文 包括
36 //光标位置 focusPath 44 //光标位置 focusPath
37 let oSceneContext = this._cApplication.popSceneContext(); 45 let oSceneContext = this._cApplication.popSceneContext();
...@@ -41,14 +49,7 @@ cc.Class({ ...@@ -41,14 +49,7 @@ cc.Class({
41 } 49 }
42 this._cApplication.setBackStatus(false); 50 this._cApplication.setBackStatus(false);
43 } 51 }
44 52 cc.log("back status: " + this._oSceneContext._iCurrentLeftIndex);
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 53
53 this._nodeTypeListWrapper = cc.find("TypeListArea/TypeListWrapper", this.node); 54 this._nodeTypeListWrapper = cc.find("TypeListArea/TypeListWrapper", this.node);
54 this._nodeTypeList = cc.find("TypeList", this._nodeTypeListWrapper); 55 this._nodeTypeList = cc.find("TypeList", this._nodeTypeListWrapper);
......
...@@ -101,14 +101,18 @@ cc.Class({ ...@@ -101,14 +101,18 @@ cc.Class({
101 if (i >= oJSONResult.resultSet.length) {//数据较少时 101 if (i >= oJSONResult.resultSet.length) {//数据较少时
102 continue; 102 continue;
103 } 103 }
104 let nodeEpisodeCell = cc.instantiate(this.PFB_EPISODE); 104 let nodeEpisodeCell = cc.find("EpisodeListCell" + i, this._nodeEpisodeList);
105 nodeEpisodeCell.x = nodeEpisodeCell.width / 2 + (i) * (nodeEpisodeCell.width + 20); 105 if (nodeEpisodeCell == null) {
106 cc.find("EpisodeNum/Text", nodeEpisodeCell).getComponent(cc.Label).string = oJSONResult.resultSet[i].name; 106 nodeEpisodeCell = cc.instantiate(this.PFB_EPISODE);
107 this._nodeEpisodeList.addChild(nodeEpisodeCell, 10, "EpisodeListCell" + i); 107 this._nodeEpisodeList.addChild(nodeEpisodeCell, 10, "EpisodeListCell" + i);
108
109 let fiEpisodeBlock = nodeEpisodeCell.addComponent(FocusInfo);
110 fiEpisodeBlock.init('', true, null, null, 1.0);
111 this._aFocusTargets[0]['episode_list_cell_' + i] = nodeEpisodeCell;
112 }
108 113
109 let fiEpisodeBlock = nodeEpisodeCell.addComponent(FocusInfo); 114 nodeEpisodeCell.x = nodeEpisodeCell.width / 2 + (i) * (nodeEpisodeCell.width + 12);
110 fiEpisodeBlock.init('', true, null, null, 1.0); 115 cc.find("EpisodeNum/Text", nodeEpisodeCell).getComponent(cc.Label).string = oJSONResult.resultSet[i].name;
111 this._aFocusTargets[0]['episode_list_cell_' + i] = nodeEpisodeCell;
112 } 116 }
113 117
114 if (!this._bIsNaviDataInit) { 118 if (!this._bIsNaviDataInit) {
...@@ -124,6 +128,7 @@ cc.Class({ ...@@ -124,6 +128,7 @@ cc.Class({
124 }, this, "uuid"); 128 }, this, "uuid");
125 }, 129 },
126 130
131 //1-20、21-40、41-60
127 initNaviList: function () { 132 initNaviList: function () {
128 //剧集分类 133 //剧集分类
129 let sum = this._oEpisode.count / 20; 134 let sum = this._oEpisode.count / 20;
...@@ -135,21 +140,21 @@ cc.Class({ ...@@ -135,21 +140,21 @@ cc.Class({
135 continue; 140 continue;
136 } 141 }
137 nodeNaviListCell = cc.instantiate(this.PFB_NAVI); 142 nodeNaviListCell = cc.instantiate(this.PFB_NAVI);
138 nodeNaviListCell.x = nodeNaviListCell.width / 2 + (i - 1) * (nodeNaviListCell.width + 23); 143 nodeNaviListCell.x = nodeNaviListCell.width / 2 + (i - 1) * (nodeNaviListCell.width + 12);
139 i == Math.ceil(sum) ? nodeNaviListCell.getChildByName('Text').getComponent(cc.Label).string = (20 * i - 19) + "-" + this._oEpisode.count 144 i == Math.ceil(sum) ? nodeNaviListCell.getChildByName('Text').getComponent(cc.Label).string = (20 * i - 19) + "-" + this._oEpisode.count
140 : nodeNaviListCell.getChildByName('Text').getComponent(cc.Label).string = (20 * i - 19) + "-" + 20 * i;//TODO:最后显示应该是41-52而不是41-60 145 : nodeNaviListCell.getChildByName('Text').getComponent(cc.Label).string = (20 * i - 19) + "-" + 20 * i;//TODO:最后显示应该是41-52而不是41-60
141 this._nodeNaviList.addChild(nodeNaviListCell, 10, "NaviListCell" + i); 146 this._nodeNaviList.addChild(nodeNaviListCell, 10, "NaviListCell" + i);
142 cc.loader.loadRes('VideoDetail/navi_bg', cc.Texture2D, function (err, texture) { 147 // cc.loader.loadRes('VideoDetail/navi_bg', cc.Texture2D, function (err, texture) {
143 let spriteFrame = new cc.SpriteFrame(); 148 // let spriteFrame = new cc.SpriteFrame();
144 if (i == 1) { 149 // if (i == 1) {
145 cc.find('Text', nodeNaviListCell).color = new cc.Color(112, 69, 61); 150 // cc.find('Text', nodeNaviListCell).color = new cc.Color(112, 69, 61);
146 spriteFrame.setTexture(texture, cc.rect(0, 42, 110, 42)); 151 // spriteFrame.setTexture(texture, cc.rect(0, 42, 110, 42));
147 } else { 152 // } else {
148 spriteFrame.setTexture(texture, cc.rect(0, 0, 110, 42)); 153 // spriteFrame.setTexture(texture, cc.rect(0, 0, 110, 42));
149 } 154 // }
150 nodeNaviListCell.getChildByName('Bg').getComponent(cc.Sprite).spriteFrame = spriteFrame; 155 // nodeNaviListCell.getChildByName('Bg').getComponent(cc.Sprite).spriteFrame = spriteFrame;
151 spriteFrame._calculateUV(); 156 // spriteFrame._calculateUV();
152 }); 157 // });
153 //准备焦点坐标 158 //准备焦点坐标
154 let fiNaviBlock = nodeNaviListCell.addComponent(FocusInfo); 159 let fiNaviBlock = nodeNaviListCell.addComponent(FocusInfo);
155 fiNaviBlock.init('', true, null, null, 1.0); 160 fiNaviBlock.init('', true, null, null, 1.0);
...@@ -308,7 +313,7 @@ cc.Class({ ...@@ -308,7 +313,7 @@ cc.Class({
308 } 313 }
309 314
310 if (fiFocusTarget && 0 == fiFocusTarget.node.name.indexOf("EpisodeListCell")) { 315 if (fiFocusTarget && 0 == fiFocusTarget.node.name.indexOf("EpisodeListCell")) {
311 if (fiFocusTarget.node.x - fiFocusTarget.node.width / 2 + this._nodeEpisodeList.x >= this._nodeEpisodeListWrapper.width) { 316 if (fiFocusTarget.node.x + fiFocusTarget.node.width / 2 + this._nodeEpisodeList.x >= this._nodeEpisodeListWrapper.width) {
312 oScrollParameter = this._nodeEpisodeList.getComponent(TVScrollParameter); 317 oScrollParameter = this._nodeEpisodeList.getComponent(TVScrollParameter);
313 oScrollParameter.setHasRelation(true); 318 oScrollParameter.setHasRelation(true);
314 oScrollParameter.setStep((fiFocusTarget.node.x + fiFocusTarget.node.width / 2 + this._nodeEpisodeList.x) - this._nodeEpisodeListWrapper.width + 20); 319 oScrollParameter.setStep((fiFocusTarget.node.x + fiFocusTarget.node.width / 2 + this._nodeEpisodeList.x) - this._nodeEpisodeListWrapper.width + 20);
...@@ -318,7 +323,7 @@ cc.Class({ ...@@ -318,7 +323,7 @@ cc.Class({
318 if (fiFocusTarget.node.x + this._nodeEpisodeList.x < 0) { 323 if (fiFocusTarget.node.x + this._nodeEpisodeList.x < 0) {
319 oScrollParameter = this._nodeEpisodeList.getComponent(TVScrollParameter); 324 oScrollParameter = this._nodeEpisodeList.getComponent(TVScrollParameter);
320 oScrollParameter.setHasRelation(true); 325 oScrollParameter.setHasRelation(true);
321 oScrollParameter.setStep(-fiFocusTarget.node.x + fiFocusTarget.node.width / 2 - this._nodeEpisodeList.x + 16); 326 oScrollParameter.setStep(-fiFocusTarget.node.x + fiFocusTarget.node.width / 2 - this._nodeEpisodeList.x);
322 oScrollParameter.setTargetPosition(this._nodeEpisodeList.x + oScrollParameter.getStep()) 327 oScrollParameter.setTargetPosition(this._nodeEpisodeList.x + oScrollParameter.getStep())
323 // this._oSceneContext._nodeNaviListX = this._nodeEpisodeList.x + oScrollParameter.getStep(); 328 // this._oSceneContext._nodeNaviListX = this._nodeEpisodeList.x + oScrollParameter.getStep();
324 } 329 }
...@@ -417,11 +422,20 @@ cc.Class({ ...@@ -417,11 +422,20 @@ cc.Class({
417 if (0 == fiFrom.node.getName().indexOf('NaviListCell') && 0 == fiTo.node.getName().indexOf('NaviListCell')) { //剧集分类1-20.21-40... 422 if (0 == fiFrom.node.getName().indexOf('NaviListCell') && 0 == fiTo.node.getName().indexOf('NaviListCell')) { //剧集分类1-20.21-40...
418 cc.find('Text', fiFrom.node).color = new cc.Color(255, 255, 255); 423 cc.find('Text', fiFrom.node).color = new cc.Color(255, 255, 255);
419 // fiFrom.node.getChildByName('Bg').getComponent(cc.Sprite).spriteFrame.setRect(cc.rect(0, 0, fiFrom.node.getChildByName('Bg').width, fiFrom.node.getChildByName('Bg').height)); 424 // fiFrom.node.getChildByName('Bg').getComponent(cc.Sprite).spriteFrame.setRect(cc.rect(0, 0, fiFrom.node.getChildByName('Bg').width, fiFrom.node.getChildByName('Bg').height));
420 cc.loader.loadRes('VideoDetail/navi_bg', cc.Texture2D, function (err, texture) { 425 // cc.loader.loadRes('VideoDetail/navi_bg', cc.Texture2D, function (err, texture) {
421 fiFrom.node.getChildByName('Bg').getComponent(cc.Sprite).spriteFrame = new cc.SpriteFrame(texture, cc.rect(0, 0, fiFrom.node.getChildByName('Bg').width, fiFrom.node.getChildByName('Bg').height)); 426 // fiFrom.node.getChildByName('Bg').getComponent(cc.Sprite).spriteFrame = new cc.SpriteFrame(texture, cc.rect(0, 0, fiFrom.node.getChildByName('Bg').width, fiFrom.node.getChildByName('Bg').height));
422 }); 427 // });
423 } 428 }
424 429
430 // if (0 == fiFrom.node.getName().indexOf('EpisodeListCell')) { //剧集分类1-20.21-40...
431 // fiFrom.node.width = 104;
432 // // cc.find('Text', fiTo.node).color = new cc.Color(255, 204, 1);
433 // // fiTo.node.getChildByName('Bg').getComponent(cc.Sprite).spriteFrame.setRect(cc.rect(0, fiTo.node.getChildByName('Bg').height, fiTo.node.getChildByName('Bg').width, fiTo.node.getChildByName('Bg').height));
434 // // cc.loader.loadRes('VideoDetail/navi_bg', cc.Texture2D, function (err, texture) {
435 // // fiTo.node.getChildByName('Bg').getComponent(cc.Sprite).spriteFrame = new cc.SpriteFrame(texture, cc.rect(0, fiTo.node.getChildByName('Bg').height, fiTo.node.getChildByName('Bg').width, fiTo.node.getChildByName('Bg').height));
436 // // });
437 // }
438
425 }, 439 },
426 440
427 onAfterFocusChange: function (event) { 441 onAfterFocusChange: function (event) {
...@@ -456,16 +470,25 @@ cc.Class({ ...@@ -456,16 +470,25 @@ cc.Class({
456 470
457 this._oSceneContext.currentPage = 1; //页面恢复 471 this._oSceneContext.currentPage = 1; //页面恢复
458 472
459 cc.find('Text', fiTo.node).color = new cc.Color(112, 69, 61); 473 cc.find('Text', fiTo.node).color = new cc.Color(255, 204, 1);
460 // fiTo.node.getChildByName('Bg').getComponent(cc.Sprite).spriteFrame.setRect(cc.rect(0, fiTo.node.getChildByName('Bg').height, fiTo.node.getChildByName('Bg').width, fiTo.node.getChildByName('Bg').height)); 474 // fiTo.node.getChildByName('Bg').getComponent(cc.Sprite).spriteFrame.setRect(cc.rect(0, fiTo.node.getChildByName('Bg').height, fiTo.node.getChildByName('Bg').width, fiTo.node.getChildByName('Bg').height));
461 cc.loader.loadRes('VideoDetail/navi_bg', cc.Texture2D, function (err, texture) { 475 // cc.loader.loadRes('VideoDetail/navi_bg', cc.Texture2D, function (err, texture) {
462 fiTo.node.getChildByName('Bg').getComponent(cc.Sprite).spriteFrame = new cc.SpriteFrame(texture, cc.rect(0, fiTo.node.getChildByName('Bg').height, fiTo.node.getChildByName('Bg').width, fiTo.node.getChildByName('Bg').height)); 476 // fiTo.node.getChildByName('Bg').getComponent(cc.Sprite).spriteFrame = new cc.SpriteFrame(texture, cc.rect(0, fiTo.node.getChildByName('Bg').height, fiTo.node.getChildByName('Bg').width, fiTo.node.getChildByName('Bg').height));
463 }); 477 // });
464 let index = fiTo.node.name.replace('NaviListCell', ''); 478 let index = fiTo.node.name.replace('NaviListCell', '');
465 this._iCurrentNaviNumLoc = index; 479 this._iCurrentNaviNumLoc = index;
466 this._oSceneContext.requestedStart = index * 20 - 20; 480 this._oSceneContext.requestedStart = index * 20 - 20;
467 this.getGatherDetailList(); 481 this.getGatherDetailList();
468 } 482 }
483
484 // if (0 == fiTo.node.getName().indexOf('EpisodeListCell')) { //剧集分类1-20.21-40...
485 // fiTo.node.width = 378;
486 // // cc.find('Text', fiTo.node).color = new cc.Color(255, 204, 1);
487 // // fiTo.node.getChildByName('Bg').getComponent(cc.Sprite).spriteFrame.setRect(cc.rect(0, fiTo.node.getChildByName('Bg').height, fiTo.node.getChildByName('Bg').width, fiTo.node.getChildByName('Bg').height));
488 // // cc.loader.loadRes('VideoDetail/navi_bg', cc.Texture2D, function (err, texture) {
489 // // fiTo.node.getChildByName('Bg').getComponent(cc.Sprite).spriteFrame = new cc.SpriteFrame(texture, cc.rect(0, fiTo.node.getChildByName('Bg').height, fiTo.node.getChildByName('Bg').width, fiTo.node.getChildByName('Bg').height));
490 // // });
491 // }
469 }, 492 },
470 493
471 doCurrentFocusTVLinkAction: function (strAction) { 494 doCurrentFocusTVLinkAction: function (strAction) {
......