Commit cf8fcf02 authored by yu's avatar yu

合并

parent eb0d5e23
...@@ -1391,7 +1391,7 @@ ...@@ -1391,7 +1391,7 @@
"__id__": 34 "__id__": 34
}, },
{ {
"__id__": 37 "__id__": 36
}, },
{ {
"__id__": 39 "__id__": 39
...@@ -1702,6 +1702,101 @@ ...@@ -1702,6 +1702,101 @@
"_originalHeight": 83, "_originalHeight": 83,
"_id": "e5xlK+8nBDRLzsr/I6H6Qs" "_id": "e5xlK+8nBDRLzsr/I6H6Qs"
}, },
{
"__type__": "cc.Node",
"_name": "desc",
"_objFlags": 0,
"_parent": {
"__id__": 27
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 35
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 157,
"g": 50,
"b": 45,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 0,
"height": 50.4
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
0,
0,
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": "a41J19KG5GoqiuwEpzA+rC"
},
{
"__type__": "cc.Label",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 34
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_string": "",
"_N$string": "",
"_fontSize": 40,
"_lineHeight": 40,
"_enableWrapText": true,
"_N$file": null,
"_isSystemFontUsed": true,
"_spacingX": 0,
"_batchAsBitmap": false,
"_styleFlags": 0,
"_underlineHeight": 0,
"_N$horizontalAlign": 1,
"_N$verticalAlign": 1,
"_N$fontFamily": "Muil",
"_N$overflow": 0,
"_N$cacheMode": 0,
"_id": "81DvabBCZNALBg8XE55UTB"
},
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "img_close", "_name": "img_close",
...@@ -1713,10 +1808,10 @@ ...@@ -1713,10 +1808,10 @@
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 35 "__id__": 37
}, },
{ {
"__id__": 36 "__id__": 38
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1772,7 +1867,7 @@ ...@@ -1772,7 +1867,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 34 "__id__": 36
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -1804,7 +1899,7 @@ ...@@ -1804,7 +1899,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 34 "__id__": 36
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -1878,7 +1973,7 @@ ...@@ -1878,7 +1973,7 @@
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 38 "__id__": 40
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -1934,7 +2029,7 @@ ...@@ -1934,7 +2029,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 37 "__id__": 39
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -1972,7 +2067,7 @@ ...@@ -1972,7 +2067,7 @@
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 40 "__id__": 42
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2028,7 +2123,7 @@ ...@@ -2028,7 +2123,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 39 "__id__": 41
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -2055,101 +2150,6 @@ ...@@ -2055,101 +2150,6 @@
"_atlas": null, "_atlas": null,
"_id": "4f7LWEBy1JXaSytoYxXfPL" "_id": "4f7LWEBy1JXaSytoYxXfPL"
}, },
{
"__type__": "cc.Node",
"_name": "desc",
"_objFlags": 0,
"_parent": {
"__id__": 27
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 42
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 157,
"g": 50,
"b": 45,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 0,
"height": 50.4
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
0,
0,
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": "a41J19KG5GoqiuwEpzA+rC"
},
{
"__type__": "cc.Label",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 41
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_string": "",
"_N$string": "",
"_fontSize": 40,
"_lineHeight": 40,
"_enableWrapText": true,
"_N$file": null,
"_isSystemFontUsed": true,
"_spacingX": 0,
"_batchAsBitmap": false,
"_styleFlags": 0,
"_underlineHeight": 0,
"_N$horizontalAlign": 1,
"_N$verticalAlign": 1,
"_N$fontFamily": "Muil",
"_N$overflow": 0,
"_N$cacheMode": 0,
"_id": "81DvabBCZNALBg8XE55UTB"
},
{ {
"__type__": "cc.Toggle", "__type__": "cc.Toggle",
"_name": "", "_name": "",
...@@ -2244,7 +2244,7 @@ ...@@ -2244,7 +2244,7 @@
"__id__": 51 "__id__": 51
}, },
{ {
"__id__": 54 "__id__": 53
}, },
{ {
"__id__": 56 "__id__": 56
...@@ -2557,34 +2557,31 @@ ...@@ -2557,34 +2557,31 @@
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "img_close", "_name": "desc",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 44 "__id__": 44
}, },
"_children": [], "_children": [],
"_active": false, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 52 "__id__": 52
},
{
"__id__": 53
} }
], ],
"_prefab": null, "_prefab": null,
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
"__type__": "cc.Color", "__type__": "cc.Color",
"r": 255, "r": 157,
"g": 255, "g": 50,
"b": 255, "b": 45,
"a": 255 "a": 255
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 92, "width": 0,
"height": 100 "height": 50.4
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -2595,15 +2592,15 @@ ...@@ -2595,15 +2592,15 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-33.651, 0,
30.807, 0,
0, 0,
0, 0,
0, 0,
0, 0,
1, 1,
0.65, 1,
0.65, 1,
1 1
] ]
}, },
...@@ -2618,10 +2615,10 @@ ...@@ -2618,10 +2615,10 @@
"_is3DNode": false, "_is3DNode": false,
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"_id": "6dSdqa+PFEsqkAzSYp8ReY" "_id": "87Y4EbGF1JLr3hpTqUWE4y"
}, },
{ {
"__type__": "cc.Sprite", "__type__": "cc.Label",
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
...@@ -2635,29 +2632,127 @@ ...@@ -2635,29 +2632,127 @@
], ],
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_string": "",
"__uuid__": "a1b3c40a-3d88-4bcc-a606-f08cc72bc74e" "_N$string": "",
}, "_fontSize": 40,
"_type": 0, "_lineHeight": 40,
"_sizeMode": 1, "_enableWrapText": true,
"_fillType": 0, "_N$file": null,
"_fillCenter": { "_isSystemFontUsed": true,
"__type__": "cc.Vec2", "_spacingX": 0,
"x": 0, "_batchAsBitmap": false,
"y": 0 "_styleFlags": 0,
}, "_underlineHeight": 0,
"_fillStart": 0, "_N$horizontalAlign": 1,
"_fillRange": 0, "_N$verticalAlign": 1,
"_isTrimmedMode": true, "_N$fontFamily": "Muil",
"_atlas": null, "_N$overflow": 0,
"_id": "6fRxqOI9JDTYeSYxQN/jBy" "_N$cacheMode": 0,
}, "_id": "d0eXn7cCxIgYsLP2YqddHf"
{ },
"__type__": "cc.Button", {
"_name": "", "__type__": "cc.Node",
"_name": "img_close",
"_objFlags": 0,
"_parent": {
"__id__": 44
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 54
},
{
"__id__": 55
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 92,
"height": 100
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
-33.651,
30.807,
0,
0,
0,
0,
1,
0.65,
0.65,
1
]
},
"_eulerAngles": {
"__type__": "cc.Vec3",
"x": 0,
"y": 0,
"z": 0
},
"_skewX": 0,
"_skewY": 0,
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "6dSdqa+PFEsqkAzSYp8ReY"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 51 "__id__": 53
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "a1b3c40a-3d88-4bcc-a606-f08cc72bc74e"
},
"_type": 0,
"_sizeMode": 1,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "6fRxqOI9JDTYeSYxQN/jBy"
},
{
"__type__": "cc.Button",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 53
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -2731,7 +2826,7 @@ ...@@ -2731,7 +2826,7 @@
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 55 "__id__": 57
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2787,7 +2882,7 @@ ...@@ -2787,7 +2882,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 54 "__id__": 56
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -2825,7 +2920,7 @@ ...@@ -2825,7 +2920,7 @@
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 57 "__id__": 59
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2881,7 +2976,7 @@ ...@@ -2881,7 +2976,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 56 "__id__": 58
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -2908,101 +3003,6 @@ ...@@ -2908,101 +3003,6 @@
"_atlas": null, "_atlas": null,
"_id": "651yIUu2ZP6Jw3IWJKsxcZ" "_id": "651yIUu2ZP6Jw3IWJKsxcZ"
}, },
{
"__type__": "cc.Node",
"_name": "desc",
"_objFlags": 0,
"_parent": {
"__id__": 44
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 59
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 157,
"g": 50,
"b": 45,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 0,
"height": 50.4
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
0,
0,
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": "87Y4EbGF1JLr3hpTqUWE4y"
},
{
"__type__": "cc.Label",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 58
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_string": "",
"_N$string": "",
"_fontSize": 40,
"_lineHeight": 40,
"_enableWrapText": true,
"_N$file": null,
"_isSystemFontUsed": true,
"_spacingX": 0,
"_batchAsBitmap": false,
"_styleFlags": 0,
"_underlineHeight": 0,
"_N$horizontalAlign": 1,
"_N$verticalAlign": 1,
"_N$fontFamily": "Muil",
"_N$overflow": 0,
"_N$cacheMode": 0,
"_id": "d0eXn7cCxIgYsLP2YqddHf"
},
{ {
"__type__": "cc.Toggle", "__type__": "cc.Toggle",
"_name": "", "_name": "",
...@@ -3097,7 +3097,7 @@ ...@@ -3097,7 +3097,7 @@
"__id__": 68 "__id__": 68
}, },
{ {
"__id__": 71 "__id__": 70
}, },
{ {
"__id__": 73 "__id__": 73
...@@ -3410,34 +3410,31 @@ ...@@ -3410,34 +3410,31 @@
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "img_close", "_name": "desc",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 61 "__id__": 61
}, },
"_children": [], "_children": [],
"_active": false, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 69 "__id__": 69
},
{
"__id__": 70
} }
], ],
"_prefab": null, "_prefab": null,
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
"__type__": "cc.Color", "__type__": "cc.Color",
"r": 255, "r": 157,
"g": 255, "g": 50,
"b": 255, "b": 45,
"a": 255 "a": 255
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 92, "width": 0,
"height": 100 "height": 50.4
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -3448,15 +3445,15 @@ ...@@ -3448,15 +3445,15 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-58.474, 0,
41.915, 0,
0, 0,
0, 0,
0, 0,
0, 0,
1, 1,
0.8, 1,
0.8, 1,
1 1
] ]
}, },
...@@ -3471,10 +3468,10 @@ ...@@ -3471,10 +3468,10 @@
"_is3DNode": false, "_is3DNode": false,
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"_id": "92KRGckFVEpbBojdEyHgHT" "_id": "d6kSaR9O9HxLwjblPQu3S/"
}, },
{ {
"__type__": "cc.Sprite", "__type__": "cc.Label",
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
...@@ -3488,11 +3485,109 @@ ...@@ -3488,11 +3485,109 @@
], ],
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_string": "",
"__uuid__": "a1b3c40a-3d88-4bcc-a606-f08cc72bc74e" "_N$string": "",
}, "_fontSize": 40,
"_type": 0, "_lineHeight": 40,
"_sizeMode": 1, "_enableWrapText": true,
"_N$file": null,
"_isSystemFontUsed": true,
"_spacingX": 0,
"_batchAsBitmap": false,
"_styleFlags": 0,
"_underlineHeight": 0,
"_N$horizontalAlign": 1,
"_N$verticalAlign": 1,
"_N$fontFamily": "Muil",
"_N$overflow": 0,
"_N$cacheMode": 0,
"_id": "21JmrcKitCwLkaKasX6eEp"
},
{
"__type__": "cc.Node",
"_name": "img_close",
"_objFlags": 0,
"_parent": {
"__id__": 61
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 71
},
{
"__id__": 72
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 92,
"height": 100
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
-58.474,
41.915,
0,
0,
0,
0,
1,
0.8,
0.8,
1
]
},
"_eulerAngles": {
"__type__": "cc.Vec3",
"x": 0,
"y": 0,
"z": 0
},
"_skewX": 0,
"_skewY": 0,
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "92KRGckFVEpbBojdEyHgHT"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 70
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "a1b3c40a-3d88-4bcc-a606-f08cc72bc74e"
},
"_type": 0,
"_sizeMode": 1,
"_fillType": 0, "_fillType": 0,
"_fillCenter": { "_fillCenter": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -3510,7 +3605,7 @@ ...@@ -3510,7 +3605,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 68 "__id__": 70
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -3584,7 +3679,7 @@ ...@@ -3584,7 +3679,7 @@
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 72 "__id__": 74
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3640,7 +3735,7 @@ ...@@ -3640,7 +3735,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 71 "__id__": 73
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3678,7 +3773,7 @@ ...@@ -3678,7 +3773,7 @@
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 74 "__id__": 76
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3734,7 +3829,7 @@ ...@@ -3734,7 +3829,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 73 "__id__": 75
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3761,101 +3856,6 @@ ...@@ -3761,101 +3856,6 @@
"_atlas": null, "_atlas": null,
"_id": "2ej4/Stk5HzoTQkW6nUMV+" "_id": "2ej4/Stk5HzoTQkW6nUMV+"
}, },
{
"__type__": "cc.Node",
"_name": "desc",
"_objFlags": 0,
"_parent": {
"__id__": 61
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 76
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 157,
"g": 50,
"b": 45,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 0,
"height": 50.4
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
0,
0,
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": "d6kSaR9O9HxLwjblPQu3S/"
},
{
"__type__": "cc.Label",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 75
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_string": "",
"_N$string": "",
"_fontSize": 40,
"_lineHeight": 40,
"_enableWrapText": true,
"_N$file": null,
"_isSystemFontUsed": true,
"_spacingX": 0,
"_batchAsBitmap": false,
"_styleFlags": 0,
"_underlineHeight": 0,
"_N$horizontalAlign": 1,
"_N$verticalAlign": 1,
"_N$fontFamily": "Muil",
"_N$overflow": 0,
"_N$cacheMode": 0,
"_id": "21JmrcKitCwLkaKasX6eEp"
},
{ {
"__type__": "cc.Toggle", "__type__": "cc.Toggle",
"_name": "", "_name": "",
...@@ -3950,7 +3950,7 @@ ...@@ -3950,7 +3950,7 @@
"__id__": 83 "__id__": 83
}, },
{ {
"__id__": 86 "__id__": 85
}, },
{ {
"__id__": 88 "__id__": 88
...@@ -4201,6 +4201,101 @@ ...@@ -4201,6 +4201,101 @@
"_atlas": null, "_atlas": null,
"_id": "9eD4Tdh1RLfrkQkxtEJuFK" "_id": "9eD4Tdh1RLfrkQkxtEJuFK"
}, },
{
"__type__": "cc.Node",
"_name": "desc",
"_objFlags": 0,
"_parent": {
"__id__": 78
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 84
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 157,
"g": 50,
"b": 45,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 410,
"height": 50.4
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
0,
0,
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": "86u0TKnp1M/oid/GMPi9RO"
},
{
"__type__": "cc.Label",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 83
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_string": "",
"_N$string": "",
"_fontSize": 40,
"_lineHeight": 40,
"_enableWrapText": true,
"_N$file": null,
"_isSystemFontUsed": true,
"_spacingX": 0,
"_batchAsBitmap": false,
"_styleFlags": 0,
"_underlineHeight": 0,
"_N$horizontalAlign": 1,
"_N$verticalAlign": 1,
"_N$fontFamily": "Muil",
"_N$overflow": 2,
"_N$cacheMode": 0,
"_id": "84PPSghJhHU7dP3FBgNRY6"
},
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "img_close", "_name": "img_close",
...@@ -4212,10 +4307,10 @@ ...@@ -4212,10 +4307,10 @@
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 84 "__id__": 86
}, },
{ {
"__id__": 85 "__id__": 87
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4271,7 +4366,7 @@ ...@@ -4271,7 +4366,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 83 "__id__": 85
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4303,7 +4398,7 @@ ...@@ -4303,7 +4398,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 83 "__id__": 85
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -4377,7 +4472,7 @@ ...@@ -4377,7 +4472,7 @@
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 87 "__id__": 89
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4428,100 +4523,6 @@ ...@@ -4428,100 +4523,6 @@
"groupIndex": 0, "groupIndex": 0,
"_id": "bckEwq2AhACbHRIrimjRcQ" "_id": "bckEwq2AhACbHRIrimjRcQ"
}, },
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 86
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "a1b3c40a-3d88-4bcc-a606-f08cc72bc74e"
},
"_type": 0,
"_sizeMode": 1,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "c8LKJgL1xFe5rHdZvJ9ZPf"
},
{
"__type__": "cc.Node",
"_name": "head",
"_objFlags": 0,
"_parent": {
"__id__": 78
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 89
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 400,
"height": 60
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
0,
0,
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": "b9MMvlOj5AG7EKGGTQWYi4"
},
{ {
"__type__": "cc.Sprite", "__type__": "cc.Sprite",
"_name": "", "_name": "",
...@@ -4538,10 +4539,10 @@ ...@@ -4538,10 +4539,10 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "8cdb44ac-a3f6-449f-b354-7cd48cf84061" "__uuid__": "a1b3c40a-3d88-4bcc-a606-f08cc72bc74e"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 0, "_sizeMode": 1,
"_fillType": 0, "_fillType": 0,
"_fillCenter": { "_fillCenter": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -4552,17 +4553,17 @@ ...@@ -4552,17 +4553,17 @@
"_fillRange": 0, "_fillRange": 0,
"_isTrimmedMode": true, "_isTrimmedMode": true,
"_atlas": null, "_atlas": null,
"_id": "ec2tfJJAhAlqvErhZk1Brq" "_id": "c8LKJgL1xFe5rHdZvJ9ZPf"
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "desc", "_name": "head",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 78 "__id__": 78
}, },
"_children": [], "_children": [],
"_active": true, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 91 "__id__": 91
...@@ -4572,15 +4573,15 @@ ...@@ -4572,15 +4573,15 @@
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
"__type__": "cc.Color", "__type__": "cc.Color",
"r": 157, "r": 255,
"g": 50, "g": 255,
"b": 45, "b": 255,
"a": 255 "a": 255
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 450, "width": 400,
"height": 50.4 "height": 60
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -4614,10 +4615,10 @@ ...@@ -4614,10 +4615,10 @@
"_is3DNode": false, "_is3DNode": false,
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"_id": "86u0TKnp1M/oid/GMPi9RO" "_id": "b9MMvlOj5AG7EKGGTQWYi4"
}, },
{ {
"__type__": "cc.Label", "__type__": "cc.Sprite",
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
...@@ -4631,23 +4632,22 @@ ...@@ -4631,23 +4632,22 @@
], ],
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_string": "", "_spriteFrame": {
"_N$string": "", "__uuid__": "8cdb44ac-a3f6-449f-b354-7cd48cf84061"
"_fontSize": 40, },
"_lineHeight": 40, "_type": 0,
"_enableWrapText": true, "_sizeMode": 0,
"_N$file": null, "_fillType": 0,
"_isSystemFontUsed": true, "_fillCenter": {
"_spacingX": 0, "__type__": "cc.Vec2",
"_batchAsBitmap": false, "x": 0,
"_styleFlags": 0, "y": 0
"_underlineHeight": 0, },
"_N$horizontalAlign": 1, "_fillStart": 0,
"_N$verticalAlign": 1, "_fillRange": 0,
"_N$fontFamily": "Muil", "_isTrimmedMode": true,
"_N$overflow": 2, "_atlas": null,
"_N$cacheMode": 0, "_id": "ec2tfJJAhAlqvErhZk1Brq"
"_id": "84PPSghJhHU7dP3FBgNRY6"
}, },
{ {
"__type__": "cc.Toggle", "__type__": "cc.Toggle",
...@@ -4743,7 +4743,7 @@ ...@@ -4743,7 +4743,7 @@
"__id__": 98 "__id__": 98
}, },
{ {
"__id__": 101 "__id__": 100
}, },
{ {
"__id__": 103 "__id__": 103
...@@ -4994,6 +4994,101 @@ ...@@ -4994,6 +4994,101 @@
"_atlas": null, "_atlas": null,
"_id": "4fDqWno5xCh5KGUf9l3gR7" "_id": "4fDqWno5xCh5KGUf9l3gR7"
}, },
{
"__type__": "cc.Node",
"_name": "desc",
"_objFlags": 0,
"_parent": {
"__id__": 93
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 99
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 157,
"g": 50,
"b": 45,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 220,
"height": 50.4
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
0,
0,
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": "15TmZT8c5Br4FfYxCskBGL"
},
{
"__type__": "cc.Label",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 98
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_string": "",
"_N$string": "",
"_fontSize": 40,
"_lineHeight": 40,
"_enableWrapText": true,
"_N$file": null,
"_isSystemFontUsed": true,
"_spacingX": 0,
"_batchAsBitmap": false,
"_styleFlags": 0,
"_underlineHeight": 0,
"_N$horizontalAlign": 1,
"_N$verticalAlign": 1,
"_N$fontFamily": "Muil",
"_N$overflow": 2,
"_N$cacheMode": 0,
"_id": "5dJrtHKCxCWKC48f+yKHWz"
},
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "img_close", "_name": "img_close",
...@@ -5005,10 +5100,10 @@ ...@@ -5005,10 +5100,10 @@
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 99 "__id__": 101
}, },
{ {
"__id__": 100 "__id__": 102
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5064,7 +5159,7 @@ ...@@ -5064,7 +5159,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 98 "__id__": 100
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -5096,7 +5191,7 @@ ...@@ -5096,7 +5191,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 98 "__id__": 100
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -5170,7 +5265,7 @@ ...@@ -5170,7 +5265,7 @@
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 102 "__id__": 104
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5226,7 +5321,7 @@ ...@@ -5226,7 +5321,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 101 "__id__": 103
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -5251,111 +5346,17 @@ ...@@ -5251,111 +5346,17 @@
"_fillRange": 0, "_fillRange": 0,
"_isTrimmedMode": true, "_isTrimmedMode": true,
"_atlas": null, "_atlas": null,
"_id": "d83G61aCVK34v7FJ0HSwwS" "_id": "d83G61aCVK34v7FJ0HSwwS"
},
{
"__type__": "cc.Node",
"_name": "head",
"_objFlags": 0,
"_parent": {
"__id__": 93
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 104
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 255,
"height": 80
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
0,
0,
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": "25oxqG3EVK07m/UsXDi03v"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 103
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "8cdb44ac-a3f6-449f-b354-7cd48cf84061"
},
"_type": 0,
"_sizeMode": 0,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "c3IAV7On9BoqH6T/H3E755"
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "desc", "_name": "head",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 93 "__id__": 93
}, },
"_children": [], "_children": [],
"_active": true, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 106 "__id__": 106
...@@ -5365,15 +5366,15 @@ ...@@ -5365,15 +5366,15 @@
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
"__type__": "cc.Color", "__type__": "cc.Color",
"r": 157, "r": 255,
"g": 50, "g": 255,
"b": 45, "b": 255,
"a": 255 "a": 255
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 0, "width": 255,
"height": 50.4 "height": 80
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -5407,10 +5408,10 @@ ...@@ -5407,10 +5408,10 @@
"_is3DNode": false, "_is3DNode": false,
"_groupIndex": 0, "_groupIndex": 0,
"groupIndex": 0, "groupIndex": 0,
"_id": "15TmZT8c5Br4FfYxCskBGL" "_id": "25oxqG3EVK07m/UsXDi03v"
}, },
{ {
"__type__": "cc.Label", "__type__": "cc.Sprite",
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
...@@ -5424,23 +5425,22 @@ ...@@ -5424,23 +5425,22 @@
], ],
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_string": "", "_spriteFrame": {
"_N$string": "", "__uuid__": "8cdb44ac-a3f6-449f-b354-7cd48cf84061"
"_fontSize": 40, },
"_lineHeight": 40, "_type": 0,
"_enableWrapText": true, "_sizeMode": 0,
"_N$file": null, "_fillType": 0,
"_isSystemFontUsed": true, "_fillCenter": {
"_spacingX": 0, "__type__": "cc.Vec2",
"_batchAsBitmap": false, "x": 0,
"_styleFlags": 0, "y": 0
"_underlineHeight": 0, },
"_N$horizontalAlign": 1, "_fillStart": 0,
"_N$verticalAlign": 1, "_fillRange": 0,
"_N$fontFamily": "Muil", "_isTrimmedMode": true,
"_N$overflow": 0, "_atlas": null,
"_N$cacheMode": 0, "_id": "c3IAV7On9BoqH6T/H3E755"
"_id": "5dJrtHKCxCWKC48f+yKHWz"
}, },
{ {
"__type__": "cc.Toggle", "__type__": "cc.Toggle",
...@@ -5536,7 +5536,7 @@ ...@@ -5536,7 +5536,7 @@
"__id__": 113 "__id__": 113
}, },
{ {
"__id__": 116 "__id__": 115
}, },
{ {
"__id__": 118 "__id__": 118
...@@ -5787,6 +5787,101 @@ ...@@ -5787,6 +5787,101 @@
"_atlas": null, "_atlas": null,
"_id": "ecmwTdtMxIzJogWxqfQvB4" "_id": "ecmwTdtMxIzJogWxqfQvB4"
}, },
{
"__type__": "cc.Node",
"_name": "desc",
"_objFlags": 0,
"_parent": {
"__id__": 108
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 114
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 157,
"g": 50,
"b": 45,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 200,
"height": 50.4
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
0,
0,
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": "c2f9wJI1NBu6Ucqmkaro0a"
},
{
"__type__": "cc.Label",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 113
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_string": "",
"_N$string": "",
"_fontSize": 40,
"_lineHeight": 40,
"_enableWrapText": true,
"_N$file": null,
"_isSystemFontUsed": true,
"_spacingX": 0,
"_batchAsBitmap": false,
"_styleFlags": 0,
"_underlineHeight": 0,
"_N$horizontalAlign": 1,
"_N$verticalAlign": 1,
"_N$fontFamily": "Muil",
"_N$overflow": 2,
"_N$cacheMode": 0,
"_id": "3ajIauRoJFwIqwoe9ZK9zA"
},
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "img_close", "_name": "img_close",
...@@ -5798,10 +5893,10 @@ ...@@ -5798,10 +5893,10 @@
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 114 "__id__": 116
}, },
{ {
"__id__": 115 "__id__": 117
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -5857,7 +5952,7 @@ ...@@ -5857,7 +5952,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 113 "__id__": 115
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -5889,7 +5984,7 @@ ...@@ -5889,7 +5984,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 113 "__id__": 115
}, },
"_enabled": true, "_enabled": true,
"_normalMaterial": null, "_normalMaterial": null,
...@@ -5963,7 +6058,7 @@ ...@@ -5963,7 +6058,7 @@
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 117 "__id__": 119
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -6019,7 +6114,7 @@ ...@@ -6019,7 +6114,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 116 "__id__": 118
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -6057,7 +6152,7 @@ ...@@ -6057,7 +6152,7 @@
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 119 "__id__": 121
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -6113,7 +6208,7 @@ ...@@ -6113,7 +6208,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 118 "__id__": 120
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -6140,101 +6235,6 @@ ...@@ -6140,101 +6235,6 @@
"_atlas": null, "_atlas": null,
"_id": "10JTzy4fRGj6YtckDmm/fW" "_id": "10JTzy4fRGj6YtckDmm/fW"
}, },
{
"__type__": "cc.Node",
"_name": "desc",
"_objFlags": 0,
"_parent": {
"__id__": 108
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 121
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 157,
"g": 50,
"b": 45,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 0,
"height": 50.4
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
0,
0,
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": "c2f9wJI1NBu6Ucqmkaro0a"
},
{
"__type__": "cc.Label",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 120
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_string": "",
"_N$string": "",
"_fontSize": 40,
"_lineHeight": 40,
"_enableWrapText": true,
"_N$file": null,
"_isSystemFontUsed": true,
"_spacingX": 0,
"_batchAsBitmap": false,
"_styleFlags": 0,
"_underlineHeight": 0,
"_N$horizontalAlign": 1,
"_N$verticalAlign": 1,
"_N$fontFamily": "Muil",
"_N$overflow": 0,
"_N$cacheMode": 0,
"_id": "3ajIauRoJFwIqwoe9ZK9zA"
},
{ {
"__type__": "cc.Toggle", "__type__": "cc.Toggle",
"_name": "", "_name": "",
...@@ -9367,7 +9367,7 @@ ...@@ -9367,7 +9367,7 @@
"_enabled": true, "_enabled": true,
"position": { "position": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
"x": 580, "x": 595,
"y": 335 "y": 335
}, },
"bigStarClip": { "bigStarClip": {
......
...@@ -5,165 +5,166 @@ ...@@ -5,165 +5,166 @@
// "audio_url": "http://staging-teach.cdn.ireadabc.com/f47f1d7b5c160fe1c59500d180346240.mp3" // "audio_url": "http://staging-teach.cdn.ireadabc.com/f47f1d7b5c160fe1c59500d180346240.mp3"
// } // }
export const defaultData ={ export const defaultData ={
"aniEnter": { "aniEnter": {
"skeJsonData": {}, "skeJsonData": {},
"texJsonData": {}, "texJsonData": {},
"texPngData": {}, "texPngData": {},
"audioUrl": null, "audioUrl": null,
"time": 1 "time": 1
}, },
"item": { "item": {
"group": [{ "group": [{
"up": { "up": {
"type": 1, "type": 1,
"pic_url": "", "pic_url": "",
"text": "1fdshkdshfksdhkfhdskdsk", "text": "1fdshkdshfksdhkfhdskdsk",
"audio_url": "" "audio_url": ""
}, },
"down": { "down": {
"type": 1, "type": 1,
"pic_url": "http://staging-teach.cdn.ireadabc.com/6689e11c1646fba838a51c212b7770d2.png", "pic_url": "http://staging-teach.cdn.ireadabc.com/6689e11c1646fba838a51c212b7770d2.png",
"text": "第三位发送到", "text": "第三位发送到",
"audio_url": "http://staging-teach.cdn.ireadabc.com/71348a317c47ec2a0b3056b0d7ca2e99.mp3" "audio_url": "http://staging-teach.cdn.ireadabc.com/71348a317c47ec2a0b3056b0d7ca2e99.mp3"
} }
}, { }, {
"up": { "up": {
"type": 0, "type": 0,
"pic_url": "http://staging-teach.cdn.ireadabc.com/e359730cf593c396a58e020333026fac.png", "pic_url": "http://staging-teach.cdn.ireadabc.com/e359730cf593c396a58e020333026fac.png",
"text": "2", "text": "2",
"audio_url": "" "audio_url": ""
}, },
"down": { "down": {
"type": 1, "type": 1,
"pic_url": "", "pic_url": "",
"text": "4534543", "text": "4534543",
"audio_url": "http://staging-teach.cdn.ireadabc.com/526624b47ba5e46f698add9e152a4b4e.mp3" "audio_url": "http://staging-teach.cdn.ireadabc.com/526624b47ba5e46f698add9e152a4b4e.mp3"
} }
}, { }, {
"up": { "up": {
"type": 0, "type": 0,
"pic_url": "http://staging-teach.cdn.ireadabc.com/bcc13bb8f504b17ee9d07d8f5204b12f.png", "pic_url": "http://staging-teach.cdn.ireadabc.com/bcc13bb8f504b17ee9d07d8f5204b12f.png",
"text": "2", "text": "2",
"audio_url": "" "audio_url": ""
}, },
"down": { "down": {
"type": 1, "type": 1,
"pic_url": "", "pic_url": "",
"text": "萨大师赛所", "text": "萨大师赛所",
"audio_url": "" "audio_url": ""
} }
}, },
// { {
// "up": { "up": {
// "type": 0, "type": 0,
// "pic_url": "http://staging-teach.cdn.ireadabc.com/b84efeac2d0bc3f32f1dffb6734aeea6.png", "pic_url": "http://staging-teach.cdn.ireadabc.com/b84efeac2d0bc3f32f1dffb6734aeea6.png",
// "text": "4", "text": "4",
// "audio_url": "" "audio_url": ""
// }, },
// "down": { "down": {
// "type": 1, "type": 1,
// "pic_url": "", "pic_url": "",
// "text": "那边不谷歌包", "text": "那边不谷歌包",
// "audio_url": "http://staging-teach.cdn.ireadabc.com/9df3f14bc88bcffc49b6717c40428ed8.mp3" "audio_url": "http://staging-teach.cdn.ireadabc.com/9df3f14bc88bcffc49b6717c40428ed8.mp3"
// } }
// }, },
// { // {
// "up": { // "up": {
// "type": 0, // "type": 0,
// "pic_url": "http://staging-teach.cdn.ireadabc.com/ce43980b533f674f9debe6ce9cae7b8d.png", // "pic_url": "http://staging-teach.cdn.ireadabc.com/ce43980b533f674f9debe6ce9cae7b8d.png",
// "text": "5", // "text": "5",
// "audio_url": "" // "audio_url": ""
// }, // },
// "down": { // "down": {
// "type": 1, // "type": 1,
// "pic_url": "", // "pic_url": "",
// "text": "5345344343", // "text": "5345344343",
// "audio_url": "" // "audio_url": ""
// } // }
// } // }
], ],
"title": "电话客服劵花费", "title": "电话客服劵花费",
"audio_title": "http://staging-teach.cdn.ireadabc.com/f7fb9f71ab7d460ac2f78c85efba7610.mp3" "audio_title": "http://staging-teach.cdn.ireadabc.com/f7fb9f71ab7d460ac2f78c85efba7610.mp3"
}
} }
}
// {
// { // "aniEnter": {
// "aniEnter": { // "skeJsonData": {},
// "skeJsonData": {}, // "texJsonData": {},
// "texJsonData": {}, // "texPngData": {},
// "texPngData": {}, // "audioUrl": "http://staging-teach.cdn.ireadabc.com/526624b47ba5e46f698add9e152a4b4e.mp3",
// "audioUrl": "http://staging-teach.cdn.ireadabc.com/526624b47ba5e46f698add9e152a4b4e.mp3", // "time": 1
// "time": 1 // },
// }, // "item": {
// "item": { // "group": [{
// "group": [{ // "up": {
// "up": { // "type": 1,
// "type": 1, // "pic_url": "",
// "pic_url": "", // "text": "1",
// "text": "1", // "audio_url": ""
// "audio_url": "" // },
// }, // "down": {
// "down": { // "type": 1,
// "type": 1, // "pic_url": "",
// "pic_url": "", // "text": "第三位发送到",
// "text": "第三位发送到", // "audio_url": ""
// "audio_url": "" // }
// } // }, {
// }, { // "up": {
// "up": { // "type": 1,
// "type": 1, // "pic_url": "",
// "pic_url": "", // "text": "2",
// "text": "2", // "audio_url": ""
// "audio_url": "" // },
// }, // "down": {
// "down": { // "type": 1,
// "type": 1, // "pic_url": "",
// "pic_url": "", // "text": "4534543",
// "text": "4534543", // "audio_url": "http://staging-teach.cdn.ireadabc.com/526624b47ba5e46f698add9e152a4b4e.mp3"
// "audio_url": "http://staging-teach.cdn.ireadabc.com/526624b47ba5e46f698add9e152a4b4e.mp3" // }
// } // }, {
// }, { // "up": {
// "up": { // "type": 1,
// "type": 1, // "pic_url": "",
// "pic_url": "", // "text": "3",
// "text": "3", // "audio_url": ""
// "audio_url": "" // },
// }, // "down": {
// "down": { // "type": 1,
// "type": 1, // "pic_url": "",
// "pic_url": "", // "text": "萨大师赛所",
// "text": "萨大师赛所", // "audio_url": ""
// "audio_url": "" // }
// } // }, {
// }, { // "up": {
// "up": { // "type": 1,
// "type": 1, // "pic_url": "",
// "pic_url": "", // "text": "4",
// "text": "4", // "audio_url": ""
// "audio_url": "" // },
// }, // "down": {
// "down": { // "type": 1,
// "type": 1, // "pic_url": "",
// "pic_url": "", // "text": "那边不谷歌包",
// "text": "那边不谷歌包", // "audio_url": ""
// "audio_url": "" // }
// } // }, {
// }, { // "up": {
// "up": { // "type": 1,
// "type": 1, // "pic_url": "",
// "pic_url": "", // "text": "5",
// "text": "5", // "audio_url": ""
// "audio_url": "" // },
// }, // "down": {
// "down": { // "type": 1,
// "type": 1, // "pic_url": "",
// "pic_url": "", // "text": "5345344343",
// "text": "5345344343", // "audio_url": ""
// "audio_url": "" // }
// } // }
// } // ],
// ], // "title": "电话客服劵花费",
// "title": "电话客服劵花费", // "audio_title": "http://staging-teach.cdn.ireadabc.com/f7fb9f71ab7d460ac2f78c85efba7610.mp3"
// "audio_title": "http://staging-teach.cdn.ireadabc.com/f7fb9f71ab7d460ac2f78c85efba7610.mp3" // }
// } // }
// }
\ 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