Commit c54a1d89 authored by Tt's avatar Tt

xiugiawancheng

parent fe4733f9
...@@ -84,10 +84,10 @@ ...@@ -84,10 +84,10 @@
"__id__": 70 "__id__": 70
}, },
{ {
"__id__": 73 "__id__": 72
}, },
{ {
"__id__": 108 "__id__": 75
}, },
{ {
"__id__": 110 "__id__": 110
...@@ -97,18 +97,21 @@ ...@@ -97,18 +97,21 @@
}, },
{ {
"__id__": 114 "__id__": 114
},
{
"__id__": 116
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 134 "__id__": 136
}, },
{ {
"__id__": 135 "__id__": 137
}, },
{ {
"__id__": 136 "__id__": 138
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -404,7 +407,7 @@ ...@@ -404,7 +407,7 @@
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
} }
], ],
"_srcBlendFactor": 770, "_srcBlendFactor": 1,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "fa4176e5-cade-4658-96e6-5597345426f8" "__uuid__": "fa4176e5-cade-4658-96e6-5597345426f8"
...@@ -528,7 +531,7 @@ ...@@ -528,7 +531,7 @@
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
} }
], ],
"_srcBlendFactor": 770, "_srcBlendFactor": 1,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "ee52d42a-bded-4698-babf-18867c529cb8" "__uuid__": "ee52d42a-bded-4698-babf-18867c529cb8"
...@@ -1238,7 +1241,7 @@ ...@@ -1238,7 +1241,7 @@
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
} }
], ],
"_srcBlendFactor": 770, "_srcBlendFactor": 1,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "c19d6a60-c159-4423-af82-cdce227607ca" "__uuid__": "c19d6a60-c159-4423-af82-cdce227607ca"
...@@ -1430,7 +1433,7 @@ ...@@ -1430,7 +1433,7 @@
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
} }
], ],
"_srcBlendFactor": 770, "_srcBlendFactor": 1,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "a63ca1d6-5884-4a8d-a181-f69eb0b8ae7e" "__uuid__": "a63ca1d6-5884-4a8d-a181-f69eb0b8ae7e"
...@@ -1622,7 +1625,7 @@ ...@@ -1622,7 +1625,7 @@
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
} }
], ],
"_srcBlendFactor": 770, "_srcBlendFactor": 1,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "a4fb18b1-2944-4f15-a54b-79ca52fb9cf1" "__uuid__": "a4fb18b1-2944-4f15-a54b-79ca52fb9cf1"
...@@ -1716,7 +1719,7 @@ ...@@ -1716,7 +1719,7 @@
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
} }
], ],
"_srcBlendFactor": 770, "_srcBlendFactor": 1,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "b58f485f-5151-4b26-8815-d3125841475e" "__uuid__": "b58f485f-5151-4b26-8815-d3125841475e"
...@@ -2008,7 +2011,7 @@ ...@@ -2008,7 +2011,7 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-12.96, -13.787,
9.253, 9.253,
0, 0,
0, 0,
...@@ -2046,7 +2049,7 @@ ...@@ -2046,7 +2049,7 @@
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
} }
], ],
"_srcBlendFactor": 770, "_srcBlendFactor": 1,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "0c9aa769-3e58-48da-a6b9-20d05d189681" "__uuid__": "0c9aa769-3e58-48da-a6b9-20d05d189681"
...@@ -2078,7 +2081,7 @@ ...@@ -2078,7 +2081,7 @@
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
} }
], ],
"_srcBlendFactor": 770, "_srcBlendFactor": 1,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "2eb5f6a2-cfc2-4dea-ab1b-8e720ba96f88" "__uuid__": "2eb5f6a2-cfc2-4dea-ab1b-8e720ba96f88"
...@@ -2203,7 +2206,7 @@ ...@@ -2203,7 +2206,7 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-11.99, -13.787,
9.253, 9.253,
0, 0,
0, 0,
...@@ -2241,7 +2244,7 @@ ...@@ -2241,7 +2244,7 @@
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
} }
], ],
"_srcBlendFactor": 770, "_srcBlendFactor": 1,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "0c9aa769-3e58-48da-a6b9-20d05d189681" "__uuid__": "0c9aa769-3e58-48da-a6b9-20d05d189681"
...@@ -2297,7 +2300,7 @@ ...@@ -2297,7 +2300,7 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
21.534, 19.737,
10.421, 10.421,
0, 0,
0, 0,
...@@ -2335,7 +2338,7 @@ ...@@ -2335,7 +2338,7 @@
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
} }
], ],
"_srcBlendFactor": 770, "_srcBlendFactor": 1,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "75258b19-698a-42b9-a2ba-6502438b0c33" "__uuid__": "75258b19-698a-42b9-a2ba-6502438b0c33"
...@@ -2367,7 +2370,7 @@ ...@@ -2367,7 +2370,7 @@
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
} }
], ],
"_srcBlendFactor": 770, "_srcBlendFactor": 1,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "2eb5f6a2-cfc2-4dea-ab1b-8e720ba96f88" "__uuid__": "2eb5f6a2-cfc2-4dea-ab1b-8e720ba96f88"
...@@ -2492,7 +2495,7 @@ ...@@ -2492,7 +2495,7 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-11.971, -13.787,
9.253, 9.253,
0, 0,
0, 0,
...@@ -2530,7 +2533,7 @@ ...@@ -2530,7 +2533,7 @@
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
} }
], ],
"_srcBlendFactor": 770, "_srcBlendFactor": 1,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "0c9aa769-3e58-48da-a6b9-20d05d189681" "__uuid__": "0c9aa769-3e58-48da-a6b9-20d05d189681"
...@@ -2586,7 +2589,7 @@ ...@@ -2586,7 +2589,7 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
28.374, 26.558,
10.421, 10.421,
0, 0,
0, 0,
...@@ -2624,7 +2627,7 @@ ...@@ -2624,7 +2627,7 @@
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
} }
], ],
"_srcBlendFactor": 770, "_srcBlendFactor": 1,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "bfa02701-99c1-4999-8e19-1bc3d22b2ce8" "__uuid__": "bfa02701-99c1-4999-8e19-1bc3d22b2ce8"
...@@ -2656,7 +2659,7 @@ ...@@ -2656,7 +2659,7 @@
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
} }
], ],
"_srcBlendFactor": 770, "_srcBlendFactor": 1,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "2eb5f6a2-cfc2-4dea-ab1b-8e720ba96f88" "__uuid__": "2eb5f6a2-cfc2-4dea-ab1b-8e720ba96f88"
...@@ -3017,7 +3020,7 @@ ...@@ -3017,7 +3020,7 @@
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
} }
], ],
"_srcBlendFactor": 770, "_srcBlendFactor": 1,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "e2cdc8d7-96c0-48cb-9833-832e79c5480c" "__uuid__": "e2cdc8d7-96c0-48cb-9833-832e79c5480c"
...@@ -3212,7 +3215,7 @@ ...@@ -3212,7 +3215,7 @@
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
} }
], ],
"_srcBlendFactor": 770, "_srcBlendFactor": 1,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "813f4ac3-d320-41fc-b327-60caeec916ab" "__uuid__": "813f4ac3-d320-41fc-b327-60caeec916ab"
...@@ -3355,19 +3358,113 @@ ...@@ -3355,19 +3358,113 @@
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "ani_npc", "_name": "img_npc",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 2 "__id__": 2
}, },
"_children": [], "_children": [],
"_active": true, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 71 "__id__": 71
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 124,
"height": 136
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
850.23,
443.913,
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": "60CBeDhRNGerR0ogorUCw1"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 70
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 1,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "24bacd99-16bc-499a-9c70-be9ccfeea10e"
},
"_type": 0,
"_sizeMode": 1,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "a6OdIbqlxBNaftQguyOArn"
},
{
"__type__": "cc.Node",
"_name": "ani_npc",
"_objFlags": 0,
"_parent": {
"__id__": 2
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 73
}, },
{ {
"__id__": 72 "__id__": 74
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3423,7 +3520,7 @@ ...@@ -3423,7 +3520,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 70 "__id__": 72
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3463,7 +3560,7 @@ ...@@ -3463,7 +3560,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 70 "__id__": 72
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -3535,19 +3632,19 @@ ...@@ -3535,19 +3632,19 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 74 "__id__": 76
}, },
{ {
"__id__": 102 "__id__": 104
}, },
{ {
"__id__": 105 "__id__": 107
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 107 "__id__": 109
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3603,17 +3700,17 @@ ...@@ -3603,17 +3700,17 @@
"_name": "layout_cover", "_name": "layout_cover",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 73 "__id__": 75
}, },
"_children": [ "_children": [
{ {
"__id__": 75 "__id__": 77
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 101 "__id__": 103
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3669,23 +3766,23 @@ ...@@ -3669,23 +3766,23 @@
"_name": "btn_record", "_name": "btn_record",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 74 "__id__": 76
}, },
"_children": [ "_children": [
{ {
"__id__": 76 "__id__": 78
}, },
{ {
"__id__": 89 "__id__": 91
}, },
{ {
"__id__": 93 "__id__": 95
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 100 "__id__": 102
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3741,17 +3838,17 @@ ...@@ -3741,17 +3838,17 @@
"_name": "mask", "_name": "mask",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 75 "__id__": 77
}, },
"_children": [ "_children": [
{ {
"__id__": 77 "__id__": 79
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 88 "__id__": 90
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3807,23 +3904,23 @@ ...@@ -3807,23 +3904,23 @@
"_name": "layout_btns", "_name": "layout_btns",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 76 "__id__": 78
}, },
"_children": [ "_children": [
{ {
"__id__": 78 "__id__": 80
}, },
{ {
"__id__": 81 "__id__": 83
}, },
{ {
"__id__": 84 "__id__": 86
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 87 "__id__": 89
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3879,16 +3976,16 @@ ...@@ -3879,16 +3976,16 @@
"_name": "btn_right", "_name": "btn_right",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 77 "__id__": 79
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 79 "__id__": 81
}, },
{ {
"__id__": 80 "__id__": 82
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3944,7 +4041,7 @@ ...@@ -3944,7 +4041,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 78 "__id__": 80
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3952,7 +4049,7 @@ ...@@ -3952,7 +4049,7 @@
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
} }
], ],
"_srcBlendFactor": 770, "_srcBlendFactor": 1,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "f4547c38-0ea1-468b-b8aa-fcc55fc6ce4c" "__uuid__": "f4547c38-0ea1-468b-b8aa-fcc55fc6ce4c"
...@@ -3976,7 +4073,7 @@ ...@@ -3976,7 +4073,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 78 "__id__": 80
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -4044,16 +4141,16 @@ ...@@ -4044,16 +4141,16 @@
"_name": "btn_play", "_name": "btn_play",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 77 "__id__": 79
}, },
"_children": [], "_children": [],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 82 "__id__": 84
}, },
{ {
"__id__": 83 "__id__": 85
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4109,7 +4206,7 @@ ...@@ -4109,7 +4206,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 81 "__id__": 83
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4117,7 +4214,7 @@ ...@@ -4117,7 +4214,7 @@
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
} }
], ],
"_srcBlendFactor": 770, "_srcBlendFactor": 1,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "8292d102-bb55-4479-8fd7-6334f1ca51e8" "__uuid__": "8292d102-bb55-4479-8fd7-6334f1ca51e8"
...@@ -4141,7 +4238,7 @@ ...@@ -4141,7 +4238,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 81 "__id__": 83
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -4209,16 +4306,16 @@ ...@@ -4209,16 +4306,16 @@
"_name": "btn_stop", "_name": "btn_stop",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 77 "__id__": 79
}, },
"_children": [], "_children": [],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 85 "__id__": 87
}, },
{ {
"__id__": 86 "__id__": 88
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4274,7 +4371,7 @@ ...@@ -4274,7 +4371,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 84 "__id__": 86
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4282,7 +4379,7 @@ ...@@ -4282,7 +4379,7 @@
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
} }
], ],
"_srcBlendFactor": 770, "_srcBlendFactor": 1,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "810e4b16-1beb-4bd9-a700-71e244d7f9a8" "__uuid__": "810e4b16-1beb-4bd9-a700-71e244d7f9a8"
...@@ -4306,7 +4403,7 @@ ...@@ -4306,7 +4403,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 84 "__id__": 86
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -4374,7 +4471,7 @@ ...@@ -4374,7 +4471,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 77 "__id__": 79
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4382,7 +4479,7 @@ ...@@ -4382,7 +4479,7 @@
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
} }
], ],
"_srcBlendFactor": 770, "_srcBlendFactor": 1,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "3700f0c8-fae1-4af8-be4c-7d9c1e50ce47" "__uuid__": "3700f0c8-fae1-4af8-be4c-7d9c1e50ce47"
...@@ -4406,7 +4503,7 @@ ...@@ -4406,7 +4503,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 76 "__id__": 78
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4426,17 +4523,17 @@ ...@@ -4426,17 +4523,17 @@
"_name": "bg", "_name": "bg",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 75 "__id__": 77
}, },
"_children": [ "_children": [
{ {
"__id__": 90 "__id__": 92
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 92 "__id__": 94
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4492,13 +4589,13 @@ ...@@ -4492,13 +4589,13 @@
"_name": "ani", "_name": "ani",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 89 "__id__": 91
}, },
"_children": [], "_children": [],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 91 "__id__": 93
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4554,7 +4651,7 @@ ...@@ -4554,7 +4651,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 90 "__id__": 92
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4594,7 +4691,7 @@ ...@@ -4594,7 +4691,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 89 "__id__": 91
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4602,7 +4699,7 @@ ...@@ -4602,7 +4699,7 @@
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
} }
], ],
"_srcBlendFactor": 770, "_srcBlendFactor": 1,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "49ca0e50-030e-4c6e-a6a1-dd379cbca6e2" "__uuid__": "49ca0e50-030e-4c6e-a6a1-dd379cbca6e2"
...@@ -4626,23 +4723,23 @@ ...@@ -4626,23 +4723,23 @@
"_name": "img_voice", "_name": "img_voice",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 75 "__id__": 77
}, },
"_children": [ "_children": [
{ {
"__id__": 94 "__id__": 96
}, },
{ {
"__id__": 95 "__id__": 97
}, },
{ {
"__id__": 97 "__id__": 99
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 99 "__id__": 101
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4698,7 +4795,7 @@ ...@@ -4698,7 +4795,7 @@
"_name": "p1", "_name": "p1",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 93 "__id__": 95
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
...@@ -4756,13 +4853,13 @@ ...@@ -4756,13 +4853,13 @@
"_name": "p2", "_name": "p2",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 93 "__id__": 95
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 96 "__id__": 98
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4818,7 +4915,7 @@ ...@@ -4818,7 +4915,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 95 "__id__": 97
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4826,7 +4923,7 @@ ...@@ -4826,7 +4923,7 @@
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
} }
], ],
"_srcBlendFactor": 770, "_srcBlendFactor": 1,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "0ae356d1-a198-4b35-bb0e-82f49b539b36" "__uuid__": "0ae356d1-a198-4b35-bb0e-82f49b539b36"
...@@ -4850,13 +4947,13 @@ ...@@ -4850,13 +4947,13 @@
"_name": "p3", "_name": "p3",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 93 "__id__": 95
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 98 "__id__": 100
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4912,7 +5009,7 @@ ...@@ -4912,7 +5009,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 97 "__id__": 99
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4920,7 +5017,7 @@ ...@@ -4920,7 +5017,7 @@
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
} }
], ],
"_srcBlendFactor": 770, "_srcBlendFactor": 1,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "2e09d276-5660-400d-a7d8-516e0b958870" "__uuid__": "2e09d276-5660-400d-a7d8-516e0b958870"
...@@ -4944,7 +5041,7 @@ ...@@ -4944,7 +5041,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 93 "__id__": 95
}, },
"_enabled": true, "_enabled": true,
"_id": "1b37Xp6IVLg6RciXLxM7OU" "_id": "1b37Xp6IVLg6RciXLxM7OU"
...@@ -4954,7 +5051,7 @@ ...@@ -4954,7 +5051,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 75 "__id__": 77
}, },
"_enabled": true, "_enabled": true,
"alignMode": 2, "alignMode": 2,
...@@ -4981,7 +5078,7 @@ ...@@ -4981,7 +5078,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 74 "__id__": 76
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -5008,16 +5105,16 @@ ...@@ -5008,16 +5105,16 @@
"_name": "label_word", "_name": "label_word",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 73 "__id__": 75
}, },
"_children": [], "_children": [],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 103 "__id__": 105
}, },
{ {
"__id__": 104 "__id__": 106
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5073,7 +5170,7 @@ ...@@ -5073,7 +5170,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 102 "__id__": 104
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -5108,7 +5205,7 @@ ...@@ -5108,7 +5205,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 102 "__id__": 104
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -5128,20 +5225,20 @@ ...@@ -5128,20 +5225,20 @@
"_isAbsVerticalCenter": true, "_isAbsVerticalCenter": true,
"_originalWidth": 0, "_originalWidth": 0,
"_originalHeight": 0, "_originalHeight": 0,
"_id": "f0NMVwbpVJ5ZnFjFOfTyVq" "_id": "63tXPoDktC8ovLlpr7Qs85"
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "ani_good", "_name": "ani_good",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 73 "__id__": 75
}, },
"_children": [], "_children": [],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 106 "__id__": 108
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5197,7 +5294,7 @@ ...@@ -5197,7 +5294,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 105 "__id__": 107
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -5237,7 +5334,7 @@ ...@@ -5237,7 +5334,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 73 "__id__": 75
}, },
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
...@@ -5270,7 +5367,7 @@ ...@@ -5270,7 +5367,7 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 109 "__id__": 111
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5326,7 +5423,7 @@ ...@@ -5326,7 +5423,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 108 "__id__": 110
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -5334,7 +5431,7 @@ ...@@ -5334,7 +5431,7 @@
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
} }
], ],
"_srcBlendFactor": 770, "_srcBlendFactor": 1,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "cf89180e-7962-4c2b-aed3-50f1e98c7570" "__uuid__": "cf89180e-7962-4c2b-aed3-50f1e98c7570"
...@@ -5364,7 +5461,7 @@ ...@@ -5364,7 +5461,7 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 111 "__id__": 113
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5390,8 +5487,8 @@ ...@@ -5390,8 +5487,8 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-0.045, 29.307,
75.059, 54.181,
0, 0,
0, 0,
0, 0,
...@@ -5420,7 +5517,7 @@ ...@@ -5420,7 +5517,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 110 "__id__": 112
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -5458,7 +5555,7 @@ ...@@ -5458,7 +5555,7 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 113 "__id__": 115
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5514,7 +5611,7 @@ ...@@ -5514,7 +5611,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 112 "__id__": 114
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -5522,7 +5619,7 @@ ...@@ -5522,7 +5619,7 @@
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
} }
], ],
"_srcBlendFactor": 770, "_srcBlendFactor": 1,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "47009890-9e95-44c9-84c5-6f1bc41b544e" "__uuid__": "47009890-9e95-44c9-84c5-6f1bc41b544e"
...@@ -5550,13 +5647,13 @@ ...@@ -5550,13 +5647,13 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 115 "__id__": 117
}, },
{ {
"__id__": 118 "__id__": 120
}, },
{ {
"__id__": 121 "__id__": 123
} }
], ],
"_active": false, "_active": false,
...@@ -5614,11 +5711,11 @@ ...@@ -5614,11 +5711,11 @@
"_name": "font", "_name": "font",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 114 "__id__": 116
}, },
"_children": [ "_children": [
{ {
"__id__": 116 "__id__": 118
} }
], ],
"_active": true, "_active": true,
...@@ -5676,13 +5773,13 @@ ...@@ -5676,13 +5773,13 @@
"_name": "BRLNSDB", "_name": "BRLNSDB",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 115 "__id__": 117
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 117 "__id__": 119
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5738,7 +5835,7 @@ ...@@ -5738,7 +5835,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 116 "__id__": 118
}, },
"_enabled": true, "_enabled": true,
"_materials": [], "_materials": [],
...@@ -5769,11 +5866,11 @@ ...@@ -5769,11 +5866,11 @@
"_name": "img", "_name": "img",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 114 "__id__": 116
}, },
"_children": [ "_children": [
{ {
"__id__": 119 "__id__": 121
} }
], ],
"_active": true, "_active": true,
...@@ -5831,13 +5928,13 @@ ...@@ -5831,13 +5928,13 @@
"_name": "icon", "_name": "icon",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 118 "__id__": 120
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 120 "__id__": 122
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5893,7 +5990,7 @@ ...@@ -5893,7 +5990,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 119 "__id__": 121
}, },
"_enabled": true, "_enabled": true,
"_materials": [], "_materials": [],
...@@ -5921,12 +6018,9 @@ ...@@ -5921,12 +6018,9 @@
"_name": "audio", "_name": "audio",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 114 "__id__": 116
}, },
"_children": [ "_children": [
{
"__id__": 122
},
{ {
"__id__": 124 "__id__": 124
}, },
...@@ -5941,6 +6035,9 @@ ...@@ -5941,6 +6035,9 @@
}, },
{ {
"__id__": 132 "__id__": 132
},
{
"__id__": 134
} }
], ],
"_active": true, "_active": true,
...@@ -5998,13 +6095,13 @@ ...@@ -5998,13 +6095,13 @@
"_name": "btn", "_name": "btn",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 121 "__id__": 123
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 123 "__id__": 125
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -6060,7 +6157,7 @@ ...@@ -6060,7 +6157,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 122 "__id__": 124
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
...@@ -6079,13 +6176,13 @@ ...@@ -6079,13 +6176,13 @@
"_name": "tip", "_name": "tip",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 121 "__id__": 123
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 125 "__id__": 127
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -6141,7 +6238,7 @@ ...@@ -6141,7 +6238,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 124 "__id__": 126
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
...@@ -6160,13 +6257,13 @@ ...@@ -6160,13 +6257,13 @@
"_name": "tosmall", "_name": "tosmall",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 121 "__id__": 123
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 127 "__id__": 129
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -6222,7 +6319,7 @@ ...@@ -6222,7 +6319,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 126 "__id__": 128
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
...@@ -6241,13 +6338,13 @@ ...@@ -6241,13 +6338,13 @@
"_name": "pagenext", "_name": "pagenext",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 121 "__id__": 123
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 129 "__id__": 131
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -6303,7 +6400,7 @@ ...@@ -6303,7 +6400,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 128 "__id__": 130
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
...@@ -6322,13 +6419,13 @@ ...@@ -6322,13 +6419,13 @@
"_name": "arrow", "_name": "arrow",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 121 "__id__": 123
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 131 "__id__": 133
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -6384,7 +6481,7 @@ ...@@ -6384,7 +6481,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 130 "__id__": 132
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
...@@ -6403,13 +6500,13 @@ ...@@ -6403,13 +6500,13 @@
"_name": "right", "_name": "right",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 121 "__id__": 123
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 133 "__id__": 135
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -6465,7 +6562,7 @@ ...@@ -6465,7 +6562,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 132 "__id__": 134
}, },
"_enabled": true, "_enabled": true,
"_clip": { "_clip": {
...@@ -6541,18 +6638,21 @@ ...@@ -6541,18 +6638,21 @@
"__id__": 57 "__id__": 57
}, },
"btn_record": { "btn_record": {
"__id__": 75 "__id__": 77
}, },
"layer_touch": { "layer_touch": {
"__id__": 13 "__id__": 13
}, },
"label_word": { "label_word": {
"__id__": 102 "__id__": 104
}, },
"ani_good": { "ani_good": {
"__id__": 105 "__id__": 107
}, },
"ani_npc": { "ani_npc": {
"__id__": 72
},
"img_npc": {
"__id__": 70 "__id__": 70
}, },
"btn_last": { "btn_last": {
......
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