Commit 9e1dc9ab authored by Tt's avatar Tt

尾部红色放大调整

parent d7ea53f6
...@@ -135,85 +135,85 @@ ...@@ -135,85 +135,85 @@
"__id__": 51 "__id__": 51
}, },
{ {
"__id__": 64 "__id__": 67
}, },
{ {
"__id__": 76 "__id__": 79
}, },
{ {
"__id__": 88 "__id__": 91
}, },
{ {
"__id__": 100 "__id__": 103
}, },
{ {
"__id__": 102 "__id__": 105
}, },
{ {
"__id__": 108 "__id__": 111
}, },
{ {
"__id__": 115 "__id__": 118
}, },
{ {
"__id__": 122 "__id__": 125
}, },
{ {
"__id__": 149 "__id__": 152
}, },
{ {
"__id__": 170 "__id__": 173
}, },
{ {
"__id__": 172 "__id__": 175
}, },
{ {
"__id__": 173 "__id__": 176
}, },
{ {
"__id__": 181 "__id__": 184
}, },
{ {
"__id__": 182 "__id__": 185
}, },
{ {
"__id__": 202 "__id__": 205
}, },
{ {
"__id__": 204 "__id__": 207
}, },
{ {
"__id__": 208 "__id__": 211
}, },
{ {
"__id__": 211 "__id__": 214
}, },
{ {
"__id__": 212 "__id__": 215
}, },
{ {
"__id__": 213 "__id__": 216
}, },
{ {
"__id__": 215 "__id__": 218
}, },
{ {
"__id__": 221 "__id__": 224
}, },
{ {
"__id__": 234 "__id__": 237
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 260 "__id__": 263
}, },
{ {
"__id__": 261 "__id__": 264
}, },
{ {
"__id__": 262 "__id__": 265
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -438,6 +438,7 @@ ...@@ -438,6 +438,7 @@
"_volume": 1, "_volume": 1,
"_mute": false, "_mute": false,
"_loop": false, "_loop": false,
"_firstlyEnabled": true,
"playOnLoad": false, "playOnLoad": false,
"preload": false, "preload": false,
"_id": "0fpufyVVpDsJXhdF0nqyQI" "_id": "0fpufyVVpDsJXhdF0nqyQI"
...@@ -518,6 +519,7 @@ ...@@ -518,6 +519,7 @@
"_volume": 1, "_volume": 1,
"_mute": false, "_mute": false,
"_loop": false, "_loop": false,
"_firstlyEnabled": true,
"playOnLoad": false, "playOnLoad": false,
"preload": false, "preload": false,
"_id": "51ctdulrJL762YJ+YJsG5h" "_id": "51ctdulrJL762YJ+YJsG5h"
...@@ -598,6 +600,7 @@ ...@@ -598,6 +600,7 @@
"_volume": 1, "_volume": 1,
"_mute": false, "_mute": false,
"_loop": false, "_loop": false,
"_firstlyEnabled": true,
"playOnLoad": false, "playOnLoad": false,
"preload": false, "preload": false,
"_id": "bcj8PE5t5C/bvzJrfJKep2" "_id": "bcj8PE5t5C/bvzJrfJKep2"
...@@ -678,6 +681,7 @@ ...@@ -678,6 +681,7 @@
"_volume": 1, "_volume": 1,
"_mute": false, "_mute": false,
"_loop": false, "_loop": false,
"_firstlyEnabled": true,
"playOnLoad": false, "playOnLoad": false,
"preload": false, "preload": false,
"_id": "adSvNME1VAJpo+Mcy1CKc4" "_id": "adSvNME1VAJpo+Mcy1CKc4"
...@@ -758,6 +762,7 @@ ...@@ -758,6 +762,7 @@
"_volume": 1, "_volume": 1,
"_mute": false, "_mute": false,
"_loop": false, "_loop": false,
"_firstlyEnabled": true,
"playOnLoad": false, "playOnLoad": false,
"preload": false, "preload": false,
"_id": "1dSsu5zCFICLt1HS8K3aX4" "_id": "1dSsu5zCFICLt1HS8K3aX4"
...@@ -838,6 +843,7 @@ ...@@ -838,6 +843,7 @@
"_volume": 1, "_volume": 1,
"_mute": false, "_mute": false,
"_loop": false, "_loop": false,
"_firstlyEnabled": true,
"playOnLoad": false, "playOnLoad": false,
"preload": false, "preload": false,
"_id": "3fGa2zmmBPponkVzm+ZTlT" "_id": "3fGa2zmmBPponkVzm+ZTlT"
...@@ -918,6 +924,7 @@ ...@@ -918,6 +924,7 @@
"_volume": 1, "_volume": 1,
"_mute": false, "_mute": false,
"_loop": false, "_loop": false,
"_firstlyEnabled": true,
"playOnLoad": false, "playOnLoad": false,
"preload": false, "preload": false,
"_id": "f3C2KOM5tKHaaYHaJOdXk8" "_id": "f3C2KOM5tKHaaYHaJOdXk8"
...@@ -998,6 +1005,7 @@ ...@@ -998,6 +1005,7 @@
"_volume": 1, "_volume": 1,
"_mute": false, "_mute": false,
"_loop": false, "_loop": false,
"_firstlyEnabled": true,
"playOnLoad": false, "playOnLoad": false,
"preload": false, "preload": false,
"_id": "b8DA79vh9Mbb+bqRvZybPk" "_id": "b8DA79vh9Mbb+bqRvZybPk"
...@@ -1078,6 +1086,7 @@ ...@@ -1078,6 +1086,7 @@
"_volume": 1, "_volume": 1,
"_mute": false, "_mute": false,
"_loop": false, "_loop": false,
"_firstlyEnabled": true,
"playOnLoad": false, "playOnLoad": false,
"preload": false, "preload": false,
"_id": "53anR5Nf9LHa35556rYf8+" "_id": "53anR5Nf9LHa35556rYf8+"
...@@ -2544,16 +2553,16 @@ ...@@ -2544,16 +2553,16 @@
"__id__": 52 "__id__": 52
}, },
{ {
"__id__": 57 "__id__": 60
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 62 "__id__": 65
}, },
{ {
"__id__": 63 "__id__": 66
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2614,12 +2623,15 @@ ...@@ -2614,12 +2623,15 @@
"_children": [ "_children": [
{ {
"__id__": 53 "__id__": 53
},
{
"__id__": 56
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 56 "__id__": 59
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2785,6 +2797,121 @@ ...@@ -2785,6 +2797,121 @@
"_originalHeight": 0, "_originalHeight": 0,
"_id": "36VGis849MQI8l59L5NejZ" "_id": "36VGis849MQI8l59L5NejZ"
}, },
{
"__type__": "cc.Node",
"_name": "last",
"_objFlags": 0,
"_parent": {
"__id__": 52
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 57
},
{
"__id__": 58
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 0,
"height": 189
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
0,
17,
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": "fadnG0zSBHvrRorS3poA4g"
},
{
"__type__": "cc.RichText",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 56
},
"_enabled": true,
"_fontFamily": "Arial",
"_isSystemFontUsed": false,
"_N$string": "",
"_N$horizontalAlign": 0,
"_N$fontSize": 100,
"_N$font": {
"__uuid__": "aad4b464-228c-4e4c-b8b7-b7a4f81719f2"
},
"_N$cacheMode": 0,
"_N$maxWidth": 0,
"_N$lineHeight": 150,
"_N$imageAtlas": null,
"_N$handleTouchEvent": true,
"_id": "30wezMhUpGDrplewKC1Ax/"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 56
},
"_enabled": true,
"alignMode": 2,
"_target": null,
"_alignFlags": 32,
"_left": 0,
"_right": 0,
"_top": 0,
"_bottom": 0,
"_verticalCenter": 0,
"_horizontalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 0,
"_originalHeight": 0,
"_id": "57Jmx1MnpJ8b+oNDPPb5W4"
},
{ {
"__type__": "cc.RichText", "__type__": "cc.RichText",
"_name": "", "_name": "",
...@@ -2817,13 +2944,13 @@ ...@@ -2817,13 +2944,13 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 58 "__id__": 61
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 61 "__id__": 64
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2879,16 +3006,16 @@ ...@@ -2879,16 +3006,16 @@
"_name": "first", "_name": "first",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 57 "__id__": 60
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 59 "__id__": 62
}, },
{ {
"__id__": 60 "__id__": 63
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2944,7 +3071,7 @@ ...@@ -2944,7 +3071,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 58 "__id__": 61
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -2954,7 +3081,6 @@ ...@@ -2954,7 +3081,6 @@
], ],
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_useOriginalSize": true,
"_string": "a", "_string": "a",
"_N$string": "a", "_N$string": "a",
"_fontSize": 100, "_fontSize": 100,
...@@ -2978,7 +3104,7 @@ ...@@ -2978,7 +3104,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 58 "__id__": 61
}, },
"_enabled": true, "_enabled": true,
"alignMode": 2, "alignMode": 2,
...@@ -3005,7 +3131,7 @@ ...@@ -3005,7 +3131,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 57 "__id__": 60
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3015,7 +3141,6 @@ ...@@ -3015,7 +3141,6 @@
], ],
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_useOriginalSize": true,
"_string": "apple", "_string": "apple",
"_N$string": "apple", "_N$string": "apple",
"_fontSize": 100, "_fontSize": 100,
...@@ -3145,25 +3270,25 @@ ...@@ -3145,25 +3270,25 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 65 "__id__": 68
}, },
{ {
"__id__": 68 "__id__": 71
}, },
{ {
"__id__": 70 "__id__": 73
}, },
{ {
"__id__": 72 "__id__": 75
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 74 "__id__": 77
}, },
{ {
"__id__": 75 "__id__": 78
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3219,16 +3344,16 @@ ...@@ -3219,16 +3344,16 @@
"_name": "bg_btm", "_name": "bg_btm",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 64 "__id__": 67
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 66 "__id__": 69
}, },
{ {
"__id__": 67 "__id__": 70
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3284,7 +3409,7 @@ ...@@ -3284,7 +3409,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 65 "__id__": 68
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3316,7 +3441,7 @@ ...@@ -3316,7 +3441,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 65 "__id__": 68
}, },
"_enabled": true, "_enabled": true,
"alignMode": 2, "alignMode": 2,
...@@ -3343,13 +3468,13 @@ ...@@ -3343,13 +3468,13 @@
"_name": "bg_light", "_name": "bg_light",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 64 "__id__": 67
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 69 "__id__": 72
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3405,7 +3530,7 @@ ...@@ -3405,7 +3530,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 68 "__id__": 71
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3437,13 +3562,13 @@ ...@@ -3437,13 +3562,13 @@
"_name": "bg_tryagain", "_name": "bg_tryagain",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 64 "__id__": 67
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 71 "__id__": 74
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3499,7 +3624,7 @@ ...@@ -3499,7 +3624,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 70 "__id__": 73
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3531,13 +3656,13 @@ ...@@ -3531,13 +3656,13 @@
"_name": "bg_success", "_name": "bg_success",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 64 "__id__": 67
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 73 "__id__": 76
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3593,7 +3718,7 @@ ...@@ -3593,7 +3718,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 72 "__id__": 75
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3625,7 +3750,7 @@ ...@@ -3625,7 +3750,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 64 "__id__": 67
}, },
"_enabled": true, "_enabled": true,
"alignMode": 2, "alignMode": 2,
...@@ -3652,7 +3777,7 @@ ...@@ -3652,7 +3777,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 64 "__id__": 67
}, },
"_enabled": true, "_enabled": true,
"_id": "c4+HuZrxNNzoHrIA23FzVQ" "_id": "c4+HuZrxNNzoHrIA23FzVQ"
...@@ -3666,22 +3791,22 @@ ...@@ -3666,22 +3791,22 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 77 "__id__": 80
}, },
{ {
"__id__": 79 "__id__": 82
}, },
{ {
"__id__": 83 "__id__": 86
}, },
{ {
"__id__": 85 "__id__": 88
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 87 "__id__": 90
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3737,13 +3862,13 @@ ...@@ -3737,13 +3862,13 @@
"_name": "guid_ske", "_name": "guid_ske",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 76 "__id__": 79
}, },
"_children": [], "_children": [],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 78 "__id__": 81
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3799,7 +3924,7 @@ ...@@ -3799,7 +3924,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 77 "__id__": 80
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3839,17 +3964,17 @@ ...@@ -3839,17 +3964,17 @@
"_name": "btn_record", "_name": "btn_record",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 76 "__id__": 79
}, },
"_children": [ "_children": [
{ {
"__id__": 80 "__id__": 83
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 82 "__id__": 85
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3905,13 +4030,13 @@ ...@@ -3905,13 +4030,13 @@
"_name": "icon_record", "_name": "icon_record",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 79 "__id__": 82
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 81 "__id__": 84
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3967,7 +4092,7 @@ ...@@ -3967,7 +4092,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 80 "__id__": 83
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3999,7 +4124,7 @@ ...@@ -3999,7 +4124,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 79 "__id__": 82
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4031,13 +4156,13 @@ ...@@ -4031,13 +4156,13 @@
"_name": "icon_record", "_name": "icon_record",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 76 "__id__": 79
}, },
"_children": [], "_children": [],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 84 "__id__": 87
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4093,7 +4218,7 @@ ...@@ -4093,7 +4218,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 83 "__id__": 86
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4125,13 +4250,13 @@ ...@@ -4125,13 +4250,13 @@
"_name": "New Node", "_name": "New Node",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 76 "__id__": 79
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 86 "__id__": 89
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4187,7 +4312,7 @@ ...@@ -4187,7 +4312,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 85 "__id__": 88
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4227,7 +4352,7 @@ ...@@ -4227,7 +4352,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 76 "__id__": 79
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -4288,7 +4413,7 @@ ...@@ -4288,7 +4413,7 @@
"hoverSprite": null, "hoverSprite": null,
"_N$disabledSprite": null, "_N$disabledSprite": null,
"_N$target": { "_N$target": {
"__id__": 76 "__id__": 79
}, },
"_id": "b09HfTfohGxpd5Ff9vXa7G" "_id": "b09HfTfohGxpd5Ff9vXa7G"
}, },
...@@ -4301,28 +4426,28 @@ ...@@ -4301,28 +4426,28 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 89 "__id__": 92
}, },
{ {
"__id__": 91 "__id__": 94
}, },
{ {
"__id__": 93 "__id__": 96
}, },
{ {
"__id__": 95 "__id__": 98
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 97 "__id__": 100
}, },
{ {
"__id__": 98 "__id__": 101
}, },
{ {
"__id__": 99 "__id__": 102
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4378,13 +4503,13 @@ ...@@ -4378,13 +4503,13 @@
"_name": "icon_recording", "_name": "icon_recording",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 88 "__id__": 91
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 90 "__id__": 93
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4440,7 +4565,7 @@ ...@@ -4440,7 +4565,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 89 "__id__": 92
}, },
"_enabled": false, "_enabled": false,
"_materials": [ "_materials": [
...@@ -4472,13 +4597,13 @@ ...@@ -4472,13 +4597,13 @@
"_name": "p0", "_name": "p0",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 88 "__id__": 91
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 92 "__id__": 95
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4534,7 +4659,7 @@ ...@@ -4534,7 +4659,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 91 "__id__": 94
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4566,13 +4691,13 @@ ...@@ -4566,13 +4691,13 @@
"_name": "p1", "_name": "p1",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 88 "__id__": 91
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 94 "__id__": 97
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4628,7 +4753,7 @@ ...@@ -4628,7 +4753,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 93 "__id__": 96
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4660,13 +4785,13 @@ ...@@ -4660,13 +4785,13 @@
"_name": "p2", "_name": "p2",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 88 "__id__": 91
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 96 "__id__": 99
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4722,7 +4847,7 @@ ...@@ -4722,7 +4847,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 95 "__id__": 98
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4754,7 +4879,7 @@ ...@@ -4754,7 +4879,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 88 "__id__": 91
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4786,7 +4911,7 @@ ...@@ -4786,7 +4911,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 88 "__id__": 91
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -4847,7 +4972,7 @@ ...@@ -4847,7 +4972,7 @@
"hoverSprite": null, "hoverSprite": null,
"_N$disabledSprite": null, "_N$disabledSprite": null,
"_N$target": { "_N$target": {
"__id__": 88 "__id__": 91
}, },
"_id": "feA2HsnyFASLUXjdq0vRse" "_id": "feA2HsnyFASLUXjdq0vRse"
}, },
...@@ -4856,7 +4981,7 @@ ...@@ -4856,7 +4981,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 88 "__id__": 91
}, },
"_enabled": true, "_enabled": true,
"_id": "09R5wk/0NITYGz7Es4tALJ" "_id": "09R5wk/0NITYGz7Es4tALJ"
...@@ -4872,7 +4997,7 @@ ...@@ -4872,7 +4997,7 @@
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 101 "__id__": 104
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4928,7 +5053,7 @@ ...@@ -4928,7 +5053,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 100 "__id__": 103
}, },
"_enabled": false, "_enabled": false,
"_materials": [ "_materials": [
...@@ -4964,19 +5089,19 @@ ...@@ -4964,19 +5089,19 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 103 "__id__": 106
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 105 "__id__": 108
}, },
{ {
"__id__": 106 "__id__": 109
}, },
{ {
"__id__": 107 "__id__": 110
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5032,13 +5157,13 @@ ...@@ -5032,13 +5157,13 @@
"_name": "bar", "_name": "bar",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 102 "__id__": 105
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 104 "__id__": 107
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5094,7 +5219,7 @@ ...@@ -5094,7 +5219,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 103 "__id__": 106
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -5126,7 +5251,7 @@ ...@@ -5126,7 +5251,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 102 "__id__": 105
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -5158,12 +5283,12 @@ ...@@ -5158,12 +5283,12 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 102 "__id__": 105
}, },
"_enabled": true, "_enabled": true,
"_N$totalLength": 1383.3, "_N$totalLength": 1383.3,
"_N$barSprite": { "_N$barSprite": {
"__id__": 104 "__id__": 107
}, },
"_N$mode": 0, "_N$mode": 0,
"_N$progress": 0, "_N$progress": 0,
...@@ -5175,7 +5300,7 @@ ...@@ -5175,7 +5300,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 102 "__id__": 105
}, },
"_enabled": true, "_enabled": true,
"costtime": 4, "costtime": 4,
...@@ -5190,10 +5315,10 @@ ...@@ -5190,10 +5315,10 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 109 "__id__": 112
}, },
{ {
"__id__": 112 "__id__": 115
} }
], ],
"_active": false, "_active": false,
...@@ -5251,16 +5376,16 @@ ...@@ -5251,16 +5376,16 @@
"_name": "invalid-name", "_name": "invalid-name",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 108 "__id__": 111
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 110 "__id__": 113
}, },
{ {
"__id__": 111 "__id__": 114
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5316,7 +5441,7 @@ ...@@ -5316,7 +5441,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 109 "__id__": 112
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -5348,7 +5473,7 @@ ...@@ -5348,7 +5473,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 109 "__id__": 112
}, },
"_enabled": true, "_enabled": true,
"r_width": 1, "r_width": 1,
...@@ -5369,16 +5494,16 @@ ...@@ -5369,16 +5494,16 @@
"_name": "invalid-name_2", "_name": "invalid-name_2",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 108 "__id__": 111
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 113 "__id__": 116
}, },
{ {
"__id__": 114 "__id__": 117
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5434,7 +5559,7 @@ ...@@ -5434,7 +5559,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 112 "__id__": 115
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -5466,7 +5591,7 @@ ...@@ -5466,7 +5591,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 112 "__id__": 115
}, },
"_enabled": true, "_enabled": true,
"r_width": 1, "r_width": 1,
...@@ -5491,16 +5616,16 @@ ...@@ -5491,16 +5616,16 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 116 "__id__": 119
}, },
{ {
"__id__": 118 "__id__": 121
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 121 "__id__": 124
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5556,13 +5681,13 @@ ...@@ -5556,13 +5681,13 @@
"_name": "bg", "_name": "bg",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 115 "__id__": 118
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 117 "__id__": 120
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5618,7 +5743,7 @@ ...@@ -5618,7 +5743,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 116 "__id__": 119
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -5650,16 +5775,16 @@ ...@@ -5650,16 +5775,16 @@
"_name": "txt", "_name": "txt",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 115 "__id__": 118
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 119 "__id__": 122
}, },
{ {
"__id__": 120 "__id__": 123
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5715,7 +5840,7 @@ ...@@ -5715,7 +5840,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 118 "__id__": 121
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -5725,7 +5850,6 @@ ...@@ -5725,7 +5850,6 @@
], ],
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_useOriginalSize": true,
"_string": "", "_string": "",
"_N$string": "", "_N$string": "",
"_fontSize": 27, "_fontSize": 27,
...@@ -5751,7 +5875,7 @@ ...@@ -5751,7 +5875,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 118 "__id__": 121
}, },
"_enabled": true, "_enabled": true,
"_color": { "_color": {
...@@ -5769,7 +5893,7 @@ ...@@ -5769,7 +5893,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 115 "__id__": 118
}, },
"_enabled": true, "_enabled": true,
"r_width": 0, "r_width": 0,
...@@ -5793,9 +5917,6 @@ ...@@ -5793,9 +5917,6 @@
"__id__": 2 "__id__": 2
}, },
"_children": [ "_children": [
{
"__id__": 123
},
{ {
"__id__": 126 "__id__": 126
}, },
...@@ -5803,13 +5924,16 @@ ...@@ -5803,13 +5924,16 @@
"__id__": 129 "__id__": 129
}, },
{ {
"__id__": 136 "__id__": 132
}, },
{ {
"__id__": 143 "__id__": 139
}, },
{ {
"__id__": 146 "__id__": 146
},
{
"__id__": 149
} }
], ],
"_active": false, "_active": false,
...@@ -5867,11 +5991,11 @@ ...@@ -5867,11 +5991,11 @@
"_name": "line0", "_name": "line0",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 122 "__id__": 125
}, },
"_children": [ "_children": [
{ {
"__id__": 124 "__id__": 127
} }
], ],
"_active": true, "_active": true,
...@@ -5929,13 +6053,13 @@ ...@@ -5929,13 +6053,13 @@
"_name": "line0", "_name": "line0",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 123 "__id__": 126
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 125 "__id__": 128
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5991,7 +6115,7 @@ ...@@ -5991,7 +6115,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 124 "__id__": 127
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -6023,11 +6147,11 @@ ...@@ -6023,11 +6147,11 @@
"_name": "line1", "_name": "line1",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 122 "__id__": 125
}, },
"_children": [ "_children": [
{ {
"__id__": 127 "__id__": 130
} }
], ],
"_active": true, "_active": true,
...@@ -6085,13 +6209,13 @@ ...@@ -6085,13 +6209,13 @@
"_name": "line0", "_name": "line0",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 126 "__id__": 129
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 128 "__id__": 131
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -6147,7 +6271,7 @@ ...@@ -6147,7 +6271,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 127 "__id__": 130
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -6179,14 +6303,14 @@ ...@@ -6179,14 +6303,14 @@
"_name": "line2", "_name": "line2",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 122 "__id__": 125
}, },
"_children": [ "_children": [
{ {
"__id__": 130 "__id__": 133
}, },
{ {
"__id__": 132 "__id__": 135
} }
], ],
"_active": true, "_active": true,
...@@ -6244,13 +6368,13 @@ ...@@ -6244,13 +6368,13 @@
"_name": "line0", "_name": "line0",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 129 "__id__": 132
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 131 "__id__": 134
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -6306,7 +6430,7 @@ ...@@ -6306,7 +6430,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 130 "__id__": 133
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -6338,17 +6462,17 @@ ...@@ -6338,17 +6462,17 @@
"_name": "line1", "_name": "line1",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 129 "__id__": 132
}, },
"_children": [ "_children": [
{ {
"__id__": 133 "__id__": 136
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 135 "__id__": 138
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -6404,13 +6528,13 @@ ...@@ -6404,13 +6528,13 @@
"_name": "combined-shape-copy-2", "_name": "combined-shape-copy-2",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 132 "__id__": 135
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 134 "__id__": 137
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -6466,7 +6590,7 @@ ...@@ -6466,7 +6590,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 133 "__id__": 136
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -6498,7 +6622,7 @@ ...@@ -6498,7 +6622,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 132 "__id__": 135
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -6530,14 +6654,14 @@ ...@@ -6530,14 +6654,14 @@
"_name": "line3", "_name": "line3",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 122 "__id__": 125
}, },
"_children": [ "_children": [
{ {
"__id__": 137 "__id__": 140
}, },
{ {
"__id__": 139 "__id__": 142
} }
], ],
"_active": true, "_active": true,
...@@ -6595,13 +6719,13 @@ ...@@ -6595,13 +6719,13 @@
"_name": "line0", "_name": "line0",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 136 "__id__": 139
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 138 "__id__": 141
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -6657,7 +6781,7 @@ ...@@ -6657,7 +6781,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 137 "__id__": 140
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -6689,17 +6813,17 @@ ...@@ -6689,17 +6813,17 @@
"_name": "line1", "_name": "line1",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 136 "__id__": 139
}, },
"_children": [ "_children": [
{ {
"__id__": 140 "__id__": 143
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 142 "__id__": 145
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -6755,13 +6879,13 @@ ...@@ -6755,13 +6879,13 @@
"_name": "combined-shape-copy-2", "_name": "combined-shape-copy-2",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 139 "__id__": 142
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 141 "__id__": 144
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -6817,7 +6941,7 @@ ...@@ -6817,7 +6941,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 140 "__id__": 143
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -6849,7 +6973,7 @@ ...@@ -6849,7 +6973,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 139 "__id__": 142
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -6881,11 +7005,11 @@ ...@@ -6881,11 +7005,11 @@
"_name": "line4", "_name": "line4",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 122 "__id__": 125
}, },
"_children": [ "_children": [
{ {
"__id__": 144 "__id__": 147
} }
], ],
"_active": true, "_active": true,
...@@ -6943,13 +7067,13 @@ ...@@ -6943,13 +7067,13 @@
"_name": "line0", "_name": "line0",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 143 "__id__": 146
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 145 "__id__": 148
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -7005,7 +7129,7 @@ ...@@ -7005,7 +7129,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 144 "__id__": 147
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -7037,11 +7161,11 @@ ...@@ -7037,11 +7161,11 @@
"_name": "line5", "_name": "line5",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 122 "__id__": 125
}, },
"_children": [ "_children": [
{ {
"__id__": 147 "__id__": 150
} }
], ],
"_active": true, "_active": true,
...@@ -7099,13 +7223,13 @@ ...@@ -7099,13 +7223,13 @@
"_name": "line0", "_name": "line0",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 146 "__id__": 149
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 148 "__id__": 151
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -7161,7 +7285,7 @@ ...@@ -7161,7 +7285,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 147 "__id__": 150
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -7197,13 +7321,13 @@ ...@@ -7197,13 +7321,13 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 150 "__id__": 153
}, },
{ {
"__id__": 157 "__id__": 160
}, },
{ {
"__id__": 164 "__id__": 167
} }
], ],
"_active": false, "_active": false,
...@@ -7261,23 +7385,23 @@ ...@@ -7261,23 +7385,23 @@
"_name": "sub_0", "_name": "sub_0",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 149 "__id__": 152
}, },
"_children": [ "_children": [
{ {
"__id__": 151 "__id__": 154
}, },
{ {
"__id__": 153 "__id__": 156
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 155 "__id__": 158
}, },
{ {
"__id__": 156 "__id__": 159
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -7333,13 +7457,13 @@ ...@@ -7333,13 +7457,13 @@
"_name": "combined-shape_4", "_name": "combined-shape_4",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 150 "__id__": 153
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 152 "__id__": 155
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -7395,7 +7519,7 @@ ...@@ -7395,7 +7519,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 151 "__id__": 154
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -7427,13 +7551,13 @@ ...@@ -7427,13 +7551,13 @@
"_name": "txt", "_name": "txt",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 150 "__id__": 153
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 154 "__id__": 157
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -7489,7 +7613,7 @@ ...@@ -7489,7 +7613,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 153 "__id__": 156
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -7499,7 +7623,6 @@ ...@@ -7499,7 +7623,6 @@
], ],
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_useOriginalSize": true,
"_string": "animal1", "_string": "animal1",
"_N$string": "animal1", "_N$string": "animal1",
"_fontSize": 36, "_fontSize": 36,
...@@ -7525,7 +7648,7 @@ ...@@ -7525,7 +7648,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 150 "__id__": 153
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -7557,7 +7680,7 @@ ...@@ -7557,7 +7680,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 150 "__id__": 153
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -7618,7 +7741,7 @@ ...@@ -7618,7 +7741,7 @@
"hoverSprite": null, "hoverSprite": null,
"_N$disabledSprite": null, "_N$disabledSprite": null,
"_N$target": { "_N$target": {
"__id__": 150 "__id__": 153
}, },
"_id": "e9hETjbwFN6ofBSoo7woie" "_id": "e9hETjbwFN6ofBSoo7woie"
}, },
...@@ -7627,23 +7750,23 @@ ...@@ -7627,23 +7750,23 @@
"_name": "sub_1", "_name": "sub_1",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 149 "__id__": 152
}, },
"_children": [ "_children": [
{ {
"__id__": 158 "__id__": 161
}, },
{ {
"__id__": 160 "__id__": 163
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 162 "__id__": 165
}, },
{ {
"__id__": 163 "__id__": 166
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -7699,13 +7822,13 @@ ...@@ -7699,13 +7822,13 @@
"_name": "combined-shape_3", "_name": "combined-shape_3",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 157 "__id__": 160
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 159 "__id__": 162
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -7761,7 +7884,7 @@ ...@@ -7761,7 +7884,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 158 "__id__": 161
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -7793,13 +7916,13 @@ ...@@ -7793,13 +7916,13 @@
"_name": "txt", "_name": "txt",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 157 "__id__": 160
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 161 "__id__": 164
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -7855,7 +7978,7 @@ ...@@ -7855,7 +7978,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 160 "__id__": 163
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -7865,7 +7988,6 @@ ...@@ -7865,7 +7988,6 @@
], ],
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_useOriginalSize": true,
"_string": "plant", "_string": "plant",
"_N$string": "plant", "_N$string": "plant",
"_fontSize": 36, "_fontSize": 36,
...@@ -7891,7 +8013,7 @@ ...@@ -7891,7 +8013,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 157 "__id__": 160
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -7923,7 +8045,7 @@ ...@@ -7923,7 +8045,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 157 "__id__": 160
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -7984,7 +8106,7 @@ ...@@ -7984,7 +8106,7 @@
"hoverSprite": null, "hoverSprite": null,
"_N$disabledSprite": null, "_N$disabledSprite": null,
"_N$target": { "_N$target": {
"__id__": 157 "__id__": 160
}, },
"_id": "8cGgjvgvhL/LuPKRoVnVQq" "_id": "8cGgjvgvhL/LuPKRoVnVQq"
}, },
...@@ -7993,20 +8115,20 @@ ...@@ -7993,20 +8115,20 @@
"_name": "main", "_name": "main",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 149 "__id__": 152
}, },
"_children": [ "_children": [
{ {
"__id__": 165 "__id__": 168
}, },
{ {
"__id__": 167 "__id__": 170
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 169 "__id__": 172
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -8062,13 +8184,13 @@ ...@@ -8062,13 +8184,13 @@
"_name": "oval-18", "_name": "oval-18",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 164 "__id__": 167
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 166 "__id__": 169
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -8124,7 +8246,7 @@ ...@@ -8124,7 +8246,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 165 "__id__": 168
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -8156,13 +8278,13 @@ ...@@ -8156,13 +8278,13 @@
"_name": "txt", "_name": "txt",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 164 "__id__": 167
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 168 "__id__": 171
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -8218,7 +8340,7 @@ ...@@ -8218,7 +8340,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 167 "__id__": 170
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -8228,7 +8350,6 @@ ...@@ -8228,7 +8350,6 @@
], ],
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_useOriginalSize": true,
"_string": "food", "_string": "food",
"_N$string": "food", "_N$string": "food",
"_fontSize": 36, "_fontSize": 36,
...@@ -8254,7 +8375,7 @@ ...@@ -8254,7 +8375,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 164 "__id__": 167
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -8315,7 +8436,7 @@ ...@@ -8315,7 +8436,7 @@
"hoverSprite": null, "hoverSprite": null,
"_N$disabledSprite": null, "_N$disabledSprite": null,
"_N$target": { "_N$target": {
"__id__": 164 "__id__": 167
}, },
"_id": "f41Ic5OXhCRpAxS/kMIRiA" "_id": "f41Ic5OXhCRpAxS/kMIRiA"
}, },
...@@ -8330,7 +8451,7 @@ ...@@ -8330,7 +8451,7 @@
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 171 "__id__": 174
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -8386,7 +8507,7 @@ ...@@ -8386,7 +8507,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 170 "__id__": 173
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -8480,19 +8601,19 @@ ...@@ -8480,19 +8601,19 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 174 "__id__": 177
}, },
{ {
"__id__": 176 "__id__": 179
}, },
{ {
"__id__": 178 "__id__": 181
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 180 "__id__": 183
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -8548,13 +8669,13 @@ ...@@ -8548,13 +8669,13 @@
"_name": "bg_blue", "_name": "bg_blue",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 173 "__id__": 176
}, },
"_children": [], "_children": [],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 175 "__id__": 178
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -8610,7 +8731,7 @@ ...@@ -8610,7 +8731,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 174 "__id__": 177
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -8642,13 +8763,13 @@ ...@@ -8642,13 +8763,13 @@
"_name": "bg_green", "_name": "bg_green",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 173 "__id__": 176
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 177 "__id__": 180
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -8704,7 +8825,7 @@ ...@@ -8704,7 +8825,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 176 "__id__": 179
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -8736,13 +8857,13 @@ ...@@ -8736,13 +8857,13 @@
"_name": "txt", "_name": "txt",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 173 "__id__": 176
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 179 "__id__": 182
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -8798,7 +8919,7 @@ ...@@ -8798,7 +8919,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 178 "__id__": 181
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -8808,7 +8929,6 @@ ...@@ -8808,7 +8929,6 @@
], ],
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_useOriginalSize": true,
"_string": "Compare", "_string": "Compare",
"_N$string": "Compare", "_N$string": "Compare",
"_fontSize": 28, "_fontSize": 28,
...@@ -8834,7 +8954,7 @@ ...@@ -8834,7 +8954,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 173 "__id__": 176
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -8895,7 +9015,7 @@ ...@@ -8895,7 +9015,7 @@
"hoverSprite": null, "hoverSprite": null,
"_N$disabledSprite": null, "_N$disabledSprite": null,
"_N$target": { "_N$target": {
"__id__": 173 "__id__": 176
}, },
"_id": "176BYmeDpPZ68HlISEHa8t" "_id": "176BYmeDpPZ68HlISEHa8t"
}, },
...@@ -8966,28 +9086,28 @@ ...@@ -8966,28 +9086,28 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 183 "__id__": 186
}, },
{ {
"__id__": 185 "__id__": 188
}, },
{ {
"__id__": 187 "__id__": 190
}, },
{ {
"__id__": 189 "__id__": 192
}, },
{ {
"__id__": 191 "__id__": 194
}, },
{ {
"__id__": 195 "__id__": 198
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 201 "__id__": 204
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -9043,13 +9163,13 @@ ...@@ -9043,13 +9163,13 @@
"_name": "bg", "_name": "bg",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 182 "__id__": 185
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 184 "__id__": 187
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -9105,7 +9225,7 @@ ...@@ -9105,7 +9225,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 183 "__id__": 186
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -9137,13 +9257,13 @@ ...@@ -9137,13 +9257,13 @@
"_name": "chose", "_name": "chose",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 182 "__id__": 185
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 186 "__id__": 189
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -9199,7 +9319,7 @@ ...@@ -9199,7 +9319,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 185 "__id__": 188
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -9231,13 +9351,13 @@ ...@@ -9231,13 +9351,13 @@
"_name": "icon", "_name": "icon",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 182 "__id__": 185
}, },
"_children": [], "_children": [],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 188 "__id__": 191
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -9293,7 +9413,7 @@ ...@@ -9293,7 +9413,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 187 "__id__": 190
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -9325,13 +9445,13 @@ ...@@ -9325,13 +9445,13 @@
"_name": "txt", "_name": "txt",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 182 "__id__": 185
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 190 "__id__": 193
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -9387,7 +9507,7 @@ ...@@ -9387,7 +9507,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 189 "__id__": 192
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -9397,7 +9517,6 @@ ...@@ -9397,7 +9517,6 @@
], ],
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_useOriginalSize": true,
"_string": "test", "_string": "test",
"_N$string": "test", "_N$string": "test",
"_fontSize": 35, "_fontSize": 35,
...@@ -9423,17 +9542,17 @@ ...@@ -9423,17 +9542,17 @@
"_name": "fail", "_name": "fail",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 182 "__id__": 185
}, },
"_children": [ "_children": [
{ {
"__id__": 192 "__id__": 195
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 194 "__id__": 197
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -9489,13 +9608,13 @@ ...@@ -9489,13 +9608,13 @@
"_name": "txt", "_name": "txt",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 191 "__id__": 194
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 193 "__id__": 196
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -9551,7 +9670,7 @@ ...@@ -9551,7 +9670,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 192 "__id__": 195
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -9561,7 +9680,6 @@ ...@@ -9561,7 +9680,6 @@
], ],
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_useOriginalSize": true,
"_string": "rerg", "_string": "rerg",
"_N$string": "rerg", "_N$string": "rerg",
"_fontSize": 35, "_fontSize": 35,
...@@ -9587,7 +9705,7 @@ ...@@ -9587,7 +9705,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 191 "__id__": 194
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -9619,20 +9737,20 @@ ...@@ -9619,20 +9737,20 @@
"_name": "success", "_name": "success",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 182 "__id__": 185
}, },
"_children": [ "_children": [
{ {
"__id__": 196 "__id__": 199
}, },
{ {
"__id__": 198 "__id__": 201
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 200 "__id__": 203
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -9688,13 +9806,13 @@ ...@@ -9688,13 +9806,13 @@
"_name": "txt", "_name": "txt",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 195 "__id__": 198
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 197 "__id__": 200
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -9750,7 +9868,7 @@ ...@@ -9750,7 +9868,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 196 "__id__": 199
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -9760,7 +9878,6 @@ ...@@ -9760,7 +9878,6 @@
], ],
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_useOriginalSize": true,
"_string": "rerg", "_string": "rerg",
"_N$string": "rerg", "_N$string": "rerg",
"_fontSize": 30, "_fontSize": 30,
...@@ -9786,13 +9903,13 @@ ...@@ -9786,13 +9903,13 @@
"_name": "icon", "_name": "icon",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 195 "__id__": 198
}, },
"_children": [], "_children": [],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 199 "__id__": 202
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -9848,7 +9965,7 @@ ...@@ -9848,7 +9965,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 198 "__id__": 201
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -9880,7 +9997,7 @@ ...@@ -9880,7 +9997,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 195 "__id__": 198
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -9912,7 +10029,7 @@ ...@@ -9912,7 +10029,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 182 "__id__": 185
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -9973,7 +10090,7 @@ ...@@ -9973,7 +10090,7 @@
"hoverSprite": null, "hoverSprite": null,
"_N$disabledSprite": null, "_N$disabledSprite": null,
"_N$target": { "_N$target": {
"__id__": 182 "__id__": 185
}, },
"_id": "58IQ76yf1KT71BqZoNtHOV" "_id": "58IQ76yf1KT71BqZoNtHOV"
}, },
...@@ -9988,7 +10105,7 @@ ...@@ -9988,7 +10105,7 @@
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 203 "__id__": 206
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -10044,7 +10161,7 @@ ...@@ -10044,7 +10161,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 202 "__id__": 205
}, },
"_enabled": true, "_enabled": true,
"r_width": 0, "r_width": 0,
...@@ -10071,13 +10188,13 @@ ...@@ -10071,13 +10188,13 @@
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 205 "__id__": 208
}, },
{ {
"__id__": 206 "__id__": 209
}, },
{ {
"__id__": 207 "__id__": 210
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -10133,7 +10250,7 @@ ...@@ -10133,7 +10250,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 204 "__id__": 207
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -10165,7 +10282,7 @@ ...@@ -10165,7 +10282,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 204 "__id__": 207
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -10226,7 +10343,7 @@ ...@@ -10226,7 +10343,7 @@
"hoverSprite": null, "hoverSprite": null,
"_N$disabledSprite": null, "_N$disabledSprite": null,
"_N$target": { "_N$target": {
"__id__": 204 "__id__": 207
}, },
"_id": "86ErSTSUhP26kFUGhhqqPn" "_id": "86ErSTSUhP26kFUGhhqqPn"
}, },
...@@ -10235,7 +10352,7 @@ ...@@ -10235,7 +10352,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 204 "__id__": 207
}, },
"_enabled": true, "_enabled": true,
"r_width": 0, "r_width": 0,
...@@ -10262,10 +10379,10 @@ ...@@ -10262,10 +10379,10 @@
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 209 "__id__": 212
}, },
{ {
"__id__": 210 "__id__": 213
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -10321,7 +10438,7 @@ ...@@ -10321,7 +10438,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 208 "__id__": 211
}, },
"_enabled": true, "_enabled": true,
"_layoutSize": { "_layoutSize": {
...@@ -10353,7 +10470,7 @@ ...@@ -10353,7 +10470,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 208 "__id__": 211
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -10502,7 +10619,7 @@ ...@@ -10502,7 +10619,7 @@
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 214 "__id__": 217
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -10558,7 +10675,7 @@ ...@@ -10558,7 +10675,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 213 "__id__": 216
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -10602,13 +10719,13 @@ ...@@ -10602,13 +10719,13 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 216 "__id__": 219
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 220 "__id__": 223
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -10664,17 +10781,17 @@ ...@@ -10664,17 +10781,17 @@
"_name": "Star", "_name": "Star",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 215 "__id__": 218
}, },
"_children": [ "_children": [
{ {
"__id__": 217 "__id__": 220
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 219 "__id__": 222
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -10730,13 +10847,13 @@ ...@@ -10730,13 +10847,13 @@
"_name": "StarBig", "_name": "StarBig",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 216 "__id__": 219
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 218 "__id__": 221
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -10792,7 +10909,7 @@ ...@@ -10792,7 +10909,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 217 "__id__": 220
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -10824,7 +10941,7 @@ ...@@ -10824,7 +10941,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 216 "__id__": 219
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -10856,7 +10973,7 @@ ...@@ -10856,7 +10973,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 215 "__id__": 218
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -10892,22 +11009,22 @@ ...@@ -10892,22 +11009,22 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 222 "__id__": 225
}, },
{ {
"__id__": 224 "__id__": 227
}, },
{ {
"__id__": 226 "__id__": 229
}, },
{ {
"__id__": 228 "__id__": 231
}, },
{ {
"__id__": 230 "__id__": 233
}, },
{ {
"__id__": 232 "__id__": 235
} }
], ],
"_active": false, "_active": false,
...@@ -10965,13 +11082,13 @@ ...@@ -10965,13 +11082,13 @@
"_name": "bg_sahua", "_name": "bg_sahua",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 221 "__id__": 224
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 223 "__id__": 226
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -11027,7 +11144,7 @@ ...@@ -11027,7 +11144,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 222 "__id__": 225
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -11059,13 +11176,13 @@ ...@@ -11059,13 +11176,13 @@
"_name": "bg_sahua", "_name": "bg_sahua",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 221 "__id__": 224
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 225 "__id__": 228
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -11121,7 +11238,7 @@ ...@@ -11121,7 +11238,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 224 "__id__": 227
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -11153,13 +11270,13 @@ ...@@ -11153,13 +11270,13 @@
"_name": "bg_sahua", "_name": "bg_sahua",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 221 "__id__": 224
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 227 "__id__": 230
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -11215,7 +11332,7 @@ ...@@ -11215,7 +11332,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 226 "__id__": 229
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -11247,13 +11364,13 @@ ...@@ -11247,13 +11364,13 @@
"_name": "bg_sahua", "_name": "bg_sahua",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 221 "__id__": 224
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 229 "__id__": 232
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -11309,7 +11426,7 @@ ...@@ -11309,7 +11426,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 228 "__id__": 231
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -11341,13 +11458,13 @@ ...@@ -11341,13 +11458,13 @@
"_name": "bg_sahua", "_name": "bg_sahua",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 221 "__id__": 224
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 231 "__id__": 234
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -11403,7 +11520,7 @@ ...@@ -11403,7 +11520,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 230 "__id__": 233
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -11435,13 +11552,13 @@ ...@@ -11435,13 +11552,13 @@
"_name": "bg_sahua", "_name": "bg_sahua",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 221 "__id__": 224
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 233 "__id__": 236
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -11497,7 +11614,7 @@ ...@@ -11497,7 +11614,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 232 "__id__": 235
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -11533,19 +11650,19 @@ ...@@ -11533,19 +11650,19 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 235 "__id__": 238
}, },
{ {
"__id__": 240 "__id__": 243
}, },
{ {
"__id__": 245 "__id__": 248
}, },
{ {
"__id__": 250 "__id__": 253
}, },
{ {
"__id__": 255 "__id__": 258
} }
], ],
"_active": false, "_active": false,
...@@ -11603,11 +11720,11 @@ ...@@ -11603,11 +11720,11 @@
"_name": "quadBase", "_name": "quadBase",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 234 "__id__": 237
}, },
"_children": [ "_children": [
{ {
"__id__": 236 "__id__": 239
} }
], ],
"_active": true, "_active": true,
...@@ -11665,17 +11782,17 @@ ...@@ -11665,17 +11782,17 @@
"_name": "quad", "_name": "quad",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 235 "__id__": 238
}, },
"_children": [ "_children": [
{ {
"__id__": 237 "__id__": 240
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 239 "__id__": 242
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -11731,13 +11848,13 @@ ...@@ -11731,13 +11848,13 @@
"_name": "paper", "_name": "paper",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 236 "__id__": 239
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 238 "__id__": 241
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -11793,7 +11910,7 @@ ...@@ -11793,7 +11910,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 237 "__id__": 240
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -11825,7 +11942,7 @@ ...@@ -11825,7 +11942,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 236 "__id__": 239
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -11847,11 +11964,11 @@ ...@@ -11847,11 +11964,11 @@
"_name": "quadBase", "_name": "quadBase",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 234 "__id__": 237
}, },
"_children": [ "_children": [
{ {
"__id__": 241 "__id__": 244
} }
], ],
"_active": true, "_active": true,
...@@ -11909,17 +12026,17 @@ ...@@ -11909,17 +12026,17 @@
"_name": "quad", "_name": "quad",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 240 "__id__": 243
}, },
"_children": [ "_children": [
{ {
"__id__": 242 "__id__": 245
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 244 "__id__": 247
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -11975,13 +12092,13 @@ ...@@ -11975,13 +12092,13 @@
"_name": "paper", "_name": "paper",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 241 "__id__": 244
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 243 "__id__": 246
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -12037,7 +12154,7 @@ ...@@ -12037,7 +12154,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 242 "__id__": 245
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -12069,7 +12186,7 @@ ...@@ -12069,7 +12186,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 241 "__id__": 244
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -12091,11 +12208,11 @@ ...@@ -12091,11 +12208,11 @@
"_name": "quadBase", "_name": "quadBase",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 234 "__id__": 237
}, },
"_children": [ "_children": [
{ {
"__id__": 246 "__id__": 249
} }
], ],
"_active": true, "_active": true,
...@@ -12153,17 +12270,17 @@ ...@@ -12153,17 +12270,17 @@
"_name": "quad", "_name": "quad",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 245 "__id__": 248
}, },
"_children": [ "_children": [
{ {
"__id__": 247 "__id__": 250
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 249 "__id__": 252
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -12219,13 +12336,13 @@ ...@@ -12219,13 +12336,13 @@
"_name": "paper", "_name": "paper",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 246 "__id__": 249
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 248 "__id__": 251
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -12281,7 +12398,7 @@ ...@@ -12281,7 +12398,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 247 "__id__": 250
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -12313,7 +12430,7 @@ ...@@ -12313,7 +12430,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 246 "__id__": 249
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -12335,11 +12452,11 @@ ...@@ -12335,11 +12452,11 @@
"_name": "quadBase", "_name": "quadBase",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 234 "__id__": 237
}, },
"_children": [ "_children": [
{ {
"__id__": 251 "__id__": 254
} }
], ],
"_active": true, "_active": true,
...@@ -12397,17 +12514,17 @@ ...@@ -12397,17 +12514,17 @@
"_name": "quad", "_name": "quad",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 250 "__id__": 253
}, },
"_children": [ "_children": [
{ {
"__id__": 252 "__id__": 255
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 254 "__id__": 257
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -12463,13 +12580,13 @@ ...@@ -12463,13 +12580,13 @@
"_name": "paper", "_name": "paper",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 251 "__id__": 254
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 253 "__id__": 256
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -12525,7 +12642,7 @@ ...@@ -12525,7 +12642,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 252 "__id__": 255
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -12557,7 +12674,7 @@ ...@@ -12557,7 +12674,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 251 "__id__": 254
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -12579,11 +12696,11 @@ ...@@ -12579,11 +12696,11 @@
"_name": "quadBase", "_name": "quadBase",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 234 "__id__": 237
}, },
"_children": [ "_children": [
{ {
"__id__": 256 "__id__": 259
} }
], ],
"_active": true, "_active": true,
...@@ -12641,17 +12758,17 @@ ...@@ -12641,17 +12758,17 @@
"_name": "quad", "_name": "quad",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 255 "__id__": 258
}, },
"_children": [ "_children": [
{ {
"__id__": 257 "__id__": 260
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 259 "__id__": 262
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -12707,13 +12824,13 @@ ...@@ -12707,13 +12824,13 @@
"_name": "paper", "_name": "paper",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 256 "__id__": 259
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 258 "__id__": 261
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -12769,7 +12886,7 @@ ...@@ -12769,7 +12886,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 257 "__id__": 260
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -12801,7 +12918,7 @@ ...@@ -12801,7 +12918,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 256 "__id__": 259
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
......
{ {
"ver": "1.2.8", "ver": "1.2.9",
"uuid": "d0944338-a5a6-44e9-bd37-eb928c715bd4", "uuid": "d0944338-a5a6-44e9-bd37-eb928c715bd4",
"asyncLoadAssets": false, "asyncLoadAssets": false,
"autoReleaseAssets": true, "autoReleaseAssets": true,
......
...@@ -641,41 +641,81 @@ cc.Class({ ...@@ -641,41 +641,81 @@ cc.Class({
wordAni(item, content) { wordAni(item, content) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
item.active = true; if (this._stageData.isLast) {
let itemfirst = pg.view.find(item, "first"); item.active = true;
//动态居中算法。 let itemfirst = pg.view.find(item, "last");
//锚点在中间,左右延长,第一个字不去显示 //动态居中算法。
let contentArr = content.split(""); //锚点在中间,左右延长,第一个字不去显示
let s0 = contentArr.shift(); let contentArr = content.split("");
let s1 = contentArr.join(""); let s0 = contentArr.pop();
//首字母变大 let s1 = contentArr.join("");
let count = 80; //首字母变大
let max = 120; let count = 80;
let str1 = `<size=${max}><color=#ffffff>${s0}</color></size><size=${count}><color=#0000>${s1}</color></size>` let max = 120;
let strfirst1 = `<size=${max}><color=#fc4a4a>${s0}</color></size>`; let str1 = `<size=${count}><color=#0000>${s1}</color></size>` + `<size=${max}><color=#ffffff>${s0}</color></size>`
item.getComponent(cc.RichText).string = str1; let strfirst1 = `<size=${max}><color=#fc4a4a>${s0}</color></size>`;
itemfirst.y = 17; item.getComponent(cc.RichText).string = str1;
itemfirst.getComponent(cc.RichText).string = strfirst1; itemfirst.y = 17;
itemfirst.getComponent(cc.RichText).string = strfirst1;
this._timeoutIds.push(setTimeout(() => { this._timeoutIds.push(setTimeout(() => {
let times = 20; let times = 20;
let time = 0; let time = 0;
let inter = setInterval(() => { let inter = setInterval(() => {
time++; time++;
let nowCount = count + (max - count) * (time / times); let nowCount = count + (max - count) * (time / times);
if (nowCount >= 120) { if (nowCount >= 120) {
nowCount = 120; nowCount = 120;
clearInterval(inter); clearInterval(inter);
} }
let str2 = `<size=${max}><color=#ffffff>${s0}</color></size><size=${nowCount}><color=#0000>${s1}</color></size>` let str2 = `<size=${nowCount}><color=#0000>${s1}</color></size>` + `<size=${max}><color=#ffffff>${s0}</color></size>`
itemfirst.y = 0; itemfirst.y = 0;
item.getComponent(cc.RichText).string = str2; item.getComponent(cc.RichText).string = str2;
}, 30); }, 30);
this._intervalIds.push(inter); this._intervalIds.push(inter);
setTimeout(() => { setTimeout(() => {
resolve(''); resolve('');
}, 1200); }, 1200);
}, 4100)); }, 4100));
} else {
item.active = true;
let itemfirst = pg.view.find(item, "first");
//动态居中算法。
//锚点在中间,左右延长,第一个字不去显示
let contentArr = content.split("");
let s0 = contentArr.shift();
let s1 = contentArr.join("");
//首字母变大
let count = 80;
let max = 120;
let str1 = `<size=${max}><color=#ffffff>${s0}</color></size><size=${count}><color=#0000>${s1}</color></size>`
let strfirst1 = `<size=${max}><color=#fc4a4a>${s0}</color></size>`;
item.getComponent(cc.RichText).string = str1;
itemfirst.y = 17;
itemfirst.getComponent(cc.RichText).string = strfirst1;
this._timeoutIds.push(setTimeout(() => {
let times = 20;
let time = 0;
let inter = setInterval(() => {
time++;
let nowCount = count + (max - count) * (time / times);
if (nowCount >= 120) {
nowCount = 120;
clearInterval(inter);
}
let str2 = `<size=${max}><color=#ffffff>${s0}</color></size><size=${nowCount}><color=#0000>${s1}</color></size>`
itemfirst.y = 0;
item.getComponent(cc.RichText).string = str2;
}, 30);
this._intervalIds.push(inter);
setTimeout(() => {
resolve('');
}, 1200);
}, 4100));
}
}); });
}, },
......
...@@ -35,6 +35,7 @@ class GameManager { ...@@ -35,6 +35,7 @@ class GameManager {
obj.word = ar.title; obj.word = ar.title;
obj.sound = ar.wordAudio; obj.sound = ar.wordAudio;
obj.img = ar.bgImg; obj.img = ar.bgImg;
obj.isLast = ar.isLast || false;
obj.cartoonSke = ar.imgAni.ske.url; obj.cartoonSke = ar.imgAni.ske.url;
obj.cartoonTex = ar.imgAni.tex.url; obj.cartoonTex = ar.imgAni.tex.url;
obj.cartoonPng = ar.imgAni.png.url; obj.cartoonPng = ar.imgAni.png.url;
......
...@@ -13,11 +13,11 @@ export const defaultData = { ...@@ -13,11 +13,11 @@ export const defaultData = {
}, },
"list": [ "list": [
{ {
"title": "appleappl", "bgImg": "http://staging-teach.cdn.ireadabc.com/97e19da9309e4e5aafca5ea2e9db8f46.png", "wordAudio": "http://staging-teach.cdn.ireadabc.com/ab3538f7d4d57ac1abd740bd32f06b2d.mp3", "imgAni": { "ske": { "url": "http://staging-teach.cdn.ireadabc.com/c81816bbb714b22c57267ac5150ee1fe.json", "name": "apple_ske.json" }, "tex": { "url": "http://staging-teach.cdn.ireadabc.com/6088eec0273bc0488d5f66dfb63c1003.json", "name": "apple_tex.json" }, "png": { "url": "http://staging-teach.cdn.ireadabc.com/a51151d68bd74d430e2e586d86c6ddd3.png", "name": "apple_tex.png" } } "isLast": true, "title": "appleappl", "bgImg": "http://staging-teach.cdn.ireadabc.com/97e19da9309e4e5aafca5ea2e9db8f46.png", "wordAudio": "http://staging-teach.cdn.ireadabc.com/ab3538f7d4d57ac1abd740bd32f06b2d.mp3", "imgAni": { "ske": { "url": "http://staging-teach.cdn.ireadabc.com/c81816bbb714b22c57267ac5150ee1fe.json", "name": "apple_ske.json" }, "tex": { "url": "http://staging-teach.cdn.ireadabc.com/6088eec0273bc0488d5f66dfb63c1003.json", "name": "apple_tex.json" }, "png": { "url": "http://staging-teach.cdn.ireadabc.com/a51151d68bd74d430e2e586d86c6ddd3.png", "name": "apple_tex.png" } }
}, { }, {
"title": "ant", "bgImg": "http://staging-teach.cdn.ireadabc.com/0600790c4336c3839d90756aca5da45e.png", "wordAudio": "http://staging-teach.cdn.ireadabc.com/ab3538f7d4d57ac1abd740bd32f06b2d.mp3", "imgAni": { "ske": { "url": "http://staging-teach.cdn.ireadabc.com/dd4ede22a761f1f8ec261c93a5306f5c.json", "name": "ant_ske.json" }, "tex": { "url": "http://staging-teach.cdn.ireadabc.com/56078bcdcc7116843a56ecc4c23d3665.json", "name": "ant_tex.json" }, "png": { "url": "http://staging-teach.cdn.ireadabc.com/1a0c95cab05487b003a8dec9dd151ba4.png", "name": "ant_tex.png" } } "isLast": true, "title": "ant", "bgImg": "http://staging-teach.cdn.ireadabc.com/0600790c4336c3839d90756aca5da45e.png", "wordAudio": "http://staging-teach.cdn.ireadabc.com/ab3538f7d4d57ac1abd740bd32f06b2d.mp3", "imgAni": { "ske": { "url": "http://staging-teach.cdn.ireadabc.com/dd4ede22a761f1f8ec261c93a5306f5c.json", "name": "ant_ske.json" }, "tex": { "url": "http://staging-teach.cdn.ireadabc.com/56078bcdcc7116843a56ecc4c23d3665.json", "name": "ant_tex.json" }, "png": { "url": "http://staging-teach.cdn.ireadabc.com/1a0c95cab05487b003a8dec9dd151ba4.png", "name": "ant_tex.png" } }
}, { }, {
"title": "allaign", "bgImg": "http://staging-teach.cdn.ireadabc.com/97e19da9309e4e5aafca5ea2e9db8f46.png", "wordAudio": "http://staging-teach.cdn.ireadabc.com/ab3538f7d4d57ac1abd740bd32f06b2d.mp3", "imgAni": { "ske": { "url": "http://staging-teach.cdn.ireadabc.com/cf0fd816076652f64cc992c084248a80.json", "name": "alligator_ske.json" }, "tex": { "url": "http://staging-teach.cdn.ireadabc.com/5ece588b347d8fbe05eba19a40c985f0.json", "name": "alligator_tex.json" }, "png": { "url": "http://staging-teach.cdn.ireadabc.com/a84eff5545eca41f3e997ea8a53ac66f.png", "name": "alligator_tex.png" } } "isLast": true, "title": "allaign", "bgImg": "http://staging-teach.cdn.ireadabc.com/97e19da9309e4e5aafca5ea2e9db8f46.png", "wordAudio": "http://staging-teach.cdn.ireadabc.com/ab3538f7d4d57ac1abd740bd32f06b2d.mp3", "imgAni": { "ske": { "url": "http://staging-teach.cdn.ireadabc.com/cf0fd816076652f64cc992c084248a80.json", "name": "alligator_ske.json" }, "tex": { "url": "http://staging-teach.cdn.ireadabc.com/5ece588b347d8fbe05eba19a40c985f0.json", "name": "alligator_tex.json" }, "png": { "url": "http://staging-teach.cdn.ireadabc.com/a84eff5545eca41f3e997ea8a53ac66f.png", "name": "alligator_tex.png" } }
}] }]
} }
} }
......
...@@ -92,6 +92,7 @@ ...@@ -92,6 +92,7 @@
<input style="width: 80%; margin-bottom: 0.5vw" type="text" nz-input placeholder="" [(ngModel)]="item.title" <input style="width: 80%; margin-bottom: 0.5vw" type="text" nz-input placeholder="" [(ngModel)]="item.title"
(blur)="saveItem()"> (blur)="saveItem()">
<label nz-checkbox [(ngModel)]="item.isLast">尾字母变红</label>
<div> <div>
<app-upload-dragon-bone style="width: 100%" (save)="onDragonBoneSave($event,item)" <app-upload-dragon-bone style="width: 100%" (save)="onDragonBoneSave($event,item)"
......
...@@ -91,6 +91,7 @@ export class FormComponent implements OnInit, OnChanges, OnDestroy { ...@@ -91,6 +91,7 @@ export class FormComponent implements OnInit, OnChanges, OnDestroy {
} }
function Item() { function Item() {
this.isLast = false;
this.title = ""; this.title = "";
this.bgImg = ""; this.bgImg = "";
this.wordAudio = ""; this.wordAudio = "";
......
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