Commit 65899585 authored by liujiangnan's avatar liujiangnan

feat: 适配调整

parent 883aeb66
...@@ -96,13 +96,13 @@ ...@@ -96,13 +96,13 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 1240 "__id__": 1242
}, },
{ {
"__id__": 1241 "__id__": 1243
}, },
{ {
"__id__": 1242 "__id__": 1244
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -28018,7 +28018,7 @@ ...@@ -28018,7 +28018,7 @@
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"showInEditor": false, "showInEditor": false,
"_id": "57J3lX9zFJGa2Q5sAGensh" "_id": "b6l2phUBJF0JxkfP7B+vVD"
}, },
{ {
"__type__": "cc.Label", "__type__": "cc.Label",
...@@ -28051,7 +28051,7 @@ ...@@ -28051,7 +28051,7 @@
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 0, "_N$overflow": 0,
"_N$cacheMode": 0, "_N$cacheMode": 0,
"_id": "90hG2R9rpI56YvTP0BJivG" "_id": "7e15uEo+lGmbwlVjJZfuD+"
}, },
{ {
"__type__": "cc.PrivateNode", "__type__": "cc.PrivateNode",
...@@ -28114,7 +28114,7 @@ ...@@ -28114,7 +28114,7 @@
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"showInEditor": false, "showInEditor": false,
"_id": "66cZGDeBdNy7Ky6LAzme5e" "_id": "31jksGe/1Ferh/jEo5jBRL"
}, },
{ {
"__type__": "cc.Label", "__type__": "cc.Label",
...@@ -28147,7 +28147,7 @@ ...@@ -28147,7 +28147,7 @@
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 0, "_N$overflow": 0,
"_N$cacheMode": 0, "_N$cacheMode": 0,
"_id": "a0VTPGPTdFCJ9M/aWzlCUJ" "_id": "36SXmk5LFMF59Dy2AvHYGU"
}, },
{ {
"__type__": "cc.PrivateNode", "__type__": "cc.PrivateNode",
...@@ -28210,7 +28210,7 @@ ...@@ -28210,7 +28210,7 @@
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"showInEditor": false, "showInEditor": false,
"_id": "2bC5PCCcpPqoZf7FPV07u5" "_id": "d3rUPfQIVGNr0GwyIbc6/0"
}, },
{ {
"__type__": "cc.Label", "__type__": "cc.Label",
...@@ -28243,7 +28243,7 @@ ...@@ -28243,7 +28243,7 @@
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 0, "_N$overflow": 0,
"_N$cacheMode": 0, "_N$cacheMode": 0,
"_id": "61isjAphhKzrxmfF6C+kcq" "_id": "02D/Dg6utB95vmbLCSvQkv"
}, },
{ {
"__type__": "cc.PrivateNode", "__type__": "cc.PrivateNode",
...@@ -28306,7 +28306,7 @@ ...@@ -28306,7 +28306,7 @@
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"showInEditor": false, "showInEditor": false,
"_id": "7aRW2i5DtCO65QSG8/djLP" "_id": "bfIrOwFZpKVrh+01VfgtjD"
}, },
{ {
"__type__": "cc.Label", "__type__": "cc.Label",
...@@ -28339,7 +28339,7 @@ ...@@ -28339,7 +28339,7 @@
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 0, "_N$overflow": 0,
"_N$cacheMode": 0, "_N$cacheMode": 0,
"_id": "b9+xygjEJJa7kgQdRYjgoY" "_id": "a6PXW20LxKBqFf3WMdXco8"
}, },
{ {
"__type__": "cc.PrivateNode", "__type__": "cc.PrivateNode",
...@@ -28402,7 +28402,7 @@ ...@@ -28402,7 +28402,7 @@
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"showInEditor": false, "showInEditor": false,
"_id": "a4aEcAuJlJkKDHZprkYvGH" "_id": "d5b2VrsAdHXqdxWfT1CMDF"
}, },
{ {
"__type__": "cc.Label", "__type__": "cc.Label",
...@@ -28435,7 +28435,7 @@ ...@@ -28435,7 +28435,7 @@
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 0, "_N$overflow": 0,
"_N$cacheMode": 0, "_N$cacheMode": 0,
"_id": "1bzzc83LNKNreHxuXh3xCB" "_id": "5d3wx4U2RMRYaXiGduc87w"
}, },
{ {
"__type__": "cc.RichText", "__type__": "cc.RichText",
...@@ -31586,7 +31586,7 @@ ...@@ -31586,7 +31586,7 @@
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"showInEditor": false, "showInEditor": false,
"_id": "dcy2ugKrhNDax2gv8UZJ7M" "_id": "41XFWtt+RFM7SYHmNNn2Df"
}, },
{ {
"__type__": "cc.Label", "__type__": "cc.Label",
...@@ -31619,7 +31619,7 @@ ...@@ -31619,7 +31619,7 @@
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 0, "_N$overflow": 0,
"_N$cacheMode": 0, "_N$cacheMode": 0,
"_id": "e1/bwjuN1DYZTz18lBcF2M" "_id": "40bm3pL/BD4oY1+CU1WUln"
}, },
{ {
"__type__": "cc.PrivateNode", "__type__": "cc.PrivateNode",
...@@ -31682,7 +31682,7 @@ ...@@ -31682,7 +31682,7 @@
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"showInEditor": false, "showInEditor": false,
"_id": "067bODC9dJV7aQAcfpTO/9" "_id": "b7z/HCFGdBKqmNaQYSpZR8"
}, },
{ {
"__type__": "cc.Label", "__type__": "cc.Label",
...@@ -31715,7 +31715,7 @@ ...@@ -31715,7 +31715,7 @@
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 0, "_N$overflow": 0,
"_N$cacheMode": 0, "_N$cacheMode": 0,
"_id": "ceexUX76RLZ6vBV8OyRzI3" "_id": "10pci9q/FBErvG8NSocgKu"
}, },
{ {
"__type__": "cc.PrivateNode", "__type__": "cc.PrivateNode",
...@@ -31778,7 +31778,7 @@ ...@@ -31778,7 +31778,7 @@
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"showInEditor": false, "showInEditor": false,
"_id": "a1+jz15A9LVb26yduG4F8A" "_id": "63HWgvaV1A8Z+rmwHKVvEm"
}, },
{ {
"__type__": "cc.Label", "__type__": "cc.Label",
...@@ -31811,7 +31811,7 @@ ...@@ -31811,7 +31811,7 @@
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 0, "_N$overflow": 0,
"_N$cacheMode": 0, "_N$cacheMode": 0,
"_id": "dbLLG3NHhPbI3lSArnW0GG" "_id": "bbxFE2VnZPYY5D6f0cM3C0"
}, },
{ {
"__type__": "cc.RichText", "__type__": "cc.RichText",
...@@ -32290,7 +32290,7 @@ ...@@ -32290,7 +32290,7 @@
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"showInEditor": false, "showInEditor": false,
"_id": "02ydPwVqxNQotA64YxIo6g" "_id": "66SCENM4BDEaELKvl4ErII"
}, },
{ {
"__type__": "cc.Label", "__type__": "cc.Label",
...@@ -32323,7 +32323,7 @@ ...@@ -32323,7 +32323,7 @@
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 0, "_N$overflow": 0,
"_N$cacheMode": 0, "_N$cacheMode": 0,
"_id": "d5qSRfZkdPmIL9LmzX86EW" "_id": "f27f8d3J1KKYXvQdGOYP8B"
}, },
{ {
"__type__": "cc.PrivateNode", "__type__": "cc.PrivateNode",
...@@ -32386,7 +32386,7 @@ ...@@ -32386,7 +32386,7 @@
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"showInEditor": false, "showInEditor": false,
"_id": "05EPXbRLpB14w0MVO9Kbre" "_id": "b1fryeJF5BZqDsNT3bNx1B"
}, },
{ {
"__type__": "cc.Label", "__type__": "cc.Label",
...@@ -32419,7 +32419,7 @@ ...@@ -32419,7 +32419,7 @@
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 0, "_N$overflow": 0,
"_N$cacheMode": 0, "_N$cacheMode": 0,
"_id": "b8Ra10ddtHBrgo90XvyqPY" "_id": "bftLmSsv9LE5rnWAqj9O1m"
}, },
{ {
"__type__": "cc.PrivateNode", "__type__": "cc.PrivateNode",
...@@ -32482,7 +32482,7 @@ ...@@ -32482,7 +32482,7 @@
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"showInEditor": false, "showInEditor": false,
"_id": "26q3psAONPsan5tunF/BI/" "_id": "8d4G+hs2JN7IGgrPPy9tzE"
}, },
{ {
"__type__": "cc.Label", "__type__": "cc.Label",
...@@ -32515,7 +32515,7 @@ ...@@ -32515,7 +32515,7 @@
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 0, "_N$overflow": 0,
"_N$cacheMode": 0, "_N$cacheMode": 0,
"_id": "34U6TIq9tNAqviElGfQcTl" "_id": "acou6FgoJKWpbxrhUdl2Z0"
}, },
{ {
"__type__": "cc.RichText", "__type__": "cc.RichText",
...@@ -32805,7 +32805,7 @@ ...@@ -32805,7 +32805,7 @@
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"showInEditor": false, "showInEditor": false,
"_id": "ffZtnrnK1DC40Wl6/owkBR" "_id": "0626NZ4oFJgqzb7i7WhXgb"
}, },
{ {
"__type__": "cc.Label", "__type__": "cc.Label",
...@@ -32838,7 +32838,7 @@ ...@@ -32838,7 +32838,7 @@
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 0, "_N$overflow": 0,
"_N$cacheMode": 0, "_N$cacheMode": 0,
"_id": "67oO5PZt5IlpPhiVVdM25b" "_id": "17uNM3dwlMKrsz1tFlBlC2"
}, },
{ {
"__type__": "cc.PrivateNode", "__type__": "cc.PrivateNode",
...@@ -32901,7 +32901,7 @@ ...@@ -32901,7 +32901,7 @@
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"showInEditor": false, "showInEditor": false,
"_id": "876aFeANVMLaUvpyeuluqV" "_id": "eaMi9uUatNMZK+EUNf8RRk"
}, },
{ {
"__type__": "cc.Label", "__type__": "cc.Label",
...@@ -32934,7 +32934,7 @@ ...@@ -32934,7 +32934,7 @@
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 0, "_N$overflow": 0,
"_N$cacheMode": 0, "_N$cacheMode": 0,
"_id": "90hIjHAp9AkLB0aZm0auYA" "_id": "9eMNJytStNOYdNSeedtFk+"
}, },
{ {
"__type__": "cc.PrivateNode", "__type__": "cc.PrivateNode",
...@@ -32997,7 +32997,7 @@ ...@@ -32997,7 +32997,7 @@
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"showInEditor": false, "showInEditor": false,
"_id": "f0pDx2LhVIFrOeOJ2AnIaw" "_id": "3aSb0PcXBOLbejiAi6NPbu"
}, },
{ {
"__type__": "cc.Label", "__type__": "cc.Label",
...@@ -33030,7 +33030,7 @@ ...@@ -33030,7 +33030,7 @@
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 0, "_N$overflow": 0,
"_N$cacheMode": 0, "_N$cacheMode": 0,
"_id": "9eToiKXs5KAbkHLfkywBLL" "_id": "b41wnivIFMdaUdlSIF4vlO"
}, },
{ {
"__type__": "cc.RichText", "__type__": "cc.RichText",
...@@ -34455,7 +34455,7 @@ ...@@ -34455,7 +34455,7 @@
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"showInEditor": false, "showInEditor": false,
"_id": "9b1zDkTxtIyZdKYZZqzYUG" "_id": "8dND5w9vZGNpjN4EFsPcq8"
}, },
{ {
"__type__": "cc.Label", "__type__": "cc.Label",
...@@ -34488,7 +34488,7 @@ ...@@ -34488,7 +34488,7 @@
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 0, "_N$overflow": 0,
"_N$cacheMode": 0, "_N$cacheMode": 0,
"_id": "36u2PpCG5GrKbYpd9UWWgP" "_id": "50+wlIOLBLkZnhfbufV3EE"
}, },
{ {
"__type__": "cc.PrivateNode", "__type__": "cc.PrivateNode",
...@@ -34551,7 +34551,7 @@ ...@@ -34551,7 +34551,7 @@
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"showInEditor": false, "showInEditor": false,
"_id": "ac4emrvIRADJiaBoSaOAKq" "_id": "c1X5HNCVRLep3InHNilpo4"
}, },
{ {
"__type__": "cc.Label", "__type__": "cc.Label",
...@@ -34584,7 +34584,7 @@ ...@@ -34584,7 +34584,7 @@
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 0, "_N$overflow": 0,
"_N$cacheMode": 0, "_N$cacheMode": 0,
"_id": "edD4q3YChOIbU1sulMR6kF" "_id": "8045LfLktBfLykcLIjCAsl"
}, },
{ {
"__type__": "cc.PrivateNode", "__type__": "cc.PrivateNode",
...@@ -34647,7 +34647,7 @@ ...@@ -34647,7 +34647,7 @@
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"showInEditor": false, "showInEditor": false,
"_id": "4a8ZZZGaZFF4l/dqSy5oV3" "_id": "50/2h+IIlFn475/V97oJ2q"
}, },
{ {
"__type__": "cc.Label", "__type__": "cc.Label",
...@@ -34680,7 +34680,7 @@ ...@@ -34680,7 +34680,7 @@
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 0, "_N$overflow": 0,
"_N$cacheMode": 0, "_N$cacheMode": 0,
"_id": "0avfpUuuZH6oLjM/AxheKp" "_id": "dcXNqNt8FD1Y3vVKUrPyJg"
}, },
{ {
"__type__": "cc.PrivateNode", "__type__": "cc.PrivateNode",
...@@ -34743,7 +34743,7 @@ ...@@ -34743,7 +34743,7 @@
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"showInEditor": false, "showInEditor": false,
"_id": "35baXXU99DGochFhWCK7gi" "_id": "60docnhm1B34QOfVlJqgO/"
}, },
{ {
"__type__": "cc.Label", "__type__": "cc.Label",
...@@ -34776,7 +34776,7 @@ ...@@ -34776,7 +34776,7 @@
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 0, "_N$overflow": 0,
"_N$cacheMode": 0, "_N$cacheMode": 0,
"_id": "389ODLPcBIc4q4frw4ZXIN" "_id": "cfrT1Gmu5I862YfZQGa6KM"
}, },
{ {
"__type__": "cc.PrivateNode", "__type__": "cc.PrivateNode",
...@@ -34839,7 +34839,7 @@ ...@@ -34839,7 +34839,7 @@
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"showInEditor": false, "showInEditor": false,
"_id": "36oeuO4PJH87ad+5b1joYp" "_id": "a1ZXfW0BBEu76ttZHohhz1"
}, },
{ {
"__type__": "cc.Label", "__type__": "cc.Label",
...@@ -34872,7 +34872,7 @@ ...@@ -34872,7 +34872,7 @@
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 0, "_N$overflow": 0,
"_N$cacheMode": 0, "_N$cacheMode": 0,
"_id": "66E8rBP6BD5YFkuXVyhcXN" "_id": "5bBEkCObBN4byoYVOsW7oh"
}, },
{ {
"__type__": "cc.PrivateNode", "__type__": "cc.PrivateNode",
...@@ -34935,7 +34935,7 @@ ...@@ -34935,7 +34935,7 @@
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"showInEditor": false, "showInEditor": false,
"_id": "91n/8WNeRI2JOP6ZKQALhQ" "_id": "2d7YPmpv9MnrJrJTOrUkMX"
}, },
{ {
"__type__": "cc.Label", "__type__": "cc.Label",
...@@ -34968,7 +34968,7 @@ ...@@ -34968,7 +34968,7 @@
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 0, "_N$overflow": 0,
"_N$cacheMode": 0, "_N$cacheMode": 0,
"_id": "37O7buTG9FpLBj+srm7uO6" "_id": "3dGu5eRHNFmr9+LisOCQXd"
}, },
{ {
"__type__": "cc.PrivateNode", "__type__": "cc.PrivateNode",
...@@ -35031,7 +35031,7 @@ ...@@ -35031,7 +35031,7 @@
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"showInEditor": false, "showInEditor": false,
"_id": "0dZWzNkUJA5aHbrucLtol1" "_id": "9eerEuJgVFla20FJkH2Wn3"
}, },
{ {
"__type__": "cc.Label", "__type__": "cc.Label",
...@@ -35064,7 +35064,7 @@ ...@@ -35064,7 +35064,7 @@
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 0, "_N$overflow": 0,
"_N$cacheMode": 0, "_N$cacheMode": 0,
"_id": "1cmssavCpM24aL121qwmf1" "_id": "f3PjGtsU5N1rfMnpqB7+js"
}, },
{ {
"__type__": "cc.RichText", "__type__": "cc.RichText",
...@@ -37810,7 +37810,7 @@ ...@@ -37810,7 +37810,7 @@
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"showInEditor": false, "showInEditor": false,
"_id": "feI61Eq+9GvpjAfXaMKWe7" "_id": "aewwN7VEBBS4yfh4Yud89Z"
}, },
{ {
"__type__": "cc.Label", "__type__": "cc.Label",
...@@ -37843,7 +37843,7 @@ ...@@ -37843,7 +37843,7 @@
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 0, "_N$overflow": 0,
"_N$cacheMode": 0, "_N$cacheMode": 0,
"_id": "9fBrypxFZKEr5yT56/96w8" "_id": "fefh7du9VMXKTlwKwiEHqF"
}, },
{ {
"__type__": "cc.PrivateNode", "__type__": "cc.PrivateNode",
...@@ -37906,7 +37906,7 @@ ...@@ -37906,7 +37906,7 @@
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"showInEditor": false, "showInEditor": false,
"_id": "16HCoUh2hKHbZrNeQUd3R/" "_id": "e4AguGuIdCZqXYeJnvTWYs"
}, },
{ {
"__type__": "cc.Label", "__type__": "cc.Label",
...@@ -37939,7 +37939,7 @@ ...@@ -37939,7 +37939,7 @@
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 0, "_N$overflow": 0,
"_N$cacheMode": 0, "_N$cacheMode": 0,
"_id": "d5pY+nzABEfJYoXHVOxPqf" "_id": "078xWIcelM1LHqXNYlfgdV"
}, },
{ {
"__type__": "cc.PrivateNode", "__type__": "cc.PrivateNode",
...@@ -38002,7 +38002,7 @@ ...@@ -38002,7 +38002,7 @@
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"showInEditor": false, "showInEditor": false,
"_id": "72r2sexs9F0KkqD07ocfAS" "_id": "adG570zxBCnKzAIiNvrLhg"
}, },
{ {
"__type__": "cc.Label", "__type__": "cc.Label",
...@@ -38035,7 +38035,7 @@ ...@@ -38035,7 +38035,7 @@
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 0, "_N$overflow": 0,
"_N$cacheMode": 0, "_N$cacheMode": 0,
"_id": "e4uH75JsZGbK+ltCwYQucz" "_id": "c9wwSAztRBgJKi60ih4uI5"
}, },
{ {
"__type__": "cc.RichText", "__type__": "cc.RichText",
...@@ -51487,19 +51487,19 @@ ...@@ -51487,19 +51487,19 @@
"__id__": 1080 "__id__": 1080
}, },
{ {
"__id__": 1231 "__id__": 1233
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 1237 "__id__": 1239
}, },
{ {
"__id__": 1238 "__id__": 1240
}, },
{ {
"__id__": 1239 "__id__": 1241
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -51565,10 +51565,10 @@ ...@@ -51565,10 +51565,10 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 1229 "__id__": 1231
}, },
{ {
"__id__": 1230 "__id__": 1232
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -51634,7 +51634,7 @@ ...@@ -51634,7 +51634,7 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 1228 "__id__": 1230
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -51649,7 +51649,7 @@ ...@@ -51649,7 +51649,7 @@
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 1280, "width": 1280,
"height": 3600 "height": 720
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -51709,10 +51709,10 @@ ...@@ -51709,10 +51709,10 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 1226 "__id__": 1228
}, },
{ {
"__id__": 1227 "__id__": 1229
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -51727,19 +51727,19 @@ ...@@ -51727,19 +51727,19 @@
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 1280, "width": 1280,
"height": 3600 "height": 720
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
"x": 0.5, "x": 0.5,
"y": 0.5 "y": 1
}, },
"_trs": { "_trs": {
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
0, 0,
-1199.479, 0,
0, 0,
0, 0,
0, 0,
...@@ -51804,7 +51804,7 @@ ...@@ -51804,7 +51804,7 @@
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
0, 0,
1628, -170.5,
0, 0,
0, 0,
0, 0,
...@@ -51873,7 +51873,7 @@ ...@@ -51873,7 +51873,7 @@
"_alignFlags": 41, "_alignFlags": 41,
"_left": 0, "_left": 0,
"_right": 0, "_right": 0,
"_top": 1.5, "_top": 0,
"_bottom": 0, "_bottom": 0,
"_verticalCenter": 0, "_verticalCenter": 0,
"_horizontalCenter": 0, "_horizontalCenter": 0,
...@@ -51928,7 +51928,7 @@ ...@@ -51928,7 +51928,7 @@
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
0, 0,
1672.654, -123.988,
0, 0,
0, 0,
0, 0,
...@@ -51997,7 +51997,7 @@ ...@@ -51997,7 +51997,7 @@
"_alignFlags": 41, "_alignFlags": 41,
"_left": 442.5, "_left": 442.5,
"_right": 442.5, "_right": 442.5,
"_top": 70.721, "_top": 67.363,
"_bottom": 0, "_bottom": 0,
"_verticalCenter": 0, "_verticalCenter": 0,
"_horizontalCenter": 0, "_horizontalCenter": 0,
...@@ -52059,7 +52059,7 @@ ...@@ -52059,7 +52059,7 @@
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
0, 0,
1442.71, -362.655,
0, 0,
0, 0,
0, 0,
...@@ -53847,7 +53847,7 @@ ...@@ -53847,7 +53847,7 @@
"_alignFlags": 41, "_alignFlags": 41,
"_left": 0, "_left": 0,
"_right": 0, "_right": 0,
"_top": 300.66499999999996, "_top": 306.03,
"_bottom": 0, "_bottom": 0,
"_verticalCenter": 0, "_verticalCenter": 0,
"_horizontalCenter": 0, "_horizontalCenter": 0,
...@@ -53879,7 +53879,7 @@ ...@@ -53879,7 +53879,7 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 1225 "__id__": 1227
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -53906,7 +53906,7 @@ ...@@ -53906,7 +53906,7 @@
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
0, 0,
1184.424, -624.125,
0, 0,
0, 0,
0, 0,
...@@ -54137,9 +54137,6 @@ ...@@ -54137,9 +54137,6 @@
{ {
"__id__": 1135 "__id__": 1135
}, },
{
"__id__": 1140
},
{ {
"__id__": 1142 "__id__": 1142
}, },
...@@ -54147,7 +54144,7 @@ ...@@ -54147,7 +54144,7 @@
"__id__": 1144 "__id__": 1144
}, },
{ {
"__id__": 1153 "__id__": 1146
}, },
{ {
"__id__": 1155 "__id__": 1155
...@@ -54156,7 +54153,7 @@ ...@@ -54156,7 +54153,7 @@
"__id__": 1157 "__id__": 1157
}, },
{ {
"__id__": 1164 "__id__": 1159
}, },
{ {
"__id__": 1166 "__id__": 1166
...@@ -54165,25 +54162,28 @@ ...@@ -54165,25 +54162,28 @@
"__id__": 1168 "__id__": 1168
}, },
{ {
"__id__": 1188 "__id__": 1170
}, },
{ {
"__id__": 1190 "__id__": 1190
}, },
{ {
"__id__": 1192 "__id__": 1192
},
{
"__id__": 1194
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 1222 "__id__": 1224
}, },
{ {
"__id__": 1223 "__id__": 1225
}, },
{ {
"__id__": 1224 "__id__": 1226
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -54344,10 +54344,10 @@ ...@@ -54344,10 +54344,10 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 1138 "__id__": 1140
}, },
{ {
"__id__": 1139 "__id__": 1141
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -54405,11 +54405,15 @@ ...@@ -54405,11 +54405,15 @@
"_parent": { "_parent": {
"__id__": 1135 "__id__": 1135
}, },
"_children": [], "_children": [
{
"__id__": 1137
}
],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 1137 "__id__": 1139
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -54424,7 +54428,7 @@ ...@@ -54424,7 +54428,7 @@
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 400, "width": 400,
"height": 179 "height": 200
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -54436,7 +54440,7 @@ ...@@ -54436,7 +54440,7 @@
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-200, -200,
-89.5, -100,
0, 0,
0, 0,
0, 0,
...@@ -54460,12 +54464,74 @@ ...@@ -54460,12 +54464,74 @@
"groupIndex": 0, "groupIndex": 0,
"_id": "53h2WCJxFKeouW5MaUsoY6" "_id": "53h2WCJxFKeouW5MaUsoY6"
}, },
{
"__type__": "cc.Node",
"_name": "pic",
"_objFlags": 0,
"_parent": {
"__id__": 1136
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 1138
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 400,
"height": 179
},
"_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": "149FajuuVFJqcx4zaPsh7O"
},
{ {
"__type__": "cc.Sprite", "__type__": "cc.Sprite",
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 1136 "__id__": 1137
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -54479,6 +54545,38 @@ ...@@ -54479,6 +54545,38 @@
"__uuid__": "8cdb44ac-a3f6-449f-b354-7cd48cf84061" "__uuid__": "8cdb44ac-a3f6-449f-b354-7cd48cf84061"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "c5K5Aqm9xCnLfhXm9gKugo"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 1136
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "a23235d1-15db-4b95-8439-a2e005bfff91"
},
"_type": 0,
"_sizeMode": 0, "_sizeMode": 0,
"_fillType": 0, "_fillType": 0,
"_fillCenter": { "_fillCenter": {
...@@ -54490,7 +54588,7 @@ ...@@ -54490,7 +54588,7 @@
"_fillRange": 0, "_fillRange": 0,
"_isTrimmedMode": true, "_isTrimmedMode": true,
"_atlas": null, "_atlas": null,
"_id": "19vYHbig9AzZwF6LQ+M8cQ" "_id": "0dlbfAtzBGMpSpyKtOOF0M"
}, },
{ {
"__type__": "cc.Sprite", "__type__": "cc.Sprite",
...@@ -54547,8 +54645,8 @@ ...@@ -54547,8 +54645,8 @@
"_N$startAxis": 0, "_N$startAxis": 0,
"_N$paddingLeft": 0, "_N$paddingLeft": 0,
"_N$paddingRight": 0, "_N$paddingRight": 0,
"_N$paddingTop": 0, "_N$paddingTop": 20,
"_N$paddingBottom": 0, "_N$paddingBottom": 20,
"_N$spacingX": 0, "_N$spacingX": 0,
"_N$spacingY": 0, "_N$spacingY": 0,
"_N$verticalDirection": 1, "_N$verticalDirection": 1,
...@@ -54567,7 +54665,7 @@ ...@@ -54567,7 +54665,7 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 1141 "__id__": 1143
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -54623,7 +54721,7 @@ ...@@ -54623,7 +54721,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 1140 "__id__": 1142
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -54661,7 +54759,7 @@ ...@@ -54661,7 +54759,7 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 1143 "__id__": 1145
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -54717,7 +54815,7 @@ ...@@ -54717,7 +54815,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 1142 "__id__": 1144
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -54754,16 +54852,16 @@ ...@@ -54754,16 +54852,16 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 1145 "__id__": 1147
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 1151 "__id__": 1153
}, },
{ {
"__id__": 1152 "__id__": 1154
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -54819,20 +54917,20 @@ ...@@ -54819,20 +54917,20 @@
"_name": "item", "_name": "item",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 1144 "__id__": 1146
}, },
"_children": [ "_children": [
{ {
"__id__": 1146 "__id__": 1148
}, },
{ {
"__id__": 1148 "__id__": 1150
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 1150 "__id__": 1152
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -54888,13 +54986,13 @@ ...@@ -54888,13 +54986,13 @@
"_name": "pic", "_name": "pic",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 1145 "__id__": 1147
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 1147 "__id__": 1149
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -54950,7 +55048,7 @@ ...@@ -54950,7 +55048,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 1146 "__id__": 1148
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -54982,13 +55080,13 @@ ...@@ -54982,13 +55080,13 @@
"_name": "word", "_name": "word",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 1145 "__id__": 1147
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 1149 "__id__": 1151
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -55044,7 +55142,7 @@ ...@@ -55044,7 +55142,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 1148 "__id__": 1150
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -55079,7 +55177,7 @@ ...@@ -55079,7 +55177,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 1145 "__id__": 1147
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -55111,7 +55209,7 @@ ...@@ -55111,7 +55209,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 1144 "__id__": 1146
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -55143,7 +55241,7 @@ ...@@ -55143,7 +55241,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 1144 "__id__": 1146
}, },
"_enabled": true, "_enabled": true,
"_layoutSize": { "_layoutSize": {
...@@ -55181,7 +55279,7 @@ ...@@ -55181,7 +55279,7 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 1154 "__id__": 1156
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -55237,7 +55335,7 @@ ...@@ -55237,7 +55335,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 1153 "__id__": 1155
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -55275,7 +55373,7 @@ ...@@ -55275,7 +55373,7 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 1156 "__id__": 1158
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -55331,7 +55429,7 @@ ...@@ -55331,7 +55429,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 1155 "__id__": 1157
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -55368,16 +55466,16 @@ ...@@ -55368,16 +55466,16 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 1158 "__id__": 1160
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 1162 "__id__": 1164
}, },
{ {
"__id__": 1163 "__id__": 1165
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -55433,17 +55531,17 @@ ...@@ -55433,17 +55531,17 @@
"_name": "item", "_name": "item",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 1157 "__id__": 1159
}, },
"_children": [ "_children": [
{ {
"__id__": 1159 "__id__": 1161
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 1161 "__id__": 1163
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -55499,13 +55597,13 @@ ...@@ -55499,13 +55597,13 @@
"_name": "sentence", "_name": "sentence",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 1158 "__id__": 1160
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 1160 "__id__": 1162
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -55561,7 +55659,7 @@ ...@@ -55561,7 +55659,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 1159 "__id__": 1161
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -55594,7 +55692,7 @@ ...@@ -55594,7 +55692,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 1158 "__id__": 1160
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -55626,7 +55724,7 @@ ...@@ -55626,7 +55724,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 1157 "__id__": 1159
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -55658,7 +55756,7 @@ ...@@ -55658,7 +55756,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 1157 "__id__": 1159
}, },
"_enabled": true, "_enabled": true,
"_layoutSize": { "_layoutSize": {
...@@ -55696,7 +55794,7 @@ ...@@ -55696,7 +55794,7 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 1165 "__id__": 1167
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -55752,7 +55850,7 @@ ...@@ -55752,7 +55850,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 1164 "__id__": 1166
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -55790,7 +55888,7 @@ ...@@ -55790,7 +55888,7 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 1167 "__id__": 1169
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -55846,7 +55944,7 @@ ...@@ -55846,7 +55944,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 1166 "__id__": 1168
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -55883,16 +55981,16 @@ ...@@ -55883,16 +55981,16 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 1169 "__id__": 1171
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 1186 "__id__": 1188
}, },
{ {
"__id__": 1187 "__id__": 1189
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -55948,23 +56046,23 @@ ...@@ -55948,23 +56046,23 @@
"_name": "row", "_name": "row",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 1168 "__id__": 1170
}, },
"_children": [ "_children": [
{ {
"__id__": 1170 "__id__": 1172
}, },
{ {
"__id__": 1173 "__id__": 1175
}, },
{ {
"__id__": 1182 "__id__": 1184
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 1185 "__id__": 1187
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -56020,11 +56118,11 @@ ...@@ -56020,11 +56118,11 @@
"_name": "item", "_name": "item",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 1169 "__id__": 1171
}, },
"_children": [ "_children": [
{ {
"__id__": 1171 "__id__": 1173
} }
], ],
"_active": true, "_active": true,
...@@ -56082,13 +56180,13 @@ ...@@ -56082,13 +56180,13 @@
"_name": "word", "_name": "word",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 1170 "__id__": 1172
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 1172 "__id__": 1174
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -56144,7 +56242,7 @@ ...@@ -56144,7 +56242,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 1171 "__id__": 1173
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -56179,14 +56277,14 @@ ...@@ -56179,14 +56277,14 @@
"_name": "item", "_name": "item",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 1169 "__id__": 1171
}, },
"_children": [ "_children": [
{ {
"__id__": 1174 "__id__": 1176
}, },
{ {
"__id__": 1179 "__id__": 1181
} }
], ],
"_active": true, "_active": true,
...@@ -56244,19 +56342,19 @@ ...@@ -56244,19 +56342,19 @@
"_name": "play_icon", "_name": "play_icon",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 1173 "__id__": 1175
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 1175 "__id__": 1177
}, },
{ {
"__id__": 1176 "__id__": 1178
}, },
{ {
"__id__": 1178 "__id__": 1180
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -56312,7 +56410,7 @@ ...@@ -56312,7 +56410,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 1174 "__id__": 1176
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -56344,7 +56442,7 @@ ...@@ -56344,7 +56442,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 1174 "__id__": 1176
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -56353,7 +56451,7 @@ ...@@ -56353,7 +56451,7 @@
"zoomScale": 1.2, "zoomScale": 1.2,
"clickEvents": [ "clickEvents": [
{ {
"__id__": 1177 "__id__": 1179
} }
], ],
"_N$interactable": true, "_N$interactable": true,
...@@ -56409,14 +56507,14 @@ ...@@ -56409,14 +56507,14 @@
"hoverSprite": null, "hoverSprite": null,
"_N$disabledSprite": null, "_N$disabledSprite": null,
"_N$target": { "_N$target": {
"__id__": 1174 "__id__": 1176
}, },
"_id": "b2nrsNa3tP4Y4jWAyoNhcl" "_id": "b2nrsNa3tP4Y4jWAyoNhcl"
}, },
{ {
"__type__": "cc.ClickEvent", "__type__": "cc.ClickEvent",
"target": { "target": {
"__id__": 1174 "__id__": 1176
}, },
"component": "", "component": "",
"_componentId": "302a6we0xtM87spUZZxF2lR", "_componentId": "302a6we0xtM87spUZZxF2lR",
...@@ -56428,7 +56526,7 @@ ...@@ -56428,7 +56526,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 1174 "__id__": 1176
}, },
"_enabled": true, "_enabled": true,
"_id": "aczoUoPdFE/4TfpLz3866q" "_id": "aczoUoPdFE/4TfpLz3866q"
...@@ -56438,16 +56536,16 @@ ...@@ -56438,16 +56536,16 @@
"_name": "play", "_name": "play",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 1173 "__id__": 1175
}, },
"_children": [], "_children": [],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 1180 "__id__": 1182
}, },
{ {
"__id__": 1181 "__id__": 1183
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -56503,7 +56601,7 @@ ...@@ -56503,7 +56601,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 1179 "__id__": 1181
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -56535,7 +56633,7 @@ ...@@ -56535,7 +56633,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 1179 "__id__": 1181
}, },
"_enabled": true, "_enabled": true,
"_defaultClip": { "_defaultClip": {
...@@ -56554,11 +56652,11 @@ ...@@ -56554,11 +56652,11 @@
"_name": "item", "_name": "item",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 1169 "__id__": 1171
}, },
"_children": [ "_children": [
{ {
"__id__": 1183 "__id__": 1185
} }
], ],
"_active": true, "_active": true,
...@@ -56616,13 +56714,13 @@ ...@@ -56616,13 +56714,13 @@
"_name": "goodjob", "_name": "goodjob",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 1182 "__id__": 1184
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 1184 "__id__": 1186
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -56678,7 +56776,7 @@ ...@@ -56678,7 +56776,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 1183 "__id__": 1185
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -56710,7 +56808,7 @@ ...@@ -56710,7 +56808,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 1169 "__id__": 1171
}, },
"_enabled": true, "_enabled": true,
"_layoutSize": { "_layoutSize": {
...@@ -56742,7 +56840,7 @@ ...@@ -56742,7 +56840,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 1168 "__id__": 1170
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -56774,7 +56872,7 @@ ...@@ -56774,7 +56872,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 1168 "__id__": 1170
}, },
"_enabled": true, "_enabled": true,
"_layoutSize": { "_layoutSize": {
...@@ -56812,7 +56910,7 @@ ...@@ -56812,7 +56910,7 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 1189 "__id__": 1191
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -56868,7 +56966,7 @@ ...@@ -56868,7 +56966,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 1188 "__id__": 1190
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -56906,7 +57004,7 @@ ...@@ -56906,7 +57004,7 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 1191 "__id__": 1193
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -56962,7 +57060,7 @@ ...@@ -56962,7 +57060,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 1190 "__id__": 1192
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -56999,10 +57097,10 @@ ...@@ -56999,10 +57097,10 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 1193 "__id__": 1195
}, },
{ {
"__id__": 1210 "__id__": 1212
} }
], ],
"_active": true, "_active": true,
...@@ -57060,12 +57158,9 @@ ...@@ -57060,12 +57158,9 @@
"_name": "result_bg", "_name": "result_bg",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 1192
},
"_children": [
{
"__id__": 1194 "__id__": 1194
}, },
"_children": [
{ {
"__id__": 1196 "__id__": 1196
}, },
...@@ -57083,12 +57178,15 @@ ...@@ -57083,12 +57178,15 @@
}, },
{ {
"__id__": 1206 "__id__": 1206
},
{
"__id__": 1208
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 1209 "__id__": 1211
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -57144,13 +57242,13 @@ ...@@ -57144,13 +57242,13 @@
"_name": "star_1", "_name": "star_1",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 1193 "__id__": 1195
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 1195 "__id__": 1197
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -57206,7 +57304,7 @@ ...@@ -57206,7 +57304,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 1194 "__id__": 1196
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -57238,13 +57336,13 @@ ...@@ -57238,13 +57336,13 @@
"_name": "star_1_light", "_name": "star_1_light",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 1193 "__id__": 1195
}, },
"_children": [], "_children": [],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 1197 "__id__": 1199
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -57300,7 +57398,7 @@ ...@@ -57300,7 +57398,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 1196 "__id__": 1198
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -57332,13 +57430,13 @@ ...@@ -57332,13 +57430,13 @@
"_name": "star_2", "_name": "star_2",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 1193 "__id__": 1195
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 1199 "__id__": 1201
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -57394,7 +57492,7 @@ ...@@ -57394,7 +57492,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 1198 "__id__": 1200
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -57426,13 +57524,13 @@ ...@@ -57426,13 +57524,13 @@
"_name": "star_2_light", "_name": "star_2_light",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 1193 "__id__": 1195
}, },
"_children": [], "_children": [],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 1201 "__id__": 1203
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -57488,7 +57586,7 @@ ...@@ -57488,7 +57586,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 1200 "__id__": 1202
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -57520,13 +57618,13 @@ ...@@ -57520,13 +57618,13 @@
"_name": "star_3", "_name": "star_3",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 1193 "__id__": 1195
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 1203 "__id__": 1205
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -57582,7 +57680,7 @@ ...@@ -57582,7 +57680,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 1202 "__id__": 1204
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -57614,13 +57712,13 @@ ...@@ -57614,13 +57712,13 @@
"_name": "star_3_light", "_name": "star_3_light",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 1193 "__id__": 1195
}, },
"_children": [], "_children": [],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 1205 "__id__": 1207
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -57676,7 +57774,7 @@ ...@@ -57676,7 +57774,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 1204 "__id__": 1206
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -57708,11 +57806,11 @@ ...@@ -57708,11 +57806,11 @@
"_name": "textnode", "_name": "textnode",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 1193 "__id__": 1195
}, },
"_children": [ "_children": [
{ {
"__id__": 1207 "__id__": 1209
} }
], ],
"_active": true, "_active": true,
...@@ -57770,13 +57868,13 @@ ...@@ -57770,13 +57868,13 @@
"_name": "New Label", "_name": "New Label",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 1206 "__id__": 1208
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 1208 "__id__": 1210
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -57832,7 +57930,7 @@ ...@@ -57832,7 +57930,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 1207 "__id__": 1209
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -57865,7 +57963,7 @@ ...@@ -57865,7 +57963,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 1193 "__id__": 1195
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -57897,23 +57995,23 @@ ...@@ -57897,23 +57995,23 @@
"_name": "video", "_name": "video",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 1192 "__id__": 1194
}, },
"_children": [ "_children": [
{
"__id__": 1211
},
{ {
"__id__": 1213 "__id__": 1213
}, },
{ {
"__id__": 1215 "__id__": 1215
},
{
"__id__": 1217
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 1221 "__id__": 1223
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -57969,13 +58067,13 @@ ...@@ -57969,13 +58067,13 @@
"_name": "video_cover", "_name": "video_cover",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 1210 "__id__": 1212
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 1212 "__id__": 1214
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -58031,7 +58129,7 @@ ...@@ -58031,7 +58129,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 1211 "__id__": 1213
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -58063,13 +58161,13 @@ ...@@ -58063,13 +58161,13 @@
"_name": "play", "_name": "play",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 1210 "__id__": 1212
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 1214 "__id__": 1216
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -58125,7 +58223,7 @@ ...@@ -58125,7 +58223,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 1213 "__id__": 1215
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -58157,20 +58255,20 @@ ...@@ -58157,20 +58255,20 @@
"_name": "video_process_bg", "_name": "video_process_bg",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 1210 "__id__": 1212
}, },
"_children": [ "_children": [
{ {
"__id__": 1216 "__id__": 1218
}, },
{ {
"__id__": 1218 "__id__": 1220
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 1220 "__id__": 1222
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -58226,13 +58324,13 @@ ...@@ -58226,13 +58324,13 @@
"_name": "video_process", "_name": "video_process",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 1215 "__id__": 1217
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 1217 "__id__": 1219
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -58288,7 +58386,7 @@ ...@@ -58288,7 +58386,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 1216 "__id__": 1218
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -58320,13 +58418,13 @@ ...@@ -58320,13 +58418,13 @@
"_name": "video_dot", "_name": "video_dot",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 1215 "__id__": 1217
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 1219 "__id__": 1221
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -58382,7 +58480,7 @@ ...@@ -58382,7 +58480,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 1218 "__id__": 1220
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -58414,7 +58512,7 @@ ...@@ -58414,7 +58512,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 1215 "__id__": 1217
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -58446,7 +58544,7 @@ ...@@ -58446,7 +58544,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 1210 "__id__": 1212
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -58577,7 +58675,7 @@ ...@@ -58577,7 +58675,7 @@
"_alignFlags": 41, "_alignFlags": 41,
"_left": 0, "_left": 0,
"_right": 0, "_right": 0,
"_top": 558.951, "_top": 567.5,
"_bottom": 0, "_bottom": 0,
"_verticalCenter": 0, "_verticalCenter": 0,
"_horizontalCenter": 0, "_horizontalCenter": 0,
...@@ -58604,7 +58702,7 @@ ...@@ -58604,7 +58702,7 @@
"_alignFlags": 41, "_alignFlags": 41,
"_left": 0, "_left": 0,
"_right": 0, "_right": 0,
"_top": -600.521, "_top": 0,
"_bottom": 0, "_bottom": 0,
"_verticalCenter": 0, "_verticalCenter": 0,
"_horizontalCenter": 0, "_horizontalCenter": 0,
...@@ -58735,16 +58833,16 @@ ...@@ -58735,16 +58833,16 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 1232 "__id__": 1234
}, },
{ {
"__id__": 1233 "__id__": 1235
}, },
{ {
"__id__": 1234 "__id__": 1236
}, },
{ {
"__id__": 1236 "__id__": 1238
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -58800,7 +58898,7 @@ ...@@ -58800,7 +58898,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 1231 "__id__": 1233
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -58832,7 +58930,7 @@ ...@@ -58832,7 +58930,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 1231 "__id__": 1233
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -58859,7 +58957,7 @@ ...@@ -58859,7 +58957,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 1231 "__id__": 1233
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -58868,7 +58966,7 @@ ...@@ -58868,7 +58966,7 @@
"zoomScale": 1.2, "zoomScale": 1.2,
"clickEvents": [ "clickEvents": [
{ {
"__id__": 1235 "__id__": 1237
} }
], ],
"_N$interactable": true, "_N$interactable": true,
...@@ -58929,7 +59027,7 @@ ...@@ -58929,7 +59027,7 @@
{ {
"__type__": "cc.ClickEvent", "__type__": "cc.ClickEvent",
"target": { "target": {
"__id__": 1231 "__id__": 1233
}, },
"component": "", "component": "",
"_componentId": "302a6we0xtM87spUZZxF2lR", "_componentId": "302a6we0xtM87spUZZxF2lR",
...@@ -58941,7 +59039,7 @@ ...@@ -58941,7 +59039,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 1231 "__id__": 1233
}, },
"_enabled": true, "_enabled": true,
"_id": "fa3KV6EbFDwJdO89ber4Ip" "_id": "fa3KV6EbFDwJdO89ber4Ip"
...@@ -204,7 +204,7 @@ export default class NewClass extends cc.Component { ...@@ -204,7 +204,7 @@ export default class NewClass extends cc.Component {
itemClone.parent = letterRow; itemClone.parent = letterRow;
itemClone.active = true; itemClone.active = true;
getSpriteFrimeByUrl(letter.pic_url, (spriteFrame) => { getSpriteFrimeByUrl(letter.pic_url, (spriteFrame) => {
itemClone.getComponent(cc.Sprite).spriteFrame = spriteFrame; cc.find("pic", itemClone).getComponent(cc.Sprite).spriteFrame = spriteFrame;
}); });
} }
} else { } else {
...@@ -260,6 +260,15 @@ export default class NewClass extends cc.Component { ...@@ -260,6 +260,15 @@ export default class NewClass extends cc.Component {
cc.find("split_line", resultNode).active = false; cc.find("split_line", resultNode).active = false;
} }
// 设置页面高度
this.scheduleOnce(() => {
const learnresult = cc.find(`Canvas/reportdetail/view/content/userdetail_scollpage/learnresult`);
const pageHight = cc.find(`itembg`, learnresult).height + Math.abs(learnresult.y);
cc.find(`Canvas/reportdetail/view/content`).height = pageHight + 100;
cc.find(`Canvas/reportdetail/view/content/userdetail_scollpage`).height = pageHight + 100;
}, 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