Commit 223a5ebe authored by liujiangnan's avatar liujiangnan

fix:布局

parent 56c29fa1
......@@ -2771,7 +2771,7 @@
"_groupIndex": 0,
"groupIndex": 0,
"showInEditor": false,
"_id": "dfztUIbx9Kpp6I7QdQQhRj"
"_id": "550H/JqHpEla3LHCd5g+8h"
},
{
"__type__": "cc.Label",
......@@ -2804,7 +2804,7 @@
"_N$fontFamily": "Arial",
"_N$overflow": 0,
"_N$cacheMode": 0,
"_id": "e81/6atgxFv5CInLf4xfa4"
"_id": "97qYHtTxhOcJOa/NvJkouI"
},
{
"__type__": "cc.PrivateNode",
......@@ -2867,7 +2867,7 @@
"_groupIndex": 0,
"groupIndex": 0,
"showInEditor": false,
"_id": "efpUA+4WZHiIauzSk+xfgM"
"_id": "64mkuBk8pJ95pDHO4RHgH0"
},
{
"__type__": "cc.Label",
......@@ -2900,7 +2900,7 @@
"_N$fontFamily": "Arial",
"_N$overflow": 0,
"_N$cacheMode": 0,
"_id": "64bg3GsR5Pe7am2UC3BaF3"
"_id": "d93/Ny+LNF+4heMij8YIXY"
},
{
"__type__": "cc.PrivateNode",
......@@ -2963,7 +2963,7 @@
"_groupIndex": 0,
"groupIndex": 0,
"showInEditor": false,
"_id": "cc95xAPRhBSpdHWn7EGQaT"
"_id": "05kZNWr8dAn7lun31LKseD"
},
{
"__type__": "cc.Label",
......@@ -2996,7 +2996,7 @@
"_N$fontFamily": "Arial",
"_N$overflow": 0,
"_N$cacheMode": 0,
"_id": "64lLhrPY9IlaJj7fayViHm"
"_id": "31Fg1b/U5H5Y4f+riAKuvL"
},
{
"__type__": "cc.PrivateNode",
......@@ -3059,7 +3059,7 @@
"_groupIndex": 0,
"groupIndex": 0,
"showInEditor": false,
"_id": "6fG/ht8p9IS5n/N2onRDdf"
"_id": "44VDrP3S9Fk6L7/LLsoVVu"
},
{
"__type__": "cc.Label",
......@@ -3092,7 +3092,7 @@
"_N$fontFamily": "Arial",
"_N$overflow": 0,
"_N$cacheMode": 0,
"_id": "51hVBEQX9IvZ2db8EdFmyZ"
"_id": "0cjrmOtIBECoVOnw/B//OM"
},
{
"__type__": "cc.PrivateNode",
......@@ -3155,7 +3155,7 @@
"_groupIndex": 0,
"groupIndex": 0,
"showInEditor": false,
"_id": "27VGhdCGFPR46jpvJLWOfK"
"_id": "e5M73ctjRBuarUit1XYvsK"
},
{
"__type__": "cc.Label",
......@@ -3188,7 +3188,7 @@
"_N$fontFamily": "Arial",
"_N$overflow": 0,
"_N$cacheMode": 0,
"_id": "0dRZZSIbVJm58cQZ4J2Arx"
"_id": "b2YTCkGyBECpGqAG3r6u0h"
},
{
"__type__": "cc.RichText",
......@@ -6369,7 +6369,7 @@
"_groupIndex": 0,
"groupIndex": 0,
"showInEditor": false,
"_id": "3dIhjf+0BCsbBM/r7fO7MW"
"_id": "a4+gatVxtMjoZMMt/JjsaH"
},
{
"__type__": "cc.Label",
......@@ -6402,7 +6402,7 @@
"_N$fontFamily": "Arial",
"_N$overflow": 0,
"_N$cacheMode": 0,
"_id": "cdVnXXO1NMUZGHXa13VxwY"
"_id": "8b4WmVjRJPMbXe8L9lkzd8"
},
{
"__type__": "cc.PrivateNode",
......@@ -6465,7 +6465,7 @@
"_groupIndex": 0,
"groupIndex": 0,
"showInEditor": false,
"_id": "22sxm0x8hJVIBi3G4gz/zt"
"_id": "61KVL9TthO7qPwqcNqwH7s"
},
{
"__type__": "cc.Label",
......@@ -6498,7 +6498,7 @@
"_N$fontFamily": "Arial",
"_N$overflow": 0,
"_N$cacheMode": 0,
"_id": "440pNZXHVG3bglSJVUqUK+"
"_id": "15Z9IOhf5Cn6wVZQLrh4Zv"
},
{
"__type__": "cc.PrivateNode",
......@@ -6561,7 +6561,7 @@
"_groupIndex": 0,
"groupIndex": 0,
"showInEditor": false,
"_id": "29fZFiklVBHriiHP6fxX/d"
"_id": "a3ydpsOZFLC70+/oLzLrd5"
},
{
"__type__": "cc.Label",
......@@ -6594,7 +6594,7 @@
"_N$fontFamily": "Arial",
"_N$overflow": 0,
"_N$cacheMode": 0,
"_id": "b2ECzbvMpIJJw5/duP0sNQ"
"_id": "cbRVdwhwFIUag1puqO2kyp"
},
{
"__type__": "cc.RichText",
......@@ -7073,7 +7073,7 @@
"_groupIndex": 0,
"groupIndex": 0,
"showInEditor": false,
"_id": "19YF0GlNJBqbDl2Yh0oWxh"
"_id": "ff55XSOOlGN5F3XsYptj0l"
},
{
"__type__": "cc.Label",
......@@ -7106,7 +7106,7 @@
"_N$fontFamily": "Arial",
"_N$overflow": 0,
"_N$cacheMode": 0,
"_id": "f2asQvXnRNebKYq3m2/dVa"
"_id": "bdQnH3H5xOKZzlxcbiFnaB"
},
{
"__type__": "cc.PrivateNode",
......@@ -7169,7 +7169,7 @@
"_groupIndex": 0,
"groupIndex": 0,
"showInEditor": false,
"_id": "d48tGyeydDqq6BHQ9H5ToR"
"_id": "2aXuMCBbRPBYiZbsMKE24/"
},
{
"__type__": "cc.Label",
......@@ -7202,7 +7202,7 @@
"_N$fontFamily": "Arial",
"_N$overflow": 0,
"_N$cacheMode": 0,
"_id": "edZ0ikYHJI/IRn24xMIhKk"
"_id": "38o4/w4P9GRIaUdIj62hQ/"
},
{
"__type__": "cc.PrivateNode",
......@@ -7265,7 +7265,7 @@
"_groupIndex": 0,
"groupIndex": 0,
"showInEditor": false,
"_id": "7fdLR7fLhIm7plRVMVOXts"
"_id": "3fD5u8YDBGjLzZqhL7ogyZ"
},
{
"__type__": "cc.Label",
......@@ -7298,7 +7298,7 @@
"_N$fontFamily": "Arial",
"_N$overflow": 0,
"_N$cacheMode": 0,
"_id": "aaEQ1Qz+lCZKUpOfx44svl"
"_id": "33531SOONHdo4sThfaFvjr"
},
{
"__type__": "cc.RichText",
......@@ -7588,7 +7588,7 @@
"_groupIndex": 0,
"groupIndex": 0,
"showInEditor": false,
"_id": "d1jUdUni9IVb1bmhekyhjW"
"_id": "d2N9oFNghCQaxoYzEVdrq6"
},
{
"__type__": "cc.Label",
......@@ -7621,7 +7621,7 @@
"_N$fontFamily": "Arial",
"_N$overflow": 0,
"_N$cacheMode": 0,
"_id": "0bPiSS1wJFZ54IwEwCGKsd"
"_id": "8f8AQiVvBCapJONKrPt1Fz"
},
{
"__type__": "cc.PrivateNode",
......@@ -7684,7 +7684,7 @@
"_groupIndex": 0,
"groupIndex": 0,
"showInEditor": false,
"_id": "568uKVQD9G3agQ4/NtgA4F"
"_id": "4eH8f0VdFCy7UEtThQSK48"
},
{
"__type__": "cc.Label",
......@@ -7717,7 +7717,7 @@
"_N$fontFamily": "Arial",
"_N$overflow": 0,
"_N$cacheMode": 0,
"_id": "212DEo/CBFX4zxiDmP3W0O"
"_id": "65uwir62tMQJ66fMZwVoJ7"
},
{
"__type__": "cc.PrivateNode",
......@@ -7780,7 +7780,7 @@
"_groupIndex": 0,
"groupIndex": 0,
"showInEditor": false,
"_id": "f8VlFO3wVKf5Vouaph1/Np"
"_id": "6cKal3Qb5NnbnqeW/Jimdq"
},
{
"__type__": "cc.Label",
......@@ -7813,7 +7813,7 @@
"_N$fontFamily": "Arial",
"_N$overflow": 0,
"_N$cacheMode": 0,
"_id": "84lI8+K89OU7Im8ko1Kij/"
"_id": "b5YdnuRshBwKcK8JJ+BS1r"
},
{
"__type__": "cc.RichText",
......@@ -9238,7 +9238,7 @@
"_groupIndex": 0,
"groupIndex": 0,
"showInEditor": false,
"_id": "ddlQ9QbJNHMJkiv/09IEcE"
"_id": "8ch6+TGlBPHZdOrp44Lj/Z"
},
{
"__type__": "cc.Label",
......@@ -9271,7 +9271,7 @@
"_N$fontFamily": "Arial",
"_N$overflow": 0,
"_N$cacheMode": 0,
"_id": "9aB4uoL+tB7rwePLiRgXjP"
"_id": "41nEB0Kn1GOIVnhPl4ky/R"
},
{
"__type__": "cc.PrivateNode",
......@@ -9334,7 +9334,7 @@
"_groupIndex": 0,
"groupIndex": 0,
"showInEditor": false,
"_id": "ebWjJdDzlFvJXz75wKE93S"
"_id": "b9qjSP5IRKRJK7J+ni7+S0"
},
{
"__type__": "cc.Label",
......@@ -9367,7 +9367,7 @@
"_N$fontFamily": "Arial",
"_N$overflow": 0,
"_N$cacheMode": 0,
"_id": "e4k7pKO7pHOp60I60+JzBA"
"_id": "92bGFzvdVIXY6EF2jUPzuw"
},
{
"__type__": "cc.PrivateNode",
......@@ -9430,7 +9430,7 @@
"_groupIndex": 0,
"groupIndex": 0,
"showInEditor": false,
"_id": "f3YE7kPgRMhrbgrr2s9/oa"
"_id": "2fxzOadHpOOI3eKy9u816f"
},
{
"__type__": "cc.Label",
......@@ -9463,7 +9463,7 @@
"_N$fontFamily": "Arial",
"_N$overflow": 0,
"_N$cacheMode": 0,
"_id": "19qoNFqWRPEZCM8nypCd3i"
"_id": "7cPiNfH/JL45Jri6ajJmpQ"
},
{
"__type__": "cc.PrivateNode",
......@@ -9526,7 +9526,7 @@
"_groupIndex": 0,
"groupIndex": 0,
"showInEditor": false,
"_id": "d8XBizOrxG3p3snxy1aCJL"
"_id": "afpfJep0JAeK+/33Pz5LaA"
},
{
"__type__": "cc.Label",
......@@ -9559,7 +9559,7 @@
"_N$fontFamily": "Arial",
"_N$overflow": 0,
"_N$cacheMode": 0,
"_id": "33QD4CfPdNo67pRsV+iToV"
"_id": "c4qznHZ3FJu4bCqcE82qKw"
},
{
"__type__": "cc.PrivateNode",
......@@ -9622,7 +9622,7 @@
"_groupIndex": 0,
"groupIndex": 0,
"showInEditor": false,
"_id": "26uRJyfZNFM5KC/j05t0RL"
"_id": "47GbJ0mhpGd6GjsvynU0YF"
},
{
"__type__": "cc.Label",
......@@ -9655,7 +9655,7 @@
"_N$fontFamily": "Arial",
"_N$overflow": 0,
"_N$cacheMode": 0,
"_id": "1az2+wYdlD1bol4N6wbEI+"
"_id": "53iS59IPdOH4TqRqW5n++e"
},
{
"__type__": "cc.PrivateNode",
......@@ -9718,7 +9718,7 @@
"_groupIndex": 0,
"groupIndex": 0,
"showInEditor": false,
"_id": "ecs7vSV2VGH4YuChKbW/7e"
"_id": "f4rdmOK35MMZKeAUT+NzEq"
},
{
"__type__": "cc.Label",
......@@ -9751,7 +9751,7 @@
"_N$fontFamily": "Arial",
"_N$overflow": 0,
"_N$cacheMode": 0,
"_id": "02qP8pC/1DfKG3ZQonAN9N"
"_id": "40pJu/JwdPgqzSLYBUe1Mh"
},
{
"__type__": "cc.PrivateNode",
......@@ -9814,7 +9814,7 @@
"_groupIndex": 0,
"groupIndex": 0,
"showInEditor": false,
"_id": "b54nH0Lb5PH7vBOTCzLGbY"
"_id": "08XvKhwapJ2JBJkFfNyvNE"
},
{
"__type__": "cc.Label",
......@@ -9847,7 +9847,7 @@
"_N$fontFamily": "Arial",
"_N$overflow": 0,
"_N$cacheMode": 0,
"_id": "162+fAVL1A2ZLmqjzKvfsW"
"_id": "06WXfxG4pAKKq36iznt6Ci"
},
{
"__type__": "cc.RichText",
......@@ -12593,7 +12593,7 @@
"_groupIndex": 0,
"groupIndex": 0,
"showInEditor": false,
"_id": "a4wkT+wmFJ37btOLEF4Un+"
"_id": "79QsOXOJtJoLTGG/TjfcUZ"
},
{
"__type__": "cc.Label",
......@@ -12626,7 +12626,7 @@
"_N$fontFamily": "Arial",
"_N$overflow": 0,
"_N$cacheMode": 0,
"_id": "853D7yWH9PfJpwEaEbtkwr"
"_id": "2cAesnAfVFg6mhD5HGRs8k"
},
{
"__type__": "cc.PrivateNode",
......@@ -12689,7 +12689,7 @@
"_groupIndex": 0,
"groupIndex": 0,
"showInEditor": false,
"_id": "087Ep7psVOhaXB9Ur/fuNp"
"_id": "cel2pl6ERKVZvX4MH3r16q"
},
{
"__type__": "cc.Label",
......@@ -12722,7 +12722,7 @@
"_N$fontFamily": "Arial",
"_N$overflow": 0,
"_N$cacheMode": 0,
"_id": "d0PFSCLD9CmYzbVznTUbH4"
"_id": "0dV9Na1N9LQ7esYnNSDQnQ"
},
{
"__type__": "cc.PrivateNode",
......@@ -12785,7 +12785,7 @@
"_groupIndex": 0,
"groupIndex": 0,
"showInEditor": false,
"_id": "47AsIMGqVEConcmror7x1m"
"_id": "78WMP19AhGZaYR8veYrdEs"
},
{
"__type__": "cc.Label",
......@@ -12818,7 +12818,7 @@
"_N$fontFamily": "Arial",
"_N$overflow": 0,
"_N$cacheMode": 0,
"_id": "487VVHfURE97nAsNqPJ58q"
"_id": "a9vbOkgGJDfpcxrJFKHJjM"
},
{
"__type__": "cc.RichText",
......@@ -30049,7 +30049,7 @@
},
{
"__type__": "cc.Node",
"_name": "split_line",
"_name": "letter_split_line",
"_objFlags": 0,
"_parent": {
"__id__": 629
......@@ -30663,7 +30663,7 @@
},
{
"__type__": "cc.Node",
"_name": "split_line",
"_name": "word_split_line",
"_objFlags": 0,
"_parent": {
"__id__": 629
......@@ -31178,7 +31178,7 @@
},
{
"__type__": "cc.Node",
"_name": "split_line",
"_name": "sentence_split_line",
"_objFlags": 0,
"_parent": {
"__id__": 629
......@@ -32391,7 +32391,7 @@
},
{
"__type__": "cc.Node",
"_name": "split_line",
"_name": "speak_split_line",
"_objFlags": 0,
"_parent": {
"__id__": 629
......@@ -32485,7 +32485,7 @@
},
{
"__type__": "cc.Node",
"_name": "speak_tittle",
"_name": "pyx_tittle",
"_objFlags": 0,
"_parent": {
"__id__": 629
......
......@@ -254,7 +254,7 @@ export default class NewClass extends cc.Component {
if (kn_letters) {
cc.find("letter_title", resultNode).active = true;
cc.find("letter_row", resultNode).active = true;
cc.find("split_line", resultNode).active = true;
cc.find("letter_split_line", resultNode).active = true;
const letterRow = cc.find("letter_row", resultNode);
const letterNode = cc.find("item", letterRow);
......@@ -272,13 +272,13 @@ export default class NewClass extends cc.Component {
} else {
cc.find("letter_title", resultNode).active = false;
cc.find("letter_row", resultNode).active = false;
cc.find("split_line", resultNode).active = false;
cc.find("letter_split_line", resultNode).active = false;
}
if (kn_words) {
cc.find("word_title", resultNode).active = true;
cc.find("word_row", resultNode).active = true;
cc.find("split_line", resultNode).active = true;
cc.find("word_split_line", resultNode).active = true;
const wordRow = cc.find("word_row", resultNode);
const wordNode = cc.find("item", wordRow);
......@@ -303,13 +303,13 @@ export default class NewClass extends cc.Component {
} else {
cc.find("word_title", resultNode).active = false;
cc.find("word_row", resultNode).active = false;
cc.find("split_line", resultNode).active = false;
cc.find("word_split_line", resultNode).active = false;
}
if (kn_sentences) {
cc.find("sentence_title", resultNode).active = true;
cc.find("sentence_row", resultNode).active = true;
cc.find("split_line", resultNode).active = true;
cc.find("sentence_split_line", resultNode).active = true;
const sentenceRow = cc.find("sentence_row", resultNode);
const sentenceNode = cc.find("item", sentenceRow);
......@@ -325,12 +325,15 @@ export default class NewClass extends cc.Component {
} else {
cc.find("sentence_title", resultNode).active = false;
cc.find("sentence_row", resultNode).active = false;
cc.find("split_line", resultNode).active = false;
cc.find("sentence_split_line", resultNode).active = false;
}
if (OP05) {
const rowData = JSON.parse(OP05).result;
cc.find("speak_tittle", resultNode).active = true;
cc.find("tips_bg", resultNode).active = true;
cc.find("speak_split_line", resultNode).active = true;
const rowData = JSON.parse(OP05).result;
const tips = cc.find("tips_bg", resultNode);
const row = cc.find("row", tips);
......@@ -346,6 +349,9 @@ export default class NewClass extends cc.Component {
}
} else {
cc.find(`Canvas/reportdetail/view/content/userdetail_scollpage/learnresult/itembg/tips_bg/row`).active = false;
cc.find("speak_tittle", resultNode).active = false;
cc.find("tips_bg", resultNode).active = false;
cc.find("speak_split_line", resultNode).active = false;
}
const qpyNode = cc.find(`Canvas/reportdetail/view/content/userdetail_scollpage/learnresult/itembg/pyx`);
......
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