Commit 27127895 authored by liujiangnan's avatar liujiangnan

feat: 调整分辨率

parent 5e75b988
...@@ -119,8 +119,8 @@ ...@@ -119,8 +119,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 1280, "width": 1920,
"height": 720 "height": 1080
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -131,8 +131,8 @@ ...@@ -131,8 +131,8 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
640, 960,
360, 540,
0, 0,
0, 0,
0, 0,
...@@ -286,8 +286,8 @@ ...@@ -286,8 +286,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 836, "width": 1377,
"height": 470 "height": 775
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -351,8 +351,8 @@ ...@@ -351,8 +351,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 1280, "width": 1920,
"height": 720 "height": 1080
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -431,10 +431,10 @@ ...@@ -431,10 +431,10 @@
"alignMode": 1, "alignMode": 1,
"_target": null, "_target": null,
"_alignFlags": 45, "_alignFlags": 45,
"_left": -222, "_left": -271.5,
"_right": -222, "_right": -271.5,
"_top": -124.99999999999996, "_top": -152.49999999999994,
"_bottom": -125, "_bottom": -152.5,
"_verticalCenter": 0, "_verticalCenter": 0,
"_horizontalCenter": 0, "_horizontalCenter": 0,
"_isAbsLeft": true, "_isAbsLeft": true,
...@@ -472,8 +472,8 @@ ...@@ -472,8 +472,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 896, "width": 1377,
"height": 504 "height": 775
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -577,8 +577,8 @@ ...@@ -577,8 +577,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 1280, "width": 1920,
"height": 720 "height": 1080
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -701,8 +701,8 @@ ...@@ -701,8 +701,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 1280, "width": 1920,
"height": 720 "height": 1080
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -844,8 +844,8 @@ ...@@ -844,8 +844,8 @@
0, 0,
0, 0,
1, 1,
0.6, 1,
0.6, 1,
1 1
] ]
}, },
...@@ -950,7 +950,7 @@ ...@@ -950,7 +950,7 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 0, "width": 1377,
"height": 0 "height": 0
}, },
"_anchorPoint": { "_anchorPoint": {
...@@ -963,14 +963,14 @@ ...@@ -963,14 +963,14 @@
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
0, 0,
-434.711,
0, 0,
0, 0,
0, 0,
0, 0,
0,
1, 1,
0.5, 1,
0.5, 1,
0.5 0.5
] ]
}, },
...@@ -1037,7 +1037,7 @@ ...@@ -1037,7 +1037,7 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 2057, "width": 1377,
"height": 25 "height": 25
}, },
"_anchorPoint": { "_anchorPoint": {
...@@ -1049,8 +1049,8 @@ ...@@ -1049,8 +1049,8 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
65.20799999999997, -0.1269999999999527,
-580.635, -2.42,
0, 0,
0, 0,
0, 0,
...@@ -1173,14 +1173,14 @@ ...@@ -1173,14 +1173,14 @@
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
"x": 0.5, "x": 0,
"y": 0.5 "y": 0.5
}, },
"_trs": { "_trs": {
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
38.399, 0,
-0.331, -0.331,
0, 0,
0, 0,
...@@ -1340,7 +1340,7 @@ ...@@ -1340,7 +1340,7 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-1180, -821.106,
1.519, 1.519,
0, 0,
0, 0,
...@@ -1393,8 +1393,8 @@ ...@@ -1393,8 +1393,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 158, "width": 180,
"height": 158 "height": 180
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -1449,7 +1449,7 @@ ...@@ -1449,7 +1449,7 @@
"__uuid__": "e89e23bb-5d4b-45e2-952c-753062416f03" "__uuid__": "e89e23bb-5d4b-45e2-952c-753062416f03"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 2, "_sizeMode": 0,
"_fillType": 0, "_fillType": 0,
"_fillCenter": { "_fillCenter": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -1594,7 +1594,7 @@ ...@@ -1594,7 +1594,7 @@
"alignMode": 1, "alignMode": 1,
"_target": null, "_target": null,
"_alignFlags": 8, "_alignFlags": 8,
"_left": -256, "_left": -237.106,
"_right": 0, "_right": 0,
"_top": 0, "_top": 0,
"_bottom": 0, "_bottom": 0,
...@@ -1654,7 +1654,7 @@ ...@@ -1654,7 +1654,7 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-1180, -822.911,
1.519, 1.519,
0, 0,
0, 0,
...@@ -1707,8 +1707,8 @@ ...@@ -1707,8 +1707,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 158, "width": 180,
"height": 158 "height": 180
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -1763,7 +1763,7 @@ ...@@ -1763,7 +1763,7 @@
"__uuid__": "da418ab0-6bf6-401e-ad24-d27cca267d4f" "__uuid__": "da418ab0-6bf6-401e-ad24-d27cca267d4f"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 2, "_sizeMode": 0,
"_fillType": 0, "_fillType": 0,
"_fillCenter": { "_fillCenter": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -1787,10 +1787,10 @@ ...@@ -1787,10 +1787,10 @@
"alignMode": 0, "alignMode": 0,
"_target": null, "_target": null,
"_alignFlags": 45, "_alignFlags": 45,
"_left": 25.5, "_left": 14.5,
"_right": 25.5, "_right": 14.5,
"_top": 30, "_top": 19,
"_bottom": 30, "_bottom": 19,
"_verticalCenter": 0, "_verticalCenter": 0,
"_horizontalCenter": 0, "_horizontalCenter": 0,
"_isAbsLeft": true, "_isAbsLeft": true,
...@@ -1898,7 +1898,7 @@ ...@@ -1898,7 +1898,7 @@
"alignMode": 1, "alignMode": 1,
"_target": null, "_target": null,
"_alignFlags": 8, "_alignFlags": 8,
"_left": -256, "_left": -238.91099999999994,
"_right": 0, "_right": 0,
"_top": 0, "_top": 0,
"_bottom": 0, "_bottom": 0,
...@@ -1958,7 +1958,7 @@ ...@@ -1958,7 +1958,7 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-1180, -825.192,
1.519, 1.519,
0, 0,
0, 0,
...@@ -2011,8 +2011,8 @@ ...@@ -2011,8 +2011,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 158, "width": 180,
"height": 158 "height": 180
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -2067,7 +2067,7 @@ ...@@ -2067,7 +2067,7 @@
"__uuid__": "16ea0a4c-9fd6-4334-8f5a-56b9ec1673f8" "__uuid__": "16ea0a4c-9fd6-4334-8f5a-56b9ec1673f8"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 2, "_sizeMode": 0,
"_fillType": 0, "_fillType": 0,
"_fillCenter": { "_fillCenter": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -2091,10 +2091,10 @@ ...@@ -2091,10 +2091,10 @@
"alignMode": 0, "alignMode": 0,
"_target": null, "_target": null,
"_alignFlags": 45, "_alignFlags": 45,
"_left": 25.5, "_left": 14.5,
"_right": 25.5, "_right": 14.5,
"_top": 30, "_top": 19,
"_bottom": 30, "_bottom": 19,
"_verticalCenter": 0, "_verticalCenter": 0,
"_horizontalCenter": 0, "_horizontalCenter": 0,
"_isAbsLeft": true, "_isAbsLeft": true,
...@@ -2202,7 +2202,7 @@ ...@@ -2202,7 +2202,7 @@
"alignMode": 1, "alignMode": 1,
"_target": null, "_target": null,
"_alignFlags": 8, "_alignFlags": 8,
"_left": -256, "_left": -241.192,
"_right": 0, "_right": 0,
"_top": 0, "_top": 0,
"_bottom": 0, "_bottom": 0,
...@@ -2261,7 +2261,7 @@ ...@@ -2261,7 +2261,7 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-965.634, -625.6339999999999,
-63.637, -63.637,
0, 0,
0, 0,
...@@ -2406,7 +2406,7 @@ ...@@ -2406,7 +2406,7 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
942.1619999999999, 602.1619999999999,
-57.424, -57.424,
0, 0,
0, 0,
...@@ -2533,7 +2533,7 @@ ...@@ -2533,7 +2533,7 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-1169.554, -829.5540000000001,
129.536, 129.536,
0, 0,
0, 0,
...@@ -2660,10 +2660,10 @@ ...@@ -2660,10 +2660,10 @@
"alignMode": 1, "alignMode": 1,
"_target": null, "_target": null,
"_alignFlags": 44, "_alignFlags": 44,
"_left": -963.292, "_left": -0.12699999999997869,
"_right": -1093.708, "_right": 0.12699999999997869,
"_top": 0, "_top": 0,
"_bottom": -593.135, "_bottom": -14.92,
"_verticalCenter": 0, "_verticalCenter": 0,
"_horizontalCenter": 0, "_horizontalCenter": 0,
"_isAbsLeft": true, "_isAbsLeft": true,
...@@ -2687,10 +2687,10 @@ ...@@ -2687,10 +2687,10 @@
"alignMode": 1, "alignMode": 1,
"_target": null, "_target": null,
"_alignFlags": 44, "_alignFlags": 44,
"_left": 640, "_left": 271.5,
"_right": 640, "_right": 271.5,
"_top": 0, "_top": 0,
"_bottom": 360, "_bottom": 105.28899999999999,
"_verticalCenter": 0, "_verticalCenter": 0,
"_horizontalCenter": 0, "_horizontalCenter": 0,
"_isAbsLeft": true, "_isAbsLeft": true,
...@@ -2734,8 +2734,8 @@ ...@@ -2734,8 +2734,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 1280, "width": 1920,
"height": 720 "height": 1080
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -2814,10 +2814,10 @@ ...@@ -2814,10 +2814,10 @@
"alignMode": 1, "alignMode": 1,
"_target": null, "_target": null,
"_alignFlags": 45, "_alignFlags": 45,
"_left": 0, "_left": -320,
"_right": 0, "_right": -320,
"_top": 0, "_top": -180,
"_bottom": 0, "_bottom": -180,
"_verticalCenter": 0, "_verticalCenter": 0,
"_horizontalCenter": 0, "_horizontalCenter": 0,
"_isAbsLeft": true, "_isAbsLeft": true,
...@@ -2877,8 +2877,8 @@ ...@@ -2877,8 +2877,8 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
511.858, 711.96,
-237.567, -375.342,
0, 0,
0, 0,
0, 0,
...@@ -2914,9 +2914,9 @@ ...@@ -2914,9 +2914,9 @@
"_target": null, "_target": null,
"_alignFlags": 36, "_alignFlags": 36,
"_left": 0, "_left": 0,
"_right": 128.142, "_right": -71.96000000000004,
"_top": 0, "_top": 0,
"_bottom": 122.43299999999999, "_bottom": -15.341999999999985,
"_verticalCenter": 0, "_verticalCenter": 0,
"_horizontalCenter": 0, "_horizontalCenter": 0,
"_isAbsLeft": true, "_isAbsLeft": true,
...@@ -2974,14 +2974,14 @@ ...@@ -2974,14 +2974,14 @@
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
0, 0,
328.651, 493,
0, 0,
0, 0,
0, 0,
0, 0,
1, 1,
0.667, 1,
0.667, 1,
1 1
] ]
}, },
...@@ -3144,7 +3144,7 @@ ...@@ -3144,7 +3144,7 @@
"__uuid__": "ba96c3bc-8370-46ab-8e41-793bf007345d" "__uuid__": "ba96c3bc-8370-46ab-8e41-793bf007345d"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 0, "_sizeMode": 1,
"_fillType": 0, "_fillType": 0,
"_fillCenter": { "_fillCenter": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -3168,8 +3168,8 @@ ...@@ -3168,8 +3168,8 @@
"alignMode": 1, "alignMode": 1,
"_target": null, "_target": null,
"_alignFlags": 41, "_alignFlags": 41,
"_left": -0.32000000000005, "_left": 0,
"_right": -0.32000000000005, "_right": 0,
"_top": 0, "_top": 0,
"_bottom": 0, "_bottom": 0,
"_verticalCenter": 0, "_verticalCenter": 0,
...@@ -3194,8 +3194,8 @@ ...@@ -3194,8 +3194,8 @@
"_enabled": true, "_enabled": true,
"_designResolution": { "_designResolution": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 1280, "width": 1920,
"height": 720 "height": 1080
}, },
"_fitWidth": true, "_fitWidth": true,
"_fitHeight": true, "_fitHeight": true,
......
...@@ -385,7 +385,7 @@ cc.Class({ ...@@ -385,7 +385,7 @@ cc.Class({
this.currentTimeLabel.string = this.formatTime(ct); this.currentTimeLabel.string = this.formatTime(ct);
const dur = this.videoPlayer.getDuration(); const dur = this.videoPlayer.getDuration();
const percent = ct / dur; const percent = ct / dur;
const maxX = this.ProgressBar.width-20; const maxX = this.ProgressBar.width;
const minX = 0; const minX = 0;
let newX = percent * maxX; let newX = percent * maxX;
newX = Math.min(maxX, Math.max(newX, minX)); newX = Math.min(maxX, Math.max(newX, minX));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment