Commit 104e7e3b authored by 杨一航's avatar 杨一航

fix

parent 45090d89
......@@ -27,14 +27,14 @@
"_active": true,
"_components": [
{
"__id__": 86
"__id__": 89
},
{
"__id__": 87
"__id__": 90
}
],
"_prefab": {
"__id__": 88
"__id__": 91
},
"_opacity": 255,
"_color": {
......@@ -248,34 +248,34 @@
"__id__": 11
},
{
"__id__": 28
"__id__": 31
},
{
"__id__": 45
"__id__": 48
},
{
"__id__": 54
"__id__": 57
},
{
"__id__": 63
"__id__": 66
},
{
"__id__": 67
"__id__": 70
},
{
"__id__": 73
"__id__": 76
},
{
"__id__": 79
"__id__": 82
},
{
"__id__": 82
"__id__": 85
}
],
"_active": true,
"_components": [],
"_prefab": {
"__id__": 85
"__id__": 88
},
"_opacity": 255,
"_color": {
......@@ -453,12 +453,15 @@
},
{
"__id__": 24
},
{
"__id__": 27
}
],
"_active": true,
"_components": [],
"_prefab": {
"__id__": 27
"__id__": 30
},
"_opacity": 255,
"_color": {
......@@ -718,7 +721,7 @@
},
{
"__type__": "cc.Node",
"_name": "top",
"_name": "bg",
"_objFlags": 0,
"_parent": {
"__id__": 11
......@@ -741,6 +744,113 @@
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 1180,
"height": 832
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
-4.13,
-103.24,
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": ""
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 18
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "62d04316-ec71-4372-8bb5-34e18060b23f"
},
"_type": 0,
"_sizeMode": 1,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": ""
},
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 1
},
"asset": {
"__uuid__": "84b72720-2013-4f2b-b787-52900432f34f"
},
"fileId": "7bUYmjD1NPDrsh4aOHpyhn",
"sync": false
},
{
"__type__": "cc.Node",
"_name": "top",
"_objFlags": 0,
"_parent": {
"__id__": 11
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 22
}
],
"_prefab": {
"__id__": 23
},
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 1589,
......@@ -785,7 +895,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 18
"__id__": 21
},
"_enabled": true,
"_materials": [
......@@ -834,11 +944,11 @@
"_active": true,
"_components": [
{
"__id__": 22
"__id__": 25
}
],
"_prefab": {
"__id__": 23
"__id__": 26
},
"_opacity": 255,
"_color": {
......@@ -892,7 +1002,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 21
"__id__": 24
},
"_enabled": true,
"_materials": [
......@@ -941,11 +1051,11 @@
"_active": true,
"_components": [
{
"__id__": 25
"__id__": 28
}
],
"_prefab": {
"__id__": 26
"__id__": 29
},
"_opacity": 255,
"_color": {
......@@ -999,7 +1109,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 24
"__id__": 27
},
"_enabled": true,
"_materials": [
......@@ -1056,9 +1166,6 @@
"__id__": 7
},
"_children": [
{
"__id__": 29
},
{
"__id__": 32
},
......@@ -1070,12 +1177,15 @@
},
{
"__id__": 41
},
{
"__id__": 44
}
],
"_active": true,
"_components": [],
"_prefab": {
"__id__": 44
"__id__": 47
},
"_opacity": 255,
"_color": {
......@@ -1129,17 +1239,17 @@
"_name": "audio",
"_objFlags": 0,
"_parent": {
"__id__": 28
"__id__": 31
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 30
"__id__": 33
}
],
"_prefab": {
"__id__": 31
"__id__": 34
},
"_opacity": 255,
"_color": {
......@@ -1193,7 +1303,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 29
"__id__": 32
},
"_enabled": true,
"_clip": {
......@@ -1223,17 +1333,17 @@
"_name": "top",
"_objFlags": 0,
"_parent": {
"__id__": 28
"__id__": 31
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 33
"__id__": 36
}
],
"_prefab": {
"__id__": 34
"__id__": 37
},
"_opacity": 255,
"_color": {
......@@ -1287,7 +1397,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 32
"__id__": 35
},
"_enabled": true,
"_materials": [
......@@ -1330,17 +1440,17 @@
"_name": "reward",
"_objFlags": 0,
"_parent": {
"__id__": 28
"__id__": 31
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 36
"__id__": 39
}
],
"_prefab": {
"__id__": 37
"__id__": 40
},
"_opacity": 255,
"_color": {
......@@ -1394,7 +1504,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 35
"__id__": 38
},
"_enabled": true,
"_materials": [
......@@ -1437,17 +1547,17 @@
"_name": "LOSE",
"_objFlags": 0,
"_parent": {
"__id__": 28
"__id__": 31
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 39
"__id__": 42
}
],
"_prefab": {
"__id__": 40
"__id__": 43
},
"_opacity": 255,
"_color": {
......@@ -1501,7 +1611,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 38
"__id__": 41
},
"_enabled": true,
"_materials": [
......@@ -1544,17 +1654,17 @@
"_name": "ani",
"_objFlags": 0,
"_parent": {
"__id__": 28
"__id__": 31
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 42
"__id__": 45
}
],
"_prefab": {
"__id__": 43
"__id__": 46
},
"_opacity": 255,
"_color": {
......@@ -1608,7 +1718,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 41
"__id__": 44
},
"_enabled": true,
"_materials": [
......@@ -1674,17 +1784,17 @@
},
"_children": [
{
"__id__": 46
"__id__": 49
}
],
"_active": true,
"_components": [
{
"__id__": 52
"__id__": 55
}
],
"_prefab": {
"__id__": 53
"__id__": 56
},
"_opacity": 255,
"_color": {
......@@ -1738,21 +1848,21 @@
"_name": "mask",
"_objFlags": 0,
"_parent": {
"__id__": 45
"__id__": 48
},
"_children": [
{
"__id__": 47
"__id__": 50
}
],
"_active": true,
"_components": [
{
"__id__": 50
"__id__": 53
}
],
"_prefab": {
"__id__": 51
"__id__": 54
},
"_opacity": 255,
"_color": {
......@@ -1806,17 +1916,17 @@
"_name": "redIcon",
"_objFlags": 0,
"_parent": {
"__id__": 46
"__id__": 49
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 48
"__id__": 51
}
],
"_prefab": {
"__id__": 49
"__id__": 52
},
"_opacity": 255,
"_color": {
......@@ -1870,7 +1980,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 47
"__id__": 50
},
"_enabled": true,
"_materials": [
......@@ -1911,7 +2021,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 46
"__id__": 49
},
"_enabled": true,
"_materials": [
......@@ -1942,7 +2052,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 45
"__id__": 48
},
"_enabled": true,
"_materials": [
......@@ -1989,17 +2099,17 @@
},
"_children": [
{
"__id__": 55
"__id__": 58
}
],
"_active": true,
"_components": [
{
"__id__": 61
"__id__": 64
}
],
"_prefab": {
"__id__": 62
"__id__": 65
},
"_opacity": 255,
"_color": {
......@@ -2053,21 +2163,21 @@
"_name": "mask",
"_objFlags": 0,
"_parent": {
"__id__": 54
"__id__": 57
},
"_children": [
{
"__id__": 56
"__id__": 59
}
],
"_active": true,
"_components": [
{
"__id__": 59
"__id__": 62
}
],
"_prefab": {
"__id__": 60
"__id__": 63
},
"_opacity": 255,
"_color": {
......@@ -2121,17 +2231,17 @@
"_name": "blueIcon",
"_objFlags": 0,
"_parent": {
"__id__": 55
"__id__": 58
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 57
"__id__": 60
}
],
"_prefab": {
"__id__": 58
"__id__": 61
},
"_opacity": 255,
"_color": {
......@@ -2185,7 +2295,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 56
"__id__": 59
},
"_enabled": true,
"_materials": [
......@@ -2226,7 +2336,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 55
"__id__": 58
},
"_enabled": true,
"_materials": [
......@@ -2257,7 +2367,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 54
"__id__": 57
},
"_enabled": true,
"_materials": [
......@@ -2306,14 +2416,14 @@
"_active": true,
"_components": [
{
"__id__": 64
"__id__": 67
},
{
"__id__": 65
"__id__": 68
}
],
"_prefab": {
"__id__": 66
"__id__": 69
},
"_opacity": 255,
"_color": {
......@@ -2367,7 +2477,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 63
"__id__": 66
},
"_enabled": true,
"_materials": [
......@@ -2399,7 +2509,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 63
"__id__": 66
},
"_enabled": true,
"_normalMaterial": null,
......@@ -2482,17 +2592,17 @@
},
"_children": [
{
"__id__": 68
"__id__": 71
}
],
"_active": true,
"_components": [
{
"__id__": 71
"__id__": 74
}
],
"_prefab": {
"__id__": 72
"__id__": 75
},
"_opacity": 255,
"_color": {
......@@ -2546,17 +2656,17 @@
"_name": "New Sprite",
"_objFlags": 0,
"_parent": {
"__id__": 67
"__id__": 70
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 69
"__id__": 72
}
],
"_prefab": {
"__id__": 70
"__id__": 73
},
"_opacity": 255,
"_color": {
......@@ -2610,7 +2720,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 68
"__id__": 71
},
"_enabled": true,
"_materials": [
......@@ -2653,7 +2763,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 67
"__id__": 70
},
"_enabled": true,
"_materials": [
......@@ -2700,17 +2810,17 @@
},
"_children": [
{
"__id__": 74
"__id__": 77
}
],
"_active": true,
"_components": [
{
"__id__": 77
"__id__": 80
}
],
"_prefab": {
"__id__": 78
"__id__": 81
},
"_opacity": 255,
"_color": {
......@@ -2764,17 +2874,17 @@
"_name": "New Sprite",
"_objFlags": 0,
"_parent": {
"__id__": 73
"__id__": 76
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 75
"__id__": 78
}
],
"_prefab": {
"__id__": 76
"__id__": 79
},
"_opacity": 255,
"_color": {
......@@ -2828,7 +2938,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 74
"__id__": 77
},
"_enabled": true,
"_materials": [
......@@ -2871,7 +2981,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 73
"__id__": 76
},
"_enabled": true,
"_materials": [
......@@ -2920,11 +3030,11 @@
"_active": true,
"_components": [
{
"__id__": 80
"__id__": 83
}
],
"_prefab": {
"__id__": 81
"__id__": 84
},
"_opacity": 255,
"_color": {
......@@ -2978,7 +3088,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 79
"__id__": 82
},
"_enabled": true,
"_materials": [
......@@ -3028,11 +3138,11 @@
"_active": true,
"_components": [
{
"__id__": 83
"__id__": 86
}
],
"_prefab": {
"__id__": 84
"__id__": 87
},
"_opacity": 255,
"_color": {
......@@ -3086,7 +3196,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 82
"__id__": 85
},
"_enabled": true,
"_materials": [
......@@ -3151,28 +3261,28 @@
"__id__": 11
},
"loseRoot": {
"__id__": 28
"__id__": 31
},
"redIcon": {
"__id__": 47
"__id__": 50
},
"blueIcon": {
"__id__": 56
"__id__": 59
},
"redCard": {
"__id__": 68
"__id__": 71
},
"blueCard": {
"__id__": 74
"__id__": 77
},
"lb_red": {
"__id__": 80
"__id__": 83
},
"lb_blue": {
"__id__": 83
"__id__": 86
},
"replayNode": {
"__id__": 63
"__id__": 66
},
"_id": ""
},
......
......@@ -534,10 +534,13 @@ export default class SceneComponent extends MyCocosSceneComponent {
if (data.round == 1) {
data = new MsgData(data);
let aniCall = () => {
this._sendMsg(MsgType.USER_PREPARE_REQ, {});
let aniCall = async () => {
this._keyboard.showOut();
this.inputNode.active = true;
await asyncDelay(0.3)
this._sendMsg(MsgType.USER_PREPARE_REQ, {});
// this.btn_record.active = true;
}
......@@ -571,7 +574,7 @@ export default class SceneComponent extends MyCocosSceneComponent {
this.btn_record.active = true;
this.btn_record.y = -cc.winSize.height / 2;
cc.tween(this.btn_record).to(1, { y: this.btn_record.height - cc.winSize.height / 2 }).start();
cc.tween(this.btn_record).to(0.3, { y: this.btn_record.height - cc.winSize.height / 2 }).start();
})
......
......@@ -11,7 +11,7 @@
"height": 184,
"platformSettings": {},
"subMetas": {
"Chip": {
"monkey": {
"ver": "1.0.4",
"uuid": "12c69ccb-fe81-40ab-a11c-581f65b841eb",
"rawTextureUuid": "07b303c0-25b6-4eb2-b670-e2a15173ed19",
......
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