Commit 9e0d4d31 authored by 李帅's avatar 李帅

白边

parent 86328455
......@@ -84,25 +84,25 @@
"__id__": 18
},
{
"__id__": 70
"__id__": 73
},
{
"__id__": 72
"__id__": 75
},
{
"__id__": 75
"__id__": 78
}
],
"_active": true,
"_components": [
{
"__id__": 83
"__id__": 86
},
{
"__id__": 84
"__id__": 87
},
{
"__id__": 85
"__id__": 88
}
],
"_prefab": null,
......@@ -860,10 +860,10 @@
"__id__": 43
},
{
"__id__": 52
"__id__": 53
},
{
"__id__": 61
"__id__": 63
}
],
"_active": true,
......@@ -1203,7 +1203,7 @@
"__uuid__": "660c5efe-f507-4c1e-8c99-3b20faed721c"
},
"_type": 0,
"_sizeMode": 1,
"_sizeMode": 0,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
......@@ -1512,7 +1512,7 @@
"__uuid__": "660c5efe-f507-4c1e-8c99-3b20faed721c"
},
"_type": 0,
"_sizeMode": 1,
"_sizeMode": 0,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
......@@ -1821,7 +1821,7 @@
"__uuid__": "660c5efe-f507-4c1e-8c99-3b20faed721c"
},
"_type": 0,
"_sizeMode": 1,
"_sizeMode": 0,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
......@@ -2032,16 +2032,16 @@
"__id__": 44
},
{
"__id__": 46
"__id__": 47
}
],
"_active": true,
"_components": [
{
"__id__": 49
"__id__": 50
},
{
"__id__": 50
"__id__": 51
}
],
"_prefab": null,
......@@ -2104,6 +2104,9 @@
"_components": [
{
"__id__": 45
},
{
"__id__": 46
}
],
"_prefab": null,
......@@ -2117,8 +2120,8 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 0,
"height": 0
"width": 189,
"height": 188
},
"_anchorPoint": {
"__type__": "cc.Vec2",
......@@ -2129,8 +2132,8 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
0,
0,
1,
6.5,
0,
0,
0,
......@@ -2171,7 +2174,7 @@
"_dstBlendFactor": 771,
"_spriteFrame": null,
"_type": 0,
"_sizeMode": 1,
"_sizeMode": 0,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
......@@ -2184,6 +2187,33 @@
"_atlas": null,
"_id": "94KZvYyHJAo7xrLIBnmQN8"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 44
},
"_enabled": true,
"alignMode": 1,
"_target": null,
"_alignFlags": 45,
"_left": 21,
"_right": 19,
"_top": 16,
"_bottom": 29,
"_verticalCenter": 0,
"_horizontalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 0,
"_originalHeight": 0,
"_id": "08as53idlNSKLvLuR4mNp6"
},
{
"__type__": "cc.Node",
"_name": "done",
......@@ -2195,10 +2225,10 @@
"_active": true,
"_components": [
{
"__id__": 47
"__id__": 48
},
{
"__id__": 48
"__id__": 49
}
],
"_prefab": null,
......@@ -2254,7 +2284,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 46
"__id__": 47
},
"_enabled": true,
"_materials": [
......@@ -2286,7 +2316,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 46
"__id__": 47
},
"_enabled": true,
"alignMode": 1,
......@@ -2354,7 +2384,7 @@
"zoomScale": 1.2,
"clickEvents": [
{
"__id__": 51
"__id__": 52
}
],
"_N$interactable": true,
......@@ -2433,19 +2463,19 @@
},
"_children": [
{
"__id__": 53
"__id__": 54
},
{
"__id__": 55
"__id__": 57
}
],
"_active": true,
"_components": [
{
"__id__": 58
"__id__": 60
},
{
"__id__": 59
"__id__": 61
}
],
"_prefab": null,
......@@ -2501,13 +2531,16 @@
"_name": "img",
"_objFlags": 0,
"_parent": {
"__id__": 52
"__id__": 53
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 54
"__id__": 55
},
{
"__id__": 56
}
],
"_prefab": null,
......@@ -2521,8 +2554,8 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 0,
"height": 0
"width": 189,
"height": 188
},
"_anchorPoint": {
"__type__": "cc.Vec2",
......@@ -2533,8 +2566,8 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
0,
0,
1,
6.5,
0,
0,
0,
......@@ -2563,7 +2596,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 53
"__id__": 54
},
"_enabled": true,
"_materials": [
......@@ -2575,7 +2608,7 @@
"_dstBlendFactor": 771,
"_spriteFrame": null,
"_type": 0,
"_sizeMode": 1,
"_sizeMode": 0,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
......@@ -2588,21 +2621,48 @@
"_atlas": null,
"_id": "3a/Bzh/KdMpKvg+thrIbVO"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 54
},
"_enabled": true,
"alignMode": 1,
"_target": null,
"_alignFlags": 45,
"_left": 21,
"_right": 19,
"_top": 16,
"_bottom": 29,
"_verticalCenter": 0,
"_horizontalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 0,
"_originalHeight": 0,
"_id": "eaP84ohhNC2ZiF2xd4usP5"
},
{
"__type__": "cc.Node",
"_name": "done",
"_objFlags": 0,
"_parent": {
"__id__": 52
"__id__": 53
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 56
"__id__": 58
},
{
"__id__": 57
"__id__": 59
}
],
"_prefab": null,
......@@ -2658,7 +2718,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 55
"__id__": 57
},
"_enabled": true,
"_materials": [
......@@ -2690,7 +2750,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 55
"__id__": 57
},
"_enabled": true,
"alignMode": 1,
......@@ -2717,7 +2777,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 52
"__id__": 53
},
"_enabled": true,
"_materials": [
......@@ -2749,7 +2809,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 52
"__id__": 53
},
"_enabled": true,
"_normalMaterial": null,
......@@ -2758,7 +2818,7 @@
"zoomScale": 1.2,
"clickEvents": [
{
"__id__": 60
"__id__": 62
}
],
"_N$interactable": true,
......@@ -2814,7 +2874,7 @@
"hoverSprite": null,
"_N$disabledSprite": null,
"_N$target": {
"__id__": 52
"__id__": 53
},
"_id": "f2PyHUKu1PrIFtyGRT6Xt2"
},
......@@ -2837,19 +2897,19 @@
},
"_children": [
{
"__id__": 62
"__id__": 64
},
{
"__id__": 64
"__id__": 67
}
],
"_active": true,
"_components": [
{
"__id__": 67
"__id__": 70
},
{
"__id__": 68
"__id__": 71
}
],
"_prefab": null,
......@@ -2905,13 +2965,16 @@
"_name": "img",
"_objFlags": 0,
"_parent": {
"__id__": 61
"__id__": 63
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 63
"__id__": 65
},
{
"__id__": 66
}
],
"_prefab": null,
......@@ -2925,8 +2988,8 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 0,
"height": 0
"width": 431,
"height": 190
},
"_anchorPoint": {
"__type__": "cc.Vec2",
......@@ -2937,8 +3000,8 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
0,
0,
1,
6.5,
0,
0,
0,
......@@ -2967,7 +3030,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 62
"__id__": 64
},
"_enabled": true,
"_materials": [
......@@ -2979,7 +3042,7 @@
"_dstBlendFactor": 771,
"_spriteFrame": null,
"_type": 0,
"_sizeMode": 1,
"_sizeMode": 0,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
......@@ -2992,21 +3055,48 @@
"_atlas": null,
"_id": "06R0atAdxETbvrrV3gahBs"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 64
},
"_enabled": true,
"alignMode": 1,
"_target": null,
"_alignFlags": 45,
"_left": 22,
"_right": 20,
"_top": 16,
"_bottom": 29,
"_verticalCenter": 0,
"_horizontalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 0,
"_originalHeight": 0,
"_id": "0e6vIqZedFBYFQNJPX1Y14"
},
{
"__type__": "cc.Node",
"_name": "done",
"_objFlags": 0,
"_parent": {
"__id__": 61
"__id__": 63
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 65
"__id__": 68
},
{
"__id__": 66
"__id__": 69
}
],
"_prefab": null,
......@@ -3062,7 +3152,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 64
"__id__": 67
},
"_enabled": true,
"_materials": [
......@@ -3094,7 +3184,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 64
"__id__": 67
},
"_enabled": true,
"alignMode": 1,
......@@ -3121,7 +3211,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 61
"__id__": 63
},
"_enabled": true,
"_materials": [
......@@ -3153,7 +3243,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 61
"__id__": 63
},
"_enabled": true,
"_normalMaterial": null,
......@@ -3162,7 +3252,7 @@
"zoomScale": 1.2,
"clickEvents": [
{
"__id__": 69
"__id__": 72
}
],
"_N$interactable": true,
......@@ -3218,7 +3308,7 @@
"hoverSprite": null,
"_N$disabledSprite": null,
"_N$target": {
"__id__": 61
"__id__": 63
},
"_id": "319dDC08VHmbRD1FD9dBtp"
},
......@@ -3243,7 +3333,7 @@
"_active": true,
"_components": [
{
"__id__": 71
"__id__": 74
}
],
"_prefab": null,
......@@ -3299,7 +3389,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 70
"__id__": 73
},
"_enabled": true,
"_materials": [
......@@ -3345,10 +3435,10 @@
"_active": true,
"_components": [
{
"__id__": 73
"__id__": 76
},
{
"__id__": 74
"__id__": 77
}
],
"_prefab": null,
......@@ -3404,7 +3494,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 72
"__id__": 75
},
"_enabled": true,
"_materials": [
......@@ -3436,7 +3526,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 72
"__id__": 75
},
"_enabled": true,
"alignMode": 1,
......@@ -3467,13 +3557,13 @@
},
"_children": [
{
"__id__": 76
"__id__": 79
},
{
"__id__": 77
"__id__": 80
},
{
"__id__": 80
"__id__": 83
}
],
"_active": false,
......@@ -3531,7 +3621,7 @@
"_name": "font",
"_objFlags": 0,
"_parent": {
"__id__": 75
"__id__": 78
},
"_children": [],
"_active": true,
......@@ -3589,11 +3679,11 @@
"_name": "img",
"_objFlags": 0,
"_parent": {
"__id__": 75
"__id__": 78
},
"_children": [
{
"__id__": 78
"__id__": 81
}
],
"_active": true,
......@@ -3651,13 +3741,13 @@
"_name": "icon",
"_objFlags": 0,
"_parent": {
"__id__": 77
"__id__": 80
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 79
"__id__": 82
}
],
"_prefab": null,
......@@ -3713,7 +3803,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 78
"__id__": 81
},
"_enabled": true,
"_materials": [],
......@@ -3739,11 +3829,11 @@
"_name": "audio",
"_objFlags": 0,
"_parent": {
"__id__": 75
"__id__": 78
},
"_children": [
{
"__id__": 81
"__id__": 84
}
],
"_active": true,
......@@ -3801,13 +3891,13 @@
"_name": "btn",
"_objFlags": 0,
"_parent": {
"__id__": 80
"__id__": 83
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 82
"__id__": 85
}
],
"_prefab": null,
......@@ -3863,7 +3953,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 81
"__id__": 84
},
"_enabled": true,
"_clip": {
......
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