Commit 92f21ee1 authored by liujiangnan's avatar liujiangnan

feat

parent adf133f2
...@@ -87,19 +87,19 @@ ...@@ -87,19 +87,19 @@
"__id__": 576 "__id__": 576
}, },
{ {
"__id__": 744 "__id__": 746
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 772 "__id__": 774
}, },
{ {
"__id__": 773 "__id__": 775
}, },
{ {
"__id__": 774 "__id__": 776
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2771,7 +2771,7 @@ ...@@ -2771,7 +2771,7 @@
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"showInEditor": false, "showInEditor": false,
"_id": "6bUHRvd7VHkacpbBTHXG2c" "_id": "fc2QQMXc9Nuaw/yAHpGwTp"
}, },
{ {
"__type__": "cc.Label", "__type__": "cc.Label",
...@@ -2804,7 +2804,7 @@ ...@@ -2804,7 +2804,7 @@
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 0, "_N$overflow": 0,
"_N$cacheMode": 0, "_N$cacheMode": 0,
"_id": "66YVz4NBZHJY/9RqpxWs7I" "_id": "93rC0gNMpIM7qHM2pmH2+1"
}, },
{ {
"__type__": "cc.PrivateNode", "__type__": "cc.PrivateNode",
...@@ -2867,7 +2867,7 @@ ...@@ -2867,7 +2867,7 @@
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"showInEditor": false, "showInEditor": false,
"_id": "51Msqc9k5FKp1TeL2bdfgW" "_id": "bcFh4CC5VHq5ABdYyl4cig"
}, },
{ {
"__type__": "cc.Label", "__type__": "cc.Label",
...@@ -2900,7 +2900,7 @@ ...@@ -2900,7 +2900,7 @@
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 0, "_N$overflow": 0,
"_N$cacheMode": 0, "_N$cacheMode": 0,
"_id": "02TL7YbyNORKSeDpcXd2o1" "_id": "c60bjVVjRDPIffUFpTniBc"
}, },
{ {
"__type__": "cc.PrivateNode", "__type__": "cc.PrivateNode",
...@@ -2963,7 +2963,7 @@ ...@@ -2963,7 +2963,7 @@
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"showInEditor": false, "showInEditor": false,
"_id": "31DeD57phI24kMkklsa3SA" "_id": "7bVYYATtBK840ZIEj6sILI"
}, },
{ {
"__type__": "cc.Label", "__type__": "cc.Label",
...@@ -2996,7 +2996,7 @@ ...@@ -2996,7 +2996,7 @@
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 0, "_N$overflow": 0,
"_N$cacheMode": 0, "_N$cacheMode": 0,
"_id": "2epBPErjNIuL5Cps1NLVbr" "_id": "b9g96/2XBKZYU95XzF+afS"
}, },
{ {
"__type__": "cc.PrivateNode", "__type__": "cc.PrivateNode",
...@@ -3059,7 +3059,7 @@ ...@@ -3059,7 +3059,7 @@
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"showInEditor": false, "showInEditor": false,
"_id": "4anqSxL9ZLoo9c99IXb8xW" "_id": "d7HBpe3pBOk5yKL3alvkb1"
}, },
{ {
"__type__": "cc.Label", "__type__": "cc.Label",
...@@ -3092,7 +3092,7 @@ ...@@ -3092,7 +3092,7 @@
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 0, "_N$overflow": 0,
"_N$cacheMode": 0, "_N$cacheMode": 0,
"_id": "35KFPNJHBFH7RSx90fwBwc" "_id": "875DA3sMlJjorSgLdR2ReG"
}, },
{ {
"__type__": "cc.PrivateNode", "__type__": "cc.PrivateNode",
...@@ -3155,7 +3155,7 @@ ...@@ -3155,7 +3155,7 @@
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"showInEditor": false, "showInEditor": false,
"_id": "76ugVXy0RC55jRzwK7Qmuw" "_id": "84c+2+LdpEnpliN+Bhklsr"
}, },
{ {
"__type__": "cc.Label", "__type__": "cc.Label",
...@@ -3188,7 +3188,7 @@ ...@@ -3188,7 +3188,7 @@
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 0, "_N$overflow": 0,
"_N$cacheMode": 0, "_N$cacheMode": 0,
"_id": "f80kSAo0xPo59WsyL4L161" "_id": "eayqRaaKhL6bTIf/9Wmysg"
}, },
{ {
"__type__": "cc.RichText", "__type__": "cc.RichText",
...@@ -6369,7 +6369,7 @@ ...@@ -6369,7 +6369,7 @@
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"showInEditor": false, "showInEditor": false,
"_id": "5cCpKpICxAS7hpgbQy/m+r" "_id": "8f+bq04/RLPZUh+s9MUXik"
}, },
{ {
"__type__": "cc.Label", "__type__": "cc.Label",
...@@ -6402,7 +6402,7 @@ ...@@ -6402,7 +6402,7 @@
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 0, "_N$overflow": 0,
"_N$cacheMode": 0, "_N$cacheMode": 0,
"_id": "169yyGPMhIGrvUqppmpU06" "_id": "7eLCqExjxE2Yd3F3/e/jOa"
}, },
{ {
"__type__": "cc.PrivateNode", "__type__": "cc.PrivateNode",
...@@ -6465,7 +6465,7 @@ ...@@ -6465,7 +6465,7 @@
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"showInEditor": false, "showInEditor": false,
"_id": "7b7ZNu++ROw6q7sCc08R6S" "_id": "347UFHM3xHmYzSa/I/cTZi"
}, },
{ {
"__type__": "cc.Label", "__type__": "cc.Label",
...@@ -6498,7 +6498,7 @@ ...@@ -6498,7 +6498,7 @@
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 0, "_N$overflow": 0,
"_N$cacheMode": 0, "_N$cacheMode": 0,
"_id": "fb7+deu3dHHJObONS282X0" "_id": "5e0uyFrehKKoz7rmiefRgc"
}, },
{ {
"__type__": "cc.PrivateNode", "__type__": "cc.PrivateNode",
...@@ -6561,7 +6561,7 @@ ...@@ -6561,7 +6561,7 @@
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"showInEditor": false, "showInEditor": false,
"_id": "5ahCDvgsROaJab8cmnGc1l" "_id": "1fGqSJi8tI4oaqjWMclv6E"
}, },
{ {
"__type__": "cc.Label", "__type__": "cc.Label",
...@@ -6594,7 +6594,7 @@ ...@@ -6594,7 +6594,7 @@
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 0, "_N$overflow": 0,
"_N$cacheMode": 0, "_N$cacheMode": 0,
"_id": "a5eIqsBFFOcp0PyffSdZTP" "_id": "3bKQtRu2hL5aDHB7Wq26PQ"
}, },
{ {
"__type__": "cc.RichText", "__type__": "cc.RichText",
...@@ -7073,7 +7073,7 @@ ...@@ -7073,7 +7073,7 @@
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"showInEditor": false, "showInEditor": false,
"_id": "29pjKhAYNJMbKhRM3Oh8ub" "_id": "ebLTeEdMBDiIvl3Ah/gjp4"
}, },
{ {
"__type__": "cc.Label", "__type__": "cc.Label",
...@@ -7106,7 +7106,7 @@ ...@@ -7106,7 +7106,7 @@
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 0, "_N$overflow": 0,
"_N$cacheMode": 0, "_N$cacheMode": 0,
"_id": "78m8W/HaxJ0IbzfxoXBn71" "_id": "57QTtJZmpPkJHGmZTRUo2f"
}, },
{ {
"__type__": "cc.PrivateNode", "__type__": "cc.PrivateNode",
...@@ -7169,7 +7169,7 @@ ...@@ -7169,7 +7169,7 @@
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"showInEditor": false, "showInEditor": false,
"_id": "701z2EHUBOW5X3hhuUb14b" "_id": "6eZl09o4JLWprlKaXT5QWz"
}, },
{ {
"__type__": "cc.Label", "__type__": "cc.Label",
...@@ -7202,7 +7202,7 @@ ...@@ -7202,7 +7202,7 @@
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 0, "_N$overflow": 0,
"_N$cacheMode": 0, "_N$cacheMode": 0,
"_id": "35dBGlY15HNrbx3vLVe0vG" "_id": "bd4JGDjyRLDoZRGCTJRdBs"
}, },
{ {
"__type__": "cc.PrivateNode", "__type__": "cc.PrivateNode",
...@@ -7265,7 +7265,7 @@ ...@@ -7265,7 +7265,7 @@
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"showInEditor": false, "showInEditor": false,
"_id": "67boDkjhtDsaNCGmph+nLw" "_id": "d8IDnRSlNL/qthydULumi2"
}, },
{ {
"__type__": "cc.Label", "__type__": "cc.Label",
...@@ -7298,7 +7298,7 @@ ...@@ -7298,7 +7298,7 @@
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 0, "_N$overflow": 0,
"_N$cacheMode": 0, "_N$cacheMode": 0,
"_id": "5d1rvuWb9CUL5uCfkMgXjk" "_id": "035zYafPFLz6SvxR5N6/sE"
}, },
{ {
"__type__": "cc.RichText", "__type__": "cc.RichText",
...@@ -7588,7 +7588,7 @@ ...@@ -7588,7 +7588,7 @@
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"showInEditor": false, "showInEditor": false,
"_id": "0eDpXfV+ZLh5j1YbxFUy8s" "_id": "b2MBgW4NJMpqZmFNrPVTCy"
}, },
{ {
"__type__": "cc.Label", "__type__": "cc.Label",
...@@ -7621,7 +7621,7 @@ ...@@ -7621,7 +7621,7 @@
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 0, "_N$overflow": 0,
"_N$cacheMode": 0, "_N$cacheMode": 0,
"_id": "49veS93mhIX79JuOyPc3qf" "_id": "20C0yhxStNW7ibdGZZbbf9"
}, },
{ {
"__type__": "cc.PrivateNode", "__type__": "cc.PrivateNode",
...@@ -7684,7 +7684,7 @@ ...@@ -7684,7 +7684,7 @@
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"showInEditor": false, "showInEditor": false,
"_id": "e0HPi33F1PRaFVtFduVCOE" "_id": "989uaSBXpOy5KN3GLwdiOt"
}, },
{ {
"__type__": "cc.Label", "__type__": "cc.Label",
...@@ -7717,7 +7717,7 @@ ...@@ -7717,7 +7717,7 @@
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 0, "_N$overflow": 0,
"_N$cacheMode": 0, "_N$cacheMode": 0,
"_id": "3dEu5j9S9JYKqtb2yDV5Po" "_id": "978RmLNxhMJJVBqOaW83an"
}, },
{ {
"__type__": "cc.PrivateNode", "__type__": "cc.PrivateNode",
...@@ -7780,7 +7780,7 @@ ...@@ -7780,7 +7780,7 @@
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"showInEditor": false, "showInEditor": false,
"_id": "66jrklYyRKEaWVBDffO8He" "_id": "7cIVPVnJ5Np7J9E9q3Ex3F"
}, },
{ {
"__type__": "cc.Label", "__type__": "cc.Label",
...@@ -7813,7 +7813,7 @@ ...@@ -7813,7 +7813,7 @@
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 0, "_N$overflow": 0,
"_N$cacheMode": 0, "_N$cacheMode": 0,
"_id": "a34iU147JKPpw6fG58GgAb" "_id": "69CnEVnUxMjLwyi20XFXWj"
}, },
{ {
"__type__": "cc.RichText", "__type__": "cc.RichText",
...@@ -9238,7 +9238,7 @@ ...@@ -9238,7 +9238,7 @@
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"showInEditor": false, "showInEditor": false,
"_id": "6dJ/986a9CFqYyZz46kiuP" "_id": "5bYWML4ipAAYrFRFoHvWek"
}, },
{ {
"__type__": "cc.Label", "__type__": "cc.Label",
...@@ -9271,7 +9271,7 @@ ...@@ -9271,7 +9271,7 @@
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 0, "_N$overflow": 0,
"_N$cacheMode": 0, "_N$cacheMode": 0,
"_id": "86QoTcjGlFUr8ENVMozGSV" "_id": "d4O6grpoZNpYoQQpDAQgeK"
}, },
{ {
"__type__": "cc.PrivateNode", "__type__": "cc.PrivateNode",
...@@ -9334,7 +9334,7 @@ ...@@ -9334,7 +9334,7 @@
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"showInEditor": false, "showInEditor": false,
"_id": "24V9axSKNENIrDvm0VEize" "_id": "89sukUtylK5LFLhHk5H+WX"
}, },
{ {
"__type__": "cc.Label", "__type__": "cc.Label",
...@@ -9367,7 +9367,7 @@ ...@@ -9367,7 +9367,7 @@
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 0, "_N$overflow": 0,
"_N$cacheMode": 0, "_N$cacheMode": 0,
"_id": "eeQY6F+O1PY5tkuOr5JZRM" "_id": "f91DPHzM1EzpMbDRuevVsw"
}, },
{ {
"__type__": "cc.PrivateNode", "__type__": "cc.PrivateNode",
...@@ -9430,7 +9430,7 @@ ...@@ -9430,7 +9430,7 @@
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"showInEditor": false, "showInEditor": false,
"_id": "fb2gD0VS5Gk72bSxb4gIpt" "_id": "eerPmgBCdEtIWMW0AYoEtc"
}, },
{ {
"__type__": "cc.Label", "__type__": "cc.Label",
...@@ -9463,7 +9463,7 @@ ...@@ -9463,7 +9463,7 @@
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 0, "_N$overflow": 0,
"_N$cacheMode": 0, "_N$cacheMode": 0,
"_id": "cc94lHv1VJyqteD05ObvYF" "_id": "bbSdxsF85PsoMGrBPSD+eR"
}, },
{ {
"__type__": "cc.PrivateNode", "__type__": "cc.PrivateNode",
...@@ -9526,7 +9526,7 @@ ...@@ -9526,7 +9526,7 @@
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"showInEditor": false, "showInEditor": false,
"_id": "3aB9UBRfNIDbDfN0La5ty6" "_id": "1cR9epNuZCjLVfNMDgy6PM"
}, },
{ {
"__type__": "cc.Label", "__type__": "cc.Label",
...@@ -9559,7 +9559,7 @@ ...@@ -9559,7 +9559,7 @@
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 0, "_N$overflow": 0,
"_N$cacheMode": 0, "_N$cacheMode": 0,
"_id": "90tH0J6ypE9oMr7Rt9HjLF" "_id": "eaAvxnmchO7LscUMGETmqC"
}, },
{ {
"__type__": "cc.PrivateNode", "__type__": "cc.PrivateNode",
...@@ -9622,7 +9622,7 @@ ...@@ -9622,7 +9622,7 @@
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"showInEditor": false, "showInEditor": false,
"_id": "50K4QD4sNNH5VlLnxC5g2a" "_id": "aaK6neUs1BurzQCoKw7k7y"
}, },
{ {
"__type__": "cc.Label", "__type__": "cc.Label",
...@@ -9655,7 +9655,7 @@ ...@@ -9655,7 +9655,7 @@
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 0, "_N$overflow": 0,
"_N$cacheMode": 0, "_N$cacheMode": 0,
"_id": "ecucF1CyVEFZ0Pqkc0ERaJ" "_id": "184Ex9f11Au632BtvCX5yY"
}, },
{ {
"__type__": "cc.PrivateNode", "__type__": "cc.PrivateNode",
...@@ -9718,7 +9718,7 @@ ...@@ -9718,7 +9718,7 @@
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"showInEditor": false, "showInEditor": false,
"_id": "e7XQ7XjzhCUYh/n3lbVbTO" "_id": "f94iBsJ8FMk7ZSDmfzD5Vk"
}, },
{ {
"__type__": "cc.Label", "__type__": "cc.Label",
...@@ -9751,7 +9751,7 @@ ...@@ -9751,7 +9751,7 @@
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 0, "_N$overflow": 0,
"_N$cacheMode": 0, "_N$cacheMode": 0,
"_id": "6aOa3mkvBBj4BRCHCz6pj+" "_id": "3fAb8ZXLdG8bQKKNOGs0y7"
}, },
{ {
"__type__": "cc.PrivateNode", "__type__": "cc.PrivateNode",
...@@ -9814,7 +9814,7 @@ ...@@ -9814,7 +9814,7 @@
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"showInEditor": false, "showInEditor": false,
"_id": "d8Ep9sMmtAW4uyCZcFZ296" "_id": "99jooeXcJIx4eFdhkSuL+K"
}, },
{ {
"__type__": "cc.Label", "__type__": "cc.Label",
...@@ -9847,7 +9847,7 @@ ...@@ -9847,7 +9847,7 @@
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 0, "_N$overflow": 0,
"_N$cacheMode": 0, "_N$cacheMode": 0,
"_id": "c63D5YAR1IsLCaNVypbL/h" "_id": "2cQTk2+npNUJaL25VSqWcJ"
}, },
{ {
"__type__": "cc.RichText", "__type__": "cc.RichText",
...@@ -12593,7 +12593,7 @@ ...@@ -12593,7 +12593,7 @@
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"showInEditor": false, "showInEditor": false,
"_id": "aew501VpxDcKPzV83dt/9l" "_id": "6efVZ5sgVARa4stvKO32Bb"
}, },
{ {
"__type__": "cc.Label", "__type__": "cc.Label",
...@@ -12626,7 +12626,7 @@ ...@@ -12626,7 +12626,7 @@
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 0, "_N$overflow": 0,
"_N$cacheMode": 0, "_N$cacheMode": 0,
"_id": "aenh0oLQlCLLWqH7Py8mSN" "_id": "58BAMKUy9MzZ29+HyYVbMY"
}, },
{ {
"__type__": "cc.PrivateNode", "__type__": "cc.PrivateNode",
...@@ -12689,7 +12689,7 @@ ...@@ -12689,7 +12689,7 @@
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"showInEditor": false, "showInEditor": false,
"_id": "1bMiC4FM5EXKfrJBcKve09" "_id": "96WojfShlD0rWuwh9lXpid"
}, },
{ {
"__type__": "cc.Label", "__type__": "cc.Label",
...@@ -12722,7 +12722,7 @@ ...@@ -12722,7 +12722,7 @@
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 0, "_N$overflow": 0,
"_N$cacheMode": 0, "_N$cacheMode": 0,
"_id": "a8QWviC3JE/5r42dNW4j4a" "_id": "c9b34ngyZKRIirnMDxvpah"
}, },
{ {
"__type__": "cc.PrivateNode", "__type__": "cc.PrivateNode",
...@@ -12785,7 +12785,7 @@ ...@@ -12785,7 +12785,7 @@
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"showInEditor": false, "showInEditor": false,
"_id": "dfqbCEdjhPAZp7EfPCfHmc" "_id": "60dkHh6XlKdZmGaHInU+g/"
}, },
{ {
"__type__": "cc.Label", "__type__": "cc.Label",
...@@ -12818,7 +12818,7 @@ ...@@ -12818,7 +12818,7 @@
"_N$fontFamily": "Arial", "_N$fontFamily": "Arial",
"_N$overflow": 0, "_N$overflow": 0,
"_N$cacheMode": 0, "_N$cacheMode": 0,
"_id": "d2PvJ+87hKBYnHom8wNB6p" "_id": "bdA1Tgw9xE4LbYR0aMvOIY"
}, },
{ {
"__type__": "cc.RichText", "__type__": "cc.RichText",
...@@ -26878,19 +26878,19 @@ ...@@ -26878,19 +26878,19 @@
"__id__": 577 "__id__": 577
}, },
{ {
"__id__": 735 "__id__": 737
} }
], ],
"_active": false, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 741 "__id__": 743
}, },
{ {
"__id__": 742 "__id__": 744
}, },
{ {
"__id__": 743 "__id__": 745
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -26956,10 +26956,10 @@ ...@@ -26956,10 +26956,10 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 733 "__id__": 735
}, },
{ {
"__id__": 734 "__id__": 736
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -27025,7 +27025,7 @@ ...@@ -27025,7 +27025,7 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 732 "__id__": 734
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -27100,10 +27100,10 @@ ...@@ -27100,10 +27100,10 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 730 "__id__": 732
}, },
{ {
"__id__": 731 "__id__": 733
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -27130,7 +27130,7 @@ ...@@ -27130,7 +27130,7 @@
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
0, 0,
0, 283.639,
0, 0,
0, 0,
0, 0,
...@@ -29270,7 +29270,7 @@ ...@@ -29270,7 +29270,7 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 729 "__id__": 731
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -29528,9 +29528,6 @@ ...@@ -29528,9 +29528,6 @@
{ {
"__id__": 632 "__id__": 632
}, },
{
"__id__": 639
},
{ {
"__id__": 641 "__id__": 641
}, },
...@@ -29538,7 +29535,7 @@ ...@@ -29538,7 +29535,7 @@
"__id__": 643 "__id__": 643
}, },
{ {
"__id__": 652 "__id__": 645
}, },
{ {
"__id__": 654 "__id__": 654
...@@ -29547,7 +29544,7 @@ ...@@ -29547,7 +29544,7 @@
"__id__": 656 "__id__": 656
}, },
{ {
"__id__": 663 "__id__": 658
}, },
{ {
"__id__": 665 "__id__": 665
...@@ -29556,25 +29553,28 @@ ...@@ -29556,25 +29553,28 @@
"__id__": 667 "__id__": 667
}, },
{ {
"__id__": 689 "__id__": 669
}, },
{ {
"__id__": 691 "__id__": 691
}, },
{ {
"__id__": 693 "__id__": 693
},
{
"__id__": 695
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 726 "__id__": 728
}, },
{ {
"__id__": 727 "__id__": 729
}, },
{ {
"__id__": 728 "__id__": 730
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -29735,10 +29735,10 @@ ...@@ -29735,10 +29735,10 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 637 "__id__": 639
}, },
{ {
"__id__": 638 "__id__": 640
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -29799,12 +29799,15 @@ ...@@ -29799,12 +29799,15 @@
"_children": [ "_children": [
{ {
"__id__": 634 "__id__": 634
},
{
"__id__": 636
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 636 "__id__": 638
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -29831,7 +29834,7 @@ ...@@ -29831,7 +29834,7 @@
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-200, -200,
-100, -120,
0, 0,
0, 0,
0, 0,
...@@ -29880,8 +29883,8 @@ ...@@ -29880,8 +29883,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 400, "width": 40,
"height": 179 "height": 36
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -29893,7 +29896,7 @@ ...@@ -29893,7 +29896,7 @@
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
0, 0,
0, 20,
0, 0,
0, 0,
0, 0,
...@@ -29949,6 +29952,103 @@ ...@@ -29949,6 +29952,103 @@
"_atlas": null, "_atlas": null,
"_id": "c5K5Aqm9xCnLfhXm9gKugo" "_id": "c5K5Aqm9xCnLfhXm9gKugo"
}, },
{
"__type__": "cc.Node",
"_name": "word",
"_objFlags": 0,
"_parent": {
"__id__": 633
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 637
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 83,
"g": 83,
"b": 83,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 56.72,
"height": 44.1
},
"_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": "b50z9IwSVBr6bw3OCugW7b"
},
{
"__type__": "cc.Label",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 636
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_string": "ant",
"_N$string": "ant",
"_fontSize": 35,
"_lineHeight": 35,
"_enableWrapText": true,
"_N$file": {
"__uuid__": "4da9b2b9-81af-4a49-a4be-cf5982ee57c7"
},
"_isSystemFontUsed": false,
"_spacingX": 0,
"_batchAsBitmap": false,
"_styleFlags": 0,
"_underlineHeight": 0,
"_N$horizontalAlign": 1,
"_N$verticalAlign": 1,
"_N$fontFamily": "Arial",
"_N$overflow": 0,
"_N$cacheMode": 0,
"_id": "72jbIgzOxJUrJLBanKbPrC"
},
{ {
"__type__": "cc.Sprite", "__type__": "cc.Sprite",
"_name": "", "_name": "",
...@@ -30056,7 +30156,7 @@ ...@@ -30056,7 +30156,7 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 640 "__id__": 642
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -30112,7 +30212,7 @@ ...@@ -30112,7 +30212,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 639 "__id__": 641
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -30150,7 +30250,7 @@ ...@@ -30150,7 +30250,7 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 642 "__id__": 644
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -30206,7 +30306,7 @@ ...@@ -30206,7 +30306,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 641 "__id__": 643
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -30243,16 +30343,16 @@ ...@@ -30243,16 +30343,16 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 644 "__id__": 646
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 650 "__id__": 652
}, },
{ {
"__id__": 651 "__id__": 653
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -30308,20 +30408,20 @@ ...@@ -30308,20 +30408,20 @@
"_name": "item", "_name": "item",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 643 "__id__": 645
}, },
"_children": [ "_children": [
{ {
"__id__": 645 "__id__": 647
}, },
{ {
"__id__": 647 "__id__": 649
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 649 "__id__": 651
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -30377,13 +30477,13 @@ ...@@ -30377,13 +30477,13 @@
"_name": "pic", "_name": "pic",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 644 "__id__": 646
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 646 "__id__": 648
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -30439,7 +30539,7 @@ ...@@ -30439,7 +30539,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 645 "__id__": 647
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -30471,13 +30571,13 @@ ...@@ -30471,13 +30571,13 @@
"_name": "word", "_name": "word",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 644 "__id__": 646
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 648 "__id__": 650
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -30533,7 +30633,7 @@ ...@@ -30533,7 +30633,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 647 "__id__": 649
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -30568,7 +30668,7 @@ ...@@ -30568,7 +30668,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 644 "__id__": 646
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -30600,7 +30700,7 @@ ...@@ -30600,7 +30700,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 643 "__id__": 645
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -30632,7 +30732,7 @@ ...@@ -30632,7 +30732,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 643 "__id__": 645
}, },
"_enabled": true, "_enabled": true,
"_layoutSize": { "_layoutSize": {
...@@ -30670,7 +30770,7 @@ ...@@ -30670,7 +30770,7 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 653 "__id__": 655
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -30726,7 +30826,7 @@ ...@@ -30726,7 +30826,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 652 "__id__": 654
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -30764,7 +30864,7 @@ ...@@ -30764,7 +30864,7 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 655 "__id__": 657
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -30820,7 +30920,7 @@ ...@@ -30820,7 +30920,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 654 "__id__": 656
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -30857,16 +30957,16 @@ ...@@ -30857,16 +30957,16 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 657 "__id__": 659
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 661 "__id__": 663
}, },
{ {
"__id__": 662 "__id__": 664
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -30922,17 +31022,17 @@ ...@@ -30922,17 +31022,17 @@
"_name": "item", "_name": "item",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 656 "__id__": 658
}, },
"_children": [ "_children": [
{ {
"__id__": 658 "__id__": 660
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 660 "__id__": 662
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -30988,13 +31088,13 @@ ...@@ -30988,13 +31088,13 @@
"_name": "sentence", "_name": "sentence",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 657 "__id__": 659
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 659 "__id__": 661
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -31050,7 +31150,7 @@ ...@@ -31050,7 +31150,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 658 "__id__": 660
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -31083,7 +31183,7 @@ ...@@ -31083,7 +31183,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 657 "__id__": 659
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -31115,7 +31215,7 @@ ...@@ -31115,7 +31215,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 656 "__id__": 658
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -31147,7 +31247,7 @@ ...@@ -31147,7 +31247,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 656 "__id__": 658
}, },
"_enabled": true, "_enabled": true,
"_layoutSize": { "_layoutSize": {
...@@ -31185,7 +31285,7 @@ ...@@ -31185,7 +31285,7 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 664 "__id__": 666
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -31241,7 +31341,7 @@ ...@@ -31241,7 +31341,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 663 "__id__": 665
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -31279,7 +31379,7 @@ ...@@ -31279,7 +31379,7 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 666 "__id__": 668
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -31335,7 +31435,7 @@ ...@@ -31335,7 +31435,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 665 "__id__": 667
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -31372,16 +31472,16 @@ ...@@ -31372,16 +31472,16 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 668 "__id__": 670
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 687 "__id__": 689
}, },
{ {
"__id__": 688 "__id__": 690
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -31437,23 +31537,23 @@ ...@@ -31437,23 +31537,23 @@
"_name": "row", "_name": "row",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 667 "__id__": 669
}, },
"_children": [ "_children": [
{ {
"__id__": 669 "__id__": 671
}, },
{ {
"__id__": 672 "__id__": 674
}, },
{ {
"__id__": 681 "__id__": 683
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 686 "__id__": 688
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -31509,11 +31609,11 @@ ...@@ -31509,11 +31609,11 @@
"_name": "item1", "_name": "item1",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 668 "__id__": 670
}, },
"_children": [ "_children": [
{ {
"__id__": 670 "__id__": 672
} }
], ],
"_active": true, "_active": true,
...@@ -31571,13 +31671,13 @@ ...@@ -31571,13 +31671,13 @@
"_name": "word", "_name": "word",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 669 "__id__": 671
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 671 "__id__": 673
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -31633,7 +31733,7 @@ ...@@ -31633,7 +31733,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 670 "__id__": 672
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -31668,14 +31768,14 @@ ...@@ -31668,14 +31768,14 @@
"_name": "item2", "_name": "item2",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 668 "__id__": 670
}, },
"_children": [ "_children": [
{ {
"__id__": 673 "__id__": 675
}, },
{ {
"__id__": 678 "__id__": 680
} }
], ],
"_active": true, "_active": true,
...@@ -31733,19 +31833,19 @@ ...@@ -31733,19 +31833,19 @@
"_name": "play_icon", "_name": "play_icon",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 672 "__id__": 674
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 674 "__id__": 676
}, },
{ {
"__id__": 675 "__id__": 677
}, },
{ {
"__id__": 677 "__id__": 679
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -31801,7 +31901,7 @@ ...@@ -31801,7 +31901,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 673 "__id__": 675
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -31833,7 +31933,7 @@ ...@@ -31833,7 +31933,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 673 "__id__": 675
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -31842,7 +31942,7 @@ ...@@ -31842,7 +31942,7 @@
"zoomScale": 1.2, "zoomScale": 1.2,
"clickEvents": [ "clickEvents": [
{ {
"__id__": 676 "__id__": 678
} }
], ],
"_N$interactable": true, "_N$interactable": true,
...@@ -31898,14 +31998,14 @@ ...@@ -31898,14 +31998,14 @@
"hoverSprite": null, "hoverSprite": null,
"_N$disabledSprite": null, "_N$disabledSprite": null,
"_N$target": { "_N$target": {
"__id__": 673 "__id__": 675
}, },
"_id": "b2nrsNa3tP4Y4jWAyoNhcl" "_id": "b2nrsNa3tP4Y4jWAyoNhcl"
}, },
{ {
"__type__": "cc.ClickEvent", "__type__": "cc.ClickEvent",
"target": { "target": {
"__id__": 673 "__id__": 675
}, },
"component": "", "component": "",
"_componentId": "9c154tqr7dIDptMURdYlia+", "_componentId": "9c154tqr7dIDptMURdYlia+",
...@@ -31917,7 +32017,7 @@ ...@@ -31917,7 +32017,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 673 "__id__": 675
}, },
"_enabled": true, "_enabled": true,
"_id": "aczoUoPdFE/4TfpLz3866q" "_id": "aczoUoPdFE/4TfpLz3866q"
...@@ -31927,16 +32027,16 @@ ...@@ -31927,16 +32027,16 @@
"_name": "play", "_name": "play",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 672 "__id__": 674
}, },
"_children": [], "_children": [],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 679 "__id__": 681
}, },
{ {
"__id__": 680 "__id__": 682
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -31992,7 +32092,7 @@ ...@@ -31992,7 +32092,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 678 "__id__": 680
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -32024,7 +32124,7 @@ ...@@ -32024,7 +32124,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 678 "__id__": 680
}, },
"_enabled": true, "_enabled": true,
"_defaultClip": { "_defaultClip": {
...@@ -32043,14 +32143,14 @@ ...@@ -32043,14 +32143,14 @@
"_name": "item3", "_name": "item3",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 668 "__id__": 670
}, },
"_children": [ "_children": [
{ {
"__id__": 682 "__id__": 684
}, },
{ {
"__id__": 684 "__id__": 686
} }
], ],
"_active": true, "_active": true,
...@@ -32108,13 +32208,13 @@ ...@@ -32108,13 +32208,13 @@
"_name": "goodjob", "_name": "goodjob",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 681 "__id__": 683
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 683 "__id__": 685
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -32170,7 +32270,7 @@ ...@@ -32170,7 +32270,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 682 "__id__": 684
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -32202,13 +32302,13 @@ ...@@ -32202,13 +32302,13 @@
"_name": "nicetry", "_name": "nicetry",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 681 "__id__": 683
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 685 "__id__": 687
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -32264,7 +32364,7 @@ ...@@ -32264,7 +32364,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 684 "__id__": 686
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -32296,7 +32396,7 @@ ...@@ -32296,7 +32396,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 668 "__id__": 670
}, },
"_enabled": true, "_enabled": true,
"_layoutSize": { "_layoutSize": {
...@@ -32328,7 +32428,7 @@ ...@@ -32328,7 +32428,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 667 "__id__": 669
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -32360,7 +32460,7 @@ ...@@ -32360,7 +32460,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 667 "__id__": 669
}, },
"_enabled": true, "_enabled": true,
"_layoutSize": { "_layoutSize": {
...@@ -32398,7 +32498,7 @@ ...@@ -32398,7 +32498,7 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 690 "__id__": 692
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -32454,7 +32554,7 @@ ...@@ -32454,7 +32554,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 689 "__id__": 691
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -32492,7 +32592,7 @@ ...@@ -32492,7 +32592,7 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 692 "__id__": 694
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -32548,7 +32648,7 @@ ...@@ -32548,7 +32648,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 691 "__id__": 693
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -32585,10 +32685,10 @@ ...@@ -32585,10 +32685,10 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 694 "__id__": 696
}, },
{ {
"__id__": 711 "__id__": 713
} }
], ],
"_active": true, "_active": true,
...@@ -32646,12 +32746,9 @@ ...@@ -32646,12 +32746,9 @@
"_name": "result_bg", "_name": "result_bg",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 693 "__id__": 695
}, },
"_children": [ "_children": [
{
"__id__": 695
},
{ {
"__id__": 697 "__id__": 697
}, },
...@@ -32669,12 +32766,15 @@ ...@@ -32669,12 +32766,15 @@
}, },
{ {
"__id__": 707 "__id__": 707
},
{
"__id__": 709
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 710 "__id__": 712
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -32730,13 +32830,13 @@ ...@@ -32730,13 +32830,13 @@
"_name": "star_1", "_name": "star_1",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 694 "__id__": 696
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 696 "__id__": 698
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -32792,7 +32892,7 @@ ...@@ -32792,7 +32892,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 695 "__id__": 697
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -32824,13 +32924,13 @@ ...@@ -32824,13 +32924,13 @@
"_name": "star_1_light", "_name": "star_1_light",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 694 "__id__": 696
}, },
"_children": [], "_children": [],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 698 "__id__": 700
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -32886,7 +32986,7 @@ ...@@ -32886,7 +32986,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 697 "__id__": 699
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -32918,13 +33018,13 @@ ...@@ -32918,13 +33018,13 @@
"_name": "star_2", "_name": "star_2",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 694 "__id__": 696
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 700 "__id__": 702
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -32980,7 +33080,7 @@ ...@@ -32980,7 +33080,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 699 "__id__": 701
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -33012,13 +33112,13 @@ ...@@ -33012,13 +33112,13 @@
"_name": "star_2_light", "_name": "star_2_light",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 694 "__id__": 696
}, },
"_children": [], "_children": [],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 702 "__id__": 704
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -33074,7 +33174,7 @@ ...@@ -33074,7 +33174,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 701 "__id__": 703
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -33106,13 +33206,13 @@ ...@@ -33106,13 +33206,13 @@
"_name": "star_3", "_name": "star_3",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 694 "__id__": 696
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 704 "__id__": 706
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -33168,7 +33268,7 @@ ...@@ -33168,7 +33268,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 703 "__id__": 705
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -33200,13 +33300,13 @@ ...@@ -33200,13 +33300,13 @@
"_name": "star_3_light", "_name": "star_3_light",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 694 "__id__": 696
}, },
"_children": [], "_children": [],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 706 "__id__": 708
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -33262,7 +33362,7 @@ ...@@ -33262,7 +33362,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 705 "__id__": 707
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -33294,11 +33394,11 @@ ...@@ -33294,11 +33394,11 @@
"_name": "textnode", "_name": "textnode",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 694 "__id__": 696
}, },
"_children": [ "_children": [
{ {
"__id__": 708 "__id__": 710
} }
], ],
"_active": true, "_active": true,
...@@ -33356,13 +33456,13 @@ ...@@ -33356,13 +33456,13 @@
"_name": "label", "_name": "label",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 707 "__id__": 709
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 709 "__id__": 711
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -33418,7 +33518,7 @@ ...@@ -33418,7 +33518,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 708 "__id__": 710
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -33451,7 +33551,7 @@ ...@@ -33451,7 +33551,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 694 "__id__": 696
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -33483,23 +33583,23 @@ ...@@ -33483,23 +33583,23 @@
"_name": "video", "_name": "video",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 693 "__id__": 695
}, },
"_children": [ "_children": [
{ {
"__id__": 712 "__id__": 714
}, },
{ {
"__id__": 714 "__id__": 716
}, },
{ {
"__id__": 719 "__id__": 721
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 725 "__id__": 727
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -33555,13 +33655,13 @@ ...@@ -33555,13 +33655,13 @@
"_name": "video_cover", "_name": "video_cover",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 711 "__id__": 713
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 713 "__id__": 715
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -33617,7 +33717,7 @@ ...@@ -33617,7 +33717,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 712 "__id__": 714
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -33649,19 +33749,19 @@ ...@@ -33649,19 +33749,19 @@
"_name": "play", "_name": "play",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 711 "__id__": 713
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 715 "__id__": 717
}, },
{ {
"__id__": 716 "__id__": 718
}, },
{ {
"__id__": 718 "__id__": 720
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -33717,7 +33817,7 @@ ...@@ -33717,7 +33817,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 714 "__id__": 716
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -33749,7 +33849,7 @@ ...@@ -33749,7 +33849,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 714 "__id__": 716
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -33758,7 +33858,7 @@ ...@@ -33758,7 +33858,7 @@
"zoomScale": 1.2, "zoomScale": 1.2,
"clickEvents": [ "clickEvents": [
{ {
"__id__": 717 "__id__": 719
} }
], ],
"_N$interactable": true, "_N$interactable": true,
...@@ -33814,14 +33914,14 @@ ...@@ -33814,14 +33914,14 @@
"hoverSprite": null, "hoverSprite": null,
"_N$disabledSprite": null, "_N$disabledSprite": null,
"_N$target": { "_N$target": {
"__id__": 714 "__id__": 716
}, },
"_id": "e9BN1dkV9OdplrQ5d5HU7K" "_id": "e9BN1dkV9OdplrQ5d5HU7K"
}, },
{ {
"__type__": "cc.ClickEvent", "__type__": "cc.ClickEvent",
"target": { "target": {
"__id__": 714 "__id__": 716
}, },
"component": "", "component": "",
"_componentId": "9c154tqr7dIDptMURdYlia+", "_componentId": "9c154tqr7dIDptMURdYlia+",
...@@ -33833,7 +33933,7 @@ ...@@ -33833,7 +33933,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 714 "__id__": 716
}, },
"_enabled": true, "_enabled": true,
"_id": "49mvGABxJCXIynRx6lRSH5" "_id": "49mvGABxJCXIynRx6lRSH5"
...@@ -33843,20 +33943,20 @@ ...@@ -33843,20 +33943,20 @@
"_name": "video_process_bg", "_name": "video_process_bg",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 711 "__id__": 713
}, },
"_children": [ "_children": [
{ {
"__id__": 720 "__id__": 722
}, },
{ {
"__id__": 722 "__id__": 724
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 724 "__id__": 726
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -33912,13 +34012,13 @@ ...@@ -33912,13 +34012,13 @@
"_name": "video_process", "_name": "video_process",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 719 "__id__": 721
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 721 "__id__": 723
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -33974,7 +34074,7 @@ ...@@ -33974,7 +34074,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 720 "__id__": 722
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -34006,13 +34106,13 @@ ...@@ -34006,13 +34106,13 @@
"_name": "video_dot", "_name": "video_dot",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 719 "__id__": 721
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 723 "__id__": 725
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -34068,7 +34168,7 @@ ...@@ -34068,7 +34168,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 722 "__id__": 724
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -34100,7 +34200,7 @@ ...@@ -34100,7 +34200,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 719 "__id__": 721
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -34132,7 +34232,7 @@ ...@@ -34132,7 +34232,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 711 "__id__": 713
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -34290,7 +34390,7 @@ ...@@ -34290,7 +34390,7 @@
"_alignFlags": 41, "_alignFlags": 41,
"_left": 0, "_left": 0,
"_right": 0, "_right": 0,
"_top": 0, "_top": -283.639,
"_bottom": 0, "_bottom": 0,
"_verticalCenter": 0, "_verticalCenter": 0,
"_horizontalCenter": 0, "_horizontalCenter": 0,
...@@ -34421,16 +34521,16 @@ ...@@ -34421,16 +34521,16 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 736 "__id__": 738
}, },
{ {
"__id__": 737 "__id__": 739
}, },
{ {
"__id__": 738 "__id__": 740
}, },
{ {
"__id__": 740 "__id__": 742
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -34486,7 +34586,7 @@ ...@@ -34486,7 +34586,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 735 "__id__": 737
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -34518,7 +34618,7 @@ ...@@ -34518,7 +34618,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 735 "__id__": 737
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -34545,7 +34645,7 @@ ...@@ -34545,7 +34645,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 735 "__id__": 737
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -34554,7 +34654,7 @@ ...@@ -34554,7 +34654,7 @@
"zoomScale": 1.2, "zoomScale": 1.2,
"clickEvents": [ "clickEvents": [
{ {
"__id__": 739 "__id__": 741
} }
], ],
"_N$interactable": true, "_N$interactable": true,
...@@ -34615,7 +34715,7 @@ ...@@ -34615,7 +34715,7 @@
{ {
"__type__": "cc.ClickEvent", "__type__": "cc.ClickEvent",
"target": { "target": {
"__id__": 735 "__id__": 737
}, },
"component": "", "component": "",
"_componentId": "9c154tqr7dIDptMURdYlia+", "_componentId": "9c154tqr7dIDptMURdYlia+",
...@@ -34627,7 +34727,7 @@ ...@@ -34627,7 +34727,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 735 "__id__": 737
}, },
"_enabled": true, "_enabled": true,
"_id": "fa3KV6EbFDwJdO89ber4Ip" "_id": "fa3KV6EbFDwJdO89ber4Ip"
...@@ -34726,28 +34826,28 @@ ...@@ -34726,28 +34826,28 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 745 "__id__": 747
}, },
{ {
"__id__": 748 "__id__": 750
}, },
{ {
"__id__": 757 "__id__": 759
}, },
{ {
"__id__": 761 "__id__": 763
}, },
{ {
"__id__": 767 "__id__": 769
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 770 "__id__": 772
}, },
{ {
"__id__": 771 "__id__": 773
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -34803,16 +34903,16 @@ ...@@ -34803,16 +34903,16 @@
"_name": "qpyVideo", "_name": "qpyVideo",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 744 "__id__": 746
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 746 "__id__": 748
}, },
{ {
"__id__": 747 "__id__": 749
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -34868,7 +34968,7 @@ ...@@ -34868,7 +34968,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 745 "__id__": 747
}, },
"_enabled": true, "_enabled": true,
"_resourceType": 0, "_resourceType": 0,
...@@ -34890,7 +34990,7 @@ ...@@ -34890,7 +34990,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 745 "__id__": 747
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -34917,23 +35017,23 @@ ...@@ -34917,23 +35017,23 @@
"_name": "video_process_bg", "_name": "video_process_bg",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 744 "__id__": 746
}, },
"_children": [ "_children": [
{ {
"__id__": 749 "__id__": 751
}, },
{ {
"__id__": 752 "__id__": 754
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 755 "__id__": 757
}, },
{ {
"__id__": 756 "__id__": 758
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -34989,16 +35089,16 @@ ...@@ -34989,16 +35089,16 @@
"_name": "video_process", "_name": "video_process",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 748 "__id__": 750
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 750 "__id__": 752
}, },
{ {
"__id__": 751 "__id__": 753
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -35054,7 +35154,7 @@ ...@@ -35054,7 +35154,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 749 "__id__": 751
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -35086,7 +35186,7 @@ ...@@ -35086,7 +35186,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 749 "__id__": 751
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -35113,16 +35213,16 @@ ...@@ -35113,16 +35213,16 @@
"_name": "video_dot", "_name": "video_dot",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 748 "__id__": 750
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 753 "__id__": 755
}, },
{ {
"__id__": 754 "__id__": 756
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -35178,7 +35278,7 @@ ...@@ -35178,7 +35278,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 752 "__id__": 754
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -35210,7 +35310,7 @@ ...@@ -35210,7 +35310,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 752 "__id__": 754
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -35237,7 +35337,7 @@ ...@@ -35237,7 +35337,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 748 "__id__": 750
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -35269,7 +35369,7 @@ ...@@ -35269,7 +35369,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 748 "__id__": 750
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -35296,19 +35396,19 @@ ...@@ -35296,19 +35396,19 @@
"_name": "mask", "_name": "mask",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 744 "__id__": 746
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 758 "__id__": 760
}, },
{ {
"__id__": 759 "__id__": 761
}, },
{ {
"__id__": 760 "__id__": 762
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -35364,7 +35464,7 @@ ...@@ -35364,7 +35464,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 757 "__id__": 759
}, },
"_enabled": true, "_enabled": true,
"_materials": [], "_materials": [],
...@@ -35392,7 +35492,7 @@ ...@@ -35392,7 +35492,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 757 "__id__": 759
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -35419,7 +35519,7 @@ ...@@ -35419,7 +35519,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 757 "__id__": 759
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -35480,7 +35580,7 @@ ...@@ -35480,7 +35580,7 @@
"hoverSprite": null, "hoverSprite": null,
"_N$disabledSprite": null, "_N$disabledSprite": null,
"_N$target": { "_N$target": {
"__id__": 757 "__id__": 759
}, },
"_id": "9fClxAegdJnoaP35o44+rP" "_id": "9fClxAegdJnoaP35o44+rP"
}, },
...@@ -35489,22 +35589,22 @@ ...@@ -35489,22 +35589,22 @@
"_name": "back", "_name": "back",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 744 "__id__": 746
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 762 "__id__": 764
}, },
{ {
"__id__": 763 "__id__": 765
}, },
{ {
"__id__": 764 "__id__": 766
}, },
{ {
"__id__": 766 "__id__": 768
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -35560,7 +35660,7 @@ ...@@ -35560,7 +35660,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 761 "__id__": 763
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -35592,7 +35692,7 @@ ...@@ -35592,7 +35692,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 761 "__id__": 763
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -35619,7 +35719,7 @@ ...@@ -35619,7 +35719,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 761 "__id__": 763
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -35628,7 +35728,7 @@ ...@@ -35628,7 +35728,7 @@
"zoomScale": 1.2, "zoomScale": 1.2,
"clickEvents": [ "clickEvents": [
{ {
"__id__": 765 "__id__": 767
} }
], ],
"_N$interactable": true, "_N$interactable": true,
...@@ -35684,14 +35784,14 @@ ...@@ -35684,14 +35784,14 @@
"hoverSprite": null, "hoverSprite": null,
"_N$disabledSprite": null, "_N$disabledSprite": null,
"_N$target": { "_N$target": {
"__id__": 761 "__id__": 763
}, },
"_id": "63efETDzBJTq9PD1gP/oLR" "_id": "63efETDzBJTq9PD1gP/oLR"
}, },
{ {
"__type__": "cc.ClickEvent", "__type__": "cc.ClickEvent",
"target": { "target": {
"__id__": 761 "__id__": 763
}, },
"component": "", "component": "",
"_componentId": "9c154tqr7dIDptMURdYlia+", "_componentId": "9c154tqr7dIDptMURdYlia+",
...@@ -35703,7 +35803,7 @@ ...@@ -35703,7 +35803,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 761 "__id__": 763
}, },
"_enabled": true, "_enabled": true,
"_id": "6bO/s4q0JC/7tFb3YzguFS" "_id": "6bO/s4q0JC/7tFb3YzguFS"
...@@ -35713,16 +35813,16 @@ ...@@ -35713,16 +35813,16 @@
"_name": "play", "_name": "play",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 744 "__id__": 746
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 768 "__id__": 770
}, },
{ {
"__id__": 769 "__id__": 771
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -35778,7 +35878,7 @@ ...@@ -35778,7 +35878,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 767 "__id__": 769
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -35810,7 +35910,7 @@ ...@@ -35810,7 +35910,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 767 "__id__": 769
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -35871,7 +35971,7 @@ ...@@ -35871,7 +35971,7 @@
"hoverSprite": null, "hoverSprite": null,
"_N$disabledSprite": null, "_N$disabledSprite": null,
"_N$target": { "_N$target": {
"__id__": 767 "__id__": 769
}, },
"_id": "a3qfAeWZdLRbldRWbD/SHz" "_id": "a3qfAeWZdLRbldRWbD/SHz"
}, },
...@@ -35880,23 +35980,23 @@ ...@@ -35880,23 +35980,23 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 744 "__id__": 746
}, },
"_enabled": true, "_enabled": true,
"dot": { "dot": {
"__id__": 752 "__id__": 754
}, },
"processBg": { "processBg": {
"__id__": 748 "__id__": 750
}, },
"process": { "process": {
"__id__": 749 "__id__": 751
}, },
"playBtn": { "playBtn": {
"__id__": 767 "__id__": 769
}, },
"videoplayer": { "videoplayer": {
"__id__": 746 "__id__": 748
}, },
"_id": "dej+nExBZLLKTp/uZgfxJs" "_id": "dej+nExBZLLKTp/uZgfxJs"
}, },
...@@ -35905,7 +36005,7 @@ ...@@ -35905,7 +36005,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 744 "__id__": 746
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
......
...@@ -275,9 +275,21 @@ export default class NewClass extends cc.Component { ...@@ -275,9 +275,21 @@ export default class NewClass extends cc.Component {
const itemClone = cc.instantiate(letterNode); const itemClone = cc.instantiate(letterNode);
itemClone.parent = letterRow; itemClone.parent = letterRow;
itemClone.active = true; itemClone.active = true;
getSpriteFrimeByUrl(letter.pic_url, (spriteFrame) => { if (letter.pic_url) {
cc.find("pic", itemClone).getComponent(cc.Sprite).spriteFrame = spriteFrame; itemClone.height = 200;
}); getSpriteFrimeByUrl(letter.pic_url, (spriteFrame) => {
const picNode = cc.find(`pic`, itemClone);
picNode.getComponent(cc.Sprite).spriteFrame = spriteFrame;
const sx = 400 / picNode.width;
const sy = 200 / picNode.height;
picNode.scale = Math.min(sx, sy);
});
} else {
itemClone.height = 45;
cc.find("pic", itemClone).active = false;
cc.find("word", itemClone).active = true;
cc.find("word", itemClone).getComponent(cc.Label).string = letter.text;
}
} }
} else { } else {
cc.find("letter_title", resultNode).active = false; cc.find("letter_title", resultNode).active = false;
...@@ -303,7 +315,11 @@ export default class NewClass extends cc.Component { ...@@ -303,7 +315,11 @@ export default class NewClass extends cc.Component {
if (word.pic_url) { if (word.pic_url) {
itemClone.height = 220; itemClone.height = 220;
getSpriteFrimeByUrl(word.pic_url, (spriteFrame) => { getSpriteFrimeByUrl(word.pic_url, (spriteFrame) => {
cc.find("pic", itemClone).getComponent(cc.Sprite).spriteFrame = spriteFrame; const picNode = cc.find(`pic`, itemClone);
picNode.getComponent(cc.Sprite).spriteFrame = spriteFrame;
const sx = 200 / picNode.width;
const sy = 179 / picNode.height;
picNode.scale = Math.min(sx, sy);
}); });
} else { } else {
itemClone.height = 40; itemClone.height = 40;
......
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