Commit d5f8c342 authored by Tt's avatar Tt

显示位置修复

parent fbb7cb17
......@@ -108,28 +108,28 @@
"__id__": 150
},
{
"__id__": 190
"__id__": 192
},
{
"__id__": 196
"__id__": 198
},
{
"__id__": 212
"__id__": 214
},
{
"__id__": 222
"__id__": 224
}
],
"_active": true,
"_components": [
{
"__id__": 235
"__id__": 237
},
{
"__id__": 236
"__id__": 238
},
{
"__id__": 237
"__id__": 239
}
],
"_prefab": null,
......@@ -3092,8 +3092,8 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 123,
"height": 123
"width": 139,
"height": 138
},
"_anchorPoint": {
"__type__": "cc.Vec2",
......@@ -3167,7 +3167,7 @@
"ctor": "Float64Array",
"array": [
0,
98,
112.263,
0,
0,
0,
......@@ -3261,7 +3261,7 @@
"ctor": "Float64Array",
"array": [
0,
98,
112.263,
0,
0,
0,
......@@ -3355,7 +3355,7 @@
"ctor": "Float64Array",
"array": [
0,
98,
112.263,
0,
0,
0,
......@@ -3449,7 +3449,7 @@
"ctor": "Float64Array",
"array": [
0,
98,
112.263,
0,
0,
0,
......@@ -3543,7 +3543,7 @@
"ctor": "Float64Array",
"array": [
0,
98,
112.263,
0,
0,
0,
......@@ -3637,7 +3637,7 @@
"ctor": "Float64Array",
"array": [
0,
98,
112.263,
0,
0,
0,
......@@ -3712,7 +3712,7 @@
"__uuid__": "557332be-622c-4f77-b502-8bd6b4f8f52c"
},
"_type": 0,
"_sizeMode": 0,
"_sizeMode": 1,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
......@@ -3959,8 +3959,8 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 123,
"height": 123
"width": 139,
"height": 138
},
"_anchorPoint": {
"__type__": "cc.Vec2",
......@@ -4034,7 +4034,7 @@
"ctor": "Float64Array",
"array": [
0,
98,
120.938,
0,
0,
0,
......@@ -4128,7 +4128,7 @@
"ctor": "Float64Array",
"array": [
0,
98,
120.938,
0,
0,
0,
......@@ -4222,7 +4222,7 @@
"ctor": "Float64Array",
"array": [
0,
98,
120.938,
0,
0,
0,
......@@ -4316,7 +4316,7 @@
"ctor": "Float64Array",
"array": [
0,
98,
120.938,
0,
0,
0,
......@@ -4410,7 +4410,7 @@
"ctor": "Float64Array",
"array": [
0,
98,
120.938,
0,
0,
0,
......@@ -4504,7 +4504,7 @@
"ctor": "Float64Array",
"array": [
0,
98,
120.938,
0,
0,
0,
......@@ -4579,7 +4579,7 @@
"__uuid__": "b2d1bf2a-828e-4058-997c-0abd56dc6016"
},
"_type": 0,
"_sizeMode": 0,
"_sizeMode": 1,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
......@@ -7060,13 +7060,10 @@
"__id__": 153
},
{
"__id__": 160
},
{
"__id__": 167
"__id__": 162
},
{
"__id__": 170
"__id__": 169
},
{
"__id__": 172
......@@ -7075,19 +7072,22 @@
"__id__": 174
},
{
"__id__": 180
"__id__": 176
},
{
"__id__": 186
"__id__": 182
},
{
"__id__": 188
}
],
"_active": true,
"_components": [
{
"__id__": 188
"__id__": 190
},
{
"__id__": 189
"__id__": 191
}
],
"_prefab": null,
......@@ -7248,6 +7248,9 @@
},
{
"__id__": 158
},
{
"__id__": 160
}
],
"_active": false,
......@@ -7585,6 +7588,100 @@
"_atlas": null,
"_id": "d4FrpEjWtAbJ8dogX17NzP"
},
{
"__type__": "cc.Node",
"_name": "img_big",
"_objFlags": 0,
"_parent": {
"__id__": 153
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 161
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 550,
"height": 350
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
0,
1.763,
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": "9fq7EYSjBK+rT9QYfsVti5"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 160
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "8cdb44ac-a3f6-449f-b354-7cd48cf84061"
},
"_type": 0,
"_sizeMode": 0,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "1882P6jDRIsqthGF0/KsTF"
},
{
"__type__": "cc.Node",
"_name": "btn_audio_clock",
......@@ -7594,16 +7691,16 @@
},
"_children": [
{
"__id__": 161
"__id__": 163
},
{
"__id__": 163
"__id__": 165
}
],
"_active": false,
"_components": [
{
"__id__": 166
"__id__": 168
}
],
"_prefab": null,
......@@ -7659,13 +7756,13 @@
"_name": "time_0",
"_objFlags": 0,
"_parent": {
"__id__": 160
"__id__": 162
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 162
"__id__": 164
}
],
"_prefab": null,
......@@ -7721,7 +7818,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 161
"__id__": 163
},
"_enabled": true,
"_materials": [
......@@ -7756,16 +7853,16 @@
"_name": "time_1",
"_objFlags": 0,
"_parent": {
"__id__": 160
"__id__": 162
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 164
"__id__": 166
},
{
"__id__": 165
"__id__": 167
}
],
"_prefab": null,
......@@ -7821,7 +7918,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 163
"__id__": 165
},
"_enabled": true,
"_materials": [
......@@ -7856,7 +7953,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 163
"__id__": 165
},
"_enabled": true,
"_color": {
......@@ -7874,7 +7971,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 160
"__id__": 162
},
"_enabled": true,
"_materials": [
......@@ -7912,10 +8009,10 @@
"_active": false,
"_components": [
{
"__id__": 168
"__id__": 170
},
{
"__id__": 169
"__id__": 171
}
],
"_prefab": null,
......@@ -7971,7 +8068,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 167
"__id__": 169
},
"_enabled": true,
"_materials": [
......@@ -8003,7 +8100,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 167
"__id__": 169
},
"_enabled": true,
"_normalMaterial": null,
......@@ -8077,7 +8174,7 @@
"_active": false,
"_components": [
{
"__id__": 171
"__id__": 173
}
],
"_prefab": null,
......@@ -8133,7 +8230,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 170
"__id__": 172
},
"_enabled": true,
"_materials": [
......@@ -8171,7 +8268,7 @@
"_active": false,
"_components": [
{
"__id__": 173
"__id__": 175
}
],
"_prefab": null,
......@@ -8227,7 +8324,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 172
"__id__": 174
},
"_enabled": true,
"_materials": [
......@@ -8271,16 +8368,16 @@
},
"_children": [
{
"__id__": 175
"__id__": 177
},
{
"__id__": 177
"__id__": 179
}
],
"_active": false,
"_components": [
{
"__id__": 179
"__id__": 181
}
],
"_prefab": null,
......@@ -8336,13 +8433,13 @@
"_name": "bg_light-big",
"_objFlags": 0,
"_parent": {
"__id__": 174
"__id__": 176
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 176
"__id__": 178
}
],
"_prefab": null,
......@@ -8398,7 +8495,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 175
"__id__": 177
},
"_enabled": true,
"_materials": [
......@@ -8430,13 +8527,13 @@
"_name": "bg_goodjob",
"_objFlags": 0,
"_parent": {
"__id__": 174
"__id__": 176
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 178
"__id__": 180
}
],
"_prefab": null,
......@@ -8492,7 +8589,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 177
"__id__": 179
},
"_enabled": true,
"_materials": [
......@@ -8524,7 +8621,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 174
"__id__": 176
},
"_enabled": false,
"_materials": [
......@@ -8560,16 +8657,16 @@
},
"_children": [
{
"__id__": 181
"__id__": 183
},
{
"__id__": 183
"__id__": 185
}
],
"_active": false,
"_components": [
{
"__id__": 185
"__id__": 187
}
],
"_prefab": null,
......@@ -8625,13 +8722,13 @@
"_name": "bg_light-small",
"_objFlags": 0,
"_parent": {
"__id__": 180
"__id__": 182
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 182
"__id__": 184
}
],
"_prefab": null,
......@@ -8687,7 +8784,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 181
"__id__": 183
},
"_enabled": true,
"_materials": [
......@@ -8719,13 +8816,13 @@
"_name": "bg_tryagain",
"_objFlags": 0,
"_parent": {
"__id__": 180
"__id__": 182
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 184
"__id__": 186
}
],
"_prefab": null,
......@@ -8781,7 +8878,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 183
"__id__": 185
},
"_enabled": true,
"_materials": [
......@@ -8813,7 +8910,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 180
"__id__": 182
},
"_enabled": true,
"_materials": [
......@@ -8851,7 +8948,7 @@
"_active": false,
"_components": [
{
"__id__": 187
"__id__": 189
}
],
"_prefab": null,
......@@ -8907,7 +9004,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 186
"__id__": 188
},
"_enabled": true,
"_materials": [
......@@ -8982,16 +9079,16 @@
},
"_children": [
{
"__id__": 191
"__id__": 193
},
{
"__id__": 193
"__id__": 195
}
],
"_active": true,
"_components": [
{
"__id__": 195
"__id__": 197
}
],
"_prefab": null,
......@@ -9047,13 +9144,13 @@
"_name": "bg_win",
"_objFlags": 0,
"_parent": {
"__id__": 190
"__id__": 192
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 192
"__id__": 194
}
],
"_prefab": null,
......@@ -9109,7 +9206,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 191
"__id__": 193
},
"_enabled": true,
"_materials": [
......@@ -9141,13 +9238,13 @@
"_name": "bg_lose",
"_objFlags": 0,
"_parent": {
"__id__": 190
"__id__": 192
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 194
"__id__": 196
}
],
"_prefab": null,
......@@ -9203,7 +9300,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 193
"__id__": 195
},
"_enabled": true,
"_materials": [
......@@ -9235,7 +9332,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 190
"__id__": 192
},
"_enabled": true,
"alignMode": 1,
......@@ -9266,25 +9363,25 @@
},
"_children": [
{
"__id__": 197
"__id__": 199
},
{
"__id__": 200
"__id__": 202
},
{
"__id__": 203
"__id__": 205
},
{
"__id__": 206
"__id__": 208
},
{
"__id__": 209
"__id__": 211
}
],
"_active": false,
"_components": [
{
"__id__": 211
"__id__": 213
}
],
"_prefab": null,
......@@ -9340,16 +9437,16 @@
"_name": "New Sprite(Splash)",
"_objFlags": 0,
"_parent": {
"__id__": 196
"__id__": 198
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 198
"__id__": 200
},
{
"__id__": 199
"__id__": 201
}
],
"_prefab": null,
......@@ -9405,7 +9502,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 197
"__id__": 199
},
"_enabled": true,
"_materials": [
......@@ -9437,7 +9534,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 197
"__id__": 199
},
"_enabled": true,
"alignMode": 1,
......@@ -9464,16 +9561,16 @@
"_name": "bg_vs",
"_objFlags": 0,
"_parent": {
"__id__": 196
"__id__": 198
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 201
"__id__": 203
},
{
"__id__": 202
"__id__": 204
}
],
"_prefab": null,
......@@ -9529,7 +9626,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 200
"__id__": 202
},
"_enabled": true,
"_materials": [
......@@ -9561,7 +9658,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 200
"__id__": 202
},
"_enabled": true,
"alignMode": 1,
......@@ -9588,16 +9685,16 @@
"_name": "player1",
"_objFlags": 0,
"_parent": {
"__id__": 196
"__id__": 198
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 204
"__id__": 206
},
{
"__id__": 205
"__id__": 207
}
],
"_prefab": null,
......@@ -9653,7 +9750,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 203
"__id__": 205
},
"_enabled": true,
"_materials": [
......@@ -9685,7 +9782,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 203
"__id__": 205
},
"_enabled": false,
"alignMode": 1,
......@@ -9712,16 +9809,16 @@
"_name": "player2",
"_objFlags": 0,
"_parent": {
"__id__": 196
"__id__": 198
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 207
"__id__": 209
},
{
"__id__": 208
"__id__": 210
}
],
"_prefab": null,
......@@ -9777,7 +9874,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 206
"__id__": 208
},
"_enabled": true,
"_materials": [
......@@ -9809,7 +9906,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 206
"__id__": 208
},
"_enabled": false,
"alignMode": 1,
......@@ -9836,13 +9933,13 @@
"_name": "icon_vs",
"_objFlags": 0,
"_parent": {
"__id__": 196
"__id__": 198
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 210
"__id__": 212
}
],
"_prefab": null,
......@@ -9898,7 +9995,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 209
"__id__": 211
},
"_enabled": true,
"_materials": [
......@@ -9930,7 +10027,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 196
"__id__": 198
},
"_enabled": true,
"alignMode": 1,
......@@ -9960,9 +10057,6 @@
"__id__": 2
},
"_children": [
{
"__id__": 213
},
{
"__id__": 215
},
......@@ -9971,6 +10065,9 @@
},
{
"__id__": 219
},
{
"__id__": 221
}
],
"_active": false,
......@@ -10028,13 +10125,13 @@
"_name": "New Sprite(Splash)",
"_objFlags": 0,
"_parent": {
"__id__": 212
"__id__": 214
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 214
"__id__": 216
}
],
"_prefab": null,
......@@ -10090,7 +10187,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 213
"__id__": 215
},
"_enabled": true,
"_materials": [
......@@ -10122,13 +10219,13 @@
"_name": "bg_di",
"_objFlags": 0,
"_parent": {
"__id__": 212
"__id__": 214
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 216
"__id__": 218
}
],
"_prefab": null,
......@@ -10184,7 +10281,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 215
"__id__": 217
},
"_enabled": true,
"_materials": [
......@@ -10216,13 +10313,13 @@
"_name": "desc",
"_objFlags": 0,
"_parent": {
"__id__": 212
"__id__": 214
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 218
"__id__": 220
}
],
"_prefab": null,
......@@ -10278,7 +10375,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 217
"__id__": 219
},
"_enabled": true,
"_materials": [
......@@ -10313,16 +10410,16 @@
"_name": "btn_start",
"_objFlags": 0,
"_parent": {
"__id__": 212
"__id__": 214
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 220
"__id__": 222
},
{
"__id__": 221
"__id__": 223
}
],
"_prefab": null,
......@@ -10378,7 +10475,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 219
"__id__": 221
},
"_enabled": true,
"_materials": [
......@@ -10410,7 +10507,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 219
"__id__": 221
},
"_enabled": true,
"_normalMaterial": null,
......@@ -10481,9 +10578,6 @@
"__id__": 2
},
"_children": [
{
"__id__": 223
},
{
"__id__": 225
},
......@@ -10498,6 +10592,9 @@
},
{
"__id__": 233
},
{
"__id__": 235
}
],
"_active": true,
......@@ -10555,13 +10652,13 @@
"_name": "bg_sahua",
"_objFlags": 0,
"_parent": {
"__id__": 222
"__id__": 224
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 224
"__id__": 226
}
],
"_prefab": null,
......@@ -10617,7 +10714,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 223
"__id__": 225
},
"_enabled": true,
"_materials": [
......@@ -10649,13 +10746,13 @@
"_name": "bg_sahua",
"_objFlags": 0,
"_parent": {
"__id__": 222
"__id__": 224
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 226
"__id__": 228
}
],
"_prefab": null,
......@@ -10711,7 +10808,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 225
"__id__": 227
},
"_enabled": true,
"_materials": [
......@@ -10743,13 +10840,13 @@
"_name": "bg_sahua",
"_objFlags": 0,
"_parent": {
"__id__": 222
"__id__": 224
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 228
"__id__": 230
}
],
"_prefab": null,
......@@ -10805,7 +10902,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 227
"__id__": 229
},
"_enabled": true,
"_materials": [
......@@ -10837,13 +10934,13 @@
"_name": "bg_sahua",
"_objFlags": 0,
"_parent": {
"__id__": 222
"__id__": 224
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 230
"__id__": 232
}
],
"_prefab": null,
......@@ -10899,7 +10996,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 229
"__id__": 231
},
"_enabled": true,
"_materials": [
......@@ -10931,13 +11028,13 @@
"_name": "bg_sahua",
"_objFlags": 0,
"_parent": {
"__id__": 222
"__id__": 224
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 232
"__id__": 234
}
],
"_prefab": null,
......@@ -10993,7 +11090,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 231
"__id__": 233
},
"_enabled": true,
"_materials": [
......@@ -11025,13 +11122,13 @@
"_name": "bg_sahua",
"_objFlags": 0,
"_parent": {
"__id__": 222
"__id__": 224
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 234
"__id__": 236
}
],
"_prefab": null,
......@@ -11087,7 +11184,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 233
"__id__": 235
},
"_enabled": true,
"_materials": [
......
......@@ -96,8 +96,15 @@ export default class SpeakRecord extends cc.Component {
updateBoard() {
let text = pg.view.find(this.text_tip, "text");
let img = pg.view.find(this.text_tip, "img");
let img_big = pg.view.find(this.text_tip, "img_big");
let ext = this.data.ext;
pg.view.setNetImg(img, ext.img, { w: 550, h: 270 })
pg.view.visible(img, !!ext.tip)
pg.view.visible(img_big, !ext.tip)
if (!ext.tip) {
pg.view.setNetImg(img_big, ext.img, { w: 550, h: 350 })
} else {
pg.view.setNetImg(img, ext.img, { w: 550, h: 270 })
}
pg.view.setString(text, ext.tip);
this.onTouchVoice();
pg.view.touchOn(img, this.onTouchVoice, this);
......
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