Commit 2fbdb2a9 authored by asdf's avatar asdf

fix bugs

parent b94e21b6
{"name":"NewProject_2","isGlobal":0,"version":"5.5","armature":[{"name":"Armature","ik":[],"defaultActions":[{"gotoAndPlay":"newAnimation"}],"slot":[{"name":"图层_2","color":{},"parent":"root"},{"name":"眼1","displayIndex":2,"color":{},"z":1,"parent":"眼1"}],"bone":[{"name":"root","transform":{}},{"name":"眼1","transform":{"x":13.2,"y":-38.85},"parent":"root"}],"aabb":{"x":-68,"height":181,"y":-87,"width":131},"frameRate":24,"animation":[{"name":"newAnimation","frame":[],"duration":44,"slot":[{"name":"图层_2","colorFrame":[],"displayFrame":[]},{"name":"眼1","colorFrame":[],"displayFrame":[{"duration":20},{"duration":2},{"value":1,"duration":2},{"value":2,"duration":2},{"value":1,"duration":2},{"duration":16},{"duration":0}]}],"bone":[{"name":"root","scaleFrame":[],"translateFrame":[],"rotateFrame":[]},{"name":"眼1","scaleFrame":[],"translateFrame":[],"rotateFrame":[]}],"playTimes":0,"ffd":[],"ik":[]}],"type":"Armature","skin":[{"name":"","slot":[{"name":"图层_2","display":[{"name":"测试骨骼/图层_2","transform":{"x":-2.5,"y":3.5},"type":"image","path":"测试骨骼/图层_2"}]},{"name":"眼1","display":[{"name":"测试骨骼/眼1","transform":{"x":-14.7,"y":-1.65},"type":"image","path":"测试骨骼/眼1"},{"name":"测试骨骼/眼2","transform":{"x":-14.7,"y":-1.65},"type":"image","path":"测试骨骼/眼2"},{"name":"测试骨骼/眼3","transform":{"x":-14.7,"y":-1.65},"type":"image","path":"测试骨骼/眼3"}]}]}]}],"frameRate":24}
\ No newline at end of file
{
"ver": "1.0.1",
"uuid": "e1623214-88d6-4d1e-a124-6d36cb382bce",
"subMetas": {}
}
\ No newline at end of file
{"name":"NewProject_2","SubTexture":[{"name":"测试骨骼/图层_2","x":1,"height":181,"y":1,"width":131},{"name":"测试骨骼/眼3","x":1,"height":15,"y":201,"width":43},{"name":"测试骨骼/眼2","x":1,"height":15,"y":218,"width":43},{"name":"测试骨骼/眼1","x":1,"height":15,"y":184,"width":43}],"imagePath":"NewProject_2_tex.png","height":256,"width":256}
\ No newline at end of file
{
"ver": "1.0.1",
"uuid": "4791f23e-a9c9-4e6f-9366-55004bc2890a",
"subMetas": {}
}
\ No newline at end of file
{
"ver": "2.3.5",
"uuid": "7029a1cf-56e3-49b4-976d-5919e29829f9",
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 256,
"height": 256,
"platformSettings": {},
"subMetas": {
"NewProject_2_tex": {
"ver": "1.0.4",
"uuid": "f621ad8c-a101-4f46-a241-46985d60f980",
"rawTextureUuid": "7029a1cf-56e3-49b4-976d-5919e29829f9",
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": -61.5,
"offsetY": 11,
"trimX": 1,
"trimY": 1,
"width": 131,
"height": 232,
"rawWidth": 256,
"rawHeight": 256,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"subMetas": {}
}
}
}
\ No newline at end of file
...@@ -282,7 +282,7 @@ ...@@ -282,7 +282,7 @@
"asset": { "asset": {
"__uuid__": "d0bbc3e4-1049-4c6e-acd5-5e98b8b1d919" "__uuid__": "d0bbc3e4-1049-4c6e-acd5-5e98b8b1d919"
}, },
"fileId": "3e5rukzpxAba/f3Pd2Ra3R", "fileId": "bcDgWbLwtA9rJt8TwOlh4O",
"sync": false "sync": false
}, },
{ {
...@@ -389,7 +389,7 @@ ...@@ -389,7 +389,7 @@
"asset": { "asset": {
"__uuid__": "d0bbc3e4-1049-4c6e-acd5-5e98b8b1d919" "__uuid__": "d0bbc3e4-1049-4c6e-acd5-5e98b8b1d919"
}, },
"fileId": "aflfdLMG1HgZbwxI/rkT97", "fileId": "c62bs3KSZOcpt7Eg3PMYH2",
"sync": false "sync": false
}, },
{ {
...@@ -500,7 +500,7 @@ ...@@ -500,7 +500,7 @@
"asset": { "asset": {
"__uuid__": "d0bbc3e4-1049-4c6e-acd5-5e98b8b1d919" "__uuid__": "d0bbc3e4-1049-4c6e-acd5-5e98b8b1d919"
}, },
"fileId": "19A25CMkRDWY0CvPcDlfNG", "fileId": "17Gg1SHUxKqqojVin6knKm",
"sync": false "sync": false
}, },
{ {
...@@ -530,7 +530,7 @@ ...@@ -530,7 +530,7 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 198.37, "width": 0,
"height": 47.88 "height": 47.88
}, },
"_anchorPoint": { "_anchorPoint": {
...@@ -611,7 +611,7 @@ ...@@ -611,7 +611,7 @@
"asset": { "asset": {
"__uuid__": "d0bbc3e4-1049-4c6e-acd5-5e98b8b1d919" "__uuid__": "d0bbc3e4-1049-4c6e-acd5-5e98b8b1d919"
}, },
"fileId": "c98048GW5CjYMVJXy6DSEe", "fileId": "24gXwOSBNBP6y5RPUvEw/W",
"sync": false "sync": false
}, },
{ {
...@@ -790,7 +790,7 @@ ...@@ -790,7 +790,7 @@
"asset": { "asset": {
"__uuid__": "d0bbc3e4-1049-4c6e-acd5-5e98b8b1d919" "__uuid__": "d0bbc3e4-1049-4c6e-acd5-5e98b8b1d919"
}, },
"fileId": "dfK9huSb9Cdo0kx/E+2Sam", "fileId": "c3erE1W7VEILZQo64VZwFa",
"sync": false "sync": false
}, },
{ {
...@@ -821,7 +821,7 @@ ...@@ -821,7 +821,7 @@
"asset": { "asset": {
"__uuid__": "d0bbc3e4-1049-4c6e-acd5-5e98b8b1d919" "__uuid__": "d0bbc3e4-1049-4c6e-acd5-5e98b8b1d919"
}, },
"fileId": "e209CawhJIWpYr+skoJ55t", "fileId": "b0CI2KZR9NcafFaRCdNr/q",
"sync": false "sync": false
}, },
{ {
...@@ -928,7 +928,7 @@ ...@@ -928,7 +928,7 @@
"asset": { "asset": {
"__uuid__": "d0bbc3e4-1049-4c6e-acd5-5e98b8b1d919" "__uuid__": "d0bbc3e4-1049-4c6e-acd5-5e98b8b1d919"
}, },
"fileId": "8dE8iimi9HlppUYFeS7USI", "fileId": "13u4pgM3dEj4A4GdnddxIE",
"sync": false "sync": false
}, },
{ {
...@@ -1103,7 +1103,7 @@ ...@@ -1103,7 +1103,7 @@
"asset": { "asset": {
"__uuid__": "d0bbc3e4-1049-4c6e-acd5-5e98b8b1d919" "__uuid__": "d0bbc3e4-1049-4c6e-acd5-5e98b8b1d919"
}, },
"fileId": "055a1cOV9MXoJ8xZY3ClfS", "fileId": "fdOgkWFbtAJZC0sMx/pZqm",
"sync": false "sync": false
}, },
{ {
...@@ -1196,7 +1196,7 @@ ...@@ -1196,7 +1196,7 @@
"asset": { "asset": {
"__uuid__": "d0bbc3e4-1049-4c6e-acd5-5e98b8b1d919" "__uuid__": "d0bbc3e4-1049-4c6e-acd5-5e98b8b1d919"
}, },
"fileId": "1cWcXzDEpI+LOCnHiF6C7H", "fileId": "c2gphpZ0dEp4qWFVKU06BB",
"sync": false "sync": false
}, },
{ {
...@@ -1303,7 +1303,7 @@ ...@@ -1303,7 +1303,7 @@
"asset": { "asset": {
"__uuid__": "d0bbc3e4-1049-4c6e-acd5-5e98b8b1d919" "__uuid__": "d0bbc3e4-1049-4c6e-acd5-5e98b8b1d919"
}, },
"fileId": "41SLQfAexEeqIXNExAC+LC", "fileId": "4aPELOLhBHD7W15z2R+9Zk",
"sync": false "sync": false
}, },
{ {
...@@ -1342,7 +1342,7 @@ ...@@ -1342,7 +1342,7 @@
"asset": { "asset": {
"__uuid__": "d0bbc3e4-1049-4c6e-acd5-5e98b8b1d919" "__uuid__": "d0bbc3e4-1049-4c6e-acd5-5e98b8b1d919"
}, },
"fileId": "c91agvmMFGz4auqGVofiBr", "fileId": "26Cnf1D/5H76jAyNzv+ibP",
"sync": false "sync": false
}, },
{ {
...@@ -1414,8 +1414,8 @@ ...@@ -1414,8 +1414,8 @@
0, 0,
0, 0,
0, 0,
0, 0.10452846326765347,
1, 0.9945218953682733,
0.63, 0.63,
0.63, 0.63,
1 1
...@@ -1425,7 +1425,7 @@ ...@@ -1425,7 +1425,7 @@
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 0, "x": 0,
"y": 0, "y": 0,
"z": 0 "z": 12
}, },
"_skewX": 0, "_skewX": 0,
"_skewY": 0, "_skewY": 0,
...@@ -1478,8 +1478,8 @@ ...@@ -1478,8 +1478,8 @@
0, 0,
0, 0,
0, 0,
0.11320321376790672, 0,
0.9935718556765875, 1,
1, 1,
1, 1,
1 1
...@@ -1489,7 +1489,7 @@ ...@@ -1489,7 +1489,7 @@
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 0, "x": 0,
"y": 0, "y": 0,
"z": 13 "z": 0
}, },
"_skewX": 0, "_skewX": 0,
"_skewY": 0, "_skewY": 0,
...@@ -1538,7 +1538,7 @@ ...@@ -1538,7 +1538,7 @@
"asset": { "asset": {
"__uuid__": "d0bbc3e4-1049-4c6e-acd5-5e98b8b1d919" "__uuid__": "d0bbc3e4-1049-4c6e-acd5-5e98b8b1d919"
}, },
"fileId": "0davJK98ZPbrvv45prAvwX", "fileId": "5dcpva/X1FnbgsB7gzr8xo",
"sync": false "sync": false
}, },
{ {
...@@ -1585,8 +1585,8 @@ ...@@ -1585,8 +1585,8 @@
0, 0,
0, 0,
0, 0,
0.11320321376790672, 0,
0.9935718556765875, 1,
1, 1,
1, 1,
1 1
...@@ -1596,7 +1596,7 @@ ...@@ -1596,7 +1596,7 @@
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 0, "x": 0,
"y": 0, "y": 0,
"z": 13 "z": 0
}, },
"_skewX": 0, "_skewX": 0,
"_skewY": 0, "_skewY": 0,
...@@ -1645,7 +1645,7 @@ ...@@ -1645,7 +1645,7 @@
"asset": { "asset": {
"__uuid__": "d0bbc3e4-1049-4c6e-acd5-5e98b8b1d919" "__uuid__": "d0bbc3e4-1049-4c6e-acd5-5e98b8b1d919"
}, },
"fileId": "3bJmN8BmFCAJwI0B8BHcyc", "fileId": "a5auJ65dJDLorsVZM75Pdp",
"sync": false "sync": false
}, },
{ {
...@@ -1692,8 +1692,8 @@ ...@@ -1692,8 +1692,8 @@
0, 0,
0, 0,
0, 0,
0.11320321376790672, 0,
0.9935718556765875, 1,
1, 1,
1, 1,
1 1
...@@ -1703,7 +1703,7 @@ ...@@ -1703,7 +1703,7 @@
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 0, "x": 0,
"y": 0, "y": 0,
"z": 13 "z": 0
}, },
"_skewX": 0, "_skewX": 0,
"_skewY": 0, "_skewY": 0,
...@@ -1756,7 +1756,7 @@ ...@@ -1756,7 +1756,7 @@
"asset": { "asset": {
"__uuid__": "d0bbc3e4-1049-4c6e-acd5-5e98b8b1d919" "__uuid__": "d0bbc3e4-1049-4c6e-acd5-5e98b8b1d919"
}, },
"fileId": "bfK+FX4TlK4Z5Ty01DLjQv", "fileId": "9dVDS7IfxLlpbdmUKlJgdz",
"sync": false "sync": false
}, },
{ {
...@@ -1798,13 +1798,13 @@ ...@@ -1798,13 +1798,13 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
27.047, -3.115,
-159.482, -159.482,
0, 0,
0, 0,
0, 0,
0.11320321376790672, 0,
0.9935718556765875, 1,
1, 1,
1, 1,
1 1
...@@ -1814,7 +1814,7 @@ ...@@ -1814,7 +1814,7 @@
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 0, "x": 0,
"y": 0, "y": 0,
"z": 13 "z": 0
}, },
"_skewX": 0, "_skewX": 0,
"_skewY": 0, "_skewY": 0,
...@@ -1867,7 +1867,7 @@ ...@@ -1867,7 +1867,7 @@
"asset": { "asset": {
"__uuid__": "d0bbc3e4-1049-4c6e-acd5-5e98b8b1d919" "__uuid__": "d0bbc3e4-1049-4c6e-acd5-5e98b8b1d919"
}, },
"fileId": "29HB1ZnyFBr7JTQB2GqEcc", "fileId": "c95rKDvShOwLZDoxWGuHrs",
"sync": false "sync": false
}, },
{ {
...@@ -1918,8 +1918,8 @@ ...@@ -1918,8 +1918,8 @@
0, 0,
0, 0,
0, 0,
0.11320321376790672, 0,
0.9935718556765875, 1,
1, 1,
1, 1,
1 1
...@@ -1929,7 +1929,7 @@ ...@@ -1929,7 +1929,7 @@
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 0, "x": 0,
"y": 0, "y": 0,
"z": 13 "z": 0
}, },
"_skewX": 0, "_skewX": 0,
"_skewY": 0, "_skewY": 0,
...@@ -2046,7 +2046,7 @@ ...@@ -2046,7 +2046,7 @@
"asset": { "asset": {
"__uuid__": "d0bbc3e4-1049-4c6e-acd5-5e98b8b1d919" "__uuid__": "d0bbc3e4-1049-4c6e-acd5-5e98b8b1d919"
}, },
"fileId": "b0MZ5CirFNmawHqlsb/y7E", "fileId": "d7Gw8xvqhIbKxe/CyD1i8w",
"sync": false "sync": false
}, },
{ {
...@@ -2077,7 +2077,7 @@ ...@@ -2077,7 +2077,7 @@
"asset": { "asset": {
"__uuid__": "d0bbc3e4-1049-4c6e-acd5-5e98b8b1d919" "__uuid__": "d0bbc3e4-1049-4c6e-acd5-5e98b8b1d919"
}, },
"fileId": "63ap0ZisVFj6AzALjRIwh2", "fileId": "e89oqag+hN67e6lkF/8gFu",
"sync": false "sync": false
}, },
{ {
...@@ -2124,8 +2124,8 @@ ...@@ -2124,8 +2124,8 @@
0, 0,
0, 0,
0, 0,
0.11320321376790672, 0,
0.9935718556765875, 1,
1, 1,
1, 1,
1 1
...@@ -2135,7 +2135,7 @@ ...@@ -2135,7 +2135,7 @@
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 0, "x": 0,
"y": 0, "y": 0,
"z": 13 "z": 0
}, },
"_skewX": 0, "_skewX": 0,
"_skewY": 0, "_skewY": 0,
...@@ -2184,7 +2184,7 @@ ...@@ -2184,7 +2184,7 @@
"asset": { "asset": {
"__uuid__": "d0bbc3e4-1049-4c6e-acd5-5e98b8b1d919" "__uuid__": "d0bbc3e4-1049-4c6e-acd5-5e98b8b1d919"
}, },
"fileId": "37dY9BP1JKHar/SozBi2sQ", "fileId": "58vfSRrEZOHaCDs0S14i5f",
"sync": false "sync": false
}, },
{ {
...@@ -2230,13 +2230,13 @@ ...@@ -2230,13 +2230,13 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
124.981, 143.963,
109.572, 76.677,
0,
0, 0,
0, 0,
0, 0,
1, -0.10452846326765347,
0.9945218953682733,
1, 1,
1, 1,
0 0
...@@ -2246,7 +2246,7 @@ ...@@ -2246,7 +2246,7 @@
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 0, "x": 0,
"y": 0, "y": 0,
"z": 0 "z": -12
}, },
"_skewX": 0, "_skewX": 0,
"_skewY": 0, "_skewY": 0,
...@@ -2359,7 +2359,7 @@ ...@@ -2359,7 +2359,7 @@
"asset": { "asset": {
"__uuid__": "d0bbc3e4-1049-4c6e-acd5-5e98b8b1d919" "__uuid__": "d0bbc3e4-1049-4c6e-acd5-5e98b8b1d919"
}, },
"fileId": "f2YYckAIZJ/I6fnk0xi3qt", "fileId": "60hfe47PdGDL6Ya5CDieYW",
"sync": false "sync": false
}, },
{ {
...@@ -2452,7 +2452,7 @@ ...@@ -2452,7 +2452,7 @@
"asset": { "asset": {
"__uuid__": "d0bbc3e4-1049-4c6e-acd5-5e98b8b1d919" "__uuid__": "d0bbc3e4-1049-4c6e-acd5-5e98b8b1d919"
}, },
"fileId": "47nuwYh71PDbHsxLikVUBO", "fileId": "4cupVM+U9HZa0uLYXGvEff",
"sync": false "sync": false
}, },
{ {
...@@ -2499,8 +2499,8 @@ ...@@ -2499,8 +2499,8 @@
0, 0,
0, 0,
0, 0,
0.11320321376790672, 0,
0.9935718556765875, 1,
1, 1,
1, 1,
1 1
...@@ -2510,7 +2510,7 @@ ...@@ -2510,7 +2510,7 @@
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 0, "x": 0,
"y": 0, "y": 0,
"z": 13 "z": 0
}, },
"_skewX": 0, "_skewX": 0,
"_skewY": 0, "_skewY": 0,
...@@ -2559,7 +2559,7 @@ ...@@ -2559,7 +2559,7 @@
"asset": { "asset": {
"__uuid__": "d0bbc3e4-1049-4c6e-acd5-5e98b8b1d919" "__uuid__": "d0bbc3e4-1049-4c6e-acd5-5e98b8b1d919"
}, },
"fileId": "7bhXvLuKpL7rNaLNPZ3s5T", "fileId": "a5zsMksTFD07CMQZdLZHLf",
"sync": false "sync": false
}, },
{ {
...@@ -2598,7 +2598,7 @@ ...@@ -2598,7 +2598,7 @@
"asset": { "asset": {
"__uuid__": "d0bbc3e4-1049-4c6e-acd5-5e98b8b1d919" "__uuid__": "d0bbc3e4-1049-4c6e-acd5-5e98b8b1d919"
}, },
"fileId": "6ayE0AHYtPzZ1styByYKcR", "fileId": "cfaawEZsxFDrzgcqEX5drZ",
"sync": false "sync": false
}, },
{ {
...@@ -2670,8 +2670,8 @@ ...@@ -2670,8 +2670,8 @@
0, 0,
0, 0,
0, 0,
0, -0.09584575252022398,
1, 0.9953961983671789,
0.63, 0.63,
0.63, 0.63,
1 1
...@@ -2681,7 +2681,7 @@ ...@@ -2681,7 +2681,7 @@
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 0, "x": 0,
"y": 0, "y": 0,
"z": 0 "z": -11
}, },
"_skewX": 0, "_skewX": 0,
"_skewY": 0, "_skewY": 0,
...@@ -2734,8 +2734,8 @@ ...@@ -2734,8 +2734,8 @@
0, 0,
0, 0,
0, 0,
-0.08715574274765817, 0,
0.9961946980917455, 1,
1, 1,
1, 1,
1 1
...@@ -2745,7 +2745,7 @@ ...@@ -2745,7 +2745,7 @@
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 0, "x": 0,
"y": 0, "y": 0,
"z": -10 "z": 0
}, },
"_skewX": 0, "_skewX": 0,
"_skewY": 0, "_skewY": 0,
...@@ -2794,7 +2794,7 @@ ...@@ -2794,7 +2794,7 @@
"asset": { "asset": {
"__uuid__": "d0bbc3e4-1049-4c6e-acd5-5e98b8b1d919" "__uuid__": "d0bbc3e4-1049-4c6e-acd5-5e98b8b1d919"
}, },
"fileId": "b2Rxvcn9dJ77DIDBMhwgCk", "fileId": "c6QEtcxFVOGLG/zqui9qzW",
"sync": false "sync": false
}, },
{ {
...@@ -2841,8 +2841,8 @@ ...@@ -2841,8 +2841,8 @@
0, 0,
0, 0,
0, 0,
-0.08715574274765817, 0,
0.9961946980917455, 1,
1, 1,
1, 1,
1 1
...@@ -2852,7 +2852,7 @@ ...@@ -2852,7 +2852,7 @@
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 0, "x": 0,
"y": 0, "y": 0,
"z": -10 "z": 0
}, },
"_skewX": 0, "_skewX": 0,
"_skewY": 0, "_skewY": 0,
...@@ -2901,7 +2901,7 @@ ...@@ -2901,7 +2901,7 @@
"asset": { "asset": {
"__uuid__": "d0bbc3e4-1049-4c6e-acd5-5e98b8b1d919" "__uuid__": "d0bbc3e4-1049-4c6e-acd5-5e98b8b1d919"
}, },
"fileId": "b1xNrqGjlG2ZS7Ax7MDX0G", "fileId": "cfmmH47TlHXJyGcAYpRE0H",
"sync": false "sync": false
}, },
{ {
...@@ -2948,8 +2948,8 @@ ...@@ -2948,8 +2948,8 @@
0, 0,
0, 0,
0, 0,
-0.08715574274765817, 0,
0.9961946980917455, 1,
1, 1,
1, 1,
1 1
...@@ -2959,7 +2959,7 @@ ...@@ -2959,7 +2959,7 @@
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 0, "x": 0,
"y": 0, "y": 0,
"z": -10 "z": 0
}, },
"_skewX": 0, "_skewX": 0,
"_skewY": 0, "_skewY": 0,
...@@ -3012,7 +3012,7 @@ ...@@ -3012,7 +3012,7 @@
"asset": { "asset": {
"__uuid__": "d0bbc3e4-1049-4c6e-acd5-5e98b8b1d919" "__uuid__": "d0bbc3e4-1049-4c6e-acd5-5e98b8b1d919"
}, },
"fileId": "6bGZBfiRNF7pJtIT8StzzA", "fileId": "eaJkupnHJJ45OVNwba/3Oh",
"sync": false "sync": false
}, },
{ {
...@@ -3054,13 +3054,13 @@ ...@@ -3054,13 +3054,13 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-24.336, -7.598,
-125.685, -128.778,
0,
0, 0,
0, 0,
0, 0,
-0.08715574274765817, 1,
0.9961946980917455,
1, 1,
1, 1,
1 1
...@@ -3070,7 +3070,7 @@ ...@@ -3070,7 +3070,7 @@
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 0, "x": 0,
"y": 0, "y": 0,
"z": -10 "z": 0
}, },
"_skewX": 0, "_skewX": 0,
"_skewY": 0, "_skewY": 0,
...@@ -3123,7 +3123,7 @@ ...@@ -3123,7 +3123,7 @@
"asset": { "asset": {
"__uuid__": "d0bbc3e4-1049-4c6e-acd5-5e98b8b1d919" "__uuid__": "d0bbc3e4-1049-4c6e-acd5-5e98b8b1d919"
}, },
"fileId": "feSRqhacBMDrs+2nCHEFjQ", "fileId": "2fZrEwY85PFoLPRZfE9e+B",
"sync": false "sync": false
}, },
{ {
...@@ -3174,8 +3174,8 @@ ...@@ -3174,8 +3174,8 @@
0, 0,
0, 0,
0, 0,
-0.08715574274765817, 0,
0.9961946980917455, 1,
1, 1,
1, 1,
1 1
...@@ -3185,7 +3185,7 @@ ...@@ -3185,7 +3185,7 @@
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 0, "x": 0,
"y": 0, "y": 0,
"z": -10 "z": 0
}, },
"_skewX": 0, "_skewX": 0,
"_skewY": 0, "_skewY": 0,
...@@ -3302,7 +3302,7 @@ ...@@ -3302,7 +3302,7 @@
"asset": { "asset": {
"__uuid__": "d0bbc3e4-1049-4c6e-acd5-5e98b8b1d919" "__uuid__": "d0bbc3e4-1049-4c6e-acd5-5e98b8b1d919"
}, },
"fileId": "07gP/3G6NDr7oCusNZKnDg", "fileId": "a9SYDOQc1Fz642ix3jJDgc",
"sync": false "sync": false
}, },
{ {
...@@ -3333,7 +3333,7 @@ ...@@ -3333,7 +3333,7 @@
"asset": { "asset": {
"__uuid__": "d0bbc3e4-1049-4c6e-acd5-5e98b8b1d919" "__uuid__": "d0bbc3e4-1049-4c6e-acd5-5e98b8b1d919"
}, },
"fileId": "2ew5GHEopGVbiipl94E1Rs", "fileId": "67R0bEbmJLU6ozri6ZKXBN",
"sync": false "sync": false
}, },
{ {
...@@ -3380,8 +3380,8 @@ ...@@ -3380,8 +3380,8 @@
0, 0,
0, 0,
0, 0,
-0.08715574274765817, 0,
0.9961946980917455, 1,
1, 1,
1, 1,
1 1
...@@ -3391,7 +3391,7 @@ ...@@ -3391,7 +3391,7 @@
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 0, "x": 0,
"y": 0, "y": 0,
"z": -10 "z": 0
}, },
"_skewX": 0, "_skewX": 0,
"_skewY": 0, "_skewY": 0,
...@@ -3440,7 +3440,7 @@ ...@@ -3440,7 +3440,7 @@
"asset": { "asset": {
"__uuid__": "d0bbc3e4-1049-4c6e-acd5-5e98b8b1d919" "__uuid__": "d0bbc3e4-1049-4c6e-acd5-5e98b8b1d919"
}, },
"fileId": "c95OG8u25B7IY7Glq9KAI8", "fileId": "71Qwt3MYdPT7tT6EKN7beN",
"sync": false "sync": false
}, },
{ {
...@@ -3486,13 +3486,13 @@ ...@@ -3486,13 +3486,13 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
170.171, 151.468,
103.924, 126.17,
0,
0, 0,
0, 0,
0, 0,
1, 0.09584575252022398,
0.9953961983671789,
1, 1,
1, 1,
0 0
...@@ -3502,7 +3502,7 @@ ...@@ -3502,7 +3502,7 @@
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 0, "x": 0,
"y": 0, "y": 0,
"z": 0 "z": 11
}, },
"_skewX": 0, "_skewX": 0,
"_skewY": 0, "_skewY": 0,
...@@ -3615,7 +3615,7 @@ ...@@ -3615,7 +3615,7 @@
"asset": { "asset": {
"__uuid__": "d0bbc3e4-1049-4c6e-acd5-5e98b8b1d919" "__uuid__": "d0bbc3e4-1049-4c6e-acd5-5e98b8b1d919"
}, },
"fileId": "d0opkO+7NN8JQURrAyuASw", "fileId": "96iSBjPrlI1aFSpMwjclwI",
"sync": false "sync": false
}, },
{ {
...@@ -3708,7 +3708,7 @@ ...@@ -3708,7 +3708,7 @@
"asset": { "asset": {
"__uuid__": "d0bbc3e4-1049-4c6e-acd5-5e98b8b1d919" "__uuid__": "d0bbc3e4-1049-4c6e-acd5-5e98b8b1d919"
}, },
"fileId": "8fyJInunhKL4Eb6Lz8y1Dp", "fileId": "31blls8/pLuJ4uAdO/SIs0",
"sync": false "sync": false
}, },
{ {
...@@ -3755,8 +3755,8 @@ ...@@ -3755,8 +3755,8 @@
0, 0,
0, 0,
0, 0,
-0.08715574274765817, 0,
0.9961946980917455, 1,
1, 1,
1, 1,
1 1
...@@ -3766,7 +3766,7 @@ ...@@ -3766,7 +3766,7 @@
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 0, "x": 0,
"y": 0, "y": 0,
"z": -10 "z": 0
}, },
"_skewX": 0, "_skewX": 0,
"_skewY": 0, "_skewY": 0,
...@@ -3815,7 +3815,7 @@ ...@@ -3815,7 +3815,7 @@
"asset": { "asset": {
"__uuid__": "d0bbc3e4-1049-4c6e-acd5-5e98b8b1d919" "__uuid__": "d0bbc3e4-1049-4c6e-acd5-5e98b8b1d919"
}, },
"fileId": "4c0zkWWwBGt4u9SONO4UXu", "fileId": "b2uyE6jpNK5Iy5u49pvNYr",
"sync": false "sync": false
}, },
{ {
...@@ -3854,7 +3854,7 @@ ...@@ -3854,7 +3854,7 @@
"asset": { "asset": {
"__uuid__": "d0bbc3e4-1049-4c6e-acd5-5e98b8b1d919" "__uuid__": "d0bbc3e4-1049-4c6e-acd5-5e98b8b1d919"
}, },
"fileId": "be3+HZh6lA1oJ2pfR4VhjG", "fileId": "68k4upC+BENr6gXMpKtWL8",
"sync": false "sync": false
}, },
{ {
...@@ -3926,8 +3926,8 @@ ...@@ -3926,8 +3926,8 @@
0, 0,
0, 0,
0, 0,
0, 0.15643446504023087,
1, 0.9876883405951378,
0.62, 0.62,
0.62, 0.62,
1 1
...@@ -3937,7 +3937,7 @@ ...@@ -3937,7 +3937,7 @@
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 0, "x": 0,
"y": 0, "y": 0,
"z": 0 "z": 18
}, },
"_skewX": 0, "_skewX": 0,
"_skewY": 0, "_skewY": 0,
...@@ -3990,8 +3990,8 @@ ...@@ -3990,8 +3990,8 @@
0, 0,
0, 0,
0, 0,
0.15643446504023087, 0,
0.9876883405951378, 1,
1, 1,
1, 1,
1 1
...@@ -4001,7 +4001,7 @@ ...@@ -4001,7 +4001,7 @@
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 0, "x": 0,
"y": 0, "y": 0,
"z": 18 "z": 0
}, },
"_skewX": 0, "_skewX": 0,
"_skewY": 0, "_skewY": 0,
...@@ -4050,7 +4050,7 @@ ...@@ -4050,7 +4050,7 @@
"asset": { "asset": {
"__uuid__": "d0bbc3e4-1049-4c6e-acd5-5e98b8b1d919" "__uuid__": "d0bbc3e4-1049-4c6e-acd5-5e98b8b1d919"
}, },
"fileId": "07DygSN25AbKDwdz67cpy3", "fileId": "45bxCyJC1PpYOeGeOu6K6U",
"sync": false "sync": false
}, },
{ {
...@@ -4097,8 +4097,8 @@ ...@@ -4097,8 +4097,8 @@
0, 0,
0, 0,
0, 0,
0.15643446504023087, 0,
0.9876883405951378, 1,
1, 1,
1, 1,
1 1
...@@ -4108,7 +4108,7 @@ ...@@ -4108,7 +4108,7 @@
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 0, "x": 0,
"y": 0, "y": 0,
"z": 18 "z": 0
}, },
"_skewX": 0, "_skewX": 0,
"_skewY": 0, "_skewY": 0,
...@@ -4157,7 +4157,7 @@ ...@@ -4157,7 +4157,7 @@
"asset": { "asset": {
"__uuid__": "d0bbc3e4-1049-4c6e-acd5-5e98b8b1d919" "__uuid__": "d0bbc3e4-1049-4c6e-acd5-5e98b8b1d919"
}, },
"fileId": "46XTygDo9HRrv0cWXCOEJd", "fileId": "bciVFfBY9G+azNujNuF85q",
"sync": false "sync": false
}, },
{ {
...@@ -4204,8 +4204,8 @@ ...@@ -4204,8 +4204,8 @@
0, 0,
0, 0,
0, 0,
0.15643446504023087, 0,
0.9876883405951378, 1,
1, 1,
1, 1,
1 1
...@@ -4215,7 +4215,7 @@ ...@@ -4215,7 +4215,7 @@
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 0, "x": 0,
"y": 0, "y": 0,
"z": 18 "z": 0
}, },
"_skewX": 0, "_skewX": 0,
"_skewY": 0, "_skewY": 0,
...@@ -4268,7 +4268,7 @@ ...@@ -4268,7 +4268,7 @@
"asset": { "asset": {
"__uuid__": "d0bbc3e4-1049-4c6e-acd5-5e98b8b1d919" "__uuid__": "d0bbc3e4-1049-4c6e-acd5-5e98b8b1d919"
}, },
"fileId": "19wzBXY/hOcICy0fA2yjEz", "fileId": "cdAr/a9aNCTY6oktgcA5ku",
"sync": false "sync": false
}, },
{ {
...@@ -4310,13 +4310,13 @@ ...@@ -4310,13 +4310,13 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
96.493, 56.457,
-102.745, -124.526,
0, 0,
0, 0,
0, 0,
0.15643446504023087, 0,
0.9876883405951378, 1,
1, 1,
1, 1,
1 1
...@@ -4326,7 +4326,7 @@ ...@@ -4326,7 +4326,7 @@
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 0, "x": 0,
"y": 0, "y": 0,
"z": 18 "z": 0
}, },
"_skewX": 0, "_skewX": 0,
"_skewY": 0, "_skewY": 0,
...@@ -4379,7 +4379,7 @@ ...@@ -4379,7 +4379,7 @@
"asset": { "asset": {
"__uuid__": "d0bbc3e4-1049-4c6e-acd5-5e98b8b1d919" "__uuid__": "d0bbc3e4-1049-4c6e-acd5-5e98b8b1d919"
}, },
"fileId": "8cE2ZonGBKgqNJvKofiVyF", "fileId": "81A8dmHoFKPYIrch15fh6h",
"sync": false "sync": false
}, },
{ {
...@@ -4430,8 +4430,8 @@ ...@@ -4430,8 +4430,8 @@
0, 0,
0, 0,
0, 0,
0.15643446504023087, 0,
0.9876883405951378, 1,
1, 1,
1, 1,
1 1
...@@ -4441,7 +4441,7 @@ ...@@ -4441,7 +4441,7 @@
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 0, "x": 0,
"y": 0, "y": 0,
"z": 18 "z": 0
}, },
"_skewX": 0, "_skewX": 0,
"_skewY": 0, "_skewY": 0,
...@@ -4558,7 +4558,7 @@ ...@@ -4558,7 +4558,7 @@
"asset": { "asset": {
"__uuid__": "d0bbc3e4-1049-4c6e-acd5-5e98b8b1d919" "__uuid__": "d0bbc3e4-1049-4c6e-acd5-5e98b8b1d919"
}, },
"fileId": "386tA32F1D7J8fCyXKxBD9", "fileId": "b58tzDwZVIi6Ds09vTHGf7",
"sync": false "sync": false
}, },
{ {
...@@ -4589,7 +4589,7 @@ ...@@ -4589,7 +4589,7 @@
"asset": { "asset": {
"__uuid__": "d0bbc3e4-1049-4c6e-acd5-5e98b8b1d919" "__uuid__": "d0bbc3e4-1049-4c6e-acd5-5e98b8b1d919"
}, },
"fileId": "3eoLD05SFGW79gk7k4T4Vj", "fileId": "fco+SHlANAT5w7tKT1ZQY+",
"sync": false "sync": false
}, },
{ {
...@@ -4636,8 +4636,8 @@ ...@@ -4636,8 +4636,8 @@
0, 0,
0, 0,
0, 0,
0.15643446504023087, 0,
0.9876883405951378, 1,
1, 1,
1, 1,
1 1
...@@ -4647,7 +4647,7 @@ ...@@ -4647,7 +4647,7 @@
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 0, "x": 0,
"y": 0, "y": 0,
"z": 18 "z": 0
}, },
"_skewX": 0, "_skewX": 0,
"_skewY": 0, "_skewY": 0,
...@@ -4696,7 +4696,7 @@ ...@@ -4696,7 +4696,7 @@
"asset": { "asset": {
"__uuid__": "d0bbc3e4-1049-4c6e-acd5-5e98b8b1d919" "__uuid__": "d0bbc3e4-1049-4c6e-acd5-5e98b8b1d919"
}, },
"fileId": "0aG3uqmSdCUKS6tP85cb1A", "fileId": "533awt6gZJgru36DDlkFW+",
"sync": false "sync": false
}, },
{ {
...@@ -4742,13 +4742,13 @@ ...@@ -4742,13 +4742,13 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
145.683, 196.019,
194.684, 136.104,
0,
0, 0,
0, 0,
0, 0,
1, -0.15643446504023087,
0.9876883405951378,
1, 1,
1, 1,
0 0
...@@ -4758,7 +4758,7 @@ ...@@ -4758,7 +4758,7 @@
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 0, "x": 0,
"y": 0, "y": 0,
"z": 0 "z": -18
}, },
"_skewX": 0, "_skewX": 0,
"_skewY": 0, "_skewY": 0,
...@@ -4871,7 +4871,7 @@ ...@@ -4871,7 +4871,7 @@
"asset": { "asset": {
"__uuid__": "d0bbc3e4-1049-4c6e-acd5-5e98b8b1d919" "__uuid__": "d0bbc3e4-1049-4c6e-acd5-5e98b8b1d919"
}, },
"fileId": "0cXCPGnIJNQ5Crr8KcPjlb", "fileId": "16zlUsNZVI07zV6i8M1JjT",
"sync": false "sync": false
}, },
{ {
...@@ -4964,7 +4964,7 @@ ...@@ -4964,7 +4964,7 @@
"asset": { "asset": {
"__uuid__": "d0bbc3e4-1049-4c6e-acd5-5e98b8b1d919" "__uuid__": "d0bbc3e4-1049-4c6e-acd5-5e98b8b1d919"
}, },
"fileId": "ceBQBvepRDC6rYp+r4tUEc", "fileId": "3e6HeHjixJFLP0yMsVrpdO",
"sync": false "sync": false
}, },
{ {
...@@ -5006,13 +5006,13 @@ ...@@ -5006,13 +5006,13 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
40.615, 54.324,
27.465, 13.962,
0,
0, 0,
0, 0,
0, 0,
0.15643446504023087, 1,
0.9876883405951378,
1, 1,
1, 1,
1 1
...@@ -5022,7 +5022,7 @@ ...@@ -5022,7 +5022,7 @@
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 0, "x": 0,
"y": 0, "y": 0,
"z": 18 "z": 0
}, },
"_skewX": 0, "_skewX": 0,
"_skewY": 0, "_skewY": 0,
...@@ -5071,7 +5071,7 @@ ...@@ -5071,7 +5071,7 @@
"asset": { "asset": {
"__uuid__": "d0bbc3e4-1049-4c6e-acd5-5e98b8b1d919" "__uuid__": "d0bbc3e4-1049-4c6e-acd5-5e98b8b1d919"
}, },
"fileId": "418t49JFdLAKKOpyCfQ1HL", "fileId": "e5fSxrcvFAtbVxWCUNPIMr",
"sync": false "sync": false
}, },
{ {
...@@ -5110,7 +5110,7 @@ ...@@ -5110,7 +5110,7 @@
"asset": { "asset": {
"__uuid__": "d0bbc3e4-1049-4c6e-acd5-5e98b8b1d919" "__uuid__": "d0bbc3e4-1049-4c6e-acd5-5e98b8b1d919"
}, },
"fileId": "07J5EUUYVImbxoasHLxO2X", "fileId": "11BZf/hBhOKbZV9hhK43mh",
"sync": false "sync": false
}, },
{ {
...@@ -5306,7 +5306,7 @@ ...@@ -5306,7 +5306,7 @@
"asset": { "asset": {
"__uuid__": "d0bbc3e4-1049-4c6e-acd5-5e98b8b1d919" "__uuid__": "d0bbc3e4-1049-4c6e-acd5-5e98b8b1d919"
}, },
"fileId": "d6Ce/JtRpLxrd6oHZ2e4lQ", "fileId": "ad6vnmHFZKIbJ48V287ltP",
"sync": false "sync": false
}, },
{ {
...@@ -5413,7 +5413,7 @@ ...@@ -5413,7 +5413,7 @@
"asset": { "asset": {
"__uuid__": "d0bbc3e4-1049-4c6e-acd5-5e98b8b1d919" "__uuid__": "d0bbc3e4-1049-4c6e-acd5-5e98b8b1d919"
}, },
"fileId": "651JYgXSRLlLWhX6YY/zhB", "fileId": "10MDRuKqBD1bNlpzMtR/T3",
"sync": false "sync": false
}, },
{ {
...@@ -5524,7 +5524,7 @@ ...@@ -5524,7 +5524,7 @@
"asset": { "asset": {
"__uuid__": "d0bbc3e4-1049-4c6e-acd5-5e98b8b1d919" "__uuid__": "d0bbc3e4-1049-4c6e-acd5-5e98b8b1d919"
}, },
"fileId": "afqxWFcHpLfYahyvVEDSLx", "fileId": "0fOU21QWxDrYjcga31LLNJ",
"sync": false "sync": false
}, },
{ {
...@@ -5635,7 +5635,7 @@ ...@@ -5635,7 +5635,7 @@
"asset": { "asset": {
"__uuid__": "d0bbc3e4-1049-4c6e-acd5-5e98b8b1d919" "__uuid__": "d0bbc3e4-1049-4c6e-acd5-5e98b8b1d919"
}, },
"fileId": "21TzKLOx5Ara0/0QjQslVL", "fileId": "2d6+7IBRVIzKmQWKfbD5NU",
"sync": false "sync": false
}, },
{ {
...@@ -5814,7 +5814,7 @@ ...@@ -5814,7 +5814,7 @@
"asset": { "asset": {
"__uuid__": "d0bbc3e4-1049-4c6e-acd5-5e98b8b1d919" "__uuid__": "d0bbc3e4-1049-4c6e-acd5-5e98b8b1d919"
}, },
"fileId": "82QftNmgVHRr6bMH+MtNBm", "fileId": "feT7fN86tCFL2VvdME0+js",
"sync": false "sync": false
}, },
{ {
...@@ -5845,7 +5845,7 @@ ...@@ -5845,7 +5845,7 @@
"asset": { "asset": {
"__uuid__": "d0bbc3e4-1049-4c6e-acd5-5e98b8b1d919" "__uuid__": "d0bbc3e4-1049-4c6e-acd5-5e98b8b1d919"
}, },
"fileId": "3bXsQIO0NFEpenAGZIHY/6", "fileId": "f3fZH/clVNg6OMv80LFHHQ",
"sync": false "sync": false
}, },
{ {
...@@ -5952,7 +5952,7 @@ ...@@ -5952,7 +5952,7 @@
"asset": { "asset": {
"__uuid__": "d0bbc3e4-1049-4c6e-acd5-5e98b8b1d919" "__uuid__": "d0bbc3e4-1049-4c6e-acd5-5e98b8b1d919"
}, },
"fileId": "b7ZjPhRahF7pfEpdSgXTNT", "fileId": "e1wrDrEdRFha1tkHM6+JJe",
"sync": false "sync": false
}, },
{ {
...@@ -6127,7 +6127,7 @@ ...@@ -6127,7 +6127,7 @@
"asset": { "asset": {
"__uuid__": "d0bbc3e4-1049-4c6e-acd5-5e98b8b1d919" "__uuid__": "d0bbc3e4-1049-4c6e-acd5-5e98b8b1d919"
}, },
"fileId": "98ap4irEJPqYh9cT3BJqGC", "fileId": "418ubXGDlCLJ3M/bbqFw2g",
"sync": false "sync": false
}, },
{ {
...@@ -6220,7 +6220,7 @@ ...@@ -6220,7 +6220,7 @@
"asset": { "asset": {
"__uuid__": "d0bbc3e4-1049-4c6e-acd5-5e98b8b1d919" "__uuid__": "d0bbc3e4-1049-4c6e-acd5-5e98b8b1d919"
}, },
"fileId": "0c3xejFIhMI6/j/XLbrZEJ", "fileId": "e5vG8uEyhKlLiR0/AYke5x",
"sync": false "sync": false
}, },
{ {
...@@ -6327,7 +6327,7 @@ ...@@ -6327,7 +6327,7 @@
"asset": { "asset": {
"__uuid__": "d0bbc3e4-1049-4c6e-acd5-5e98b8b1d919" "__uuid__": "d0bbc3e4-1049-4c6e-acd5-5e98b8b1d919"
}, },
"fileId": "06szc5mShFHZb+Js7S3PCX", "fileId": "71BBOtj7lN0J2Aq7RT7H7f",
"sync": false "sync": false
}, },
{ {
...@@ -6366,7 +6366,7 @@ ...@@ -6366,7 +6366,7 @@
"asset": { "asset": {
"__uuid__": "d0bbc3e4-1049-4c6e-acd5-5e98b8b1d919" "__uuid__": "d0bbc3e4-1049-4c6e-acd5-5e98b8b1d919"
}, },
"fileId": "943jqv+lxB7at4GbRLZhkB", "fileId": "f5A/RMnD9LF4DAw722DUVt",
"sync": false "sync": false
}, },
{ {
......
...@@ -288,7 +288,7 @@ ...@@ -288,7 +288,7 @@
"asset": { "asset": {
"__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f" "__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f"
}, },
"fileId": "7dmjJNex1CqogPZirAVJnr", "fileId": "2aQCODyZJNpo+XdYtYtrZH",
"sync": false "sync": false
}, },
{ {
...@@ -395,7 +395,7 @@ ...@@ -395,7 +395,7 @@
"asset": { "asset": {
"__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f" "__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f"
}, },
"fileId": "f6yPP/VGxI/4YbDko82T12", "fileId": "90V6mLXJlKpbIdjdJvPFZe",
"sync": false "sync": false
}, },
{ {
...@@ -506,7 +506,7 @@ ...@@ -506,7 +506,7 @@
"asset": { "asset": {
"__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f" "__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f"
}, },
"fileId": "6cYO3imPVMSY4vqs4zAx2A", "fileId": "42HMooRplLqIZyoNbTn4lr",
"sync": false "sync": false
}, },
{ {
...@@ -617,7 +617,7 @@ ...@@ -617,7 +617,7 @@
"asset": { "asset": {
"__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f" "__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f"
}, },
"fileId": "e6QlWy7zhFg54tPRUH/UyM", "fileId": "534eB+d8BF/q2mFhIQ9oxl",
"sync": false "sync": false
}, },
{ {
...@@ -796,7 +796,7 @@ ...@@ -796,7 +796,7 @@
"asset": { "asset": {
"__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f" "__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f"
}, },
"fileId": "42xJLp1zlCPIuzZmK+bSoU", "fileId": "a1Gt1dD19FL4ihKInhFNvv",
"sync": false "sync": false
}, },
{ {
...@@ -827,7 +827,7 @@ ...@@ -827,7 +827,7 @@
"asset": { "asset": {
"__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f" "__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f"
}, },
"fileId": "88XQDIRP9O3Zu/fGrKRIno", "fileId": "77gj0XTWVAoq7A0/NfpF5W",
"sync": false "sync": false
}, },
{ {
...@@ -934,7 +934,7 @@ ...@@ -934,7 +934,7 @@
"asset": { "asset": {
"__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f" "__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f"
}, },
"fileId": "fddaZevf1CM7fN1qx+RJ01", "fileId": "0edN5DvVNJIL1+j27BkrdK",
"sync": false "sync": false
}, },
{ {
...@@ -1109,7 +1109,7 @@ ...@@ -1109,7 +1109,7 @@
"asset": { "asset": {
"__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f" "__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f"
}, },
"fileId": "68LaPIUwBAy7WDpFeBW85C", "fileId": "cfAzgtUSVGEbnj117BFuyb",
"sync": false "sync": false
}, },
{ {
...@@ -1202,7 +1202,7 @@ ...@@ -1202,7 +1202,7 @@
"asset": { "asset": {
"__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f" "__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f"
}, },
"fileId": "b1Im9HOLNJurQqfdDwie54", "fileId": "4awhDJoZxORb6XIiy4q1V/",
"sync": false "sync": false
}, },
{ {
...@@ -1309,7 +1309,7 @@ ...@@ -1309,7 +1309,7 @@
"asset": { "asset": {
"__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f" "__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f"
}, },
"fileId": "94toGuEolD0LwZuMicMap2", "fileId": "6cKM22u6RGiKBwZegErjD8",
"sync": false "sync": false
}, },
{ {
...@@ -1338,9 +1338,6 @@ ...@@ -1338,9 +1338,6 @@
"audTryagain": { "audTryagain": {
"__uuid__": "6df9bb96-0611-47b1-9d98-f877972aa7f1" "__uuid__": "6df9bb96-0611-47b1-9d98-f877972aa7f1"
}, },
"audDown": {
"__uuid__": "3102823d-0ed3-4985-bc07-2d108298c006"
},
"_id": "" "_id": ""
}, },
{ {
...@@ -1351,7 +1348,7 @@ ...@@ -1351,7 +1348,7 @@
"asset": { "asset": {
"__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f" "__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f"
}, },
"fileId": "9exEV6aAZLepVLHVSrrJLv", "fileId": "1dHd9JE21LDof+rrJ/HhmG",
"sync": false "sync": false
}, },
{ {
...@@ -1547,7 +1544,7 @@ ...@@ -1547,7 +1544,7 @@
"asset": { "asset": {
"__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f" "__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f"
}, },
"fileId": "18RnAZu1lJ+YxSKTCr8Asf", "fileId": "bdgZscZp9BKKYaBAvIDT1l",
"sync": false "sync": false
}, },
{ {
...@@ -1654,7 +1651,7 @@ ...@@ -1654,7 +1651,7 @@
"asset": { "asset": {
"__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f" "__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f"
}, },
"fileId": "57/UOIn/9GJoBgeAG6dTaG", "fileId": "dal2u3Y35Iqok/+a+xCMOW",
"sync": false "sync": false
}, },
{ {
...@@ -1765,7 +1762,7 @@ ...@@ -1765,7 +1762,7 @@
"asset": { "asset": {
"__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f" "__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f"
}, },
"fileId": "d2ybrcQfhLBJxFyDRagNbL", "fileId": "f4QBlfJSJPerinI5Nia959",
"sync": false "sync": false
}, },
{ {
...@@ -1876,7 +1873,7 @@ ...@@ -1876,7 +1873,7 @@
"asset": { "asset": {
"__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f" "__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f"
}, },
"fileId": "2f+Foz2bZPmqpiUXSYLr2i", "fileId": "5dtGTJuVtHBpweXww1xHbM",
"sync": false "sync": false
}, },
{ {
...@@ -2055,7 +2052,7 @@ ...@@ -2055,7 +2052,7 @@
"asset": { "asset": {
"__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f" "__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f"
}, },
"fileId": "35JKznofxO+rQV0wdcKrPJ", "fileId": "8fDUYjqK5KkomPAdAxYmFy",
"sync": false "sync": false
}, },
{ {
...@@ -2086,7 +2083,7 @@ ...@@ -2086,7 +2083,7 @@
"asset": { "asset": {
"__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f" "__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f"
}, },
"fileId": "29BigVV/xON5KK5Tj51wex", "fileId": "a8cQ1FhAlPboNSiGhncQmr",
"sync": false "sync": false
}, },
{ {
...@@ -2193,7 +2190,7 @@ ...@@ -2193,7 +2190,7 @@
"asset": { "asset": {
"__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f" "__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f"
}, },
"fileId": "03bcssAXROqqBfwqKWWKPr", "fileId": "997m1MUyBPeKwo7yQIQOto",
"sync": false "sync": false
}, },
{ {
...@@ -2368,7 +2365,7 @@ ...@@ -2368,7 +2365,7 @@
"asset": { "asset": {
"__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f" "__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f"
}, },
"fileId": "5e8jDUcLRBYaMQz9ST0n2x", "fileId": "5er/LwmAtP6oQZRoWKLZRe",
"sync": false "sync": false
}, },
{ {
...@@ -2461,7 +2458,7 @@ ...@@ -2461,7 +2458,7 @@
"asset": { "asset": {
"__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f" "__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f"
}, },
"fileId": "68i5etbvVNwINWkldDtkzB", "fileId": "6cOuQ0635LdbKtokB7LXbm",
"sync": false "sync": false
}, },
{ {
...@@ -2568,7 +2565,7 @@ ...@@ -2568,7 +2565,7 @@
"asset": { "asset": {
"__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f" "__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f"
}, },
"fileId": "bafKaNxS5Kgqz1wYzYtQLY", "fileId": "27uz4sN0NPxotKif8HgQaB",
"sync": false "sync": false
}, },
{ {
...@@ -2597,9 +2594,6 @@ ...@@ -2597,9 +2594,6 @@
"audTryagain": { "audTryagain": {
"__uuid__": "6df9bb96-0611-47b1-9d98-f877972aa7f1" "__uuid__": "6df9bb96-0611-47b1-9d98-f877972aa7f1"
}, },
"audDown": {
"__uuid__": "3102823d-0ed3-4985-bc07-2d108298c006"
},
"_id": "" "_id": ""
}, },
{ {
...@@ -2610,7 +2604,7 @@ ...@@ -2610,7 +2604,7 @@
"asset": { "asset": {
"__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f" "__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f"
}, },
"fileId": "e02j3SDYFGa7LSGDVExlqZ", "fileId": "0dJnqigfFG0bZLtl1Kvejd",
"sync": false "sync": false
}, },
{ {
...@@ -2806,7 +2800,7 @@ ...@@ -2806,7 +2800,7 @@
"asset": { "asset": {
"__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f" "__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f"
}, },
"fileId": "083oNsPJxOzJpbD5yKLTzr", "fileId": "69RihrPMFGfaUwiSU0D5a/",
"sync": false "sync": false
}, },
{ {
...@@ -2913,7 +2907,7 @@ ...@@ -2913,7 +2907,7 @@
"asset": { "asset": {
"__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f" "__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f"
}, },
"fileId": "ae0jU8Q/1AFan/Oonej9mz", "fileId": "cereK3NApFvJv+bYxtUzzF",
"sync": false "sync": false
}, },
{ {
...@@ -3024,7 +3018,7 @@ ...@@ -3024,7 +3018,7 @@
"asset": { "asset": {
"__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f" "__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f"
}, },
"fileId": "6agcwXrhJEQLRb+WQnwN3M", "fileId": "3fNLR/efRKL5PYH4lOFL6c",
"sync": false "sync": false
}, },
{ {
...@@ -3066,7 +3060,7 @@ ...@@ -3066,7 +3060,7 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
27.047, -0.108,
-159.482, -159.482,
0, 0,
0, 0,
...@@ -3135,7 +3129,7 @@ ...@@ -3135,7 +3129,7 @@
"asset": { "asset": {
"__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f" "__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f"
}, },
"fileId": "9dqnz+TsdHU4aVztcFa7ES", "fileId": "81LVm4YRxAj7X1zr5wWhA0",
"sync": false "sync": false
}, },
{ {
...@@ -3314,7 +3308,7 @@ ...@@ -3314,7 +3308,7 @@
"asset": { "asset": {
"__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f" "__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f"
}, },
"fileId": "9eyP3geS5KXJrmNO1woL3G", "fileId": "51f4dSSf5O86XOl8rrJUUP",
"sync": false "sync": false
}, },
{ {
...@@ -3345,7 +3339,7 @@ ...@@ -3345,7 +3339,7 @@
"asset": { "asset": {
"__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f" "__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f"
}, },
"fileId": "689Q6sosZHH7LXs/KiR6XC", "fileId": "2cmV40AuNEsagIV1x+l2LN",
"sync": false "sync": false
}, },
{ {
...@@ -3452,7 +3446,7 @@ ...@@ -3452,7 +3446,7 @@
"asset": { "asset": {
"__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f" "__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f"
}, },
"fileId": "6fRejKJmhPeaqfwoFz2NTh", "fileId": "203q9SuqJI9YQ2KUsYQvvJ",
"sync": false "sync": false
}, },
{ {
...@@ -3627,7 +3621,7 @@ ...@@ -3627,7 +3621,7 @@
"asset": { "asset": {
"__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f" "__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f"
}, },
"fileId": "31ldrp36NBZpxg/EKsqvdP", "fileId": "30EIgbv/tPuKhLkTEpl8xn",
"sync": false "sync": false
}, },
{ {
...@@ -3720,7 +3714,7 @@ ...@@ -3720,7 +3714,7 @@
"asset": { "asset": {
"__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f" "__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f"
}, },
"fileId": "aajPxB6lJI7I970Hn+oQCI", "fileId": "99ryrqA/1NiIVUJlZcwWnE",
"sync": false "sync": false
}, },
{ {
...@@ -3827,7 +3821,7 @@ ...@@ -3827,7 +3821,7 @@
"asset": { "asset": {
"__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f" "__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f"
}, },
"fileId": "a8AJhr+eFIC4NaX6YI+HU+", "fileId": "8fnREavZhEhoeGcont6tHr",
"sync": false "sync": false
}, },
{ {
...@@ -3856,9 +3850,6 @@ ...@@ -3856,9 +3850,6 @@
"audTryagain": { "audTryagain": {
"__uuid__": "6df9bb96-0611-47b1-9d98-f877972aa7f1" "__uuid__": "6df9bb96-0611-47b1-9d98-f877972aa7f1"
}, },
"audDown": {
"__uuid__": "3102823d-0ed3-4985-bc07-2d108298c006"
},
"_id": "" "_id": ""
}, },
{ {
...@@ -3869,7 +3860,7 @@ ...@@ -3869,7 +3860,7 @@
"asset": { "asset": {
"__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f" "__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f"
}, },
"fileId": "8e0Xi3HvhDVo9FKeYkf5oP", "fileId": "7aE7PbZnZFioxogMgbkUJ7",
"sync": false "sync": false
}, },
{ {
...@@ -3941,8 +3932,8 @@ ...@@ -3941,8 +3932,8 @@
0, 0,
0, 0,
0, 0,
0, -0.13052619222005157,
1, 0.9914448613738104,
0.63, 0.63,
0.63, 0.63,
1 1
...@@ -3952,7 +3943,7 @@ ...@@ -3952,7 +3943,7 @@
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 0, "x": 0,
"y": 0, "y": 0,
"z": 0 "z": -15
}, },
"_skewX": 0, "_skewX": 0,
"_skewY": 0, "_skewY": 0,
...@@ -4005,8 +3996,8 @@ ...@@ -4005,8 +3996,8 @@
0, 0,
0, 0,
0, 0,
-0.12304723478506921, 0,
0.9924008152010699, 1,
1, 1,
1, 1,
1 1
...@@ -4016,7 +4007,7 @@ ...@@ -4016,7 +4007,7 @@
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 0, "x": 0,
"y": 0, "y": 0,
"z": -14.136 "z": 0
}, },
"_skewX": 0, "_skewX": 0,
"_skewY": 0, "_skewY": 0,
...@@ -4065,7 +4056,7 @@ ...@@ -4065,7 +4056,7 @@
"asset": { "asset": {
"__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f" "__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f"
}, },
"fileId": "80pMAlYsdI+a3iFlOuJSgA", "fileId": "c2ynR1WgVF0JdETOqd+m9H",
"sync": false "sync": false
}, },
{ {
...@@ -4112,8 +4103,8 @@ ...@@ -4112,8 +4103,8 @@
0, 0,
0, 0,
0, 0,
-0.12304723478506921, 0,
0.9924008152010699, 1,
1, 1,
1, 1,
1 1
...@@ -4123,7 +4114,7 @@ ...@@ -4123,7 +4114,7 @@
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 0, "x": 0,
"y": 0, "y": 0,
"z": -14.136 "z": 0
}, },
"_skewX": 0, "_skewX": 0,
"_skewY": 0, "_skewY": 0,
...@@ -4172,7 +4163,7 @@ ...@@ -4172,7 +4163,7 @@
"asset": { "asset": {
"__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f" "__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f"
}, },
"fileId": "f9toLpVsdKZJfKyQ825ZKE", "fileId": "3bCm36hKtOmq6ZInYGeKSG",
"sync": false "sync": false
}, },
{ {
...@@ -4219,8 +4210,8 @@ ...@@ -4219,8 +4210,8 @@
0, 0,
0, 0,
0, 0,
-0.12304723478506921, 0,
0.9924008152010699, 1,
1, 1,
1, 1,
1 1
...@@ -4230,7 +4221,7 @@ ...@@ -4230,7 +4221,7 @@
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 0, "x": 0,
"y": 0, "y": 0,
"z": -14.136 "z": 0
}, },
"_skewX": 0, "_skewX": 0,
"_skewY": 0, "_skewY": 0,
...@@ -4283,7 +4274,7 @@ ...@@ -4283,7 +4274,7 @@
"asset": { "asset": {
"__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f" "__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f"
}, },
"fileId": "45I/I/6WNG84aFjJrM6oe+", "fileId": "efY53qjMxHSpIKz2MPYAuZ",
"sync": false "sync": false
}, },
{ {
...@@ -4325,13 +4316,13 @@ ...@@ -4325,13 +4316,13 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
27.047, -5.674,
-159.482, -159.482,
0, 0,
0, 0,
0, 0,
-0.12304723478506921, 0,
0.9924008152010699, 1,
1, 1,
1, 1,
1 1
...@@ -4341,7 +4332,7 @@ ...@@ -4341,7 +4332,7 @@
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 0, "x": 0,
"y": 0, "y": 0,
"z": -14.136 "z": 0
}, },
"_skewX": 0, "_skewX": 0,
"_skewY": 0, "_skewY": 0,
...@@ -4394,7 +4385,7 @@ ...@@ -4394,7 +4385,7 @@
"asset": { "asset": {
"__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f" "__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f"
}, },
"fileId": "e26YtAh9BL1Yd/THihivY1", "fileId": "0fPhuxivJPTq0xn2220yPH",
"sync": false "sync": false
}, },
{ {
...@@ -4445,8 +4436,8 @@ ...@@ -4445,8 +4436,8 @@
0, 0,
0, 0,
0, 0,
-0.12304723478506921, 0,
0.9924008152010699, 1,
1, 1,
1, 1,
1 1
...@@ -4456,7 +4447,7 @@ ...@@ -4456,7 +4447,7 @@
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 0, "x": 0,
"y": 0, "y": 0,
"z": -14.136 "z": 0
}, },
"_skewX": 0, "_skewX": 0,
"_skewY": 0, "_skewY": 0,
...@@ -4573,7 +4564,7 @@ ...@@ -4573,7 +4564,7 @@
"asset": { "asset": {
"__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f" "__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f"
}, },
"fileId": "07uQz0WUxPj6krolBTXkmk", "fileId": "d5cfsVP7BG04AEnjnJViyq",
"sync": false "sync": false
}, },
{ {
...@@ -4604,7 +4595,7 @@ ...@@ -4604,7 +4595,7 @@
"asset": { "asset": {
"__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f" "__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f"
}, },
"fileId": "94uA794EhBEKMMWMfIVKnf", "fileId": "3fZAo/PahNf5OAP3HIVHhf",
"sync": false "sync": false
}, },
{ {
...@@ -4651,8 +4642,8 @@ ...@@ -4651,8 +4642,8 @@
0, 0,
0, 0,
0, 0,
-0.12304723478506921, 0,
0.9924008152010699, 1,
1, 1,
1, 1,
1 1
...@@ -4662,7 +4653,7 @@ ...@@ -4662,7 +4653,7 @@
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 0, "x": 0,
"y": 0, "y": 0,
"z": -14.136 "z": 0
}, },
"_skewX": 0, "_skewX": 0,
"_skewY": 0, "_skewY": 0,
...@@ -4711,7 +4702,7 @@ ...@@ -4711,7 +4702,7 @@
"asset": { "asset": {
"__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f" "__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f"
}, },
"fileId": "655synabZFQZoq6/aJiFvT", "fileId": "2dDCwW26lD8ZtaQvU5JPia",
"sync": false "sync": false
}, },
{ {
...@@ -4757,13 +4748,13 @@ ...@@ -4757,13 +4748,13 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
161.687, 146.866,
47.63, 87.664,
0,
0, 0,
0, 0,
0, 0,
1, 0.13052619222005157,
0.9914448613738104,
1, 1,
1, 1,
0 0
...@@ -4773,7 +4764,7 @@ ...@@ -4773,7 +4764,7 @@
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 0, "x": 0,
"y": 0, "y": 0,
"z": 0 "z": 15
}, },
"_skewX": 0, "_skewX": 0,
"_skewY": 0, "_skewY": 0,
...@@ -4886,7 +4877,7 @@ ...@@ -4886,7 +4877,7 @@
"asset": { "asset": {
"__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f" "__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f"
}, },
"fileId": "4aekj6NwxNC7FJtlJRvZIs", "fileId": "0efcb/eQ1DbIi3IKdwx/qS",
"sync": false "sync": false
}, },
{ {
...@@ -4979,7 +4970,7 @@ ...@@ -4979,7 +4970,7 @@
"asset": { "asset": {
"__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f" "__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f"
}, },
"fileId": "742189ZzhHiahzAwt7yLAG", "fileId": "ddQhRjJc9Pr7lwYaxwARjq",
"sync": false "sync": false
}, },
{ {
...@@ -5026,8 +5017,8 @@ ...@@ -5026,8 +5017,8 @@
0, 0,
0, 0,
0, 0,
-0.12304723478506921, 0,
0.9924008152010699, 1,
1, 1,
1, 1,
1 1
...@@ -5037,7 +5028,7 @@ ...@@ -5037,7 +5028,7 @@
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 0, "x": 0,
"y": 0, "y": 0,
"z": -14.136 "z": 0
}, },
"_skewX": 0, "_skewX": 0,
"_skewY": 0, "_skewY": 0,
...@@ -5086,7 +5077,7 @@ ...@@ -5086,7 +5077,7 @@
"asset": { "asset": {
"__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f" "__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f"
}, },
"fileId": "81lbSsRRdJ3Jm6+3d0IWKT", "fileId": "33DNcOiOJHY55l5kLI3SJE",
"sync": false "sync": false
}, },
{ {
...@@ -5115,9 +5106,6 @@ ...@@ -5115,9 +5106,6 @@
"audTryagain": { "audTryagain": {
"__uuid__": "6df9bb96-0611-47b1-9d98-f877972aa7f1" "__uuid__": "6df9bb96-0611-47b1-9d98-f877972aa7f1"
}, },
"audDown": {
"__uuid__": "3102823d-0ed3-4985-bc07-2d108298c006"
},
"_id": "" "_id": ""
}, },
{ {
...@@ -5128,7 +5116,7 @@ ...@@ -5128,7 +5116,7 @@
"asset": { "asset": {
"__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f" "__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f"
}, },
"fileId": "d69lCdjuJFoJVSubXGf/MG", "fileId": "10uGFSOXRMRbqdUDEmH0If",
"sync": false "sync": false
}, },
{ {
...@@ -5200,8 +5188,8 @@ ...@@ -5200,8 +5188,8 @@
0, 0,
0, 0,
0, 0,
0, -0.08715574274765817,
1, 0.9961946980917455,
0.6, 0.6,
0.6, 0.6,
1 1
...@@ -5211,7 +5199,7 @@ ...@@ -5211,7 +5199,7 @@
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 0, "x": 0,
"y": 0, "y": 0,
"z": 0 "z": -10
}, },
"_skewX": 0, "_skewX": 0,
"_skewY": 0, "_skewY": 0,
...@@ -5264,8 +5252,8 @@ ...@@ -5264,8 +5252,8 @@
0, 0,
0, 0,
0, 0,
-0.08715574274765817, 0,
0.9961946980917455, 1,
1, 1,
1, 1,
1 1
...@@ -5275,7 +5263,7 @@ ...@@ -5275,7 +5263,7 @@
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 0, "x": 0,
"y": 0, "y": 0,
"z": -10 "z": 0
}, },
"_skewX": 0, "_skewX": 0,
"_skewY": 0, "_skewY": 0,
...@@ -5324,7 +5312,7 @@ ...@@ -5324,7 +5312,7 @@
"asset": { "asset": {
"__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f" "__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f"
}, },
"fileId": "c9RnI6+d1NAqKqoeGmbady", "fileId": "5fGaIJupJIUJMnn9ATrTKH",
"sync": false "sync": false
}, },
{ {
...@@ -5371,8 +5359,8 @@ ...@@ -5371,8 +5359,8 @@
0, 0,
0, 0,
0, 0,
-0.08715574274765817, 0,
0.9961946980917455, 1,
1, 1,
1, 1,
1 1
...@@ -5382,7 +5370,7 @@ ...@@ -5382,7 +5370,7 @@
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 0, "x": 0,
"y": 0, "y": 0,
"z": -10 "z": 0
}, },
"_skewX": 0, "_skewX": 0,
"_skewY": 0, "_skewY": 0,
...@@ -5431,7 +5419,7 @@ ...@@ -5431,7 +5419,7 @@
"asset": { "asset": {
"__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f" "__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f"
}, },
"fileId": "9cXJmLuBBPiKMKOiCBUGAE", "fileId": "54UxEw2slP6J1uX94oXyek",
"sync": false "sync": false
}, },
{ {
...@@ -5478,8 +5466,8 @@ ...@@ -5478,8 +5466,8 @@
0, 0,
0, 0,
0, 0,
-0.08715574274765817, 0,
0.9961946980917455, 1,
1, 1,
1, 1,
1 1
...@@ -5489,7 +5477,7 @@ ...@@ -5489,7 +5477,7 @@
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 0, "x": 0,
"y": 0, "y": 0,
"z": -10 "z": 0
}, },
"_skewX": 0, "_skewX": 0,
"_skewY": 0, "_skewY": 0,
...@@ -5542,7 +5530,7 @@ ...@@ -5542,7 +5530,7 @@
"asset": { "asset": {
"__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f" "__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f"
}, },
"fileId": "a8Mc90NkxH4onRCenwJKmE", "fileId": "f3+b2h7K5NaY3Qo7HaVJyu",
"sync": false "sync": false
}, },
{ {
...@@ -5584,13 +5572,13 @@ ...@@ -5584,13 +5572,13 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-24.336, -9.506,
-125.685, -125.685,
0, 0,
0, 0,
0, 0,
-0.08715574274765817, 0,
0.9961946980917455, 1,
1, 1,
1, 1,
1 1
...@@ -5600,7 +5588,7 @@ ...@@ -5600,7 +5588,7 @@
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 0, "x": 0,
"y": 0, "y": 0,
"z": -10 "z": 0
}, },
"_skewX": 0, "_skewX": 0,
"_skewY": 0, "_skewY": 0,
...@@ -5653,7 +5641,7 @@ ...@@ -5653,7 +5641,7 @@
"asset": { "asset": {
"__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f" "__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f"
}, },
"fileId": "1a0tIKRZFDPYkWLDOFGO6l", "fileId": "0bz1NL5DJAy4GXxBT2EiGo",
"sync": false "sync": false
}, },
{ {
...@@ -5704,8 +5692,8 @@ ...@@ -5704,8 +5692,8 @@
0, 0,
0, 0,
0, 0,
-0.08715574274765817, 0,
0.9961946980917455, 1,
1, 1,
1, 1,
1 1
...@@ -5715,7 +5703,7 @@ ...@@ -5715,7 +5703,7 @@
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 0, "x": 0,
"y": 0, "y": 0,
"z": -10 "z": 0
}, },
"_skewX": 0, "_skewX": 0,
"_skewY": 0, "_skewY": 0,
...@@ -5832,7 +5820,7 @@ ...@@ -5832,7 +5820,7 @@
"asset": { "asset": {
"__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f" "__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f"
}, },
"fileId": "ca6XkHO1pKDoPk8Fm0z6cg", "fileId": "7dhGJEBTpLeqhMg6xqF/uI",
"sync": false "sync": false
}, },
{ {
...@@ -5863,7 +5851,7 @@ ...@@ -5863,7 +5851,7 @@
"asset": { "asset": {
"__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f" "__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f"
}, },
"fileId": "b2k7cFu2dOC6pP4k8R2Y0R", "fileId": "00JDOE1X5NO5t5VmAsBRP0",
"sync": false "sync": false
}, },
{ {
...@@ -5910,8 +5898,8 @@ ...@@ -5910,8 +5898,8 @@
0, 0,
0, 0,
0, 0,
-0.08715574274765817, 0,
0.9961946980917455, 1,
1, 1,
1, 1,
1 1
...@@ -5921,7 +5909,7 @@ ...@@ -5921,7 +5909,7 @@
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 0, "x": 0,
"y": 0, "y": 0,
"z": -10 "z": 0
}, },
"_skewX": 0, "_skewX": 0,
"_skewY": 0, "_skewY": 0,
...@@ -5970,7 +5958,7 @@ ...@@ -5970,7 +5958,7 @@
"asset": { "asset": {
"__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f" "__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f"
}, },
"fileId": "5cYFs6rIpJAr0il9s7RSG4", "fileId": "42AokBtKRJqJjuaDv9LtOe",
"sync": false "sync": false
}, },
{ {
...@@ -6016,13 +6004,13 @@ ...@@ -6016,13 +6004,13 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
170.171, 149.55,
103.924, 119.259,
0, 0,
0, 0,
0, 0,
0, 0.08715574274765817,
1, 0.9961946980917455,
1, 1,
1, 1,
0 0
...@@ -6032,7 +6020,7 @@ ...@@ -6032,7 +6020,7 @@
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 0, "x": 0,
"y": 0, "y": 0,
"z": 0 "z": 10
}, },
"_skewX": 0, "_skewX": 0,
"_skewY": 0, "_skewY": 0,
...@@ -6145,7 +6133,7 @@ ...@@ -6145,7 +6133,7 @@
"asset": { "asset": {
"__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f" "__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f"
}, },
"fileId": "2fP58nq0lDsrLXD0me4IEE", "fileId": "37ocjpGtZNnKc2x2HRGcFx",
"sync": false "sync": false
}, },
{ {
...@@ -6238,7 +6226,7 @@ ...@@ -6238,7 +6226,7 @@
"asset": { "asset": {
"__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f" "__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f"
}, },
"fileId": "44tAAaJfhOBrv21e97bZoK", "fileId": "9d5C0q7YdMipRiRa1EX9mC",
"sync": false "sync": false
}, },
{ {
...@@ -6285,8 +6273,8 @@ ...@@ -6285,8 +6273,8 @@
0, 0,
0, 0,
0, 0,
-0.08715574274765817, 0,
0.9961946980917455, 1,
1, 1,
1, 1,
1 1
...@@ -6296,7 +6284,7 @@ ...@@ -6296,7 +6284,7 @@
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 0, "x": 0,
"y": 0, "y": 0,
"z": -10 "z": 0
}, },
"_skewX": 0, "_skewX": 0,
"_skewY": 0, "_skewY": 0,
...@@ -6345,7 +6333,7 @@ ...@@ -6345,7 +6333,7 @@
"asset": { "asset": {
"__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f" "__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f"
}, },
"fileId": "78O/jB2sBL1r5ZqTLN/hyv", "fileId": "0fgyeRPJlNR5Nqo8nf1w5L",
"sync": false "sync": false
}, },
{ {
...@@ -6374,9 +6362,6 @@ ...@@ -6374,9 +6362,6 @@
"audTryagain": { "audTryagain": {
"__uuid__": "6df9bb96-0611-47b1-9d98-f877972aa7f1" "__uuid__": "6df9bb96-0611-47b1-9d98-f877972aa7f1"
}, },
"audDown": {
"__uuid__": "3102823d-0ed3-4985-bc07-2d108298c006"
},
"_id": "" "_id": ""
}, },
{ {
...@@ -6387,7 +6372,7 @@ ...@@ -6387,7 +6372,7 @@
"asset": { "asset": {
"__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f" "__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f"
}, },
"fileId": "fbQHn8Rn1IOqFwDfeFew6B", "fileId": "f6Phuu2kBP3aKDvSn1kfG/",
"sync": false "sync": false
}, },
{ {
...@@ -6459,8 +6444,8 @@ ...@@ -6459,8 +6444,8 @@
0, 0,
0, 0,
0, 0,
0, 0.14780941112961063,
1, 0.9890158633619168,
0.6, 0.6,
0.6, 0.6,
1 1
...@@ -6470,7 +6455,7 @@ ...@@ -6470,7 +6455,7 @@
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 0, "x": 0,
"y": 0, "y": 0,
"z": 0 "z": 17
}, },
"_skewX": 0, "_skewX": 0,
"_skewY": 0, "_skewY": 0,
...@@ -6523,8 +6508,8 @@ ...@@ -6523,8 +6508,8 @@
0, 0,
0, 0,
0, 0,
0.15643446504023087, 0,
0.9876883405951378, 1,
1, 1,
1, 1,
1 1
...@@ -6534,7 +6519,7 @@ ...@@ -6534,7 +6519,7 @@
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 0, "x": 0,
"y": 0, "y": 0,
"z": 18 "z": 0
}, },
"_skewX": 0, "_skewX": 0,
"_skewY": 0, "_skewY": 0,
...@@ -6583,7 +6568,7 @@ ...@@ -6583,7 +6568,7 @@
"asset": { "asset": {
"__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f" "__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f"
}, },
"fileId": "2ceObZfrJO8pXli3v0BYDF", "fileId": "a30YDbkiJHArfgQqt/xj5B",
"sync": false "sync": false
}, },
{ {
...@@ -6630,8 +6615,8 @@ ...@@ -6630,8 +6615,8 @@
0, 0,
0, 0,
0, 0,
0.15643446504023087, 0,
0.9876883405951378, 1,
1, 1,
1, 1,
1 1
...@@ -6641,7 +6626,7 @@ ...@@ -6641,7 +6626,7 @@
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 0, "x": 0,
"y": 0, "y": 0,
"z": 18 "z": 0
}, },
"_skewX": 0, "_skewX": 0,
"_skewY": 0, "_skewY": 0,
...@@ -6690,7 +6675,7 @@ ...@@ -6690,7 +6675,7 @@
"asset": { "asset": {
"__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f" "__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f"
}, },
"fileId": "f541l+U4tNNYaBe2/tAYma", "fileId": "60e1D5kAdLPqmX89y/OeLM",
"sync": false "sync": false
}, },
{ {
...@@ -6732,13 +6717,13 @@ ...@@ -6732,13 +6717,13 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
43.783, 46.618,
28.272, 14.334,
0, 0,
0, 0,
0, 0,
0.15643446504023087, 0,
0.9876883405951378, 1,
1, 1,
1, 1,
1 1
...@@ -6748,7 +6733,7 @@ ...@@ -6748,7 +6733,7 @@
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 0, "x": 0,
"y": 0, "y": 0,
"z": 18 "z": 0
}, },
"_skewX": 0, "_skewX": 0,
"_skewY": 0, "_skewY": 0,
...@@ -6801,7 +6786,7 @@ ...@@ -6801,7 +6786,7 @@
"asset": { "asset": {
"__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f" "__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f"
}, },
"fileId": "97Us735ZhEQYhAAuU23vVa", "fileId": "81Tx4LyCtK15jmwyohy5rV",
"sync": false "sync": false
}, },
{ {
...@@ -6843,13 +6828,13 @@ ...@@ -6843,13 +6828,13 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
96.493, 59.482,
-102.745, -124.158,
0,
0, 0,
0, 0,
0, 0,
0.15643446504023087, 1,
0.9876883405951378,
1, 1,
1, 1,
1 1
...@@ -6859,7 +6844,7 @@ ...@@ -6859,7 +6844,7 @@
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 0, "x": 0,
"y": 0, "y": 0,
"z": 18 "z": 0
}, },
"_skewX": 0, "_skewX": 0,
"_skewY": 0, "_skewY": 0,
...@@ -6912,7 +6897,7 @@ ...@@ -6912,7 +6897,7 @@
"asset": { "asset": {
"__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f" "__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f"
}, },
"fileId": "fcF/okZtlCh5G/bJXMJSR7", "fileId": "39LmHLJQ1NUICPHLa8eH8c",
"sync": false "sync": false
}, },
{ {
...@@ -6958,13 +6943,13 @@ ...@@ -6958,13 +6943,13 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-31.356, 5.821,
-116.785, -131.908,
0,
0, 0,
0, 0,
0, 0,
0.15643446504023087, 1,
0.9876883405951378,
1, 1,
1, 1,
1 1
...@@ -6974,7 +6959,7 @@ ...@@ -6974,7 +6959,7 @@
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 0, "x": 0,
"y": 0, "y": 0,
"z": 18 "z": 0
}, },
"_skewX": 0, "_skewX": 0,
"_skewY": 0, "_skewY": 0,
...@@ -7091,7 +7076,7 @@ ...@@ -7091,7 +7076,7 @@
"asset": { "asset": {
"__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f" "__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f"
}, },
"fileId": "84aOz9eaNKgZE18x8Nemle", "fileId": "d41Kyrc21H+7CXLbQ3k466",
"sync": false "sync": false
}, },
{ {
...@@ -7122,7 +7107,7 @@ ...@@ -7122,7 +7107,7 @@
"asset": { "asset": {
"__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f" "__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f"
}, },
"fileId": "f1jq6X/rRKfZBmJ1e4ru6g", "fileId": "653tonIZRFQZHR/kxwnVKb",
"sync": false "sync": false
}, },
{ {
...@@ -7169,8 +7154,8 @@ ...@@ -7169,8 +7154,8 @@
0, 0,
0, 0,
0, 0,
0.15643446504023087, 0,
0.9876883405951378, 1,
1, 1,
1, 1,
1 1
...@@ -7180,7 +7165,7 @@ ...@@ -7180,7 +7165,7 @@
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 0, "x": 0,
"y": 0, "y": 0,
"z": 18 "z": 0
}, },
"_skewX": 0, "_skewX": 0,
"_skewY": 0, "_skewY": 0,
...@@ -7229,7 +7214,7 @@ ...@@ -7229,7 +7214,7 @@
"asset": { "asset": {
"__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f" "__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f"
}, },
"fileId": "65LqXMO9hAhoZy1Pv1NQGW", "fileId": "b5sDJZdP9FNZ7LPEfYzL4H",
"sync": false "sync": false
}, },
{ {
...@@ -7275,13 +7260,13 @@ ...@@ -7275,13 +7260,13 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
145.683, 196.962,
194.684, 144.398,
0,
0, 0,
0, 0,
0, 0,
1, -0.14780941112961063,
0.9890158633619168,
1, 1,
1, 1,
0 0
...@@ -7291,7 +7276,7 @@ ...@@ -7291,7 +7276,7 @@
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 0, "x": 0,
"y": 0, "y": 0,
"z": 0 "z": -17
}, },
"_skewX": 0, "_skewX": 0,
"_skewY": 0, "_skewY": 0,
...@@ -7404,7 +7389,7 @@ ...@@ -7404,7 +7389,7 @@
"asset": { "asset": {
"__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f" "__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f"
}, },
"fileId": "fa6DdntIBEAJM6yI09z2N8", "fileId": "f5i9OWWXdCfaCpFztESXA3",
"sync": false "sync": false
}, },
{ {
...@@ -7497,7 +7482,7 @@ ...@@ -7497,7 +7482,7 @@
"asset": { "asset": {
"__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f" "__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f"
}, },
"fileId": "3fFUmL2dVD84wY+xyn4ETy", "fileId": "785TTrDfVDy6Kzgesydrpe",
"sync": false "sync": false
}, },
{ {
...@@ -7539,13 +7524,13 @@ ...@@ -7539,13 +7524,13 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
43.173, 51.045,
28.296, 13.491,
0, 0,
0, 0,
0, 0,
0.15643446504023087, 0,
0.9876883405951378, 1,
1, 1,
1, 1,
1 1
...@@ -7555,7 +7540,7 @@ ...@@ -7555,7 +7540,7 @@
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 0, "x": 0,
"y": 0, "y": 0,
"z": 18 "z": 0
}, },
"_skewX": 0, "_skewX": 0,
"_skewY": 0, "_skewY": 0,
...@@ -7604,7 +7589,7 @@ ...@@ -7604,7 +7589,7 @@
"asset": { "asset": {
"__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f" "__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f"
}, },
"fileId": "65wrjvpdtPG5Ncj9Q6zVkK", "fileId": "81fazz0/BEZJFTigjcGHLI",
"sync": false "sync": false
}, },
{ {
...@@ -7633,9 +7618,6 @@ ...@@ -7633,9 +7618,6 @@
"audTryagain": { "audTryagain": {
"__uuid__": "6df9bb96-0611-47b1-9d98-f877972aa7f1" "__uuid__": "6df9bb96-0611-47b1-9d98-f877972aa7f1"
}, },
"audDown": {
"__uuid__": "3102823d-0ed3-4985-bc07-2d108298c006"
},
"_id": "" "_id": ""
}, },
{ {
...@@ -7646,7 +7628,7 @@ ...@@ -7646,7 +7628,7 @@
"asset": { "asset": {
"__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f" "__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f"
}, },
"fileId": "8b6G+AsxtIbInPAUiCwG9O", "fileId": "a4J20ECExHm4jmJBgMCqi3",
"sync": false "sync": false
}, },
{ {
...@@ -7713,7 +7695,7 @@ ...@@ -7713,7 +7695,7 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
111.245, 112.3,
102.187, 102.187,
0, 0,
0, 0,
...@@ -7842,7 +7824,7 @@ ...@@ -7842,7 +7824,7 @@
"asset": { "asset": {
"__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f" "__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f"
}, },
"fileId": "beMObWRlBFTaPqA39EJrH1", "fileId": "f5Ail8BsBJBoooZ0iCfaYQ",
"sync": false "sync": false
}, },
{ {
...@@ -7949,7 +7931,7 @@ ...@@ -7949,7 +7931,7 @@
"asset": { "asset": {
"__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f" "__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f"
}, },
"fileId": "d5sXV+pypHfJnBVHNROeGP", "fileId": "2cW3weyqRDqY7U1R+OgHz8",
"sync": false "sync": false
}, },
{ {
...@@ -8060,7 +8042,7 @@ ...@@ -8060,7 +8042,7 @@
"asset": { "asset": {
"__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f" "__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f"
}, },
"fileId": "17gbVboUhJr5FVie+PCmkt", "fileId": "4cpcib23VK8JQ1wUd5tnoO",
"sync": false "sync": false
}, },
{ {
...@@ -8171,7 +8153,7 @@ ...@@ -8171,7 +8153,7 @@
"asset": { "asset": {
"__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f" "__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f"
}, },
"fileId": "30x165jBJICp6pDAHb+/dN", "fileId": "708Q66Up5KzZ47H0WtPJgR",
"sync": false "sync": false
}, },
{ {
...@@ -8350,7 +8332,7 @@ ...@@ -8350,7 +8332,7 @@
"asset": { "asset": {
"__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f" "__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f"
}, },
"fileId": "78Om4zAiFL44ig6wQ+D3kL", "fileId": "e9sBvm24BDtbTcWtc2t2x1",
"sync": false "sync": false
}, },
{ {
...@@ -8381,7 +8363,7 @@ ...@@ -8381,7 +8363,7 @@
"asset": { "asset": {
"__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f" "__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f"
}, },
"fileId": "88YEOjctdFno1W6ilnr2zD", "fileId": "e2mTy8ddxG2pwIx1AH8r5q",
"sync": false "sync": false
}, },
{ {
...@@ -8488,7 +8470,7 @@ ...@@ -8488,7 +8470,7 @@
"asset": { "asset": {
"__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f" "__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f"
}, },
"fileId": "4fsEONhb9ARY82Rn3jVz7c", "fileId": "aeEWDjpgxHH7Y10LKxqMpJ",
"sync": false "sync": false
}, },
{ {
...@@ -8663,7 +8645,7 @@ ...@@ -8663,7 +8645,7 @@
"asset": { "asset": {
"__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f" "__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f"
}, },
"fileId": "94IJM7lC5Ed5GgEs1EAFLP", "fileId": "80Yf8OI2VN1LZ6nL/hWbep",
"sync": false "sync": false
}, },
{ {
...@@ -8756,7 +8738,7 @@ ...@@ -8756,7 +8738,7 @@
"asset": { "asset": {
"__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f" "__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f"
}, },
"fileId": "87QdGsnHVFeYC1mIoVgu5A", "fileId": "e4hzjAmvVNWKaXJLp0KONT",
"sync": false "sync": false
}, },
{ {
...@@ -8863,7 +8845,7 @@ ...@@ -8863,7 +8845,7 @@
"asset": { "asset": {
"__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f" "__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f"
}, },
"fileId": "d8+3Ko0tNPeZTiFvwOqK04", "fileId": "0erx5lUA5HCJrF0OIjEZiJ",
"sync": false "sync": false
}, },
{ {
...@@ -8892,9 +8874,6 @@ ...@@ -8892,9 +8874,6 @@
"audTryagain": { "audTryagain": {
"__uuid__": "6df9bb96-0611-47b1-9d98-f877972aa7f1" "__uuid__": "6df9bb96-0611-47b1-9d98-f877972aa7f1"
}, },
"audDown": {
"__uuid__": "3102823d-0ed3-4985-bc07-2d108298c006"
},
"_id": "" "_id": ""
}, },
{ {
...@@ -8905,7 +8884,7 @@ ...@@ -8905,7 +8884,7 @@
"asset": { "asset": {
"__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f" "__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f"
}, },
"fileId": "33OcyXrO1NPqPrfA9Lhy/x", "fileId": "daz5k51XlMlL9/uGwLDyba",
"sync": false "sync": false
}, },
{ {
......
...@@ -75,37 +75,37 @@ ...@@ -75,37 +75,37 @@
"__id__": 5 "__id__": 5
}, },
{ {
"__id__": 38 "__id__": 36
}, },
{ {
"__id__": 52 "__id__": 50
}, },
{ {
"__id__": 56 "__id__": 54
}, },
{ {
"__id__": 58 "__id__": 56
}, },
{ {
"__id__": 60 "__id__": 58
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 64 "__id__": 62
}, },
{ {
"__id__": 65 "__id__": 63
}, },
{ {
"__id__": 66 "__id__": 64
}, },
{ {
"__id__": 67 "__id__": 65
}, },
{ {
"__id__": 68 "__id__": 66
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -195,7 +195,7 @@ ...@@ -195,7 +195,7 @@
"array": [ "array": [
0, 0,
0, 0,
311.7691453623979, 200.91789367798978,
0, 0,
0, 0,
0, 0,
...@@ -290,16 +290,16 @@ ...@@ -290,16 +290,16 @@
"__id__": 28 "__id__": 28
}, },
{ {
"__id__": 35 "__id__": 33
}, },
{ {
"__id__": 36 "__id__": 34
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 37 "__id__": 35
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1272,18 +1272,15 @@ ...@@ -1272,18 +1272,15 @@
"_children": [ "_children": [
{ {
"__id__": 29 "__id__": 29
},
{
"__id__": 31
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 33 "__id__": 31
}, },
{ {
"__id__": 34 "__id__": 32
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1298,7 +1295,7 @@ ...@@ -1298,7 +1295,7 @@
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 678, "width": 678,
"height": 74 "height": 118
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -1309,7 +1306,7 @@ ...@@ -1309,7 +1306,7 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-281.667, 5.811,
360, 360,
0, 0,
0, 0,
...@@ -1334,98 +1331,6 @@ ...@@ -1334,98 +1331,6 @@
"groupIndex": 0, "groupIndex": 0,
"_id": "cdryvKJWtMw6JhKXetwgVn" "_id": "cdryvKJWtMw6JhKXetwgVn"
}, },
{
"__type__": "cc.Node",
"_name": "bg_title",
"_objFlags": 0,
"_parent": {
"__id__": 28
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 30
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 678,
"height": 74
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
21.865,
-36.956,
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": "4eYg3hBZlA2r8pp0Th0HCA"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 29
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": null,
"_type": 0,
"_sizeMode": 1,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "66GO914aNCJ5Zkjai4IW6N"
},
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "$labTitle", "_name": "$labTitle",
...@@ -1437,7 +1342,7 @@ ...@@ -1437,7 +1342,7 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 32 "__id__": 30
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1463,7 +1368,7 @@ ...@@ -1463,7 +1368,7 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
271.318, 0,
-51.429, -51.429,
0, 0,
0, 0,
...@@ -1493,7 +1398,7 @@ ...@@ -1493,7 +1398,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 31 "__id__": 29
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -1773,19 +1678,19 @@ ...@@ -1773,19 +1678,19 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 39 "__id__": 37
}, },
{ {
"__id__": 43 "__id__": 41
}, },
{ {
"__id__": 47 "__id__": 45
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 51 "__id__": 49
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1841,16 +1746,16 @@ ...@@ -1841,16 +1746,16 @@
"_name": "$btnLast", "_name": "$btnLast",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 38 "__id__": 36
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 40 "__id__": 38
}, },
{ {
"__id__": 42 "__id__": 40
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1906,7 +1811,7 @@ ...@@ -1906,7 +1811,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 39 "__id__": 37
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": { "_normalMaterial": {
...@@ -1919,7 +1824,7 @@ ...@@ -1919,7 +1824,7 @@
"zoomScale": 1.2, "zoomScale": 1.2,
"clickEvents": [ "clickEvents": [
{ {
"__id__": 41 "__id__": 39
} }
], ],
"_N$interactable": true, "_N$interactable": true,
...@@ -1987,7 +1892,7 @@ ...@@ -1987,7 +1892,7 @@
"__uuid__": "29158224-f8dd-4661-a796-1ffab537140e" "__uuid__": "29158224-f8dd-4661-a796-1ffab537140e"
}, },
"_N$target": { "_N$target": {
"__id__": 39 "__id__": 37
}, },
"_id": "3aYEjZFo9EW5nRfp9wQsPT" "_id": "3aYEjZFo9EW5nRfp9wQsPT"
}, },
...@@ -2004,7 +1909,7 @@ ...@@ -2004,7 +1909,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 39 "__id__": 37
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -2036,16 +1941,16 @@ ...@@ -2036,16 +1941,16 @@
"_name": "$btnReplay", "_name": "$btnReplay",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 38 "__id__": 36
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 44 "__id__": 42
}, },
{ {
"__id__": 46 "__id__": 44
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2101,7 +2006,7 @@ ...@@ -2101,7 +2006,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 43 "__id__": 41
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": { "_normalMaterial": {
...@@ -2114,7 +2019,7 @@ ...@@ -2114,7 +2019,7 @@
"zoomScale": 1.2, "zoomScale": 1.2,
"clickEvents": [ "clickEvents": [
{ {
"__id__": 45 "__id__": 43
} }
], ],
"_N$interactable": true, "_N$interactable": true,
...@@ -2182,7 +2087,7 @@ ...@@ -2182,7 +2087,7 @@
"__uuid__": "29158224-f8dd-4661-a796-1ffab537140e" "__uuid__": "29158224-f8dd-4661-a796-1ffab537140e"
}, },
"_N$target": { "_N$target": {
"__id__": 43 "__id__": 41
}, },
"_id": "07Ws9ikrxNn7zeBRgoDjd6" "_id": "07Ws9ikrxNn7zeBRgoDjd6"
}, },
...@@ -2199,7 +2104,7 @@ ...@@ -2199,7 +2104,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 43 "__id__": 41
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -2231,16 +2136,16 @@ ...@@ -2231,16 +2136,16 @@
"_name": "$btnNext", "_name": "$btnNext",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 38 "__id__": 36
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 48 "__id__": 46
}, },
{ {
"__id__": 50 "__id__": 48
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2296,7 +2201,7 @@ ...@@ -2296,7 +2201,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 47 "__id__": 45
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": { "_normalMaterial": {
...@@ -2309,7 +2214,7 @@ ...@@ -2309,7 +2214,7 @@
"zoomScale": 1.2, "zoomScale": 1.2,
"clickEvents": [ "clickEvents": [
{ {
"__id__": 49 "__id__": 47
} }
], ],
"_N$interactable": true, "_N$interactable": true,
...@@ -2377,7 +2282,7 @@ ...@@ -2377,7 +2282,7 @@
"__uuid__": "29158224-f8dd-4661-a796-1ffab537140e" "__uuid__": "29158224-f8dd-4661-a796-1ffab537140e"
}, },
"_N$target": { "_N$target": {
"__id__": 47 "__id__": 45
}, },
"_id": "135iNKUqZJsISLr7ME3oWt" "_id": "135iNKUqZJsISLr7ME3oWt"
}, },
...@@ -2394,7 +2299,7 @@ ...@@ -2394,7 +2299,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 47 "__id__": 45
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -2426,7 +2331,7 @@ ...@@ -2426,7 +2331,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 38 "__id__": 36
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -2457,13 +2362,13 @@ ...@@ -2457,13 +2362,13 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 53 "__id__": 51
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 55 "__id__": 53
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2519,13 +2424,13 @@ ...@@ -2519,13 +2424,13 @@
"_name": "$sprAudio", "_name": "$sprAudio",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 52 "__id__": 50
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 54 "__id__": 52
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2581,7 +2486,7 @@ ...@@ -2581,7 +2486,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 53 "__id__": 51
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -2613,7 +2518,7 @@ ...@@ -2613,7 +2518,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 52 "__id__": 50
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -2686,7 +2591,7 @@ ...@@ -2686,7 +2591,7 @@
"__uuid__": "29158224-f8dd-4661-a796-1ffab537140e" "__uuid__": "29158224-f8dd-4661-a796-1ffab537140e"
}, },
"_N$target": { "_N$target": {
"__id__": 52 "__id__": 50
}, },
"_id": "28Vhywz4hGv7Zkx2yg5cPL" "_id": "28Vhywz4hGv7Zkx2yg5cPL"
}, },
...@@ -2701,7 +2606,7 @@ ...@@ -2701,7 +2606,7 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 57 "__id__": 55
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2757,7 +2662,7 @@ ...@@ -2757,7 +2662,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 56 "__id__": 54
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -2790,7 +2695,7 @@ ...@@ -2790,7 +2695,7 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 59 "__id__": 57
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2846,7 +2751,7 @@ ...@@ -2846,7 +2751,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 58 "__id__": 56
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -2892,13 +2797,13 @@ ...@@ -2892,13 +2797,13 @@
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 61 "__id__": 59
}, },
{ {
"__id__": 62 "__id__": 60
}, },
{ {
"__id__": 63 "__id__": 61
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2954,7 +2859,7 @@ ...@@ -2954,7 +2859,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 60 "__id__": 58
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -2986,7 +2891,7 @@ ...@@ -2986,7 +2891,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 60 "__id__": 58
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -3013,7 +2918,7 @@ ...@@ -3013,7 +2918,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 60 "__id__": 58
}, },
"_enabled": true, "_enabled": true,
"_id": "6agttKBQpG2LLsR8YnzqwI" "_id": "6agttKBQpG2LLsR8YnzqwI"
...@@ -3106,7 +3011,7 @@ ...@@ -3106,7 +3011,7 @@
"__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f" "__uuid__": "88f15fa0-f590-4044-949c-b337e6a0b06f"
}, },
"dragonBone": { "dragonBone": {
"__id__": 59 "__id__": 57
}, },
"spfAudio": [ "spfAudio": [
{ {
......
export const DefaultData = {
"questionAudio": "http://staging-teach.cdn.ireadabc.com/70810ba6564a9f73f7cdce7ed180e3db.mp3",
"questionText": "123 234 345 456 567 678 789",
"questionList": [
{
"rightOptionIdx": 1,
"optionList": [
{
"text": "123 234 345",
"optionDragonBone": {
"skeJsonData": {
"url": "http://staging-teach.cdn.ireadabc.com/48b884b3c7b3a717f6e4b055f490a1f1.json",
"name": "walkingfish_ske.json"
},
"texJsonData": {
"url": "http://staging-teach.cdn.ireadabc.com/608b2c5f85297f0b7930325733b7bea9.json",
"name": "walkingfish_tex.json"
},
"texPngData": {
"url": "http://staging-teach.cdn.ireadabc.com/ecfd66f932659635f5b66642378d826b.png",
"name": "walkingfish_tex.png"
}
},
"optionAudio": "http://staging-teach.cdn.ireadabc.com/4e267b9c0b58ebb153bfc0ae520cb7fe.mp3"
},
{
"text": "2342 2342",
"optionDragonBone": {
"skeJsonData": {
"url": "http://staging-teach.cdn.ireadabc.com/48b884b3c7b3a717f6e4b055f490a1f1.json",
"name": "walkingfish_ske.json"
},
"texJsonData": {
"url": "http://staging-teach.cdn.ireadabc.com/608b2c5f85297f0b7930325733b7bea9.json",
"name": "walkingfish_tex.json"
},
"texPngData": {
"url": "http://staging-teach.cdn.ireadabc.com/ecfd66f932659635f5b66642378d826b.png",
"name": "walkingfish_tex.png"
}
},
"optionAudio": "http://staging-teach.cdn.ireadabc.com/4e267b9c0b58ebb153bfc0ae520cb7fe.mp3"
},
{
"text": "45234523453245324532543452354234",
"optionDragonBone": {
"skeJsonData": {
"url": "http://staging-teach.cdn.ireadabc.com/48b884b3c7b3a717f6e4b055f490a1f1.json",
"name": "walkingfish_ske.json"
},
"texJsonData": {
"url": "http://staging-teach.cdn.ireadabc.com/608b2c5f85297f0b7930325733b7bea9.json",
"name": "walkingfish_tex.json"
},
"texPngData": {
"url": "http://staging-teach.cdn.ireadabc.com/ecfd66f932659635f5b66642378d826b.png",
"name": "walkingfish_tex.png"
}
},
"optionAudio": "http://staging-teach.cdn.ireadabc.com/90fd9908a33a3d087ac53e6f7d794c18.mp3"
}
],
"pageAudio": "http://staging-teach.cdn.ireadabc.com/1d192b1cb2f2b1864ca55e903711081a.mp3"
},
{
"rightOptionIdx": 0,
"optionList": [
{
"text": "123 234 345",
"optionDragonBone": {
"skeJsonData": {
"url": "http://staging-teach.cdn.ireadabc.com/48b884b3c7b3a717f6e4b055f490a1f1.json",
"name": "walkingfish_ske.json"
},
"texJsonData": {
"url": "http://staging-teach.cdn.ireadabc.com/608b2c5f85297f0b7930325733b7bea9.json",
"name": "walkingfish_tex.json"
},
"texPngData": {
"url": "http://staging-teach.cdn.ireadabc.com/ecfd66f932659635f5b66642378d826b.png",
"name": "walkingfish_tex.png"
}
},
"optionAudio": "http://staging-teach.cdn.ireadabc.com/4e267b9c0b58ebb153bfc0ae520cb7fe.mp3"
},
{
"text": "45234523453245324532543452354234",
"optionDragonBone": {
"skeJsonData": {
"url": "http://staging-teach.cdn.ireadabc.com/48b884b3c7b3a717f6e4b055f490a1f1.json",
"name": "walkingfish_ske.json"
},
"texJsonData": {
"url": "http://staging-teach.cdn.ireadabc.com/608b2c5f85297f0b7930325733b7bea9.json",
"name": "walkingfish_tex.json"
},
"texPngData": {
"url": "http://staging-teach.cdn.ireadabc.com/ecfd66f932659635f5b66642378d826b.png",
"name": "walkingfish_tex.png"
}
},
"optionAudio": "http://staging-teach.cdn.ireadabc.com/90fd9908a33a3d087ac53e6f7d794c18.mp3"
}
],
"pageAudio": "http://staging-teach.cdn.ireadabc.com/092d354f33b0147565b7b5e3634c28dd.mp3"
},
// {
// "rightOptionIdx": 0,
// "optionList": [
// {
// "text": "123 234 345",
// "optionDragonBone": {
// "skeJsonData": {
// "url": "http://staging-teach.cdn.ireadabc.com/48b884b3c7b3a717f6e4b055f490a1f1.json",
// "name": "walkingfish_ske.json"
// },
// "texJsonData": {
// "url": "http://staging-teach.cdn.ireadabc.com/608b2c5f85297f0b7930325733b7bea9.json",
// "name": "walkingfish_tex.json"
// },
// "texPngData": {
// "url": "http://staging-teach.cdn.ireadabc.com/ecfd66f932659635f5b66642378d826b.png",
// "name": "walkingfish_tex.png"
// }
// },
// "optionAudio": "http://staging-teach.cdn.ireadabc.com/4e267b9c0b58ebb153bfc0ae520cb7fe.mp3"
// },
// {
// "text": "2342 23 42",
// "optionDragonBone": {
// "skeJsonData": {
// "url": "http://staging-teach.cdn.ireadabc.com/48b884b3c7b3a717f6e4b055f490a1f1.json",
// "name": "walkingfish_ske.json"
// },
// "texJsonData": {
// "url": "http://staging-teach.cdn.ireadabc.com/608b2c5f85297f0b7930325733b7bea9.json",
// "name": "walkingfish_tex.json"
// },
// "texPngData": {
// "url": "http://staging-teach.cdn.ireadabc.com/ecfd66f932659635f5b66642378d826b.png",
// "name": "walkingfish_tex.png"
// }
// },
// "optionAudio": "http://staging-teach.cdn.ireadabc.com/4e267b9c0b58ebb153bfc0ae520cb7fe.mp3"
// },
// {
// "text": "45234523453245324532543452354234",
// "optionDragonBone": {
// "skeJsonData": {
// "url": "http://staging-teach.cdn.ireadabc.com/48b884b3c7b3a717f6e4b055f490a1f1.json",
// "name": "walkingfish_ske.json"
// },
// "texJsonData": {
// "url": "http://staging-teach.cdn.ireadabc.com/608b2c5f85297f0b7930325733b7bea9.json",
// "name": "walkingfish_tex.json"
// },
// "texPngData": {
// "url": "http://staging-teach.cdn.ireadabc.com/ecfd66f932659635f5b66642378d826b.png",
// "name": "walkingfish_tex.png"
// }
// },
// "optionAudio": "http://staging-teach.cdn.ireadabc.com/90fd9908a33a3d087ac53e6f7d794c18.mp3"
// }
// ],
// "pageAudio": "http://staging-teach.cdn.ireadabc.com/1d192b1cb2f2b1864ca55e903711081a.mp3"
// }
]
}
\ No newline at end of file
{
"ver": "1.0.8",
"uuid": "6fa9c94a-d3df-4f14-bf6b-b6aa701eb398",
"isPlugin": false,
"loadPluginInWeb": true,
"loadPluginInNative": true,
"loadPluginInEditor": false,
"subMetas": {}
}
\ No newline at end of file
...@@ -63,7 +63,6 @@ cc.Class({ ...@@ -63,7 +63,6 @@ cc.Class({
} }
}, },
showAudioButton() { showAudioButton() {
this.nodMask.runAction(cc.fadeOut(1))
this.btnAudio.active = true; this.btnAudio.active = true;
this.playShowAudioButton(); this.playShowAudioButton();
}, },
...@@ -158,13 +157,15 @@ cc.Class({ ...@@ -158,13 +157,15 @@ cc.Class({
}, },
chooseRight() { chooseRight() {
this.nodMask.runAction(cc.fadeOut(1))
this.showLight(); this.showLight();
this.playAudioRight(); this.playAudioRight();
this.scene.onClickAnswer(this, this.isRight);
}, },
chooseWrong() { chooseWrong() {
this.showLight();
this.playAudioWrong(); this.playAudioWrong();
this.playShowCross(); this.playShowCross();
this.scene.onClickAnswer(this, this.isRight);
}, },
playAudioRight() { playAudioRight() {
...@@ -173,17 +174,19 @@ cc.Class({ ...@@ -173,17 +174,19 @@ cc.Class({
cc.audioEngine.setFinishCallback(id, () => { cc.audioEngine.setFinishCallback(id, () => {
GameData.audioCount--; GameData.audioCount--;
}) })
this.scene.onClickAnswer(this, this.isRight);
}, },
playAudioWrong() { playAudioWrong() {
GameData.audioCount++; GameData.audioCount++;
let id = cc.audioEngine.play(this.audWrong, false, 1); let id = cc.audioEngine.play(this.audWrong, false, 1);
cc.audioEngine.setFinishCallback(id, () => { cc.audioEngine.setFinishCallback(id, () => {
GameData.audioCount--; GameData.audioCount--;
this.scene.onClickAnswer(this, this.isRight);
}) })
}, },
playRotateNormal() {
this.node.runAction(cc.rotateTo(0.5, 0));
},
showLight() { showLight() {
this.nodLight.active = true; this.nodLight.active = true;
}, },
...@@ -252,7 +255,7 @@ cc.Class({ ...@@ -252,7 +255,7 @@ cc.Class({
this.playAudioOption((duration) => { this.playAudioOption((duration) => {
this.scheduleStep = 2; this.scheduleStep = 2;
this.scheduleDuration = duration / 2 / this.label.node.width * this.scheduleStep; this.scheduleDuration = duration / 2 / this.label.node.width * this.scheduleStep;
if(this.scheduleDuration < 0.05){ if (this.scheduleDuration < 0.05) {
this.scheduleDuration = 0.05; this.scheduleDuration = 0.05;
this.scheduleStep = this.scheduleDuration / duration * 2 * this.label.node.width; this.scheduleStep = this.scheduleDuration / duration * 2 * this.label.node.width;
} }
......
const saveKey = "DataKey_Cocos_FT12"; const saveKey = "DataKey_Cocos_FT12";
const BaseUI = require('BaseUI'); const BaseUI = require('BaseUI');
import { DefaultData } from './DefaultData';
import EventMgr from './EventMgr'; import EventMgr from './EventMgr';
cc.Class({ cc.Class({
...@@ -97,8 +98,7 @@ cc.Class({ ...@@ -97,8 +98,7 @@ cc.Class({
}, },
getDefaultData() { getDefaultData() {
let dataJson = '{"questionAudio":"http://staging-teach.cdn.ireadabc.com/d2a9d8815d0370dc3b9aa18987dee584.mp3","questionText":"123","questionList":[{"rightOptionIdx":0,"rightOptionIndex":"","optionList":[{"text":"123 456 789 123 343","optionDragonBone":{"skeJsonData":{"url":"http://staging-teach.cdn.ireadabc.com/48b884b3c7b3a717f6e4b055f490a1f1.json","name":"walkingfish_ske.json"},"texJsonData":{"url":"http://staging-teach.cdn.ireadabc.com/608b2c5f85297f0b7930325733b7bea9.json","name":"walkingfish_tex.json"},"texPngData":{"url":"http://staging-teach.cdn.ireadabc.com/ecfd66f932659635f5b66642378d826b.png","name":"walkingfish_tex.png"}},"optionAudio":"http://staging-teach.cdn.ireadabc.com/7ee85feaee06931e85cd0dd4ee64eeb1.mp3"},{"text":"","optionDragonBone":{"skeJsonData":{"url":""},"texJsonData":{"url":""},"texPngData":{"url":""}},"optionAudio":""},{"text":"","optionDragonBone":{"skeJsonData":{"url":""},"texJsonData":{"url":""},"texPngData":{"url":""}},"optionAudio":""},{"text":"","optionDragonBone":{"skeJsonData":{"url":""},"texJsonData":{"url":""},"texPngData":{"url":""}},"optionAudio":""},{"text":"","optionDragonBone":{"skeJsonData":{"url":""},"texJsonData":{"url":""},"texPngData":{"url":""}},"optionAudio":""}]},{"rightOptionIdx":0,"rightOptionIndex":"","optionList":[{"text":"123","optionDragonBone":{"skeJsonData":{"url":"http://staging-teach.cdn.ireadabc.com/48b884b3c7b3a717f6e4b055f490a1f1.json","name":"walkingfish_ske.json"},"texJsonData":{"url":"http://staging-teach.cdn.ireadabc.com/608b2c5f85297f0b7930325733b7bea9.json","name":"walkingfish_tex.json"},"texPngData":{"url":"http://staging-teach.cdn.ireadabc.com/ecfd66f932659635f5b66642378d826b.png","name":"walkingfish_tex.png"}},"optionAudio":"http://staging-teach.cdn.ireadabc.com/7ee85feaee06931e85cd0dd4ee64eeb1.mp3"},{"text":"","optionDragonBone":{"skeJsonData":{"url":""},"texJsonData":{"url":""},"texPngData":{"url":""}},"optionAudio":""},{"text":"","optionDragonBone":{"skeJsonData":{"url":""},"texJsonData":{"url":""},"texPngData":{"url":""}},"optionAudio":""},{"text":"","optionDragonBone":{"skeJsonData":{"url":""},"texJsonData":{"url":""},"texPngData":{"url":""}},"optionAudio":""}]},{"rightOptionIdx":0,"rightOptionIndex":"","optionList":[{"text":"123","optionDragonBone":{"skeJsonData":{"url":"http://staging-teach.cdn.ireadabc.com/48b884b3c7b3a717f6e4b055f490a1f1.json","name":"walkingfish_ske.json"},"texJsonData":{"url":"http://staging-teach.cdn.ireadabc.com/608b2c5f85297f0b7930325733b7bea9.json","name":"walkingfish_tex.json"},"texPngData":{"url":"http://staging-teach.cdn.ireadabc.com/ecfd66f932659635f5b66642378d826b.png","name":"walkingfish_tex.png"}},"optionAudio":"http://staging-teach.cdn.ireadabc.com/7ee85feaee06931e85cd0dd4ee64eeb1.mp3"},{"text":"","optionDragonBone":{"skeJsonData":{"url":""},"texJsonData":{"url":""},"texPngData":{"url":""}},"optionAudio":""},{"text":"","optionDragonBone":{"skeJsonData":{"url":""},"texJsonData":{"url":""},"texPngData":{"url":""}},"optionAudio":""}]},{"rightOptionIdx":0,"rightOptionIndex":"","optionList":[{"text":"123","optionDragonBone":{"skeJsonData":{"url":"http://staging-teach.cdn.ireadabc.com/48b884b3c7b3a717f6e4b055f490a1f1.json","name":"walkingfish_ske.json"},"texJsonData":{"url":"http://staging-teach.cdn.ireadabc.com/608b2c5f85297f0b7930325733b7bea9.json","name":"walkingfish_tex.json"},"texPngData":{"url":"http://staging-teach.cdn.ireadabc.com/ecfd66f932659635f5b66642378d826b.png","name":"walkingfish_tex.png"}},"optionAudio":"http://staging-teach.cdn.ireadabc.com/7ee85feaee06931e85cd0dd4ee64eeb1.mp3"},{"text":"","optionDragonBone":{"skeJsonData":{"url":""},"texJsonData":{"url":""},"texPngData":{"url":""}},"optionAudio":""},{"text":"","optionDragonBone":{"skeJsonData":{"url":""},"texJsonData":{"url":""},"texPngData":{"url":""}},"optionAudio":""},{"text":"","optionDragonBone":{"skeJsonData":{"url":""},"texJsonData":{"url":""},"texPngData":{"url":""}},"optionAudio":""},{"text":"","optionDragonBone":{"skeJsonData":{"url":""},"texJsonData":{"url":""},"texPngData":{"url":""}},"optionAudio":""},{"text":"","optionDragonBone":{"skeJsonData":{"url":""},"texJsonData":{"url":""},"texPngData":{"url":""}},"optionAudio":""},{"text":"","optionDragonBone":{"skeJsonData":{"url":""},"texJsonData":{"url":""},"texPngData":{"url":""}},"optionAudio":""}]},{"rightOptionIdx":0,"rightOptionIndex":"","optionList":[{"text":"123","optionDragonBone":{"skeJsonData":{"url":"http://staging-teach.cdn.ireadabc.com/48b884b3c7b3a717f6e4b055f490a1f1.json","name":"walkingfish_ske.json"},"texJsonData":{"url":"http://staging-teach.cdn.ireadabc.com/608b2c5f85297f0b7930325733b7bea9.json","name":"walkingfish_tex.json"},"texPngData":{"url":"http://staging-teach.cdn.ireadabc.com/ecfd66f932659635f5b66642378d826b.png","name":"walkingfish_tex.png"}},"optionAudio":"http://staging-teach.cdn.ireadabc.com/7ee85feaee06931e85cd0dd4ee64eeb1.mp3"},{"text":"","optionDragonBone":{"skeJsonData":{"url":""},"texJsonData":{"url":""},"texPngData":{"url":""}},"optionAudio":""},{"text":"","optionDragonBone":{"skeJsonData":{"url":""},"texJsonData":{"url":""},"texPngData":{"url":""}},"optionAudio":""},{"text":"","optionDragonBone":{"skeJsonData":{"url":""},"texJsonData":{"url":""},"texPngData":{"url":""}},"optionAudio":""},{"text":"","optionDragonBone":{"skeJsonData":{"url":""},"texJsonData":{"url":""},"texPngData":{"url":""}},"optionAudio":""},{"text":"","optionDragonBone":{"skeJsonData":{"url":""},"texJsonData":{"url":""},"texPngData":{"url":""}},"optionAudio":""}]}]}'; let data = DefaultData;
let data = JSON.parse(dataJson);
return data; return data;
}, },
...@@ -136,8 +136,7 @@ cc.Class({ ...@@ -136,8 +136,7 @@ cc.Class({
loadEnd() { loadEnd() {
GameData.questionIndex = 0; GameData.questionIndex = 0;
this.questionList = []; this.questionList = [];
let optionList = this.data.questionList[GameData.questionIndex].optionList; for (let i = 0; i < this.data.questionList.length; i++) {
for (let i = 0; i < optionList.length; i++) {
this.questionList[i] = i; this.questionList[i] = i;
} }
// this.questionList[0] = 0; // this.questionList[0] = 0;
...@@ -342,7 +341,7 @@ cc.Class({ ...@@ -342,7 +341,7 @@ cc.Class({
}) })
) )
) )
itemAnswer.playRotateNormal();
target.runAction(cc.sequence( target.runAction(cc.sequence(
cc.spawn( cc.spawn(
cc.moveTo(0.5, 0, 0), cc.moveTo(0.5, 0, 0),
......
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