Commit c32115d9 authored by 张世斌's avatar 张世斌

1.修复bug

parent 9a5658eb
...@@ -17,10 +17,10 @@ ...@@ -17,10 +17,10 @@
"__id__": 2 "__id__": 2
}, },
{ {
"__id__": 163 "__id__": 165
}, },
{ {
"__id__": 199 "__id__": 201
} }
], ],
"_active": false, "_active": false,
...@@ -81,25 +81,25 @@ ...@@ -81,25 +81,25 @@
"__id__": 5 "__id__": 5
}, },
{ {
"__id__": 149 "__id__": 151
}, },
{ {
"__id__": 157 "__id__": 159
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 159 "__id__": 161
}, },
{ {
"__id__": 160 "__id__": 162
}, },
{ {
"__id__": 161 "__id__": 163
}, },
{ {
"__id__": 162 "__id__": 164
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -272,25 +272,25 @@ ...@@ -272,25 +272,25 @@
"__id__": 67 "__id__": 67
}, },
{ {
"__id__": 73 "__id__": 76
}, },
{ {
"__id__": 84 "__id__": 86
}, },
{ {
"__id__": 96 "__id__": 98
}, },
{ {
"__id__": 138 "__id__": 140
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 147 "__id__": 149
}, },
{ {
"__id__": 148 "__id__": 150
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3607,15 +3607,18 @@ ...@@ -3607,15 +3607,18 @@
"_children": [ "_children": [
{ {
"__id__": 68 "__id__": 68
},
{
"__id__": 71
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 71 "__id__": 74
}, },
{ {
"__id__": 72 "__id__": 75
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3788,6 +3791,128 @@ ...@@ -3788,6 +3791,128 @@
"_originalHeight": 0, "_originalHeight": 0,
"_id": "90EvF+rN5AHalyDyzIhte0" "_id": "90EvF+rN5AHalyDyzIhte0"
}, },
{
"__type__": "cc.Node",
"_name": "bg_img",
"_objFlags": 512,
"_parent": {
"__id__": 67
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 72
},
{
"__id__": 73
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 1407,
"height": 731
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
0,
-80,
0,
0,
0,
0,
1,
1.19,
1.19,
1.19
]
},
"_eulerAngles": {
"__type__": "cc.Vec3",
"x": 0,
"y": 0,
"z": 0
},
"_skewX": 0,
"_skewY": 0,
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "bc0WQq7JVI3Z03cj1OIsin"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 71
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": null,
"_type": 0,
"_sizeMode": 1,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "70fuUf8ypJYJHKGczdvzYb"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 71
},
"_enabled": true,
"alignMode": 1,
"_target": null,
"_alignFlags": 18,
"_left": 0,
"_right": 0,
"_top": 0,
"_bottom": 194.5,
"_verticalCenter": -80,
"_horizontalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 0,
"_originalHeight": 0,
"_id": "0chxCAWjRKf6KZSCkZjaMl"
},
{ {
"__type__": "cc.Sprite", "__type__": "cc.Sprite",
"_name": "", "_name": "",
...@@ -3856,13 +3981,13 @@ ...@@ -3856,13 +3981,13 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 74 "__id__": 77
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 83 "__id__": 85
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3918,23 +4043,23 @@ ...@@ -3918,23 +4043,23 @@
"_name": "paint", "_name": "paint",
"_objFlags": 512, "_objFlags": 512,
"_parent": { "_parent": {
"__id__": 73 "__id__": 76
}, },
"_children": [ "_children": [
{ {
"__id__": 75 "__id__": 78
}, },
{ {
"__id__": 78 "__id__": 80
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 81 "__id__": 83
}, },
{ {
"__id__": 82 "__id__": 84
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3990,16 +4115,13 @@ ...@@ -3990,16 +4115,13 @@
"_name": "alligator", "_name": "alligator",
"_objFlags": 512, "_objFlags": 512,
"_parent": { "_parent": {
"__id__": 74 "__id__": 77
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 76 "__id__": 79
},
{
"__id__": 77
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4055,7 +4177,7 @@ ...@@ -4055,7 +4177,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 75 "__id__": 78
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -4077,51 +4199,21 @@ ...@@ -4077,51 +4199,21 @@
"_originalHeight": 0, "_originalHeight": 0,
"_id": "7e4UiOhhxEhLc7kaVxienp" "_id": "7e4UiOhhxEhLc7kaVxienp"
}, },
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 75
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 1,
"_dstBlendFactor": 771,
"_spriteFrame": null,
"_type": 0,
"_sizeMode": 1,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "efDuRxyZRCM4jn9HpjoAHw"
},
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "bg_img", "_name": "bg_img",
"_objFlags": 512, "_objFlags": 512,
"_parent": { "_parent": {
"__id__": 74 "__id__": 77
}, },
"_children": [], "_children": [],
"_active": false, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 79 "__id__": 81
}, },
{ {
"__id__": 80 "__id__": 82
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4135,8 +4227,8 @@ ...@@ -4135,8 +4227,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 1407, "width": 1305,
"height": 731 "height": 635
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -4177,7 +4269,7 @@ ...@@ -4177,7 +4269,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 78 "__id__": 80
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4185,11 +4277,9 @@ ...@@ -4185,11 +4277,9 @@
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
} }
], ],
"_srcBlendFactor": 1, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": null,
"__uuid__": "96c0dd06-35f7-44c6-bcf9-85e895eb711e"
},
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
"_fillType": 0, "_fillType": 0,
...@@ -4209,7 +4299,7 @@ ...@@ -4209,7 +4299,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 78 "__id__": 80
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -4236,7 +4326,7 @@ ...@@ -4236,7 +4326,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 74 "__id__": 77
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4268,7 +4358,7 @@ ...@@ -4268,7 +4358,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 74 "__id__": 77
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -4295,7 +4385,7 @@ ...@@ -4295,7 +4385,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 73 "__id__": 76
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -4326,19 +4416,19 @@ ...@@ -4326,19 +4416,19 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 85 "__id__": 87
}, },
{ {
"__id__": 89 "__id__": 91
}, },
{ {
"__id__": 92 "__id__": 94
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 95 "__id__": 97
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4394,19 +4484,19 @@ ...@@ -4394,19 +4484,19 @@
"_name": "btn_submit", "_name": "btn_submit",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 84 "__id__": 86
}, },
"_children": [], "_children": [],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 86 "__id__": 88
}, },
{ {
"__id__": 87 "__id__": 89
}, },
{ {
"__id__": 88 "__id__": 90
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4462,7 +4552,7 @@ ...@@ -4462,7 +4552,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 85 "__id__": 87
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4494,7 +4584,7 @@ ...@@ -4494,7 +4584,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 85 "__id__": 87
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -4521,7 +4611,7 @@ ...@@ -4521,7 +4611,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 85 "__id__": 87
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -4589,16 +4679,16 @@ ...@@ -4589,16 +4679,16 @@
"_name": "coolcat", "_name": "coolcat",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 84 "__id__": 86
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 90 "__id__": 92
}, },
{ {
"__id__": 91 "__id__": 93
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4654,7 +4744,7 @@ ...@@ -4654,7 +4744,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 89 "__id__": 91
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4694,7 +4784,7 @@ ...@@ -4694,7 +4784,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 89 "__id__": 91
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -4721,16 +4811,16 @@ ...@@ -4721,16 +4811,16 @@
"_name": "BtnCoolCat", "_name": "BtnCoolCat",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 84 "__id__": 86
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 93 "__id__": 95
}, },
{ {
"__id__": 94 "__id__": 96
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4786,7 +4876,7 @@ ...@@ -4786,7 +4876,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 92 "__id__": 94
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -4813,7 +4903,7 @@ ...@@ -4813,7 +4903,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 92 "__id__": 94
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -4881,7 +4971,7 @@ ...@@ -4881,7 +4971,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 84 "__id__": 86
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -4912,13 +5002,13 @@ ...@@ -4912,13 +5002,13 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 97 "__id__": 99
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 137 "__id__": 139
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4974,23 +5064,23 @@ ...@@ -4974,23 +5064,23 @@
"_name": "paint", "_name": "paint",
"_objFlags": 512, "_objFlags": 512,
"_parent": { "_parent": {
"__id__": 96 "__id__": 98
}, },
"_children": [ "_children": [
{ {
"__id__": 98 "__id__": 100
}, },
{ {
"__id__": 132 "__id__": 134
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 135 "__id__": 137
}, },
{ {
"__id__": 136 "__id__": 138
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5046,38 +5136,38 @@ ...@@ -5046,38 +5136,38 @@
"_name": "alligator", "_name": "alligator",
"_objFlags": 512, "_objFlags": 512,
"_parent": { "_parent": {
"__id__": 97 "__id__": 99
}, },
"_children": [ "_children": [
{ {
"__id__": 99 "__id__": 101
}, },
{ {
"__id__": 103 "__id__": 105
}, },
{ {
"__id__": 107 "__id__": 109
}, },
{ {
"__id__": 111 "__id__": 113
}, },
{ {
"__id__": 115 "__id__": 117
}, },
{ {
"__id__": 119 "__id__": 121
}, },
{ {
"__id__": 123 "__id__": 125
}, },
{ {
"__id__": 127 "__id__": 129
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 131 "__id__": 133
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5133,17 +5223,17 @@ ...@@ -5133,17 +5223,17 @@
"_name": "t2", "_name": "t2",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 98 "__id__": 100
}, },
"_children": [ "_children": [
{ {
"__id__": 100 "__id__": 102
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 102 "__id__": 104
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5199,13 +5289,13 @@ ...@@ -5199,13 +5289,13 @@
"_name": "word", "_name": "word",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 99 "__id__": 101
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 101 "__id__": 103
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5261,7 +5351,7 @@ ...@@ -5261,7 +5351,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 100 "__id__": 102
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -5296,7 +5386,7 @@ ...@@ -5296,7 +5386,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 99 "__id__": 101
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -5328,17 +5418,17 @@ ...@@ -5328,17 +5418,17 @@
"_name": "t3", "_name": "t3",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 98 "__id__": 100
}, },
"_children": [ "_children": [
{ {
"__id__": 104 "__id__": 106
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 106 "__id__": 108
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5394,13 +5484,13 @@ ...@@ -5394,13 +5484,13 @@
"_name": "word", "_name": "word",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 103 "__id__": 105
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 105 "__id__": 107
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5456,7 +5546,7 @@ ...@@ -5456,7 +5546,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 104 "__id__": 106
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -5491,7 +5581,7 @@ ...@@ -5491,7 +5581,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 103 "__id__": 105
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -5523,17 +5613,17 @@ ...@@ -5523,17 +5613,17 @@
"_name": "t4", "_name": "t4",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 98 "__id__": 100
}, },
"_children": [ "_children": [
{ {
"__id__": 108 "__id__": 110
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 110 "__id__": 112
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5589,13 +5679,13 @@ ...@@ -5589,13 +5679,13 @@
"_name": "word", "_name": "word",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 107 "__id__": 109
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 109 "__id__": 111
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5651,7 +5741,7 @@ ...@@ -5651,7 +5741,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 108 "__id__": 110
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -5686,7 +5776,7 @@ ...@@ -5686,7 +5776,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 107 "__id__": 109
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -5718,17 +5808,17 @@ ...@@ -5718,17 +5808,17 @@
"_name": "t5", "_name": "t5",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 98 "__id__": 100
}, },
"_children": [ "_children": [
{ {
"__id__": 112 "__id__": 114
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 114 "__id__": 116
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5784,13 +5874,13 @@ ...@@ -5784,13 +5874,13 @@
"_name": "word", "_name": "word",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 111 "__id__": 113
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 113 "__id__": 115
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5846,7 +5936,7 @@ ...@@ -5846,7 +5936,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 112 "__id__": 114
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -5881,7 +5971,7 @@ ...@@ -5881,7 +5971,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 111 "__id__": 113
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -5913,17 +6003,17 @@ ...@@ -5913,17 +6003,17 @@
"_name": "t6", "_name": "t6",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 98 "__id__": 100
}, },
"_children": [ "_children": [
{ {
"__id__": 116 "__id__": 118
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 118 "__id__": 120
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5979,13 +6069,13 @@ ...@@ -5979,13 +6069,13 @@
"_name": "word", "_name": "word",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 115 "__id__": 117
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 117 "__id__": 119
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -6041,7 +6131,7 @@ ...@@ -6041,7 +6131,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 116 "__id__": 118
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -6076,7 +6166,7 @@ ...@@ -6076,7 +6166,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 115 "__id__": 117
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -6108,17 +6198,17 @@ ...@@ -6108,17 +6198,17 @@
"_name": "t7", "_name": "t7",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 98 "__id__": 100
}, },
"_children": [ "_children": [
{ {
"__id__": 120 "__id__": 122
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 122 "__id__": 124
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -6174,13 +6264,13 @@ ...@@ -6174,13 +6264,13 @@
"_name": "word", "_name": "word",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 119 "__id__": 121
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 121 "__id__": 123
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -6236,7 +6326,7 @@ ...@@ -6236,7 +6326,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 120 "__id__": 122
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -6271,7 +6361,7 @@ ...@@ -6271,7 +6361,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 119 "__id__": 121
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -6303,17 +6393,17 @@ ...@@ -6303,17 +6393,17 @@
"_name": "t8", "_name": "t8",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 98 "__id__": 100
}, },
"_children": [ "_children": [
{ {
"__id__": 124 "__id__": 126
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 126 "__id__": 128
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -6369,13 +6459,13 @@ ...@@ -6369,13 +6459,13 @@
"_name": "word", "_name": "word",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 123 "__id__": 125
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 125 "__id__": 127
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -6431,7 +6521,7 @@ ...@@ -6431,7 +6521,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 124 "__id__": 126
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -6466,7 +6556,7 @@ ...@@ -6466,7 +6556,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 123 "__id__": 125
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -6498,17 +6588,17 @@ ...@@ -6498,17 +6588,17 @@
"_name": "t9", "_name": "t9",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 98 "__id__": 100
}, },
"_children": [ "_children": [
{ {
"__id__": 128 "__id__": 130
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 130 "__id__": 132
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -6564,13 +6654,13 @@ ...@@ -6564,13 +6654,13 @@
"_name": "word", "_name": "word",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 127 "__id__": 129
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 129 "__id__": 131
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -6626,7 +6716,7 @@ ...@@ -6626,7 +6716,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 128 "__id__": 130
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -6661,7 +6751,7 @@ ...@@ -6661,7 +6751,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 127 "__id__": 129
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -6693,7 +6783,7 @@ ...@@ -6693,7 +6783,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 98 "__id__": 100
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -6720,16 +6810,16 @@ ...@@ -6720,16 +6810,16 @@
"_name": "alligator_img", "_name": "alligator_img",
"_objFlags": 512, "_objFlags": 512,
"_parent": { "_parent": {
"__id__": 97 "__id__": 99
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 133 "__id__": 135
}, },
{ {
"__id__": 134 "__id__": 136
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -6785,7 +6875,7 @@ ...@@ -6785,7 +6875,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 132 "__id__": 134
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -6817,7 +6907,7 @@ ...@@ -6817,7 +6907,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 132 "__id__": 134
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -6844,7 +6934,7 @@ ...@@ -6844,7 +6934,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 97 "__id__": 99
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -6874,7 +6964,7 @@ ...@@ -6874,7 +6964,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 97 "__id__": 99
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -6901,7 +6991,7 @@ ...@@ -6901,7 +6991,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 96 "__id__": 98
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -6931,23 +7021,23 @@ ...@@ -6931,23 +7021,23 @@
"__id__": 5 "__id__": 5
}, },
"_children": [ "_children": [
{
"__id__": 139
},
{ {
"__id__": 141 "__id__": 141
}, },
{ {
"__id__": 143 "__id__": 143
},
{
"__id__": 145
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 145 "__id__": 147
}, },
{ {
"__id__": 146 "__id__": 148
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -7003,13 +7093,13 @@ ...@@ -7003,13 +7093,13 @@
"_name": "bg_circle2", "_name": "bg_circle2",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 138 "__id__": 140
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 140 "__id__": 142
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -7065,7 +7155,7 @@ ...@@ -7065,7 +7155,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 139 "__id__": 141
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -7097,13 +7187,13 @@ ...@@ -7097,13 +7187,13 @@
"_name": "bg_circle", "_name": "bg_circle",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 138 "__id__": 140
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 142 "__id__": 144
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -7159,7 +7249,7 @@ ...@@ -7159,7 +7249,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 141 "__id__": 143
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -7191,13 +7281,13 @@ ...@@ -7191,13 +7281,13 @@
"_name": "btn_replay", "_name": "btn_replay",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 138 "__id__": 140
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 144 "__id__": 146
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -7253,7 +7343,7 @@ ...@@ -7253,7 +7343,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 143 "__id__": 145
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -7285,7 +7375,7 @@ ...@@ -7285,7 +7375,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 138 "__id__": 140
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -7317,7 +7407,7 @@ ...@@ -7317,7 +7407,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 138 "__id__": 140
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -7448,19 +7538,19 @@ ...@@ -7448,19 +7538,19 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 150 "__id__": 152
}, },
{ {
"__id__": 153 "__id__": 155
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 155 "__id__": 157
}, },
{ {
"__id__": 156 "__id__": 158
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -7516,16 +7606,16 @@ ...@@ -7516,16 +7606,16 @@
"_name": "start_bg", "_name": "start_bg",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 149 "__id__": 151
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 151 "__id__": 153
}, },
{ {
"__id__": 152 "__id__": 154
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -7581,7 +7671,7 @@ ...@@ -7581,7 +7671,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 150 "__id__": 152
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -7613,7 +7703,7 @@ ...@@ -7613,7 +7703,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 150 "__id__": 152
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -7640,13 +7730,13 @@ ...@@ -7640,13 +7730,13 @@
"_name": "start", "_name": "start",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 149 "__id__": 151
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 154 "__id__": 156
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -7702,7 +7792,7 @@ ...@@ -7702,7 +7792,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 153 "__id__": 155
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -7734,7 +7824,7 @@ ...@@ -7734,7 +7824,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 149 "__id__": 151
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -7795,7 +7885,7 @@ ...@@ -7795,7 +7885,7 @@
"hoverSprite": null, "hoverSprite": null,
"_N$disabledSprite": null, "_N$disabledSprite": null,
"_N$target": { "_N$target": {
"__id__": 149 "__id__": 151
}, },
"_id": "dcCiAjNMREj6CcPYJOxYXZ" "_id": "dcCiAjNMREj6CcPYJOxYXZ"
}, },
...@@ -7804,7 +7894,7 @@ ...@@ -7804,7 +7894,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 149 "__id__": 151
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -7837,7 +7927,7 @@ ...@@ -7837,7 +7927,7 @@
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 158 "__id__": 160
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -7893,7 +7983,7 @@ ...@@ -7893,7 +7983,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 157 "__id__": 159
}, },
"_enabled": true, "_enabled": true,
"_cullingMask": 2, "_cullingMask": 2,
...@@ -7977,7 +8067,7 @@ ...@@ -7977,7 +8067,7 @@
}, },
"_enabled": false, "_enabled": false,
"paint": { "paint": {
"__id__": 74 "__id__": 77
}, },
"paint2": { "paint2": {
"__id__": 67 "__id__": 67
...@@ -7989,10 +8079,10 @@ ...@@ -7989,10 +8079,10 @@
"__id__": 15 "__id__": 15
}, },
"coolcat": { "coolcat": {
"__id__": 89 "__id__": 91
}, },
"btn_submit": { "btn_submit": {
"__id__": 88 "__id__": 90
}, },
"btn_next": { "btn_next": {
"__id__": 13 "__id__": 13
...@@ -8068,13 +8158,13 @@ ...@@ -8068,13 +8158,13 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 164 "__id__": 166
}, },
{ {
"__id__": 177 "__id__": 179
}, },
{ {
"__id__": 196 "__id__": 198
} }
], ],
"_active": true, "_active": true,
...@@ -8132,12 +8222,9 @@ ...@@ -8132,12 +8222,9 @@
"_name": "img", "_name": "img",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 163 "__id__": 165
}, },
"_children": [ "_children": [
{
"__id__": 165
},
{ {
"__id__": 167 "__id__": 167
}, },
...@@ -8152,6 +8239,9 @@ ...@@ -8152,6 +8239,9 @@
}, },
{ {
"__id__": 175 "__id__": 175
},
{
"__id__": 177
} }
], ],
"_active": false, "_active": false,
...@@ -8209,13 +8299,13 @@ ...@@ -8209,13 +8299,13 @@
"_name": "time_strip", "_name": "time_strip",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 164 "__id__": 166
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 166 "__id__": 168
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -8271,7 +8361,7 @@ ...@@ -8271,7 +8361,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 165 "__id__": 167
}, },
"_enabled": true, "_enabled": true,
"_materials": [], "_materials": [],
...@@ -8297,13 +8387,13 @@ ...@@ -8297,13 +8387,13 @@
"_name": "time_strip_bg", "_name": "time_strip_bg",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 164 "__id__": 166
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 168 "__id__": 170
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -8359,7 +8449,7 @@ ...@@ -8359,7 +8449,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 167 "__id__": 169
}, },
"_enabled": true, "_enabled": true,
"_materials": [], "_materials": [],
...@@ -8385,13 +8475,13 @@ ...@@ -8385,13 +8475,13 @@
"_name": "online_bg", "_name": "online_bg",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 164 "__id__": 166
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 170 "__id__": 172
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -8447,7 +8537,7 @@ ...@@ -8447,7 +8537,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 169 "__id__": 171
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -8477,13 +8567,13 @@ ...@@ -8477,13 +8567,13 @@
"_name": "smiling_face", "_name": "smiling_face",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 164 "__id__": 166
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 172 "__id__": 174
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -8539,7 +8629,7 @@ ...@@ -8539,7 +8629,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 171 "__id__": 173
}, },
"_enabled": true, "_enabled": true,
"_materials": [], "_materials": [],
...@@ -8565,13 +8655,13 @@ ...@@ -8565,13 +8655,13 @@
"_name": "star", "_name": "star",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 164 "__id__": 166
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 174 "__id__": 176
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -8627,7 +8717,7 @@ ...@@ -8627,7 +8717,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 173 "__id__": 175
}, },
"_enabled": true, "_enabled": true,
"_materials": [], "_materials": [],
...@@ -8653,13 +8743,13 @@ ...@@ -8653,13 +8743,13 @@
"_name": "me", "_name": "me",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 164 "__id__": 166
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 176 "__id__": 178
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -8715,7 +8805,7 @@ ...@@ -8715,7 +8805,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 175 "__id__": 177
}, },
"_enabled": true, "_enabled": true,
"_materials": [], "_materials": [],
...@@ -8741,12 +8831,9 @@ ...@@ -8741,12 +8831,9 @@
"_name": "audio", "_name": "audio",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 163 "__id__": 165
}, },
"_children": [ "_children": [
{
"__id__": 178
},
{ {
"__id__": 180 "__id__": 180
}, },
...@@ -8770,6 +8857,9 @@ ...@@ -8770,6 +8857,9 @@
}, },
{ {
"__id__": 194 "__id__": 194
},
{
"__id__": 196
} }
], ],
"_active": true, "_active": true,
...@@ -8827,13 +8917,13 @@ ...@@ -8827,13 +8917,13 @@
"_name": "button", "_name": "button",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 177 "__id__": 179
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 179 "__id__": 181
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -8889,7 +8979,7 @@ ...@@ -8889,7 +8979,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 178 "__id__": 180
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
...@@ -8908,13 +8998,13 @@ ...@@ -8908,13 +8998,13 @@
"_name": "finish", "_name": "finish",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 177 "__id__": 179
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 181 "__id__": 183
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -8970,7 +9060,7 @@ ...@@ -8970,7 +9060,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 180 "__id__": 182
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
...@@ -8989,13 +9079,13 @@ ...@@ -8989,13 +9079,13 @@
"_name": "click", "_name": "click",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 177 "__id__": 179
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 183 "__id__": 185
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -9051,7 +9141,7 @@ ...@@ -9051,7 +9141,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 182 "__id__": 184
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
...@@ -9070,13 +9160,13 @@ ...@@ -9070,13 +9160,13 @@
"_name": "correct", "_name": "correct",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 177 "__id__": 179
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 185 "__id__": 187
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -9132,7 +9222,7 @@ ...@@ -9132,7 +9222,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 184 "__id__": 186
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
...@@ -9151,13 +9241,13 @@ ...@@ -9151,13 +9241,13 @@
"_name": "incorrect", "_name": "incorrect",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 177 "__id__": 179
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 187 "__id__": 189
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -9213,7 +9303,7 @@ ...@@ -9213,7 +9303,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 186 "__id__": 188
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
...@@ -9232,13 +9322,13 @@ ...@@ -9232,13 +9322,13 @@
"_name": "lack", "_name": "lack",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 177 "__id__": 179
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 189 "__id__": 191
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -9294,7 +9384,7 @@ ...@@ -9294,7 +9384,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 188 "__id__": 190
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
...@@ -9313,13 +9403,13 @@ ...@@ -9313,13 +9403,13 @@
"_name": "painted", "_name": "painted",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 177 "__id__": 179
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 191 "__id__": 193
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -9375,7 +9465,7 @@ ...@@ -9375,7 +9465,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 190 "__id__": 192
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
...@@ -9394,13 +9484,13 @@ ...@@ -9394,13 +9484,13 @@
"_name": "demo", "_name": "demo",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 177 "__id__": 179
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 193 "__id__": 195
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -9456,7 +9546,7 @@ ...@@ -9456,7 +9546,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 192 "__id__": 194
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
...@@ -9475,13 +9565,13 @@ ...@@ -9475,13 +9565,13 @@
"_name": "star", "_name": "star",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 177 "__id__": 179
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 195 "__id__": 197
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -9537,7 +9627,7 @@ ...@@ -9537,7 +9627,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 194 "__id__": 196
}, },
"_enabled": true, "_enabled": true,
"_clip": null, "_clip": null,
...@@ -9554,11 +9644,11 @@ ...@@ -9554,11 +9644,11 @@
"_name": "font", "_name": "font",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 163 "__id__": 165
}, },
"_children": [ "_children": [
{ {
"__id__": 197 "__id__": 199
} }
], ],
"_active": false, "_active": false,
...@@ -9616,13 +9706,13 @@ ...@@ -9616,13 +9706,13 @@
"_name": "MMTextBook-Bold", "_name": "MMTextBook-Bold",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 196 "__id__": 198
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 198 "__id__": 200
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -9678,7 +9768,7 @@ ...@@ -9678,7 +9768,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 197 "__id__": 199
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -9717,7 +9807,7 @@ ...@@ -9717,7 +9807,7 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 200 "__id__": 202
} }
], ],
"_active": false, "_active": false,
...@@ -9775,17 +9865,17 @@ ...@@ -9775,17 +9865,17 @@
"_name": "Ff", "_name": "Ff",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 199 "__id__": 201
}, },
"_children": [ "_children": [
{ {
"__id__": 201 "__id__": 203
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 203 "__id__": 205
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -9841,13 +9931,13 @@ ...@@ -9841,13 +9931,13 @@
"_name": "New Label", "_name": "New Label",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 200 "__id__": 202
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 202 "__id__": 204
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -9903,7 +9993,7 @@ ...@@ -9903,7 +9993,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 201 "__id__": 203
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -9938,7 +10028,7 @@ ...@@ -9938,7 +10028,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 200 "__id__": 202
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
......
...@@ -38,19 +38,19 @@ export default class MenuController extends Controller{ ...@@ -38,19 +38,19 @@ export default class MenuController extends Controller{
await this.view.updateData(this.model); await this.view.updateData(this.model);
this.view.open(); this.view.open();
let gameData=this.model.getItem(this.stageIdx); // let gameData=this.model.getItem(this.stageIdx);
let words=gameData.words.split(""); // let words=gameData.words.split("");
let answers=gameData.answers.split(""); // let answers=gameData.answers.split("");
let itemAudio=gameData.audio_url; // let itemAudio=gameData.audio_url;
this.answers=new Array(); this.answers=new Array();
cc.log(words); // cc.log(words);
cc.log(answers); // cc.log(answers);
let colorBlocks=this.view.colorItems1; let colorBlocks=this.view.colorItems1;
for(let i=0;i<colorBlocks.length;i++){ for(let i=0;i<colorBlocks.length;i++){
cc.log(colorBlocks[i].name); cc.log(colorBlocks[i].name);
let word=colorBlocks[i].getComponentInChildren(cc.Label); // let word=colorBlocks[i].getComponentInChildren(cc.Label);
word.string=words[i]; // word.string=words[i];
colorBlocks[i].color=cc.Color.WHITE; colorBlocks[i].color=cc.Color.WHITE;
// colorBlocks[i].getComponent(cc.Sprite).trim=true; // colorBlocks[i].getComponent(cc.Sprite).trim=true;
colorBlocks[i].on(cc.Node.EventType.TOUCH_START,()=>{ colorBlocks[i].on(cc.Node.EventType.TOUCH_START,()=>{
...@@ -62,30 +62,46 @@ export default class MenuController extends Controller{ ...@@ -62,30 +62,46 @@ export default class MenuController extends Controller{
{ {
return; return;
} }
// this.onClickBlock(i,answers);
let result=answers.findIndex((item)=>{ this.answers.push(i.toString());
return item==i.toString(); let color=new cc.Color();
}); color.fromHEX(this.colorCur);
cc.log("i:"+i+",result:"+result) colorBlocks[i].color=color;
if(result==-1){ // cc.Color.fromHEX(colorBlocks[i].color,+"#"+this.colorCur);
this.onWrong(); this.onRight();
}
else{ // let flag=0;
this.answers[result]=i.toString(); // for(let i=0;i<this.answers.length;i++){
let color=new cc.Color(); // if(this.answers[i]==answers[i]){
color.fromHEX(this.colorCur); // flag++;
colorBlocks[i].color=color; // }
// cc.Color.fromHEX(colorBlocks[i].color,+"#"+this.colorCur); // }
this.onRight(); (this.answers.length>=colorBlocks.length)&&this.finish();
let flag=0; // // this.onClickBlock(i,answers);
for(let i=0;i<this.answers.length;i++){ // let result=answers.findIndex((item)=>{
if(this.answers[i]==answers[i]){ // return item==i.toString();
flag++; // });
} // cc.log("i:"+i+",result:"+result)
} // if(result==-1){
(flag>=answers.length)&&this.finish(); // this.onWrong();
} // }
// else{
// this.answers[result]=i.toString();
// let color=new cc.Color();
// color.fromHEX(this.colorCur);
// colorBlocks[i].color=color;
// // cc.Color.fromHEX(colorBlocks[i].color,+"#"+this.colorCur);
// this.onRight();
// let flag=0;
// for(let i=0;i<this.answers.length;i++){
// if(this.answers[i]==answers[i]){
// flag++;
// }
// }
// (flag>=answers.length)&&this.finish();
// }
}); });
colorBlocks[i]._hitTest=this._hitTest.bind(this); colorBlocks[i]._hitTest=this._hitTest.bind(this);
} }
...@@ -119,10 +135,10 @@ export default class MenuController extends Controller{ ...@@ -119,10 +135,10 @@ export default class MenuController extends Controller{
} }
private enter(){ private enter(){
let gameData=this.model.getItem(this.stageIdx); // let gameData=this.model.getItem(this.stageIdx);
let itemAudio=gameData.audio_url; // let itemAudio=gameData.audio_url;
AppFacade.getMgr(SoundMgr).playEffectByUrl(itemAudio); // AppFacade.getMgr(SoundMgr).playEffectByUrl(itemAudio);
// AppFacade.getMgr(SoundMgr).playEffectByUrl(this.model.getStartAudio()); AppFacade.getMgr(SoundMgr).playEffectByUrl(this.model.getStartAudio());
this.playDragonBoneAnimation(this.catAni,"begin",1,()=>{ this.playDragonBoneAnimation(this.catAni,"begin",1,()=>{
this.playDragonBoneAnimation(this.catAni,"normal",-1); this.playDragonBoneAnimation(this.catAni,"normal",-1);
}); });
...@@ -160,9 +176,9 @@ export default class MenuController extends Controller{ ...@@ -160,9 +176,9 @@ export default class MenuController extends Controller{
{ {
item.color=cc.Color.WHITE item.color=cc.Color.WHITE
} }
let w=item.getComponentInChildren(cc.Label); // let w=item.getComponentInChildren(cc.Label);
w.string=word.string; // w.string=word.string;
w.node.color=cc.Color.BLACK; // w.node.color=cc.Color.BLACK;
} }
} }
......
...@@ -50,13 +50,13 @@ export default class MenuModel extends Model{ ...@@ -50,13 +50,13 @@ export default class MenuModel extends Model{
return this.data; return this.data;
} }
public getItems(){ // public getItems(){
return this.data.items; // return this.data.items;
} // }
public getItem(idx:number){ // public getItem(idx:number){
return this.data.items[idx]; // return this.data.items[idx];
} // }
public getStartAudio(){ public getStartAudio(){
return this.data.startAudio; return this.data.startAudio;
......
...@@ -66,8 +66,8 @@ export default class MenuView extends UIFullView{ ...@@ -66,8 +66,8 @@ export default class MenuView extends UIFullView{
protected async onUpdateData(model:MenuModel){ protected async onUpdateData(model:MenuModel){
let images:{img:string}[]=model.getImages(); let images:{img:string}[]=model.getImages();
let bg1=this.getChildComp("main_area/paint/alligator",cc.Sprite); let bg1=this.getChildComp("main_area/paint/bg_img",cc.Sprite);
let bg2=this.getChildComp("paint2/alligator",cc.Sprite); let bg2=this.getChildComp("paint2/bg_img",cc.Sprite);
bg1.spriteFrame=await UIUtil.getSpriteByUrl(model.getBG()); bg1.spriteFrame=await UIUtil.getSpriteByUrl(model.getBG());
bg2.spriteFrame=await UIUtil.getSpriteByUrl(model.getBG()); bg2.spriteFrame=await UIUtil.getSpriteByUrl(model.getBG());
...@@ -78,9 +78,9 @@ export default class MenuView extends UIFullView{ ...@@ -78,9 +78,9 @@ export default class MenuView extends UIFullView{
this.colorItems2 = new Array(); this.colorItems2 = new Array();
let colorArea2=this.paint2; let colorArea2=this.paint2;
let gameData=model.getItem(model.stageIdx); // let gameData=model.getItem(model.stageIdx);
let words=gameData.words.split(""); // let words=gameData.words.split("");
let pos=gameData.pos; // let pos=gameData.pos;
for (let i = 0; i < images.length; i++) { for (let i = 0; i < images.length; i++) {
let spriteFrame = await UIUtil.getSpriteByUrl({url:images[i].img}) let spriteFrame = await UIUtil.getSpriteByUrl({url:images[i].img})
...@@ -89,32 +89,30 @@ export default class MenuView extends UIFullView{ ...@@ -89,32 +89,30 @@ export default class MenuView extends UIFullView{
item1.group="camera"; item1.group="camera";
let sprite1:cc.Sprite=this.addCCComp(item1,cc.Sprite); let sprite1:cc.Sprite=this.addCCComp(item1,cc.Sprite);
sprite1.spriteFrame=spriteFrame; sprite1.spriteFrame=spriteFrame;
let wordNode1=GameUtil.createNode("word",item1); // let wordNode1=GameUtil.createNode("word",item1);
wordNode1.x= pos[i][0]; // wordNode1.x= pos[i][0];
wordNode1.y=pos[i][1]; // wordNode1.y=pos[i][1];
wordNode1.color=cc.Color.BLACK; // wordNode1.color=cc.Color.BLACK;
let label1:cc.Label=this.addCCComp(wordNode1,cc.Label); // let label1:cc.Label=this.addCCComp(wordNode1,cc.Label);
label1.string=words[i]; // label1.string=words[i];
label1.font=model.getFont(); // label1.font=model.getFont();
label1.fontSize=80; // label1.fontSize=80;
label1.lineHeight=80; // label1.lineHeight=80;
this.colorItems1[i] = sprite1.node; this.colorItems1[i] = sprite1.node;
let item2=GameUtil.createNode("img"+1,colorArea2); let item2=GameUtil.createNode("img"+1,colorArea2);
item2.group="camera" item2.group="camera"
let sprite2:cc.Sprite=this.addCCComp(item2,cc.Sprite); let sprite2:cc.Sprite=this.addCCComp(item2,cc.Sprite);
sprite2.spriteFrame=spriteFrame; sprite2.spriteFrame=spriteFrame;
let wordNode2=GameUtil.createNode("word",item2); // let wordNode2=GameUtil.createNode("word",item2);
wordNode2.anchorX=0; // wordNode2.x=pos[i][0];
// wordNode2.y=pos[i][1];
wordNode2.x=pos[i][0]; // wordNode2.color=cc.Color.BLACK;
wordNode2.y=pos[i][1]; // let label2:cc.Label=this.addCCComp(wordNode2,cc.Label);
wordNode2.color=cc.Color.BLACK; // label2.string=words[i];
let label2:cc.Label=this.addCCComp(wordNode2,cc.Label); // label2.font=model.getFont();
label2.string=words[i]; // label2.fontSize=80;
label2.font=model.getFont(); // label2.lineHeight=80;
label2.fontSize=80;
label2.lineHeight=80;
this.colorItems2[i] = sprite2.node; this.colorItems2[i] = sprite2.node;
} }
} }
......
export const defaultData = export const defaultData =
{ {
"items": [ // "items": [
{ // {
"words": "FdFFf", // "words": "FdFFf",
"answers": "0234", // "answers": "01234",
"audio_url": "http://staging-teach.cdn.ireadabc.com/18bf8207ddea222c9b82c68f2549dadc.mp3", // "audio_url": "http://staging-teach.cdn.ireadabc.com/18bf8207ddea222c9b82c68f2549dadc.mp3",
"pos":[ // "pos":[
[-425.989,-6.456], // [-425.989,-6.456],
[-37.043,195.708], // [-37.043,195.708],
[151.487,-129.498], // [151.487,-129.498],
[570.348,200], // [570.348,200],
[617.5,43.247] // [617.5,43.247]
] // ]
}, // },
{ // {
"words": "aAcBaCbA", // "words": "aAcBaCbA",
"answers": "0147", // "answers": "0147",
"audio_url": "http://staging-teach.cdn.ireadabc.com/18bf8207ddea222c9b82c68f2549dadc.mp3" // "audio_url": "http://staging-teach.cdn.ireadabc.com/18bf8207ddea222c9b82c68f2549dadc.mp3"
}, // },
], // ],
"startAudio": "http://staging-teach.cdn.ireadabc.com/18bf8207ddea222c9b82c68f2549dadc.mp3", "startAudio": "http://staging-teach.cdn.ireadabc.com/18bf8207ddea222c9b82c68f2549dadc.mp3",
"waitAudio": "http://staging-teach.cdn.ireadabc.com/46cba1330608d848239ec6a68bb4707e.mp3", "waitAudio": "http://staging-teach.cdn.ireadabc.com/46cba1330608d848239ec6a68bb4707e.mp3",
"finishAudio": "http://staging-teach.cdn.ireadabc.com/b3260e3d6972cc59b345f573aaab4290.mp3", "finishAudio": "http://staging-teach.cdn.ireadabc.com/b3260e3d6972cc59b345f573aaab4290.mp3",
......
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