Commit 3ed0d56e authored by liujiangnan's avatar liujiangnan

fix: 视频相关问题

parent e6e8ae29
...@@ -93,13 +93,13 @@ ...@@ -93,13 +93,13 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 768 "__id__": 772
}, },
{ {
"__id__": 769 "__id__": 773
}, },
{ {
"__id__": 770 "__id__": 774
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2771,7 +2771,7 @@ ...@@ -2771,7 +2771,7 @@
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"showInEditor": false, "showInEditor": false,
"_id": "c2hElPCjRO0ab8I6Y8TVm6" "_id": "8bhOYsKcJM/oyhy2+gOpNL"
}, },
{ {
"__type__": "cc.Label", "__type__": "cc.Label",
...@@ -2804,7 +2804,7 @@ ...@@ -2804,7 +2804,7 @@
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 0, "_N$overflow": 0,
"_N$cacheMode": 0, "_N$cacheMode": 0,
"_id": "76K2zcA0RJsrWLktyNIVhQ" "_id": "6cXRb51khJIbnIt2n0q0As"
}, },
{ {
"__type__": "cc.PrivateNode", "__type__": "cc.PrivateNode",
...@@ -2867,7 +2867,7 @@ ...@@ -2867,7 +2867,7 @@
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"showInEditor": false, "showInEditor": false,
"_id": "418kzcxC9MBJ1bT1HTO1Rg" "_id": "3fbhcBi+FJkJQL53t96HaU"
}, },
{ {
"__type__": "cc.Label", "__type__": "cc.Label",
...@@ -2900,7 +2900,7 @@ ...@@ -2900,7 +2900,7 @@
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 0, "_N$overflow": 0,
"_N$cacheMode": 0, "_N$cacheMode": 0,
"_id": "b5ggto6sxE061V2sKhBiKo" "_id": "eagkS9tyNCv5ol3smr/bMK"
}, },
{ {
"__type__": "cc.PrivateNode", "__type__": "cc.PrivateNode",
...@@ -2963,7 +2963,7 @@ ...@@ -2963,7 +2963,7 @@
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"showInEditor": false, "showInEditor": false,
"_id": "b0rn6OlGJGeJs/cqeYg4rw" "_id": "0c2LM4KgtKyJddFxNkFst1"
}, },
{ {
"__type__": "cc.Label", "__type__": "cc.Label",
...@@ -2996,7 +2996,7 @@ ...@@ -2996,7 +2996,7 @@
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 0, "_N$overflow": 0,
"_N$cacheMode": 0, "_N$cacheMode": 0,
"_id": "d9RLxixKlGMI+hBor2IRTz" "_id": "095MiOS/VC/rw+XYAFxbAs"
}, },
{ {
"__type__": "cc.PrivateNode", "__type__": "cc.PrivateNode",
...@@ -3059,7 +3059,7 @@ ...@@ -3059,7 +3059,7 @@
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"showInEditor": false, "showInEditor": false,
"_id": "6elDkGACdFxZuemXvTSpP5" "_id": "52usINc1JOmYMlFU/5BZOU"
}, },
{ {
"__type__": "cc.Label", "__type__": "cc.Label",
...@@ -3092,7 +3092,7 @@ ...@@ -3092,7 +3092,7 @@
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 0, "_N$overflow": 0,
"_N$cacheMode": 0, "_N$cacheMode": 0,
"_id": "63itvv2VlHU5XcTzjYczca" "_id": "47gq3Zn9hJTJi8hSQnPLKD"
}, },
{ {
"__type__": "cc.PrivateNode", "__type__": "cc.PrivateNode",
...@@ -3155,7 +3155,7 @@ ...@@ -3155,7 +3155,7 @@
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"showInEditor": false, "showInEditor": false,
"_id": "b1nB/FK6BEuopdSzUUBTMt" "_id": "90gFub8C5IxaA8VX4b45GT"
}, },
{ {
"__type__": "cc.Label", "__type__": "cc.Label",
...@@ -3188,7 +3188,7 @@ ...@@ -3188,7 +3188,7 @@
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 0, "_N$overflow": 0,
"_N$cacheMode": 0, "_N$cacheMode": 0,
"_id": "2abWjmJU1E04bvIPIooGvY" "_id": "6aHBoMlJ1I4q99RQuqrKBG"
}, },
{ {
"__type__": "cc.RichText", "__type__": "cc.RichText",
...@@ -6369,7 +6369,7 @@ ...@@ -6369,7 +6369,7 @@
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"showInEditor": false, "showInEditor": false,
"_id": "10D5G/jjxBtaSZzFwA/IUQ" "_id": "34Js7ArlBGV58EE0VSHFvI"
}, },
{ {
"__type__": "cc.Label", "__type__": "cc.Label",
...@@ -6402,7 +6402,7 @@ ...@@ -6402,7 +6402,7 @@
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 0, "_N$overflow": 0,
"_N$cacheMode": 0, "_N$cacheMode": 0,
"_id": "99TGSX79BA65ncwbIwIahp" "_id": "d1vRhajhJAUZ+2N2u6tHmf"
}, },
{ {
"__type__": "cc.PrivateNode", "__type__": "cc.PrivateNode",
...@@ -6465,7 +6465,7 @@ ...@@ -6465,7 +6465,7 @@
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"showInEditor": false, "showInEditor": false,
"_id": "beLrLEb/9OvI7ovjRCfAVA" "_id": "1fJg/5x39GF4Tw+AzqyF1x"
}, },
{ {
"__type__": "cc.Label", "__type__": "cc.Label",
...@@ -6498,7 +6498,7 @@ ...@@ -6498,7 +6498,7 @@
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 0, "_N$overflow": 0,
"_N$cacheMode": 0, "_N$cacheMode": 0,
"_id": "bbqmltWJBH1JMeNhtGuhPe" "_id": "7bNoBuiRpKialXrO+1t/f3"
}, },
{ {
"__type__": "cc.PrivateNode", "__type__": "cc.PrivateNode",
...@@ -6561,7 +6561,7 @@ ...@@ -6561,7 +6561,7 @@
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"showInEditor": false, "showInEditor": false,
"_id": "79z7WgNsJEIpymC1/uwAFB" "_id": "b7SYA1G71EcbNB98T+hHY6"
}, },
{ {
"__type__": "cc.Label", "__type__": "cc.Label",
...@@ -6594,7 +6594,7 @@ ...@@ -6594,7 +6594,7 @@
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 0, "_N$overflow": 0,
"_N$cacheMode": 0, "_N$cacheMode": 0,
"_id": "e4OHUIPkZJ2rebi78aXazh" "_id": "38+54F7rROJbBgnVDY/vG6"
}, },
{ {
"__type__": "cc.RichText", "__type__": "cc.RichText",
...@@ -7073,7 +7073,7 @@ ...@@ -7073,7 +7073,7 @@
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"showInEditor": false, "showInEditor": false,
"_id": "e0ICGlMEVH8KsBY7YaZFeu" "_id": "0epeymCbdBeIZ0sWjxecHi"
}, },
{ {
"__type__": "cc.Label", "__type__": "cc.Label",
...@@ -7106,7 +7106,7 @@ ...@@ -7106,7 +7106,7 @@
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 0, "_N$overflow": 0,
"_N$cacheMode": 0, "_N$cacheMode": 0,
"_id": "71mrin9GhFcoP4oVj8KRTH" "_id": "9fNBotTVhLTKy+u2OQB8Cs"
}, },
{ {
"__type__": "cc.PrivateNode", "__type__": "cc.PrivateNode",
...@@ -7169,7 +7169,7 @@ ...@@ -7169,7 +7169,7 @@
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"showInEditor": false, "showInEditor": false,
"_id": "1bss7y1i9Mv6qq1IxzOCMa" "_id": "6aZYcp/kxBM5CEGMMFCAWG"
}, },
{ {
"__type__": "cc.Label", "__type__": "cc.Label",
...@@ -7202,7 +7202,7 @@ ...@@ -7202,7 +7202,7 @@
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 0, "_N$overflow": 0,
"_N$cacheMode": 0, "_N$cacheMode": 0,
"_id": "03MyP45IREsZEBiMWbAicd" "_id": "c7smSXthJEO6hbY1ToivFT"
}, },
{ {
"__type__": "cc.PrivateNode", "__type__": "cc.PrivateNode",
...@@ -7265,7 +7265,7 @@ ...@@ -7265,7 +7265,7 @@
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"showInEditor": false, "showInEditor": false,
"_id": "68VyrxM6VHep2QfBg4/KmX" "_id": "65VweecoJGLJj/BfOovvzf"
}, },
{ {
"__type__": "cc.Label", "__type__": "cc.Label",
...@@ -7298,7 +7298,7 @@ ...@@ -7298,7 +7298,7 @@
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 0, "_N$overflow": 0,
"_N$cacheMode": 0, "_N$cacheMode": 0,
"_id": "a3H03rVnFNs4k4qYr1hzdW" "_id": "51WcoWXB5Hw7lTXvUG4tUH"
}, },
{ {
"__type__": "cc.RichText", "__type__": "cc.RichText",
...@@ -7588,7 +7588,7 @@ ...@@ -7588,7 +7588,7 @@
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"showInEditor": false, "showInEditor": false,
"_id": "a7/bbcU0BLlYqiME+kC/Zy" "_id": "ee7B0Ox2ZHX4C6TOZxFSKv"
}, },
{ {
"__type__": "cc.Label", "__type__": "cc.Label",
...@@ -7621,7 +7621,7 @@ ...@@ -7621,7 +7621,7 @@
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 0, "_N$overflow": 0,
"_N$cacheMode": 0, "_N$cacheMode": 0,
"_id": "3cW+zMjJhE/IXMzLvA21M9" "_id": "acAxjOA1RDZa9ip8wtemU6"
}, },
{ {
"__type__": "cc.PrivateNode", "__type__": "cc.PrivateNode",
...@@ -7684,7 +7684,7 @@ ...@@ -7684,7 +7684,7 @@
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"showInEditor": false, "showInEditor": false,
"_id": "ebevoNnrxBIbUMlJ6MfTKM" "_id": "cdYo6seNlGnpv22wHRofCM"
}, },
{ {
"__type__": "cc.Label", "__type__": "cc.Label",
...@@ -7717,7 +7717,7 @@ ...@@ -7717,7 +7717,7 @@
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 0, "_N$overflow": 0,
"_N$cacheMode": 0, "_N$cacheMode": 0,
"_id": "23rCpK0xZKRrHH4qrhO8TJ" "_id": "15F358t99Dl7V8PDWm5Dvo"
}, },
{ {
"__type__": "cc.PrivateNode", "__type__": "cc.PrivateNode",
...@@ -7780,7 +7780,7 @@ ...@@ -7780,7 +7780,7 @@
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"showInEditor": false, "showInEditor": false,
"_id": "86euEse4xBVoUOZ4OKElrs" "_id": "74S0qZGQZPZ4CxazoHHbjo"
}, },
{ {
"__type__": "cc.Label", "__type__": "cc.Label",
...@@ -7813,7 +7813,7 @@ ...@@ -7813,7 +7813,7 @@
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 0, "_N$overflow": 0,
"_N$cacheMode": 0, "_N$cacheMode": 0,
"_id": "40IpZxXdpC/Z3ee4nJKue3" "_id": "72q9rYMQhKKpAAiZSksEzp"
}, },
{ {
"__type__": "cc.RichText", "__type__": "cc.RichText",
...@@ -9238,7 +9238,7 @@ ...@@ -9238,7 +9238,7 @@
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"showInEditor": false, "showInEditor": false,
"_id": "844fdRNHBBDrWpWGK5kdCw" "_id": "5aAeuHvpdDwKnGX2dtk3rf"
}, },
{ {
"__type__": "cc.Label", "__type__": "cc.Label",
...@@ -9271,7 +9271,7 @@ ...@@ -9271,7 +9271,7 @@
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 0, "_N$overflow": 0,
"_N$cacheMode": 0, "_N$cacheMode": 0,
"_id": "c1SQNVM6BJ/7Eb5aruKUx1" "_id": "10AETZIZtLNrdx78bOFT9+"
}, },
{ {
"__type__": "cc.PrivateNode", "__type__": "cc.PrivateNode",
...@@ -9334,7 +9334,7 @@ ...@@ -9334,7 +9334,7 @@
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"showInEditor": false, "showInEditor": false,
"_id": "2dtzFcjKZESaKqjUlmu6bB" "_id": "547cmpRRlChJqu9TEUQSkX"
}, },
{ {
"__type__": "cc.Label", "__type__": "cc.Label",
...@@ -9367,7 +9367,7 @@ ...@@ -9367,7 +9367,7 @@
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 0, "_N$overflow": 0,
"_N$cacheMode": 0, "_N$cacheMode": 0,
"_id": "9d7NQokc9FGqxtLNQ2EhZ0" "_id": "d2MeSy/+5Impux1f3vnvPw"
}, },
{ {
"__type__": "cc.PrivateNode", "__type__": "cc.PrivateNode",
...@@ -9430,7 +9430,7 @@ ...@@ -9430,7 +9430,7 @@
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"showInEditor": false, "showInEditor": false,
"_id": "bbhtBW9MJLP5Q6fF5DU1Q7" "_id": "09TFbRpJpKOK6PDh7W/aFT"
}, },
{ {
"__type__": "cc.Label", "__type__": "cc.Label",
...@@ -9463,7 +9463,7 @@ ...@@ -9463,7 +9463,7 @@
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 0, "_N$overflow": 0,
"_N$cacheMode": 0, "_N$cacheMode": 0,
"_id": "33rH6DKY1K8oVlmdEoQmLP" "_id": "c76rnW/jZHs714m93Dl0/e"
}, },
{ {
"__type__": "cc.PrivateNode", "__type__": "cc.PrivateNode",
...@@ -9526,7 +9526,7 @@ ...@@ -9526,7 +9526,7 @@
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"showInEditor": false, "showInEditor": false,
"_id": "5dFSm2kUFNfZq0NsRDfh6e" "_id": "67ZqD6hHpIEpFqfJgfNRm0"
}, },
{ {
"__type__": "cc.Label", "__type__": "cc.Label",
...@@ -9559,7 +9559,7 @@ ...@@ -9559,7 +9559,7 @@
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 0, "_N$overflow": 0,
"_N$cacheMode": 0, "_N$cacheMode": 0,
"_id": "b5HMtSwK5K8oNxViwoiKSG" "_id": "a0HC3jeelMr4hWtiPzyAOS"
}, },
{ {
"__type__": "cc.PrivateNode", "__type__": "cc.PrivateNode",
...@@ -9622,7 +9622,7 @@ ...@@ -9622,7 +9622,7 @@
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"showInEditor": false, "showInEditor": false,
"_id": "a2gXcGjaVOVZuT+ZqBg+Lj" "_id": "d5LnujPFFJJbwkZTf3MrsP"
}, },
{ {
"__type__": "cc.Label", "__type__": "cc.Label",
...@@ -9655,7 +9655,7 @@ ...@@ -9655,7 +9655,7 @@
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 0, "_N$overflow": 0,
"_N$cacheMode": 0, "_N$cacheMode": 0,
"_id": "8chxoBMQdN0IhiSnKBhBpK" "_id": "acauFXJN5LMJlopUFUlEPs"
}, },
{ {
"__type__": "cc.PrivateNode", "__type__": "cc.PrivateNode",
...@@ -9718,7 +9718,7 @@ ...@@ -9718,7 +9718,7 @@
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"showInEditor": false, "showInEditor": false,
"_id": "1cF9flTnRIh6THv5YRS1me" "_id": "8a5pae58xLoblzIdmILC5t"
}, },
{ {
"__type__": "cc.Label", "__type__": "cc.Label",
...@@ -9751,7 +9751,7 @@ ...@@ -9751,7 +9751,7 @@
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 0, "_N$overflow": 0,
"_N$cacheMode": 0, "_N$cacheMode": 0,
"_id": "11IZb+OaBN3ZtUDCAbE0qO" "_id": "63Rus5B4VJXoor2WYg/KYw"
}, },
{ {
"__type__": "cc.PrivateNode", "__type__": "cc.PrivateNode",
...@@ -9814,7 +9814,7 @@ ...@@ -9814,7 +9814,7 @@
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"showInEditor": false, "showInEditor": false,
"_id": "22S3fbsc1MyoUZXWhJzD93" "_id": "d2g2Q5+UNHmqjQjBqpmYov"
}, },
{ {
"__type__": "cc.Label", "__type__": "cc.Label",
...@@ -9847,7 +9847,7 @@ ...@@ -9847,7 +9847,7 @@
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 0, "_N$overflow": 0,
"_N$cacheMode": 0, "_N$cacheMode": 0,
"_id": "5ehOgC1gVAyqyhdo1Y1TK3" "_id": "a4Ze/wPmFI4pDt6Yc3H1Lr"
}, },
{ {
"__type__": "cc.RichText", "__type__": "cc.RichText",
...@@ -12593,7 +12593,7 @@ ...@@ -12593,7 +12593,7 @@
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"showInEditor": false, "showInEditor": false,
"_id": "c5XxfOz+pBIKlUxpn33qPZ" "_id": "75JZGWHSxN4px6cwOcUScA"
}, },
{ {
"__type__": "cc.Label", "__type__": "cc.Label",
...@@ -12626,7 +12626,7 @@ ...@@ -12626,7 +12626,7 @@
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 0, "_N$overflow": 0,
"_N$cacheMode": 0, "_N$cacheMode": 0,
"_id": "3dH28lkatCt7iba5Ux7Swu" "_id": "71s0LOK7lIf72+59/+bBoh"
}, },
{ {
"__type__": "cc.PrivateNode", "__type__": "cc.PrivateNode",
...@@ -12689,7 +12689,7 @@ ...@@ -12689,7 +12689,7 @@
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"showInEditor": false, "showInEditor": false,
"_id": "bcOx3mSTJDeLtiqf2BPtff" "_id": "3e/E6NTdZAtonB/05Idx2m"
}, },
{ {
"__type__": "cc.Label", "__type__": "cc.Label",
...@@ -12722,7 +12722,7 @@ ...@@ -12722,7 +12722,7 @@
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 0, "_N$overflow": 0,
"_N$cacheMode": 0, "_N$cacheMode": 0,
"_id": "ddxve+MlpGKpSgtP5KMGPr" "_id": "7ahU+b4J5GlbQ1Y1zp1Nsh"
}, },
{ {
"__type__": "cc.PrivateNode", "__type__": "cc.PrivateNode",
...@@ -12785,7 +12785,7 @@ ...@@ -12785,7 +12785,7 @@
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"showInEditor": false, "showInEditor": false,
"_id": "6bwMNoKPxNt7tXjHt/ti+5" "_id": "96z3BFLh1ORp0ZQUcmtg/S"
}, },
{ {
"__type__": "cc.Label", "__type__": "cc.Label",
...@@ -12818,7 +12818,7 @@ ...@@ -12818,7 +12818,7 @@
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 0, "_N$overflow": 0,
"_N$cacheMode": 0, "_N$cacheMode": 0,
"_id": "d1MntIJXtBK6QV6EcVeYG+" "_id": "2bh05IALRIY4iiANFB8URq"
}, },
{ {
"__type__": "cc.RichText", "__type__": "cc.RichText",
...@@ -34737,16 +34737,19 @@ ...@@ -34737,16 +34737,19 @@
"__id__": 757 "__id__": 757
}, },
{ {
"__id__": 763 "__id__": 761
},
{
"__id__": 767
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 766 "__id__": 770
}, },
{ {
"__id__": 767 "__id__": 771
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -34879,7 +34882,7 @@ ...@@ -34879,7 +34882,7 @@
"_mute": false, "_mute": false,
"_isFullscreen": false, "_isFullscreen": false,
"_N$isFullscreen": false, "_N$isFullscreen": false,
"_stayOnBottom": false, "_stayOnBottom": true,
"videoPlayerEvent": [], "videoPlayerEvent": [],
"_N$keepAspectRatio": true, "_N$keepAspectRatio": true,
"_id": "58utnq+VJFsq6KmVUKGAxa" "_id": "58utnq+VJFsq6KmVUKGAxa"
...@@ -35066,7 +35069,7 @@ ...@@ -35066,7 +35069,7 @@
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "a6392d3f-096c-4299-ab18-cdd0ee2b21d0" "__uuid__": "a6392d3f-096c-4299-ab18-cdd0ee2b21d0"
}, },
"_type": 0, "_type": 1,
"_sizeMode": 0, "_sizeMode": 0,
"_fillType": 0, "_fillType": 0,
"_fillCenter": { "_fillCenter": {
...@@ -35249,7 +35252,7 @@ ...@@ -35249,7 +35252,7 @@
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "b051fe84-93fd-4c49-912f-f8da503c2443" "__uuid__": "b051fe84-93fd-4c49-912f-f8da503c2443"
}, },
"_type": 0, "_type": 1,
"_sizeMode": 0, "_sizeMode": 0,
"_fillType": 0, "_fillType": 0,
"_fillCenter": { "_fillCenter": {
...@@ -35292,7 +35295,7 @@ ...@@ -35292,7 +35295,7 @@
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "back", "_name": "mask",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 744 "__id__": 744
...@@ -35308,9 +35311,202 @@ ...@@ -35308,9 +35311,202 @@
}, },
{ {
"__id__": 760 "__id__": 760
}
],
"_prefab": null,
"_opacity": 0,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 1280,
"height": 720
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
0,
0,
0,
0,
0,
0,
1,
1,
1,
1
]
},
"_eulerAngles": {
"__type__": "cc.Vec3",
"x": 0,
"y": 0,
"z": 0
},
"_skewX": 0,
"_skewY": 0,
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "87sIbfODhEaqWmbiqNwwqC"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 757
},
"_enabled": true,
"_materials": [],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "a23235d1-15db-4b95-8439-a2e005bfff91"
},
"_type": 0,
"_sizeMode": 0,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "eflCBwWEtA6qekId3kqlu9"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 757
},
"_enabled": true,
"alignMode": 1,
"_target": null,
"_alignFlags": 45,
"_left": 0,
"_right": 0,
"_top": 0,
"_bottom": 0,
"_verticalCenter": 0,
"_horizontalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 1280,
"_originalHeight": 720,
"_id": "1aeL2N7M5AN5YaPJd+Tqox"
}, },
{
"__type__": "cc.Button",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 757
},
"_enabled": true,
"_normalMaterial": null,
"_grayMaterial": null,
"duration": 0.1,
"zoomScale": 1.2,
"clickEvents": [],
"_N$interactable": true,
"_N$enableAutoGrayEffect": false,
"_N$transition": 0,
"transition": 0,
"_N$normalColor": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_N$pressedColor": {
"__type__": "cc.Color",
"r": 211,
"g": 211,
"b": 211,
"a": 255
},
"pressedColor": {
"__type__": "cc.Color",
"r": 211,
"g": 211,
"b": 211,
"a": 255
},
"_N$hoverColor": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"hoverColor": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_N$disabledColor": {
"__type__": "cc.Color",
"r": 124,
"g": 124,
"b": 124,
"a": 255
},
"_N$normalSprite": null,
"_N$pressedSprite": null,
"pressedSprite": null,
"_N$hoverSprite": null,
"hoverSprite": null,
"_N$disabledSprite": null,
"_N$target": {
"__id__": 757
},
"_id": "9fClxAegdJnoaP35o44+rP"
},
{
"__type__": "cc.Node",
"_name": "back",
"_objFlags": 0,
"_parent": {
"__id__": 744
},
"_children": [],
"_active": true,
"_components": [
{ {
"__id__": 762 "__id__": 762
},
{
"__id__": 763
},
{
"__id__": 764
},
{
"__id__": 766
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -35366,7 +35562,7 @@ ...@@ -35366,7 +35562,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 757 "__id__": 761
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -35398,7 +35594,7 @@ ...@@ -35398,7 +35594,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 757 "__id__": 761
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -35425,7 +35621,7 @@ ...@@ -35425,7 +35621,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 757 "__id__": 761
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -35434,7 +35630,7 @@ ...@@ -35434,7 +35630,7 @@
"zoomScale": 1.2, "zoomScale": 1.2,
"clickEvents": [ "clickEvents": [
{ {
"__id__": 761 "__id__": 765
} }
], ],
"_N$interactable": true, "_N$interactable": true,
...@@ -35490,14 +35686,14 @@ ...@@ -35490,14 +35686,14 @@
"hoverSprite": null, "hoverSprite": null,
"_N$disabledSprite": null, "_N$disabledSprite": null,
"_N$target": { "_N$target": {
"__id__": 757 "__id__": 761
}, },
"_id": "63efETDzBJTq9PD1gP/oLR" "_id": "63efETDzBJTq9PD1gP/oLR"
}, },
{ {
"__type__": "cc.ClickEvent", "__type__": "cc.ClickEvent",
"target": { "target": {
"__id__": 757 "__id__": 761
}, },
"component": "", "component": "",
"_componentId": "9c154tqr7dIDptMURdYlia+", "_componentId": "9c154tqr7dIDptMURdYlia+",
...@@ -35509,7 +35705,7 @@ ...@@ -35509,7 +35705,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 757 "__id__": 761
}, },
"_enabled": true, "_enabled": true,
"_id": "6bO/s4q0JC/7tFb3YzguFS" "_id": "6bO/s4q0JC/7tFb3YzguFS"
...@@ -35525,10 +35721,10 @@ ...@@ -35525,10 +35721,10 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 764 "__id__": 768
}, },
{ {
"__id__": 765 "__id__": 769
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -35584,7 +35780,7 @@ ...@@ -35584,7 +35780,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 763 "__id__": 767
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -35616,7 +35812,7 @@ ...@@ -35616,7 +35812,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 763 "__id__": 767
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -35677,7 +35873,7 @@ ...@@ -35677,7 +35873,7 @@
"hoverSprite": null, "hoverSprite": null,
"_N$disabledSprite": null, "_N$disabledSprite": null,
"_N$target": { "_N$target": {
"__id__": 763 "__id__": 767
}, },
"_id": "a3qfAeWZdLRbldRWbD/SHz" "_id": "a3qfAeWZdLRbldRWbD/SHz"
}, },
...@@ -35699,7 +35895,7 @@ ...@@ -35699,7 +35895,7 @@
"__id__": 749 "__id__": 749
}, },
"playBtn": { "playBtn": {
"__id__": 763 "__id__": 767
}, },
"videoplayer": { "videoplayer": {
"__id__": 746 "__id__": 746
......
...@@ -41,7 +41,7 @@ export default class SceneComponent extends MyCocosSceneComponent { ...@@ -41,7 +41,7 @@ export default class SceneComponent extends MyCocosSceneComponent {
initData() { initData() {
const middleLayer = cc.find('middleLayer'); const middleLayer = cc.find('middleLayer');
if (!middleLayer) { if (!middleLayer) {
cc.sys.localStorage.setItem('token', 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6NCwicGhvbmUiOiIxNTUwMDAwMDAwMSIsInNpZ24iOiI2NjAyMDk3ZS1iNjdmLTQ2ZjEtOTEyNC1lZmM4N2QzMmNmMjIiLCJpYXQiOjE2NTU4MDE1NzEsImV4cCI6MTY1ODM5MzU3MX0.JSdRYQKkzxQHAUqwvh4T9Rd8fe511wO92Dlk-R97EQg'); cc.sys.localStorage.setItem('token', 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6NCwicGhvbmUiOiIxNTUwMDAwMDAwMSIsInNpZ24iOiIyNWRmYjI4NS1mODIxLTRlMmQtOWI5NS1kM2I3ZDU5YmRjZDUiLCJpYXQiOjE2NTU4MDQ3MTAsImV4cCI6MTY1ODM5NjcxMH0.V2LzxdxnyWKF1rnbXAK8zyslurzOUq0bE_DEdWD5Cv0');
} }
this.token = cc.sys.localStorage.getItem("token"); this.token = cc.sys.localStorage.getItem("token");
} }
......
...@@ -79,7 +79,7 @@ export default class NewClass extends MyCocosSceneComponent { ...@@ -79,7 +79,7 @@ export default class NewClass extends MyCocosSceneComponent {
closeVideo() { closeVideo() {
this.videoplayer.stop(); this.videoplayer.stop();
if (this.playAudioId) { if (this.playAudioId!=null) {
cc.audioEngine.stop(this.playAudioId); cc.audioEngine.stop(this.playAudioId);
} }
this.dot.x = this.dotX; this.dot.x = this.dotX;
...@@ -97,15 +97,16 @@ export default class NewClass extends MyCocosSceneComponent { ...@@ -97,15 +97,16 @@ export default class NewClass extends MyCocosSceneComponent {
buttonOnClick(this.playBtn, () => { buttonOnClick(this.playBtn, () => {
this.videoplayer.play(); this.videoplayer.play();
if (this.playAudioId) { if (this.playAudioId!=null) {
cc.audioEngine.resume(this.playAudioId); cc.audioEngine.resume(this.playAudioId);
} }
}); });
this.videoplayer.node.on('clicked', () => { const mask = cc.find(`Canvas/videoContainer/mask`);
mask.on('click', () => {
if (this.videoplayer.isPlaying()) { if (this.videoplayer.isPlaying()) {
this.videoplayer.pause(); this.videoplayer.pause();
if (this.playAudioId) { if (this.playAudioId!=null) {
cc.audioEngine.pause(this.playAudioId); cc.audioEngine.pause(this.playAudioId);
} }
this.playBtn.active = true; this.playBtn.active = true;
...@@ -140,7 +141,9 @@ export default class NewClass extends MyCocosSceneComponent { ...@@ -140,7 +141,9 @@ export default class NewClass extends MyCocosSceneComponent {
console.error(err); console.error(err);
return; return;
} }
if (this.videoplayer.isPlaying()) {
this.playAudioId = cc.audioEngine.play(audioClip, false, 1); this.playAudioId = cc.audioEngine.play(audioClip, false, 1);
}
}); });
} }
......
...@@ -28,8 +28,8 @@ ...@@ -28,8 +28,8 @@
"rawHeight": 10, "rawHeight": 10,
"borderTop": 0, "borderTop": 0,
"borderBottom": 0, "borderBottom": 0,
"borderLeft": 0, "borderLeft": 5,
"borderRight": 0, "borderRight": 5,
"subMetas": {} "subMetas": {}
} }
} }
......
...@@ -28,8 +28,8 @@ ...@@ -28,8 +28,8 @@
"rawHeight": 10, "rawHeight": 10,
"borderTop": 0, "borderTop": 0,
"borderBottom": 0, "borderBottom": 0,
"borderLeft": 0, "borderLeft": 5,
"borderRight": 0, "borderRight": 5,
"subMetas": {} "subMetas": {}
} }
} }
......
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