Commit 65e70e7a authored by xytk's avatar xytk

提交代码

parent 189d60a0
......@@ -5,7 +5,7 @@
"_native": "",
"_duration": 0.06666666666666667,
"sample": 60,
"speed": 0.3,
"speed": 0.15,
"wrapMode": 2,
"curveData": {
"comps": {
......
......@@ -78,28 +78,28 @@
"__id__": 8
},
{
"__id__": 15
"__id__": 17
},
{
"__id__": 32
"__id__": 35
},
{
"__id__": 41
"__id__": 45
}
],
"_active": true,
"_components": [
{
"__id__": 51
"__id__": 55
},
{
"__id__": 52
"__id__": 56
},
{
"__id__": 54
"__id__": 58
},
{
"__id__": 53
"__id__": 57
}
],
"_prefab": null,
......@@ -189,7 +189,7 @@
"array": [
0,
0,
840.3829328442588,
585.4331729582806,
0,
0,
0,
......@@ -390,7 +390,10 @@
"_active": true,
"_components": [
{
"__id__": 14
"__id__": 15
},
{
"__id__": 16
}
],
"_prefab": null,
......@@ -416,8 +419,8 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
0,
0,
-556,
351,
0,
0,
0,
......@@ -475,14 +478,14 @@
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0.5
"y": 1
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
-586.397,
304.729,
0,
0,
0,
0,
0,
......@@ -566,6 +569,9 @@
"_components": [
{
"__id__": 13
},
{
"__id__": 14
}
],
"_prefab": null,
......@@ -579,20 +585,20 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 320.88,
"height": 50.4
"width": 324.88,
"height": 54.4
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0.5
"y": 1
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
-479.331,
304.729,
113.648,
-20,
0,
0,
0,
......@@ -652,6 +658,24 @@
"_N$cacheMode": 0,
"_id": "d14n7BeJBEjbZC3gnIOME6"
},
{
"__type__": "cc.LabelOutline",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 12
},
"_enabled": true,
"_color": {
"__type__": "cc.Color",
"r": 230,
"g": 51,
"b": 65,
"a": 255
},
"_width": 2,
"_id": "50d1cSC7NFzrszSyu+vdkW"
},
{
"__type__": "83c44u0rt9GionenYKXF9Ta",
"_name": "",
......@@ -668,6 +692,33 @@
},
"_id": "c6IjBS3upM3ofigBlX7xTe"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 8
},
"_enabled": true,
"alignMode": 1,
"_target": null,
"_alignFlags": 9,
"_left": 84,
"_right": 0,
"_top": 9,
"_bottom": 0,
"_verticalCenter": 0,
"_horizontalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 0,
"_originalHeight": 0,
"_id": "05omO73qJOh5VXpxie3Z7r"
},
{
"__type__": "cc.Node",
"_name": "middle",
......@@ -677,22 +728,25 @@
},
"_children": [
{
"__id__": 16
"__id__": 18
},
{
"__id__": 18
"__id__": 20
},
{
"__id__": 23
"__id__": 25
},
{
"__id__": 27
"__id__": 29
}
],
"_active": true,
"_components": [
{
"__id__": 31
"__id__": 33
},
{
"__id__": 34
}
],
"_prefab": null,
......@@ -706,7 +760,7 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 1023.9999999999998,
"width": 1108,
"height": 431.9999999999999
},
"_anchorPoint": {
......@@ -748,13 +802,13 @@
"_name": "bg",
"_objFlags": 0,
"_parent": {
"__id__": 15
"__id__": 17
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 17
"__id__": 19
}
],
"_prefab": null,
......@@ -810,7 +864,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 16
"__id__": 18
},
"_enabled": true,
"_materials": [
......@@ -842,20 +896,20 @@
"_name": "dragonBone",
"_objFlags": 0,
"_parent": {
"__id__": 15
"__id__": 17
},
"_children": [
{
"__id__": 19
"__id__": 21
}
],
"_active": true,
"_components": [
{
"__id__": 21
"__id__": 23
},
{
"__id__": 22
"__id__": 24
}
],
"_prefab": null,
......@@ -869,7 +923,7 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 402.08407761575506,
"width": 431.5958073617139,
"height": 313.1361171716606
},
"_anchorPoint": {
......@@ -881,7 +935,7 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
-353.2799999999999,
-380.5241351270206,
0,
0,
0,
......@@ -911,13 +965,13 @@
"_name": "DEBUG_DRAW_NODE",
"_objFlags": 1024,
"_parent": {
"__id__": 18
"__id__": 20
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 20
"__id__": 22
}
],
"_prefab": null,
......@@ -975,7 +1029,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 19
"__id__": 21
},
"_enabled": true,
"_materials": [
......@@ -1008,7 +1062,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 18
"__id__": 20
},
"_enabled": true,
"alignMode": 1,
......@@ -1035,7 +1089,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 18
"__id__": 20
},
"_enabled": true,
"_clip": null,
......@@ -1051,19 +1105,19 @@
"_name": "picA",
"_objFlags": 0,
"_parent": {
"__id__": 15
"__id__": 17
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 24
"__id__": 26
},
{
"__id__": 25
"__id__": 27
},
{
"__id__": 26
"__id__": 28
}
],
"_prefab": null,
......@@ -1077,7 +1131,7 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 294,
"width": 318.1171875000001,
"height": 323
},
"_anchorPoint": {
......@@ -1119,7 +1173,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 23
"__id__": 25
},
"_enabled": true,
"_materials": [
......@@ -1149,7 +1203,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 23
"__id__": 25
},
"_enabled": true,
"alignMode": 1,
......@@ -1176,7 +1230,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 23
"__id__": 25
},
"_enabled": true,
"_clip": null,
......@@ -1192,19 +1246,19 @@
"_name": "picC",
"_objFlags": 0,
"_parent": {
"__id__": 15
"__id__": 17
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 28
"__id__": 30
},
{
"__id__": 29
"__id__": 31
},
{
"__id__": 30
"__id__": 32
}
],
"_prefab": null,
......@@ -1218,7 +1272,7 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 277.99999999999994,
"width": 300.8046875,
"height": 316
},
"_anchorPoint": {
......@@ -1230,7 +1284,7 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
353.28,
382.26,
0,
0,
0,
......@@ -1260,7 +1314,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 27
"__id__": 29
},
"_enabled": true,
"_materials": [
......@@ -1290,7 +1344,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 27
"__id__": 29
},
"_enabled": true,
"alignMode": 1,
......@@ -1317,7 +1371,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 27
"__id__": 29
},
"_enabled": true,
"_clip": null,
......@@ -1333,20 +1387,47 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 15
"__id__": 17
},
"_enabled": true,
"dragonBoneAudioSource": {
"__id__": 22
"__id__": 24
},
"picAAudioSource": {
"__id__": 26
"__id__": 28
},
"picCAudioSource": {
"__id__": 30
"__id__": 32
},
"_id": "a2RsgrevxLALki66+UKTAy"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 17
},
"_enabled": true,
"alignMode": 1,
"_target": null,
"_alignFlags": 40,
"_left": 86,
"_right": 86,
"_top": 0,
"_bottom": 0,
"_verticalCenter": 0,
"_horizontalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 1023.9999999999998,
"_originalHeight": 0,
"_id": "60BaiJdDtN5r5wMaNGriAT"
},
{
"__type__": "cc.Node",
"_name": "bottom",
......@@ -1356,16 +1437,19 @@
},
"_children": [
{
"__id__": 33
"__id__": 36
},
{
"__id__": 37
"__id__": 40
}
],
"_active": true,
"_components": [
{
"__id__": 40
"__id__": 43
},
{
"__id__": 44
}
],
"_prefab": null,
......@@ -1392,7 +1476,7 @@
"ctor": "Float64Array",
"array": [
0,
-237.194,
-280,
0,
0,
0,
......@@ -1421,19 +1505,19 @@
"_name": "label",
"_objFlags": 0,
"_parent": {
"__id__": 32
"__id__": 35
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 34
"__id__": 37
},
{
"__id__": 35
"__id__": 38
},
{
"__id__": 36
"__id__": 39
}
],
"_prefab": null,
......@@ -1489,7 +1573,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 33
"__id__": 36
},
"_enabled": true,
"_materials": [
......@@ -1525,7 +1609,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 33
"__id__": 36
},
"_enabled": true,
"_color": {
......@@ -1543,7 +1627,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 33
"__id__": 36
},
"_enabled": true,
"_clip": null,
......@@ -1559,16 +1643,16 @@
"_name": "doc",
"_objFlags": 0,
"_parent": {
"__id__": 32
"__id__": 35
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 38
"__id__": 41
},
{
"__id__": 39
"__id__": 42
}
],
"_prefab": null,
......@@ -1624,7 +1708,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 37
"__id__": 40
},
"_enabled": true,
"_materials": [
......@@ -1656,7 +1740,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 37
"__id__": 40
},
"_enabled": true,
"_defaultClip": {
......@@ -1675,17 +1759,44 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 32
"__id__": 35
},
"_enabled": true,
"doc": {
"__id__": 37
"__id__": 40
},
"text": {
"__id__": 33
"__id__": 36
},
"_id": "624Q23nvtEgp2teq8h6WHj"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 35
},
"_enabled": true,
"alignMode": 1,
"_target": null,
"_alignFlags": 4,
"_left": 0,
"_right": 0,
"_top": 0,
"_bottom": 80,
"_verticalCenter": 0,
"_horizontalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 0,
"_originalHeight": 0,
"_id": "70Zu8iVClD+aCTkCjHtxtg"
},
{
"__type__": "cc.Node",
"_name": "res",
......@@ -1695,13 +1806,13 @@
},
"_children": [
{
"__id__": 42
"__id__": 46
},
{
"__id__": 45
"__id__": 49
},
{
"__id__": 48
"__id__": 52
}
],
"_active": false,
......@@ -1759,11 +1870,11 @@
"_name": "font",
"_objFlags": 0,
"_parent": {
"__id__": 41
"__id__": 45
},
"_children": [
{
"__id__": 43
"__id__": 47
}
],
"_active": true,
......@@ -1821,13 +1932,13 @@
"_name": "BRLNSDB",
"_objFlags": 0,
"_parent": {
"__id__": 42
"__id__": 46
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 44
"__id__": 48
}
],
"_prefab": null,
......@@ -1883,7 +1994,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 43
"__id__": 47
},
"_enabled": true,
"_materials": [
......@@ -1919,11 +2030,11 @@
"_name": "img",
"_objFlags": 0,
"_parent": {
"__id__": 41
"__id__": 45
},
"_children": [
{
"__id__": 46
"__id__": 50
}
],
"_active": true,
......@@ -1981,13 +2092,13 @@
"_name": "icon",
"_objFlags": 0,
"_parent": {
"__id__": 45
"__id__": 49
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 47
"__id__": 51
}
],
"_prefab": null,
......@@ -2043,7 +2154,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 46
"__id__": 50
},
"_enabled": true,
"_materials": [
......@@ -2075,11 +2186,11 @@
"_name": "audio",
"_objFlags": 0,
"_parent": {
"__id__": 41
"__id__": 45
},
"_children": [
{
"__id__": 49
"__id__": 53
}
],
"_active": true,
......@@ -2137,13 +2248,13 @@
"_name": "btn",
"_objFlags": 0,
"_parent": {
"__id__": 48
"__id__": 52
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 50
"__id__": 54
}
],
"_prefab": null,
......@@ -2199,7 +2310,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 49
"__id__": 53
},
"_enabled": true,
"_clip": {
......@@ -2238,25 +2349,25 @@
},
"_enabled": true,
"loadInAudioSource": {
"__id__": 53
"__id__": 57
},
"dragonBonesNode": {
"__id__": 18
"__id__": 20
},
"pic_a_sprite": {
"__id__": 24
"__id__": 26
},
"pic_c_sprite": {
"__id__": 28
"__id__": 30
},
"tittleJs": {
"__id__": 14
"__id__": 15
},
"middleJs": {
"__id__": 31
"__id__": 33
},
"bottomJs": {
"__id__": 40
"__id__": 43
},
"_id": "e687yyoRBIzZAOVRL8Sseh"
},
......
......@@ -92,7 +92,7 @@ cc.Class({
},
getDefaultData() {
const dataJson = '{"bt_text":"11111","bt_audio_url":"http://staging-teach.cdn.ireadabc.com/b0c23eb327ec13212d09516a1a8a49ec.mp3","dragonBone":{"skeJsonData":{"url":"http://staging-teach.cdn.ireadabc.com/14ca834d522122b031a2e18be5129251.json","name":"sb_boy_ske.json"},"texJsonData":{"url":"http://staging-teach.cdn.ireadabc.com/ecc48e23d55b1af8eb40d997dc573791.json","name":"sb_boy_tex.json"},"texPngData":{"url":"http://staging-teach.cdn.ireadabc.com/2d668f8049bc98c0e026921ef316a0fd.png","name":"sb_boy_tex.png"}},"dragonBone_audio_url":"http://staging-teach.cdn.ireadabc.com/b0c23eb327ec13212d09516a1a8a49ec.mp3","pic_A_url":"http://staging-teach.cdn.ireadabc.com/ed0e074ce7c52a469cc78c13a58eb09d.png","pic_C_url":"http://staging-teach.cdn.ireadabc.com/b2423375f6f8bfc4e24568c36b23947d.png","bottom_text":"底部的文本","bottom_audio_url":"http://staging-teach.cdn.ireadabc.com/b0c23eb327ec13212d09516a1a8a49ec.mp3","pic_A_audio_url":"http://staging-teach.cdn.ireadabc.com/b0c23eb327ec13212d09516a1a8a49ec.mp3","pic_C_audio_url":"http://staging-teach.cdn.ireadabc.com/b0c23eb327ec13212d09516a1a8a49ec.mp3","dragonBone_animationName":"unit1_boy_jump","dragonBone_armatureName":"Armature"}'
const dataJson = '{"bt_text":"11111","bt_audio_url":"http://staging-teach.cdn.ireadabc.com/b0c23eb327ec13212d09516a1a8a49ec.mp3","dragonBone":{"skeJsonData":{"url":"http://staging-teach.cdn.ireadabc.com/14ca834d522122b031a2e18be5129251.json","name":"sb_boy_ske.json"},"texJsonData":{"url":"http://staging-teach.cdn.ireadabc.com/ecc48e23d55b1af8eb40d997dc573791.json","name":"sb_boy_tex.json"},"texPngData":{"url":"http://staging-teach.cdn.ireadabc.com/2d668f8049bc98c0e026921ef316a0fd.png","name":"sb_boy_tex.png"}},"dragonBone_audio_url":"http://staging-teach.cdn.ireadabc.com/b0c23eb327ec13212d09516a1a8a49ec.mp3","pic_A_url":"http://staging-teach.cdn.ireadabc.com/79f4b6912d1ffad13da6c05dda328237.jpg","pic_C_url":"http://staging-teach.cdn.ireadabc.com/79f4b6912d1ffad13da6c05dda328237.jpg","bottom_text":"底部的文本","bottom_audio_url":"http://staging-teach.cdn.ireadabc.com/b0c23eb327ec13212d09516a1a8a49ec.mp3","pic_A_audio_url":"http://staging-teach.cdn.ireadabc.com/b0c23eb327ec13212d09516a1a8a49ec.mp3","pic_C_audio_url":"http://staging-teach.cdn.ireadabc.com/b0c23eb327ec13212d09516a1a8a49ec.mp3","dragonBone_animationName":"unit1_boy_jump","dragonBone_armatureName":"Armature"}'
const data = JSON.parse(dataJson);
return data;
},
......@@ -226,10 +226,18 @@ cc.Class({
pic2: null,
initPic() {
this.getSpriteFrimeByUrl(this.data.pic_A_url,(spriteFrame)=>{
let width = this.pic_a_sprite.node.width;
let height = this.pic_a_sprite.node.height;
this.pic_a_sprite.spriteFrame = spriteFrame;
this.pic_a_sprite.node.width = width;
this.pic_a_sprite.node.height = height;
});
this.getSpriteFrimeByUrl(this.data.pic_C_url,(spriteFrame)=>{
let width = this.pic_c_sprite.node.width;
let height = this.pic_c_sprite.node.height;
this.pic_c_sprite.spriteFrame = spriteFrame;
this.pic_c_sprite.node.width = width;
this.pic_c_sprite.node.height = height;
});
},
......
......@@ -14,6 +14,7 @@ export default class NewClass extends cc.Component {
start () {
this.audioSource.node.on(cc.Node.EventType.TOUCH_START,this.playSe,this);
// cc.view.getFrameSize
}
/**
* 设置标题文本
......
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