Commit 615756ce authored by liujiangnan's avatar liujiangnan

debug

parent 3f829fa3
......@@ -2771,7 +2771,7 @@
"_groupIndex": 0,
"groupIndex": 0,
"showInEditor": false,
"_id": "3atO3lhs5AiI2YLXtioEAc"
"_id": "60mfIyaXlGyKPUMqOFC47c"
},
{
"__type__": "cc.Label",
......@@ -2804,7 +2804,7 @@
"_N$fontFamily": "Arial",
"_N$overflow": 0,
"_N$cacheMode": 0,
"_id": "247OWnI3NPhINYq6MxrzYp"
"_id": "26gXMo0UZNDaPeEQu/Rm7D"
},
{
"__type__": "cc.PrivateNode",
......@@ -2867,7 +2867,7 @@
"_groupIndex": 0,
"groupIndex": 0,
"showInEditor": false,
"_id": "195KSgX75MKZIXyAjP/uce"
"_id": "ebiDiZfC9ASqWX+0Pr9d/e"
},
{
"__type__": "cc.Label",
......@@ -2900,7 +2900,7 @@
"_N$fontFamily": "Arial",
"_N$overflow": 0,
"_N$cacheMode": 0,
"_id": "b7Kim0dbFPEbb04sJ4r/X4"
"_id": "5dkzARkxhEy5aEoxO2p0UC"
},
{
"__type__": "cc.PrivateNode",
......@@ -2963,7 +2963,7 @@
"_groupIndex": 0,
"groupIndex": 0,
"showInEditor": false,
"_id": "d2jFqm3rBCiLt8sH/Yl5M3"
"_id": "94jIz1O3dKmKbz9TS7t53c"
},
{
"__type__": "cc.Label",
......@@ -2996,7 +2996,7 @@
"_N$fontFamily": "Arial",
"_N$overflow": 0,
"_N$cacheMode": 0,
"_id": "2bZ4za7BlCG4NTw1LfxuRV"
"_id": "b4s5uFpX9K+pHw26pMKRxI"
},
{
"__type__": "cc.PrivateNode",
......@@ -3059,7 +3059,7 @@
"_groupIndex": 0,
"groupIndex": 0,
"showInEditor": false,
"_id": "dabSyyXmlHhLX/X1z8j0Rg"
"_id": "a8Ds8EVdBPAIu3ePZBbMWg"
},
{
"__type__": "cc.Label",
......@@ -3092,7 +3092,7 @@
"_N$fontFamily": "Arial",
"_N$overflow": 0,
"_N$cacheMode": 0,
"_id": "b5TekGBiRCrZIh84GaZmwM"
"_id": "4dckCvcShKNL4FVgTLj5Rk"
},
{
"__type__": "cc.PrivateNode",
......@@ -3155,7 +3155,7 @@
"_groupIndex": 0,
"groupIndex": 0,
"showInEditor": false,
"_id": "edY8tVrNVNzIawrUHX/X/u"
"_id": "32X7Zl0qlEsJaZZC5w4we5"
},
{
"__type__": "cc.Label",
......@@ -3188,7 +3188,7 @@
"_N$fontFamily": "Arial",
"_N$overflow": 0,
"_N$cacheMode": 0,
"_id": "3bAqCejbBAuKiaDKVCXVJK"
"_id": "83LQK/IvNFuIdshzKobvuC"
},
{
"__type__": "cc.RichText",
......@@ -6369,7 +6369,7 @@
"_groupIndex": 0,
"groupIndex": 0,
"showInEditor": false,
"_id": "85cL6PmJNE9bokreox9ZT5"
"_id": "09dTGNIGJMKbl6V6053yw5"
},
{
"__type__": "cc.Label",
......@@ -6402,7 +6402,7 @@
"_N$fontFamily": "Arial",
"_N$overflow": 0,
"_N$cacheMode": 0,
"_id": "a5PKgxf+ZKi5f98rmpAOa/"
"_id": "45HwKkvMhHz5Llz8IU97Kp"
},
{
"__type__": "cc.PrivateNode",
......@@ -6465,7 +6465,7 @@
"_groupIndex": 0,
"groupIndex": 0,
"showInEditor": false,
"_id": "3agAoUL0hGkIqOqugMI54L"
"_id": "9dUo06txBI+KLQ/H71wSGE"
},
{
"__type__": "cc.Label",
......@@ -6498,7 +6498,7 @@
"_N$fontFamily": "Arial",
"_N$overflow": 0,
"_N$cacheMode": 0,
"_id": "98nws3V3xNW5SngPb7nBXg"
"_id": "18IACWIMJBnKrgWzWVRykr"
},
{
"__type__": "cc.PrivateNode",
......@@ -6561,7 +6561,7 @@
"_groupIndex": 0,
"groupIndex": 0,
"showInEditor": false,
"_id": "1cytjrDl5DHbQCtf4eBHx6"
"_id": "230gv+EYtLbZfH9RaKf4Lg"
},
{
"__type__": "cc.Label",
......@@ -6594,7 +6594,7 @@
"_N$fontFamily": "Arial",
"_N$overflow": 0,
"_N$cacheMode": 0,
"_id": "b6UpmLVkNId6TYE0sPagXt"
"_id": "d1s8AZgExOI6aO+3PiwHMt"
},
{
"__type__": "cc.RichText",
......@@ -7073,7 +7073,7 @@
"_groupIndex": 0,
"groupIndex": 0,
"showInEditor": false,
"_id": "d2olxQ7AFJ3ZEdW/D720V4"
"_id": "78IJXiUABIHYcHEYbnqmMp"
},
{
"__type__": "cc.Label",
......@@ -7106,7 +7106,7 @@
"_N$fontFamily": "Arial",
"_N$overflow": 0,
"_N$cacheMode": 0,
"_id": "6871HD8KFKu4JKtkx0fkTU"
"_id": "30BDjAJ75JhZax0ZI07XwB"
},
{
"__type__": "cc.PrivateNode",
......@@ -7169,7 +7169,7 @@
"_groupIndex": 0,
"groupIndex": 0,
"showInEditor": false,
"_id": "d7mFGNCeJMf7W//Vy3HR/w"
"_id": "0eUEhxUJBPZZsVPE1QvHqI"
},
{
"__type__": "cc.Label",
......@@ -7202,7 +7202,7 @@
"_N$fontFamily": "Arial",
"_N$overflow": 0,
"_N$cacheMode": 0,
"_id": "f9Bu3qe7FNfq0gfFe1ccCD"
"_id": "551r5q8gBB37aJrgpTi7J1"
},
{
"__type__": "cc.PrivateNode",
......@@ -7265,7 +7265,7 @@
"_groupIndex": 0,
"groupIndex": 0,
"showInEditor": false,
"_id": "41RfZANRdJ3L4S8plZ2jVD"
"_id": "c2RzBIHb5BL5YnpIccuFJl"
},
{
"__type__": "cc.Label",
......@@ -7298,7 +7298,7 @@
"_N$fontFamily": "Arial",
"_N$overflow": 0,
"_N$cacheMode": 0,
"_id": "12tgeRm/5Opr1V4gyhFBHc"
"_id": "f9RmkOwsBIAZ1F8wtKc/1x"
},
{
"__type__": "cc.RichText",
......@@ -7588,7 +7588,7 @@
"_groupIndex": 0,
"groupIndex": 0,
"showInEditor": false,
"_id": "5cJc8HYMJOd4dRwCjh49ZU"
"_id": "b52CvVbgVH9Lp9oDb1xePV"
},
{
"__type__": "cc.Label",
......@@ -7621,7 +7621,7 @@
"_N$fontFamily": "Arial",
"_N$overflow": 0,
"_N$cacheMode": 0,
"_id": "9bJnekBM5FuKg1qdDbwSah"
"_id": "38wQjMB7ZDVLJDn/u6xnLN"
},
{
"__type__": "cc.PrivateNode",
......@@ -7684,7 +7684,7 @@
"_groupIndex": 0,
"groupIndex": 0,
"showInEditor": false,
"_id": "94gke5d/1Hwa9s+ZVpQfef"
"_id": "06NWEgWq5NGqrNFK7zkRc2"
},
{
"__type__": "cc.Label",
......@@ -7717,7 +7717,7 @@
"_N$fontFamily": "Arial",
"_N$overflow": 0,
"_N$cacheMode": 0,
"_id": "1dVLPSO61HfZti3QQuvrll"
"_id": "9dKMACnqlGubU9f5rI6pSj"
},
{
"__type__": "cc.PrivateNode",
......@@ -7780,7 +7780,7 @@
"_groupIndex": 0,
"groupIndex": 0,
"showInEditor": false,
"_id": "4crLbUGo9CmJJmcPTRpQ9Z"
"_id": "bb0aucjmNEXZJqkOjurbx6"
},
{
"__type__": "cc.Label",
......@@ -7813,7 +7813,7 @@
"_N$fontFamily": "Arial",
"_N$overflow": 0,
"_N$cacheMode": 0,
"_id": "efUODA3pVOxLP9RjoPnep6"
"_id": "50kimQ0EpHwJhKlkxUMQa4"
},
{
"__type__": "cc.RichText",
......@@ -9238,7 +9238,7 @@
"_groupIndex": 0,
"groupIndex": 0,
"showInEditor": false,
"_id": "c6M9iwxjhFZ6IhxcNQlcct"
"_id": "9cigft6xFG7oF39cBSzsSU"
},
{
"__type__": "cc.Label",
......@@ -9271,7 +9271,7 @@
"_N$fontFamily": "Arial",
"_N$overflow": 0,
"_N$cacheMode": 0,
"_id": "4bvYfushBF2KVukuZzWEOs"
"_id": "8fWQXP6m1GubGKRBG9Amet"
},
{
"__type__": "cc.PrivateNode",
......@@ -9334,7 +9334,7 @@
"_groupIndex": 0,
"groupIndex": 0,
"showInEditor": false,
"_id": "07xR6ZoZdB27NKAIqPKK/l"
"_id": "90wMfpPydCV5fOv3gieila"
},
{
"__type__": "cc.Label",
......@@ -9367,7 +9367,7 @@
"_N$fontFamily": "Arial",
"_N$overflow": 0,
"_N$cacheMode": 0,
"_id": "a5N6crcltHx6lGuUFQHwEs"
"_id": "daVwWtGylKE6SGT1C1qha2"
},
{
"__type__": "cc.PrivateNode",
......@@ -9430,7 +9430,7 @@
"_groupIndex": 0,
"groupIndex": 0,
"showInEditor": false,
"_id": "6aD3dXbc1B/YhU4pLWOJvV"
"_id": "59RVuzb1lD+LNeNVW8oatq"
},
{
"__type__": "cc.Label",
......@@ -9463,7 +9463,7 @@
"_N$fontFamily": "Arial",
"_N$overflow": 0,
"_N$cacheMode": 0,
"_id": "11XFjkQmFOKYLHUQAFKTiv"
"_id": "9fvyD62IZBxpk1A09rA80r"
},
{
"__type__": "cc.PrivateNode",
......@@ -9526,7 +9526,7 @@
"_groupIndex": 0,
"groupIndex": 0,
"showInEditor": false,
"_id": "d2H4jpTDpMtb76ZigDHX27"
"_id": "cde7Ci3axHmp0xcaC6It8J"
},
{
"__type__": "cc.Label",
......@@ -9559,7 +9559,7 @@
"_N$fontFamily": "Arial",
"_N$overflow": 0,
"_N$cacheMode": 0,
"_id": "850S6x/EBKy7phJynfqW4y"
"_id": "a0u60CDoZIkpCGoKvj83xS"
},
{
"__type__": "cc.PrivateNode",
......@@ -9622,7 +9622,7 @@
"_groupIndex": 0,
"groupIndex": 0,
"showInEditor": false,
"_id": "58mKUZiBFCoZmVbwABdm0V"
"_id": "feikPsSvlKKrmilDWOQoeO"
},
{
"__type__": "cc.Label",
......@@ -9655,7 +9655,7 @@
"_N$fontFamily": "Arial",
"_N$overflow": 0,
"_N$cacheMode": 0,
"_id": "c7jm8HFctIy5C3XKV1ZvOs"
"_id": "4bGZuvdLdDQZIF3gSowIHS"
},
{
"__type__": "cc.PrivateNode",
......@@ -9718,7 +9718,7 @@
"_groupIndex": 0,
"groupIndex": 0,
"showInEditor": false,
"_id": "3ePWDg3RBFKqyd7ul5KUej"
"_id": "3d+DIvXDdMJJrXTubb9bdN"
},
{
"__type__": "cc.Label",
......@@ -9751,7 +9751,7 @@
"_N$fontFamily": "Arial",
"_N$overflow": 0,
"_N$cacheMode": 0,
"_id": "7d+wF51gFObb/UjgacjEG1"
"_id": "ef9AiRUTBIKKBaAMWr3MiO"
},
{
"__type__": "cc.PrivateNode",
......@@ -9814,7 +9814,7 @@
"_groupIndex": 0,
"groupIndex": 0,
"showInEditor": false,
"_id": "02qb/B07VKUISERLm45aqz"
"_id": "eeRpro0GpNgrA+d0PBHcbF"
},
{
"__type__": "cc.Label",
......@@ -9847,7 +9847,7 @@
"_N$fontFamily": "Arial",
"_N$overflow": 0,
"_N$cacheMode": 0,
"_id": "f3NCNNSsJEDaQd1xnGzx70"
"_id": "e13bQhuf5FULvceRdH5NaA"
},
{
"__type__": "cc.RichText",
......@@ -12593,7 +12593,7 @@
"_groupIndex": 0,
"groupIndex": 0,
"showInEditor": false,
"_id": "a4zC+VqUhNJqLVT4HjiBjO"
"_id": "a1asANgk1NeLKnbCV2SY5X"
},
{
"__type__": "cc.Label",
......@@ -12626,7 +12626,7 @@
"_N$fontFamily": "Arial",
"_N$overflow": 0,
"_N$cacheMode": 0,
"_id": "7cvYS2Z15MCrmhbPcT8F2F"
"_id": "b0lNuaydlOCpHbCD0xLDGy"
},
{
"__type__": "cc.PrivateNode",
......@@ -12689,7 +12689,7 @@
"_groupIndex": 0,
"groupIndex": 0,
"showInEditor": false,
"_id": "c00CF+cmtChYa6vBfe1Ui2"
"_id": "49P74tu89C3o6LFD2pHzkr"
},
{
"__type__": "cc.Label",
......@@ -12722,7 +12722,7 @@
"_N$fontFamily": "Arial",
"_N$overflow": 0,
"_N$cacheMode": 0,
"_id": "f7LjVlgORA5rtgUYpjR/8W"
"_id": "26Q5pCx2NI1oepiTm6nOwe"
},
{
"__type__": "cc.PrivateNode",
......@@ -12785,7 +12785,7 @@
"_groupIndex": 0,
"groupIndex": 0,
"showInEditor": false,
"_id": "b4imKOrR9KaJ+61KO/eRsf"
"_id": "bdkNKXPatFHIr5YunP3cFY"
},
{
"__type__": "cc.Label",
......@@ -12818,7 +12818,7 @@
"_N$fontFamily": "Arial",
"_N$overflow": 0,
"_N$cacheMode": 0,
"_id": "117VjdXIdK/KR/XYhcp2WO"
"_id": "9dRkEbeIZAbIqt1pQOHXC9"
},
{
"__type__": "cc.RichText",
......@@ -30750,8 +30750,8 @@
"_N$startAxis": 0,
"_N$paddingLeft": 0,
"_N$paddingRight": 0,
"_N$paddingTop": 0,
"_N$paddingBottom": 0,
"_N$paddingTop": 20,
"_N$paddingBottom": 20,
"_N$spacingX": 0,
"_N$spacingY": 0,
"_N$verticalDirection": 1,
......
......@@ -311,7 +311,6 @@ export default class NewClass extends cc.Component {
const itemClone = cc.instantiate(wordNode);
itemClone.parent = wordRow;
itemClone.active = true;
cc.find("word", itemClone).getComponent(cc.Label).string = word.text;
if (word.pic_url) {
itemClone.height = 220;
getSpriteFrimeByUrl(word.pic_url, (spriteFrame) => {
......@@ -322,8 +321,9 @@ export default class NewClass extends cc.Component {
picNode.scale = Math.min(sx, sy);
});
} else {
itemClone.height = 45;
cc.find("pic", itemClone).active = false;
itemClone.height = 40;
cc.find("word", itemClone).getComponent(cc.Label).string = word.text;
}
}
} else {
......
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