Commit c6cc8b04 authored by yu's avatar yu

1

parent 28b8e8c8
......@@ -17,7 +17,7 @@
"__id__": 2
},
{
"__id__": 166
"__id__": 167
}
],
"_active": false,
......@@ -96,34 +96,34 @@
"__id__": 94
},
{
"__id__": 96
"__id__": 97
},
{
"__id__": 131
"__id__": 132
},
{
"__id__": 134
"__id__": 135
},
{
"__id__": 138
"__id__": 139
},
{
"__id__": 140
"__id__": 141
},
{
"__id__": 146
"__id__": 147
}
],
"_active": true,
"_components": [
{
"__id__": 163
},
{
"__id__": 164
},
{
"__id__": 165
},
{
"__id__": 166
}
],
"_prefab": null,
......@@ -4460,6 +4460,9 @@
"_components": [
{
"__id__": 95
},
{
"__id__": 96
}
],
"_prefab": null,
......@@ -4542,6 +4545,33 @@
"_N$affectedByScale": true,
"_id": "87l/u90PlM4YxRYHUGb27O"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 94
},
"_enabled": true,
"alignMode": 1,
"_target": null,
"_alignFlags": 4,
"_left": 0,
"_right": 0,
"_top": 0,
"_bottom": 38.66500000000002,
"_verticalCenter": 0,
"_horizontalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 0,
"_originalHeight": 0,
"_id": "23gU8nOwtCjoTRhjHbMfl+"
},
{
"__type__": "cc.Node",
"_name": "loadingLayerBase",
......@@ -4551,13 +4581,13 @@
},
"_children": [
{
"__id__": 97
"__id__": 98
}
],
"_active": true,
"_components": [
{
"__id__": 130
"__id__": 131
}
],
"_prefab": null,
......@@ -4613,32 +4643,32 @@
"_name": "LoadingLayer",
"_objFlags": 0,
"_parent": {
"__id__": 96
"__id__": 97
},
"_children": [
{
"__id__": 98
"__id__": 99
},
{
"__id__": 102
"__id__": 103
},
{
"__id__": 105
"__id__": 106
},
{
"__id__": 108
"__id__": 109
},
{
"__id__": 115
"__id__": 116
}
],
"_active": false,
"_components": [
{
"__id__": 128
"__id__": 129
},
{
"__id__": 129
"__id__": 130
}
],
"_prefab": null,
......@@ -4694,19 +4724,19 @@
"_name": "bg",
"_objFlags": 0,
"_parent": {
"__id__": 97
"__id__": 98
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 99
},
{
"__id__": 100
},
{
"__id__": 101
},
{
"__id__": 102
}
],
"_prefab": null,
......@@ -4762,7 +4792,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 98
"__id__": 99
},
"_enabled": true,
"_materials": [
......@@ -4794,7 +4824,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 98
"__id__": 99
},
"_enabled": true,
"alignMode": 1,
......@@ -4821,7 +4851,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 98
"__id__": 99
},
"_enabled": true,
"_normalMaterial": null,
......@@ -4889,16 +4919,16 @@
"_name": "layout",
"_objFlags": 0,
"_parent": {
"__id__": 97
"__id__": 98
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 103
"__id__": 104
},
{
"__id__": 104
"__id__": 105
}
],
"_prefab": null,
......@@ -4954,7 +4984,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 102
"__id__": 103
},
"_enabled": true,
"_layoutSize": {
......@@ -4986,7 +5016,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 102
"__id__": 103
},
"_enabled": true,
"alignMode": 1,
......@@ -5013,16 +5043,16 @@
"_name": "label",
"_objFlags": 0,
"_parent": {
"__id__": 97
"__id__": 98
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 106
"__id__": 107
},
{
"__id__": 107
"__id__": 108
}
],
"_prefab": null,
......@@ -5078,7 +5108,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 105
"__id__": 106
},
"_enabled": true,
"_materials": [
......@@ -5113,7 +5143,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 105
"__id__": 106
},
"_enabled": true,
"alignMode": 2,
......@@ -5140,23 +5170,23 @@
"_name": "progressBar",
"_objFlags": 0,
"_parent": {
"__id__": 97
"__id__": 98
},
"_children": [
{
"__id__": 109
"__id__": 110
}
],
"_active": true,
"_components": [
{
"__id__": 112
},
{
"__id__": 113
},
{
"__id__": 114
},
{
"__id__": 115
}
],
"_prefab": null,
......@@ -5212,16 +5242,16 @@
"_name": "bar",
"_objFlags": 512,
"_parent": {
"__id__": 108
"__id__": 109
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 110
"__id__": 111
},
{
"__id__": 111
"__id__": 112
}
],
"_prefab": null,
......@@ -5277,7 +5307,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 109
"__id__": 110
},
"_enabled": true,
"_materials": [
......@@ -5309,7 +5339,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 109
"__id__": 110
},
"_enabled": true,
"alignMode": 1,
......@@ -5336,7 +5366,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 108
"__id__": 109
},
"_enabled": true,
"_materials": [
......@@ -5368,12 +5398,12 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 108
"__id__": 109
},
"_enabled": true,
"_N$totalLength": 1568,
"_N$barSprite": {
"__id__": 110
"__id__": 111
},
"_N$mode": 0,
"_N$progress": 0,
......@@ -5385,7 +5415,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 108
"__id__": 109
},
"_enabled": true,
"alignMode": 2,
......@@ -5412,23 +5442,23 @@
"_name": "head",
"_objFlags": 0,
"_parent": {
"__id__": 97
"__id__": 98
},
"_children": [
{
"__id__": 116
"__id__": 117
},
{
"__id__": 118
"__id__": 119
},
{
"__id__": 122
"__id__": 123
},
{
"__id__": 124
"__id__": 125
},
{
"__id__": 126
"__id__": 127
}
],
"_active": false,
......@@ -5486,13 +5516,13 @@
"_name": "bg",
"_objFlags": 0,
"_parent": {
"__id__": 115
"__id__": 116
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 117
"__id__": 118
}
],
"_prefab": null,
......@@ -5548,7 +5578,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 116
"__id__": 117
},
"_enabled": true,
"_materials": [
......@@ -5580,17 +5610,17 @@
"_name": "mask",
"_objFlags": 0,
"_parent": {
"__id__": 115
"__id__": 116
},
"_children": [
{
"__id__": 119
"__id__": 120
}
],
"_active": true,
"_components": [
{
"__id__": 121
"__id__": 122
}
],
"_prefab": null,
......@@ -5646,13 +5676,13 @@
"_name": "headImg",
"_objFlags": 0,
"_parent": {
"__id__": 118
"__id__": 119
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 120
"__id__": 121
}
],
"_prefab": null,
......@@ -5708,7 +5738,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 119
"__id__": 120
},
"_enabled": true,
"_materials": [
......@@ -5740,7 +5770,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 118
"__id__": 119
},
"_enabled": true,
"_materials": [
......@@ -5762,13 +5792,13 @@
"_name": "frame",
"_objFlags": 0,
"_parent": {
"__id__": 115
"__id__": 116
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 123
"__id__": 124
}
],
"_prefab": null,
......@@ -5824,7 +5854,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 122
"__id__": 123
},
"_enabled": true,
"_materials": [
......@@ -5856,13 +5886,13 @@
"_name": "frame_self",
"_objFlags": 0,
"_parent": {
"__id__": 115
"__id__": 116
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 125
"__id__": 126
}
],
"_prefab": null,
......@@ -5918,7 +5948,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 124
"__id__": 125
},
"_enabled": true,
"_materials": [
......@@ -5950,13 +5980,13 @@
"_name": "name",
"_objFlags": 0,
"_parent": {
"__id__": 115
"__id__": 116
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 127
"__id__": 128
}
],
"_prefab": null,
......@@ -6012,7 +6042,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 126
"__id__": 127
},
"_enabled": true,
"_materials": [
......@@ -6047,7 +6077,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 97
"__id__": 98
},
"_enabled": true,
"alignMode": 2,
......@@ -6074,7 +6104,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 97
"__id__": 98
},
"_enabled": true,
"_id": "f54eYuLvlJyYIF4wrxhwvC"
......@@ -6084,7 +6114,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 96
"__id__": 97
},
"_enabled": true,
"alignMode": 1,
......@@ -6117,10 +6147,10 @@
"_active": false,
"_components": [
{
"__id__": 132
"__id__": 133
},
{
"__id__": 133
"__id__": 134
}
],
"_prefab": null,
......@@ -6176,7 +6206,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 131
"__id__": 132
},
"_enabled": true,
"_id": "53uGFb6qJMFZHndqSAD7ZB"
......@@ -6186,7 +6216,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 131
"__id__": 132
},
"_enabled": true,
"alignMode": 1,
......@@ -6217,13 +6247,13 @@
},
"_children": [
{
"__id__": 135
"__id__": 136
}
],
"_active": true,
"_components": [
{
"__id__": 137
"__id__": 138
}
],
"_prefab": null,
......@@ -6279,13 +6309,13 @@
"_name": "btnCheckCat",
"_objFlags": 0,
"_parent": {
"__id__": 134
"__id__": 135
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 136
"__id__": 137
}
],
"_prefab": null,
......@@ -6341,7 +6371,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 135
"__id__": 136
},
"_enabled": true,
"_normalMaterial": null,
......@@ -6409,7 +6439,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 134
"__id__": 135
},
"_enabled": true,
"_materials": [
......@@ -6455,7 +6485,7 @@
"_active": false,
"_components": [
{
"__id__": 139
"__id__": 140
}
],
"_prefab": null,
......@@ -6511,7 +6541,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 138
"__id__": 139
},
"_enabled": true,
"_materials": [
......@@ -6555,7 +6585,7 @@
},
"_children": [
{
"__id__": 141
"__id__": 142
}
],
"_active": true,
......@@ -6613,14 +6643,14 @@
"_name": "item_1",
"_objFlags": 0,
"_parent": {
"__id__": 140
"__id__": 141
},
"_children": [
{
"__id__": 142
"__id__": 143
},
{
"__id__": 144
"__id__": 145
}
],
"_active": true,
......@@ -6678,13 +6708,13 @@
"_name": "cardbg",
"_objFlags": 0,
"_parent": {
"__id__": 141
"__id__": 142
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 143
"__id__": 144
}
],
"_prefab": null,
......@@ -6740,7 +6770,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 142
"__id__": 143
},
"_enabled": true,
"_materials": [
......@@ -6772,13 +6802,13 @@
"_name": "word",
"_objFlags": 0,
"_parent": {
"__id__": 141
"__id__": 142
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 145
"__id__": 146
}
],
"_prefab": null,
......@@ -6834,7 +6864,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 144
"__id__": 145
},
"_enabled": true,
"_materials": [
......@@ -6873,19 +6903,19 @@
},
"_children": [
{
"__id__": 147
"__id__": 148
},
{
"__id__": 151
"__id__": 152
}
],
"_active": false,
"_components": [
{
"__id__": 161
"__id__": 162
},
{
"__id__": 162
"__id__": 163
}
],
"_prefab": null,
......@@ -6941,19 +6971,19 @@
"_name": "bg",
"_objFlags": 0,
"_parent": {
"__id__": 146
"__id__": 147
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 148
},
{
"__id__": 149
},
{
"__id__": 150
},
{
"__id__": 151
}
],
"_prefab": null,
......@@ -7009,7 +7039,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 147
"__id__": 148
},
"_enabled": true,
"_materials": [
......@@ -7041,7 +7071,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 147
"__id__": 148
},
"_enabled": true,
"alignMode": 2,
......@@ -7068,7 +7098,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 147
"__id__": 148
},
"_enabled": true,
"_normalMaterial": null,
......@@ -7136,20 +7166,20 @@
"_name": "BtnFrame",
"_objFlags": 0,
"_parent": {
"__id__": 146
"__id__": 147
},
"_children": [
{
"__id__": 152
"__id__": 153
},
{
"__id__": 156
"__id__": 157
}
],
"_active": true,
"_components": [
{
"__id__": 160
"__id__": 161
}
],
"_prefab": null,
......@@ -7205,19 +7235,19 @@
"_name": "BtnExit",
"_objFlags": 0,
"_parent": {
"__id__": 151
"__id__": 152
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 153
},
{
"__id__": 154
},
{
"__id__": 155
},
{
"__id__": 156
}
],
"_prefab": null,
......@@ -7273,7 +7303,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 152
"__id__": 153
},
"_enabled": true,
"_materials": [
......@@ -7305,7 +7335,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 152
"__id__": 153
},
"_enabled": true,
"alignMode": 1,
......@@ -7332,7 +7362,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 152
"__id__": 153
},
"_enabled": true,
"_normalMaterial": null,
......@@ -7400,19 +7430,19 @@
"_name": "BtnPlayAgain",
"_objFlags": 0,
"_parent": {
"__id__": 151
"__id__": 152
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 157
},
{
"__id__": 158
},
{
"__id__": 159
},
{
"__id__": 160
}
],
"_prefab": null,
......@@ -7468,7 +7498,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 156
"__id__": 157
},
"_enabled": true,
"_materials": [
......@@ -7500,7 +7530,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 156
"__id__": 157
},
"_enabled": true,
"alignMode": 1,
......@@ -7527,7 +7557,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 156
"__id__": 157
},
"_enabled": true,
"_normalMaterial": null,
......@@ -7595,7 +7625,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 151
"__id__": 152
},
"_enabled": true,
"_materials": [
......@@ -7627,7 +7657,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 146
"__id__": 147
},
"_enabled": true,
"alignMode": 2,
......@@ -7654,7 +7684,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 146
"__id__": 147
},
"_enabled": true,
"_id": "68evFVe1pHtLw2FrqnkBxx"
......@@ -7712,13 +7742,13 @@
},
"_enabled": true,
"loadingLayer": {
"__id__": 97
"__id__": 98
},
"dbCat": {
"__id__": 134
"__id__": 135
},
"item_1": {
"__id__": 141
"__id__": 142
},
"item_pic": {
"__id__": 57
......@@ -7743,28 +7773,28 @@
},
"_children": [
{
"__id__": 167
"__id__": 168
},
{
"__id__": 169
"__id__": 170
},
{
"__id__": 173
"__id__": 174
},
{
"__id__": 175
"__id__": 176
},
{
"__id__": 237
"__id__": 238
}
],
"_active": false,
"_components": [
{
"__id__": 241
"__id__": 242
},
{
"__id__": 242
"__id__": 243
}
],
"_prefab": null,
......@@ -7820,13 +7850,13 @@
"_name": "star",
"_objFlags": 0,
"_parent": {
"__id__": 166
"__id__": 167
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 168
"__id__": 169
}
],
"_prefab": null,
......@@ -7882,7 +7912,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 167
"__id__": 168
},
"_enabled": true,
"_materials": [
......@@ -7914,19 +7944,19 @@
"_name": "bg",
"_objFlags": 0,
"_parent": {
"__id__": 166
"__id__": 167
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 170
},
{
"__id__": 171
},
{
"__id__": 172
},
{
"__id__": 173
}
],
"_prefab": null,
......@@ -7982,7 +8012,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 169
"__id__": 170
},
"_enabled": true,
"_materials": [
......@@ -8014,7 +8044,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 169
"__id__": 170
},
"_enabled": true,
"alignMode": 1,
......@@ -8041,7 +8071,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 169
"__id__": 170
},
"_enabled": true,
"_normalMaterial": null,
......@@ -8109,13 +8139,13 @@
"_name": "label",
"_objFlags": 0,
"_parent": {
"__id__": 166
"__id__": 167
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 174
"__id__": 175
}
],
"_prefab": null,
......@@ -8171,7 +8201,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 173
"__id__": 174
},
"_enabled": true,
"_materials": [
......@@ -8204,32 +8234,32 @@
"_name": "jiangtaiNode",
"_objFlags": 0,
"_parent": {
"__id__": 166
"__id__": 167
},
"_children": [
{
"__id__": 176
"__id__": 177
},
{
"__id__": 178
"__id__": 179
},
{
"__id__": 180
"__id__": 181
},
{
"__id__": 182
"__id__": 183
},
{
"__id__": 193
"__id__": 194
},
{
"__id__": 204
"__id__": 205
},
{
"__id__": 215
"__id__": 216
},
{
"__id__": 226
"__id__": 227
}
],
"_active": true,
......@@ -8287,13 +8317,13 @@
"_name": "light",
"_objFlags": 0,
"_parent": {
"__id__": 175
"__id__": 176
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 177
"__id__": 178
}
],
"_prefab": null,
......@@ -8349,7 +8379,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 176
"__id__": 177
},
"_enabled": true,
"_materials": [
......@@ -8381,13 +8411,13 @@
"_name": "fire",
"_objFlags": 0,
"_parent": {
"__id__": 175
"__id__": 176
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 179
"__id__": 180
}
],
"_prefab": null,
......@@ -8443,7 +8473,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 178
"__id__": 179
},
"_enabled": true,
"_materials": [
......@@ -8475,13 +8505,13 @@
"_name": "bg",
"_objFlags": 0,
"_parent": {
"__id__": 175
"__id__": 176
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 181
"__id__": 182
}
],
"_prefab": null,
......@@ -8537,7 +8567,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 180
"__id__": 181
},
"_enabled": true,
"_materials": [
......@@ -8569,20 +8599,20 @@
"_name": "head_0",
"_objFlags": 0,
"_parent": {
"__id__": 175
"__id__": 176
},
"_children": [
{
"__id__": 183
"__id__": 184
},
{
"__id__": 187
"__id__": 188
},
{
"__id__": 189
"__id__": 190
},
{
"__id__": 191
"__id__": 192
}
],
"_active": false,
......@@ -8640,17 +8670,17 @@
"_name": "mask",
"_objFlags": 0,
"_parent": {
"__id__": 182
"__id__": 183
},
"_children": [
{
"__id__": 184
"__id__": 185
}
],
"_active": true,
"_components": [
{
"__id__": 186
"__id__": 187
}
],
"_prefab": null,
......@@ -8706,13 +8736,13 @@
"_name": "headImg",
"_objFlags": 0,
"_parent": {
"__id__": 183
"__id__": 184
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 185
"__id__": 186
}
],
"_prefab": null,
......@@ -8768,7 +8798,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 184
"__id__": 185
},
"_enabled": true,
"_materials": [
......@@ -8798,7 +8828,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 183
"__id__": 184
},
"_enabled": true,
"_materials": [
......@@ -8818,13 +8848,13 @@
"_name": "head",
"_objFlags": 0,
"_parent": {
"__id__": 182
"__id__": 183
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 188
"__id__": 189
}
],
"_prefab": null,
......@@ -8880,7 +8910,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 187
"__id__": 188
},
"_enabled": true,
"_materials": [
......@@ -8912,13 +8942,13 @@
"_name": "name",
"_objFlags": 0,
"_parent": {
"__id__": 182
"__id__": 183
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 190
"__id__": 191
}
],
"_prefab": null,
......@@ -8974,7 +9004,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 189
"__id__": 190
},
"_enabled": true,
"_materials": [
......@@ -9007,13 +9037,13 @@
"_name": "arrow",
"_objFlags": 0,
"_parent": {
"__id__": 182
"__id__": 183
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 192
"__id__": 193
}
],
"_prefab": null,
......@@ -9069,7 +9099,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 191
"__id__": 192
},
"_enabled": true,
"_materials": [
......@@ -9101,20 +9131,20 @@
"_name": "head_1",
"_objFlags": 0,
"_parent": {
"__id__": 175
"__id__": 176
},
"_children": [
{
"__id__": 194
"__id__": 195
},
{
"__id__": 198
"__id__": 199
},
{
"__id__": 200
"__id__": 201
},
{
"__id__": 202
"__id__": 203
}
],
"_active": false,
......@@ -9172,17 +9202,17 @@
"_name": "mask",
"_objFlags": 0,
"_parent": {
"__id__": 193
"__id__": 194
},
"_children": [
{
"__id__": 195
"__id__": 196
}
],
"_active": true,
"_components": [
{
"__id__": 197
"__id__": 198
}
],
"_prefab": null,
......@@ -9238,13 +9268,13 @@
"_name": "headImg",
"_objFlags": 0,
"_parent": {
"__id__": 194
"__id__": 195
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 196
"__id__": 197
}
],
"_prefab": null,
......@@ -9300,7 +9330,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 195
"__id__": 196
},
"_enabled": true,
"_materials": [
......@@ -9330,7 +9360,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 194
"__id__": 195
},
"_enabled": true,
"_materials": [
......@@ -9350,13 +9380,13 @@
"_name": "head",
"_objFlags": 0,
"_parent": {
"__id__": 193
"__id__": 194
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 199
"__id__": 200
}
],
"_prefab": null,
......@@ -9412,7 +9442,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 198
"__id__": 199
},
"_enabled": true,
"_materials": [
......@@ -9444,13 +9474,13 @@
"_name": "name",
"_objFlags": 0,
"_parent": {
"__id__": 193
"__id__": 194
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 201
"__id__": 202
}
],
"_prefab": null,
......@@ -9506,7 +9536,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 200
"__id__": 201
},
"_enabled": true,
"_materials": [
......@@ -9539,13 +9569,13 @@
"_name": "arrow",
"_objFlags": 0,
"_parent": {
"__id__": 193
"__id__": 194
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 203
"__id__": 204
}
],
"_prefab": null,
......@@ -9601,7 +9631,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 202
"__id__": 203
},
"_enabled": true,
"_materials": [
......@@ -9633,20 +9663,20 @@
"_name": "head_2",
"_objFlags": 0,
"_parent": {
"__id__": 175
"__id__": 176
},
"_children": [
{
"__id__": 205
"__id__": 206
},
{
"__id__": 209
"__id__": 210
},
{
"__id__": 211
"__id__": 212
},
{
"__id__": 213
"__id__": 214
}
],
"_active": false,
......@@ -9704,17 +9734,17 @@
"_name": "mask",
"_objFlags": 0,
"_parent": {
"__id__": 204
"__id__": 205
},
"_children": [
{
"__id__": 206
"__id__": 207
}
],
"_active": true,
"_components": [
{
"__id__": 208
"__id__": 209
}
],
"_prefab": null,
......@@ -9770,13 +9800,13 @@
"_name": "headImg",
"_objFlags": 0,
"_parent": {
"__id__": 205
"__id__": 206
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 207
"__id__": 208
}
],
"_prefab": null,
......@@ -9832,7 +9862,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 206
"__id__": 207
},
"_enabled": true,
"_materials": [
......@@ -9862,7 +9892,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 205
"__id__": 206
},
"_enabled": true,
"_materials": [
......@@ -9882,13 +9912,13 @@
"_name": "head",
"_objFlags": 0,
"_parent": {
"__id__": 204
"__id__": 205
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 210
"__id__": 211
}
],
"_prefab": null,
......@@ -9944,7 +9974,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 209
"__id__": 210
},
"_enabled": true,
"_materials": [
......@@ -9976,13 +10006,13 @@
"_name": "name",
"_objFlags": 0,
"_parent": {
"__id__": 204
"__id__": 205
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 212
"__id__": 213
}
],
"_prefab": null,
......@@ -10038,7 +10068,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 211
"__id__": 212
},
"_enabled": true,
"_materials": [
......@@ -10071,13 +10101,13 @@
"_name": "arrow",
"_objFlags": 0,
"_parent": {
"__id__": 204
"__id__": 205
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 214
"__id__": 215
}
],
"_prefab": null,
......@@ -10133,7 +10163,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 213
"__id__": 214
},
"_enabled": true,
"_materials": [
......@@ -10165,20 +10195,20 @@
"_name": "head_3",
"_objFlags": 0,
"_parent": {
"__id__": 175
"__id__": 176
},
"_children": [
{
"__id__": 216
"__id__": 217
},
{
"__id__": 220
"__id__": 221
},
{
"__id__": 222
"__id__": 223
},
{
"__id__": 224
"__id__": 225
}
],
"_active": false,
......@@ -10236,17 +10266,17 @@
"_name": "mask",
"_objFlags": 0,
"_parent": {
"__id__": 215
"__id__": 216
},
"_children": [
{
"__id__": 217
"__id__": 218
}
],
"_active": true,
"_components": [
{
"__id__": 219
"__id__": 220
}
],
"_prefab": null,
......@@ -10302,13 +10332,13 @@
"_name": "headImg",
"_objFlags": 0,
"_parent": {
"__id__": 216
"__id__": 217
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 218
"__id__": 219
}
],
"_prefab": null,
......@@ -10364,7 +10394,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 217
"__id__": 218
},
"_enabled": true,
"_materials": [
......@@ -10394,7 +10424,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 216
"__id__": 217
},
"_enabled": true,
"_materials": [
......@@ -10414,13 +10444,13 @@
"_name": "head",
"_objFlags": 0,
"_parent": {
"__id__": 215
"__id__": 216
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 221
"__id__": 222
}
],
"_prefab": null,
......@@ -10476,7 +10506,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 220
"__id__": 221
},
"_enabled": true,
"_materials": [
......@@ -10508,13 +10538,13 @@
"_name": "name",
"_objFlags": 0,
"_parent": {
"__id__": 215
"__id__": 216
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 223
"__id__": 224
}
],
"_prefab": null,
......@@ -10570,7 +10600,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 222
"__id__": 223
},
"_enabled": true,
"_materials": [
......@@ -10603,13 +10633,13 @@
"_name": "arrow",
"_objFlags": 0,
"_parent": {
"__id__": 215
"__id__": 216
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 225
"__id__": 226
}
],
"_prefab": null,
......@@ -10665,7 +10695,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 224
"__id__": 225
},
"_enabled": true,
"_materials": [
......@@ -10697,20 +10727,20 @@
"_name": "head_4",
"_objFlags": 0,
"_parent": {
"__id__": 175
"__id__": 176
},
"_children": [
{
"__id__": 227
"__id__": 228
},
{
"__id__": 231
"__id__": 232
},
{
"__id__": 233
"__id__": 234
},
{
"__id__": 235
"__id__": 236
}
],
"_active": false,
......@@ -10768,17 +10798,17 @@
"_name": "mask",
"_objFlags": 0,
"_parent": {
"__id__": 226
"__id__": 227
},
"_children": [
{
"__id__": 228
"__id__": 229
}
],
"_active": true,
"_components": [
{
"__id__": 230
"__id__": 231
}
],
"_prefab": null,
......@@ -10834,13 +10864,13 @@
"_name": "headImg",
"_objFlags": 0,
"_parent": {
"__id__": 227
"__id__": 228
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 229
"__id__": 230
}
],
"_prefab": null,
......@@ -10896,7 +10926,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 228
"__id__": 229
},
"_enabled": true,
"_materials": [
......@@ -10926,7 +10956,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 227
"__id__": 228
},
"_enabled": true,
"_materials": [
......@@ -10946,13 +10976,13 @@
"_name": "head",
"_objFlags": 0,
"_parent": {
"__id__": 226
"__id__": 227
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 232
"__id__": 233
}
],
"_prefab": null,
......@@ -11008,7 +11038,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 231
"__id__": 232
},
"_enabled": true,
"_materials": [
......@@ -11040,13 +11070,13 @@
"_name": "name",
"_objFlags": 0,
"_parent": {
"__id__": 226
"__id__": 227
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 234
"__id__": 235
}
],
"_prefab": null,
......@@ -11102,7 +11132,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 233
"__id__": 234
},
"_enabled": true,
"_materials": [
......@@ -11135,13 +11165,13 @@
"_name": "arrow",
"_objFlags": 0,
"_parent": {
"__id__": 226
"__id__": 227
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 236
"__id__": 237
}
],
"_prefab": null,
......@@ -11197,7 +11227,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 235
"__id__": 236
},
"_enabled": true,
"_materials": [
......@@ -11229,17 +11259,17 @@
"_name": "catFrame",
"_objFlags": 0,
"_parent": {
"__id__": 166
"__id__": 167
},
"_children": [
{
"__id__": 238
"__id__": 239
}
],
"_active": true,
"_components": [
{
"__id__": 240
"__id__": 241
}
],
"_prefab": null,
......@@ -11295,13 +11325,13 @@
"_name": "CoolCat",
"_objFlags": 0,
"_parent": {
"__id__": 237
"__id__": 238
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 239
"__id__": 240
}
],
"_prefab": null,
......@@ -11357,7 +11387,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 238
"__id__": 239
},
"_enabled": true,
"_materials": [
......@@ -11397,7 +11427,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 237
"__id__": 238
},
"_enabled": true,
"alignMode": 1,
......@@ -11424,7 +11454,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 166
"__id__": 167
},
"_enabled": true,
"alignMode": 1,
......@@ -11451,7 +11481,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 166
"__id__": 167
},
"_enabled": true,
"_id": "2di0B0u6VIfa27gpyDYfMr"
......
......@@ -88,12 +88,12 @@
<app-audio-recorder style="margin-left: 10px; " [audioUrl]="item.waitAudio"
(audioUploaded)="onAudioUploadSuccess($event, 'waitAudio', item,'waitAudioName')"></app-audio-recorder>
<span style="font-size: 20px;">开始读条音频:</span>
<!-- <span style="font-size: 20px;">开始读条音频:</span>
<app-audio-recorder style="margin-left: 10px; " [audioUrl]="item.startLoadingAudio"
(audioUploaded)="onAudioUploadSuccess($event, 'startLoadingAudio', item,'loadAudioName')"></app-audio-recorder>
(audioUploaded)="onAudioUploadSuccess($event, 'startLoadingAudio', item,'loadAudioName')"></app-audio-recorder> -->
<span style="font-size: 20px;">猫咪第一音频:</span>
<!-- <span style="font-size: 20px;">猫咪第一音频:</span>
<app-audio-recorder style="margin-left: 10px; " [audioUrl]="item.finishAudioList[0]"
(audioUploaded)="onFinishAudioUploadSuccess($event, 0)"></app-audio-recorder>
......@@ -111,7 +111,7 @@
<span style="font-size: 20px;">猫咪第五音频:</span>
<app-audio-recorder style="margin-left: 10px; " [audioUrl]="item.finishAudioList[4]"
(audioUploaded)="onFinishAudioUploadSuccess($event, 4)"></app-audio-recorder>
(audioUploaded)="onFinishAudioUploadSuccess($event, 4)"></app-audio-recorder> -->
</div>
</div>
......
......@@ -11,7 +11,7 @@ import { ComponentBase } from './ComponentBase';
export class FormComponent extends ComponentBase implements OnInit, OnChanges, OnDestroy {
// 储存数据用
saveKey = "op_72";
saveKey = "op_72_single";
// 储存对象
item: any = {
// score: 0,
......
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