Commit 5e206824 authored by xytk's avatar xytk

提交代码

parent 6892e582
......@@ -81,25 +81,25 @@
"__id__": 16
},
{
"__id__": 34
"__id__": 32
},
{
"__id__": 44
"__id__": 42
}
],
"_active": true,
"_components": [
{
"__id__": 54
"__id__": 52
},
{
"__id__": 55
"__id__": 53
},
{
"__id__": 57
"__id__": 55
},
{
"__id__": 56
"__id__": 54
}
],
"_prefab": null,
......@@ -189,7 +189,7 @@
"array": [
0,
0,
585.4331729582806,
578.3992193418256,
0,
0,
0,
......@@ -555,8 +555,8 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 324.88,
"height": 54.4
"width": 350,
"height": 56.4
},
"_anchorPoint": {
"__type__": "cc.Vec2",
......@@ -612,7 +612,7 @@
"_N$string": "Listen and Droag",
"_fontSize": 40,
"_lineHeight": 40,
"_enableWrapText": true,
"_enableWrapText": false,
"_N$file": {
"__uuid__": "9de7e940-49b7-4208-a6fd-efbfd529cfa6"
},
......@@ -624,7 +624,7 @@
"_N$horizontalAlign": 0,
"_N$verticalAlign": 1,
"_N$fontFamily": "Arial",
"_N$overflow": 0,
"_N$overflow": 2,
"_N$cacheMode": 0,
"_id": "d14n7BeJBEjbZC3gnIOME6"
},
......@@ -643,7 +643,7 @@
"b": 65,
"a": 255
},
"_width": 2,
"_width": 3,
"_id": "50d1cSC7NFzrszSyu+vdkW"
},
{
......@@ -704,19 +704,19 @@
"__id__": 19
},
{
"__id__": 24
"__id__": 23
},
{
"__id__": 28
"__id__": 27
}
],
"_active": true,
"_components": [
{
"__id__": 32
"__id__": 30
},
{
"__id__": 33
"__id__": 31
}
],
"_prefab": null,
......@@ -877,9 +877,6 @@
"_components": [
{
"__id__": 22
},
{
"__id__": 23
}
],
"_prefab": null,
......@@ -893,8 +890,8 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 431.5958073617139,
"height": 313.1361171716606
"width": 280,
"height": 316
},
"_anchorPoint": {
"__type__": "cc.Vec2",
......@@ -905,7 +902,7 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
-380.5241351270206,
-349.337,
0,
0,
0,
......@@ -1027,33 +1024,6 @@
"_miterLimit": 10,
"_id": "d3x9O4fL5Lf7ECDS07Yg1T"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 19
},
"_enabled": true,
"alignMode": 1,
"_target": null,
"_alignFlags": 45,
"_left": -42.32203880787756,
"_right": 0.648669883976682,
"_top": 0.13757393845872606,
"_bottom": 0.13757393845872606,
"_verticalCenter": 0,
"_horizontalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": false,
"_isAbsTop": false,
"_isAbsBottom": false,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 0,
"_originalHeight": 0,
"_id": "25Y/j0TVlNLaW7n75RnpW0"
},
{
"__type__": "cc.AudioSource",
"_name": "",
......@@ -1081,13 +1051,13 @@
"_active": true,
"_components": [
{
"__id__": 25
"__id__": 24
},
{
"__id__": 26
"__id__": 25
},
{
"__id__": 27
"__id__": 26
}
],
"_prefab": null,
......@@ -1101,8 +1071,8 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 318.1171875000001,
"height": 323
"width": 280,
"height": 316
},
"_anchorPoint": {
"__type__": "cc.Vec2",
......@@ -1143,7 +1113,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 24
"__id__": 23
},
"_enabled": true,
"_materials": [
......@@ -1173,16 +1143,16 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 24
"__id__": 23
},
"_enabled": true,
"alignMode": 1,
"_target": null,
"_alignFlags": 45,
"_left": 0.35644531249999994,
"_right": 0.35644531249999994,
"_top": 0.12615740740740733,
"_bottom": 0.12615740740740733,
"_left": 0.37364620938628157,
"_right": 0.37364620938628157,
"_top": 0.13425925925925913,
"_bottom": 0.13425925925925913,
"_verticalCenter": 0,
"_horizontalCenter": 0,
"_isAbsLeft": false,
......@@ -1200,7 +1170,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 24
"__id__": 23
},
"_enabled": true,
"_clip": null,
......@@ -1222,13 +1192,10 @@
"_active": true,
"_components": [
{
"__id__": 29
},
{
"__id__": 30
"__id__": 28
},
{
"__id__": 31
"__id__": 29
}
],
"_prefab": null,
......@@ -1242,7 +1209,7 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 300.8046875,
"width": 280,
"height": 316
},
"_anchorPoint": {
......@@ -1254,7 +1221,7 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
382.26,
335.48,
0,
0,
0,
......@@ -1284,7 +1251,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 28
"__id__": 27
},
"_enabled": true,
"_materials": [
......@@ -1309,39 +1276,12 @@
"_atlas": null,
"_id": "3c3MU8idVAibDF4ufQHJCy"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 28
},
"_enabled": true,
"alignMode": 1,
"_target": null,
"_alignFlags": 45,
"_left": 0.7092578125,
"_right": 0.019257812499999975,
"_top": 0.13425925925925916,
"_bottom": 0.13425925925925916,
"_verticalCenter": 0,
"_horizontalCenter": 0,
"_isAbsLeft": false,
"_isAbsRight": false,
"_isAbsTop": false,
"_isAbsBottom": false,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 0,
"_originalHeight": 0,
"_id": "20HeObJVlDQZgPuhh6C3My"
},
{
"__type__": "cc.AudioSource",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 28
"__id__": 27
},
"_enabled": true,
"_clip": null,
......@@ -1361,13 +1301,13 @@
},
"_enabled": true,
"dragonBoneAudioSource": {
"__id__": 23
"__id__": 22
},
"picAAudioSource": {
"__id__": 27
"__id__": 26
},
"picCAudioSource": {
"__id__": 31
"__id__": 29
},
"_id": "a2RsgrevxLALki66+UKTAy"
},
......@@ -1407,19 +1347,19 @@
},
"_children": [
{
"__id__": 35
"__id__": 33
},
{
"__id__": 39
"__id__": 37
}
],
"_active": true,
"_components": [
{
"__id__": 42
"__id__": 40
},
{
"__id__": 43
"__id__": 41
}
],
"_prefab": null,
......@@ -1475,19 +1415,19 @@
"_name": "label",
"_objFlags": 0,
"_parent": {
"__id__": 34
"__id__": 32
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 36
"__id__": 34
},
{
"__id__": 37
"__id__": 35
},
{
"__id__": 38
"__id__": 36
}
],
"_prefab": null,
......@@ -1543,7 +1483,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 35
"__id__": 33
},
"_enabled": true,
"_materials": [
......@@ -1579,7 +1519,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 35
"__id__": 33
},
"_enabled": true,
"_color": {
......@@ -1597,7 +1537,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 35
"__id__": 33
},
"_enabled": true,
"_clip": null,
......@@ -1613,16 +1553,16 @@
"_name": "doc",
"_objFlags": 0,
"_parent": {
"__id__": 34
"__id__": 32
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 40
"__id__": 38
},
{
"__id__": 41
"__id__": 39
}
],
"_prefab": null,
......@@ -1678,7 +1618,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 39
"__id__": 37
},
"_enabled": true,
"_materials": [
......@@ -1710,7 +1650,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 39
"__id__": 37
},
"_enabled": true,
"_defaultClip": {
......@@ -1729,14 +1669,14 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 34
"__id__": 32
},
"_enabled": true,
"doc": {
"__id__": 39
"__id__": 37
},
"text": {
"__id__": 35
"__id__": 33
},
"_id": "624Q23nvtEgp2teq8h6WHj"
},
......@@ -1745,7 +1685,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 34
"__id__": 32
},
"_enabled": true,
"alignMode": 1,
......@@ -1776,13 +1716,13 @@
},
"_children": [
{
"__id__": 45
"__id__": 43
},
{
"__id__": 48
"__id__": 46
},
{
"__id__": 51
"__id__": 49
}
],
"_active": false,
......@@ -1840,11 +1780,11 @@
"_name": "font",
"_objFlags": 0,
"_parent": {
"__id__": 44
"__id__": 42
},
"_children": [
{
"__id__": 46
"__id__": 44
}
],
"_active": true,
......@@ -1902,13 +1842,13 @@
"_name": "BRLNSDB",
"_objFlags": 0,
"_parent": {
"__id__": 45
"__id__": 43
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 47
"__id__": 45
}
],
"_prefab": null,
......@@ -1964,7 +1904,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 46
"__id__": 44
},
"_enabled": true,
"_materials": [
......@@ -2000,11 +1940,11 @@
"_name": "img",
"_objFlags": 0,
"_parent": {
"__id__": 44
"__id__": 42
},
"_children": [
{
"__id__": 49
"__id__": 47
}
],
"_active": true,
......@@ -2062,13 +2002,13 @@
"_name": "icon",
"_objFlags": 0,
"_parent": {
"__id__": 48
"__id__": 46
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 50
"__id__": 48
}
],
"_prefab": null,
......@@ -2124,7 +2064,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 49
"__id__": 47
},
"_enabled": true,
"_materials": [
......@@ -2156,11 +2096,11 @@
"_name": "audio",
"_objFlags": 0,
"_parent": {
"__id__": 44
"__id__": 42
},
"_children": [
{
"__id__": 52
"__id__": 50
}
],
"_active": true,
......@@ -2218,13 +2158,13 @@
"_name": "btn",
"_objFlags": 0,
"_parent": {
"__id__": 51
"__id__": 49
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 53
"__id__": 51
}
],
"_prefab": null,
......@@ -2280,7 +2220,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 52
"__id__": 50
},
"_enabled": true,
"_clip": {
......@@ -2319,25 +2259,25 @@
},
"_enabled": true,
"loadInAudioSource": {
"__id__": 56
"__id__": 54
},
"dragonBonesNode": {
"__id__": 19
},
"pic_a_sprite": {
"__id__": 25
"__id__": 24
},
"pic_c_sprite": {
"__id__": 29
"__id__": 28
},
"tittleJs": {
"__id__": 15
},
"middleJs": {
"__id__": 32
"__id__": 30
},
"bottomJs": {
"__id__": 42
"__id__": 40
},
"_id": "e687yyoRBIzZAOVRL8Sseh"
},
......
......@@ -145,9 +145,6 @@ cc.Class({
this.initAudio();
this.initView();
// this.initListener();
},
_cantouch: null,
......@@ -198,10 +195,8 @@ cc.Class({
var atlas = new dragonBones.DragonBonesAtlasAsset();
atlas.atlasJson = atlasJson;
atlas.texture = texture;
var asset = new dragonBones.DragonBonesAsset();
asset.dragonBonesJson = dragonBonesJson;
dragonDisplay.dragonAtlasAsset = atlas;
dragonDisplay.dragonAsset = asset;
let dbj = JSON.parse(dragonBonesJson);
......@@ -210,7 +205,12 @@ cc.Class({
dragonDisplay.armatureName = armatureNames[0];
}
// dragonDisplay.playAnimation(item.dragonBone_animationName, 0);
let width = animNode.node.width;
let height = animNode.node.height;
animNode.spriteFrame = spriteFrame;
animNode.node.width = width;
animNode.node.height = height;
});
});
});
......
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