Commit 63789dc5 authored by 范雪寒's avatar 范雪寒

fix: 多个点击

parent 902490a2
...@@ -17,16 +17,16 @@ ...@@ -17,16 +17,16 @@
"__id__": 2 "__id__": 2
}, },
{ {
"__id__": 108 "__id__": 104
}, },
{ {
"__id__": 110 "__id__": 106
}, },
{ {
"__id__": 112 "__id__": 108
}, },
{ {
"__id__": 114 "__id__": 110
} }
], ],
"_active": false, "_active": false,
...@@ -84,19 +84,19 @@ ...@@ -84,19 +84,19 @@
"__id__": 3 "__id__": 3
}, },
{ {
"__id__": 97 "__id__": 93
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 105 "__id__": 101
}, },
{ {
"__id__": 106 "__id__": 102
}, },
{ {
"__id__": 107 "__id__": 103
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -171,10 +171,10 @@ ...@@ -171,10 +171,10 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 95 "__id__": 91
}, },
{ {
"__id__": 96 "__id__": 92
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4480,21 +4480,14 @@ ...@@ -4480,21 +4480,14 @@
"_parent": { "_parent": {
"__id__": 3 "__id__": 3
}, },
"_children": [ "_children": [],
{
"__id__": 89
},
{
"__id__": 91
}
],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 93 "__id__": 89
}, },
{ {
"__id__": 94 "__id__": 90
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4508,7 +4501,7 @@ ...@@ -4508,7 +4501,7 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 421, "width": 804,
"height": 95 "height": 95
}, },
"_anchorPoint": { "_anchorPoint": {
...@@ -4520,7 +4513,7 @@ ...@@ -4520,7 +4513,7 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
429.5, 238,
-282.5, -282.5,
0, 0,
0, 0,
...@@ -4545,197 +4538,6 @@ ...@@ -4545,197 +4538,6 @@
"groupIndex": 0, "groupIndex": 0,
"_id": "ebcdiQiHNAmb4QJXyOkWEi" "_id": "ebcdiQiHNAmb4QJXyOkWEi"
}, },
{
"__type__": "cc.Node",
"_name": "tipLabel",
"_objFlags": 0,
"_parent": {
"__id__": 88
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 90
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 244,
"g": 245,
"b": 211,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 293.2,
"height": 50.4
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
-8.03,
-19.501,
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": "c3+boURSNJLqoi3Ms+b0Jp"
},
{
"__type__": "cc.Label",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 89
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_string": "Tick if S masters them.",
"_N$string": "Tick if S masters them.",
"_fontSize": 24,
"_lineHeight": 40,
"_enableWrapText": true,
"_N$file": {
"__uuid__": "f5946259-9a27-4b99-b41b-c6dc8e77cbe0"
},
"_isSystemFontUsed": false,
"_spacingX": 0,
"_batchAsBitmap": false,
"_styleFlags": 0,
"_underlineHeight": 0,
"_N$horizontalAlign": 1,
"_N$verticalAlign": 1,
"_N$fontFamily": "Arial",
"_N$overflow": 0,
"_N$cacheMode": 0,
"_id": "baHTjAE/5KHYPsevq0/dCv"
},
{
"__type__": "cc.Node",
"_name": "starNode",
"_objFlags": 0,
"_parent": {
"__id__": 88
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 92
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 35,
"height": 34
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
-87.18,
-19.501,
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": "af8kSYKfNM2riQdBG4R0o+"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 91
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "7433433b-8085-4fa6-adef-205b1d3b5beb"
},
"_type": 0,
"_sizeMode": 1,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "d1+kvYSAZB4Y/Mf9aTRSE8"
},
{ {
"__type__": "cc.Sprite", "__type__": "cc.Sprite",
"_name": "", "_name": "",
...@@ -4863,7 +4665,7 @@ ...@@ -4863,7 +4665,7 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 98 "__id__": 94
} }
], ],
"_active": true, "_active": true,
...@@ -4921,17 +4723,17 @@ ...@@ -4921,17 +4723,17 @@
"_name": "testBtn", "_name": "testBtn",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 97 "__id__": 93
}, },
"_children": [ "_children": [
{ {
"__id__": 99 "__id__": 95
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 104 "__id__": 100
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4987,20 +4789,20 @@ ...@@ -4987,20 +4789,20 @@
"_name": "Background", "_name": "Background",
"_objFlags": 512, "_objFlags": 512,
"_parent": { "_parent": {
"__id__": 98 "__id__": 94
}, },
"_children": [ "_children": [
{ {
"__id__": 100 "__id__": 96
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 102 "__id__": 98
}, },
{ {
"__id__": 103 "__id__": 99
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5056,13 +4858,13 @@ ...@@ -5056,13 +4858,13 @@
"_name": "Label", "_name": "Label",
"_objFlags": 512, "_objFlags": 512,
"_parent": { "_parent": {
"__id__": 99 "__id__": 95
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 101 "__id__": 97
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5118,7 +4920,7 @@ ...@@ -5118,7 +4920,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 100 "__id__": 96
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -5151,7 +4953,7 @@ ...@@ -5151,7 +4953,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 99 "__id__": 95
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -5183,7 +4985,7 @@ ...@@ -5183,7 +4985,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 99 "__id__": 95
}, },
"_enabled": true, "_enabled": true,
"alignMode": 0, "alignMode": 0,
...@@ -5210,7 +5012,7 @@ ...@@ -5210,7 +5012,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 98 "__id__": 94
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -5283,7 +5085,7 @@ ...@@ -5283,7 +5085,7 @@
"__uuid__": "29158224-f8dd-4661-a796-1ffab537140e" "__uuid__": "29158224-f8dd-4661-a796-1ffab537140e"
}, },
"_N$target": { "_N$target": {
"__id__": 99 "__id__": 95
}, },
"_id": "0bNdPv3K1CubNfgwCtNZnD" "_id": "0bNdPv3K1CubNfgwCtNZnD"
}, },
...@@ -5352,7 +5154,7 @@ ...@@ -5352,7 +5154,7 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 109 "__id__": 105
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5408,7 +5210,7 @@ ...@@ -5408,7 +5210,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 108 "__id__": 104
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -5449,7 +5251,7 @@ ...@@ -5449,7 +5251,7 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 111 "__id__": 107
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5505,7 +5307,7 @@ ...@@ -5505,7 +5307,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 110 "__id__": 106
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -5543,7 +5345,7 @@ ...@@ -5543,7 +5345,7 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 113 "__id__": 109
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5599,7 +5401,7 @@ ...@@ -5599,7 +5401,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 112 "__id__": 108
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
...@@ -5624,7 +5426,7 @@ ...@@ -5624,7 +5426,7 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 115 "__id__": 111
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5680,7 +5482,7 @@ ...@@ -5680,7 +5482,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 114 "__id__": 110
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
......
...@@ -185,7 +185,12 @@ cc.Class({ ...@@ -185,7 +185,12 @@ cc.Class({
if (!this.teachFlag) { if (!this.teachFlag) {
return; return;
} }
console.log('idx = ' + idx); if (this._status.currentShowOptionIdx !== null) {
return;
}
if (this._status.currentShowQuestion !== false) {
return;
}
this.sendServerEvent('clickOption', { data: { idx: idx }, status: this._status }); this.sendServerEvent('clickOption', { data: { idx: idx }, status: this._status });
}); });
}); });
...@@ -195,6 +200,12 @@ cc.Class({ ...@@ -195,6 +200,12 @@ cc.Class({
if (!this.teachFlag) { if (!this.teachFlag) {
return; return;
} }
if (this._status.currentShowOptionIdx !== null) {
return;
}
if (this._status.currentShowQuestion !== false) {
return;
}
this.sendServerEvent('clickQuestion', null); this.sendServerEvent('clickQuestion', null);
}); });
}, },
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
"premultiplyAlpha": false, "premultiplyAlpha": false,
"genMipmaps": false, "genMipmaps": false,
"packable": true, "packable": true,
"width": 421, "width": 804,
"height": 95, "height": 95,
"platformSettings": {}, "platformSettings": {},
"subMetas": { "subMetas": {
...@@ -22,9 +22,9 @@ ...@@ -22,9 +22,9 @@
"offsetY": 0, "offsetY": 0,
"trimX": 0, "trimX": 0,
"trimY": 0, "trimY": 0,
"width": 421, "width": 804,
"height": 95, "height": 95,
"rawWidth": 421, "rawWidth": 804,
"rawHeight": 95, "rawHeight": 95,
"borderTop": 0, "borderTop": 0,
"borderBottom": 0, "borderBottom": 0,
......
{"ios":{"sceneName":"AK09","version":"180f8"},"android":{"sceneName":"AK09","version":"180f8"}} {"ios":{"sceneName":"AK09","version":"0f3c7"},"android":{"sceneName":"AK09","version":"0f3c7"}}
\ No newline at end of file \ No newline at end of file
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