Commit cd523376 authored by 章红平's avatar 章红平

提交

parent 389c0578
......@@ -361,9 +361,6 @@
},
{
"__id__": 19
},
{
"__id__": 22
}
],
"_active": true,
......@@ -765,7 +762,7 @@
},
{
"__type__": "cc.Node",
"_name": "desk",
"_name": "stickers",
"_objFlags": 0,
"_parent": {
"__id__": 7
......@@ -789,130 +786,6 @@
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 1500,
"height": 35
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
0,
-342.5,
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": "0bGBvng2ZHSaZcbNu1vXkT"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 16
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "50d4f294-ba3f-4f4c-9bc2-f6b9e39b44d4"
},
"_type": 0,
"_sizeMode": 0,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "9a0lObnQtOC7xYvIK0dgy+"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 16
},
"_enabled": true,
"alignMode": 2,
"_target": null,
"_alignFlags": 4,
"_left": 0,
"_right": 0,
"_top": 0,
"_bottom": 0,
"_verticalCenter": 0,
"_horizontalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 0,
"_originalHeight": 0,
"_id": "aeefOlJ1BOYbHz7gj5kndH"
},
{
"__type__": "cc.Node",
"_name": "stickers",
"_objFlags": 0,
"_parent": {
"__id__": 7
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 20
},
{
"__id__": 21
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": -10,
......@@ -957,7 +830,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 19
"__id__": 16
},
"_enabled": true,
"alignMode": 1,
......@@ -984,7 +857,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 19
"__id__": 16
},
"_enabled": true,
"stickerP": {
......@@ -1014,16 +887,19 @@
},
"_children": [
{
"__id__": 23
"__id__": 20
},
{
"__id__": 45
"__id__": 42
},
{
"__id__": 67
"__id__": 64
},
{
"__id__": 73
"__id__": 70
},
{
"__id__": 74
}
],
"_active": true,
......@@ -1081,33 +957,33 @@
"_name": "candle1",
"_objFlags": 0,
"_parent": {
"__id__": 22
"__id__": 19
},
"_children": [
{
"__id__": 24
"__id__": 21
},
{
"__id__": 31
"__id__": 28
},
{
"__id__": 35
"__id__": 32
},
{
"__id__": 38
"__id__": 35
}
],
"_active": true,
"_components": [
{
"__id__": 42
"__id__": 39
},
{
"__id__": 43
"__id__": 40
}
],
"_prefab": {
"__id__": 44
"__id__": 41
},
"_opacity": 255,
"_color": {
......@@ -1161,24 +1037,24 @@
"_name": "mask",
"_objFlags": 0,
"_parent": {
"__id__": 23
"__id__": 20
},
"_children": [
{
"__id__": 25
"__id__": 22
}
],
"_active": true,
"_components": [
{
"__id__": 28
"__id__": 25
},
{
"__id__": 29
"__id__": 26
}
],
"_prefab": {
"__id__": 30
"__id__": 27
},
"_opacity": 255,
"_color": {
......@@ -1232,17 +1108,17 @@
"_name": "body",
"_objFlags": 0,
"_parent": {
"__id__": 24
"__id__": 21
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 26
"__id__": 23
}
],
"_prefab": {
"__id__": 27
"__id__": 24
},
"_opacity": 255,
"_color": {
......@@ -1296,7 +1172,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 25
"__id__": 22
},
"_enabled": true,
"_materials": [
......@@ -1326,7 +1202,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 24
"__id__": 21
},
"asset": null,
"fileId": "bbKchDkVxKQLXFsnw+LeO0",
......@@ -1337,7 +1213,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 24
"__id__": 21
},
"_enabled": true,
"_materials": [
......@@ -1357,7 +1233,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 24
"__id__": 21
},
"_enabled": true,
"alignMode": 2,
......@@ -1382,7 +1258,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 24
"__id__": 21
},
"asset": null,
"fileId": "2855ZyugVOPI3vV0cxL3Ic",
......@@ -1393,20 +1269,20 @@
"_name": "candleBone1",
"_objFlags": 0,
"_parent": {
"__id__": 23
"__id__": 20
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 32
"__id__": 29
},
{
"__id__": 33
"__id__": 30
}
],
"_prefab": {
"__id__": 34
"__id__": 31
},
"_opacity": 255,
"_color": {
......@@ -1460,7 +1336,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 31
"__id__": 28
},
"_enabled": true,
"_materials": [
......@@ -1500,7 +1376,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 31
"__id__": 28
},
"_enabled": true,
"alignMode": 2,
......@@ -1525,7 +1401,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 23
"__id__": 20
},
"asset": {
"__uuid__": "347c6086-250f-45a2-b5d2-a24fd6be5624"
......@@ -1538,17 +1414,17 @@
"_name": "candleBone2",
"_objFlags": 0,
"_parent": {
"__id__": 23
"__id__": 20
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 36
"__id__": 33
}
],
"_prefab": {
"__id__": 37
"__id__": 34
},
"_opacity": 255,
"_color": {
......@@ -1602,7 +1478,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 35
"__id__": 32
},
"_enabled": true,
"_materials": [
......@@ -1640,7 +1516,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 23
"__id__": 20
},
"asset": {
"__uuid__": "347c6086-250f-45a2-b5d2-a24fd6be5624"
......@@ -1653,20 +1529,20 @@
"_name": "candleBone3",
"_objFlags": 0,
"_parent": {
"__id__": 23
"__id__": 20
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 39
"__id__": 36
},
{
"__id__": 40
"__id__": 37
}
],
"_prefab": {
"__id__": 41
"__id__": 38
},
"_opacity": 255,
"_color": {
......@@ -1720,7 +1596,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 38
"__id__": 35
},
"_enabled": true,
"_materials": [
......@@ -1760,7 +1636,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 38
"__id__": 35
},
"_enabled": true,
"alignMode": 2,
......@@ -1785,7 +1661,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 23
"__id__": 20
},
"asset": {
"__uuid__": "347c6086-250f-45a2-b5d2-a24fd6be5624"
......@@ -1798,18 +1674,18 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 23
"__id__": 20
},
"_enabled": true,
"label": null,
"dragon1": {
"__id__": 32
"__id__": 29
},
"dragon2": {
"__id__": 36
"__id__": 33
},
"dragon3": {
"__id__": 39
"__id__": 36
},
"text": "hello",
"_id": "74ru8AE9dAHYwo/t0e4oZl"
......@@ -1819,7 +1695,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 23
"__id__": 20
},
"_enabled": false,
"_materials": [
......@@ -1837,7 +1713,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 23
"__id__": 20
},
"asset": {
"__uuid__": "347c6086-250f-45a2-b5d2-a24fd6be5624"
......@@ -1850,33 +1726,33 @@
"_name": "candle2",
"_objFlags": 0,
"_parent": {
"__id__": 22
"__id__": 19
},
"_children": [
{
"__id__": 46
"__id__": 43
},
{
"__id__": 53
"__id__": 50
},
{
"__id__": 57
"__id__": 54
},
{
"__id__": 60
"__id__": 57
}
],
"_active": true,
"_components": [
{
"__id__": 64
"__id__": 61
},
{
"__id__": 65
"__id__": 62
}
],
"_prefab": {
"__id__": 66
"__id__": 63
},
"_opacity": 255,
"_color": {
......@@ -1930,24 +1806,24 @@
"_name": "mask",
"_objFlags": 0,
"_parent": {
"__id__": 45
"__id__": 42
},
"_children": [
{
"__id__": 47
"__id__": 44
}
],
"_active": true,
"_components": [
{
"__id__": 50
"__id__": 47
},
{
"__id__": 51
"__id__": 48
}
],
"_prefab": {
"__id__": 52
"__id__": 49
},
"_opacity": 255,
"_color": {
......@@ -2001,17 +1877,17 @@
"_name": "body",
"_objFlags": 0,
"_parent": {
"__id__": 46
"__id__": 43
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 48
"__id__": 45
}
],
"_prefab": {
"__id__": 49
"__id__": 46
},
"_opacity": 255,
"_color": {
......@@ -2065,7 +1941,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 47
"__id__": 44
},
"_enabled": true,
"_materials": [
......@@ -2095,7 +1971,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 46
"__id__": 43
},
"asset": null,
"fileId": "bbKchDkVxKQLXFsnw+LeO0",
......@@ -2106,7 +1982,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 46
"__id__": 43
},
"_enabled": true,
"_materials": [
......@@ -2126,7 +2002,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 46
"__id__": 43
},
"_enabled": true,
"alignMode": 1,
......@@ -2151,7 +2027,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 46
"__id__": 43
},
"asset": null,
"fileId": "2855ZyugVOPI3vV0cxL3Ic",
......@@ -2162,20 +2038,20 @@
"_name": "candleBone1",
"_objFlags": 0,
"_parent": {
"__id__": 45
"__id__": 42
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 54
"__id__": 51
},
{
"__id__": 55
"__id__": 52
}
],
"_prefab": {
"__id__": 56
"__id__": 53
},
"_opacity": 255,
"_color": {
......@@ -2229,7 +2105,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 53
"__id__": 50
},
"_enabled": true,
"_materials": [
......@@ -2269,7 +2145,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 53
"__id__": 50
},
"_enabled": true,
"alignMode": 2,
......@@ -2294,7 +2170,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 45
"__id__": 42
},
"asset": {
"__uuid__": "347c6086-250f-45a2-b5d2-a24fd6be5624"
......@@ -2307,17 +2183,17 @@
"_name": "candleBone2",
"_objFlags": 0,
"_parent": {
"__id__": 45
"__id__": 42
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 58
"__id__": 55
}
],
"_prefab": {
"__id__": 59
"__id__": 56
},
"_opacity": 255,
"_color": {
......@@ -2371,7 +2247,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 57
"__id__": 54
},
"_enabled": true,
"_materials": [
......@@ -2409,7 +2285,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 45
"__id__": 42
},
"asset": {
"__uuid__": "347c6086-250f-45a2-b5d2-a24fd6be5624"
......@@ -2422,20 +2298,20 @@
"_name": "candleBone3",
"_objFlags": 0,
"_parent": {
"__id__": 45
"__id__": 42
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 61
"__id__": 58
},
{
"__id__": 62
"__id__": 59
}
],
"_prefab": {
"__id__": 63
"__id__": 60
},
"_opacity": 255,
"_color": {
......@@ -2489,7 +2365,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 60
"__id__": 57
},
"_enabled": true,
"_materials": [
......@@ -2529,7 +2405,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 60
"__id__": 57
},
"_enabled": true,
"alignMode": 2,
......@@ -2554,7 +2430,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 45
"__id__": 42
},
"asset": {
"__uuid__": "347c6086-250f-45a2-b5d2-a24fd6be5624"
......@@ -2567,18 +2443,18 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 45
"__id__": 42
},
"_enabled": true,
"label": null,
"dragon1": {
"__id__": 54
"__id__": 51
},
"dragon2": {
"__id__": 58
"__id__": 55
},
"dragon3": {
"__id__": 61
"__id__": 58
},
"text": "hello",
"_id": "faAPIW9NNIWIhow3GpxUyf"
......@@ -2588,7 +2464,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 45
"__id__": 42
},
"_enabled": false,
"_materials": [
......@@ -2606,7 +2482,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 45
"__id__": 42
},
"asset": {
"__uuid__": "347c6086-250f-45a2-b5d2-a24fd6be5624"
......@@ -2619,20 +2495,20 @@
"_name": "musicBtn",
"_objFlags": 0,
"_parent": {
"__id__": 22
"__id__": 19
},
"_children": [
{
"__id__": 68
"__id__": 65
}
],
"_active": true,
"_components": [
{
"__id__": 70
"__id__": 67
},
{
"__id__": 71
"__id__": 68
}
],
"_prefab": null,
......@@ -2688,13 +2564,13 @@
"_name": "icon",
"_objFlags": 0,
"_parent": {
"__id__": 67
"__id__": 64
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 69
"__id__": 66
}
],
"_prefab": null,
......@@ -2750,7 +2626,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 68
"__id__": 65
},
"_enabled": true,
"_materials": [
......@@ -2782,7 +2658,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 67
"__id__": 64
},
"_enabled": true,
"_materials": [
......@@ -2814,7 +2690,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 67
"__id__": 64
},
"_enabled": true,
"_normalMaterial": null,
......@@ -2823,7 +2699,7 @@
"zoomScale": 1.2,
"clickEvents": [
{
"__id__": 72
"__id__": 69
}
],
"_N$interactable": true,
......@@ -2891,7 +2767,7 @@
"__uuid__": "ab9af49e-0936-4b5d-a8e6-379b34b80073"
},
"_N$target": {
"__id__": 68
"__id__": 65
},
"_id": "f0UYxtfZ1II4dUt38c6/Sd"
},
......@@ -2910,16 +2786,16 @@
"_name": "commitBTn",
"_objFlags": 0,
"_parent": {
"__id__": 22
"__id__": 19
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 74
"__id__": 71
},
{
"__id__": 75
"__id__": 72
}
],
"_prefab": null,
......@@ -2975,7 +2851,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 73
"__id__": 70
},
"_enabled": true,
"_materials": [
......@@ -3007,7 +2883,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 73
"__id__": 70
},
"_enabled": true,
"_normalMaterial": null,
......@@ -3016,7 +2892,7 @@
"zoomScale": 1.2,
"clickEvents": [
{
"__id__": 76
"__id__": 73
}
],
"_N$interactable": true,
......@@ -3084,6 +2960,130 @@
"handler": "stopTalking",
"customEventData": ""
},
{
"__type__": "cc.Node",
"_name": "desk",
"_objFlags": 0,
"_parent": {
"__id__": 19
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 75
},
{
"__id__": 76
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 1500,
"height": 35
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
0,
-342.5,
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": "0bGBvng2ZHSaZcbNu1vXkT"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 74
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "50d4f294-ba3f-4f4c-9bc2-f6b9e39b44d4"
},
"_type": 0,
"_sizeMode": 0,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "9a0lObnQtOC7xYvIK0dgy+"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 74
},
"_enabled": true,
"alignMode": 2,
"_target": null,
"_alignFlags": 4,
"_left": 0,
"_right": 0,
"_top": 0,
"_bottom": 0,
"_verticalCenter": 0,
"_horizontalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 0,
"_originalHeight": 0,
"_id": "aeefOlJ1BOYbHz7gj5kndH"
},
{
"__type__": "cc.Mask",
"_name": "",
......@@ -5153,19 +5153,19 @@
"_enabled": true,
"canTouch": true,
"stickers": {
"__id__": 21
"__id__": 18
},
"candle1": {
"__id__": 23
"__id__": 20
},
"musicBtn": {
"__id__": 71
"__id__": 68
},
"candle2": {
"__id__": 45
"__id__": 42
},
"redBtnN": {
"__id__": 73
"__id__": 70
},
"panel": {
"__uuid__": "3d36363e-8b0c-4b06-9192-bfffb9ed35bf"
......
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