Commit f10f593f authored by 范雪寒's avatar 范雪寒

Merge branch 'master' of http://vcs.ireadabc.com/template/BOY04

parents 4c7d59ac d9714c7f
...@@ -1438,8 +1438,8 @@ ...@@ -1438,8 +1438,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 78, "width": 70,
"height": 58 "height": 70
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -1450,8 +1450,8 @@ ...@@ -1450,8 +1450,8 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-512, -517,
7.488, 1,
0, 0,
0, 0,
0, 0,
...@@ -1494,7 +1494,7 @@ ...@@ -1494,7 +1494,7 @@
"__uuid__": "04cd31c6-c6c7-4ce1-b273-81cad601edf6" "__uuid__": "04cd31c6-c6c7-4ce1-b273-81cad601edf6"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 0,
"_fillType": 0, "_fillType": 0,
"_fillCenter": { "_fillCenter": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -1557,8 +1557,8 @@ ...@@ -1557,8 +1557,8 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-465, -469,
0, -11,
0, 0,
0, 0,
0, 0,
...@@ -2105,7 +2105,7 @@ ...@@ -2105,7 +2105,7 @@
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
"_target": null, "_target": null,
"_alignFlags": 1, "_alignFlags": 9,
"_left": 0, "_left": 0,
"_right": 0, "_right": 0,
"_top": 0, "_top": 0,
...@@ -2807,9 +2807,9 @@ ...@@ -2807,9 +2807,9 @@
"_enabled": true, "_enabled": true,
"alignMode": 1, "alignMode": 1,
"_target": null, "_target": null,
"_alignFlags": 45, "_alignFlags": 5,
"_left": 155, "_left": -15,
"_right": 185, "_right": 15,
"_top": 101.99999999999999, "_top": 101.99999999999999,
"_bottom": 118.00000000000001, "_bottom": 118.00000000000001,
"_verticalCenter": 0, "_verticalCenter": 0,
......
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